From cc4e0ccd65d587e86cb0e1709ea9017ccbb22d44 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 01:32:11 -0500
Subject: [PATCH 01/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index eacf7cd..ae3bd8c 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,7 @@
 
 Name:		vxl	
 Version:	1.17.0	
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -248,6 +248,9 @@ ctest .
 
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Mon Mar 04 2013 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-11
 - Applied upstream patches (25, 26) to ensure compatibility with ITK
 

From 87027fce5a80690fea48e76f6431283e56243b17 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 23:06:42 -0500
Subject: [PATCH 02/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index ae3bd8c..7282cba 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,7 @@
 
 Name:		vxl	
 Version:	1.17.0	
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -248,6 +248,9 @@ ctest .
 
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From f56efe69840678168de050f0c0d2d8c9dc058d17 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 08:13:19 +0000
Subject: [PATCH 03/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 7282cba..4c2cf43 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,7 @@
 
 Name:		vxl	
 Version:	1.17.0	
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -248,6 +248,9 @@ ctest .
 
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 4ef49c0553ec3f8574e31501af8465a0ebd9217b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= <devrim@gunduz.org>
Date: Mon, 25 Aug 2014 15:47:05 +0300
Subject: [PATCH 04/74] - Rebuilt for libgeotiff

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 4c2cf43..fae9c2b 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,7 @@
 
 Name:		vxl	
 Version:	1.17.0	
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -248,6 +248,9 @@ ctest .
 
 
 %changelog
+* Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
+- Rebuilt for libgeotiff 
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From 1764c9386113fe369ef2a26aefe9035711c96c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Mon, 16 Feb 2015 05:47:14 +0100
Subject: [PATCH 05/74] Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS
 RHBZ#1192886).

- Fix bogus %changelog date.
---
 vxl-0.17.0-gcc5.diff | 13 +++++++++++++
 vxl.spec             | 11 ++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 vxl-0.17.0-gcc5.diff

diff --git a/vxl-0.17.0-gcc5.diff b/vxl-0.17.0-gcc5.diff
new file mode 100644
index 0000000..5fc0270
--- /dev/null
+++ b/vxl-0.17.0-gcc5.diff
@@ -0,0 +1,13 @@
+--- vxl-git4e07960/vcl/vcl_compiler.h~	2012-11-02 12:08:21.000000000 +0100
++++ vxl-git4e07960/vcl/vcl_compiler.h	2015-02-15 13:50:46.376329878 +0100
+@@ -119,6 +119,10 @@
+ #  else
+ #   define VCL_GCC_40
+ #  endif
++# elif (__GNUC__== 5)
++// pretend GCC 5 to be GCC 4
++#  define VCL_GCC_4
++#  define VCL_GCC_41
+ # else
+ #  error "Dunno about this gcc"
+ # endif
diff --git a/vxl.spec b/vxl.spec
index fae9c2b..f6deb42 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,6 @@
-
 Name:		vxl	
 Version:	1.17.0	
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -38,6 +37,7 @@ Patch24:	0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
 Patch25:	0025-Legacy-def1-r35963.patch
 Patch26:	0026-Legacy-def2-r36001.patch
 
+Patch50:        vxl-0.17.0-gcc5.diff
 
 Patch100:	%{name}-1.17.0-secondary.patch
 
@@ -154,6 +154,7 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch50 -p1
 %patch100 -p1 -b .secondary
 
 
@@ -248,6 +249,10 @@ ctest .
 
 
 %changelog
+* Mon Feb 16 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.17.0-16
+- Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
+- Fix bogus %%changelog date.
+
 * Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
 - Rebuilt for libgeotiff 
 
@@ -325,6 +330,6 @@ ctest .
 * Tue Mar 2 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-2%{?dist}
 - Applied patch from debian distribution to force the generation of versioned lib
 
-* Sat Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
+* Fri Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
 - Initial RPM Release
 

From 766b677f72b8ad13871ef9787f8bfa0bb47e916d Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 18 May 2015 15:48:47 -0600
Subject: [PATCH 06/74] Rebuilt using hardened build flags:
 https://fedoraproject.org/wiki/Changes/Harden_All_Packages

---
 vxl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index f6deb42..f93a4ab 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -202,7 +202,7 @@ find . -name "*.txx" | xargs chmod ugo-x
 	-DBUILD_TESTING:BOOL=OFF \
 	-DBUILD_DOCUMENTATION:BOOL=ON \
 	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
-	-DCMAKE_CXX_FLAGS:STRING="-fpermissive" \
+	-DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
 	-DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
 	-DVNL_CONFIG_LEGACY_METHODS=ON .
 
@@ -249,6 +249,9 @@ ctest .
 
 
 %changelog
+* Sat May 16 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 1.17.0-17
+- Rebuilt using hardened build flags: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+
 * Mon Feb 16 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.17.0-16
 - Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
 - Fix bogus %%changelog date.

From 5bbb34d5af064b86b5ec8cc68bbb71b515729541 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 02:11:21 +0000
Subject: [PATCH 07/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index f93a4ab..092bc0c 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -249,6 +249,9 @@ ctest .
 
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat May 16 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 1.17.0-17
 - Rebuilt using hardened build flags: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
 

From d4a522f78ff1b268de06b625782d9025f17afd72 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 02:52:18 +0000
Subject: [PATCH 08/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 092bc0c..f27a608 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -249,6 +249,9 @@ ctest .
 
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From c08ad8602996ab09f8b5bed4672352a3f1d03d68 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 26 Feb 2016 09:01:42 -0500
Subject: [PATCH 09/74] fix 1.17.0 build with gcc 6, remove non-free lena file

---
 .gitignore            |  1 +
 sources               |  2 +-
 vxl-1.17.0-gcc6.patch | 70 +++++++++++++++++++++++++++++++++++++++++++
 vxl.spec              | 15 ++++++++--
 4 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 vxl-1.17.0-gcc6.patch

diff --git a/.gitignore b/.gitignore
index c1125b0..f97538c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /vxl-1.17.0.tar.gz
+/vxl-1.17.0-clean.tar.gz
diff --git a/sources b/sources
index 2c4a8e4..90f5730 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09666d317aa8103178bee561e4f24502  vxl-1.17.0.tar.gz
+99b44265df5a638b7757135cb4f10166  vxl-1.17.0-clean.tar.gz
diff --git a/vxl-1.17.0-gcc6.patch b/vxl-1.17.0-gcc6.patch
new file mode 100644
index 0000000..e12330e
--- /dev/null
+++ b/vxl-1.17.0-gcc6.patch
@@ -0,0 +1,70 @@
+diff -up vxl-git4e07960/core/vnl/io/CMakeLists.txt.gcc6 vxl-git4e07960/core/vnl/io/CMakeLists.txt
+--- vxl-git4e07960/core/vnl/io/CMakeLists.txt.gcc6	2016-02-25 15:41:15.829447406 -0500
++++ vxl-git4e07960/core/vnl/io/CMakeLists.txt	2016-02-25 15:41:29.558366867 -0500
+@@ -22,7 +22,7 @@ AUX_SOURCE_DIRECTORY(Templates vnl_io_so
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+   SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vcl_vector+vnl_vector+double----.cxx
+                               PROPERTIES
+-                              COMPILE_FLAGS -ftemplate-depth-35)
++                              COMPILE_FLAGS -ftemplate-depth=70)
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+ ADD_LIBRARY(vnl_io ${vnl_io_sources} )
+diff -up vxl-git4e07960/core/vul/vul_psfile.h.gcc6 vxl-git4e07960/core/vul/vul_psfile.h
+--- vxl-git4e07960/core/vul/vul_psfile.h.gcc6	2012-11-02 07:08:21.000000000 -0400
++++ vxl-git4e07960/core/vul/vul_psfile.h	2016-02-25 15:27:18.435360448 -0500
+@@ -37,7 +37,7 @@ class vul_psfile: public vcl_ofstream
+ 
+   vul_psfile(char const* filename, bool debug_output=false);
+   ~vul_psfile();
+-  operator bool() { return (void*)output_filestream!=(void*)0; }
++  operator bool() { return reinterpret_cast<void*>(&output_filestream)!=(void*)0; }
+ 
+   void set_paper_type(vul_psfile::paper_type type){printer_paper_type = type;}
+   void set_paper_layout(vul_psfile::paper_layout layout) {printer_paper_layout = layout;}
+diff -up vxl-git4e07960/vcl/vcl_compiler.h.gcc6 vxl-git4e07960/vcl/vcl_compiler.h
+--- vxl-git4e07960/vcl/vcl_compiler.h.gcc6	2016-02-25 15:10:56.252121833 -0500
++++ vxl-git4e07960/vcl/vcl_compiler.h	2016-02-25 15:10:56.254121822 -0500
+@@ -119,8 +119,8 @@
+ #  else
+ #   define VCL_GCC_40
+ #  endif
+-# elif (__GNUC__== 5)
+-// pretend GCC 5 to be GCC 4
++# elif (__GNUC__>5)
++// pretend GCC 5+ to be GCC 4
+ #  define VCL_GCC_4
+ #  define VCL_GCC_41
+ # else
+diff -up vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx.gcc6 vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx
+--- vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx.gcc6	2016-02-25 16:34:20.892977826 -0500
++++ vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx	2016-02-25 17:23:52.435971926 -0500
+@@ -15,6 +15,12 @@
+ #include <vul/vul_string.h>
+ #include <vgl/vgl_point_2d.h>
+ 
++// not at all sure this is right, but it gets this past gcc 6.
++
++vcl_ostream& operator <<( vcl_ostream &a, vcl_ostream &b) {
++a << b;
++return a;
++}
+ 
+ //=========================================================================
+ // Static function to create a static logger when first required
+diff -up vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx.gcc6 vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx
+--- vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx.gcc6	2016-02-25 17:15:12.591046600 -0500
++++ vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx	2016-02-25 17:24:15.283836790 -0500
+@@ -19,6 +19,12 @@
+ #include <vgl/vgl_point_3d.h>
+ #include <vgl/vgl_box_3d.h>
+ 
++// not at all sure this is right, but it gets this past gcc 6.
++
++vcl_ostream& operator <<( vcl_ostream &a, vcl_ostream &b) {
++  a << b;
++  return a;
++}
+ 
+ //=========================================================================
+ // Static function to create a static logger when first required
diff --git a/vxl.spec b/vxl.spec
index f27a608..93fb920 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,11 +1,16 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	19%{?dist}
+Release:	20%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
 URL:		http://vxl.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/project/vxl/vxl/1.17/vxl-1.17.0.tar.gz
+# Need to remove the non-free lena image from the sources
+# tar xf vxl-1.17.0.tar.gz
+# rm -rf vxl-git4e07960/contrib/prip/vdtop/tests/lena.org.pgm 
+# tar cfz vxl-1.17.0-clean.tar.gz vxl-git4e07960/
+# Source0:	http://downloads.sourceforge.net/project/vxl/vxl/1.17/vxl-1.17.0.tar.gz
+Source0:	%{name}-%{version}-clean.tar.gz
 Source2:	https://vxl.svn.sourceforge.net/svnroot/vxl/trunk/core/vxl_copyright.h
 # Fedora has a distribution-specific include dir
 Patch1:		0001-Added-include-path-for-geotiff.patch
@@ -38,6 +43,7 @@ Patch25:	0025-Legacy-def1-r35963.patch
 Patch26:	0026-Legacy-def2-r36001.patch
 
 Patch50:        vxl-0.17.0-gcc5.diff
+Patch51:	vxl-1.17.0-gcc6.patch
 
 Patch100:	%{name}-1.17.0-secondary.patch
 
@@ -155,6 +161,7 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 %patch25 -p1
 %patch26 -p1
 %patch50 -p1
+%patch51 -p1 -b .gcc6
 %patch100 -p1 -b .secondary
 
 
@@ -249,6 +256,10 @@ ctest .
 
 
 %changelog
+* Thu Feb 25 2016 Tom Callaway <spot@fedoraproject.org> - 1.17.0-20
+- remove non-free lena image file from source tarball (bz1310388)
+- fix FTBFS (bz1303695, bz1308234)
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 72e999b5f81905f2336d07aecf4b5cec60aee94c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 17:13:32 +0000
Subject: [PATCH 10/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 93fb920..00b98a5 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	20%{?dist}
+Release:	21%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -256,6 +256,9 @@ ctest .
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Feb 25 2016 Tom Callaway <spot@fedoraproject.org> - 1.17.0-20
 - remove non-free lena image file from source tarball (bz1310388)
 - fix FTBFS (bz1303695, bz1308234)

From dbb9ca81d8843698112dc145f5278de6754875a1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 15 May 2017 19:50:12 +0000
Subject: [PATCH 11/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 00b98a5..9354198 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	21%{?dist}
+Release:	22%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -256,6 +256,9 @@ ctest .
 
 
 %changelog
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 41453c1628c0ca9a09ea618b879e40923de786db Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 21:27:44 +0000
Subject: [PATCH 12/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 9354198..4b7289e 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	22%{?dist}
+Release:	23%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -256,6 +256,9 @@ ctest .
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
 

From db7f163508b595c36decffc19b9612a28c57dd07 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 10:10:13 +0000
Subject: [PATCH 13/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 4b7289e..6c9aadc 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	23%{?dist}
+Release:	24%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -256,6 +256,9 @@ ctest .
 
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 08a2f81fa29b2993fe02232d8742c4d4c117f3b7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 20:42:37 +0000
Subject: [PATCH 14/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 6c9aadc..9ea75d4 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	24%{?dist}
+Release:	25%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -256,6 +256,9 @@ ctest .
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From 9b2b5100f055f44183a2b545233f5b8179fd7075 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 08:58:15 +0100
Subject: [PATCH 15/74] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 vxl.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index 9ea75d4..3b49666 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -228,9 +228,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %check
 ctest .
 

From 4dc19d06529b99f10327fce7e0301ed61ce87000 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 7 Mar 2018 20:57:45 -0800
Subject: [PATCH 16/74] Rebuild to fix GCC 8 mis-compilation

See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
---
 vxl.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 3b49666..197fa4b 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	25%{?dist}
+Release:	26%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -253,6 +253,10 @@ ctest .
 
 
 %changelog
+* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.17.0-26
+- Rebuild to fix GCC 8 mis-compilation
+  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 2c09aa039f7458af62dac32750abf2d182f15687 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Mon, 9 Jul 2018 19:06:53 +0200
Subject: [PATCH 17/74] add BuildRequires: gcc-c++,gcc

Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
---
 vxl.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vxl.spec b/vxl.spec
index 197fa4b..050d5a8 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -51,6 +51,8 @@ Patch100:	%{name}-1.17.0-secondary.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:	cmake 
 BuildRequires:	doxygen
 BuildRequires:	expat-devel

From 98e8128cfb507b23f65d5f8968c61f074bd08715 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 08:41:32 +0000
Subject: [PATCH 18/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 050d5a8..86e6ff4 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	26%{?dist}
+Release:	27%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -255,6 +255,9 @@ ctest .
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.17.0-26
 - Rebuild to fix GCC 8 mis-compilation
   See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")

From b9a8543028f8fb59bb916c1239991ff886328987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= <panovotn@redhat.com>
Date: Tue, 28 Aug 2018 11:39:35 +0200
Subject: [PATCH 19/74] Update dependency to minizip-compat(-devel)

Related: rhbz#1609830, rhbz#1615381
---
 vxl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index 86e6ff4..417500d 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	27%{?dist}
+Release:	28%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -73,7 +73,7 @@ BuildRequires:	libdc1394-devel
 %endif
 BuildRequires:	libgeotiff-devel
 BuildRequires:	libjpeg-turbo-devel
-BuildRequires:	minizip-devel
+BuildRequires:	minizip-compat-devel
 BuildRequires:	rply-devel
 BuildRequires:	SIMVoleon-devel
 BuildRequires:	shapelib-devel
@@ -255,6 +255,9 @@ ctest .
 
 
 %changelog
+* Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com> - 1.17.0-28
+- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 1a1692469ccb27ff31a9e2ac127521becb82c75a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:41:18 +0100
Subject: [PATCH 20/74] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 vxl.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index 417500d..f475d17 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -233,9 +233,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %check
 ctest .
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %doc core/vxl_copyright.h

From b75090409c5aa31c723ab46102419619be645eff Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:30 +0100
Subject: [PATCH 21/74] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 vxl.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index f475d17..32c1126 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,6 @@ Name:		vxl
 Version:	1.17.0	
 Release:	28%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
-Group:		Development/Libraries
 License:	BSD
 URL:		http://vxl.sourceforge.net/
 # Need to remove the non-free lena image from the sources
@@ -93,7 +92,6 @@ platforms.
 
 %package	doc
 Summary:	Documentation for VXL library
-Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 BuildArch:	noarch
 
@@ -104,7 +102,6 @@ have all the documentation
 
 %package	devel
 Summary:	Headers and development libraries for VXL
-Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel

From d7d547aca1a0a5b4638dd794dabad152366adc24 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 29 Jan 2019 05:36:39 +0100
Subject: [PATCH 22/74] Remove obsolete BuildRoot tag

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 vxl.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 32c1126..41e3714 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -48,7 +48,6 @@ Patch100:	%{name}-1.17.0-secondary.patch
 
 #KL is used in an "UNMAINTAINED_LIBRARY", vgel is only built on request
 
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++

From 3aa2a912aa235ae18aeb54f1e151bf6b90bff31f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 11:29:50 +0000
Subject: [PATCH 23/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 41e3714..a1ed549 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:		vxl	
 Version:	1.17.0	
-Release:	28%{?dist}
+Release:	29%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 License:	BSD
 URL:		http://vxl.sourceforge.net/
@@ -249,6 +249,9 @@ ctest .
 
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com> - 1.17.0-28
 - change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
 

From 7efbca912d3a07f8d5eb22569932913fcdef4655 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sun, 17 Feb 2019 12:26:39 +0000
Subject: [PATCH 24/74] Rebuild

---
 vxl.spec | 265 ++++++++++++++++++++++++-------------------------------
 1 file changed, 117 insertions(+), 148 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index a1ed549..634ea6c 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,107 +1,107 @@
-Name:		vxl	
-Version:	1.17.0	
-Release:	29%{?dist}
-Summary:	C++ Libraries for Computer Vision Research and Implementation
-License:	BSD
-URL:		http://vxl.sourceforge.net/
+Name:       vxl
+Version:    1.17.0
+Release:    30%{?dist}
+Summary:    C++ Libraries for Computer Vision Research and Implementation
+License:    BSD
+URL:        http://vxl.sourceforge.net/
 # Need to remove the non-free lena image from the sources
 # tar xf vxl-1.17.0.tar.gz
-# rm -rf vxl-git4e07960/contrib/prip/vdtop/tests/lena.org.pgm 
+# rm -rf vxl-git4e07960/contrib/prip/vdtop/tests/lena.org.pgm
 # tar cfz vxl-1.17.0-clean.tar.gz vxl-git4e07960/
-# Source0:	http://downloads.sourceforge.net/project/vxl/vxl/1.17/vxl-1.17.0.tar.gz
-Source0:	%{name}-%{version}-clean.tar.gz
-Source2:	https://vxl.svn.sourceforge.net/svnroot/vxl/trunk/core/vxl_copyright.h
+# Source0:  http://downloads.sourceforge.net/project/vxl/vxl/1.17/vxl-1.17.0.tar.gz
+Source0:    %{name}-%{version}-clean.tar.gz
+Source2:    https://vxl.svn.sourceforge.net/svnroot/vxl/trunk/core/vxl_copyright.h
 # Fedora has a distribution-specific include dir
-Patch1:		0001-Added-include-path-for-geotiff.patch
-Patch2:		0002-Added-soname-info-for-core-libraries.patch
+Patch1:     0001-Added-include-path-for-geotiff.patch
+Patch2:     0002-Added-soname-info-for-core-libraries.patch
 # Use system rply and don't use mpeg2
-Patch3:		0003-Use-system-rply.patch
-Patch4:		0004-Added-more-soname.patch
-Patch5:		0005-Do-not-build-OUL.patch
-Patch6:		0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
-Patch7:		0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
-Patch8:		0008-More-sonames.patch
-Patch9:		0009-Bumped-up-version-to-1.14.patch
+Patch3:     0003-Use-system-rply.patch
+Patch4:     0004-Added-more-soname.patch
+Patch5:     0005-Do-not-build-OUL.patch
+Patch6:     0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
+Patch7:     0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
+Patch8:     0008-More-sonames.patch
+Patch9:     0009-Bumped-up-version-to-1.14.patch
 #TODO: Refers to contrib and is therefore not correct
-Patch10:	0010-Use-system-FindEXPAT.patch
-Patch11:	0011-Do-not-use-bundled-minizip.patch
-Patch12:	0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
-Patch13:	0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
-Patch14:	0014-Added-additional-search-path-for-xerces-Submitted-by.patch
-Patch15:	0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
-Patch16:	0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
-Patch17:	0017-Add-sonames-to-vpgl-lib.patch
-Patch18:	0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
-Patch19:	0019-Removed-box2m-which-requires-OpenCL-libraries.patch
-Patch20:	0020-Included-missing-vcl_cstdio.h-header.patch
-Patch21:	0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
-Patch22:	0022-Include-missing-vcl_cstdio.h-header.patch
-Patch23:	0023-Remove-volm-because-of-error-in-function-prototype.patch
-Patch24:	0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
-Patch25:	0025-Legacy-def1-r35963.patch
-Patch26:	0026-Legacy-def2-r36001.patch
+Patch10:    0010-Use-system-FindEXPAT.patch
+Patch11:    0011-Do-not-use-bundled-minizip.patch
+Patch12:    0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
+Patch13:    0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
+Patch14:    0014-Added-additional-search-path-for-xerces-Submitted-by.patch
+Patch15:    0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
+Patch16:    0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
+Patch17:    0017-Add-sonames-to-vpgl-lib.patch
+Patch18:    0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
+Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
+Patch20:    0020-Included-missing-vcl_cstdio.h-header.patch
+Patch21:    0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
+Patch22:    0022-Include-missing-vcl_cstdio.h-header.patch
+Patch23:    0023-Remove-volm-because-of-error-in-function-prototype.patch
+Patch24:    0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
+Patch25:    0025-Legacy-def1-r35963.patch
+Patch26:    0026-Legacy-def2-r36001.patch
 
-Patch50:        vxl-0.17.0-gcc5.diff
-Patch51:	vxl-1.17.0-gcc6.patch
+Patch50:    vxl-0.17.0-gcc5.diff
+Patch51:    vxl-1.17.0-gcc6.patch
 
-Patch100:	%{name}-1.17.0-secondary.patch
+Patch100:   %{name}-1.17.0-secondary.patch
 
 #KL is used in an "UNMAINTAINED_LIBRARY", vgel is only built on request
 
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:	cmake 
-BuildRequires:	doxygen
-BuildRequires:	expat-devel
-BuildRequires:	Coin2-devel
-BuildRequires:	dcmtk-devel
-BuildRequires:	doxygen
-BuildRequires:	expat-devel
-BuildRequires:	expatpp-devel
-BuildRequires:	freeglut-devel
-BuildRequires:	klt-devel
-BuildRequires:	libpng-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libXmu-devel 
-BuildRequires:	libXi-devel
-BuildRequires:	libjpeg-devel
+BuildRequires:  cmake
+BuildRequires:  doxygen
+BuildRequires:  expat-devel
+BuildRequires:  Coin2-devel
+BuildRequires:  dcmtk-devel
+BuildRequires:  doxygen
+BuildRequires:  expat-devel
+BuildRequires:  expatpp-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  klt-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXi-devel
+BuildRequires:  libjpeg-devel
 %ifnarch s390 s390x
-BuildRequires:	libdc1394-devel
+BuildRequires:  libdc1394-devel
 %endif
-BuildRequires:	libgeotiff-devel
-BuildRequires:	libjpeg-turbo-devel
-BuildRequires:	minizip-compat-devel
-BuildRequires:	rply-devel
-BuildRequires:	SIMVoleon-devel
-BuildRequires:	shapelib-devel
-BuildRequires:	texi2html
-BuildRequires:	xerces-c-devel
-BuildRequires:	zlib-devel
+BuildRequires:  libgeotiff-devel
+BuildRequires:  libjpeg-turbo-devel
+BuildRequires:  minizip-compat-devel
+BuildRequires:  rply-devel
+BuildRequires:  SIMVoleon-devel
+BuildRequires:  shapelib-devel
+BuildRequires:  texi2html
+BuildRequires:  xerces-c-devel
+BuildRequires:  zlib-devel
 
 #GUI needs wx, a desktop file and an icon
 
 %description
 VXL (the Vision-something-Libraries) is a collection of C++ libraries designed
 for computer vision research and implementation. It was created from TargetJr
-and the IUE with the aim of making a light, fast and consistent system. 
+and the IUE with the aim of making a light, fast and consistent system.
 VXL is written in ANSI/ISO C++ and is designed to be portable over many
 platforms.
 
 
-%package	doc
-Summary:	Documentation for VXL library
-Requires:	%{name} = %{version}-%{release}
-BuildArch:	noarch
+%package    doc
+Summary:    Documentation for VXL library
+Requires:   %{name} = %{version}-%{release}
+BuildArch:  noarch
 
 %description doc
 
 You should install this package if you would like to
 have all the documentation
 
-%package	devel
-Summary:	Headers and development libraries for VXL
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+%package    devel
+Summary:    Headers and development libraries for VXL
+Requires:   %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 
@@ -109,7 +109,7 @@ You should install this package if you would like to
 develop code based on VXL.
 
 %prep
-%setup -q -n vxl-git4e07960
+%autosetup -n vxl-git4e07960 -S patch -p1
 
 cp %{SOURCE2} .
 
@@ -118,7 +118,7 @@ cp %{SOURCE2} .
 # QV is a Silicon Graphics' VRML parser from the 90s. Now unmantained.
 for l in jpeg png zlib tiff geotiff rply dcmtk bzlib
 do
-	find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm {} +
+    find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 done
 
 find contrib/brl/b3p/shapelib -type f ! -name 'CMakeLists.txt' -execdir rm {} +
@@ -132,37 +132,6 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 #TODO: Various
 #vxl-devel.x86_64: E: invalid-soname /usr/lib64/libvvid.so libvvid.so
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch50 -p1
-%patch51 -p1 -b .gcc6
-%patch100 -p1 -b .secondary
-
-
 #Fix lib / lib64 problem during install:
 find . -name CMakeLists.txt -exec sed -i "s/INSTALL_TARGETS([ ]*\/lib/INSTALL_TARGETS(\/lib\$\{LIB_SUFFIX\}/;" {} +
 
@@ -173,43 +142,43 @@ find . -name "*.txx" | xargs chmod ugo-x
 
 %build
 %cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DBUILD_SHARED_LIBS:BOOL=ON \
-	-DVXL_FORCE_B3P_EXPAT:BOOL=OFF \
-	-DVXL_FORCE_V3P_DCMTK:BOOL=OFF \
-	-DVXL_FORCE_V3P_GEOTIFF:BOOL=OFF \
-	-DVXL_USING_NATIVE_KL=ON \
-	-DVXL_FORCE_V3P_JPEG:BOOL=OFF \
-	-DVXL_FORCE_V3P_MPEG2:BOOL=OFF \
-	-DVXL_FORCE_V3P_PNG:BOOL=OFF \
-	-DVXL_FORCE_V3P_TIFF:BOOL=OFF \
-	-DVXL_FORCE_V3P_ZLIB:BOOL=OFF \
-	-DVXL_FORCE_V3P_RPLY:BOOL=OFF \
-	-DVXL_USING_NATIVE_ZLIB=ON \
-	-DVXL_USING_NATIVE_JPEG=ON \
-	-DVXL_USING_NATIVE_PNG=ON \
-	-DVXL_USING_NATIVE_TIFF=ON \
-	-DVXL_USING_NATIVE_GEOTIFF=ON \
-	-DVXL_USING_NATIVE_EXPAT=ON \
-	-DVXL_USING_NATIVE_SHAPELIB=ON \
-	-DVXL_USING_NATIVE_BZLIB2=ON \
-	-DBUILD_VGUI=OFF \
-	-DBUILD_BGUI3D=OFF \
-	-DBUILD_OXL:BOOL=ON \
-	-DBUILD_BRL=OFF \
-	-DBUILD_CORE_GEOMETRY:BOOL=ON \
-	-DBUILD_CORE_IMAGING:BOOL=ON \
-	-DBUILD_CORE_NUMERICS:BOOL=ON \
-	-DBUILD_CORE_PROBABILITY:BOOL=ON \
-	-DBUILD_CORE_SERIALISATION:BOOL=ON \
-	-DBUILD_CORE_UTILITIES:BOOL=ON \
-	-DBUILD_CORE_VIDEO:BOOL=ON \
-	-DBUILD_EXAMPLES:BOOL=OFF \
-	-DBUILD_TESTING:BOOL=OFF \
-	-DBUILD_DOCUMENTATION:BOOL=ON \
-	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
-	-DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
-	-DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
-	-DVNL_CONFIG_LEGACY_METHODS=ON .
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DVXL_FORCE_B3P_EXPAT:BOOL=OFF \
+    -DVXL_FORCE_V3P_DCMTK:BOOL=OFF \
+    -DVXL_FORCE_V3P_GEOTIFF:BOOL=OFF \
+    -DVXL_USING_NATIVE_KL=ON \
+    -DVXL_FORCE_V3P_JPEG:BOOL=OFF \
+    -DVXL_FORCE_V3P_MPEG2:BOOL=OFF \
+    -DVXL_FORCE_V3P_PNG:BOOL=OFF \
+    -DVXL_FORCE_V3P_TIFF:BOOL=OFF \
+    -DVXL_FORCE_V3P_ZLIB:BOOL=OFF \
+    -DVXL_FORCE_V3P_RPLY:BOOL=OFF \
+    -DVXL_USING_NATIVE_ZLIB=ON \
+    -DVXL_USING_NATIVE_JPEG=ON \
+    -DVXL_USING_NATIVE_PNG=ON \
+    -DVXL_USING_NATIVE_TIFF=ON \
+    -DVXL_USING_NATIVE_GEOTIFF=ON \
+    -DVXL_USING_NATIVE_EXPAT=ON \
+    -DVXL_USING_NATIVE_SHAPELIB=ON \
+    -DVXL_USING_NATIVE_BZLIB2=ON \
+    -DBUILD_VGUI=OFF \
+    -DBUILD_BGUI3D=OFF \
+    -DBUILD_OXL:BOOL=ON \
+    -DBUILD_BRL=OFF \
+    -DBUILD_CORE_GEOMETRY:BOOL=ON \
+    -DBUILD_CORE_IMAGING:BOOL=ON \
+    -DBUILD_CORE_NUMERICS:BOOL=ON \
+    -DBUILD_CORE_PROBABILITY:BOOL=ON \
+    -DBUILD_CORE_SERIALISATION:BOOL=ON \
+    -DBUILD_CORE_UTILITIES:BOOL=ON \
+    -DBUILD_CORE_VIDEO:BOOL=ON \
+    -DBUILD_EXAMPLES:BOOL=OFF \
+    -DBUILD_TESTING:BOOL=OFF \
+    -DBUILD_DOCUMENTATION:BOOL=ON \
+    -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
+    -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
+    -DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
+    -DVNL_CONFIG_LEGACY_METHODS=ON .
 
 # Why is expat stated, but not shapelib?
 # DCMDK Cmake -- Included in bundle, but why?
@@ -235,7 +204,7 @@ ctest .
 %doc core/vxl_copyright.h
 %{_libdir}/*.so.*
 %{_bindir}/*
-#%{_datadir}/%{name}/
+#%%{_datadir}/%%{name}/
 
 %files devel
 %{_datadir}/%{name}
@@ -245,10 +214,11 @@ ctest .
 %files doc
 %doc %{_docdir}/*
 
-
-
-
 %changelog
+* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.17.0-30
+- Use autosetup macro
+- Remove whitespaces, use space instead of tabs for cleanliness
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -295,7 +265,7 @@ ctest .
 - Fix bogus %%changelog date.
 
 * Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
-- Rebuilt for libgeotiff 
+- Rebuilt for libgeotiff
 
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -337,7 +307,6 @@ ctest .
 
 * Sun Oct 14 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-3%{?dist}
 - More fixes from Volker's post https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
-- 
 
 * Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-2%{?dist}
 - Added patches 12-16 from https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42

From 2566942a3bd746deb6afe2fb3a3842c211dcd5e1 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 9 Mar 2019 16:36:00 +0100
Subject: [PATCH 25/74] Rebuild for dcmtk-3.6.4

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 634ea6c..b1504c1 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    1.17.0
-Release:    30%{?dist}
+Release:    31%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        http://vxl.sourceforge.net/
@@ -215,6 +215,9 @@ ctest .
 %doc %{_docdir}/*
 
 %changelog
+* Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
+- Rebuild for dcmtk-3.6.4
+
 * Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.17.0-30
 - Use autosetup macro
 - Remove whitespaces, use space instead of tabs for cleanliness

From ea6f50391eea57fdd86ef2f4ded2f08338daac99 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 18 Apr 2019 18:34:01 +0100
Subject: [PATCH 26/74] Spec bump, bundle dcmtk

---
 .gitignore |  1 +
 sources    |  2 +-
 vxl.spec   | 36 +++++++++++++++++++++++-------------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index f97538c..5d40acb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /vxl-1.17.0.tar.gz
 /vxl-1.17.0-clean.tar.gz
+/vxl-2.0.2-clean.tar.gz
diff --git a/sources b/sources
index 90f5730..09701af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99b44265df5a638b7757135cb4f10166  vxl-1.17.0-clean.tar.gz
+SHA512 (vxl-2.0.2-clean.tar.gz) = d8cad8ca6851641bb4c3398b8bf5e3df45a7414fd736acf8e75b79bdd5d18ec3aae4edac5b4c66d98fc499f411a25a443f046859a3544e45228f468052ec79ee
diff --git a/vxl.spec b/vxl.spec
index b1504c1..c8c5f82 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,16 +1,15 @@
 Name:       vxl
-Version:    1.17.0
-Release:    31%{?dist}
+Version:    2.0.2
+Release:    1%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
-URL:        http://vxl.sourceforge.net/
+URL:        https://vxl.github.io/
 # Need to remove the non-free lena image from the sources
-# tar xf vxl-1.17.0.tar.gz
-# rm -rf vxl-git4e07960/contrib/prip/vdtop/tests/lena.org.pgm
-# tar cfz vxl-1.17.0-clean.tar.gz vxl-git4e07960/
-# Source0:  http://downloads.sourceforge.net/project/vxl/vxl/1.17/vxl-1.17.0.tar.gz
+# tar xf vxl-%{version}.tar.gz
+# rm -rf vxl-%{version}/contrib/prip/vdtop/tests/lena.org.pgm
+# tar cfz vxl-%{version}-clean.tar.gz vxl-%{version}/
+# Source0:  https://github.com/vxl/vxl/archive/v%{version}/%{name}-%{version}.tar.gz
 Source0:    %{name}-%{version}-clean.tar.gz
-Source2:    https://vxl.svn.sourceforge.net/svnroot/vxl/trunk/core/vxl_copyright.h
 # Fedora has a distribution-specific include dir
 Patch1:     0001-Added-include-path-for-geotiff.patch
 Patch2:     0002-Added-soname-info-for-core-libraries.patch
@@ -55,7 +54,9 @@ BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  Coin2-devel
-BuildRequires:  dcmtk-devel
+# Use bundled dcmtk until upstream updates their code to use newer dcmtk
+# https://github.com/vxl/vxl/issues/550
+# BuildRequires:  dcmtk-devel
 BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  expatpp-devel
@@ -109,14 +110,18 @@ You should install this package if you would like to
 develop code based on VXL.
 
 %prep
-%autosetup -n vxl-git4e07960 -S patch -p1
-
-cp %{SOURCE2} .
+%autosetup -S patch -p1
 
 #Remove bundled library (let's use FEDORA's ones)
 # v3p/netlib (made by f2c) dependency not removed because of heavily modifications
 # QV is a Silicon Graphics' VRML parser from the 90s. Now unmantained.
-for l in jpeg png zlib tiff geotiff rply dcmtk bzlib
+
+# For the time being, use bundled dcmtk. It does not build with newer dcmtk.
+# Issue filed here:
+# https://github.com/vxl/vxl/issues/550
+# for l in jpeg png zlib tiff geotiff rply dcmtk bzlib
+
+for l in jpeg png zlib tiff geotiff rply bzlib
 do
     find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 done
@@ -215,6 +220,11 @@ ctest .
 %doc %{_docdir}/*
 
 %changelog
+* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
+- Update to latest upstream release
+- Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)
+- Use new github upstream
+
 * Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
 - Rebuild for dcmtk-3.6.4
 

From 2efb9d728de3876dd56dbd02222ea59b27fab69c Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Fri, 19 Apr 2019 00:07:30 +0100
Subject: [PATCH 27/74] WIP: not yet ready for build

---
 0001-Added-include-path-for-geotiff.patch     |   26 -
 0001-v2.0.2-unbundle-rply.patch               | 3626 +++++++++++++++++
 ...Added-soname-info-for-core-libraries.patch |  117 -
 0002-v2.0.2-Use-Fedora-FindEXPAT.patch        |  469 +++
 0003-Use-system-rply.patch                    |   71 -
 0003-v2.0.2-Use-Fedora-minizip.patch          |   28 +
 0004-Added-more-soname.patch                  |   53 -
 0004-Version-shared-objects.patch             |  258 ++
 0004-v2.0.2-Correct-dcmtk-includes.patch      |   65 +
 0008-More-sonames.patch                       |  819 ----
 0009-Bumped-up-version-to-1.14.patch          |   26 -
 0011-Do-not-use-bundled-minizip.patch         |   30 -
 0017-Add-sonames-to-vpgl-lib.patch            |   77 -
 ...ed-sonames-to-vgui-vidl-vpdl-Qv-libs.patch |   64 -
 ...d-missing-sonames-for-mvl2-and-vepl1.patch |   37 -
 vxl-0.17.0-gcc5.diff                          |   13 -
 vxl-1.17.0-gcc6.patch                         |   70 -
 vxl.spec                                      |  219 +-
 vxl_copyright.h                               |   37 -
 19 files changed, 4601 insertions(+), 1504 deletions(-)
 delete mode 100644 0001-Added-include-path-for-geotiff.patch
 create mode 100644 0001-v2.0.2-unbundle-rply.patch
 delete mode 100644 0002-Added-soname-info-for-core-libraries.patch
 create mode 100644 0002-v2.0.2-Use-Fedora-FindEXPAT.patch
 delete mode 100644 0003-Use-system-rply.patch
 create mode 100644 0003-v2.0.2-Use-Fedora-minizip.patch
 delete mode 100644 0004-Added-more-soname.patch
 create mode 100644 0004-Version-shared-objects.patch
 create mode 100644 0004-v2.0.2-Correct-dcmtk-includes.patch
 delete mode 100644 0008-More-sonames.patch
 delete mode 100644 0009-Bumped-up-version-to-1.14.patch
 delete mode 100644 0011-Do-not-use-bundled-minizip.patch
 delete mode 100644 0017-Add-sonames-to-vpgl-lib.patch
 delete mode 100644 0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
 delete mode 100644 0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
 delete mode 100644 vxl-0.17.0-gcc5.diff
 delete mode 100644 vxl-1.17.0-gcc6.patch
 delete mode 100644 vxl_copyright.h

diff --git a/0001-Added-include-path-for-geotiff.patch b/0001-Added-include-path-for-geotiff.patch
deleted file mode 100644
index 20ea0f4..0000000
--- a/0001-Added-include-path-for-geotiff.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ac852c19102585381f1762251716e62ebc86c0f7 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:09:48 +0200
-Subject: [PATCH 01/23] Added include path for geotiff
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- config/cmake/Modules/NewCMake/FindGEOTIFF.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake b/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake
-index 9e5013f..624e331 100644
---- a/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake
-+++ b/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake
-@@ -8,6 +8,8 @@
- #  GEOTIFF_LIBRARY, where to find the GEOTIFF library.
- 
- FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h
-+  /usr/local/include/libgeotiff
-+  /usr/include/libgeotiff
-   /usr/local/include
-   /usr/include
- )
--- 
-1.7.11.7
-
diff --git a/0001-v2.0.2-unbundle-rply.patch b/0001-v2.0.2-unbundle-rply.patch
new file mode 100644
index 0000000..dc93658
--- /dev/null
+++ b/0001-v2.0.2-unbundle-rply.patch
@@ -0,0 +1,3626 @@
+From 03d46e9ecaae8e18c892aecded6f918f6407344d Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 14:15:02 +0000
+Subject: [PATCH 1/4] v2.0.2: unbundle rply
+
+---
+ contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
+ contrib/brl/bseg/boxm/algo/CMakeLists.txt     |    3 +-
+ contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |    6 +-
+ .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |    6 +-
+ v3p/CMakeLists.txt                            |    1 -
+ v3p/rply/CMakeLists.txt                       |    9 -
+ v3p/rply/LICENSE                              |   20 -
+ v3p/rply/etc/convert.c                        |  136 --
+ v3p/rply/etc/dump.c                           |   44 -
+ v3p/rply/etc/input.ply                        |   16 -
+ v3p/rply/etc/sconvert.c                       |   66 -
+ v3p/rply/manual/manual.html                   |  993 -----------
+ v3p/rply/manual/reference.css                 |   54 -
+ v3p/rply/manual/rply.png                      |  Bin 6232 -> 0 bytes
+ v3p/rply/readme.txt                           |   24 -
+ v3p/rply/rply.c                               | 1570 -----------------
+ v3p/rply/rply.h                               |  367 ----
+ 17 files changed, 13 insertions(+), 3307 deletions(-)
+ delete mode 100644 v3p/rply/CMakeLists.txt
+ delete mode 100644 v3p/rply/LICENSE
+ delete mode 100644 v3p/rply/etc/convert.c
+ delete mode 100644 v3p/rply/etc/dump.c
+ delete mode 100644 v3p/rply/etc/input.ply
+ delete mode 100644 v3p/rply/etc/sconvert.c
+ delete mode 100644 v3p/rply/manual/manual.html
+ delete mode 100644 v3p/rply/manual/reference.css
+ delete mode 100644 v3p/rply/manual/rply.png
+ delete mode 100644 v3p/rply/readme.txt
+ delete mode 100644 v3p/rply/rply.c
+ delete mode 100644 v3p/rply/rply.h
+
+diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab4561a7f3b8 100644
+--- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
++++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+@@ -1,8 +1,9 @@
+ # This is bbas/bmsh3d/algo/CMakeLists.txt
+ # Brown 3D Mesh Algorithm Library
++FIND_PACKAGE(rply REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR} )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++include_directories( ${RPLY_INCLUDE_DIR} )
+ 
+ set( bmsh3d_algo_sources
+   bmsh3d_fileio.cxx           bmsh3d_fileio.h
+@@ -13,7 +14,7 @@ set( bmsh3d_algo_sources
+ )
+ 
+ vxl_add_library(LIBRARY_NAME bmsh3d_algo LIBRARY_SOURCES  ${bmsh3d_algo_sources})
+-target_link_libraries( bmsh3d_algo bmsh3d rply ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
++target_link_libraries( bmsh3d_algo bmsh3d ${RPLY_LIBRARY} ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b8782402d18f64d 100644
+--- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # brl/bseg/boxm/algo/CMakeLists.txt
++FIND_PACKAGE(rply REQUIRED)
+ include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++include_directories( ${RPLY_INCLUDE_DIR} )
+ set(boxm_algo_sources
+     boxm_compute_scene_statistics.h
+     boxm_crop_scene.h
+diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
+index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae8a69ffc0 100644
+--- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
+@@ -1,12 +1,14 @@
++FIND_PACKAGE(rply REQUIRED)
++
+ include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++include_directories( ${RPLY_INCLUDE_DIR} )
+ set(boxm2_cpp_sources
+ 
+    )
+ aux_source_directory(Templates boxm2_cpp_sources)
+ vxl_add_library(LIBRARY_NAME boxm2_cpp LIBRARY_SOURCES  ${boxm2_cpp_sources})
+ 
+-target_link_libraries(boxm2_cpp boxm2 boxm2_basic boxm2_io boct brdb ${VXL_LIB_PREFIX}vbl_io expatpp ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl rply)
++target_link_libraries(boxm2_cpp boxm2 boxm2_basic boxm2_io boct brdb ${VXL_LIB_PREFIX}vbl_io expatpp ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl ${RPLY_LIBRARY} )
+ 
+ # cpp process APIs.
+ add_subdirectory(pro)
+diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb89539df76a93 100644
+--- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+@@ -1,6 +1,8 @@
++FIND_PACKAGE(rply REQUIRED)
++
+ include_directories( ${BRL_INCLUDE_DIR}/bseg )
+ include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply)
++include_directories( ${RPLY_INCLUDE_DIR} )
+ 
+ set(boxm2_cpp_algo_sources
+     boxm2_cast_ray_function.h
+@@ -57,7 +59,7 @@ set(boxm2_cpp_algo_sources
+ aux_source_directory(Templates boxm2_cpp_algo_sources)
+ 
+ vxl_add_library(LIBRARY_NAME boxm2_cpp_algo LIBRARY_SOURCES  ${boxm2_cpp_algo_sources})
+-target_link_libraries(boxm2_cpp_algo boxm2_cpp brad boct brdb expatpp ${VXL_LIB_PREFIX}vpgl bvgl imesh imesh_algo bsta_algo bsta ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl bvpl rply)
++target_link_libraries(boxm2_cpp_algo boxm2_cpp brad boct brdb expatpp ${VXL_LIB_PREFIX}vpgl bvgl imesh imesh_algo bsta_algo bsta ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl bvpl ${RPLY_LIBRARY} )
+ 
+ if(BUILD_TESTING)
+   add_subdirectory(tests)
+diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
+index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f906345b98 100644
+--- a/v3p/CMakeLists.txt
++++ b/v3p/CMakeLists.txt
+@@ -60,5 +60,4 @@ if(VXL_BUILD_CORE_IMAGING)
+   add_subdirectory(png)
+   add_subdirectory(dcmtk)
+   add_subdirectory(openjpeg2)
+-  add_subdirectory(rply)
+ endif()
+diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
+deleted file mode 100644
+index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..0000000000000000000000000000000000000000
+--- a/v3p/rply/CMakeLists.txt
++++ /dev/null
+@@ -1,9 +0,0 @@
+-# This is /v3p/rply/CMakeLists.txt
+-# library for reading and writing .PLY file
+-
+-set(rply_sources
+-  rply.h
+-  rply.c
+-  )
+-
+-vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources})
+diff --git a/v3p/rply/LICENSE b/v3p/rply/LICENSE
+deleted file mode 100644
+index 02e7c5f385b5ca8c7e9df071455f3956122e9380..0000000000000000000000000000000000000000
+--- a/v3p/rply/LICENSE
++++ /dev/null
+@@ -1,20 +0,0 @@
+-RPly 1.01 license
+-Copyright � 2003-2005 Diego Nehab.
+-
+-Permission is hereby granted, free of charge, to any person obtaining a
+-copy of this software and associated documentation files (the "Software"),
+-to deal in the Software without restriction, including without limitation
+-the rights to use, copy, modify, merge, publish, distribute, sublicense,
+-and/or sell copies of the Software, and to permit persons to whom the
+-Software is furnished to do so, subject to the following conditions:
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+-DEALINGS IN THE SOFTWARE.
+diff --git a/v3p/rply/etc/convert.c b/v3p/rply/etc/convert.c
+deleted file mode 100644
+index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..0000000000000000000000000000000000000000
+--- a/v3p/rply/etc/convert.c
++++ /dev/null
+@@ -1,136 +0,0 @@
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdarg.h>
+-#include "rply.h"
+-
+-/* internal function prototypes */
+-static void error(const char *fmt, ...);
+-static void help(void);
+-static void parse_arguments(int argc, char **argv,
+-        e_ply_storage_mode *storage_mode,
+-        const char **iname, const char **oname);
+-static void setup_callbacks(p_ply iply, p_ply oply);
+-
+-/* given a format mode, an input file name and an output file name,
+- * convert input file to output in given format mode */
+-int main(int argc, char **argv)
+-{
+-    const char *value = NULL;
+-    e_ply_storage_mode storage_mode = PLY_LITTLE_ENDIAN;
+-    const char *iname = NULL, *oname = NULL;
+-    p_ply iply = NULL, oply = NULL;
+-    /* parse command line arguments */
+-    parse_arguments(argc, argv, &storage_mode, &iname, &oname);
+-    /* open input file and make sure we parsed its header */
+-    iply = ply_open(iname, NULL);
+-    if (!iply) error("Unable to open file '%s'", iname);
+-    if (!ply_read_header(iply)) error("Failed reading '%s' header", iname);
+-    /* create output file */
+-    oply = ply_create(oname, storage_mode, NULL);
+-    if (!oply) error("Unable to create file '%s'", oname);
+-    /* create elements and properties in output file and
+-     * setup callbacks for them in input file */
+-    setup_callbacks(iply, oply);
+-    /* pass comments and obj_infos from input to output */
+-    value = NULL;
+-    while ((value = ply_get_next_comment(iply, value)))
+-        if (!ply_add_comment(oply, value))
+-            error("Failed adding comments");
+-    value = NULL;
+-    while ((value = ply_get_next_obj_info(iply, value)))
+-        if (!ply_add_obj_info(oply, value))
+-            error("Failed adding comments");
+-    /* write output header */
+-    if (!ply_write_header(oply)) error("Failed writing '%s' header", oname);
+-    /* read input file generating callbacks that pass data to output file */
+-    if (!ply_read(iply)) error("Conversion failed");
+-    /* close up, we are done */
+-    if (!ply_close(iply)) error("Error closing file '%s'", iname);
+-    if (!ply_close(oply)) error("Error closing file '%s'", oname);
+-    return 0;
+-}
+-
+-/* prints an error message and exits */
+-static void error(const char *fmt, ...)
+-{
+-    va_list ap;
+-    va_start(ap, fmt);
+-    vfprintf(stderr, fmt, ap);
+-    va_end(ap);
+-    fprintf(stderr, "\n");
+-    exit(1);
+-}
+-
+-/* prints the help message and exits */
+-static void help(void)
+-{
+-    error("Usage:\n"
+-            "    convert <option> <input> <output>\n"
+-            "Options:\n"
+-            "    -a, --ascii: convert to ascii format\n"
+-            "    -b, --big-endian: convert to big-endian format\n"
+-            "    -l, --little-endian: convert to little-endian format\n");
+-}
+-
+-/* parse command line parameters */
+-static void parse_arguments(int argc, char **argv,
+-        e_ply_storage_mode *storage_mode,
+-        const char **iname, const char **oname)
+-{
+-    if (argc < 4) help();
+-    if (strcmp(argv[1], "--ascii") == 0 ||
+-            strcmp(argv[1], "-a") == 0)
+-        *storage_mode = PLY_ASCII;
+-    else if (strcmp(argv[1], "--little-endian") == 0 ||
+-            strcmp(argv[1], "-l") == 0)
+-        *storage_mode = PLY_LITTLE_ENDIAN;
+-    else if (strcmp(argv[1], "--big-endian") == 0 ||
+-            strcmp(argv[1], "-b") == 0)
+-        *storage_mode = PLY_BIG_ENDIAN;
+-    else help();
+-    *iname = argv[2];
+-    *oname = argv[3];
+-}
+-
+-/* read callback */
+-static int callback(p_ply_argument argument)
+-{
+-    void *pdata;
+-    /* just pass the value from the input file to the output file */
+-    ply_get_argument_user_data(argument, &pdata, NULL);
+-    ply_write((p_ply) pdata, ply_get_argument_value(argument));
+-    return 1;
+-}
+-
+-/* prepares the conversion */
+-static void setup_callbacks(p_ply iply, p_ply oply)
+-{
+-    p_ply_element element = NULL;
+-    /* iterate over all elements in input file */
+-    while ((element = ply_get_next_element(iply, element))) {
+-        p_ply_property property = NULL;
+-        long ninstances = 0;
+-        const char *element_name;
+-        ply_get_element_info(element, &element_name, &ninstances);
+-        /* add this element to output file */
+-        if (!ply_add_element(oply, element_name, ninstances))
+-            error("Unable to add output element '%s'", element_name);
+-        /* iterate over all properties of current element */
+-        while ((property = ply_get_next_property(element, property))) {
+-            const char *property_name;
+-            e_ply_type type, length_type, value_type;
+-            ply_get_property_info(property, &property_name, &type,
+-                    &length_type, &value_type);
+-            /* setup input callback for this property */
+-            if (!ply_set_read_cb(iply, element_name, property_name, callback,
+-                    oply, 0))
+-                error("Unable to setup input callback for property '%s'",
+-                        property_name);
+-            /* add this property to output file */
+-            if (!ply_add_property(oply, property_name, type, length_type,
+-                    value_type))
+-                error("Unable to add output property '%s'", property_name);
+-        }
+-    }
+-}
+diff --git a/v3p/rply/etc/dump.c b/v3p/rply/etc/dump.c
+deleted file mode 100644
+index 7ae2341cf14962953aeefed659f560e1c486cf40..0000000000000000000000000000000000000000
+--- a/v3p/rply/etc/dump.c
++++ /dev/null
+@@ -1,44 +0,0 @@
+-#include <stdio.h>
+-#include "rply.h"
+-
+-static int vertex_cb(p_ply_argument argument) {
+-    long eol;
+-    ply_get_argument_user_data(argument, NULL, &eol);
+-    printf("%g", ply_get_argument_value(argument));
+-    if (eol) printf("\n");
+-    else printf(" ");
+-    return 1;
+-}
+-
+-static int face_cb(p_ply_argument argument) {
+-    long length, value_index;
+-    ply_get_argument_property(argument, NULL, &length, &value_index);
+-    switch (value_index) {
+-        case 0:
+-        case 1:
+-            printf("%g ", ply_get_argument_value(argument));
+-            break;
+-        case 2:
+-            printf("%g\n", ply_get_argument_value(argument));
+-            break;
+-        default:
+-            break;
+-    }
+-    return 1;
+-}
+-
+-int main(void) {
+-    long nvertices, ntriangles;
+-    p_ply ply = ply_open("input.ply", NULL);
+-    if (!ply) return 1;
+-    if (!ply_read_header(ply)) return 1;
+-    nvertices = ply_set_read_cb(ply, "vertex", "x", vertex_cb, NULL, 0);
+-    ply_set_read_cb(ply, "vertex", "y", vertex_cb, NULL, 0);
+-    ply_set_read_cb(ply, "vertex", "z", vertex_cb, NULL, 1);
+-    ntriangles = ply_set_read_cb(ply, "face", "vertex_indices", face_cb, NULL, 0);
+-    printf("%ld\n%ld\n", nvertices, ntriangles);
+-    if (!ply_read(ply)) return 1;
+-    ply_close(ply);
+-    return 0;
+-}
+-
+diff --git a/v3p/rply/etc/input.ply b/v3p/rply/etc/input.ply
+deleted file mode 100644
+index 87ba8546d03d8349b773d4a155429853c7591412..0000000000000000000000000000000000000000
+--- a/v3p/rply/etc/input.ply
++++ /dev/null
+@@ -1,16 +0,0 @@
+-ply
+-format ascii 1.0
+-comment this is our first comment
+-element vertex 3
+-property float x
+-property float y
+-property float z
+-element face 1
+-property list uchar int vertex_indices
+-comment this is our last comment
+-end_header
+--1 0 0 
+-000 1 0 
+-1 0000 0
+-3 1 00000 2
+-3 1 0 2
+diff --git a/v3p/rply/etc/sconvert.c b/v3p/rply/etc/sconvert.c
+deleted file mode 100644
+index 97209e9b495bbea97c8043298460bce0d4c95197..0000000000000000000000000000000000000000
+--- a/v3p/rply/etc/sconvert.c
++++ /dev/null
+@@ -1,66 +0,0 @@
+-#include <stdio.h>
+-#include "rply.h"
+-
+-static int callback(p_ply_argument argument)
+-{
+-    void *pdata;
+-    /* just pass the value from the input file to the output file */
+-    ply_get_argument_user_data(argument, &pdata, NULL);
+-    ply_write((p_ply) pdata, ply_get_argument_value(argument));
+-    return 1;
+-}
+-
+-static int setup_callbacks(p_ply iply, p_ply oply)
+-{
+-    p_ply_element element = NULL;
+-    /* iterate over all elements in input file */
+-    while ((element = ply_get_next_element(iply, element))) {
+-        p_ply_property property = NULL;
+-        long nelems = 0;
+-        const char *element_name;
+-        ply_get_element_info(element, &element_name, &nelems);
+-        /* add this element to output file */
+-        if (!ply_add_element(oply, element_name, nelems)) return 0;
+-        /* iterate over all properties of current element */
+-        while ((property = ply_get_next_property(element, property))) {
+-            const char *property_name;
+-            e_ply_type type, length_type, value_type;
+-            ply_get_property_info(property, &property_name, &type,
+-                    &length_type, &value_type);
+-            /* setup input callback for this property */
+-            if (!ply_set_read_cb(iply, element_name, property_name, callback,
+-                    oply, 0)) return 0;
+-            /* add this property to output file */
+-            if (!ply_add_property(oply, property_name, type, length_type,
+-                    value_type)) return 0;
+-        }
+-    }
+-    return 1;
+-}
+-
+-int main(int argc, char **argv)
+-{
+-    const char *value;
+-    p_ply iply, oply;
+-    iply = ply_open("input.ply", NULL);
+-    if (!iply) return 1;
+-    if (!ply_read_header(iply)) return 1;
+-    oply = ply_create("output.ply", PLY_LITTLE_ENDIAN, NULL);
+-    if (!oply) return 1;
+-    if (!setup_callbacks(iply, oply)) return 1;
+-    /* pass comments and obj_infos from input to output */
+-    value = NULL;
+-    while ((value = ply_get_next_comment(iply, value)))
+-        if (!ply_add_comment(oply, value)) return 1;
+-    value = NULL;
+-    while ((value = ply_get_next_obj_info(iply, value)))
+-        if (!ply_add_obj_info(oply, value)) return 1;;
+-    /* write output header */
+-    if (!ply_write_header(oply)) return 1;
+-    /* read input file generating callbacks that pass data to output file */
+-    if (!ply_read(iply)) return 1;
+-    /* close up, we are done */
+-    if (!ply_close(iply)) return 1;
+-    if (!ply_close(oply)) return 1;
+-    return 0;
+-}
+diff --git a/v3p/rply/manual/manual.html b/v3p/rply/manual/manual.html
+deleted file mode 100644
+index 60b415341fa283d2d03c7e1dbdd913892196d407..0000000000000000000000000000000000000000
+--- a/v3p/rply/manual/manual.html
++++ /dev/null
+@@ -1,993 +0,0 @@
+-<html>
+-
+-<head>
+-<meta name="description" content="The RPly Homepage">
+-<meta name="keywords" content="open source, C, Library, PLY, file format,
+-input, output, tools">
+-<title>
+-RPly: ANSI C library for PLY file format input and output
+-</title>
+-<link rel="stylesheet" href="reference.css" type="text/css">
+-</head>
+-
+-<body>
+-
+-<!-- header +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<div class=header>
+-<hr>
+-<center>
+-<table summary="RPly logo">
+-<tr><td align=center>
+-<img border=0 alt="RPly" src="rply.png">
+-</td></tr>
+-<tr><td align=center valign=top>ANSI C Library for PLY file format input and output
+-</td></tr>
+-</table>
+-</center>
+-<hr>
+-</div>
+-
+-
+-<!-- Introduction +++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<h1>Introduction</h1>
+-
+-<p>RPly is a library that lets applications read and write PLY files.  The
+-PLY file format is widely used to store geometric information, such as 3D
+-models, but is general enough to be useful for other purposes.
+-</p>
+-
+-<p>There are other libraries out there, of course. I tried using them and
+-finally decided to write my own. I tried to write it in such a way that
+-others won't have to do it again and again. Everything that made me unhappy
+-about the existing libraries was eliminated from RPly.</p>
+-
+-<p>RPly is easy to use, well documented, small, free,
+-open-source, ANSI C, efficient, and well tested. I will keep supporting it
+-for a while because all my tools use the library for input/output. The highlights are: </p>
+-<ul>
+-<li> A callback mechanism that makes PLY file input straightforward;
+-<li> Support for the full range of numeric formats though the user only
+-deals with doubles;
+-<li> Binary (big and little endian) and text modes are fully supported;
+-<li> Input and output are buffered for efficiency;
+-<li> Available under the
+-<a href=http://www.opensource.org/licenses/mit-license.html>MIT license</a>
+-for added freedom.
+-</ul>
+-
+-<p>
+-The format was developed at <a
+-href=http://graphics.stanford.edu/data/3Dscanrep/>Stanford University</a>
+-for use with their 3D scanning projects. Greg Turk's PLY library, available
+-from <a href=http://www.cc.gatech.edu/projects/large_models>
+-Georgia Institute of Technology</a>, seems to be the standard reference
+-to the PLY file format, although there are some variations out there.
+-</p>
+-
+-<p> Whatever documentation and examples were found, were taken into
+-consideration to create RPly. In theory, since RPly doesn't try to interpret
+-the meaning of the data in a PLY file, it should be able to read any PLY file.
+-In practice, the library works with all PLY files that I could find.  </p>
+-
+-<h2>Download</h2>
+-
+-<p>
+-Version 1.01 of RPly is available for download in source
+-code from <a href=rply-1.01.tar.gz>this link</a>. Examples and documentation
+-are packed inside the tar ball. Have fun!
+-</p>
+-
+-<p>
+-Copyright &copy; 2003-2005 Diego Nehab. All rights reserved. <br>
+-Author: <A href="http://www.cs.princeton.edu/~diego">Diego Nehab</a>
+-</p>
+-
+-<h2>What's new?</h2>
+-
+-<p>
+-The change for version 1.01 is the use of our own buffering code when
+-reading ASCII files. Speedup factor of 5 in Linux, almost no change in
+-Windows.
+-</p>
+-
+-<h2> RPly's idea of what a PLY file is </h2>
+-
+-<p> A PLY file contains the description of one object. This object is
+-composed by <em>elements</em>, each element type
+-being composed by a group of <em>properties</em>.  The PLY file
+-format specifies a syntax for the description of element types and the
+-properties that compose them, as well as comments and meta-information.
+-</p>
+-
+-<p> The element type descriptions come in a header, which is followed by
+-element instances. Element instances come grouped by their type, in the
+-order of declaration. Each element instance is defined by the value
+-of its properties. Properties values also appear in the order of their
+-declaration. Here is a sample PLY file describing a triangle: </p>
+-
+-<pre class=example>
+-ply
+-format ascii 1.0
+-comment this is a simple file
+-obj_info any data, in one line of free form text
+-element vertex 3
+-property float x
+-property float y
+-property float z
+-element face 1
+-property list uchar int vertex_indices
+-end_header
+--1 0 0
+- 0 1 0
+- 1 0 0
+-3 0 1 2
+-</pre>
+-
+-<p> The header goes from the first line to the line marked by
+-<tt>end_header</tt>.  The first line contains only <tt>ply\n</tt> and is
+-used to detect whether a file is in PLY format or not.  The second line
+-specifies the <tt>format</tt> number (which is always <tt>1.0</tt>) and the
+-storage mode (<tt>ascii</tt>, <tt>binary_big_endian</tt> or
+-<tt>binary_little_endian</tt>).  </p>
+-
+-<p> Lines that start with <tt>comment</tt> are just comments, of course.
+-Lines that start with <tt>obj_info</tt> contain meta-information about the
+-object.  <tt>Comment</tt>s and <tt>obj_info</tt>s are optional and their
+-relative order in the header is irrelevant. </p>
+-
+-<p> In the sample PLY file, the first element type is declared with name
+-<tt>vertex</tt>, and on the same line we learn that there will be 3
+-instances of this element type.  The properties following describe what a
+-<tt>vertex</tt> element looks like.  Each <tt>vertex</tt> is declared to
+-consist of 3 scalar properties, named <tt>x</tt>, <tt>y</tt> and
+-<tt>z</tt>.  Each scalar property is declared to be of type <tt>float</tt>.
+-</p>
+-
+-<p> Scalar types can be any of the following: <tt>int8</tt>,
+-<tt>uint8</tt>, <tt>int16</tt>, <tt>uint16</tt>, <tt>int32</tt>,
+-<tt>uint32</tt>, <tt>float32</tt>, <tt>float64</tt>, <tt>char</tt>,
+-<tt>uchar</tt>, <tt>short</tt>, <tt>ushort</tt>, <tt>int</tt>,
+-<tt>uint</tt>, <tt>float</tt>, <tt>double</tt>. They consist of signed
+-and unsigned integer types of sizes 8, 16 and 32 bits, as well as floating
+-point types of 32 and 64bits.
+-
+-<p> Next, the <tt>face</tt> element type is declared, of which only 1
+-instance will be given. This element consists of a <tt>list</tt> property,
+-named <tt>vertex_indices</tt>. Lists are sequences on which the
+-first value, the <em>length</em>, gives the number of remaining values. List properties are described by the scalar
+-type of their length field and the scalar type of the remaining fields.
+-In the case of <tt>vertex_indices</tt>, the length field
+-is of type <tt>uchar</tt> and the remaining values are of type
+-<tt>int</tt>. </p>
+-
+-<p> Following the header, come the elements, in the order they were
+-declared in the header.  First come the 3 elements of type <tt>vertex</tt>,
+-each represented by the value of their properties <tt>x</tt>, <tt>y</tt>
+-and <tt>z</tt>. Then comes the single <tt>face</tt> element, composed by a
+-single list of type <tt>vertex_indices</tt> containing 3 values
+-(0 1 2).</p>
+-
+-<h2> How to read a file with RPly </h2>
+-
+-<p> Most users that want to read a PLY file already know which elements and
+-properties they are interested at. In the following example, we will
+-implement a simple program that dumps the contents of a PLY file to the
+-terminal, in a different, simpler format that only works for triangles.
+-</p>
+-
+-<p> This simple format has a header that gives the number of vertices in the
+-first line and the number of triangles in the second line. Following the
+-header come the vertices, and finally the triangles. Here is the sample
+-code for the program:</p>
+-
+-<pre class=example>
+-#include &lt;stdio.h&gt;
+-#include "rply.h"
+-
+-static int vertex_cb(p_ply_argument argument) {
+-    long eol;
+-    ply_get_argument_user_data(argument, NULL, &amp;eol);
+-    printf("%g", ply_get_argument_value(argument));
+-    if (eol) printf("\n");
+-    else printf(" ");
+-    return 1;
+-}
+-
+-static int face_cb(p_ply_argument argument) {
+-    long length, value_index;
+-    ply_get_argument_property(argument, NULL, &amp;length, &amp;value_index);
+-    switch (value_index) {
+-        case 0:
+-        case 1:
+-            printf("%g ", ply_get_argument_value(argument));
+-            break;
+-        case 2:
+-            printf("%g\n", ply_get_argument_value(argument));
+-            break;
+-        default:
+-            break;
+-    }
+-    return 1;
+-}
+-
+-int main(void) {
+-    long nvertices, ntriangles;
+-    p_ply ply = ply_open("input.ply", NULL);
+-    if (!ply) return 1;
+-    if (!ply_read_header(ply)) return 1;
+-    nvertices = ply_set_read_cb(ply, "vertex", "x", vertex_cb, NULL, 0);
+-    ply_set_read_cb(ply, "vertex", "y", vertex_cb, NULL, 0);
+-    ply_set_read_cb(ply, "vertex", "z", vertex_cb, NULL, 1);
+-    ntriangles = ply_set_read_cb(ply, "face", "vertex_indices", face_cb, NULL, 0);
+-    printf("%ld\n%ld\n", nvertices, ntriangles);
+-    if (!ply_read(ply)) return 1;
+-    ply_close(ply);
+-    return 0;
+-}
+-</pre>
+-
+-<p> RPly uses callbacks to pass data to an application. Independent callbacks
+-can be  associated with each property of each element. For scalar
+-properties, the callback is invoked once for each instance. For list
+-properties, the callback is invoked first with the number of
+-entries in the instance, and then once for each of the data entries.
+-<em>This is exactly the order in which the data items appear in the
+-file.</em></p>
+-
+-<p> To keep things simple, values are always passed as <tt>double</tt>,
+-regardless of how they are stored in the file. From its parameters,
+-callbacks can find out exactly which part of the file is being processed
+-(including the real type of the value), plus access custom information
+-provided by the user in the form of a pointer and an integer constant. </p>
+-
+-<p> In our example, we start with a call to <tt>ply_open</tt> to open a
+-file for reading. Then we get RPly to parse it's header, with a call to
+-<tt>ply_read_header</tt>.  After the header is parsed, RPly knows which
+-element types and properties are available. We then set callbacks for each
+-of the <tt>vertex</tt> element properties and the <tt>face</tt> property
+-(using <tt>ply_set_read_cb</tt>). Finally, we invoke the main RPly reading
+-function, <tt>ply_read</tt>. This function reads all data in the file,
+-passing the data to the appropriate callbacks.  After all reading is done,
+-we call <tt>ply_close</tt> to release any resources used by RPly.</p>
+-
+-<p>There are some details, of course. <tt>Ply_set_read_cb</tt> returns the
+-number of instances of the target property (which is the same as the number
+-of element instances).  This is how the program obtains the number of
+-vertices and faces in the file. </p>
+-
+-<p>RPly lets us associate one pointer <em>and</em> one integer to each
+-callback.  We are free to use either or both to link some context to our
+-callbacks. Our example uses the integer placeholder to tell
+-<tt>vertex_cb</tt> that it has to break the line after the <tt>z</tt>
+-property (notice the last argument of <tt>ply_set_read_cb</tt>).</p>
+-
+-<p><tt>Vertex_cb</tt> gets the user data and the property value from it's
+-argument and prints accordingly.  The <tt>face_cb</tt> callback is a bit
+-more complicated because lists are more complicated.  Since the
+-simple file format only supports triangles, it only prints the first
+-3 list values, after which it breaks the line. </p>
+-
+-<p> The output of the program, as expected, is: </p>
+-
+-<pre class=example>
+-3
+-1
+--1 0 0
+-0 1 0
+-1 0 0
+-0 1 2
+-</pre>
+-
+-<h2> Writing files with RPly </h2>
+-
+-<p> The next example is somewhat more involved. We will create a program
+-that converts our simple PLY file to binary mode. Besides showing how to
+-write a PLY file, this example also illustrates the query functions. We
+-do not know a priori which elements and properties, comments and obj_infos
+-will be in the input file, so we need a way to find out. Although our simple
+-program would work on any PLY file, a better version of this program is
+-available from the RPly distribution. For simplicity, the simple version
+-omits error messages and command line parameter processing. </p>
+-
+-<p> In practice, writing a file is even easier than reading one. First we
+-create a file in binary mode, with a call to <tt>ply_create</tt> (notice
+-the argument <tt>PLY_LITTLE_ENDIAN</tt> that gives the storage mode).  Then,
+-we define the elements using <tt>ply_add_element</tt>. After each element, we
+-define its properties using <tt>ply_add_scalar_property</tt> or
+-<tt>ply_add_list_property</tt>. When we are done with elements and
+-properties, we add comments and obj_infos. We then write the header with
+-<tt>ply_write_header</tt> and send all data items. The data items are sent
+-one by one, with calls to <tt>ply_write</tt>, <em>in the same order they
+-are to appear in the file</em>.  Again, to simplify things, this function
+-receives data as <tt>double</tt> and performs the needed conversion. Here
+-is the code for the example: </p>
+-
+-<pre class=example>
+-#include &lt;stdio.h&gt;
+-#include "rply.h"
+-
+-static int callback(p_ply_argument argument) {
+-    void *pdata;
+-    /* just pass the value from the input file to the output file */
+-    ply_get_argument_user_data(argument, &amp;pdata, NULL);
+-    ply_write((p_ply) pdata, ply_get_argument_value(argument));
+-    return 1;
+-}
+-
+-static int setup_callbacks(p_ply iply, p_ply oply) {
+-    p_ply_element element = NULL;
+-    /* iterate over all elements in input file */
+-    while ((element = ply_get_next_element(iply, element))) {
+-        p_ply_property property = NULL;
+-        long ninstances = 0;
+-        const char *element_name;
+-        ply_get_element_info(element, &amp;element_name, &amp;ninstances);
+-        /* add this element to output file */
+-        if (!ply_add_element(oply, element_name, ninstances)) return 0;
+-        /* iterate over all properties of current element */
+-        while ((property = ply_get_next_property(element, property))) {
+-            const char *property_name;
+-            e_ply_type type, length_type, value_type;
+-            ply_get_property_info(property, &amp;property_name, &amp;type,
+-                    &amp;length_type, &amp;value_type);
+-            /* setup input callback for this property */
+-            if (!ply_set_read_cb(iply, element_name, property_name, callback,
+-                    oply, 0)) return 0;
+-            /* add this property to output file */
+-            if (!ply_add_property(oply, property_name, type, length_type,
+-                    value_type)) return 0;
+-        }
+-    }
+-    return 1;
+-}
+-
+-int main(void) {
+-    const char *value;
+-    p_ply iply, oply;
+-    iply = ply_open("input.ply", NULL);
+-    if (!iply) return 1;
+-    if (!ply_read_header(iply)) return 1;
+-    oply = ply_create("output.ply", PLY_LITTLE_ENDIAN, NULL);
+-    if (!oply) return 1;
+-    if (!setup_callbacks(iply, oply)) return 1;
+-    /* pass comments and obj_infos from input to output */
+-    value = NULL;
+-    while ((value = ply_get_next_comment(iply, value)))
+-        if (!ply_add_comment(oply, value)) return 1;
+-    value = NULL;
+-    while ((value = ply_get_next_obj_info(iply, value)))
+-        if (!ply_add_obj_info(oply, value)) return 1;;
+-    /* write output header */
+-    if (!ply_write_header(oply)) return 1;
+-    /* read input file generating callbacks that pass data to output file */
+-    if (!ply_read(iply)) return 1;
+-    /* close up, we are done */
+-    if (!ply_close(iply)) return 1;
+-    if (!ply_close(oply)) return 1;
+-    return 0;
+-}
+-</pre>
+-
+-<p> RPly uses iterators to let the user loop over a PLY file header. A
+-function is used to  get the first item of a given class (element, property
+-etc). Passing the last returned item to the same function produces the next
+-item, until there are no more items. Examples of iterator use can be seen
+-in the <tt>main</tt> function, which uses them to loop over comments and
+-obj_infos, and in the <tt>setup_callbacks</tt> function, which loops over
+-elements and properties. </p>
+-
+-<p> In the <tt>setup_callbacks</tt> function, for each element in the
+-input, an equivalent element is defined in the output. For each property in
+-each element, an equivalent property is defined in the output. Notice that
+-the same callback is specified for all properties. It is given the output
+-PLY handle as the context pointer. Each time it is called, it  passes the
+-received value to <tt>ply_write</tt> on the output handle. It is as simple
+-as that. </p>
+-
+-<h1>Reference Manual</h1>
+-
+-<!-- ply_open ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_open>
+-p_ply <b>ply_open</b>(const char *name, p_ply_error_cb error_cb)
+-</p>
+-
+-<p class=description>
+-Opens a PLY file for reading, checks if it is a valid PLY file
+-and returns a handle to it.
+-</p>
+-
+-<p class=arguments>
+-<tt>Name</tt> is the file name, and <tt>error_cb</tt> is a function to
+-be called when an error is found.
+-If <tt>error_cb</tt> is NULL, the default
+-error callback is used. It prints a message to the standard error stream.
+-</p>
+-
+-<p class=return>
+-Returns a handle to the file or NULL on error.
+-</p>
+-
+-<p class=note>
+-Note: <tt>Error_cb</tt> is of type <tt>void
+-    (*p_ply_error_cb)(const char *message)</tt>
+-</p>
+-
+-<!-- ply_read_header +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_read_header>
+-int <b>ply_read_header</b>(p_ply ply)
+-</p>
+-
+-<p class=description>
+-Reads and parses the header of a PLY file.
+-After a call to this function, the query functions
+-<a href=#ply_get_next_element><tt>ply_get_next_element</tt></a>,
+-<a href=#ply_get_next_property><tt>ply_get_next_property</tt></a>,
+-<a href=#ply_get_next_comment><tt>ply_get_next_comment</tt></a>, and
+-<a href=#ply_get_next_obj_info><tt>ply_get_next_obj_info</tt></a> can be
+-called. Callbacks can also be set with the
+-<a href=#ply_set_read_cb><tt>ply_set_read_cb</tt></a> function.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by <a href=#ply_open><tt>ply_open</tt></a>.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_set_read_cb +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_set_read_cb>
+-long <b>ply_set_read_cb</b>(<br>
+-&nbsp;&nbsp; p_ply ply,<br>
+-&nbsp;&nbsp; const char *element_name,<br>
+-&nbsp;&nbsp; const char *property_name,<br>
+-&nbsp;&nbsp; p_ply_read_cb read_cb,<br>
+-&nbsp;&nbsp; void *pdata,<br>
+-&nbsp;&nbsp; long idata<br>
+-)
+-</p>
+-
+-<p class=description>
+-Sets up the callback to be invoked when the value of a property is read.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by <a href=#ply_open><tt>ply_open</tt></a>.
+-<tt>Element_name</tt> and <tt>property_name</tt> are the names of the
+-element and property of interest. <tt>Read_cb</tt> is the callback
+-function.  <tt>Pdata</tt> and <tt>idata</tt> are user data to be passed to
+-the callback function.
+-</p>
+-
+-<p class=return>
+-Returns the number of instances of the element of interest.
+-</p>
+-
+-<p class=note>
+-Note: <tt>Read_cb</tt> is of type
+-<tt>int (*p_ply_read_cb)(p_ply_argument argument)</tt>.
+-The callback should return 1 to continue the reading process,
+-or return 0 to abort.
+-
+-<!-- ply_get_argument_element ++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_argument_element>
+-int <b>ply_get_argument_element</b>(<br>
+-&nbsp;&nbsp; p_ply_argument argument,<br>
+-&nbsp;&nbsp; p_ply_element *element,<br>
+-&nbsp;&nbsp; long *instance_index<br>
+-)
+-</p>
+-
+-<p class=description>
+-Retrieves element information from the callback argument.
+-</p>
+-
+-<p class=arguments>
+-<tt>Argument</tt> is the handle passed to the callback.
+-<tt>Element</tt> receives a handle to the element
+-originating the callback. <tt>Instance_index</tt> receives
+-the index of the instance of the element
+-being read. <tt>Element</tt> and <tt>instance_index</tt> can be NULL.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<p class=note>
+-Note: further information can be obtained from <tt>element</tt> with a
+-call to <a href=#ply_get_element_info>ply_get_element_info</a>.
+-</p>
+-
+-<!-- ply_get_argument_property +++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_argument_property>
+-int <b>ply_get_argument_property</b>(<br>
+-&nbsp;&nbsp; p_ply_argument argument,<br>
+-&nbsp;&nbsp; p_ply_property *property,<br>
+-&nbsp;&nbsp; long *length,<br>
+-&nbsp;&nbsp; long *value_index<br>
+-)
+-</p>
+-
+-<p class=description>
+-Retrieves property information from the callback argument.
+-</p>
+-
+-<p class=arguments>
+-<tt>Argument</tt> is the handle passed to the callback.
+-<tt>Property</tt> receives a handle to the property
+-originating the callback. <tt>Length</tt> receives the number
+-of values in the list property (1 for scalar properties).
+-<tt>Value_index</tt> receives the index of the current property entry (0 for
+-scalar properties, -1 for the first value of a list property, the one that
+-gives the number of entries). <tt>Property</tt>, <tt>length</tt> and
+-<tt>value_index</tt> can be NULL.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<p class=note>
+-Note: further information can be obtained from <tt>property</tt> with a
+-call to <a href=#ply_get_property_info>ply_get_property_info</a>.
+-</p>
+-
+-<!-- ply_get_argument_user_data +++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_argument_user_data>
+-int <b>ply_get_argument_user_data</b>(p_ply_argument argument, void *pdata,
+-        long *idata)
+-</p>
+-
+-<p class=description>
+-Retrieves the user data from the callback argument.
+-</p>
+-
+-<p class=arguments>
+-<tt>Argument</tt> is the handle passed to the callback.
+-<tt>Pdata</tt> receives the user data pointer.
+-<tt>Idata</tt> receives the user data integer.
+-<tt>Pdata</tt> and <tt>idata</tt> can be NULL.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_get_argument_value +++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_argument_value>
+-double <b>ply_get_argument_value</b>(p_ply_argument argument)
+-</p>
+-
+-<p class=description>
+-Retrieves the property value from the callback argument.
+-</p>
+-
+-<p class=arguments>
+-<tt>Argument</tt> is the handle passed to the callback.
+-</p>
+-
+-<p class=return>
+-Returns the property value.
+-</p>
+-
+-<!-- ply_read +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_read>
+-int <b>ply_read</b>(p_ply ply)
+-</p>
+-
+-<p class=description>
+-Reads all data in file, calling appropriate callbacks.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by <a href=#ply_open><tt>ply_open</tt></a>.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_get_next_element ++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_next_element>
+-p_ply_element <b>ply_get_next_element</b>(p_ply ply, p_ply_element last)
+-</p>
+-
+-<p class=description>
+-Iterates over all elements on the header of a PLY file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by <a href=#ply_open><tt>ply_open</tt></a>.
+-<a href=#ply_read_header><tt>Ply_read_header</tt></a> must have been called
+-on the handle otherwise no elements will be found.
+-<tt>Last</tt> is NULL to retrieve the first element, and an element to
+-retrieve the next element.
+-</p>
+-
+-<p class=return>
+-Returns the next element, or NULL if no more elements.
+-</p>
+-
+-<p class=note>
+-Note: further information can be obtained from an element with a
+-call to <a href=#ply_get_element_info>ply_get_element_info</a>.
+-</p>
+-
+-<!-- ply_get_next_property +++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_next_property>
+-p_ply_property <b>ply_get_next_property</b>(p_ply_element element, p_ply_property last)
+-</p>
+-
+-<p class=description>
+-Iterates over all properties of an element.
+-</p>
+-
+-<p class=arguments>
+-<tt>Element</tt> is an element handle.
+-<tt>Last</tt> is NULL to retrieve the first property, and a property to
+-retrieve the next property.
+-</p>
+-
+-<p class=return>
+-Returns the next property, or NULL if no more properties.
+-</p>
+-
+-<p class=note>
+-Note: further information can be obtained from a property with a
+-call to <a href=#ply_get_property_info>ply_get_property_info</a>.
+-</p>
+-
+-<!-- ply_get_next_comment ++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_next_comment>
+-const char *<b>ply_get_next_comment</b>(p_ply ply, const char *last)
+-</p>
+-
+-<p class=description>
+-Iterates over all comments on the header of a PLY file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by <a href=#ply_open><tt>ply_open</tt></a>.
+-<a href=#ply_read_header><tt>Ply_read_header</tt></a> must have been called
+-on the handle otherwise no comments will be found.
+-<tt>Last</tt> is NULL to retrieve the first comment, and a comment to
+-retrieve the next comment.
+-</p>
+-
+-<p class=return>
+-Returns the next comment, or NULL if no more comments.
+-</p>
+-
+-<!-- ply_get_next_obj_info +++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_next_obj_info>
+-const char *<b>ply_get_next_obj_info</b>(p_ply ply, const char *last)
+-</p>
+-
+-<p class=description>
+-Iterates over all obj_infos on the header of a PLY file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by <a href=#ply_open><tt>ply_open</tt></a>.
+-<a href=#ply_read_header><tt>Ply_read_header</tt></a> must have been called
+-on the handle otherwise no obj_infos will be found.
+-<tt>Last</tt> is NULL to retrieve the first obj_info, and a obj_info to
+-retrieve the next obj_info.
+-</p>
+-
+-<p class=return>
+-Returns the next obj_info, or NULL if no more obj_infos.
+-</p>
+-
+-<!-- ply_get_element_info ++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_element_info>
+-int <b>ply_get_element_info</b>(p_ply_element element, const char** name,
+-        long *ninstances)
+-</p>
+-
+-<p class=description>
+-Retrieves information from an element handle.
+-</p>
+-
+-<p class=arguments>
+-<tt>Element</tt> is the handle of the element of interest.
+-<tt>Name</tt> receives the internal copy of the element name.
+-<tt>Ninstances</tt> receives the number of instances of this element
+-in the file. Both <tt>name</tt> and <tt>ninstances</tt> can be NULL.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_get_property_info +++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_get_property_info>
+-int <b>ply_get_property_info</b>(<br>
+-&nbsp;&nbsp; p_ply_property property,<br>
+-&nbsp;&nbsp; const char** name,<br>
+-&nbsp;&nbsp; e_ply_type *type,<br>
+-&nbsp;&nbsp; e_ply_type *length_type,<br>
+-&nbsp;&nbsp; e_ply_type *value_type<br>
+-)
+-</p>
+-
+-<p class=description>
+-Retrieves information from a property handle.
+-</p>
+-
+-<p class=arguments>
+-<tt>Property</tt> is the handle of the property of interest.
+-<tt>Name</tt> receives the internal copy of the property name.
+-<tt>Type</tt> receives the property type.
+-<tt>Length_type</tt> receives the scalar type of the first entry
+-in a list property (the one that gives the number of entries).
+-<tt>Value_type</tt> receives the scalar type of the remaining list entries.
+-<tt>Name</tt>, <tt>type</tt>, <tt>length_type</tt>, and
+-<tt>value_type</tt> can be NULL.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<p class=note>
+-Note: <tt>Length_type</tt> and <tt>value_type</tt> can
+-receive any of the constants for scalar types defined in
+-<tt>e_ply_type</tt>. <tt>Type</tt> can, in addition, be <tt>PLY_LIST</tt>,
+-in which case the property is a list property and the fields
+-<tt>length_type</tt> and <tt>value_type</tt> become meaningful.
+-</p>
+-
+-<!-- ply_create ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_create>
+-p_ply <b>ply_create</b>(const char *name, e_ply_storage_mode storage_mode,
+-        p_ply_error_cb error_cb)
+-</p>
+-
+-<p class=description>
+-Creates a PLY file for writing.
+-</p>
+-
+-<p class=arguments>
+-<tt>Name</tt> is the file name, <tt>storage_mode</tt> is the file storage mode
+-(<tt>PLY_ASCII</tt>, <tt>PLY_LITTLE_ENDIAN</tt> or <tt>PLY_BIG_ENDIAN</tt>). <tt>Error_cb</tt> is a function to be called when an error is found.
+-If <tt>error_cb</tt> is NULL, the default
+-error callback is used. It prints a message to the standard error stream.
+-</p>
+-
+-<p class=return>
+-Returns a handle to the file or NULL on error.
+-</p>
+-
+-<p class=note>
+-Note: <tt>Error_cb</tt> is of type <tt>void
+-    (*p_ply_error_cb)(const char *message)</tt>
+-</p>
+-
+-<!-- ply_add_element +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_add_element>
+-int <b>ply_add_element</b>(p_ply ply, const char *name, long ninstances)
+-</p>
+-
+-<p class=description>
+-Adds a new element to the ply file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a>, <tt>name</tt> is the element
+-name and <tt>ninstances</tt> is the number of instances of this element that
+-will be written to the file.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_add_property ++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_add_property>
+-int <b>ply_add_property</b>(<br>
+-&nbsp;&nbsp; p_ply ply,<br>
+-&nbsp;&nbsp; const char *name,<br>
+-&nbsp;&nbsp; e_ply_type type,<br>
+-&nbsp;&nbsp; e_ply_type length_type,<br>
+-&nbsp;&nbsp; e_ply_type value_type<br>
+-)
+-</p>
+-
+-<p class=description>
+-Adds a new property to the last element added to the ply file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a> and <tt>name</tt> is the
+-property name.
+-<tt>Type</tt> is the property type.
+-<tt>Length_type</tt> is the scalar type of the first entry
+-in a list property (the one that gives the number of entries).
+-<tt>Value_type</tt> is the scalar type of the remaining list entries.
+-If <tt>type</tt> is not <tt>PLY_LIST</tt>, <tt>length_type</tt> and
+-<tt>value_type</tt> are ignored.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<p class=note>
+-Note: <tt>Length_type</tt> and <tt>value_type</tt> can
+-be any of the constants for scalar types defined in
+-<tt>e_ply_type</tt>. <tt>Type</tt> can, in addition, be <tt>PLY_LIST</tt>,
+-in which case the property is a list property and the fields
+-<tt>length_type</tt> and <tt>value_type</tt> become meaningful.
+-</p>
+-
+-<!-- ply_add_list_property ++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_add_list_property>
+-int <b>ply_add_list_property</b>(<br>
+-&nbsp;&nbsp; p_ply ply,<br>
+-&nbsp;&nbsp; const char *name,<br>
+-&nbsp;&nbsp; e_ply_type length_type,<br>
+-&nbsp;&nbsp; e_ply_type value_type<br>
+-)
+-</p>
+-
+-<p class=description>
+-Same as <a href=#ply_add_property><tt>ply_add_property</tt></a> if
+-<tt>type</tt> is <tt>PLY_LIST</tt>.
+-</p>
+-
+-<!-- ply_add_scalar_property +++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_add_scalar_property>
+-int <b>ply_add_scalar_property</b>(p_ply ply, const char *name, e_ply_type type)
+-</p>
+-
+-<p class=description>
+-Same as <a href=#ply_add_property><tt>ply_add_property</tt></a> if
+-<tt>type</tt> is <em>not</em> <tt>PLY_LIST</tt>.
+-</p>
+-
+-<!-- ply_add_comment +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_add_comment>
+-int <b>ply_add_comment</b>(p_ply ply, const char *comment);
+-</p>
+-
+-<p class=description>
+-Adds a comment to a PLY file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a> and <tt>comment</tt> is the
+-comment text.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_add_obj_info ++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_add_obj_info>
+-int <b>ply_add_obj_info</b>(p_ply ply, const char *obj_info);
+-</p>
+-
+-<p class=description>
+-Adds a obj_info to a PLY file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a> and <tt>obj_info</tt> is the
+-obj_info text.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_write_header ++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_write_header>
+-int <b>ply_write_header</b>(p_ply ply);
+-</p>
+-
+-<p class=description>
+-Writes the PLY file header to disk, after all elements, properties,
+-comments and obj_infos have been added to the handle.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a> and <tt>comment</tt> is the
+-comment text.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_write +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_write>
+-int <b>ply_write</b>(p_ply ply, double value);
+-</p>
+-
+-<p class=description>
+-Passes a value to be stored in the PLY file.
+-Values must be passed in the order they will appear in the file.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a> and <tt>value</tt> is the
+-value to be stored.  For simplicity, values are always passed as
+-<tt>double</tt> and conversion is performed as needed.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- ply_close +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<p class=name id=ply_close>
+-int <b>ply_close</b>(p_ply ply);
+-</p>
+-
+-<p class=description>
+-Closes the handle and ensures that all resources have been freed and data
+-have been written.
+-</p>
+-
+-<p class=arguments>
+-<tt>Ply</tt> is a handle returned by
+-<a href=#ply_create><tt>ply_create</tt></a> or by
+-<a href=#ply_open><tt>ply_open</tt></a>.
+-</p>
+-
+-<p class=return>
+-Returns 1 in case of success, 0 otherwise.
+-</p>
+-
+-<!-- footer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+-
+-<div class=footer>
+-<hr>
+-<center>
+-<p>
+-<small>
+-Last modified by Diego Nehab on <br>
+-Fri Jul 16 15:23:01 EDT 2004
+-</small>
+-</p>
+-</center>
+-</div>
+-
+-</body>
+-</html>
+diff --git a/v3p/rply/manual/reference.css b/v3p/rply/manual/reference.css
+deleted file mode 100644
+index 821215dc8279d81ff09c611166479df78fd2fd15..0000000000000000000000000000000000000000
+--- a/v3p/rply/manual/reference.css
++++ /dev/null
+@@ -1,54 +0,0 @@
+-body {
+-    margin-left: 1em;
+-    margin-right: 1em;
+-    font-family: "Verdana", sans-serif;
+-}
+-
+-tt {
+-    font-family: "Andale Mono", monospace;
+-}
+-
+-h1, h2, h3, h4 { margin-left: 0em; }
+-
+-
+-h3 { padding-top: 1em; }
+-
+-p { margin-left: 1em; }
+-
+-p.name {
+-    font-family: "Andale Mono", monospace;
+-    padding-top: 1em;
+-    margin-left: 0em;
+-}
+-
+-a[href] { color: #7f0000; }
+-
+-blockquote { margin-left: 3em; }
+-
+-pre.example {
+-    background: #cbb;
+-    padding: 1em;
+-    margin-left: 1em;
+-    font-family: "Andale Mono", monospace;
+-    font-size: small;
+-}
+-
+-hr {
+-    margin-left: 0em;
+-	background: #7f0000;
+-	border: 0px;
+-	height: 1px;
+-}
+-
+-ul { list-style-type: disc; }
+-
+-table.index { border: 1px #7f0000; }
+-table.index td { text-align: left; vertical-align: top; }
+-table.index ul { padding-top: 0em; margin-top: 0em; }
+-
+-h1:first-letter,
+-h2:first-letter,
+-h2:first-letter,
+-h3:first-letter { color: #7f0000; }
+-
+-div.header, div.footer { margin-left: 0em; }
+diff --git a/v3p/rply/manual/rply.png b/v3p/rply/manual/rply.png
+deleted file mode 100644
+index e27e44f677da48c3e923fb98a7ac478127e14984..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 6232
+zcmV-e7^mlnP)<h;3K|Lk000e1NJLTq003kF004Uk0ssI24FIxD00009a7bBm0017r
+z0017r0mErjQvd(}2XskIMF-Oi5flvzOn9}k000;FNkl<Zc%0pRcU%-#_x>|mD1wb*
+z6iGxBHA<|2L^MqWDZVHIV#AUcHKw7UMnPhXC>qq*6HP=xFp7W$#ey|?Z3$HbrAZa(
+z2)is>=6?TJ;b(p?0(S<)56_2xMrWQm`|P=A?>%Sk8HNy2Czam*^UvDq>XBo|zVpsI
+z-~^UslM)iL)6)kG9Xfo(2!TMrjVCuZH~#i*JwrpQapSbLwYibB7mA-g^|7$H4kQCx
+zyLUeu8A<4&P$)JnS@MTam<EIjh1*uFP%4!icp^eVc695O0$c&sj2~Z8Qo@0x{eXbw
+z%S!<Q5P$`KFfyvBsGw!Jc<$T<h9M0+=Y+z`moCwgl$VulGB98pND6^%D_7Ezv?~O4
+zw{IIXco_qXDlX1@@`TnsAKblbO-SS6Sd}X4@4snD9%p2XEGuIg4vm2NyLV|x+7$x9
+zfC2KCj`MVM3=9ovS^Aoq=Du`T2=wgNkCw!^Z{H`HnvI8b0HG&oUnIuI|EQ-|21tR+
+zz(PkymSt)Ev!<rT$J#mrr~@7WE(QjrrKPkaEX)4n<8xIYkOF1E3WkX}caD~%T_N0m
+z;J{nX&W8!v9Uq@d2%bDC(bF4kX~{55%StyuLqo&T)%8NJUK{V-yC;(wOQmtSxgR+?
+zipApAlQ0Zp_3_84=H^=q3oqp7cLQ$z{r4z)dp$ipdLL*Xs5N`^=+P2Q%^koF;4`uK
+zm)*NL_!l8${-8l>lC{7WZf<pTbsR_n0s_<|fq?74fmvBu97x&&P0WUdDHQj;ybkW&
+z%jY{V1bUu4`OTa;a=E<avtI!Xz$!D-+txNGCx?$QZH1<%j>DA7dtZP3>z+O2rQbMO
+z7y!K@Bfp+CODdIeCJ_VUva-A<PtMH9;7rn1c;!6XoRIroUcc_%%||bNz#uZxXa0PN
+zM8cUw1dPqfTI=YT@%S-kk~Tqei;`hV<v-ruzwpz`0O%1Bv1-8rKK`WvSY%|Zb9C%j
+z|7u|cH&mgBU%8T}UWP!=h=>()=hoNPb0*OMEHg7#+1Yhq{Azi*J5;Is$II)$u3dcN
+zS5(wj9v*ddb(~4WfK5)$%83&@%D-Bb8yLp2@hevF)JqR|D>{0`+_`+>mk@YAC+9nR
+z`^S$SaVFu6)+SPhv23EZ_ko{(W?7c=&GZ5N$VeYgPf2YpXA&`BnU&?|<n;RWqR2YE
+zt5hbgTE%}n>P1Gb^z`I29yNe5nVD-H9A5Kyq)XAgt576*d+*=5vkl_c%$fBv8D|m=
+zz&bm7m91@NW+rD6T2SXRhpJSGD_8Q=OAqLK_Uu<49z5q?<DNWOZEO1|J)JWN6}TjS
+zhZ2(H<Fjwa4nFa#C-Bzk)82FE*7As7BEUK)$IsC*JuQthN$bHeQ~s_>m9l#E{vA8`
+z&hMk6edf*M<6mOHB0GD%lhdR2kM|tK0x(3WOj)yLA8)-3qoco_HA}`XepzN`e`jZx
+z)z0yYyI25*D3!_H-g|<Ac*ZZIvuBsPy7F9a+vMhYPn_7U@r##O0Ny3!!Rpm}gMwI=
+zt*)w)C=?t#q$kifCdO;lteTn{nM_t)RaFbn$}a?L^74Eg9MT>>RH;-&g@pzA`3i-C
+z-kev0Q9H%s$B(xUA3lWZ+AUoqV%*$JZr$ozSonaDa$p!eNjZ@H$tMG<tId*<N|egK
+zfiZxHl0*UA?caaEd+!a5ixabKrj5<#zx~F!82bOAZNw@B%z(uJ0}x;z@C4{fNg@Yw
+zfS&;k0Kh-M&%kJUW9|Sy0mcA;D&Qx3`|r=35s7GJZvrnU<Z^i`A<wn6xUoD{DpxC&
+z>ZCmbxB|09qC!gho)faTzFwo@a0~#3NueZRfwz@P<Axa812DRA<N5RFZIZ|r0Z=Fu
+zg@uLry1G8U|2}@g1P&}=2M<cttZA%2N&(lcTW8LnPeqcQm6dL7jfT0K3NW5Hanb($
+zR3s{uD$LoLJbKhvZjotf3WY){l2@Xtvhq7e$8dol7VzrcJ@)*04w?Ld{CxjDeWU;Z
+zB!Hi>aZynbEs0z%U+3hM4-h~FgowqlXU=di=FrZaR|NufSvwi<UAT~2@#TLZ?8Pwi
+z4<EK6WFRo9zW(R)=ev#@*N?Kg*{xeQ{mGMmD=E1x7GJlq@i=tIbie@GuT3Zvj<mB2
+zk;`w$WY-1{HVF*0cXp<#$f+^h!s4$!eU9hlMV6Gr0mYS-!|m)0=_|)gVBMH8jn60$
+zAPV?UU;oz4n;e8^SyrJ?@c#l83I%^(xO(Z*x4;fy8!+A2I6W<mzhMHAv9anU?VbW3
+zl$Y;vcD{A<Cavxa!?ewhj!4A8q5jtxHH8QmUr_Mf<jD_HQ+aX<CV6@7)z((m_L6|>
+zfFAIEW##T^)Be15izoXV0s%0tpupe3;Xz6YFCLo@KCrrcdBgPS^8|t*z!Ct!0Pj~;
+z?wLOQ=8YR|Vs3{+1X$(e{V;VZAH4(&!&uwc%-^y_M=T!w(u|n_tjf#x&6vSqJieI_
+z16H}Y-#a>{J$%TGp}Do802o_dzQ@`5=Jo5`*xxjWfcNwB*G`)Bkdt05ETkF0x~gjL
+z^y!^OFCj4g>C^Rgb}7lpwAZ$rb$Fqdi_48pq?dI;!N#dmlPUFTRf>iI##UDDpE0A;
+z=%tSL8=ah};(crLSpvYSqGG>`%Z+Q-IGOjxK?GRm=dZW3OKtW1iz4|a0LE5U?sIXu
+ze)TFR^WHe9<CmYUZ7bs!U8YnWzxKPhT<<LYB>-%SiZ(hrCM71e=43iBfOU2Cff+Nd
+zbt3<=Dk#`Ab!t*lQuAkW$-y&#Rb}O`uCAR%FA-o>Q1C-b>miN>3jttNS^0~L%hfAa
+zxG}tG5CJwtMShbeH50$MS9cg-Y<2aouCAR%F99&2q-2A=ePTkwt4`pK|EE`693P%H
+z2Liyls3>6S)P$z=VpJ;C$z#WogM#Xklk*7~1JD*N2ym}Qj}LzQ@o7wqW@@U`+<aDG
+zpt-p@2V2WZOMh9vo{f!F_Ubi!#R?a9cMgdyg+dX$cW=(VebS7Kr+@`Ov2y_cpakw3
+z8QHF1pMUI_W?r7m+WND=z<&MuF{i@Anc1_a5yAk^fUkkE^!`=>)Byp27?1-2Mn<3A
+zy=!c2OhqD>%l#Z3y{}v`1PBlz7Hj|Uhtu@wl(t}hVBm=Fz8gmffJcBoFczSdJQwH-
+ztN;W+EwFLeFyGs^g+r>Vmt|+GxpaX#K>a+5jOH&L@CSMV0E9sQnwqO-W+N>vsqD+l
+z%w$)tv<3h$z`HDaLL&Ka_G~H=g+g&<>C!o+rRqZiAQQ+3YJul8e>uRWhC!wQbSW);
+zGGT&<{QC(OU6JVRfPg+mMpP!2oIkG_7S?#E3CQUmT#!m6+AlpbApk)Cbd6G}6#TnX
+ztOb<Nk3{*ui{Uyzg+wBHd&Z2U+qXvm02ILe_uljW>MJeEYU_JLhek$5E@^lYCR#^l
+zyqz7Tc^Euo$Vqc^rw0$zAM9`7Z5J0>5^Zg5fum#o?%i(#0IGq104w^y@))=TI0FD!
+zAjZ(}vk4P~5ogba)YjfgN=jBL_W~w8dya8+)#%oZin>?t-npixVgLPahD34%xFr^k
+zaBvtfa3B?lSS)^P!h{|7?`ISjpC=>)=s9ZC_>VqfD7RY=A2)7KK|y?a`aPBE05AyP
+zu+utEORHqTg4<bHk5#Ha`uCq09BlsHdoP}KD9g@1JYs~nwibZCx%sr1n6C5>Q>av`
+zxq}B=Wn}@l*R|`y6DMq^Orf_E-z{IRzi*!i$YL0ywQE;x*ubHreDB`917pVyr@uP^
+zl67>Z9zN{i=B7|6s;a6C3=Gsi$}he&Ee#Ewh9Bwj2M<m=Io0Il(cVTV6lw~EjCws(
+zQ*+qe{Zec!y|vKN&``&V0fZC<1O)o~b9f$8Q&W>$RW3<K$LaUqUEJINh{a+<L&L`D
+zOVb`+mXZ?f;80sw$mw=Kqh4-qmo8r9Oafp4A;p_FZ&|;d&-1ITN4%Dnb8zqsclRd$
+z_m$zGJT*1S&W^8MwYB{9GG*D~&6_v3zh3cLTGK;9rn|bn>V)QEXL)LBl&vj?@z{tL
+z{^ja=@%(wtBmhiV_E|u{W?x^GO4ah&^dLZjj*d%cXfsNo#h=vjhYzD29G>UqHh)?(
+zQ2W;r50BWG7|tXBObL0mWy@w?-}dmYBwgKU!NJpJ%xM0!mVcGYQ&UenI`Z@{%bJ=a
+z9v-n5E^sCRU`j|yU|>L7`&UAjF4Ka8oA)U-S~Z0!Pfd-QGNrblfU`kr|2pdK&R?(6
+zz`!;fkN;?CxrBzc=u>L6cD`4UmKMo7ep%Mm9(8xWz;8VEXW7!NTLadu<F8kImo9E$
+zVa}~yt5ZylE7H=Urc8NG-+ZMJYP~`{JkFmz%b5f~f0ixVx;0?!TF!bAAW>I$Mri1N
+zXtEk~D~XD<w9}4`{PhZ*J^TE*bDT*4^e3cj+cwU6CF<%<KXRn?KBWeArnLOw!)SZ^
+zn*4m)3mfr5FAt9k{N@w=2`S&UZ4<p-|7dHwhK4%RuhO}sl`GQIqik*Y>LrncxVxX{
+z7r#shsrcz9D!u;J)^-mMpX%();dUHz@D=Ilk&`Ds=dlr9tyieKd(4?LoJjzfux!P)
+zZ9lGAqf{!JKa&9Qy1E|6k8@KBd<qtoj~+!kI#y?Ab7o)wOQ|$$_Uv<~Pje=L+P{K=
+zHmzCHjDHazv1?bikPxT;{D<?6cvW}WB;H#{B;j-B@bs_#gj8<dzVX$1#p~#}g@jC<
+zHjU3+`0fg;NKcQlv*S7cvXDr^X3dJ>H=i&er1}+l-PhLk2oHDSI{F$R0+5!PdUDsU
+zjJi4vz?{AiQu+9C<mAa8|M5rk`STUU#kYY`l=U<Qu#if_JUo;kA@aJq^td<`Fc9cP
+zX-Pkp%?%3L$g+0Rr=Qxpw+IjcHM+WU!owY$oG8hfvh)6(JC`R-@~W-X0&V~YfU)!}
+zG9aB{0thhz@_}{0FhH~A>;456h+&wGgp32~fX#pmpevjJ0R93#Vwk0bFhC>_zkGSX
+zo;~z5O+eVEvT{vQlKO+000lrbeVz3oumVu0+`9w)fir*}prZM!1grq{B25ff1EGKc
+zC5aM{0p9~cfB}XAcZ-TffBw0KhDI~?w-O>YC+Fod(Ex^d=IUyyuTRC29UuSpy?c#^
+zeE~9YA~S9r6^Z2O)BcAJH6CgMJ^J-yJUyvMlnTXL2M!3Usv7^LXGuw&Os1o&OU2VP
+z0>Am@*-L#&H}>sYRaHg3QRd>sn1A;vy&4xsOHxr$v8h)t@=~ADpjE4ANeChS)27un
+zkSGAZ(WC3@>pAfJFHlxi=51qhNg#*^z6abs{#YWB(6T6%%0Mr#Pz{X~AXr0V>&lhf
+zb}F5Yh}f#Hp8&)HQyJ#iks};<GBYz*nVa8an0vr_W8*u2{l&qOCILc-tgbF9D#}({
+zdjqf*_;Th<No_4H5zDeENlDSs(J9Hvd<-fqD46Tw@-?s(nA4?8bVLLPlA7nwug1k)
+zxNw0(2he8lqHb7FP~bOo=!lvc042b4clT|<!5!5HdV`l&_nkWd5a6FKUED%KI4pYG
+z15HdydjZ`~obZ}AuWk4Fa{vR3kxEa_oqIYux??R-qv;vEA<*m8sW168Qfm`1fJI&1
+z$yu|aBO*H15;U{i(E|)4BfUL6`80}YD~yrJPR*Ymb@C+P(VB!mnp+#H8$qsKu%N^B
+zVt~<7Y2<<h9qV5$ETj#A9uX1Vo}PRf>$C~fdY$t0jE;=#C>vVNIv4;3k&$2XYedv0
+zU;qo5EMm@_s1EY4R;6h4f!@*4-_D-h;o}j2g-jOd>3QnJiPs;$TAR<(0}P^~eCE&R
+z(@3qYFuJbp^umRaCr-TP`%)zT3;?}Tr+ntm=hNt_O~3%7q|)dG3r@XWz34Kf>iG4|
+ztXX^-|F#JjV2n%_?dci$8sisrT3H`3I&<brclQqWF92ie>!aq*jW~Y%^~5hOIryGH
+z?=xps%$f5>#IO4LGm93z9=$jgEYyt+edf*UaJ?8{R9)S<Pd|+~e!RW!#l5<tZk)Md
+z&YU-4{W!9&?(D*a5$zoBd6mNSfj(!>eCg)aR(cUa?%%nSn2-<;P|fHVV03-`>3Q=`
+zhKIM`coYG6UR`}PHnvzU??YdG>Ionw=9`%_w;ny3l9-sAo^CR9==(M{9G+Y!g#5Z~
+zTi12#4l9)<z;@uRhW$XT#2C5!+@eK<Wj~rc`PP*ytU_V=;fE$BCbX8k3QT@p-fnw)
+z_texLz**n{z+vxODUkTiJIf0ShOum-K=5$!VxK*GXxl?QD=rQ*GxKT)f|bA*^mRD`
+z+|trA>(OIgaj_UUZD?o}7WUDkNt85AL#QW_tcZ;@1@wTiz<mJp+ky&!Pphl#2<ZU~
+zAw-stkY#N>(9DdABqb$9cmMvzYqWuD09};{V1RO^GN`t;FJJ&zOQpf_@$WBM)HaR1
+z<oEA4x;g_`0|y5T=s~&BDX*l&qG8t>fKe=aDj@;(_EaRMrluiXyV}>(s1K`vd{a{u
+z<*pc|N@aZSo_52WSqK<Ceq38yOS^TeX?#C>w)CYocDuTFFDfjg&E!XfhTeaP<UYfw
+z7rL}Kw0(Q1re-OS0eoj>mYbVP%b-%J){h^rc&WJeqlpQJ`b(2Q>VpUVy?Yk|)j%{b
+z-@!qpQqi(VB$72Bf1Cu=0tvvXNt3v}_=;uOyLay%+`2X7x8KUR7G|!;#cl82y#%NP
+z4go&PmbFzkNf1Jw<mCLccI^}mjpe`+k!a_ZEgbZ!si_G&cyNcecj&=`94e1(i`0~q
+zHH#KG1K$FkT3TU8kG2Wzix;cq=jSiz+Ex8Jv!z1e&cML7`ZhWW*Dhc70@R<#Q$r*C
+z*fIW`O-xD$t5oT0*8IF>3+d46KpSF|Tz+A}g7A<Ko}Z}c8T?>E9<5vVb70`>*|_!^
+zFiN4gxOj2+(W89ydgXFwFd>h9eLIt0BkJofFI~z<ujbZ<gH);vKfg|+7Xu8J$u52V
+zd3Z<&H-;7#(t}j03}4@!Tefr>y++FA7eD<p?C4Prm$#gC7{sy}zP>v*Z|)p=0T`uJ
+zURu03G&q=cJhm!DGnkOf_3Jy6UL)o5xTQ;vQR>y&eAXbA&GPr((TVgLUSA)#Y}v8k
+z;MQM4k^D1Lsj@qfUJNjzzW&ORC80--wDJ<VOsSblmF4HRebc7Sp%;LW3dNPrJ`4H%
+z_tuO@>a_A8LbCn+w+94t9=(*xYs;3kMlUWo_(6o^eE)rC@~`1?`Ss<?Lw@_MdA&Fm
+zEX-7@CmS{dbtb*)>#u+DMabd9&78x%x-(FvdgAXNv~gqS(MzGY_W9>WUp*dqmBP#j
+zd9q={Pn}4w5h~U7rAv<<I@F|I0st(_78MlKs8k%@Qg22`UV~nxrKKs!$>n8bylv(S
+zl}c6o^l3HF!sgbdFkGRy`Q?{K4jv?g6crXeNJ*(~*xbU@*473tSz;0u)lDkB0(7N+
+z#}|N1p|Hl@e#D(S11l=h^!590+BA3ZVtSgkK}ku;&V>ty#>I*1>tlhp=}SZak~K6$
+z_Vy#MUF$26BpDf5?%r+h?9A-+_jlN^L0y1S0$&0B8(wYJdgK8k0ri$70vy%S8hZ1l
+zC1r!ew!#k!7A!k*MEy=839t+pNgr-f0S{mz0Du77di0o;oGhw{jcqK|i2z$5R9m|n
+zWj#4xF87tc7{m-<FO!|Vaic@Tl1inTH*Yq+y-5eK1pe&VQ%u?Kv{E9mX{e_$z?7=0
+zggbXc(9>gI68^cCmiOh$#+22%$dHh#b?X}6^Hu|BcJEHb&{hzO#r3+n<fZ+%a((^n
+ziHTh)yBO~C^Q+sntFhKt0qAz`j!Q8yzl+5xfB;#*x|uUMly-`rK3)6HJL-*VHNYAZ
+zlago8_!kJc;pl+_F#-XrZp{k>ty;yQ_>%hIK|qfla)1COfRBZRR3c$mmc4S}!hiSe
+z6INB}e)7rU)vI-MbU1vanHd?!H*G?Cx@yP}Pd~r@^e<LxE3hmZ86KW?<Ou5P`%IfQ
+z?~5-qHEFjX13+SYeDvnc;(`Lfm@$idec$Tc`~Luki^=?0^$uzP0000<MNUMnLSTYd
+CHXH8%
+
+diff --git a/v3p/rply/readme.txt b/v3p/rply/readme.txt
+deleted file mode 100644
+index 638124bc3f39c21a2fcbc453a950b026686d4a19..0000000000000000000000000000000000000000
+--- a/v3p/rply/readme.txt
++++ /dev/null
+@@ -1,24 +0,0 @@
+-June 22, 2006
+-Nhon Trinh
+-
+-This library is downloaded from http://www.cs.princeton.edu/~diego/professional/rply on June 13, 2006
+-
+-Below is the description of the library on the website:
+-
+----------------------------------------------------------------
+-RPly is a library that lets applications read and write PLY files. The PLY file format is widely used to store geometric information, such as 3D models, but is general enough to be useful for other purposes.
+-
+-There are other libraries out there, of course. I tried using them and finally decided to write my own. I tried to write it in such a way that others won't have to do it again and again. Everything that made me unhappy about the existing libraries was eliminated from RPly.
+-
+-RPly is easy to use, well documented, small, free, open-source, ANSI C, efficient, and well tested. I will keep supporting it for a while because all my tools use the library for input/output. The highlights are:
+-
+-A callback mechanism that makes PLY file input straightforward;
+-Support for the full range of numeric formats though the user only deals with doubles;
+-Binary (big and little endian) and text modes are fully supported;
+-Input and output are buffered for efficiency;
+-Available under the MIT license for added freedom.
+-The format was developed at Stanford University for use with their 3D scanning projects. Greg Turk's PLY library, available from Georgia Institute of Technology, seems to be the standard reference to the PLY file format, although there are some variations out there.
+-
+-Whatever documentation and examples were found, were taken into consideration to create RPly. In theory, since RPly doesn't try to interpret the meaning of the data in a PLY file, it should be able to read any PLY file. In practice, the library works with all PLY files that I could find.
+-------------------------------------------------------------------
+-
+diff --git a/v3p/rply/rply.c b/v3p/rply/rply.c
+deleted file mode 100644
+index bc99b135d21ccb835759ac6335b4e99c40e4decc..0000000000000000000000000000000000000000
+--- a/v3p/rply/rply.c
++++ /dev/null
+@@ -1,1570 +0,0 @@
+-/* ----------------------------------------------------------------------
+- * RPly library, read/write PLY files
+- * Diego Nehab, Princeton University
+- * http://www.cs.princeton.edu/~diego/professional/rply
+- *
+- * This library is distributed under the MIT License. See notice
+- * at the end of this file.
+- * ---------------------------------------------------------------------- */
+-#include <stdio.h>
+-#include <ctype.h>
+-#include <assert.h>
+-#include <string.h>
+-#include <limits.h>
+-#include <float.h>
+-#include <stdarg.h>
+-#include <stdlib.h>
+-#include <stddef.h>
+-
+-#include "rply.h"
+-
+-/* ----------------------------------------------------------------------
+- * Make sure we get our integer types right
+- * ---------------------------------------------------------------------- */
+-#if defined(_MSC_VER)
+-/* We are in 2006, and some compilers still fail to define C99 types! */
+-typedef __int8 t_ply_int8;
+-typedef __int16 t_ply_int16;
+-typedef __int32 t_ply_int32;
+-typedef unsigned __int8 t_ply_uint8;
+-typedef unsigned __int16 t_ply_uint16;
+-typedef unsigned __int32 t_ply_uint32;
+-#define PLY_INT8_MAX (127)
+-#define PLY_INT8_MIN (-PLY_INT8_MAX-1)
+-#define PLY_INT16_MAX (32767)
+-#define PLY_INT16_MIN (-PLY_INT16_MAX-1)
+-#define PLY_INT32_MAX (2147483647)
+-#define PLY_INT32_MIN (-PLY_INT32_MAX-1)
+-#define PLY_UINT8_MAX (255)
+-#define PLY_UINT16_MAX (65535)
+-#define PLY_UINT32_MAX (4294967295)
+-#else
+-#include <stdint.h>
+-typedef int8_t t_ply_int8;
+-typedef int16_t t_ply_int16;
+-typedef int32_t t_ply_int32;
+-typedef uint8_t t_ply_uint8;
+-typedef uint16_t t_ply_uint16;
+-typedef uint32_t t_ply_uint32;
+-#define PLY_INT8_MIN INT8_MIN
+-#define PLY_INT8_MAX INT8_MAX
+-#define PLY_INT16_MIN INT16_MIN
+-#define PLY_INT16_MAX INT16_MAX
+-#define PLY_INT32_MIN INT32_MIN
+-#define PLY_INT32_MAX INT32_MAX
+-#define PLY_UINT8_MAX UINT8_MAX
+-#define PLY_UINT16_MAX UINT16_MAX
+-#define PLY_UINT32_MAX UINT32_MAX
+-#endif
+-
+-/* ----------------------------------------------------------------------
+- * Constants
+- * ---------------------------------------------------------------------- */
+-#define WORDSIZE 256
+-#define LINESIZE 1024
+-#define BUFFERSIZE (8*1024)
+-
+-typedef enum e_ply_io_mode_ {
+-    PLY_READ,
+-    PLY_WRITE
+-} e_ply_io_mode;
+-
+-static const char *const ply_storage_mode_list[] = {
+-    "binary_big_endian", "binary_little_endian", "ascii", NULL
+-};     /* order matches e_ply_storage_mode enum */
+-
+-static const char *const ply_type_list[] = {
+-    "int8", "uint8", "int16", "uint16",
+-    "int32", "uint32", "float32", "float64",
+-    "char", "uchar", "short", "ushort",
+-    "int", "uint", "float", "double",
+-    "list", NULL
+-};     /* order matches e_ply_type enum */
+-
+-/* ----------------------------------------------------------------------
+- * Property reading callback argument
+- *
+- * element: name of element being processed
+- * property: name of property being processed
+- * nelements: number of elements of this kind in file
+- * instance_index: index current element of this kind being processed
+- * length: number of values in current list (or 1 for scalars)
+- * value_index: index of current value int this list (or 0 for scalars)
+- * value: value of property
+- * pdata/idata: user data defined with ply_set_cb
+- *
+- * Returns handle to ply file if successful, NULL otherwise.
+- * ---------------------------------------------------------------------- */
+-typedef struct t_ply_argument_ {
+-    p_ply_element element;
+-    long instance_index;
+-    p_ply_property property;
+-    long length, value_index;
+-    double value;
+-    void *pdata;
+-    long idata;
+-} t_ply_argument;
+-
+-/* ----------------------------------------------------------------------
+- * Property information
+- *
+- * name: name of this property
+- * type: type of this property (list or type of scalar value)
+- * length_type, value_type: type of list property count and values
+- * read_cb: function to be called when this property is called
+- *
+- * Returns 1 if should continue processing file, 0 if should abort.
+- * ---------------------------------------------------------------------- */
+-typedef struct t_ply_property_ {
+-    char name[WORDSIZE];
+-    e_ply_type type, value_type, length_type;
+-    p_ply_read_cb read_cb;
+-    void *pdata;
+-    long idata;
+-} t_ply_property;
+-
+-/* ----------------------------------------------------------------------
+- * Element information
+- *
+- * name: name of this property
+- * ninstances: number of elements of this type in file
+- * property: property descriptions for this element
+- * nproperty: number of properties in this element
+- *
+- * Returns 1 if should continue processing file, 0 if should abort.
+- * ---------------------------------------------------------------------- */
+-typedef struct t_ply_element_ {
+-    char name[WORDSIZE];
+-    long ninstances;
+-    p_ply_property property;
+-    long nproperties;
+-} t_ply_element;
+-
+-/* ----------------------------------------------------------------------
+- * Input/output driver
+- *
+- * Depending on file mode, different functions are used to read/write
+- * property fields. The drivers make it transparent to read/write in ascii,
+- * big endian or little endian cases.
+- * ---------------------------------------------------------------------- */
+-typedef int (*p_ply_ihandler)(p_ply ply, double *value);
+-typedef int (*p_ply_ichunk)(p_ply ply, void *anydata, size_t size);
+-typedef struct t_ply_idriver_ {
+-    p_ply_ihandler ihandler[16];
+-    p_ply_ichunk ichunk;
+-    const char *name;
+-} t_ply_idriver;
+-typedef t_ply_idriver *p_ply_idriver;
+-
+-typedef int (*p_ply_ohandler)(p_ply ply, double value);
+-typedef int (*p_ply_ochunk)(p_ply ply, void *anydata, size_t size);
+-typedef struct t_ply_odriver_ {
+-    p_ply_ohandler ohandler[16];
+-    p_ply_ochunk ochunk;
+-    const char *name;
+-} t_ply_odriver;
+-typedef t_ply_odriver *p_ply_odriver;
+-
+-/* ----------------------------------------------------------------------
+- * Ply file handle.
+- *
+- * io_mode: read or write (from e_ply_io_mode)
+- * storage_mode: mode of file associated with handle (from e_ply_storage_mode)
+- * element: elements description for this file
+- * nelement: number of different elements in file
+- * comment: comments for this file
+- * ncomments: number of comments in file
+- * obj_info: obj_info items for this file
+- * nobj_infos: number of obj_info items in file
+- * fp: file pointer associated with ply file
+- * rn: skip extra char after end_header?
+- * buffer: last word/chunck of data read from ply file
+- * buffer_first, buffer_last: interval of untouched good data in buffer
+- * buffer_token: start of parsed token (line or word) in buffer
+- * idriver, odriver: input driver used to get property fields from file
+- * argument: storage space for callback arguments
+- * welement, wproperty: element/property type being written
+- * winstance_index: index of instance of current element being written
+- * wvalue_index: index of list property value being written
+- * wlength: number of values in list property being written
+- * error_cb: error callback
+- * pdata/idata: user data defined with ply_open/ply_create
+- * ---------------------------------------------------------------------- */
+-typedef struct t_ply_ {
+-    e_ply_io_mode io_mode;
+-    e_ply_storage_mode storage_mode;
+-    p_ply_element element;
+-    long nelements;
+-    char *comment;
+-    long ncomments;
+-    char *obj_info;
+-    long nobj_infos;
+-    FILE *fp;
+-    int rn;
+-    char buffer[BUFFERSIZE];
+-    size_t buffer_first, buffer_token, buffer_last;
+-    p_ply_idriver idriver;
+-    p_ply_odriver odriver;
+-    t_ply_argument argument;
+-    long welement, wproperty;
+-    long winstance_index, wvalue_index, wlength;
+-    p_ply_error_cb error_cb;
+-    void *pdata;
+-    long idata;
+-} t_ply;
+-
+-/* ----------------------------------------------------------------------
+- * I/O functions and drivers
+- * ---------------------------------------------------------------------- */
+-static t_ply_idriver ply_idriver_ascii;
+-static t_ply_idriver ply_idriver_binary;
+-static t_ply_idriver ply_idriver_binary_reverse;
+-static t_ply_odriver ply_odriver_ascii;
+-static t_ply_odriver ply_odriver_binary;
+-static t_ply_odriver ply_odriver_binary_reverse;
+-
+-static int ply_read_word(p_ply ply);
+-static int ply_check_word(p_ply ply);
+-static int ply_read_line(p_ply ply);
+-static int ply_check_line(p_ply ply);
+-static int ply_read_chunk(p_ply ply, void *anybuffer, size_t size);
+-static int ply_read_chunk_reverse(p_ply ply, void *anybuffer, size_t size);
+-static int ply_write_chunk(p_ply ply, void *anybuffer, size_t size);
+-static int ply_write_chunk_reverse(p_ply ply, void *anybuffer, size_t size);
+-static void ply_reverse(void *anydata, size_t size);
+-
+-/* ----------------------------------------------------------------------
+- * String functions
+- * ---------------------------------------------------------------------- */
+-static int ply_find_string(const char *item, const char* const list[]);
+-static p_ply_element ply_find_element(p_ply ply, const char *name);
+-static p_ply_property ply_find_property(p_ply_element element,
+-                                        const char *name);
+-
+-/* ----------------------------------------------------------------------
+- * Header parsing
+- * ---------------------------------------------------------------------- */
+-static int ply_read_header_magic(p_ply ply);
+-static int ply_read_header_format(p_ply ply);
+-static int ply_read_header_comment(p_ply ply);
+-static int ply_read_header_obj_info(p_ply ply);
+-static int ply_read_header_property(p_ply ply);
+-static int ply_read_header_element(p_ply ply);
+-
+-/* ----------------------------------------------------------------------
+- * Error handling
+- * ---------------------------------------------------------------------- */
+-static void ply_error_cb(p_ply ply, const char *message);
+-static void ply_ferror(p_ply ply, const char *fmt, ...);
+-
+-/* ----------------------------------------------------------------------
+- * Memory allocation and initialization
+- * ---------------------------------------------------------------------- */
+-static void ply_init(p_ply ply);
+-static void ply_element_init(p_ply_element element);
+-static void ply_property_init(p_ply_property property);
+-static p_ply ply_alloc(void);
+-static p_ply_element ply_grow_element(p_ply ply);
+-static p_ply_property ply_grow_property(p_ply ply, p_ply_element element);
+-static void *ply_grow_array(p_ply ply, void **pointer, long *nmemb, long size);
+-
+-/* ----------------------------------------------------------------------
+- * Special functions
+- * ---------------------------------------------------------------------- */
+-static e_ply_storage_mode ply_arch_endian(void);
+-static int ply_type_check(void);
+-
+-/* ----------------------------------------------------------------------
+- * Auxiliary read functions
+- * ---------------------------------------------------------------------- */
+-static int ply_read_element(p_ply ply, p_ply_element element,
+-                            p_ply_argument argument);
+-static int ply_read_property(p_ply ply, p_ply_element element,
+-                             p_ply_property property, p_ply_argument argument);
+-static int ply_read_list_property(p_ply ply, p_ply_element element,
+-                                  p_ply_property property, p_ply_argument argument);
+-static int ply_read_scalar_property(p_ply ply, p_ply_element element,
+-                                    p_ply_property property, p_ply_argument argument);
+-
+-/* ----------------------------------------------------------------------
+- * Buffer support functions
+- * ---------------------------------------------------------------------- */
+-/* pointers to tokenized word and line in buffer */
+-#define BWORD(p) (p->buffer + p->buffer_token)
+-#define BLINE(p) (p->buffer + p->buffer_token)
+-
+-/* pointer to start of untouched bytes in buffer */
+-#define BFIRST(p) (p->buffer + p->buffer_first)
+-
+-/* number of bytes untouched in buffer */
+-#define BSIZE(p) (p->buffer_last - p->buffer_first)
+-
+-/* consumes data from buffer */
+-#define BSKIP(p, s) (p->buffer_first += s)
+-
+-/* refills the buffer */
+-static int BREFILL(p_ply ply) {
+-    /* move untouched data to beginning of buffer */
+-    size_t size = BSIZE(ply);
+-    memmove(ply->buffer, BFIRST(ply), size);
+-    ply->buffer_last = size;
+-    ply->buffer_first = ply->buffer_token = 0;
+-    /* fill remaining with new data */
+-    size = fread(ply->buffer+size, 1, BUFFERSIZE-size-1, ply->fp);
+-    /* place sentinel so we can use str* functions with buffer */
+-    ply->buffer[BUFFERSIZE-1] = '\0';
+-    /* check if read failed */
+-    if (size <= 0) return 0;
+-    /* increase size to account for new data */
+-    ply->buffer_last += size;
+-    return 1;
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Exported functions
+- * ---------------------------------------------------------------------- */
+-/* ----------------------------------------------------------------------
+- * Read support functions
+- * ---------------------------------------------------------------------- */
+-/* We don't care about end-of-line, generally, because we
+- * separate words by any white-space character.
+- * Unfortunately, in binary mode, right after 'end_header',
+- * we have to know *exactly* how many characters to skip */
+-/* We use the end-of-line marker after the 'ply' magic
+- * number to figure out what to do */
+-static int ply_read_header_magic(p_ply ply) {
+-    char *magic = ply->buffer;
+-    if (!BREFILL(ply)) {
+-      ply->error_cb(ply, "Unable to read magic number from file");
+-      return 0;
+-    }
+-    /* check if it is ply */
+-    if (magic[0] != 'p' || magic[1] != 'l' || magic[2] != 'y'
+-        || !isspace(magic[3])) {
+-      ply->error_cb(ply, "Wrong magic number. Expected 'ply'");
+-      return 0;
+-    }
+-    /* figure out if we have to skip the extra character */
+-    ply->rn = magic[3] == '\r' && magic[4] == '\n';
+-    BSKIP(ply, 3);
+-    return 1;
+-}
+-
+-p_ply ply_open(const char *name, p_ply_error_cb error_cb,
+-               long idata, void *pdata) {
+-    FILE *fp = NULL;
+-    p_ply ply = ply_alloc();
+-    if (error_cb == NULL) error_cb = ply_error_cb;
+-    if (!ply) {
+-        error_cb(NULL, "Out of memory");
+-        return NULL;
+-    }
+-    ply->idata = idata;
+-    ply->pdata = pdata;
+-    ply->io_mode = PLY_READ;
+-    ply->error_cb = error_cb;
+-    if (!ply_type_check()) {
+-        error_cb(ply, "Incompatible type system");
+-        free(ply);
+-        return NULL;
+-    }
+-    assert(name);
+-    fp = fopen(name, "rb");
+-    if (!fp) {
+-        error_cb(ply, "Unable to open file");
+-        free(ply);
+-        return NULL;
+-    }
+-    ply->fp = fp;
+-    return ply;
+-}
+-
+-int ply_read_header(p_ply ply) {
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    if (!ply_read_header_magic(ply)) return 0;
+-    if (!ply_read_word(ply)) return 0;
+-    /* parse file format */
+-    if (!ply_read_header_format(ply)) {
+-      ply_ferror(ply, "Invalid file format");
+-      return 0;
+-    }
+-    /* parse elements, comments or obj_infos until the end of header */
+-    while (strcmp(BWORD(ply), "end_header")) {
+-        if (!ply_read_header_comment(ply) &&
+-            !ply_read_header_element(ply) &&
+-            !ply_read_header_obj_info(ply)) {
+-          ply_ferror(ply, "Unexpected token '%s'", BWORD(ply));
+-          return 0;
+-        }
+-    }
+-    /* skip extra character? */
+-    if (ply->rn) {
+-        if (BSIZE(ply) < 1 && !BREFILL(ply)) {
+-          ply_ferror(ply, "Unexpected end of file");
+-          return 0;
+-        }
+-        BSKIP(ply, 1);
+-    }
+-    return 1;
+-}
+-
+-long ply_set_read_cb(p_ply ply, const char *element_name,
+-                     const char* property_name, p_ply_read_cb read_cb,
+-                     void *pdata, long idata) {
+-    p_ply_element element = NULL;
+-    p_ply_property property = NULL;
+-    assert(ply && element_name && property_name);
+-    element = ply_find_element(ply, element_name);
+-    if (!element) return 0;
+-    property = ply_find_property(element, property_name);
+-    if (!property) return 0;
+-    property->read_cb = read_cb;
+-    property->pdata = pdata;
+-    property->idata = idata;
+-    return (int) element->ninstances;
+-}
+-
+-int ply_read(p_ply ply) {
+-    long i;
+-    p_ply_argument argument;
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    argument = &ply->argument;
+-    /* for each element type */
+-    for (i = 0; i < ply->nelements; i++) {
+-        p_ply_element element = &ply->element[i];
+-        argument->element = element;
+-        if (!ply_read_element(ply, element, argument))
+-            return 0;
+-    }
+-    return 1;
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Write support functions
+- * ---------------------------------------------------------------------- */
+-p_ply ply_create(const char *name, e_ply_storage_mode storage_mode,
+-                 p_ply_error_cb error_cb, long idata, void *pdata) {
+-    FILE *fp = NULL;
+-    p_ply ply = ply_alloc();
+-    if (error_cb == NULL) error_cb = ply_error_cb;
+-    if (!ply) {
+-        error_cb(NULL, "Out of memory");
+-        return NULL;
+-    }
+-    if (!ply_type_check()) {
+-        error_cb(ply, "Incompatible type system");
+-        free(ply);
+-        return NULL;
+-    }
+-    assert(name && storage_mode <= PLY_DEFAULT);
+-    fp = fopen(name, "wb");
+-    if (!fp) {
+-        error_cb(ply, "Unable to create file");
+-        free(ply);
+-        return NULL;
+-    }
+-    ply->idata = idata;
+-    ply->pdata = pdata;
+-    ply->io_mode = PLY_WRITE;
+-    if (storage_mode == PLY_DEFAULT) storage_mode = ply_arch_endian();
+-    if (storage_mode == PLY_ASCII) ply->odriver = &ply_odriver_ascii;
+-    else if (storage_mode == ply_arch_endian())
+-        ply->odriver = &ply_odriver_binary;
+-    else ply->odriver = &ply_odriver_binary_reverse;
+-    ply->storage_mode = storage_mode;
+-    ply->fp = fp;
+-    ply->error_cb = error_cb;
+-    return ply;
+-}
+-
+-int ply_add_element(p_ply ply, const char *name, long ninstances) {
+-    p_ply_element element = NULL;
+-    assert(ply && ply->fp && ply->io_mode == PLY_WRITE);
+-    assert(name && strlen(name) < WORDSIZE && ninstances >= 0);
+-    if (strlen(name) >= WORDSIZE || ninstances < 0) {
+-        ply_ferror(ply, "Invalid arguments");
+-        return 0;
+-    }
+-    element = ply_grow_element(ply);
+-    if (!element) return 0;
+-    strcpy(element->name, name);
+-    element->ninstances = ninstances;
+-    return 1;
+-}
+-
+-int ply_add_scalar_property(p_ply ply, const char *name, e_ply_type type) {
+-    p_ply_element element = NULL;
+-    p_ply_property property = NULL;
+-    assert(ply && ply->fp && ply->io_mode == PLY_WRITE);
+-    assert(name && strlen(name) < WORDSIZE);
+-    assert(type < PLY_LIST);
+-    if (strlen(name) >= WORDSIZE || type >= PLY_LIST) {
+-        ply_ferror(ply, "Invalid arguments");
+-        return 0;
+-    }
+-    element = &ply->element[ply->nelements-1];
+-    property = ply_grow_property(ply, element);
+-    if (!property) return 0;
+-    strcpy(property->name, name);
+-    property->type = type;
+-    return 1;
+-}
+-
+-int ply_add_list_property(p_ply ply, const char *name,
+-                          e_ply_type length_type, e_ply_type value_type) {
+-    p_ply_element element = NULL;
+-    p_ply_property property = NULL;
+-    assert(ply && ply->fp && ply->io_mode == PLY_WRITE);
+-    assert(name && strlen(name) < WORDSIZE);
+-    if (strlen(name) >= WORDSIZE) {
+-        ply_ferror(ply, "Invalid arguments");
+-        return 0;
+-    }
+-    assert(length_type < PLY_LIST);
+-    assert(value_type < PLY_LIST);
+-    if (length_type >= PLY_LIST || value_type >= PLY_LIST) {
+-        ply_ferror(ply, "Invalid arguments");
+-        return 0;
+-    }
+-    element = &ply->element[ply->nelements-1];
+-    property = ply_grow_property(ply, element);
+-    if (!property) return 0;
+-    strcpy(property->name, name);
+-    property->type = PLY_LIST;
+-    property->length_type = length_type;
+-    property->value_type = value_type;
+-    return 1;
+-}
+-
+-int ply_add_property(p_ply ply, const char *name, e_ply_type type,
+-                     e_ply_type length_type, e_ply_type value_type) {
+-    if (type == PLY_LIST)
+-        return ply_add_list_property(ply, name, length_type, value_type);
+-    else
+-        return ply_add_scalar_property(ply, name, type);
+-}
+-
+-int ply_add_comment(p_ply ply, const char *comment) {
+-    char *new_comment = NULL;
+-    assert(ply && comment && strlen(comment) < LINESIZE);
+-    if (!comment || strlen(comment) >= LINESIZE) {
+-        ply_ferror(ply, "Invalid arguments");
+-        return 0;
+-    }
+-    new_comment = (char *) ply_grow_array(ply, (void **) &ply->comment,
+-            &ply->ncomments, LINESIZE);
+-    if (!new_comment) return 0;
+-    strcpy(new_comment, comment);
+-    return 1;
+-}
+-
+-int ply_add_obj_info(p_ply ply, const char *obj_info) {
+-    char *new_obj_info = NULL;
+-    assert(ply && obj_info && strlen(obj_info) < LINESIZE);
+-    if (!obj_info || strlen(obj_info) >= LINESIZE) {
+-        ply_ferror(ply, "Invalid arguments");
+-        return 0;
+-    }
+-    new_obj_info = (char *) ply_grow_array(ply, (void **) &ply->obj_info,
+-            &ply->nobj_infos, LINESIZE);
+-    if (!new_obj_info) return 0;
+-    strcpy(new_obj_info, obj_info);
+-    return 1;
+-}
+-
+-int ply_write_header(p_ply ply) {
+-    long i, j;
+-    assert(ply && ply->fp && ply->io_mode == PLY_WRITE);
+-    assert(ply->element || ply->nelements == 0);
+-    assert(!ply->element || ply->nelements > 0);
+-    if (fprintf(ply->fp, "ply\nformat %s 1.0\n",
+-                ply_storage_mode_list[ply->storage_mode]) <= 0) goto error;
+-    for (i = 0; i < ply->ncomments; i++)
+-        if (fprintf(ply->fp, "comment %s\n", ply->comment + LINESIZE*i) <= 0)
+-            goto error;
+-    for (i = 0; i < ply->nobj_infos; i++)
+-        if (fprintf(ply->fp, "obj_info %s\n", ply->obj_info + LINESIZE*i) <= 0)
+-            goto error;
+-    for (i = 0; i < ply->nelements; i++) {
+-        p_ply_element element = &ply->element[i];
+-        assert(element->property || element->nproperties == 0);
+-        assert(!element->property || element->nproperties > 0);
+-        if (fprintf(ply->fp, "element %s %ld\n", element->name,
+-                    element->ninstances) <= 0) goto error;
+-        for (j = 0; j < element->nproperties; j++) {
+-            p_ply_property property = &element->property[j];
+-            if (property->type == PLY_LIST) {
+-                if (fprintf(ply->fp, "property list %s %s %s\n",
+-                            ply_type_list[property->length_type],
+-                            ply_type_list[property->value_type],
+-                            property->name) <= 0) goto error;
+-            } else {
+-                if (fprintf(ply->fp, "property %s %s\n",
+-                            ply_type_list[property->type],
+-                            property->name) <= 0) goto error;
+-            }
+-        }
+-    }
+-    return fprintf(ply->fp, "end_header\n") > 0;
+-error:
+-    ply_ferror(ply, "Error writing to file");
+-    return 0;
+-}
+-
+-int ply_write(p_ply ply, double value) {
+-    p_ply_element element = NULL;
+-    p_ply_property property = NULL;
+-    int type = -1;
+-    int breakafter = 0;
+-    if (ply->welement > ply->nelements) return 0;
+-    element = &ply->element[ply->welement];
+-    if (ply->wproperty > element->nproperties) return 0;
+-    property = &element->property[ply->wproperty];
+-    if (property->type == PLY_LIST) {
+-        if (ply->wvalue_index == 0) {
+-            type = property->length_type;
+-            ply->wlength = (long) value;
+-        } else type = property->value_type;
+-    } else {
+-        type = property->type;
+-        ply->wlength = 0;
+-    }
+-    if (!ply->odriver->ohandler[type](ply, value)) {
+-        ply_ferror(ply, "Failed writing %s of %s %d (%s: %s)",
+-                   property->name, element->name,
+-                   ply->winstance_index,
+-                   ply->odriver->name, ply_type_list[type]);
+-        return 0;
+-    }
+-    ply->wvalue_index++;
+-    if (ply->wvalue_index > ply->wlength) {
+-        ply->wvalue_index = 0;
+-        ply->wproperty++;
+-    }
+-    if (ply->wproperty >= element->nproperties) {
+-        ply->wproperty = 0;
+-        ply->winstance_index++;
+-        if (ply->storage_mode == PLY_ASCII) breakafter = 1;
+-    }
+-    if (ply->winstance_index >= element->ninstances) {
+-        ply->winstance_index = 0;
+-        ply->welement++;
+-    }
+-    return !breakafter || putc('\n', ply->fp) > 0;
+-}
+-
+-int ply_close(p_ply ply) {
+-    long i;
+-    assert(ply && ply->fp);
+-    assert(ply->element || ply->nelements == 0);
+-    assert(!ply->element || ply->nelements > 0);
+-    /* write last chunk to file */
+-    if (ply->io_mode == PLY_WRITE &&
+-        fwrite(ply->buffer, 1, ply->buffer_last, ply->fp) < ply->buffer_last) {
+-      ply_ferror(ply, "Error closing up");
+-      return 0;
+-    }
+-    fclose(ply->fp);
+-    /* free all memory used by handle */
+-    if (ply->element) {
+-        for (i = 0; i < ply->nelements; i++) {
+-            p_ply_element element = &ply->element[i];
+-            if (element->property) free(element->property);
+-        }
+-        free(ply->element);
+-    }
+-    if (ply->obj_info) free(ply->obj_info);
+-    if (ply->comment) free(ply->comment);
+-    free(ply);
+-    return 1;
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Query support functions
+- * ---------------------------------------------------------------------- */
+-p_ply_element ply_get_next_element(p_ply ply,
+-                                   p_ply_element last) {
+-    assert(ply);
+-    if (!last) return ply->element;
+-    last++;
+-    if (last < ply->element + ply->nelements) return last;
+-    else return NULL;
+-}
+-
+-int ply_get_element_info(p_ply_element element, const char** name,
+-                         long *ninstances) {
+-    assert(element);
+-    if (name) *name = element->name;
+-    if (ninstances) *ninstances = (long) element->ninstances;
+-    return 1;
+-}
+-
+-p_ply_property ply_get_next_property(p_ply_element element,
+-                                     p_ply_property last) {
+-    assert(element);
+-    if (!last) return element->property;
+-    last++;
+-    if (last < element->property + element->nproperties) return last;
+-    else return NULL;
+-}
+-
+-int ply_get_property_info(p_ply_property property, const char** name,
+-                          e_ply_type *type, e_ply_type *length_type, e_ply_type *value_type) {
+-    assert(property);
+-    if (name) *name = property->name;
+-    if (type) *type = property->type;
+-    if (length_type) *length_type = property->length_type;
+-    if (value_type) *value_type = property->value_type;
+-    return 1;
+-}
+-
+-const char *ply_get_next_comment(p_ply ply, const char *last) {
+-    assert(ply);
+-    if (!last) return ply->comment;
+-    last += LINESIZE;
+-    if (last < ply->comment + LINESIZE*ply->ncomments) return last;
+-    else return NULL;
+-}
+-
+-const char *ply_get_next_obj_info(p_ply ply, const char *last) {
+-    assert(ply);
+-    if (!last) return ply->obj_info;
+-    last += LINESIZE;
+-    if (last < ply->obj_info + LINESIZE*ply->nobj_infos) return last;
+-    else return NULL;
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Callback argument support functions
+- * ---------------------------------------------------------------------- */
+-int ply_get_argument_element(p_ply_argument argument,
+-                             p_ply_element *element, long *instance_index) {
+-    assert(argument);
+-    if (!argument) return 0;
+-    if (element) *element = argument->element;
+-    if (instance_index) *instance_index = argument->instance_index;
+-    return 1;
+-}
+-
+-int ply_get_argument_property(p_ply_argument argument,
+-                              p_ply_property *property, long *length, long *value_index) {
+-    assert(argument);
+-    if (!argument) return 0;
+-    if (property) *property = argument->property;
+-    if (length) *length = argument->length;
+-    if (value_index) *value_index = argument->value_index;
+-    return 1;
+-}
+-
+-int ply_get_argument_user_data(p_ply_argument argument, void **pdata,
+-                               long *idata) {
+-    assert(argument);
+-    if (!argument) return 0;
+-    if (pdata) *pdata = argument->pdata;
+-    if (idata) *idata = argument->idata;
+-    return 1;
+-}
+-
+-double ply_get_argument_value(p_ply_argument argument) {
+-    assert(argument);
+-    if (!argument) return 0.0;
+-    return argument->value;
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Internal functions
+- * ---------------------------------------------------------------------- */
+-static int ply_read_list_property(p_ply ply, p_ply_element element,
+-                                  p_ply_property property, p_ply_argument argument) {
+-    int l;
+-    p_ply_read_cb read_cb = property->read_cb;
+-    p_ply_ihandler *driver = ply->idriver->ihandler;
+-    /* get list length */
+-    p_ply_ihandler handler = driver[property->length_type];
+-    double length;
+-    if (!handler(ply, &length)) {
+-        ply_ferror(ply, "Error reading '%s' of '%s' number %d",
+-                   property->name, element->name, argument->instance_index);
+-        return 0;
+-    }
+-    /* invoke callback to pass length in value field */
+-    argument->length = (long) length;
+-    argument->value_index = -1;
+-    argument->value = length;
+-    if (read_cb && !read_cb(argument)) {
+-        ply_ferror(ply, "Aborted by user");
+-        return 0;
+-    }
+-    /* read list values */
+-    handler = driver[property->value_type];
+-    /* for each value in list */
+-    for (l = 0; l < (long) length; l++) {
+-        /* read value from file */
+-        argument->value_index = l;
+-        if (!handler(ply, &argument->value)) {
+-            ply_ferror(ply, "Error reading value number %d of '%s' of "
+-                       "'%s' number %d", l+1, property->name,
+-                       element->name, argument->instance_index);
+-            return 0;
+-        }
+-        /* invoke callback to pass value */
+-        if (read_cb && !read_cb(argument)) {
+-            ply_ferror(ply, "Aborted by user");
+-            return 0;
+-        }
+-    }
+-    return 1;
+-}
+-
+-static int ply_read_scalar_property(p_ply ply, p_ply_element element,
+-                                    p_ply_property property, p_ply_argument argument) {
+-    p_ply_read_cb read_cb = property->read_cb;
+-    p_ply_ihandler *driver = ply->idriver->ihandler;
+-    p_ply_ihandler handler = driver[property->type];
+-    argument->length = 1;
+-    argument->value_index = 0;
+-    if (!handler(ply, &argument->value)) {
+-        ply_ferror(ply, "Error reading '%s' of '%s' number %d",
+-                   property->name, element->name, argument->instance_index);
+-        return 0;
+-    }
+-    if (read_cb && !read_cb(argument)) {
+-        ply_ferror(ply, "Aborted by user");
+-        return 0;
+-    }
+-    return 1;
+-}
+-
+-static int ply_read_property(p_ply ply, p_ply_element element,
+-                             p_ply_property property, p_ply_argument argument) {
+-    if (property->type == PLY_LIST)
+-        return ply_read_list_property(ply, element, property, argument);
+-    else
+-        return ply_read_scalar_property(ply, element, property, argument);
+-}
+-
+-static int ply_read_element(p_ply ply, p_ply_element element,
+-                            p_ply_argument argument) {
+-    long j, k;
+-    /* for each element of this type */
+-    for (j = 0; j < element->ninstances; j++) {
+-        argument->instance_index = j;
+-        /* for each property */
+-        for (k = 0; k < element->nproperties; k++) {
+-            p_ply_property property = &element->property[k];
+-            argument->property = property;
+-            argument->pdata = property->pdata;
+-            argument->idata = property->idata;
+-            if (!ply_read_property(ply, element, property, argument))
+-                return 0;
+-        }
+-    }
+-    return 1;
+-}
+-
+-static int ply_find_string(const char *item, const char* const list[]) {
+-    int i;
+-    assert(item && list);
+-    for (i = 0; list[i]; i++)
+-        if (!strcmp(list[i], item)) return i;
+-    return -1;
+-}
+-
+-static p_ply_element ply_find_element(p_ply ply, const char *name) {
+-    p_ply_element element;
+-    int i, nelements;
+-    assert(ply && name);
+-    element = ply->element;
+-    nelements = ply->nelements;
+-    assert(element || nelements == 0);
+-    assert(!element || nelements > 0);
+-    for (i = 0; i < nelements; i++)
+-        if (!strcmp(element[i].name, name)) return &element[i];
+-    return NULL;
+-}
+-
+-static p_ply_property ply_find_property(p_ply_element element,
+-                                        const char *name) {
+-    p_ply_property property;
+-    int i, nproperties;
+-    assert(element && name);
+-    property = element->property;
+-    nproperties = element->nproperties;
+-    assert(property || nproperties == 0);
+-    assert(!property || nproperties > 0);
+-    for (i = 0; i < nproperties; i++)
+-        if (!strcmp(property[i].name, name)) return &property[i];
+-    return NULL;
+-}
+-
+-static int ply_check_word(p_ply ply) {
+-    if (strlen(BLINE(ply)) >= WORDSIZE) {
+-        ply_ferror(ply, "Word too long");
+-        return 0;
+-    }
+-    return 1;
+-}
+-
+-static int ply_read_word(p_ply ply) {
+-    size_t t = 0;
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    /* skip leading blanks */
+-    while (1) {
+-        t = strspn(BFIRST(ply), " \n\r\t");
+-        /* check if all buffer was made of blanks */
+-        if (t >= BSIZE(ply)) {
+-            if (!BREFILL(ply)) {
+-                ply_ferror(ply, "Unexpected end of file");
+-                return 0;
+-            }
+-        } else break;
+-    }
+-    BSKIP(ply, t);
+-    /* look for a space after the current word */
+-    t = strcspn(BFIRST(ply), " \n\r\t");
+-    /* if we didn't reach the end of the buffer, we are done */
+-    if (t < BSIZE(ply)) {
+-        ply->buffer_token = ply->buffer_first;
+-        BSKIP(ply, t);
+-        *BFIRST(ply) = '\0';
+-        BSKIP(ply, 1);
+-        return ply_check_word(ply);
+-    }
+-    /* otherwise, try to refill buffer */
+-    if (!BREFILL(ply)) {
+-        ply_ferror(ply, "Unexpected end of file");
+-        return 0;
+-    }
+-    /* keep looking from where we left */
+-    t += strcspn(BFIRST(ply) + t, " \n\r\t");
+-    /* check if the token is too large for our buffer */
+-    if (t >= BSIZE(ply)) {
+-        ply_ferror(ply, "Token too large");
+-        return 0;
+-    }
+-    /* we are done */
+-    ply->buffer_token = ply->buffer_first;
+-    BSKIP(ply, t);
+-    *BFIRST(ply) = '\0';
+-    BSKIP(ply, 1);
+-    return ply_check_word(ply);
+-}
+-
+-static int ply_check_line(p_ply ply) {
+-    if (strlen(BLINE(ply)) >= LINESIZE) {
+-        ply_ferror(ply, "Line too long");
+-        return 0;
+-    }
+-    return 1;
+-}
+-
+-static int ply_read_line(p_ply ply) {
+-    const char *end = NULL;
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    /* look for a end of line */
+-    end = strchr(BFIRST(ply), '\n');
+-    /* if we didn't reach the end of the buffer, we are done */
+-    if (end) {
+-        ply->buffer_token = ply->buffer_first;
+-        BSKIP(ply, end - BFIRST(ply));
+-        *BFIRST(ply) = '\0';
+-        BSKIP(ply, 1);
+-        return ply_check_line(ply);
+-    } else {
+-        end = ply->buffer + BSIZE(ply);
+-        /* otherwise, try to refill buffer */
+-        if (!BREFILL(ply)) {
+-            ply_ferror(ply, "Unexpected end of file");
+-            return 0;
+-        }
+-    }
+-    /* keep looking from where we left */
+-    end = strchr(end, '\n');
+-    /* check if the token is too large for our buffer */
+-    if (!end) {
+-        ply_ferror(ply, "Token too large");
+-        return 0;
+-    }
+-    /* we are done */
+-    ply->buffer_token = ply->buffer_first;
+-    BSKIP(ply, end - BFIRST(ply));
+-    *BFIRST(ply) = '\0';
+-    BSKIP(ply, 1);
+-    return ply_check_line(ply);
+-}
+-
+-static int ply_read_chunk(p_ply ply, void *anybuffer, size_t size) {
+-    char *buffer = (char *) anybuffer;
+-    size_t i = 0;
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    assert(ply->buffer_first <= ply->buffer_last);
+-    while (i < size) {
+-        if (ply->buffer_first < ply->buffer_last) {
+-            buffer[i] = ply->buffer[ply->buffer_first];
+-            ply->buffer_first++;
+-            i++;
+-        } else {
+-            ply->buffer_first = 0;
+-            ply->buffer_last = fread(ply->buffer, 1, BUFFERSIZE, ply->fp);
+-            if (ply->buffer_last <= 0) return 0;
+-        }
+-    }
+-    return 1;
+-}
+-
+-static int ply_write_chunk(p_ply ply, void *anybuffer, size_t size) {
+-    char *buffer = (char *) anybuffer;
+-    size_t i = 0;
+-    assert(ply && ply->fp && ply->io_mode == PLY_WRITE);
+-    assert(ply->buffer_last <= BUFFERSIZE);
+-    while (i < size) {
+-        if (ply->buffer_last < BUFFERSIZE) {
+-            ply->buffer[ply->buffer_last] = buffer[i];
+-            ply->buffer_last++;
+-            i++;
+-        } else {
+-            ply->buffer_last = 0;
+-            if (fwrite(ply->buffer, 1, BUFFERSIZE, ply->fp) < BUFFERSIZE)
+-                return 0;
+-        }
+-    }
+-    return 1;
+-}
+-
+-static int ply_write_chunk_reverse(p_ply ply, void *anybuffer, size_t size) {
+-    int ret = 0;
+-    ply_reverse(anybuffer, size);
+-    ret = ply_write_chunk(ply, anybuffer, size);
+-    ply_reverse(anybuffer, size);
+-    return ret;
+-}
+-
+-static int ply_read_chunk_reverse(p_ply ply, void *anybuffer, size_t size) {
+-    if (!ply_read_chunk(ply, anybuffer, size)) return 0;
+-    ply_reverse(anybuffer, size);
+-    return 1;
+-}
+-
+-static void ply_reverse(void *anydata, size_t size) {
+-    char *data = (char *) anydata;
+-    char temp;
+-    size_t i;
+-    for (i = 0; i < size/2; i++) {
+-        temp = data[i];
+-        data[i] = data[size-i-1];
+-        data[size-i-1] = temp;
+-    }
+-}
+-
+-static void ply_init(p_ply ply) {
+-    ply->element = NULL;
+-    ply->nelements = 0;
+-    ply->comment = NULL;
+-    ply->ncomments = 0;
+-    ply->obj_info = NULL;
+-    ply->nobj_infos = 0;
+-    ply->idriver = NULL;
+-    ply->odriver = NULL;
+-    ply->buffer[0] = '\0';
+-    ply->buffer_first = ply->buffer_last = ply->buffer_token = 0;
+-    ply->welement = 0;
+-    ply->wproperty = 0;
+-    ply->winstance_index = 0;
+-    ply->wlength = 0;
+-    ply->wvalue_index = 0;
+-}
+-
+-static void ply_element_init(p_ply_element element) {
+-    element->name[0] = '\0';
+-    element->ninstances = 0;
+-    element->property = NULL;
+-    element->nproperties = 0;
+-}
+-
+-static void ply_property_init(p_ply_property property) {
+-    property->name[0] = '\0';
+-    property->type = -1;
+-    property->length_type = -1;
+-    property->value_type = -1;
+-    property->read_cb = (p_ply_read_cb) NULL;
+-    property->pdata = NULL;
+-    property->idata = 0;
+-}
+-
+-static p_ply ply_alloc(void) {
+-    p_ply ply = (p_ply) malloc(sizeof(t_ply));
+-    if (!ply) return NULL;
+-    ply_init(ply);
+-    return ply;
+-}
+-
+-static void *ply_grow_array(p_ply ply, void **pointer,
+-                            long *nmemb, long size) {
+-    void *temp = *pointer;
+-    long count = *nmemb + 1;
+-    if (!temp) temp = malloc(count*size);
+-    else {
+-      void * newtmp= realloc(temp, count*size);
+-      if (newtmp == NULL ) {
+-        ply_ferror(ply, "Out of memory");
+-        return NULL;
+-      }
+-      else {
+-        temp = newtmp;
+-      }
+-    }
+-    *pointer = temp;
+-    *nmemb = count;
+-    return (char *) temp + (count-1) * size;
+-}
+-
+-static p_ply_element ply_grow_element(p_ply ply) {
+-    p_ply_element element = NULL;
+-    assert(ply);
+-    assert(ply->element || ply->nelements == 0);
+-    assert(!ply->element || ply->nelements > 0);
+-    element = (p_ply_element) ply_grow_array(ply, (void **) &ply->element,
+-            &ply->nelements, sizeof(t_ply_element));
+-    if (!element) return NULL;
+-    ply_element_init(element);
+-    return element;
+-}
+-
+-static p_ply_property ply_grow_property(p_ply ply, p_ply_element element) {
+-    p_ply_property property = NULL;
+-    assert(ply);
+-    assert(element);
+-    assert(element->property || element->nproperties == 0);
+-    assert(!element->property || element->nproperties > 0);
+-    property = (p_ply_property) ply_grow_array(ply,
+-            (void **) &element->property,
+-            &element->nproperties, sizeof(t_ply_property));
+-    if (!property) return NULL;
+-    ply_property_init(property);
+-    return property;
+-}
+-
+-static int ply_read_header_format(p_ply ply) {
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    if (strcmp(BWORD(ply), "format")) return 0;
+-    if (!ply_read_word(ply)) return 0;
+-    ply->storage_mode = ply_find_string(BWORD(ply), ply_storage_mode_list);
+-    if (ply->storage_mode == (e_ply_storage_mode) (-1)) return 0;
+-    if (ply->storage_mode == PLY_ASCII) ply->idriver = &ply_idriver_ascii;
+-    else if (ply->storage_mode == ply_arch_endian())
+-        ply->idriver = &ply_idriver_binary;
+-    else ply->idriver = &ply_idriver_binary_reverse;
+-    if (!ply_read_word(ply)) return 0;
+-    if (strcmp(BWORD(ply), "1.0")) return 0;
+-    if (!ply_read_word(ply)) return 0;
+-    return 1;
+-}
+-
+-static int ply_read_header_comment(p_ply ply) {
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    if (strcmp(BWORD(ply), "comment")) return 0;
+-    if (!ply_read_line(ply)) return 0;
+-    if (!ply_add_comment(ply, BLINE(ply))) return 0;
+-    if (!ply_read_word(ply)) return 0;
+-    return 1;
+-}
+-
+-static int ply_read_header_obj_info(p_ply ply) {
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    if (strcmp(BWORD(ply), "obj_info")) return 0;
+-    if (!ply_read_line(ply)) return 0;
+-    if (!ply_add_obj_info(ply, BLINE(ply))) return 0;
+-    if (!ply_read_word(ply)) return 0;
+-    return 1;
+-}
+-
+-static int ply_read_header_property(p_ply ply) {
+-    p_ply_element element = NULL;
+-    p_ply_property property = NULL;
+-    /* make sure it is a property */
+-    if (strcmp(BWORD(ply), "property")) return 0;
+-    element = &ply->element[ply->nelements-1];
+-    property = ply_grow_property(ply, element);
+-    if (!property) return 0;
+-    /* get property type */
+-    if (!ply_read_word(ply)) return 0;
+-    property->type = ply_find_string(BWORD(ply), ply_type_list);
+-    if (property->type == (e_ply_type) (-1)) return 0;
+-    if (property->type == PLY_LIST) {
+-        /* if it's a list, we need the base types */
+-        if (!ply_read_word(ply)) return 0;
+-        property->length_type = ply_find_string(BWORD(ply), ply_type_list);
+-        if (property->length_type == (e_ply_type) (-1)) return 0;
+-        if (!ply_read_word(ply)) return 0;
+-        property->value_type = ply_find_string(BWORD(ply), ply_type_list);
+-        if (property->value_type == (e_ply_type) (-1)) return 0;
+-    }
+-    /* get property name */
+-    if (!ply_read_word(ply)) return 0;
+-    strcpy(property->name, BWORD(ply));
+-    if (!ply_read_word(ply)) return 0;
+-    return 1;
+-}
+-
+-static int ply_read_header_element(p_ply ply) {
+-    p_ply_element element = NULL;
+-    long dummy;
+-    assert(ply && ply->fp && ply->io_mode == PLY_READ);
+-    if (strcmp(BWORD(ply), "element")) return 0;
+-    /* allocate room for new element */
+-    element = ply_grow_element(ply);
+-    if (!element) return 0;
+-    /* get element name */
+-    if (!ply_read_word(ply)) return 0;
+-    strcpy(element->name, BWORD(ply));
+-    /* get number of elements of this type */
+-    if (!ply_read_word(ply)) return 0;
+-    if (sscanf(BWORD(ply), "%ld", &dummy) != 1) {
+-        ply_ferror(ply, "Expected number got '%s'", BWORD(ply));
+-        return 0;
+-    }
+-    element->ninstances = dummy;
+-    /* get all properties for this element */
+-    if (!ply_read_word(ply)) return 0;
+-    while (ply_read_header_property(ply) ||
+-           ply_read_header_comment(ply) || ply_read_header_obj_info(ply))
+-        /* do nothing */;
+-    return 1;
+-}
+-
+-static void ply_error_cb(p_ply ply, const char *message) {
+-    (void) ply;
+-    fprintf(stderr, "RPly: %s\n", message);
+-}
+-
+-static void ply_ferror(p_ply ply, const char *fmt, ...) {
+-    char buffer[1024];
+-    va_list ap;
+-    va_start(ap, fmt);
+-    vsprintf(buffer, fmt, ap);
+-    va_end(ap);
+-    ply->error_cb(ply, buffer);
+-}
+-
+-static e_ply_storage_mode ply_arch_endian(void) {
+-    unsigned long i = 1;
+-    unsigned char *s = (unsigned char *) &i;
+-    if (*s == 1) return PLY_LITTLE_ENDIAN;
+-    else return PLY_BIG_ENDIAN;
+-}
+-
+-static int ply_type_check(void) {
+-    assert(sizeof(t_ply_int8) == 1);
+-    assert(sizeof(t_ply_uint8) == 1);
+-    assert(sizeof(t_ply_int16) == 2);
+-    assert(sizeof(t_ply_uint16) == 2);
+-    assert(sizeof(t_ply_int32) == 4);
+-    assert(sizeof(t_ply_uint32) == 4);
+-    assert(sizeof(float) == 4);
+-    assert(sizeof(double) == 8);
+-    if (sizeof(t_ply_int8) != 1) return 0;
+-    if (sizeof(t_ply_uint8) != 1) return 0;
+-    if (sizeof(t_ply_int16) != 2) return 0;
+-    if (sizeof(t_ply_uint16) != 2) return 0;
+-    if (sizeof(t_ply_int32) != 4) return 0;
+-    if (sizeof(t_ply_uint32) != 4) return 0;
+-    if (sizeof(float) != 4) return 0;
+-    if (sizeof(double) != 8) return 0;
+-    return 1;
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Output handlers
+- * ---------------------------------------------------------------------- */
+-static int oascii_int8(p_ply ply, double value) {
+-    if (value > PLY_INT8_MAX || value < PLY_INT8_MIN) return 0;
+-    return fprintf(ply->fp, "%d ", (t_ply_int8) value) > 0;
+-}
+-
+-static int oascii_uint8(p_ply ply, double value) {
+-    if (value > PLY_UINT8_MAX || value < 0) return 0;
+-    return fprintf(ply->fp, "%d ", (t_ply_uint8) value) > 0;
+-}
+-
+-static int oascii_int16(p_ply ply, double value) {
+-    if (value > PLY_INT16_MAX || value < PLY_INT16_MIN) return 0;
+-    return fprintf(ply->fp, "%d ", (t_ply_int16) value) > 0;
+-}
+-
+-static int oascii_uint16(p_ply ply, double value) {
+-    if (value > PLY_UINT16_MAX || value < 0) return 0;
+-    return fprintf(ply->fp, "%d ", (t_ply_uint16) value) > 0;
+-}
+-
+-static int oascii_int32(p_ply ply, double value) {
+-    if (value > PLY_INT32_MAX || value < PLY_INT32_MIN) return 0;
+-    return fprintf(ply->fp, "%d ", (t_ply_int32) value) > 0;
+-}
+-
+-static int oascii_uint32(p_ply ply, double value) {
+-    if (value > PLY_UINT32_MAX || value < 0) return 0;
+-    return fprintf(ply->fp, "%d ", (t_ply_uint32) value) > 0;
+-}
+-
+-static int oascii_float32(p_ply ply, double value) {
+-    if (value < -FLT_MAX || value > FLT_MAX) return 0;
+-    return fprintf(ply->fp, "%g ", (float) value) > 0;
+-}
+-
+-static int oascii_float64(p_ply ply, double value) {
+-    if (value < -DBL_MAX || value > DBL_MAX) return 0;
+-    //return fprintf(ply->fp, "%g ", value) > 0; //Ming the original %g does not work
+-    return fprintf(ply->fp, "%.16f ", value) > 0;
+-}
+-
+-static int obinary_int8(p_ply ply, double value) {
+-    t_ply_int8 int8 = (t_ply_int8) value;
+-    if (value > PLY_INT8_MAX || value < PLY_INT8_MIN) return 0;
+-    return ply->odriver->ochunk(ply, &int8, sizeof(int8));
+-}
+-
+-static int obinary_uint8(p_ply ply, double value) {
+-    t_ply_uint8 uint8 = (t_ply_uint8) value;
+-    if (value > PLY_UINT8_MAX || value < 0) return 0;
+-    return ply->odriver->ochunk(ply, &uint8, sizeof(uint8));
+-}
+-
+-static int obinary_int16(p_ply ply, double value) {
+-    t_ply_int16 int16 = (t_ply_int16) value;
+-    if (value > PLY_INT16_MAX || value < PLY_INT16_MIN) return 0;
+-    return ply->odriver->ochunk(ply, &int16, sizeof(int16));
+-}
+-
+-static int obinary_uint16(p_ply ply, double value) {
+-    t_ply_uint16 uint16 = (t_ply_uint16) value;
+-    if (value > PLY_UINT16_MAX || value < 0) return 0;
+-    return ply->odriver->ochunk(ply, &uint16, sizeof(uint16));
+-}
+-
+-static int obinary_int32(p_ply ply, double value) {
+-    t_ply_int32 int32 = (t_ply_int32) value;
+-    if (value > PLY_INT32_MAX || value < PLY_INT32_MIN) return 0;
+-    return ply->odriver->ochunk(ply, &int32, sizeof(int32));
+-}
+-
+-static int obinary_uint32(p_ply ply, double value) {
+-    t_ply_uint32 uint32 = (t_ply_uint32) value;
+-    if (value > PLY_UINT32_MAX || value < 0) return 0;
+-    return ply->odriver->ochunk(ply, &uint32, sizeof(uint32));
+-}
+-
+-static int obinary_float32(p_ply ply, double value) {
+-    float float32 = (float) value;
+-    if (value > FLT_MAX || value < -FLT_MAX) return 0;
+-    return ply->odriver->ochunk(ply, &float32, sizeof(float32));
+-}
+-
+-static int obinary_float64(p_ply ply, double value) {
+-    return ply->odriver->ochunk(ply, &value, sizeof(value));
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Input  handlers
+- * ---------------------------------------------------------------------- */
+-static int iascii_int8(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtol(BWORD(ply), &end, 10);
+-    if (*end || *value > PLY_INT8_MAX || *value < PLY_INT8_MIN) return 0;
+-    return 1;
+-}
+-
+-static int iascii_uint8(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtol(BWORD(ply), &end, 10);
+-    if (*end || *value > PLY_UINT8_MAX || *value < 0) return 0;
+-    return 1;
+-}
+-
+-static int iascii_int16(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtol(BWORD(ply), &end, 10);
+-    if (*end || *value > PLY_INT16_MAX || *value < PLY_INT16_MIN) return 0;
+-    return 1;
+-}
+-
+-static int iascii_uint16(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtol(BWORD(ply), &end, 10);
+-    if (*end || *value > PLY_UINT16_MAX || *value < 0) return 0;
+-    return 1;
+-}
+-
+-static int iascii_int32(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtol(BWORD(ply), &end, 10);
+-    if (*end || *value > PLY_INT32_MAX || *value < PLY_INT32_MIN) return 0;
+-    return 1;
+-}
+-
+-static int iascii_uint32(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtol(BWORD(ply), &end, 10);
+-    if (*end || *value > PLY_UINT32_MAX || *value < 0) return 0;
+-    return 1;
+-}
+-
+-static int iascii_float32(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtod(BWORD(ply), &end);
+-    if (*end || *value < -FLT_MAX || *value > FLT_MAX) return 0;
+-    return 1;
+-}
+-
+-static int iascii_float64(p_ply ply, double *value) {
+-    char *end;
+-    if (!ply_read_word(ply)) return 0;
+-    *value = strtod(BWORD(ply), &end);
+-    if (*end || *value < -DBL_MAX || *value > DBL_MAX) return 0;
+-    return 1;
+-}
+-
+-static int ibinary_int8(p_ply ply, double *value) {
+-    t_ply_int8 int8;
+-    if (!ply->idriver->ichunk(ply, &int8, 1)) return 0;
+-    *value = int8;
+-    return 1;
+-}
+-
+-static int ibinary_uint8(p_ply ply, double *value) {
+-    t_ply_uint8 uint8;
+-    if (!ply->idriver->ichunk(ply, &uint8, 1)) return 0;
+-    *value = uint8;
+-    return 1;
+-}
+-
+-static int ibinary_int16(p_ply ply, double *value) {
+-    t_ply_int16 int16;
+-    if (!ply->idriver->ichunk(ply, &int16, sizeof(int16))) return 0;
+-    *value = int16;
+-    return 1;
+-}
+-
+-static int ibinary_uint16(p_ply ply, double *value) {
+-    t_ply_uint16 uint16;
+-    if (!ply->idriver->ichunk(ply, &uint16, sizeof(uint16))) return 0;
+-    *value = uint16;
+-    return 1;
+-}
+-
+-static int ibinary_int32(p_ply ply, double *value) {
+-    t_ply_int32 int32;
+-    if (!ply->idriver->ichunk(ply, &int32, sizeof(int32))) return 0;
+-    *value = int32;
+-    return 1;
+-}
+-
+-static int ibinary_uint32(p_ply ply, double *value) {
+-    t_ply_uint32 uint32;
+-    if (!ply->idriver->ichunk(ply, &uint32, sizeof(uint32))) return 0;
+-    *value = uint32;
+-    return 1;
+-}
+-
+-static int ibinary_float32(p_ply ply, double *value) {
+-    float float32;
+-    if (!ply->idriver->ichunk(ply, &float32, sizeof(float32))) return 0;
+-    *value = float32;
+-    return 1;
+-}
+-
+-static int ibinary_float64(p_ply ply, double *value) {
+-    return ply->idriver->ichunk(ply, value, sizeof(double));
+-}
+-
+-/* ----------------------------------------------------------------------
+- * Constants
+- * ---------------------------------------------------------------------- */
+-static t_ply_idriver ply_idriver_ascii = {
+-    {   iascii_int8, iascii_uint8, iascii_int16, iascii_uint16,
+-        iascii_int32, iascii_uint32, iascii_float32, iascii_float64,
+-        iascii_int8, iascii_uint8, iascii_int16, iascii_uint16,
+-        iascii_int32, iascii_uint32, iascii_float32, iascii_float64
+-    }, /* order matches e_ply_type enum */
+-    NULL,
+-    "ascii input"
+-};
+-
+-static t_ply_idriver ply_idriver_binary = {
+-    {   ibinary_int8, ibinary_uint8, ibinary_int16, ibinary_uint16,
+-        ibinary_int32, ibinary_uint32, ibinary_float32, ibinary_float64,
+-        ibinary_int8, ibinary_uint8, ibinary_int16, ibinary_uint16,
+-        ibinary_int32, ibinary_uint32, ibinary_float32, ibinary_float64
+-    }, /* order matches e_ply_type enum */
+-    ply_read_chunk,
+-    "binary input"
+-};
+-
+-static t_ply_idriver ply_idriver_binary_reverse = {
+-    {   ibinary_int8, ibinary_uint8, ibinary_int16, ibinary_uint16,
+-        ibinary_int32, ibinary_uint32, ibinary_float32, ibinary_float64,
+-        ibinary_int8, ibinary_uint8, ibinary_int16, ibinary_uint16,
+-        ibinary_int32, ibinary_uint32, ibinary_float32, ibinary_float64
+-    }, /* order matches e_ply_type enum */
+-    ply_read_chunk_reverse,
+-    "reverse binary input"
+-};
+-
+-static t_ply_odriver ply_odriver_ascii = {
+-    {   oascii_int8, oascii_uint8, oascii_int16, oascii_uint16,
+-        oascii_int32, oascii_uint32, oascii_float32, oascii_float64,
+-        oascii_int8, oascii_uint8, oascii_int16, oascii_uint16,
+-        oascii_int32, oascii_uint32, oascii_float32, oascii_float64
+-    }, /* order matches e_ply_type enum */
+-    NULL,
+-    "ascii output"
+-};
+-
+-static t_ply_odriver ply_odriver_binary = {
+-    {   obinary_int8, obinary_uint8, obinary_int16, obinary_uint16,
+-        obinary_int32, obinary_uint32, obinary_float32, obinary_float64,
+-        obinary_int8, obinary_uint8, obinary_int16, obinary_uint16,
+-        obinary_int32, obinary_uint32, obinary_float32, obinary_float64
+-    }, /* order matches e_ply_type enum */
+-    ply_write_chunk,
+-    "binary output"
+-};
+-
+-static t_ply_odriver ply_odriver_binary_reverse = {
+-    {   obinary_int8, obinary_uint8, obinary_int16, obinary_uint16,
+-        obinary_int32, obinary_uint32, obinary_float32, obinary_float64,
+-        obinary_int8, obinary_uint8, obinary_int16, obinary_uint16,
+-        obinary_int32, obinary_uint32, obinary_float32, obinary_float64
+-    }, /* order matches e_ply_type enum */
+-    ply_write_chunk_reverse,
+-    "reverse binary output"
+-};
+-
+-/* ----------------------------------------------------------------------
+- * Copyright (C) 2003 Diego Nehab.  All rights reserved.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining
+- * a copy of this software and associated documentation files (the
+- * "Software"), to deal in the Software without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Software, and to
+- * permit persons to whom the Software is furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be
+- * included in all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- * ---------------------------------------------------------------------- */
+diff --git a/v3p/rply/rply.h b/v3p/rply/rply.h
+deleted file mode 100644
+index 3c604fd88ee1667d404d7f0e80431f2d83eb9686..0000000000000000000000000000000000000000
+--- a/v3p/rply/rply.h
++++ /dev/null
+@@ -1,367 +0,0 @@
+-#ifndef PLY_H
+-#define PLY_H
+-/* ----------------------------------------------------------------------
+- * RPly library, read/write PLY files
+- * Diego Nehab, Princeton University
+- * http://www.cs.princeton.edu/~diego/professional/rply
+- *
+- * This library is distributed under the MIT License. See notice
+- * at the end of this file.
+- * ---------------------------------------------------------------------- */
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#define RPLY_VERSION   "RPly 1.1"
+-#define RPLY_COPYRIGHT "Copyright (C) 2003-2006 Diego Nehab"
+-#define RPLY_AUTHORS   "Diego Nehab"
+-
+-/* ----------------------------------------------------------------------
+- * Types
+- * ---------------------------------------------------------------------- */
+-/* structures are opaque */
+-typedef struct t_ply_ *p_ply;
+-typedef struct t_ply_element_ *p_ply_element;
+-typedef struct t_ply_property_ *p_ply_property;
+-typedef struct t_ply_argument_ *p_ply_argument;
+-
+-/* ply format mode type */
+-typedef enum e_ply_storage_mode_ {
+-    PLY_BIG_ENDIAN,
+-    PLY_LITTLE_ENDIAN,
+-    PLY_ASCII,
+-    PLY_DEFAULT      /* has to be the last in enum */
+-} e_ply_storage_mode; /* order matches ply_storage_mode_list */
+-
+-/* ply data type */
+-typedef enum e_ply_type {
+-    PLY_INT8, PLY_UINT8, PLY_INT16, PLY_UINT16,
+-    PLY_INT32, PLY_UIN32, PLY_FLOAT32, PLY_FLOAT64,
+-    PLY_CHAR, PLY_UCHAR, PLY_SHORT, PLY_USHORT,
+-    PLY_INT, PLY_UINT, PLY_FLOAT, PLY_DOUBLE,
+-    PLY_LIST    /* has to be the last in enum */
+-} e_ply_type;   /* order matches ply_type_list */
+-
+-/* ----------------------------------------------------------------------
+- * Property reading callback prototype
+- *
+- * message: error message
+- * ---------------------------------------------------------------------- */
+-typedef void (*p_ply_error_cb)(p_ply ply, const char *message);
+-
+-/* ----------------------------------------------------------------------
+- * Opens a ply file for reading (fails if file is not a ply file)
+- *
+- * error_cb: error callback function
+- * name: file name
+- * idata,pdata: contextual information available to users
+- *
+- * Returns 1 if successful, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-p_ply ply_open(const char *name, p_ply_error_cb error_cb, long idata,
+-        void *pdata);
+-
+-/* ----------------------------------------------------------------------
+- * Reads and parses the header of a ply file returned by ply_open
+- *
+- * ply: handle returned by ply_open
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_read_header(p_ply ply);
+-
+-/* ----------------------------------------------------------------------
+- * Property reading callback prototype
+- *
+- * argument: parameters for property being processed when callback is called
+- *
+- * Returns 1 if should continue processing file, 0 if should abort.
+- * ---------------------------------------------------------------------- */
+-typedef int (*p_ply_read_cb)(p_ply_argument argument);
+-
+-/* ----------------------------------------------------------------------
+- * Sets up callbacks for property reading after header was parsed
+- *
+- * ply: handle returned by ply_open
+- * element_name: element where property is
+- * property_name: property to associate element with
+- * read_cb: function to be called for each property value
+- * pdata/idata: user data that will be passed to callback
+- *
+- * Returns 0 if no element or no property in element, returns the
+- * number of element instances otherwise.
+- * ---------------------------------------------------------------------- */
+-long ply_set_read_cb(p_ply ply, const char *element_name,
+-        const char *property_name, p_ply_read_cb read_cb,
+-        void *pdata, long idata);
+-
+-/* ----------------------------------------------------------------------
+- * Returns information about the element originating a callback
+- *
+- * argument: handle to argument
+- * element: receives a the element handle (if non-null)
+- * instance_index: receives the index of the current element instance
+- *     (if non-null)
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_get_argument_element(p_ply_argument argument,
+-        p_ply_element *element, long *instance_index);
+-
+-/* ----------------------------------------------------------------------
+- * Returns information about the property originating a callback
+- *
+- * argument: handle to argument
+- * property: receives the property handle (if non-null)
+- * length: receives the number of values in this property (if non-null)
+- * value_index: receives the index of current property value (if non-null)
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_get_argument_property(p_ply_argument argument,
+-        p_ply_property *property, long *length, long *value_index);
+-
+-/* ----------------------------------------------------------------------
+- * Returns user data associated with callback
+- *
+- * pdata: receives a copy of user custom data pointer (if non-null)
+- * idata: receives a copy of user custom data integer (if non-null)
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_get_argument_user_data(p_ply_argument argument, void **pdata,
+-        long *idata);
+-
+-/* ----------------------------------------------------------------------
+- * Returns the value associated with a callback
+- *
+- * argument: handle to argument
+- *
+- * Returns the current data item
+- * ---------------------------------------------------------------------- */
+-double ply_get_argument_value(p_ply_argument argument);
+-
+-/* ----------------------------------------------------------------------
+- * Reads all elements and properties calling the callbacks defined with
+- * calls to ply_set_read_cb
+- *
+- * ply: handle returned by ply_open
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_read(p_ply ply);
+-
+-/* ----------------------------------------------------------------------
+- * Iterates over all elements by returning the next element.
+- * Call with NULL to return handle to first element.
+- *
+- * ply: handle returned by ply_open
+- * last: handle of last element returned (NULL for first element)
+- *
+- * Returns element if successfull or NULL if no more elements
+- * ---------------------------------------------------------------------- */
+-p_ply_element ply_get_next_element(p_ply ply, p_ply_element last);
+-
+-/* ----------------------------------------------------------------------
+- * Iterates over all comments by returning the next comment.
+- * Call with NULL to return pointer to first comment.
+- *
+- * ply: handle returned by ply_open
+- * last: pointer to last comment returned (NULL for first comment)
+- *
+- * Returns comment if successfull or NULL if no more comments
+- * ---------------------------------------------------------------------- */
+-const char *ply_get_next_comment(p_ply ply, const char *last);
+-
+-/* ----------------------------------------------------------------------
+- * Iterates over all obj_infos by returning the next obj_info.
+- * Call with NULL to return pointer to first obj_info.
+- *
+- * ply: handle returned by ply_open
+- * last: pointer to last obj_info returned (NULL for first obj_info)
+- *
+- * Returns obj_info if successfull or NULL if no more obj_infos
+- * ---------------------------------------------------------------------- */
+-const char *ply_get_next_obj_info(p_ply ply, const char *last);
+-
+-/* ----------------------------------------------------------------------
+- * Returns information about an element
+- *
+- * element: element of interest
+- * name: receives a pointer to internal copy of element name (if non-null)
+- * ninstances: receives the number of instances of this element (if non-null)
+- *
+- * Returns 1 if successfull or 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_get_element_info(p_ply_element element, const char** name,
+-        long *ninstances);
+-
+-/* ----------------------------------------------------------------------
+- * Iterates over all properties by returning the next property.
+- * Call with NULL to return handle to first property.
+- *
+- * element: handle of element with the properties of interest
+- * last: handle of last property returned (NULL for first property)
+- *
+- * Returns element if successfull or NULL if no more properties
+- * ---------------------------------------------------------------------- */
+-p_ply_property ply_get_next_property(p_ply_element element,
+-        p_ply_property last);
+-
+-/* ----------------------------------------------------------------------
+- * Returns information about a property
+- *
+- * property: handle to property of interest
+- * name: receives a pointer to internal copy of property name (if non-null)
+- * type: receives the property type (if non-null)
+- * length_type: for list properties, receives the scalar type of
+- *     the length field (if non-null)
+- * value_type: for list properties, receives the scalar type of the value
+- *     fields  (if non-null)
+- *
+- * Returns 1 if successfull or 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_get_property_info(p_ply_property property, const char** name,
+-        e_ply_type *type, e_ply_type *length_type, e_ply_type *value_type);
+-
+-/* ----------------------------------------------------------------------
+- * Creates new ply file
+- *
+- * name: file name
+- * storage_mode: file format mode
+- *
+- * Returns handle to ply file if successfull, NULL otherwise
+- * ---------------------------------------------------------------------- */
+-p_ply ply_create(const char *name, e_ply_storage_mode storage_mode,
+-        p_ply_error_cb error_cb, long idata, void *pdata);
+-
+-/* ----------------------------------------------------------------------
+- * Adds a new element to the ply file created by ply_create
+- *
+- * ply: handle returned by ply_create
+- * name: name of new element
+- * ninstances: number of element of this time in file
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_add_element(p_ply ply, const char *name, long ninstances);
+-
+-/* ----------------------------------------------------------------------
+- * Adds a new property to the last element added by ply_add_element
+- *
+- * ply: handle returned by ply_create
+- * name: name of new property
+- * type: property type
+- * length_type: scalar type of length field of a list property
+- * value_type: scalar type of value fields of a list property
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_add_property(p_ply ply, const char *name, e_ply_type type,
+-        e_ply_type length_type, e_ply_type value_type);
+-
+-/* ----------------------------------------------------------------------
+- * Adds a new list property to the last element added by ply_add_element
+- *
+- * ply: handle returned by ply_create
+- * name: name of new property
+- * length_type: scalar type of length field of a list property
+- * value_type: scalar type of value fields of a list property
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_add_list_property(p_ply ply, const char *name,
+-        e_ply_type length_type, e_ply_type value_type);
+-
+-/* ----------------------------------------------------------------------
+- * Adds a new property to the last element added by ply_add_element
+- *
+- * ply: handle returned by ply_create
+- * name: name of new property
+- * type: property type
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_add_scalar_property(p_ply ply, const char *name, e_ply_type type);
+-
+-/* ----------------------------------------------------------------------
+- * Adds a new comment item
+- *
+- * ply: handle returned by ply_create
+- * comment: pointer to string with comment text
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_add_comment(p_ply ply, const char *comment);
+-
+-/* ----------------------------------------------------------------------
+- * Adds a new obj_info item
+- *
+- * ply: handle returned by ply_create
+- * comment: pointer to string with obj_info data
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_add_obj_info(p_ply ply, const char *obj_info);
+-
+-/* ----------------------------------------------------------------------
+- * Writes the ply file header after all element and properties have been
+- * defined by calls to ply_add_element and ply_add_property
+- *
+- * ply: handle returned by ply_create
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_write_header(p_ply ply);
+-
+-/* ----------------------------------------------------------------------
+- * Writes one property value, in the order they should be written to the
+- * file. For each element type, write all elements of that type in order.
+- * For each element, write all its properties in order. For scalar
+- * properties, just write the value. For list properties, write the length
+- * and then each of the values.
+- *
+- * ply: handle returned by ply_create
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_write(p_ply ply, double value);
+-
+-/* ----------------------------------------------------------------------
+- * Closes a ply file handle. Releases all memory used by handle
+- *
+- * ply: handle to be closed.
+- *
+- * Returns 1 if successfull, 0 otherwise
+- * ---------------------------------------------------------------------- */
+-int ply_close(p_ply ply);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* RPLY_H */
+-
+-/* ----------------------------------------------------------------------
+- * Copyright (C) 2003-2005 Diego Nehab. All rights reserved.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining
+- * a copy of this software and associated documentation files (the
+- * "Software"), to deal in the Software without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Software, and to
+- * permit persons to whom the Software is furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be
+- * included in all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- * ---------------------------------------------------------------------- */
+-- 
+2.21.0
+
diff --git a/0002-Added-soname-info-for-core-libraries.patch b/0002-Added-soname-info-for-core-libraries.patch
deleted file mode 100644
index b153475..0000000
--- a/0002-Added-soname-info-for-core-libraries.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 620fd77b0773f8cc9b57ff96b90d770eb5055b5d Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:10:50 +0200
-Subject: [PATCH 02/23] Added soname info for core libraries
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- CMakeLists.txt               | 20 ++++++++++++++++++++
- core/testlib/CMakeLists.txt  |  1 +
- core/vnl/CMakeLists.txt      |  1 +
- core/vnl/algo/CMakeLists.txt |  1 +
- v3p/netlib/CMakeLists.txt    |  2 ++
- vcl/CMakeLists.txt           |  1 +
- 6 files changed, 26 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 217f93a..67b2ea4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,26 @@ ENDIF( COMMAND CMAKE_POLICY )
- 
- PROJECT(vxl)
- 
-+SET(VXL_MAJOR_VERSION 1)
-+SET(VXL_MINOR_VERSION 13)
-+SET(VXL_BUILD_VERSION 0)
-+SET(VXL_VERSION
-+  "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
-+SET(VXL_API_VERSION
-+  "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
-+SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}
-+  VERSION "${VXL_VERSION}"
-+  SOVERSION "${VXL_API_VERSION}"
-+)
-+SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+
-+
-+
- SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
-      "Output directory for the vxl libraries" )
- 
-diff --git a/core/testlib/CMakeLists.txt b/core/testlib/CMakeLists.txt
-index da85662..4d105e9 100644
---- a/core/testlib/CMakeLists.txt
-+++ b/core/testlib/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET( testlib_sources
- )
- 
- ADD_LIBRARY( testlib ${testlib_sources} )
-+SET_TARGET_PROPERTIES(testlib PROPERTIES ${TESTLIB_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( testlib vcl )
- INSTALL_TARGETS( /lib testlib)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
-diff --git a/core/vnl/CMakeLists.txt b/core/vnl/CMakeLists.txt
-index 490022a..053cdab 100644
---- a/core/vnl/CMakeLists.txt
-+++ b/core/vnl/CMakeLists.txt
-@@ -264,6 +264,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vnl ${vnl_sources})
-+SET_TARGET_PROPERTIES(vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vnl vcl )
- 
- INSTALL_TARGETS(/lib vnl)
-diff --git a/core/vnl/algo/CMakeLists.txt b/core/vnl/algo/CMakeLists.txt
-index cefe140..2f99996 100644
---- a/core/vnl/algo/CMakeLists.txt
-+++ b/core/vnl/algo/CMakeLists.txt
-@@ -102,6 +102,7 @@ IF(NETLIB_FOUND)
-   AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
- 
-   ADD_LIBRARY( vnl_algo ${vnl_algo_sources})
-+  SET_TARGET_PROPERTIES(vnl_algo PROPERTIES ${VNL_ALGO_LIBRARY_PROPERTIES})
-   TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl )
- 
-   INSTALL_TARGETS(/lib vnl_algo)
-diff --git a/v3p/netlib/CMakeLists.txt b/v3p/netlib/CMakeLists.txt
-index 9e78799..0ad28f6 100644
---- a/v3p/netlib/CMakeLists.txt
-+++ b/v3p/netlib/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET(netlib_sources
-    )
- 
- ADD_LIBRARY( netlib ${netlib_sources} )
-+SET_TARGET_PROPERTIES(netlib PROPERTIES ${NETLIB_LIBRARY_PROPERTIES})
- INSTALL_TARGETS( /lib netlib )
- INSTALL_FILES( /include/vxl/v3p/netlib .h triangle )
- 
-@@ -462,6 +463,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
- 
- # Create a netlib library with mangled symbols.
- ADD_LIBRARY(v3p_netlib ${v3p_netlib_sources})
-+SET_TARGET_PROPERTIES(v3p_netlib PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
- INSTALL_TARGETS( /lib v3p_netlib )
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${v3p_netlib_sources})
- IF(UNIX)
-diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt
-index 11f1887..7f1e9d9 100644
---- a/vcl/CMakeLists.txt
-+++ b/vcl/CMakeLists.txt
-@@ -360,6 +360,7 @@ SET( vcl_sources
- #AUX_SOURCE_DIRECTORY(Templates vcl_sources)
- 
- ADD_LIBRARY(vcl ${vcl_sources})
-+SET_TARGET_PROPERTIES(vcl PROPERTIES ${VCL_LIBRARY_PROPERTIES})
- 
- # CMake can automatically figure out the compiler characteristics on
- # Windows too.  No need to do manual config.
--- 
-1.7.11.7
-
diff --git a/0002-v2.0.2-Use-Fedora-FindEXPAT.patch b/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
new file mode 100644
index 0000000..fb76af5
--- /dev/null
+++ b/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
@@ -0,0 +1,469 @@
+From 73535b3c72cf0ca6e1a5c9bef4861cbcbff45183 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 15:20:08 +0000
+Subject: [PATCH 2/4] v2.0.2 Use Fedora FindEXPAT
+
+---
+ contrib/brl/b3p/expat/CMakeLists.txt              | 2 +-
+ contrib/brl/b3p/expatpp/CMakeLists.txt            | 2 +-
+ contrib/brl/bbas/bkml/CMakeLists.txt              | 2 +-
+ contrib/brl/bbas/bvgl/CMakeLists.txt              | 2 +-
+ contrib/brl/bbas/bvgl/tests/CMakeLists.txt        | 2 +-
+ contrib/brl/bbas/bwm/CMakeLists.txt               | 2 +-
+ contrib/brl/bbas/bwm/io/CMakeLists.txt            | 2 +-
+ contrib/brl/bbas/bwm/video/CMakeLists.txt         | 2 +-
+ contrib/brl/bbas/bwm/video/exe/CMakeLists.txt     | 2 +-
+ contrib/brl/bbas/bxml/CMakeLists.txt              | 2 +-
+ contrib/brl/bbas/volm/CMakeLists.txt              | 2 +-
+ contrib/brl/bpro/CMakeLists.txt                   | 2 +-
+ contrib/brl/bseg/bbgm_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/betr_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/bmdl_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/boxm/CMakeLists.txt              | 2 +-
+ contrib/brl/bseg/boxm2/CMakeLists.txt             | 2 +-
+ contrib/brl/bseg/boxm2/volm/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/boxm2_batch/CMakeLists.txt       | 2 +-
+ contrib/brl/bseg/boxm_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/brec_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/bstm/CMakeLists.txt              | 2 +-
+ contrib/brl/bseg/bstm_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/bstm_multi/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  | 2 +-
+ contrib/brl/bseg/bvpl/functors/CMakeLists.txt     | 2 +-
+ contrib/brl/bseg/bvpl/kernels/CMakeLists.txt      | 2 +-
+ contrib/brl/bseg/bvpl_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt | 2 +-
+ contrib/brl/bseg/bvxm/CMakeLists.txt              | 2 +-
+ contrib/brl/bseg/bvxm_batch/CMakeLists.txt        | 2 +-
+ contrib/brl/bseg/bvxm_bridge/CMakeLists.txt       | 2 +-
+ contrib/brl/bseg/vcon/CMakeLists.txt              | 2 +-
+ 33 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
+index 5b9d660530acd9310dfb554171d70cdc7417028f..de3997078024fe9a3283534cc5b0b9819af6a0a8 100644
+--- a/contrib/brl/b3p/expat/CMakeLists.txt
++++ b/contrib/brl/b3p/expat/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ project(expat C)
+ #include_regular_expression("^.*$")
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(NOT VXL_USING_NATIVE_EXPAT)
+ 
+   if(WIN32)
+diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
+index 4959c123c336ee7935b31dbeffc97f734c07d73a..71ecd0568b7f9e01f9e266af6ca6fe308fbc1484 100644
+--- a/contrib/brl/b3p/expatpp/CMakeLists.txt
++++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ #This is brl/b3p/expatpp
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if( EXPAT_FOUND )
+ 
+   if( VXL_USING_NATIVE_EXPAT )
+diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
+index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d111d4713 100644
+--- a/contrib/brl/bbas/bkml/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(bkml_sources
+   bkml_write.h bkml_write.cxx
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
+index c4da5b9d289cdbd64ca12e20a8941856f5d91342..29e4cf838da65cb60f4580f1daee5f3ac3e4e4d2 100644
+--- a/contrib/brl/bbas/bvgl/CMakeLists.txt
++++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
+@@ -37,7 +37,7 @@ aux_source_directory(Templates bvgl_sources)
+ 
+ 
+ #find expatpp library for
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+index 76995137ed8d81fb80c10bf6d9f810b9f4003210..88eebcd621c2f5dcc775374c77289a77f5ed7e53 100644
+--- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
++++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(bvgl_test_sources
+ )
+ 
+ #Make sure expat library is found
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+   set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
+diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
+index dace2292e7e09803845f90519be8fcb50fc2131a..78f35ac924ab58e1ec8836220217168ca29572e0 100644
+--- a/contrib/brl/bbas/bwm/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/CMakeLists.txt
+@@ -26,7 +26,7 @@ endif()
+ 
+ include( ${BRL_MODULE_PATH}/FindSHAPELIB.cmake )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ # Set CMake options for using vgui
+ include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
+diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
+index dc2102047f46fffb68d2f1e92c5718dd656c09a8..9c55cc59ba1dc8c87d6c304f9eef0551f0102e70 100644
+--- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(bwm_io_sources
+ )
+ aux_source_directory(Templates bwm_io_sources)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
+index 5408fe77a72b842784b3c05aaf30379f08fcddc1..2dd989f27c6b34ea72052eda258caf1c27f4f3f1 100644
+--- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(bwm_video_sources
+                                  bwm_video_site_io_defs.h
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+index ca3c490d5e9674c465bd5a57f709882bad9c71ac..baff80256f9f13a71533b51b7e30876199c0c5ac 100644
+--- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This is contrib/bwm/exe/CMakeLists.txt
+ # World Modeling GUI executables
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
+index c027dfaa286137f879e6b70043e0b291663039d4..239f6e528e36121d243d763732287809062f57df 100644
+--- a/contrib/brl/bbas/bxml/CMakeLists.txt
++++ b/contrib/brl/bbas/bxml/CMakeLists.txt
+@@ -12,7 +12,7 @@ set( bxml_sources
+     bxml_find.cxx                bxml_find.h
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
+index cf11103557090d878dd388f14f3b90e870695e2e..9047257fc5f78dcce4d52b6c2aa0e76c9b54931c 100644
+--- a/contrib/brl/bbas/volm/CMakeLists.txt
++++ b/contrib/brl/bbas/volm/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+ if(HAS_GEOTIFF)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
+index 637c1ecfa8479088678c34f48ce022c7acd533a2..803917fd2496180d111afeed78a7f15d674ca4cd 100644
+--- a/contrib/brl/bpro/CMakeLists.txt
++++ b/contrib/brl/bpro/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # brl/bpro/CMakeLists.txt
+ # main package for processing operations
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ # Basic process classes
+diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..21b1fbec894cb1ae1911b21962d47617a6c96d73 100644
+--- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     if(EXPATPP_FOUND)
+     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
+index 3c5d70e0c6569aa51761f99782b51b7920e17681..0069fb9ff38fcd93a2e1db418599920d2c3043bb 100644
+--- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
+@@ -4,7 +4,7 @@ project( betr_batch )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+index f341e59f07f614bf38bee3f41305bbbd46f63653..e253c8f5011df5e19b1f2dba88acb26e61c17a39 100644
+--- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+    if(EXPATPP_FOUND)
+     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
+index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..0ddd6033d50b38502a7ebbd986b474401a08b8a0 100644
+--- a/contrib/brl/bseg/boxm/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # contrib/brl/bseg/boxm/CMakeLists.txt
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
+index 4475e418be3d2475f24e6df71a18319efb242e38..14acc308ecbbe8c499c16ee60682e599ae49c55e 100644
+--- a/contrib/brl/bseg/boxm2/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
+@@ -21,7 +21,7 @@ set(boxm2_sources
+     boxm2_blocks_vis_graph.h          boxm2_blocks_vis_graph.cxx
+    )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+ 
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+index 861b960f4d44c92fc900280581cda2b87fce5f0d..c3ae5b39bf376fb5e24c722bde74f0b1ab3420fd 100644
+--- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # This is contrib/brl/bseg/boxm2/volm/CMakeLists
+ # volm depends on bkml and expat
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     #depends on OPENCL being found...
+diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+index 70e603743b280db75ea9bb006cbf63d867cdd16f..77f8f743f9c990f44b0403340c21777571483dff 100644
+--- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+@@ -9,7 +9,7 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
+ include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+index 1d57861444e72e66e3ee04c96e496ee4b89b206f..a6f24b1da9d9ec9702595a9912ec10d2ae03ef9f 100644
+--- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+@@ -4,7 +4,7 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
+index b7e3039d7ee534d30de991a7e4aae3f940b7b360..c13969e15d090e63831455cee0ea61d1c5e98557 100644
+--- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # contrib/brl/bseg/brec_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
+index 977d68fdab136cf193f7e712e63bbd607113066a..97a895fa28ef6d9e9b11cb45f324d5e0ba39818b 100644
+--- a/contrib/brl/bseg/bstm/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
+                  bstm_time_block.h bstm_time_block.cxx
+                  bstm_util.cxx bstm_util.h)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+index c94ddbcc4c159b771d85bb6a81a0e38d77750023..8b6aa9f1f2ff8b0c8712b0201dc22e140a53afcf 100644
+--- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+@@ -12,7 +12,7 @@ if(DIRECTSHOW_FOUND)
+ endif()
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+index ba8815fe6bef5982f655a3c6f13afefb64743344..6abac60395a72f232cc718059315036a8e1639b7 100644
+--- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(bstm_multi_sources
+   space_time_scene_parser.h space_time_scene_parser.hxx
+   )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if (EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..cefb928abc92300bdd5f19e4f067664cdf36f701 100644
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+ # Brown Voxel Processing library for octrees
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
+ #mark_as_advanced( VXL_FORCE_V3P_RPLY )
+diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+index 25433e56f26dd49fb413480b1aa67a312f9999fb..550528c08c6afd2a08aedc230d8df63f705d41cb 100644
+--- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+ # The kernel-related files for Brown Voxel Processing Library (BVPL)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..5b2a2750de2225048bd4ff67fa6d310eeccc9e5c 100644
+--- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+ # The kernel-related files for Brown Voxel Processing Library (BVPL)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+index 90102867454d6308ab766a13d101567562920633..abca67a186d7f8305c2f235b35924ecd7eddb8a5 100644
+--- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..2b7731521f5f19579819ffd17370b474ad7e0a2f 100644
+--- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
+index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..d6ba4cc128b3005fa169f89512da9abcee1231e0 100644
+--- a/contrib/brl/bseg/bvxm/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
+@@ -38,7 +38,7 @@ set(bvxm_sources
+ aux_source_directory(Templates bvxm_sources)
+ 
+ #find expatpp library for bvxm_world_params parser
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+index 58ece0b8d3852237d36db89e868463369dc4502c..779c056a765516fa4934ca9de313366ec4b7adb5 100644
+--- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(HAS_GEOTIFF)
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+index b7b0636f29e443a9e02a6354faf204f01c2617e9..0fc2e895f7a686f8009e30148f56a134fafe314d 100644
+--- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+@@ -8,7 +8,7 @@ if(OPENCL_FOUND)
+   include_directories( ${MUL_INCLUDE_DIR} )
+ 
+   #find expatpp library
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
+   if(EXPAT_FOUND)
+     include_directories( ${EXPAT_INCLUDE_DIR} )
+     include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
+index 26504576be394f4351e7ef1521ab3fff38616003..1fc507d257953975931e8cab9a86b97e4680e461 100644
+--- a/contrib/brl/bseg/vcon/CMakeLists.txt
++++ b/contrib/brl/bseg/vcon/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+ if(HAS_GEOTIFF)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     include_directories( ${BRL_INCLUDE_DIR} )
+-- 
+2.21.0
+
diff --git a/0003-Use-system-rply.patch b/0003-Use-system-rply.patch
deleted file mode 100644
index 604a916..0000000
--- a/0003-Use-system-rply.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 2a338e6b27483b775d6ab0a6ba2661eb6231ac50 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:15:37 +0200
-Subject: [PATCH 03/23] Use system rply
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt |  6 ++++--
- v3p/CMakeLists.txt                          |  1 -
- v3p/rply/CMakeLists.txt                     | 13 -------------
- 3 files changed, 4 insertions(+), 16 deletions(-)
- delete mode 100644 v3p/rply/CMakeLists.txt
-
-diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index d96bf35..c8be547 100644
---- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-@@ -1,8 +1,10 @@
- # This is bbas/bmsh3d/algo/CMakeLists.txt
- # Brown 3D Mesh Algorithm Library
- 
-+FIND_PACKAGE(rply REQUIRED)
-+
- INCLUDE_DIRECTORIES( ${BRL_INCLUDE_DIR} )
--INCLUDE_DIRECTORIES( ${VTHREEP_INCLUDE_DIR}/rply )
-+INCLUDE_DIRECTORIES( ${RPLY_INCLUDE_DIR} )
- 
- SET( bmsh3d_algo_sources
-   bmsh3d_fileio.cxx           bmsh3d_fileio.h
-@@ -13,7 +15,7 @@ SET( bmsh3d_algo_sources
- )
- 
- ADD_LIBRARY( bmsh3d_algo  ${bmsh3d_algo_sources})
--TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
-+TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d ${RPLY_LIBRARY} vgl vnl vul)
- 
- IF( BUILD_TESTING )
-   SUBDIRS(tests)
-diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index dbdb30a..2e300d4 100644
---- a/v3p/CMakeLists.txt
-+++ b/v3p/CMakeLists.txt
-@@ -60,6 +60,5 @@ IF (BUILD_CORE_IMAGING)
-   MARK_AS_ADVANCED( VXL_FORCE_V3P_OPENJPEG2 )
-   SUBDIRS(openjpeg2)
- 
--  SUBDIRS(rply)
- 
- ENDIF (BUILD_CORE_IMAGING)
-diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
-deleted file mode 100644
-index 87e7524..0000000
---- a/v3p/rply/CMakeLists.txt
-+++ /dev/null
-@@ -1,13 +0,0 @@
--# This is /v3p/rply/CMakeLists.txt
--# library for reading and writing .PLY file
--
--SET(rply_sources
--  rply.h
--  rply.c
--  )
-- 
--ADD_LIBRARY(rply ${rply_sources})
--
--#install the .h .txx and libs
--INSTALL_TARGETS(/lib rply)
--INSTALL_NOBASE_HEADER_FILES(/include/vxl/rply/brl/ ${rply_sources})
--- 
-1.7.11.7
-
diff --git a/0003-v2.0.2-Use-Fedora-minizip.patch b/0003-v2.0.2-Use-Fedora-minizip.patch
new file mode 100644
index 0000000..fb36a9c
--- /dev/null
+++ b/0003-v2.0.2-Use-Fedora-minizip.patch
@@ -0,0 +1,28 @@
+From 1103f55dff5f640a1e8bf71db87f9c871ddc27c1 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 15:31:18 +0000
+Subject: [PATCH 3/4] v2.0.2 Use Fedora minizip
+
+---
+ contrib/brl/b3p/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
+index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..74a7268c7e7762460760bac0c090b29990b88ca7 100644
+--- a/contrib/brl/b3p/CMakeLists.txt
++++ b/contrib/brl/b3p/CMakeLists.txt
+@@ -16,10 +16,6 @@ mark_as_advanced( VXL_FORCE_B3P_EXPAT )
+ add_subdirectory(expat)
+ add_subdirectory(expatpp)
+ 
+-option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
++option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" NO)
+ mark_as_advanced( VXL_FORCE_B3P_SHAPELIB )
+ add_subdirectory(shapelib)
+-
+-add_subdirectory(minizip)
+-
+-
+-- 
+2.21.0
+
diff --git a/0004-Added-more-soname.patch b/0004-Added-more-soname.patch
deleted file mode 100644
index f0f37f3..0000000
--- a/0004-Added-more-soname.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4c5770c15c0ba12e4d11ec3e00b0d5852636aa76 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:16:38 +0200
-Subject: [PATCH 04/23] Added more soname
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- CMakeLists.txt               | 3 ++-
- core/vil/CMakeLists.txt      | 1 +
- core/vil/algo/CMakeLists.txt | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 67b2ea4..71f48bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,7 +29,8 @@ SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
--
-+SET(VIL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VIL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- 
- 
- SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
-diff --git a/core/vil/CMakeLists.txt b/core/vil/CMakeLists.txt
-index 75b660a..d297412 100644
---- a/core/vil/CMakeLists.txt
-+++ b/core/vil/CMakeLists.txt
-@@ -330,6 +330,7 @@ IF(OPENJPEG2_FOUND)
-   TARGET_LINK_LIBRARIES( vil ${OPENJPEG2_LIBRARIES} )
- ENDIF(OPENJPEG2_FOUND)
- 
-+SET_TARGET_PROPERTIES(vil PROPERTIES ${VIL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil vcl )
- 
- IF (NOT UNIX)
-diff --git a/core/vil/algo/CMakeLists.txt b/core/vil/algo/CMakeLists.txt
-index e9f2119..a7ab0d7 100644
---- a/core/vil/algo/CMakeLists.txt
-+++ b/core/vil/algo/CMakeLists.txt
-@@ -58,6 +58,7 @@ AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
- 
- ADD_LIBRARY(vil_algo ${vil_algo_sources})
- 
-+SET_TARGET_PROPERTIES(vil_algo PROPERTIES ${VIL_ALGO_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl )
- 
- INSTALL_TARGETS(/lib vil_algo)
--- 
-1.7.11.7
-
diff --git a/0004-Version-shared-objects.patch b/0004-Version-shared-objects.patch
new file mode 100644
index 0000000..e7a61fa
--- /dev/null
+++ b/0004-Version-shared-objects.patch
@@ -0,0 +1,258 @@
+From 2941b7bebf5da16636a925c824e55c4ea2dec165 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 18 Apr 2019 22:11:41 +0100
+Subject: [PATCH 4/4] Version shared objects
+
+---
+ CMakeLists.txt                        | 26 +++++++++++++++++++++++++-
+ core/testlib/CMakeLists.txt           |  1 +
+ core/vgui/CMakeLists.txt              |  1 +
+ core/vidl/gui/CMakeLists.txt          |  1 +
+ core/vil/CMakeLists.txt               |  1 +
+ core/vil/algo/CMakeLists.txt          |  1 +
+ core/vnl/CMakeLists.txt               |  1 +
+ core/vnl/algo/CMakeLists.txt          |  1 +
+ core/vpdl/CMakeLists.txt              |  1 +
+ core/vpgl/CMakeLists.txt              |  1 +
+ core/vpgl/algo/CMakeLists.txt         |  1 +
+ core/vpgl/file_formats/CMakeLists.txt |  1 +
+ core/vpgl/io/CMakeLists.txt           |  1 +
+ core/vpgl/xio/CMakeLists.txt          |  1 +
+ v3p/netlib/CMakeLists.txt             |  4 ++++
+ vcl/CMakeLists.txt                    |  2 ++
+ 16 files changed, 44 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..b6cf7dfcdecb57929a266c466c1105948d17c7b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,10 +46,34 @@ foreach(p
+ endforeach()
+ 
+ project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
+-    VERSION 2.0.2.0
+     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
+     LANGUAGES CXX C)
+ 
++SET(VXL_MAJOR_VERSION 2)
++SET(VXL_MINOR_VERSION 0)
++SET(VXL_BUILD_VERSION 2)
++SET(VXL_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
++SET(VXL_API_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
++SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
++    SOVERSION "${VXL_API_VERSION}")
++
++SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VIL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VIL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VPGL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VPGL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VPGL_FILE_FORMATS_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VPGL_IO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VPGL_XIO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VGUI_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VIDLGUI_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VPDL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++
+ include(CMakeDependentOption)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
+ 
+diff --git a/core/testlib/CMakeLists.txt b/core/testlib/CMakeLists.txt
+index 0dd61806dbf68ddc953b0284eff8bc37ddf0c247..2833f468acff665622c6cbf9467d0e6299cea586 100644
+--- a/core/testlib/CMakeLists.txt
++++ b/core/testlib/CMakeLists.txt
+@@ -33,6 +33,7 @@ set(testlib_sources
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}testlib
+   LIBRARY_SOURCES ${testlib_sources}
+   HEADER_INSTALL_DIR core/testlib)
++set_target_properties(${VXL_LIB_PREFIX}testlib PROPERTIES ${TESTLIB_LIBRARY_PROPERTIES})
+ target_link_libraries(${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl)
+ 
+ if( BUILD_TESTING )
+diff --git a/core/vgui/CMakeLists.txt b/core/vgui/CMakeLists.txt
+index fe1ecd4ec2debf573ec2eddf455c81129da88d70..9c6ed4abf45513eeb94ba4ac3a78575c89b3a7bc 100644
+--- a/core/vgui/CMakeLists.txt
++++ b/core/vgui/CMakeLists.txt
+@@ -525,6 +525,7 @@ set( vgui_sources ${vgui_sources}
+ )
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vgui LIBRARY_SOURCES ${vgui_sources})
++SET_TARGET_PROPERTIES(${VXL_LIB_PREFIX}vgui PROPERTIES ${VGUI_LIBRARY_PROPERTIES})
+ set( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
+ 
+ # Dependencies on other vxl libraries
+diff --git a/core/vidl/gui/CMakeLists.txt b/core/vidl/gui/CMakeLists.txt
+index 138372f69bc5ca44b7180805a2036660ffb7e5c1..85d574a89073e5039373533891f717c6b0432424 100644
+--- a/core/vidl/gui/CMakeLists.txt
++++ b/core/vidl/gui/CMakeLists.txt
+@@ -12,6 +12,7 @@ set(vidl_gui_sources
+    )
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vidl_gui LIBRARY_SOURCES ${vidl_gui_sources})
++set_target_properties(${VXL_LIB_PREFIX}vidl_gui PROPERTIES ${VIDLGUI_LIBRARY_PROPERTIES})
+ target_link_libraries( ${VXL_LIB_PREFIX}vidl_gui ${VXL_LIB_PREFIX}vidl ${VXL_LIB_PREFIX}vgui ${VXL_LIB_PREFIX}vil )
+ 
+ if( BUILD_TESTING )
+diff --git a/core/vil/CMakeLists.txt b/core/vil/CMakeLists.txt
+index 61672fe90edf7db26010613a2635ec355c8cf626..2734909d70af7c0d3c94febee8efe6aad6b1b666 100644
+--- a/core/vil/CMakeLists.txt
++++ b/core/vil/CMakeLists.txt
+@@ -335,6 +335,7 @@ set( vil_network_sources
+ )
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vil LIBRARY_SOURCES ${vil_sources} ${vil_network_sources})
++set_target_properties(${VXL_LIB_PREFIX}vil PROPERTIES ${VIL_LIBRARY_PROPERTIES})
+ 
+ if(JPEG_FOUND)
+   target_link_libraries( ${VXL_LIB_PREFIX}vil ${JPEG_LIBRARIES} )
+diff --git a/core/vil/algo/CMakeLists.txt b/core/vil/algo/CMakeLists.txt
+index ee68c9106bbdefadc7b49a3eeee0ea5854b5160d..2b9a71f4303a073ddc2ae5e2b79d6988b512cc50 100644
+--- a/core/vil/algo/CMakeLists.txt
++++ b/core/vil/algo/CMakeLists.txt
+@@ -57,6 +57,7 @@ set( vil_algo_sources
+ aux_source_directory(Templates vil_algo_sources)
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vil_algo LIBRARY_SOURCES ${vil_algo_sources})
++set_target_properties(${VXL_LIB_PREFIX}vil_algo PROPERTIES ${VIL_ALGO_LIBRARY_PROPERTIES})
+ 
+ target_link_libraries( ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vcl )
+ 
+diff --git a/core/vnl/CMakeLists.txt b/core/vnl/CMakeLists.txt
+index 6388a7f4a7b277cf2df4926300c69b66fb038008..d40871b9ec8c0ce8fee2d82f787f478ed0749c6d 100644
+--- a/core/vnl/CMakeLists.txt
++++ b/core/vnl/CMakeLists.txt
+@@ -268,6 +268,7 @@ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vnl
+   LIBRARY_SOURCES ${vnl_sources}
+   HEADER_INSTALL_DIR vnl)
+ target_link_libraries( ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vcl )
++set_target_properties(${VXL_LIB_PREFIX}vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ set(_curr_lib_name vnl)
+ # If VXL_INSTALL_INCLUDE_DIR is the default value
+ if("${VXL_INSTALL_INCLUDE_DIR}" STREQUAL "include/vxl")
+diff --git a/core/vnl/algo/CMakeLists.txt b/core/vnl/algo/CMakeLists.txt
+index 1666a0e089c74ba1212c7ccd0743c79b1ed420fe..a326fd6aea06fd26e6ae838b652d97f078bd8ae1 100644
+--- a/core/vnl/algo/CMakeLists.txt
++++ b/core/vnl/algo/CMakeLists.txt
+@@ -111,6 +111,7 @@ if(NETLIB_FOUND)
+   vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vnl_algo
+     LIBRARY_SOURCES ${vnl_algo_sources}
+     HEADER_INSTALL_DIR vnl/algo)
++  set_target_properties(${VXL_LIB_PREFIX}vnl_algo PROPERTIES ${VNL_ALGO_LIBRARY_PROPERTIES})
+   target_link_libraries( ${VXL_LIB_PREFIX}vnl_algo ${NETLIB_LIBRARIES} ${VXL_LIB_PREFIX}vnl )
+   set(CURR_LIB_NAME vnl_algo)
+   set_vxl_library_properties(
+diff --git a/core/vpdl/CMakeLists.txt b/core/vpdl/CMakeLists.txt
+index 2ea8d4e2b64b33b87ca706394c5afae7a9446b78..eca0c4f010746278969d1992c27de914e82c0e1f 100644
+--- a/core/vpdl/CMakeLists.txt
++++ b/core/vpdl/CMakeLists.txt
+@@ -50,6 +50,7 @@ aux_source_directory(Templates vpdl_sources)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpdl LIBRARY_SOURCES ${vpdl_sources})
++set_target_properties(${VXL_LIB_PREFIX}vpdl PROPERTIES ${VPDL_LIBRARY_PROPERTIES})
+ target_link_libraries( ${VXL_LIB_PREFIX}vpdl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl )
+ set(CURR_LIB_NAME vpdl)
+ set_vxl_library_properties(
+diff --git a/core/vpgl/CMakeLists.txt b/core/vpgl/CMakeLists.txt
+index 6b3589f61c4a29af52d77ffec73258b823505079..ae1e74dba44eecaf96c48156ccf0b6f679076f3c 100644
+--- a/core/vpgl/CMakeLists.txt
++++ b/core/vpgl/CMakeLists.txt
+@@ -35,6 +35,7 @@ aux_source_directory(Templates vpgl_sources)
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl LIBRARY_SOURCES ${vpgl_sources})
++set_target_properties(${VXL_LIB_PREFIX}vpgl PROPERTIES ${VPGL_LIBRARY_PROPERTIES})
+ target_link_libraries(${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vbl)
+ set(CURR_LIB_NAME vpgl)
+ set_vxl_library_properties(
+diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
+index ab762c300616bd81b6de331acec8007d03102c19..97e50096c35b086e76b62a5de621637d3cfbc92f 100644
+--- a/core/vpgl/algo/CMakeLists.txt
++++ b/core/vpgl/algo/CMakeLists.txt
+@@ -43,6 +43,7 @@ endif()
+ aux_source_directory(Templates vpgl_algo_sources)
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_algo LIBRARY_SOURCES ${vpgl_algo_sources})
++set_target_properties(${VXL_LIB_PREFIX}vpgl_algo PROPERTIES ${VPGL_ALGO_LIBRARY_PROPERTIES})
+ 
+ target_link_libraries(${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_file_formats ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+ 
+diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
+index cd33c8ec2bc94558274a95f1fbebf4faecafcd1b..5a1c40bd089049dace2a04e7db7385ceab2c3d84 100644
+--- a/core/vpgl/file_formats/CMakeLists.txt
++++ b/core/vpgl/file_formats/CMakeLists.txt
+@@ -21,6 +21,7 @@ if(TIFF_FOUND)
+ endif()
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_file_formats LIBRARY_SOURCES ${vpgl_file_formats_sources})
++set_target_properties(${VXL_LIB_PREFIX}vpgl_file_formats PROPERTIES ${VPGL_FILE_FORMATS_LIBRARY_PROPERTIES})
+ 
+ target_link_libraries(${VXL_LIB_PREFIX}vpgl_file_formats ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl)
+ 
+diff --git a/core/vpgl/io/CMakeLists.txt b/core/vpgl/io/CMakeLists.txt
+index eeaeef11a2055cc533e54469749d450aecbf085d..1204f88d373db213d793702f66f0f47926aa0a60 100644
+--- a/core/vpgl/io/CMakeLists.txt
++++ b/core/vpgl/io/CMakeLists.txt
+@@ -13,6 +13,7 @@ set(vpgl_io_sources
+ aux_source_directory(Templates vpgl_io_sources)
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_io LIBRARY_SOURCES ${vpgl_io_sources})
++set_target_properties(${VXL_LIB_PREFIX}vpgl_io PROPERTIES ${VPGL_IO_LIBRARY_PROPERTIES})
+ 
+ target_link_libraries(${VXL_LIB_PREFIX}vpgl_io ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vbl_io)
+ 
+diff --git a/core/vpgl/xio/CMakeLists.txt b/core/vpgl/xio/CMakeLists.txt
+index 4019d294eec7cada19ad7c2ef601b2b61f8fd9ef..8c367dc41ad8a0f79fed236da2f8e9079114c1dd 100644
+--- a/core/vpgl/xio/CMakeLists.txt
++++ b/core/vpgl/xio/CMakeLists.txt
+@@ -5,6 +5,7 @@ set(vpgl_xio_sources
+ )
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_xio LIBRARY_SOURCES ${vpgl_xio_sources} )
++set_target_properties(${VXL_LIB_PREFIX}vpgl_xio PROPERTIES ${VPGL_XIO_LIBRARY_PROPERTIES})
+ target_link_libraries( ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vsl )
+ 
+ if(BUILD_TESTING)
+diff --git a/v3p/netlib/CMakeLists.txt b/v3p/netlib/CMakeLists.txt
+index 726a25a834893f8f051fbe627c490c52cc3af2b6..e670609dd775b7b092dfb1e10389832f1d1b69dd 100644
+--- a/v3p/netlib/CMakeLists.txt
++++ b/v3p/netlib/CMakeLists.txt
+@@ -9,6 +9,8 @@ set(netlib_sources
+ 
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}netlib
+   LIBRARY_SOURCES ${netlib_sources})
++set_target_properties(${VXL_LIB_PREFIX}netlib
++    PROPERTIES ${NETLIB_LIBRARY_PROPERTIES})
+ 
+ if(UNIX)
+   target_link_libraries( ${VXL_LIB_PREFIX}netlib m )
+@@ -437,6 +439,8 @@ endif()
+ # Create a netlib library with mangled symbols.
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}v3p_netlib
+   LIBRARY_SOURCES ${v3p_netlib_sources})
++set_target_properties(${VXL_LIB_PREFIX}v3p_netlib
++    PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ if(UNIX)
+   target_link_libraries(${VXL_LIB_PREFIX}v3p_netlib m)
+ endif()
+diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt
+index dd83858d156fe2d9c9c2a0dfbdac016ec6af582c..d6b92ed8395f5df2eb312ae19387e8ebed5367b4 100644
+--- a/vcl/CMakeLists.txt
++++ b/vcl/CMakeLists.txt
+@@ -193,6 +193,8 @@ set( vcl_sources
+ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vcl
+   LIBRARY_SOURCES ${vcl_sources}
+   )
++set_target_properties(${VXL_LIB_PREFIX}vcl
++    PROPERTIES ${VCL_LIBRARY_PROPERTIES})
+ if(UNIX)
+   target_link_libraries(${VXL_LIB_PREFIX}vcl m)
+ endif()
+-- 
+2.21.0
+
diff --git a/0004-v2.0.2-Correct-dcmtk-includes.patch b/0004-v2.0.2-Correct-dcmtk-includes.patch
new file mode 100644
index 0000000..60a3167
--- /dev/null
+++ b/0004-v2.0.2-Correct-dcmtk-includes.patch
@@ -0,0 +1,65 @@
+From d91d374811c2ecbb442607eaf0962669a4f741d9 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 15:46:28 +0000
+Subject: [PATCH 4/4] v2.0.2 Correct dcmtk includes
+
+---
+ core/vil/file_formats/vil_dicom.cxx        | 14 +++++++-------
+ core/vil/file_formats/vil_dicom_stream.cxx |  2 +-
+ core/vil/file_formats/vil_dicom_stream.h   |  2 +-
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/core/vil/file_formats/vil_dicom.cxx b/core/vil/file_formats/vil_dicom.cxx
+index 482d6b7a3369d91a82e0ec77a9663b20a3399378..ab7398cac693ec34e472570825d0821c90b23b56 100644
+--- a/core/vil/file_formats/vil_dicom.cxx
++++ b/core/vil/file_formats/vil_dicom.cxx
+@@ -27,13 +27,13 @@
+ #include <vil/vil_pixel_format.h>
+ #include <vil/vil_exception.h>
+ 
+-#include <dcfilefo.h>
+-#include <dcmetinf.h>
+-#include <dcdatset.h>
+-#include <dctagkey.h>
+-#include <dcdeftag.h>
+-#include <dcstack.h>
+-#include <diinpxt.h>
++#include <dcmtk/dcmdata/dcfilefo.h>
++#include <dcmtk/dcmdata/dcmetinf.h>
++#include <dcmtk/dcmdata/dcdatset.h>
++#include <dcmtk/dcmdata/dctagkey.h>
++#include <dcmtk/dcmdata/dcdeftag.h>
++#include <dcmtk/dcmdata/dcstack.h>
++#include <dcmtk/dcmimgle/diinpxt.h>
+ 
+ #include "vil_dicom_stream.h"
+ //
+diff --git a/core/vil/file_formats/vil_dicom_stream.cxx b/core/vil/file_formats/vil_dicom_stream.cxx
+index f30ce5849eec05666fe6d81128b210542e56567a..ccc601d5db717b07a696f1804d3341ec3b4ceafa 100644
+--- a/core/vil/file_formats/vil_dicom_stream.cxx
++++ b/core/vil/file_formats/vil_dicom_stream.cxx
+@@ -4,7 +4,7 @@
+ 
+ #include "vil_dicom_stream.h"
+ #include <vil/vil_stream.h>
+-#include <dcerror.h>
++#include <dcmtk/dcmdata/dcerror.h>
+ 
+ #include <cassert>
+ #ifdef _MSC_VER
+diff --git a/core/vil/file_formats/vil_dicom_stream.h b/core/vil/file_formats/vil_dicom_stream.h
+index 79a639639a2bb1f627820bb508b358643b7405a9..14a765b6f6766e9dcdd7a50f92c681f473b77ae8 100644
+--- a/core/vil/file_formats/vil_dicom_stream.h
++++ b/core/vil/file_formats/vil_dicom_stream.h
+@@ -4,7 +4,7 @@
+ // \file
+ // \author Amitha Perera
+ 
+-#include <dcistrma.h>
++#include <dcmtk/dcmdata/dcistrma.h>
+ 
+ class vil_stream;
+ 
+-- 
+2.21.0
+
diff --git a/0008-More-sonames.patch b/0008-More-sonames.patch
deleted file mode 100644
index 7703850..0000000
--- a/0008-More-sonames.patch
+++ /dev/null
@@ -1,819 +0,0 @@
-From 0a1e1ce761a79e9856aea1e14dfd177b3d71fec1 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:38:03 +0200
-Subject: [PATCH 08/23] More sonames
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/b3p/minizip/CMakeLists.txt   | 1 +
- contrib/brl/bbas/bdgl/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bdpg/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bgrl/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bnl/CMakeLists.txt      | 1 +
- contrib/brl/bbas/bnl/algo/CMakeLists.txt | 1 +
- contrib/brl/bbas/bsol/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bsta/CMakeLists.txt     | 1 +
- contrib/brl/bbas/btol/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bugl/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bvgl/CMakeLists.txt     | 1 +
- contrib/brl/bseg/brip/CMakeLists.txt     | 1 +
- contrib/brl/bseg/sdet/CMakeLists.txt     | 1 +
- contrib/gel/geml/CMakeLists.txt          | 1 +
- contrib/gel/gevd/CMakeLists.txt          | 1 +
- contrib/gel/gmvl/CMakeLists.txt          | 1 +
- contrib/gel/gst/CMakeLists.txt           | 1 +
- contrib/gel/gtrl/CMakeLists.txt          | 1 +
- contrib/gel/vdgl/CMakeLists.txt          | 1 +
- contrib/gel/vifa/CMakeLists.txt          | 1 +
- contrib/gel/vmal/CMakeLists.txt          | 1 +
- contrib/gel/vsol/CMakeLists.txt          | 1 +
- contrib/gel/vtol/CMakeLists.txt          | 1 +
- contrib/gel/vtol/algo/CMakeLists.txt     | 1 +
- contrib/mul/clsfy/CMakeLists.txt         | 1 +
- contrib/mul/ipts/CMakeLists.txt          | 1 +
- contrib/mul/mbl/CMakeLists.txt           | 1 +
- contrib/mul/pdf1d/CMakeLists.txt         | 1 +
- contrib/mul/vil3d/CMakeLists.txt         | 1 +
- contrib/mul/vil3d/algo/CMakeLists.txt    | 1 +
- contrib/mul/vil3d/io/CMakeLists.txt      | 1 +
- contrib/mul/vimt/CMakeLists.txt          | 1 +
- contrib/mul/vimt/algo/CMakeLists.txt     | 1 +
- contrib/mul/vimt3d/CMakeLists.txt        | 1 +
- contrib/mul/vpdfl/CMakeLists.txt         | 1 +
- contrib/oxl/mvl/CMakeLists.txt           | 1 +
- contrib/oxl/osl/CMakeLists.txt           | 1 +
- contrib/prip/vdtop/CMakeLists.txt        | 1 +
- contrib/prip/vmap/CMakeLists.txt         | 1 +
- contrib/prip/vpyr/CMakeLists.txt         | 1 +
- contrib/rpl/rgrl/CMakeLists.txt          | 1 +
- contrib/rpl/rrel/CMakeLists.txt          | 2 +-
- contrib/rpl/rsdl/CMakeLists.txt          | 1 +
- contrib/tbl/vepl/CMakeLists.txt          | 1 +
- contrib/tbl/vipl/CMakeLists.txt          | 1 +
- core/vbl/CMakeLists.txt                  | 1 +
- core/vbl/io/CMakeLists.txt               | 1 +
- core/vcsl/CMakeLists.txt                 | 1 +
- core/vgl/CMakeLists.txt                  | 1 +
- core/vgl/algo/CMakeLists.txt             | 1 +
- core/vgl/io/CMakeLists.txt               | 1 +
- core/vgl/xio/CMakeLists.txt              | 1 +
- core/vidl/CMakeLists.txt                 | 1 +
- core/vil/io/CMakeLists.txt               | 1 +
- core/vil1/CMakeLists.txt                 | 1 +
- core/vil1/io/CMakeLists.txt              | 1 +
- core/vnl/io/CMakeLists.txt               | 1 +
- core/vnl/xio/CMakeLists.txt              | 1 +
- core/vpl/CMakeLists.txt                  | 1 +
- core/vsl/CMakeLists.txt                  | 1 +
- core/vul/CMakeLists.txt                  | 1 +
- core/vul/io/CMakeLists.txt               | 1 +
- 62 files changed, 62 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/brl/b3p/minizip/CMakeLists.txt b/contrib/brl/b3p/minizip/CMakeLists.txt
-index 5f9c310..02ccbfe 100644
---- a/contrib/brl/b3p/minizip/CMakeLists.txt
-+++ b/contrib/brl/b3p/minizip/CMakeLists.txt
-@@ -22,6 +22,7 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- ADD_LIBRARY( minizip ${minizip_sources} )
-+SET_TARGET_PROPERTIES(minizip PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS( /lib minizip )
- 
- ENDIF(ZLIB_FOUND)
-diff --git a/contrib/brl/bbas/bdgl/CMakeLists.txt b/contrib/brl/bbas/bdgl/CMakeLists.txt
-index a6315f0..90b0856 100644
---- a/contrib/brl/bbas/bdgl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bdgl/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET(bdgl_sources
- )
- 
- ADD_LIBRARY(bdgl ${bdgl_sources})
-+SET_TARGET_PROPERTIES(bdgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bdgl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdgl ${bdgl_sources})
- 
-diff --git a/contrib/brl/bbas/bdpg/CMakeLists.txt b/contrib/brl/bbas/bdpg/CMakeLists.txt
-index 40ca6cb..73b4eec 100644
---- a/contrib/brl/bbas/bdpg/CMakeLists.txt
-+++ b/contrib/brl/bbas/bdpg/CMakeLists.txt
-@@ -10,6 +10,7 @@ bdpg_array_dynamic_prg.cxx    bdpg_array_dynamic_prg.h
- AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
- 
- ADD_LIBRARY(bdpg ${bdpg_sources})
-+SET_TARGET_PROPERTIES(bdpg PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bdpg)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdpg ${bdpg_sources})
- 
-diff --git a/contrib/brl/bbas/bgrl/CMakeLists.txt b/contrib/brl/bbas/bgrl/CMakeLists.txt
-index cd7071c..8a34186 100644
---- a/contrib/brl/bbas/bgrl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bgrl/CMakeLists.txt
-@@ -19,6 +19,7 @@ SET(bgrl_sources
- AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
- 
- ADD_LIBRARY(bgrl ${bgrl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bgrl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
- 
-diff --git a/contrib/brl/bbas/bnl/CMakeLists.txt b/contrib/brl/bbas/bnl/CMakeLists.txt
-index 490b3ee..4b17399 100644
---- a/contrib/brl/bbas/bnl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bnl/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET(bnl_sources
-    )
- 
- ADD_LIBRARY(bnl ${bnl_sources})
-+SET_TARGET_PROPERTIES(bnl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bnl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl ${bnl_sources})
- 
-diff --git a/contrib/brl/bbas/bnl/algo/CMakeLists.txt b/contrib/brl/bbas/bnl/algo/CMakeLists.txt
-index f0c455a..be88139 100644
---- a/contrib/brl/bbas/bnl/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bnl/algo/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET( bnl_algo_sources
- )
- 
- ADD_LIBRARY( bnl_algo ${bnl_algo_sources} )
-+SET_TARGET_PROPERTIES(bnl_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bnl_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl/algo ${bnl_algo_sources})
- TARGET_LINK_LIBRARIES( bnl_algo vnl )
-diff --git a/contrib/brl/bbas/bsol/CMakeLists.txt b/contrib/brl/bbas/bsol/CMakeLists.txt
-index 33f6dde..7608c80 100644
---- a/contrib/brl/bbas/bsol/CMakeLists.txt
-+++ b/contrib/brl/bbas/bsol/CMakeLists.txt
-@@ -24,6 +24,7 @@ SET(bsol_sources
- AUX_SOURCE_DIRECTORY(Templates bsol_sources)
- 
- ADD_LIBRARY(bsol ${bsol_sources})
-+SET_TARGET_PROPERTIES(bsol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bsol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsol ${bsol_sources})
- TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
-diff --git a/contrib/brl/bbas/bsta/CMakeLists.txt b/contrib/brl/bbas/bsta/CMakeLists.txt
-index 9370247..f762491 100644
---- a/contrib/brl/bbas/bsta/CMakeLists.txt
-+++ b/contrib/brl/bbas/bsta/CMakeLists.txt
-@@ -62,6 +62,7 @@ SET(bsta_sources
- 
- AUX_SOURCE_DIRECTORY(Templates bsta_sources)
- ADD_LIBRARY(bsta  ${bsta_sources})
-+SET_TARGET_PROPERTIES(bsta PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bsta)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/bsta ${bsta_sources})
- 
-diff --git a/contrib/brl/bbas/btol/CMakeLists.txt b/contrib/brl/bbas/btol/CMakeLists.txt
-index a80f2ce..d5bcba9 100644
---- a/contrib/brl/bbas/btol/CMakeLists.txt
-+++ b/contrib/brl/bbas/btol/CMakeLists.txt
-@@ -19,6 +19,7 @@ SET(btol_sources
- )
- 
- ADD_LIBRARY(btol ${btol_sources})
-+SET_TARGET_PROPERTIES(btol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib btol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btol ${btol_sources})
- 
-diff --git a/contrib/brl/bbas/bugl/CMakeLists.txt b/contrib/brl/bbas/bugl/CMakeLists.txt
-index f6cc10a..022890b 100644
---- a/contrib/brl/bbas/bugl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bugl/CMakeLists.txt
-@@ -26,6 +26,7 @@ SET(bugl_sources
- AUX_SOURCE_DIRECTORY(Templates bugl_sources)
- 
- ADD_LIBRARY(bugl ${bugl_sources})
-+SET_TARGET_PROPERTIES(bugl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bugl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bugl ${bugl_sources})
- TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
-diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index 3d4e456..bcb5e8b 100644
---- a/contrib/brl/bbas/bvgl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
-@@ -38,6 +38,7 @@ ENDIF(EXPAT_FOUND)
- 
- #Create BVGL library
- ADD_LIBRARY(bvgl ${bvgl_sources})
-+SET_TARGET_PROPERTIES(bvgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bvgl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvgl ${bvgl_sources})
- TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl_io vgl vnl_algo vnl vil vbl)
-diff --git a/contrib/brl/bseg/brip/CMakeLists.txt b/contrib/brl/bseg/brip/CMakeLists.txt
-index 0e03e27..7864317 100644
---- a/contrib/brl/bseg/brip/CMakeLists.txt
-+++ b/contrib/brl/bseg/brip/CMakeLists.txt
-@@ -40,6 +40,7 @@ SET(brip_sources
- AUX_SOURCE_DIRECTORY(Templates brip_sources)
- 
- ADD_LIBRARY(brip ${brip_sources})
-+SET_TARGET_PROPERTIES(brip PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib brip)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/brip ${brip_sources})
- 
-diff --git a/contrib/brl/bseg/sdet/CMakeLists.txt b/contrib/brl/bseg/sdet/CMakeLists.txt
-index 8d603f5..ffb0445 100644
---- a/contrib/brl/bseg/sdet/CMakeLists.txt
-+++ b/contrib/brl/bseg/sdet/CMakeLists.txt
-@@ -55,6 +55,7 @@ SET(sdet_sources
- AUX_SOURCE_DIRECTORY(Templates sdet_sources)
- 
- ADD_LIBRARY(sdet ${sdet_sources})
-+SET_TARGET_PROPERTIES(sdet PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib sdet)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/sdet ${sdet_sources})
- 
-diff --git a/contrib/gel/geml/CMakeLists.txt b/contrib/gel/geml/CMakeLists.txt
-index 07b4772..8f4b799 100644
---- a/contrib/gel/geml/CMakeLists.txt
-+++ b/contrib/gel/geml/CMakeLists.txt
-@@ -12,6 +12,7 @@ SET(geml_sources
- )
- 
- ADD_LIBRARY(geml ${geml_sources})
-+SET_TARGET_PROPERTIES(geml PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib geml)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/geml ${geml_sources})
- TARGET_LINK_LIBRARIES(geml vil1 vnl)
-diff --git a/contrib/gel/gevd/CMakeLists.txt b/contrib/gel/gevd/CMakeLists.txt
-index 87edfbe..265cb28 100644
---- a/contrib/gel/gevd/CMakeLists.txt
-+++ b/contrib/gel/gevd/CMakeLists.txt
-@@ -33,6 +33,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(gevd ${gevd_sources})
-+SET_TARGET_PROPERTIES(gevd PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gevd)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gevd ${gevd_sources})
- TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
-diff --git a/contrib/gel/gmvl/CMakeLists.txt b/contrib/gel/gmvl/CMakeLists.txt
-index 3f99c15..55b1d8c 100644
---- a/contrib/gel/gmvl/CMakeLists.txt
-+++ b/contrib/gel/gmvl/CMakeLists.txt
-@@ -21,6 +21,7 @@ SET(gmvl_sources
- AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
- 
- ADD_LIBRARY(gmvl ${gmvl_sources})
-+SET_TARGET_PROPERTIES(gmvl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gmvl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gmvl ${gmvl_sources})
- TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
-diff --git a/contrib/gel/gst/CMakeLists.txt b/contrib/gel/gst/CMakeLists.txt
-index e9e5d01..3bb59d6 100644
---- a/contrib/gel/gst/CMakeLists.txt
-+++ b/contrib/gel/gst/CMakeLists.txt
-@@ -17,6 +17,7 @@ SET(gst_sources
- AUX_SOURCE_DIRECTORY(Templates gst_sources)
- 
- ADD_LIBRARY(gst ${gst_sources})
-+SET_TARGET_PROPERTIES(gst PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gst)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
- 
-diff --git a/contrib/gel/gtrl/CMakeLists.txt b/contrib/gel/gtrl/CMakeLists.txt
-index c3c79b9..9325960 100644
---- a/contrib/gel/gtrl/CMakeLists.txt
-+++ b/contrib/gel/gtrl/CMakeLists.txt
-@@ -25,6 +25,7 @@ IF(NETLIB_FOUND)
- ENDIF(NETLIB_FOUND)
- 
- ADD_LIBRARY(gtrl ${gtrl_sources})
-+SET_TARGET_PROPERTIES(gtrl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gtrl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gtrl ${gtrl_sources})
- 
-diff --git a/contrib/gel/vdgl/CMakeLists.txt b/contrib/gel/vdgl/CMakeLists.txt
-index d5d100d..f0792f2 100644
---- a/contrib/gel/vdgl/CMakeLists.txt
-+++ b/contrib/gel/vdgl/CMakeLists.txt
-@@ -23,6 +23,7 @@ SET(vdgl_sources
- AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
- 
- ADD_LIBRARY(vdgl ${vdgl_sources})
-+SET_TARGET_PROPERTIES(vdgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vdgl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vdgl ${vdgl_sources})
- TARGET_LINK_LIBRARIES(vdgl vsol vgl_algo vgl vnl_algo vnl vbl_io vbl vsl vul vcl)
-diff --git a/contrib/gel/vifa/CMakeLists.txt b/contrib/gel/vifa/CMakeLists.txt
-index a54fac7..8a19e60 100644
---- a/contrib/gel/vifa/CMakeLists.txt
-+++ b/contrib/gel/vifa/CMakeLists.txt
-@@ -31,6 +31,7 @@ SET(vifa_sources
- AUX_SOURCE_DIRECTORY(Templates vifa_sources)
- 
- ADD_LIBRARY(vifa ${vifa_sources})
-+SET_TARGET_PROPERTIES(vifa PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vifa)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vifa ${vifa_sources})
- TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
-diff --git a/contrib/gel/vmal/CMakeLists.txt b/contrib/gel/vmal/CMakeLists.txt
-index 66604bf..63f66f4 100644
---- a/contrib/gel/vmal/CMakeLists.txt
-+++ b/contrib/gel/vmal/CMakeLists.txt
-@@ -37,6 +37,7 @@ AUX_SOURCE_DIRECTORY(Templates vmal_sources)
- 
- 
- ADD_LIBRARY(vmal ${vmal_sources})
-+SET_TARGET_PROPERTIES(vmal PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vmal)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
- 
-diff --git a/contrib/gel/vsol/CMakeLists.txt b/contrib/gel/vsol/CMakeLists.txt
-index 942af24..9fdf889 100644
---- a/contrib/gel/vsol/CMakeLists.txt
-+++ b/contrib/gel/vsol/CMakeLists.txt
-@@ -63,6 +63,7 @@ INCLUDE_DIRECTORIES(${VXLCORE_INCLUDE_DIR})
- AUX_SOURCE_DIRECTORY(Templates vsol_sources)
- 
- ADD_LIBRARY(vsol ${vsol_sources})
-+SET_TARGET_PROPERTIES(vsol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vsol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsol ${vsol_sources})
- TARGET_LINK_LIBRARIES(vsol vgl_algo vgl_io vgl vnl vbl_io vbl vsl vul vcl)
-diff --git a/contrib/gel/vtol/CMakeLists.txt b/contrib/gel/vtol/CMakeLists.txt
-index 7068118..28ab541 100644
---- a/contrib/gel/vtol/CMakeLists.txt
-+++ b/contrib/gel/vtol/CMakeLists.txt
-@@ -35,6 +35,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vtol ${vtol_sources})
-+SET_TARGET_PROPERTIES(vtol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vtol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol ${vtol_sources})
- TARGET_LINK_LIBRARIES(vtol vdgl vsol vnl vbl vul ${CMAKE_THREAD_LIBS})
-diff --git a/contrib/gel/vtol/algo/CMakeLists.txt b/contrib/gel/vtol/algo/CMakeLists.txt
-index f0edd60..6004217 100644
---- a/contrib/gel/vtol/algo/CMakeLists.txt
-+++ b/contrib/gel/vtol/algo/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET( vtol_algo_sources
- AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
- 
- ADD_LIBRARY( vtol_algo ${vtol_algo_sources} )
-+SET_TARGET_PROPERTIES(vtol_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vtol_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol/algo ${vtol_algo_sources})
- TARGET_LINK_LIBRARIES( vtol_algo vtol vsol vdgl vil_algo vgl_algo vgl vil vbl )
-diff --git a/contrib/mul/clsfy/CMakeLists.txt b/contrib/mul/clsfy/CMakeLists.txt
-index 9e529ad..2569b87 100644
---- a/contrib/mul/clsfy/CMakeLists.txt
-+++ b/contrib/mul/clsfy/CMakeLists.txt
-@@ -53,6 +53,7 @@ SET(clsfy_sources
- AUX_SOURCE_DIRECTORY(Templates clsfy_sources)
- 
- ADD_LIBRARY(clsfy ${clsfy_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib clsfy)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/clsfy ${clsfy_sources})
- TARGET_LINK_LIBRARIES(clsfy vpdfl mbl vnl_algo vnl_io vnl vbl vsl vul)
-diff --git a/contrib/mul/ipts/CMakeLists.txt b/contrib/mul/ipts/CMakeLists.txt
-index 54910b6..0d2e31e 100644
---- a/contrib/mul/ipts/CMakeLists.txt
-+++ b/contrib/mul/ipts/CMakeLists.txt
-@@ -16,6 +16,7 @@ SET(ipts_sources
- )
- 
- ADD_LIBRARY(ipts ${ipts_sources})
-+SET_TARGET_PROPERTIES(ipts PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib ipts)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/ipts ${ipts_sources})
- TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
-diff --git a/contrib/mul/mbl/CMakeLists.txt b/contrib/mul/mbl/CMakeLists.txt
-index 75b157f..7009c61 100644
---- a/contrib/mul/mbl/CMakeLists.txt
-+++ b/contrib/mul/mbl/CMakeLists.txt
-@@ -121,6 +121,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(mbl ${mbl_sources})
-+SET_TARGET_PROPERTIES(mbl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl)
- 
- INSTALL_TARGETS(/lib mbl)
-diff --git a/contrib/mul/pdf1d/CMakeLists.txt b/contrib/mul/pdf1d/CMakeLists.txt
-index 6c26478..aca9219 100644
---- a/contrib/mul/pdf1d/CMakeLists.txt
-+++ b/contrib/mul/pdf1d/CMakeLists.txt
-@@ -49,6 +49,7 @@ SET(pdf1d_sources
- AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
- 
- ADD_LIBRARY(pdf1d ${pdf1d_sources})
-+SET_TARGET_PROPERTIES(pdf1d PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib pdf1d)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/pdf1d ${pdf1d_sources})
- TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
-diff --git a/contrib/mul/vil3d/CMakeLists.txt b/contrib/mul/vil3d/CMakeLists.txt
-index b3fd91f..716ab57 100644
---- a/contrib/mul/vil3d/CMakeLists.txt
-+++ b/contrib/mul/vil3d/CMakeLists.txt
-@@ -49,6 +49,7 @@ SET(vil3d_sources
- AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
- 
- ADD_LIBRARY(vil3d ${vil3d_sources})
-+SET_TARGET_PROPERTIES(vil3d PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl )
- 
- INSTALL_TARGETS(/lib vil3d)
-diff --git a/contrib/mul/vil3d/algo/CMakeLists.txt b/contrib/mul/vil3d/algo/CMakeLists.txt
-index 3aeeff4..9553ad2 100644
---- a/contrib/mul/vil3d/algo/CMakeLists.txt
-+++ b/contrib/mul/vil3d/algo/CMakeLists.txt
-@@ -36,6 +36,7 @@ SET(vil3d_algo_sources
- AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
- 
- ADD_LIBRARY(vil3d_algo ${vil3d_algo_sources})
-+SET_TARGET_PROPERTIES(vil3d_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vil3d_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/algo ${vil3d_algo_sources})
- TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
-diff --git a/contrib/mul/vil3d/io/CMakeLists.txt b/contrib/mul/vil3d/io/CMakeLists.txt
-index 9bb78cc..4a369e6 100644
---- a/contrib/mul/vil3d/io/CMakeLists.txt
-+++ b/contrib/mul/vil3d/io/CMakeLists.txt
-@@ -7,6 +7,7 @@ SET(vil3d_io_sources
- )
- 
- ADD_LIBRARY(vil3d_io ${vil3d_io_sources})
-+SET_TARGET_PROPERTIES(vil3d_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vil3d_io)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/io ${vil3d_io_sources})
- TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
-diff --git a/contrib/mul/vimt/CMakeLists.txt b/contrib/mul/vimt/CMakeLists.txt
-index ebcab91..3b07187 100644
---- a/contrib/mul/vimt/CMakeLists.txt
-+++ b/contrib/mul/vimt/CMakeLists.txt
-@@ -35,6 +35,7 @@ SET(vimt_sources
- AUX_SOURCE_DIRECTORY(Templates vimt_sources)
- 
- ADD_LIBRARY(vimt ${vimt_sources})
-+SET_TARGET_PROPERTIES(vimt PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vimt)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt ${vimt_sources})
- TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil_io vil )
-diff --git a/contrib/mul/vimt/algo/CMakeLists.txt b/contrib/mul/vimt/algo/CMakeLists.txt
-index 5eb8e8e..215c568 100644
---- a/contrib/mul/vimt/algo/CMakeLists.txt
-+++ b/contrib/mul/vimt/algo/CMakeLists.txt
-@@ -11,6 +11,7 @@ SET( vimt_algo_sources
- )
- 
- ADD_LIBRARY(vimt_algo ${vimt_algo_sources})
-+SET_TARGET_PROPERTIES(vimt_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vimt_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt/algo ${vimt_algo_sources})
- TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
-diff --git a/contrib/mul/vimt3d/CMakeLists.txt b/contrib/mul/vimt3d/CMakeLists.txt
-index 51d053c..93efcbf 100644
---- a/contrib/mul/vimt3d/CMakeLists.txt
-+++ b/contrib/mul/vimt3d/CMakeLists.txt
-@@ -34,6 +34,7 @@ SET(vimt3d_sources
- AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
- 
- ADD_LIBRARY(vimt3d ${vimt3d_sources})
-+SET_TARGET_PROPERTIES(vimt3d PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vimt3d)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt3d ${vimt3d_sources})
- TARGET_LINK_LIBRARIES(vimt3d vil3d_algo vil3d_io vil3d vimt mbl vnl_algo vgl vnl_io vnl vil vsl vul)
-diff --git a/contrib/mul/vpdfl/CMakeLists.txt b/contrib/mul/vpdfl/CMakeLists.txt
-index 5e258cd..2c0b05b 100644
---- a/contrib/mul/vpdfl/CMakeLists.txt
-+++ b/contrib/mul/vpdfl/CMakeLists.txt
-@@ -37,6 +37,7 @@ SET(vpdfl_sources
- AUX_SOURCE_DIRECTORY(Templates vpdfl_sources)
- 
- ADD_LIBRARY(vpdfl ${vpdfl_sources})
-+SET_TARGET_PROPERTIES(vpdfl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vpdfl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vpdfl ${vpdfl_sources})
- TARGET_LINK_LIBRARIES(vpdfl mbl vnl_algo vnl_io vnl vsl vul)
-diff --git a/contrib/oxl/mvl/CMakeLists.txt b/contrib/oxl/mvl/CMakeLists.txt
-index d2bf196..878be51 100644
---- a/contrib/oxl/mvl/CMakeLists.txt
-+++ b/contrib/oxl/mvl/CMakeLists.txt
-@@ -113,6 +113,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(mvl ${mvl_sources})
-+SET_TARGET_PROPERTIES(mvl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib mvl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/mvl ${mvl_sources})
- TARGET_LINK_LIBRARIES(mvl vil1 vnl_algo vnl vbl vgl vgl_algo vul)
-diff --git a/contrib/oxl/osl/CMakeLists.txt b/contrib/oxl/osl/CMakeLists.txt
-index a5a0fff..d399b31 100644
---- a/contrib/oxl/osl/CMakeLists.txt
-+++ b/contrib/oxl/osl/CMakeLists.txt
-@@ -45,6 +45,7 @@ SET(osl_sources
- AUX_SOURCE_DIRECTORY(Templates osl_sources)
- 
- ADD_LIBRARY(osl ${osl_sources})
-+SET_TARGET_PROPERTIES(osl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib osl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
- TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
-diff --git a/contrib/prip/vdtop/CMakeLists.txt b/contrib/prip/vdtop/CMakeLists.txt
-index 9723450..feee0c2 100644
---- a/contrib/prip/vdtop/CMakeLists.txt
-+++ b/contrib/prip/vdtop/CMakeLists.txt
-@@ -26,6 +26,7 @@ SET(vdtop_sources
- )
- 
- ADD_LIBRARY(vdtop ${vdtop_sources})
-+SET_TARGET_PROPERTIES(vdtop PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vdtop)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vdtop ${vdtop_sources})
- TARGET_LINK_LIBRARIES(vdtop vmap vil)
-diff --git a/contrib/prip/vmap/CMakeLists.txt b/contrib/prip/vmap/CMakeLists.txt
-index 5c8938b..051ffc2 100644
---- a/contrib/prip/vmap/CMakeLists.txt
-+++ b/contrib/prip/vmap/CMakeLists.txt
-@@ -28,6 +28,7 @@ SET(vmap_sources
- )
- 
- ADD_LIBRARY(vmap ${vmap_sources})
-+SET_TARGET_PROPERTIES(vmap PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vmap)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vmap ${vmap_sources})
- TARGET_LINK_LIBRARIES(vmap vcl)
-diff --git a/contrib/prip/vpyr/CMakeLists.txt b/contrib/prip/vpyr/CMakeLists.txt
-index 0074833..d1a4dda 100644
---- a/contrib/prip/vpyr/CMakeLists.txt
-+++ b/contrib/prip/vpyr/CMakeLists.txt
-@@ -23,6 +23,7 @@ SET(vpyr_sources
- )
- 
- ADD_LIBRARY(vpyr ${vpyr_sources})
-+SET_TARGET_PROPERTIES(vpyr PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vpyr)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vpyr ${vpyr_sources})
- TARGET_LINK_LIBRARIES(vpyr vmap)
-diff --git a/contrib/rpl/rgrl/CMakeLists.txt b/contrib/rpl/rgrl/CMakeLists.txt
-index 82c9861..3b0be6e 100644
---- a/contrib/rpl/rgrl/CMakeLists.txt
-+++ b/contrib/rpl/rgrl/CMakeLists.txt
-@@ -161,6 +161,7 @@ SET( rgrl_sources
- AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
- 
- ADD_LIBRARY( rgrl ${rgrl_sources} )
-+SET_TARGET_PROPERTIES(rgrl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib rgrl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rgrl ${rgrl_sources})
- TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
-diff --git a/contrib/rpl/rrel/CMakeLists.txt b/contrib/rpl/rrel/CMakeLists.txt
-index 761c023..407a5b0 100644
---- a/contrib/rpl/rrel/CMakeLists.txt
-+++ b/contrib/rpl/rrel/CMakeLists.txt
-@@ -44,7 +44,7 @@ SET(rrel_sources
- AUX_SOURCE_DIRECTORY(Templates rrel_sources)
- 
- ADD_LIBRARY(rrel ${rrel_sources})
--
-+SET_TARGET_PROPERTIES(rrel PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib rrel)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rrel ${rrel_sources})
- TARGET_LINK_LIBRARIES(rrel vnl_algo vnl vgl)
-diff --git a/contrib/rpl/rsdl/CMakeLists.txt b/contrib/rpl/rsdl/CMakeLists.txt
-index 360068b..b758e19 100644
---- a/contrib/rpl/rsdl/CMakeLists.txt
-+++ b/contrib/rpl/rsdl/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(rsdl ${rsdl_sources})
-+SET_TARGET_PROPERTIES(rsdl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib rsdl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rsdl ${rsdl_sources})
- TARGET_LINK_LIBRARIES( rsdl vnl vbl )
-diff --git a/contrib/tbl/vepl/CMakeLists.txt b/contrib/tbl/vepl/CMakeLists.txt
-index c6fa6ec..c7efe76 100644
---- a/contrib/tbl/vepl/CMakeLists.txt
-+++ b/contrib/tbl/vepl/CMakeLists.txt
-@@ -52,6 +52,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vepl ${vepl_sources})
-+SET_TARGET_PROPERTIES(vepl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vepl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl ${vepl_sources})
- TARGET_LINK_LIBRARIES(vepl vipl vil ${CMAKE_THREAD_LIBS})
-diff --git a/contrib/tbl/vipl/CMakeLists.txt b/contrib/tbl/vipl/CMakeLists.txt
-index 91a8726..4ee00e7 100644
---- a/contrib/tbl/vipl/CMakeLists.txt
-+++ b/contrib/tbl/vipl/CMakeLists.txt
-@@ -77,6 +77,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vipl ${vipl_sources})
-+SET_TARGET_PROPERTIES(vipl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vipl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vipl ${vipl_sources})
- TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
-diff --git a/core/vbl/CMakeLists.txt b/core/vbl/CMakeLists.txt
-index 7298356..5c9f57b 100644
---- a/core/vbl/CMakeLists.txt
-+++ b/core/vbl/CMakeLists.txt
-@@ -42,6 +42,7 @@ SET( vbl_sources
- AUX_SOURCE_DIRECTORY(Templates vbl_sources)
- 
- ADD_LIBRARY(vbl ${vbl_sources})
-+SET_TARGET_PROPERTIES(vbl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vbl vcl )
- 
- INSTALL_TARGETS(/lib vbl)
-diff --git a/core/vbl/io/CMakeLists.txt b/core/vbl/io/CMakeLists.txt
-index f79b9f8..8ec5629 100644
---- a/core/vbl/io/CMakeLists.txt
-+++ b/core/vbl/io/CMakeLists.txt
-@@ -17,6 +17,7 @@ SET(vbl_io_sources
- AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
- 
- ADD_LIBRARY(vbl_io ${vbl_io_sources})
-+SET_TARGET_PROPERTIES(vbl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vbl_io vbl vsl )
- 
- INSTALL_TARGETS(/lib vbl_io)
-diff --git a/core/vcsl/CMakeLists.txt b/core/vcsl/CMakeLists.txt
-index f7e8894..49191e6 100644
---- a/core/vcsl/CMakeLists.txt
-+++ b/core/vcsl/CMakeLists.txt
-@@ -63,6 +63,7 @@ doxygen_add_library(core/vcsl
-   AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
- 
-   ADD_LIBRARY( vcsl ${vcsl_sources} )
-+  SET_TARGET_PROPERTIES(vcsl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-   TARGET_LINK_LIBRARIES( vcsl vnl vbl )
- 
-   INSTALL_TARGETS(/lib vcsl)
-diff --git a/core/vgl/CMakeLists.txt b/core/vgl/CMakeLists.txt
-index 486fe81..0f22323 100644
---- a/core/vgl/CMakeLists.txt
-+++ b/core/vgl/CMakeLists.txt
-@@ -69,6 +69,7 @@ ENDIF( BUILD_NONCOMMERCIAL )
- AUX_SOURCE_DIRECTORY(Templates vgl_sources)
- 
- ADD_LIBRARY(vgl ${vgl_sources})
-+SET_TARGET_PROPERTIES(vgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vgl vcl )
- doxygen_add_library(core/vgl
-   #DEPENDS core/vsl core/vnl
-diff --git a/core/vgl/algo/CMakeLists.txt b/core/vgl/algo/CMakeLists.txt
-index f124a5c..5cd991f 100644
---- a/core/vgl/algo/CMakeLists.txt
-+++ b/core/vgl/algo/CMakeLists.txt
-@@ -44,6 +44,7 @@ SET( vgl_algo_sources
- AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
- 
- ADD_LIBRARY(vgl_algo ${vgl_algo_sources})
-+SET_TARGET_PROPERTIES(vgl_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vgl_algo vgl vnl_algo vnl )
- 
- INSTALL_TARGETS(/lib vgl_algo)
-diff --git a/core/vgl/io/CMakeLists.txt b/core/vgl/io/CMakeLists.txt
-index bf27abc..10a6420 100644
---- a/core/vgl/io/CMakeLists.txt
-+++ b/core/vgl/io/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET(vgl_io_sources
- AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
- 
- ADD_LIBRARY(vgl_io ${vgl_io_sources})
-+SET_TARGET_PROPERTIES(vgl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vgl_io vgl vsl )
- 
- INSTALL_TARGETS(/lib vgl_io)
-diff --git a/core/vgl/xio/CMakeLists.txt b/core/vgl/xio/CMakeLists.txt
-index 365fbef..83989e4 100644
---- a/core/vgl/xio/CMakeLists.txt
-+++ b/core/vgl/xio/CMakeLists.txt
-@@ -10,6 +10,7 @@ SET(vgl_xio_sources
- AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
- 
- ADD_LIBRARY(vgl_xio ${vgl_xio_sources})
-+SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- IF(NOT WIN32)
-   SET_TARGET_PROPERTIES(vgl_xio PROPERTIES COMPILE_FLAGS "-fPIC")
- ENDIF(NOT WIN32)
-diff --git a/core/vidl/CMakeLists.txt b/core/vidl/CMakeLists.txt
-index 1778ca7..eb3dcf1 100644
---- a/core/vidl/CMakeLists.txt
-+++ b/core/vidl/CMakeLists.txt
-@@ -128,6 +128,7 @@ ENDIF(VIDEODEV2_FOUND)
- AUX_SOURCE_DIRECTORY(Templates vidl_sources)
- 
- ADD_LIBRARY(vidl ${vidl_sources})
-+SET_TARGET_PROPERTIES(vidl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vidl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources})
- 
-diff --git a/core/vil/io/CMakeLists.txt b/core/vil/io/CMakeLists.txt
-index 4b9800f..b6153d8 100644
---- a/core/vil/io/CMakeLists.txt
-+++ b/core/vil/io/CMakeLists.txt
-@@ -15,6 +15,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vil_io ${vil_io_sources})
-+SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil_io vil vsl )
- 
- INSTALL_TARGETS(/lib vil_io)
-diff --git a/core/vil1/CMakeLists.txt b/core/vil1/CMakeLists.txt
-index 2bde8ff..cd0797f 100644
---- a/core/vil1/CMakeLists.txt
-+++ b/core/vil1/CMakeLists.txt
-@@ -169,6 +169,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vil1 ${vil1_sources})
-+SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vil1)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources})
- 
-diff --git a/core/vil1/io/CMakeLists.txt b/core/vil1/io/CMakeLists.txt
-index c16238a..836bb67 100644
---- a/core/vil1/io/CMakeLists.txt
-+++ b/core/vil1/io/CMakeLists.txt
-@@ -15,6 +15,7 @@ SET(vil1_io_sources
- AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
- 
- ADD_LIBRARY(vil1_io ${vil1_io_sources})
-+SET_TARGET_PROPERTIES(vil1_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil1_io vil1 vsl )
- INSTALL_TARGETS(/lib vil1_io)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
-diff --git a/core/vnl/io/CMakeLists.txt b/core/vnl/io/CMakeLists.txt
-index 74da98e..3a723c6 100644
---- a/core/vnl/io/CMakeLists.txt
-+++ b/core/vnl/io/CMakeLists.txt
-@@ -26,6 +26,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vnl_io ${vnl_io_sources} )
-+SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
- 
- INSTALL_TARGETS(/lib vnl_io)
-diff --git a/core/vnl/xio/CMakeLists.txt b/core/vnl/xio/CMakeLists.txt
-index b27f519..4b62d4a 100644
---- a/core/vnl/xio/CMakeLists.txt
-+++ b/core/vnl/xio/CMakeLists.txt
-@@ -11,6 +11,7 @@ SET(vnl_xio_sources
- AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
- 
- ADD_LIBRARY(vnl_xio ${vnl_xio_sources} )
-+SET_TARGET_PROPERTIES(vnl_xio PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vnl_xio vnl vsl )
- 
- INSTALL_TARGETS(/lib vnl_xio)
-diff --git a/core/vpl/CMakeLists.txt b/core/vpl/CMakeLists.txt
-index 4c0fdfe..f2bd994 100644
---- a/core/vpl/CMakeLists.txt
-+++ b/core/vpl/CMakeLists.txt
-@@ -13,6 +13,7 @@ SET( vpl_sources
- )
- 
- ADD_LIBRARY(vpl ${vpl_sources})
-+SET_TARGET_PROPERTIES(vpl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- IF(NOT WIN32)
-   SET_TARGET_PROPERTIES(vpl PROPERTIES COMPILE_FLAGS "-fPIC")
- ENDIF(NOT WIN32)
-diff --git a/core/vsl/CMakeLists.txt b/core/vsl/CMakeLists.txt
-index 7823022..e12ddd0 100644
---- a/core/vsl/CMakeLists.txt
-+++ b/core/vsl/CMakeLists.txt
-@@ -36,6 +36,7 @@ SET(vsl_sources
- AUX_SOURCE_DIRECTORY(Templates vsl_sources)
- 
- ADD_LIBRARY(vsl ${vsl_sources})
-+SET_TARGET_PROPERTIES(vsl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vsl vcl )
- 
- INSTALL_TARGETS(/lib vsl)
-diff --git a/core/vul/CMakeLists.txt b/core/vul/CMakeLists.txt
-index f444d6a..ecacb58 100644
---- a/core/vul/CMakeLists.txt
-+++ b/core/vul/CMakeLists.txt
-@@ -76,6 +76,7 @@ ENDIF (SOLARIS)
- 
- ENDIF(APPLE)
- 
-+SET_TARGET_PROPERTIES(vul PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vul vcl )
- 
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul 
-diff --git a/core/vul/io/CMakeLists.txt b/core/vul/io/CMakeLists.txt
-index e52099e..ee4ff9d 100644
---- a/core/vul/io/CMakeLists.txt
-+++ b/core/vul/io/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET(vul_io_sources
- )
- 
- ADD_LIBRARY(vul_io ${vul_io_sources})
-+SET_TARGET_PROPERTIES(vul_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vul_io vul vsl)
- 
- INSTALL_TARGETS(/lib vul_io)
--- 
-1.7.11.7
-
diff --git a/0009-Bumped-up-version-to-1.14.patch b/0009-Bumped-up-version-to-1.14.patch
deleted file mode 100644
index 7a34e4a..0000000
--- a/0009-Bumped-up-version-to-1.14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 75b02abb0f8c4826c0bf435422b5d659057f664a Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:39:14 +0200
-Subject: [PATCH 09/23] Bumped up version to 1.14
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71f48bc..c532b01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ ENDIF( COMMAND CMAKE_POLICY )
- PROJECT(vxl)
- 
- SET(VXL_MAJOR_VERSION 1)
--SET(VXL_MINOR_VERSION 13)
-+SET(VXL_MINOR_VERSION 14)
- SET(VXL_BUILD_VERSION 0)
- SET(VXL_VERSION
-   "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
--- 
-1.7.11.7
-
diff --git a/0011-Do-not-use-bundled-minizip.patch b/0011-Do-not-use-bundled-minizip.patch
deleted file mode 100644
index 2338597..0000000
--- a/0011-Do-not-use-bundled-minizip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2721eacfd99e884904adbef9b1fe77530bcbbe4c Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:39:50 +0200
-Subject: [PATCH 11/23] Do not use bundled minizip
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/b3p/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7e61ffb..a0cc98e 100644
---- a/contrib/brl/b3p/CMakeLists.txt
-+++ b/contrib/brl/b3p/CMakeLists.txt
-@@ -16,10 +16,10 @@ MARK_AS_ADVANCED( VXL_FORCE_B3P_EXPAT )
- SUBDIRS(expat)
- SUBDIRS(expatpp)
- 
--OPTION( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
-+OPTION( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" NO)
- MARK_AS_ADVANCED( VXL_FORCE_B3P_SHAPELIB )
- SUBDIRS(shapelib)
- 
--SUBDIRS(minizip)
-+#SUBDIRS(minizip)
- 
- 
--- 
-1.7.11.7
-
diff --git a/0017-Add-sonames-to-vpgl-lib.patch b/0017-Add-sonames-to-vpgl-lib.patch
deleted file mode 100644
index bd73a4f..0000000
--- a/0017-Add-sonames-to-vpgl-lib.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b23d58cbe99dd3bda8468a83e59ca0c18a38150d Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Sun, 14 Oct 2012 17:11:31 +0200
-Subject: [PATCH 17/23] Add sonames to vpgl lib
-
----
- core/vpgl/CMakeLists.txt              | 1 +
- core/vpgl/algo/CMakeLists.txt         | 1 +
- core/vpgl/file_formats/CMakeLists.txt | 2 +-
- core/vpgl/io/CMakeLists.txt           | 1 +
- core/vpgl/xio/CMakeLists.txt          | 1 +
- 5 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/core/vpgl/CMakeLists.txt b/core/vpgl/CMakeLists.txt
-index 235853f..120eebb 100755
---- a/core/vpgl/CMakeLists.txt
-+++ b/core/vpgl/CMakeLists.txt
-@@ -32,6 +32,7 @@ SET( vpgl_sources
- AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
- 
- ADD_LIBRARY(vpgl ${vpgl_sources})
-+SET_TARGET_PROPERTIES(vpgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vpgl vnl_algo vnl vgl_algo vgl vul vsl vbl)
- 
- IF( BUILD_TESTING )
-diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
-index 753efb8..7dfdb9e 100755
---- a/core/vpgl/algo/CMakeLists.txt
-+++ b/core/vpgl/algo/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET( vpgl_algo_sources
- AUX_SOURCE_DIRECTORY(Templates vpgl_algo_sources)
- 
- ADD_LIBRARY(vpgl_algo ${vpgl_algo_sources})
-+SET_TARGET_PROPERTIES(vpgl_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- 
- TARGET_LINK_LIBRARIES(vpgl_algo vpgl vpgl_file_formats vgl_algo vnl_algo vnl vgl vil vul vbl)
- 
-diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
-index d5c38f9..e864476 100755
---- a/core/vpgl/file_formats/CMakeLists.txt
-+++ b/core/vpgl/file_formats/CMakeLists.txt
-@@ -21,7 +21,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
- 
- ADD_LIBRARY(vpgl_file_formats ${vpgl_file_formats_sources})
--
-+SET_TARGET_PROPERTIES(vpgl_file_formats PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vpgl_file_formats vpgl vil vnl)
- 
- IF( BUILD_TESTING )
-diff --git a/core/vpgl/io/CMakeLists.txt b/core/vpgl/io/CMakeLists.txt
-index 6809320..80ff3a1 100755
---- a/core/vpgl/io/CMakeLists.txt
-+++ b/core/vpgl/io/CMakeLists.txt
-@@ -13,6 +13,7 @@ SET(vpgl_io_sources
- AUX_SOURCE_DIRECTORY(Templates vpgl_io_sources)
- 
- ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
-+SET_TARGET_PROPERTIES(vpgl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- 
- TARGET_LINK_LIBRARIES(vpgl_io vsl vpgl vnl vgl vgl_algo vgl_io vnl_io vbl_io)
- 
-diff --git a/core/vpgl/xio/CMakeLists.txt b/core/vpgl/xio/CMakeLists.txt
-index 986ac31..a883456 100644
---- a/core/vpgl/xio/CMakeLists.txt
-+++ b/core/vpgl/xio/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET(vpgl_xio_sources
- )
- 
- ADD_LIBRARY(vpgl_xio ${vpgl_xio_sources} )
-+SET_TARGET_PROPERTIES(vpgl_xio PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vpgl_xio vpgl vsl )
- 
- INSTALL_TARGETS(/lib vpgl_xio)
--- 
-1.7.11.7
-
diff --git a/0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch b/0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
deleted file mode 100644
index 9d0f023..0000000
--- a/0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 354b76db3c873078198017ca33a22dcfc217be09 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Sun, 14 Oct 2012 17:38:51 +0200
-Subject: [PATCH 18/23] Added sonames to vgui vidl vpdl Qv libs
-
----
- core/vgui/CMakeLists.txt     | 1 +
- core/vidl/gui/CMakeLists.txt | 1 +
- core/vpdl/CMakeLists.txt     | 1 +
- v3p/Qv/CMakeLists.txt        | 2 +-
- 4 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/core/vgui/CMakeLists.txt b/core/vgui/CMakeLists.txt
-index df5eb3b..0dc1121 100644
---- a/core/vgui/CMakeLists.txt
-+++ b/core/vgui/CMakeLists.txt
-@@ -518,6 +518,7 @@ SET( vgui_sources ${vgui_sources}
- )
- 
- ADD_LIBRARY(vgui ${vgui_sources})
-+SET_TARGET_PROPERTIES(vgui PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vgui)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vgui ${vgui_sources})
- SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
-diff --git a/core/vidl/gui/CMakeLists.txt b/core/vidl/gui/CMakeLists.txt
-index 3ecc67f..c055a55 100644
---- a/core/vidl/gui/CMakeLists.txt
-+++ b/core/vidl/gui/CMakeLists.txt
-@@ -12,6 +12,7 @@ SET(vidl_gui_sources
-    )
- 
- ADD_LIBRARY(vidl_gui ${vidl_gui_sources})
-+SET_TARGET_PROPERTIES(vidl_gui PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vidl_gui)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl/gui ${vidl_gui_sources})
- TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
-diff --git a/core/vpdl/CMakeLists.txt b/core/vpdl/CMakeLists.txt
-index 7f7fcd8..263cd8c 100644
---- a/core/vpdl/CMakeLists.txt
-+++ b/core/vpdl/CMakeLists.txt
-@@ -48,6 +48,7 @@ SET( vpdl_sources
- AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
- 
- ADD_LIBRARY(vpdl ${vpdl_sources})
-+SET_TARGET_PROPERTIES(vpdl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl )
- 
- INSTALL_TARGETS(/lib vpdl)
-diff --git a/v3p/Qv/CMakeLists.txt b/v3p/Qv/CMakeLists.txt
-index 75bd643..e53f334 100644
---- a/v3p/Qv/CMakeLists.txt
-+++ b/v3p/Qv/CMakeLists.txt
-@@ -169,7 +169,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY( Qv ${Qv_sources} )
--
-+SET_TARGET_PROPERTIES(Qv PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( Qv vcl )
- 
- INSTALL_TARGETS(/lib Qv)
--- 
-1.7.11.7
-
diff --git a/0024-Added-missing-sonames-for-mvl2-and-vepl1.patch b/0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
deleted file mode 100644
index 65d8353..0000000
--- a/0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 57527d9b27af9772681dac3d6efa2e4c93232689 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Sun, 25 Nov 2012 12:30:16 +0100
-Subject: [PATCH 24/24] Added missing sonames for mvl2 and vepl1
-
----
- contrib/mul/mvl2/CMakeLists.txt  | 1 +
- contrib/tbl/vepl1/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/contrib/mul/mvl2/CMakeLists.txt b/contrib/mul/mvl2/CMakeLists.txt
-index 8870a91..9994443 100644
---- a/contrib/mul/mvl2/CMakeLists.txt
-+++ b/contrib/mul/mvl2/CMakeLists.txt
-@@ -54,6 +54,7 @@ ENDIF (AVIFILE_FOUND)
- ADD_LIBRARY(mvl2 ${mvl2_sources})
- INSTALL_TARGETS(/lib mvl2)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mvl2 ${mvl2_sources})
-+SET_TARGET_PROPERTIES(mvl2 PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
- 
- IF (AVIFILE_FOUND)
-diff --git a/contrib/tbl/vepl1/CMakeLists.txt b/contrib/tbl/vepl1/CMakeLists.txt
-index 1cc2295..0b7303f 100644
---- a/contrib/tbl/vepl1/CMakeLists.txt
-+++ b/contrib/tbl/vepl1/CMakeLists.txt
-@@ -47,6 +47,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- ADD_LIBRARY(vepl1 ${vepl1_sources})
- INSTALL_TARGETS(/lib vepl1)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl1 ${vepl1_sources})
-+SET_TARGET_PROPERTIES(vepl1 PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vepl1 vipl vil1 ${CMAKE_THREAD_LIBS})
- 
- IF (BUILD_EXAMPLES)
--- 
-1.7.11.7
-
diff --git a/vxl-0.17.0-gcc5.diff b/vxl-0.17.0-gcc5.diff
deleted file mode 100644
index 5fc0270..0000000
--- a/vxl-0.17.0-gcc5.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- vxl-git4e07960/vcl/vcl_compiler.h~	2012-11-02 12:08:21.000000000 +0100
-+++ vxl-git4e07960/vcl/vcl_compiler.h	2015-02-15 13:50:46.376329878 +0100
-@@ -119,6 +119,10 @@
- #  else
- #   define VCL_GCC_40
- #  endif
-+# elif (__GNUC__== 5)
-+// pretend GCC 5 to be GCC 4
-+#  define VCL_GCC_4
-+#  define VCL_GCC_41
- # else
- #  error "Dunno about this gcc"
- # endif
diff --git a/vxl-1.17.0-gcc6.patch b/vxl-1.17.0-gcc6.patch
deleted file mode 100644
index e12330e..0000000
--- a/vxl-1.17.0-gcc6.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -up vxl-git4e07960/core/vnl/io/CMakeLists.txt.gcc6 vxl-git4e07960/core/vnl/io/CMakeLists.txt
---- vxl-git4e07960/core/vnl/io/CMakeLists.txt.gcc6	2016-02-25 15:41:15.829447406 -0500
-+++ vxl-git4e07960/core/vnl/io/CMakeLists.txt	2016-02-25 15:41:29.558366867 -0500
-@@ -22,7 +22,7 @@ AUX_SOURCE_DIRECTORY(Templates vnl_io_so
- IF(CMAKE_COMPILER_IS_GNUCXX)
-   SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vcl_vector+vnl_vector+double----.cxx
-                               PROPERTIES
--                              COMPILE_FLAGS -ftemplate-depth-35)
-+                              COMPILE_FLAGS -ftemplate-depth=70)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vnl_io ${vnl_io_sources} )
-diff -up vxl-git4e07960/core/vul/vul_psfile.h.gcc6 vxl-git4e07960/core/vul/vul_psfile.h
---- vxl-git4e07960/core/vul/vul_psfile.h.gcc6	2012-11-02 07:08:21.000000000 -0400
-+++ vxl-git4e07960/core/vul/vul_psfile.h	2016-02-25 15:27:18.435360448 -0500
-@@ -37,7 +37,7 @@ class vul_psfile: public vcl_ofstream
- 
-   vul_psfile(char const* filename, bool debug_output=false);
-   ~vul_psfile();
--  operator bool() { return (void*)output_filestream!=(void*)0; }
-+  operator bool() { return reinterpret_cast<void*>(&output_filestream)!=(void*)0; }
- 
-   void set_paper_type(vul_psfile::paper_type type){printer_paper_type = type;}
-   void set_paper_layout(vul_psfile::paper_layout layout) {printer_paper_layout = layout;}
-diff -up vxl-git4e07960/vcl/vcl_compiler.h.gcc6 vxl-git4e07960/vcl/vcl_compiler.h
---- vxl-git4e07960/vcl/vcl_compiler.h.gcc6	2016-02-25 15:10:56.252121833 -0500
-+++ vxl-git4e07960/vcl/vcl_compiler.h	2016-02-25 15:10:56.254121822 -0500
-@@ -119,8 +119,8 @@
- #  else
- #   define VCL_GCC_40
- #  endif
--# elif (__GNUC__== 5)
--// pretend GCC 5 to be GCC 4
-+# elif (__GNUC__>5)
-+// pretend GCC 5+ to be GCC 4
- #  define VCL_GCC_4
- #  define VCL_GCC_41
- # else
-diff -up vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx.gcc6 vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx
---- vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx.gcc6	2016-02-25 16:34:20.892977826 -0500
-+++ vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx	2016-02-25 17:23:52.435971926 -0500
-@@ -15,6 +15,12 @@
- #include <vul/vul_string.h>
- #include <vgl/vgl_point_2d.h>
- 
-+// not at all sure this is right, but it gets this past gcc 6.
-+
-+vcl_ostream& operator <<( vcl_ostream &a, vcl_ostream &b) {
-+a << b;
-+return a;
-+}
- 
- //=========================================================================
- // Static function to create a static logger when first required
-diff -up vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx.gcc6 vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx
---- vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx.gcc6	2016-02-25 17:15:12.591046600 -0500
-+++ vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx	2016-02-25 17:24:15.283836790 -0500
-@@ -19,6 +19,12 @@
- #include <vgl/vgl_point_3d.h>
- #include <vgl/vgl_box_3d.h>
- 
-+// not at all sure this is right, but it gets this past gcc 6.
-+
-+vcl_ostream& operator <<( vcl_ostream &a, vcl_ostream &b) {
-+  a << b;
-+  return a;
-+}
- 
- //=========================================================================
- // Static function to create a static logger when first required
diff --git a/vxl.spec b/vxl.spec
index c8c5f82..d4111a0 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -10,57 +10,60 @@ URL:        https://vxl.github.io/
 # tar cfz vxl-%{version}-clean.tar.gz vxl-%{version}/
 # Source0:  https://github.com/vxl/vxl/archive/v%{version}/%{name}-%{version}.tar.gz
 Source0:    %{name}-%{version}-clean.tar.gz
-# Fedora has a distribution-specific include dir
-Patch1:     0001-Added-include-path-for-geotiff.patch
-Patch2:     0002-Added-soname-info-for-core-libraries.patch
+
+# Patches generated from tree here:
+# https://github.com/sanjayankur31/vxl/tree/fedora-v2.0.2
 # Use system rply and don't use mpeg2
-Patch3:     0003-Use-system-rply.patch
-Patch4:     0004-Added-more-soname.patch
-Patch5:     0005-Do-not-build-OUL.patch
-Patch6:     0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
-Patch7:     0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
-Patch8:     0008-More-sonames.patch
-Patch9:     0009-Bumped-up-version-to-1.14.patch
-#TODO: Refers to contrib and is therefore not correct
-Patch10:    0010-Use-system-FindEXPAT.patch
-Patch11:    0011-Do-not-use-bundled-minizip.patch
-Patch12:    0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
-Patch13:    0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
-Patch14:    0014-Added-additional-search-path-for-xerces-Submitted-by.patch
-Patch15:    0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
-Patch16:    0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
-Patch17:    0017-Add-sonames-to-vpgl-lib.patch
-Patch18:    0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
-Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
-Patch20:    0020-Included-missing-vcl_cstdio.h-header.patch
-Patch21:    0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
-Patch22:    0022-Include-missing-vcl_cstdio.h-header.patch
-Patch23:    0023-Remove-volm-because-of-error-in-function-prototype.patch
-Patch24:    0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
-Patch25:    0025-Legacy-def1-r35963.patch
-Patch26:    0026-Legacy-def2-r36001.patch
+Patch1:     0001-v2.0.2-unbundle-rply.patch
+Patch2:     0002-v2.0.2-Use-Fedora-FindEXPAT.patch
+Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
+# Patch4:     0004-v2.0.2-Correct-dcmtk-includes.patch
+# Patch5:     0004-Added-more-soname.patch
+# Patch6:     0005-Do-not-build-OUL.patch
+# Patch7:     0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
+# Patch8:     0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
+# Patch9:     0008-More-sonames.patch
+# Patch10:    0009-Bumped-up-version-to-1.14.patch
+# Patch11:    0011-Do-not-use-bundled-minizip.patch
+# Patch12:    0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
+# Patch13:    0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
+# Patch14:    0014-Added-additional-search-path-for-xerces-Submitted-by.patch
+# Patch15:    0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
+# Patch16:    0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
+# Patch17:    0017-Add-sonames-to-vpgl-lib.patch
+# Patch18:    0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
+# Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
+# Patch20:    0020-Included-missing-vcl_cstdio.h-header.patch
+# Patch21:    0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
+# Patch22:    0022-Include-missing-vcl_cstdio.h-header.patch
+# Patch23:    0023-Remove-volm-because-of-error-in-function-prototype.patch
+# Patch24:    0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
+# Patch25:    0025-Legacy-def1-r35963.patch
+# Patch26:    0026-Legacy-def2-r36001.patch
 
-Patch50:    vxl-0.17.0-gcc5.diff
-Patch51:    vxl-1.17.0-gcc6.patch
+# Submitted upstream https://github.com/vxl/vxl/pull/626
+Patch27:   0004-Version-shared-objects.patch
 
-Patch100:   %{name}-1.17.0-secondary.patch
+# Patch50:    vxl-0.17.0-gcc5.diff
+# Patch51:    vxl-1.17.0-gcc6.patch
+
+# Patch100:   %{name}-1.17.0-secondary.patch
 
 #KL is used in an "UNMAINTAINED_LIBRARY", vgel is only built on request
 
 
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
 BuildRequires:  cmake
-BuildRequires:  doxygen
-BuildRequires:  expat-devel
 BuildRequires:  Coin2-devel
-# Use bundled dcmtk until upstream updates their code to use newer dcmtk
-# https://github.com/vxl/vxl/issues/550
-# BuildRequires:  dcmtk-devel
 BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  expatpp-devel
 BuildRequires:  freeglut-devel
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  git
+# Use bundled dcmtk until upstream updates their code to use newer dcmtk
+# https://github.com/vxl/vxl/issues/550
+# BuildRequires:  dcmtk-devel
 BuildRequires:  klt-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
@@ -72,7 +75,7 @@ BuildRequires:  libdc1394-devel
 %endif
 BuildRequires:  libgeotiff-devel
 BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  minizip-compat-devel
+BuildRequires:  minizip-devel
 BuildRequires:  rply-devel
 BuildRequires:  SIMVoleon-devel
 BuildRequires:  shapelib-devel
@@ -110,18 +113,19 @@ You should install this package if you would like to
 develop code based on VXL.
 
 %prep
-%autosetup -S patch -p1
+%autosetup -S git
 
-#Remove bundled library (let's use FEDORA's ones)
+# Remove bundled library (let's use FEDORA's ones)
 # v3p/netlib (made by f2c) dependency not removed because of heavily modifications
 # QV is a Silicon Graphics' VRML parser from the 90s. Now unmantained.
 
 # For the time being, use bundled dcmtk. It does not build with newer dcmtk.
 # Issue filed here:
 # https://github.com/vxl/vxl/issues/550
-# for l in jpeg png zlib tiff geotiff rply dcmtk bzlib
+# Requires VXL_FORCE_V3P_DCMTK=ON
 
-for l in jpeg png zlib tiff geotiff rply bzlib
+# for l in jpeg png zlib tiff geotiff rply dcmtk bzlib
+for l in jpeg png zlib tiff geotiff bzlib
 do
     find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 done
@@ -129,7 +133,6 @@ done
 find contrib/brl/b3p/shapelib -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 find contrib/brl/b3p/minizip -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 find contrib/brl/b3p/expat -type f ! -name 'CMakeLists.txt' -execdir rm {} +
-find contrib/gel/vgel/kl -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 
 # v3p/mpeg2 lib in fedora is not enough to build the target. Moreover it is in rpmfusion repo
@@ -137,19 +140,17 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 #TODO: Various
 #vxl-devel.x86_64: E: invalid-soname /usr/lib64/libvvid.so libvvid.so
 
-#Fix lib / lib64 problem during install:
-find . -name CMakeLists.txt -exec sed -i "s/INSTALL_TARGETS([ ]*\/lib/INSTALL_TARGETS(\/lib\$\{LIB_SUFFIX\}/;" {} +
-
 # Fix executable permissions on source file
-find . -name "*.h" | xargs chmod ugo-x
-find . -name "*.cxx" | xargs chmod ugo-x
-find . -name "*.txx" | xargs chmod ugo-x
+find . -name "*.h" -exec chmod -x '{}' \;
+find . -name "*.cxx" -exec chmod -x '{}' \;
+find . -name "*.txx" -exec chmod -x '{}' \;
 
 %build
-%cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
+%cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DVXL_FORCE_B3P_EXPAT:BOOL=OFF \
-    -DVXL_FORCE_V3P_DCMTK:BOOL=OFF \
+    -DVXL_FORCE_V3P_DCMTK:BOOL=ON \
     -DVXL_FORCE_V3P_GEOTIFF:BOOL=OFF \
     -DVXL_USING_NATIVE_KL=ON \
     -DVXL_FORCE_V3P_JPEG:BOOL=OFF \
@@ -190,40 +191,130 @@ find . -name "*.txx" | xargs chmod ugo-x
 #BUILD_VGUI? NO, it depends on box2m which in turns relies on OPENCL which is not available in FEDORA
 #wxwidgets seems to be found
 #Multiple versions of QT found please set DESIRED_QT_VERSION
-#TODO: Xerces for brl
-#TODO: Testing?
-#BR: coin2, coin3 (coin3d) brl, bbas
 
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 %check
-ctest .
+# No tests
 
 %ldconfig_scriptlets
 
 %files
 %doc core/vxl_copyright.h
-%{_libdir}/*.so.*
-%{_bindir}/*
-#%%{_datadir}/%%{name}/
+%{_libdir}/libclipper.so.2.0
+%{_libdir}/libtestlib.so.2.0
+%{_libdir}/libvcl.so.2.0
+%{_libdir}/libvgl.so.2.0
+%{_libdir}/libvil_io.so.2.0
+%{_libdir}/libvnl.so.2.0
+%{_libdir}/libvpgl_file_formats.so.2.0
+%{_libdir}/libvpl.so.2.0
+%{_libdir}/libclipper.so.2.0.2
+%{_libdir}/libtestlib.so.2.0.2
+%{_libdir}/libvcl.so.2.0.2
+%{_libdir}/libvgl.so.2.0.2
+%{_libdir}/libvil_io.so.2.0.2
+%{_libdir}/libvnl.so.2.0.2
+%{_libdir}/libvpgl_file_formats.so.2.0.2
+%{_libdir}/libvpl.so.2.0.2
+%{_libdir}/libnetlib.so.2.0
+%{_libdir}/libv3p_netlib.so.2.0
+%{_libdir}/libvcsl.so.2.0
+%{_libdir}/libvgl_xio.so.2.0
+%{_libdir}/libvil.so.2.0
+%{_libdir}/libvnl_xio.so.2.0
+%{_libdir}/libvpgl_io.so.2.0
+%{_libdir}/libvsl.so.2.0
+%{_libdir}/libnetlib.so.2.0.2
+%{_libdir}/libv3p_netlib.so.2.0.2
+%{_libdir}/libvcsl.so.2.0.2
+%{_libdir}/libvgl_xio.so.2.0.2
+%{_libdir}/libvil.so.2.0.2
+%{_libdir}/libvnl_xio.so.2.0.2
+%{_libdir}/libvpgl_io.so.2.0.2
+%{_libdir}/libvsl.so.2.0.2
+%{_libdir}/libopenjpeg2.so.2.0
+%{_libdir}/libvbl_io.so.2.0
+%{_libdir}/libvgl_algo.so.2.0
+%{_libdir}/libvil1.so.2.0
+%{_libdir}/libvnl_algo.so.2.0
+%{_libdir}/libvpdl.so.2.0
+%{_libdir}/libvpgl.so.2.0
+%{_libdir}/libvul_io.so.2.0
+%{_libdir}/libopenjpeg2.so.2.0.0
+%{_libdir}/libvbl_io.so.2.0.2
+%{_libdir}/libvgl_algo.so.2.0.2
+%{_libdir}/libvil1.so.2.0.2
+%{_libdir}/libvnl_algo.so.2.0.2
+%{_libdir}/libvpdl.so.2.0.2
+%{_libdir}/libvpgl.so.2.0.2
+%{_libdir}/libvul_io.so.2.0.2
+%{_libdir}/librply.so.2.0
+%{_libdir}/libvbl.so.2.0
+%{_libdir}/libvgl_io.so.2.0
+%{_libdir}/libvil_algo.so.2.0
+%{_libdir}/libvnl_io.so.2.0
+%{_libdir}/libvpgl_algo.so.2.0
+%{_libdir}/libvpgl_xio.so.2.0
+%{_libdir}/libvul.so.2.0
+%{_libdir}/librply.so.2.0.2
+%{_libdir}/libvbl.so.2.0.2
+%{_libdir}/libvgl_io.so.2.0.2
+%{_libdir}/libvil_algo.so.2.0.2
+%{_libdir}/libvnl_io.so.2.0.2
+%{_libdir}/libvpgl_algo.so.2.0.2
+%{_libdir}/libvpgl_xio.so.2.0.2
+%{_libdir}/libvul.so.2.0.2
 
 %files devel
 %{_datadir}/%{name}
 %{_includedir}/%{name}
-%{_libdir}/*.so
+%{_libdir}/libclipper.so
+%{_libdir}/librply.so
+%{_libdir}/libvbl_io.so
+%{_libdir}/libvcsl.so
+%{_libdir}/libvgl.so
+%{_libdir}/libvil_algo.so
+%{_libdir}/libvnl_algo.so
+%{_libdir}/libvnl_xio.so
+%{_libdir}/libvpgl_file_formats.so
+%{_libdir}/libvpgl_xio.so
+%{_libdir}/libvul_io.so
+%{_libdir}/libnetlib.so
+%{_libdir}/libtestlib.so
+%{_libdir}/libvbl.so
+%{_libdir}/libvgl_algo.so
+%{_libdir}/libvgl_xio.so
+%{_libdir}/libvil_io.so
+%{_libdir}/libvnl_io.so
+%{_libdir}/libvpdl.so
+%{_libdir}/libvpgl_io.so
+%{_libdir}/libvpl.so
+%{_libdir}/libvul.so
+%{_libdir}/libopenjpeg2.so
+%{_libdir}/libv3p_netlib.so
+%{_libdir}/libvcl.so
+%{_libdir}/libvgl_io.so
+%{_libdir}/libvil1.so
+%{_libdir}/libvil.so
+%{_libdir}/libvnl.so
+%{_libdir}/libvpgl_algo.so
+%{_libdir}/libvpgl.so
+%{_libdir}/libvsl.so
 
 %files doc
 %doc %{_docdir}/*
 
 %changelog
-* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
+* Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
 - Update to latest upstream release
 - Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)
 - Use new github upstream
+- Remove uneeded patches
+- Explicitly list all shared objects
 
 * Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
 - Rebuild for dcmtk-3.6.4
diff --git a/vxl_copyright.h b/vxl_copyright.h
deleted file mode 100644
index f8f8004..0000000
--- a/vxl_copyright.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef vxl_copyright_h_
-#define vxl_copyright_h_
-
-// <begin copyright notice>
-// ---------------------------------------------------------------------------
-//
-//                Copyright (c) 2000-2003 TargetJr Consortium
-//               GE Corporate Research and Development (GE CRD)
-//                             1 Research Circle
-//                            Niskayuna, NY 12309
-//                            All Rights Reserved
-//              Reproduction rights limited as described below.
-//
-//      Permission to use, copy, modify, distribute, and sell this software
-//      and its documentation for any purpose is hereby granted without fee,
-//      provided that (i) the above copyright notice and this permission
-//      notice appear in all copies of the software and related documentation,
-//      (ii) the name TargetJr Consortium (represented by GE CRD), may not be
-//      used in any advertising or publicity relating to the software without
-//      the specific, prior written permission of GE CRD, and (iii) any
-//      modifications are clearly marked and summarized in a change history
-//      log.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-//      EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-//      WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-//      IN NO EVENT SHALL THE TARGETJR CONSORTIUM BE LIABLE FOR ANY SPECIAL,
-//      INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY
-//      DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-//      WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON
-//      ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE
-//      USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// ---------------------------------------------------------------------------
-// <end copyright notice>
-
-#endif // vxl_copyright_h_

From 42456eece04bbd13be71265046fcf5d6364e9b07 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Fri, 19 Apr 2019 10:14:36 +0100
Subject: [PATCH 28/74] Build fixed---moving on to re-porting patches

---
 0003-v2.0.2-Use-Fedora-minizip.patch          | 16 +++++--------
 ...> 0004-v2.0.2-Version-shared-objects.patch |  4 ++--
 vxl.spec                                      | 24 +++++++++----------
 3 files changed, 20 insertions(+), 24 deletions(-)
 rename 0004-Version-shared-objects.patch => 0004-v2.0.2-Version-shared-objects.patch (99%)

diff --git a/0003-v2.0.2-Use-Fedora-minizip.patch b/0003-v2.0.2-Use-Fedora-minizip.patch
index fb36a9c..04df1cd 100644
--- a/0003-v2.0.2-Use-Fedora-minizip.patch
+++ b/0003-v2.0.2-Use-Fedora-minizip.patch
@@ -1,22 +1,18 @@
-From 1103f55dff5f640a1e8bf71db87f9c871ddc27c1 Mon Sep 17 00:00:00 2001
+From d356019e2510dc2eb0bcd161fd823561287871dc Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
 Subject: [PATCH 3/4] v2.0.2 Use Fedora minizip
 
 ---
- contrib/brl/b3p/CMakeLists.txt | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ contrib/brl/b3p/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..74a7268c7e7762460760bac0c090b29990b88ca7 100644
+index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..b2f4b5f6bdb4ed0cbbde6459cb201578a1823a5d 100644
 --- a/contrib/brl/b3p/CMakeLists.txt
 +++ b/contrib/brl/b3p/CMakeLists.txt
-@@ -16,10 +16,6 @@ mark_as_advanced( VXL_FORCE_B3P_EXPAT )
- add_subdirectory(expat)
- add_subdirectory(expatpp)
- 
--option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
-+option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" NO)
+@@ -19,7 +19,3 @@ add_subdirectory(expatpp)
+ option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
  mark_as_advanced( VXL_FORCE_B3P_SHAPELIB )
  add_subdirectory(shapelib)
 -
diff --git a/0004-Version-shared-objects.patch b/0004-v2.0.2-Version-shared-objects.patch
similarity index 99%
rename from 0004-Version-shared-objects.patch
rename to 0004-v2.0.2-Version-shared-objects.patch
index e7a61fa..d6bedfb 100644
--- a/0004-Version-shared-objects.patch
+++ b/0004-v2.0.2-Version-shared-objects.patch
@@ -1,7 +1,7 @@
-From 2941b7bebf5da16636a925c824e55c4ea2dec165 Mon Sep 17 00:00:00 2001
+From 2980591c7c7d178bfaa6d073e007fb8c50fec944 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 18 Apr 2019 22:11:41 +0100
-Subject: [PATCH 4/4] Version shared objects
+Subject: [PATCH 4/4] v2.0.2 Version shared objects
 
 ---
  CMakeLists.txt                        | 26 +++++++++++++++++++++++++-
diff --git a/vxl.spec b/vxl.spec
index d4111a0..ae957ac 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -5,10 +5,10 @@ Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
 # Need to remove the non-free lena image from the sources
-# tar xf vxl-%{version}.tar.gz
-# rm -rf vxl-%{version}/contrib/prip/vdtop/tests/lena.org.pgm
-# tar cfz vxl-%{version}-clean.tar.gz vxl-%{version}/
-# Source0:  https://github.com/vxl/vxl/archive/v%{version}/%{name}-%{version}.tar.gz
+# tar xf vxl-%%{version}.tar.gz
+# rm -rf vxl-%%{version}/contrib/prip/vdtop/tests/lena.org.pgm
+# tar cfz vxl-%%{version}-clean.tar.gz vxl-%%{version}/
+# Source0:  https://github.com/vxl/vxl/archive/v%%{version}/%%{name}-%%{version}.tar.gz
 Source0:    %{name}-%{version}-clean.tar.gz
 
 # Patches generated from tree here:
@@ -17,6 +17,8 @@ Source0:    %{name}-%{version}-clean.tar.gz
 Patch1:     0001-v2.0.2-unbundle-rply.patch
 Patch2:     0002-v2.0.2-Use-Fedora-FindEXPAT.patch
 Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
+# Submitted upstream https://github.com/vxl/vxl/pull/626
+Patch27:   0004-v2.0.2-Version-shared-objects.patch
 # Patch4:     0004-v2.0.2-Correct-dcmtk-includes.patch
 # Patch5:     0004-Added-more-soname.patch
 # Patch6:     0005-Do-not-build-OUL.patch
@@ -41,8 +43,6 @@ Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
 # Patch25:    0025-Legacy-def1-r35963.patch
 # Patch26:    0026-Legacy-def2-r36001.patch
 
-# Submitted upstream https://github.com/vxl/vxl/pull/626
-Patch27:   0004-Version-shared-objects.patch
 
 # Patch50:    vxl-0.17.0-gcc5.diff
 # Patch51:    vxl-1.17.0-gcc6.patch
@@ -141,9 +141,12 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 #vxl-devel.x86_64: E: invalid-soname /usr/lib64/libvvid.so libvvid.so
 
 # Fix executable permissions on source file
-find . -name "*.h" -exec chmod -x '{}' \;
-find . -name "*.cxx" -exec chmod -x '{}' \;
-find . -name "*.txx" -exec chmod -x '{}' \;
+# not using "." for find since it sometimes crashes within the .git folder
+for f in config contrib core scripts v3p vcl; do
+    find $f -name "*.h" -execdir chmod -x '{}' \;
+    find $f -name "*.cxx" -execdir chmod -x '{}' \;
+    find $f -name "*.txx" -execdir chmod -x '{}' \;
+done
 
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
@@ -252,7 +255,6 @@ find . -name "*.txx" -exec chmod -x '{}' \;
 %{_libdir}/libvpdl.so.2.0.2
 %{_libdir}/libvpgl.so.2.0.2
 %{_libdir}/libvul_io.so.2.0.2
-%{_libdir}/librply.so.2.0
 %{_libdir}/libvbl.so.2.0
 %{_libdir}/libvgl_io.so.2.0
 %{_libdir}/libvil_algo.so.2.0
@@ -260,7 +262,6 @@ find . -name "*.txx" -exec chmod -x '{}' \;
 %{_libdir}/libvpgl_algo.so.2.0
 %{_libdir}/libvpgl_xio.so.2.0
 %{_libdir}/libvul.so.2.0
-%{_libdir}/librply.so.2.0.2
 %{_libdir}/libvbl.so.2.0.2
 %{_libdir}/libvgl_io.so.2.0.2
 %{_libdir}/libvil_algo.so.2.0.2
@@ -273,7 +274,6 @@ find . -name "*.txx" -exec chmod -x '{}' \;
 %{_datadir}/%{name}
 %{_includedir}/%{name}
 %{_libdir}/libclipper.so
-%{_libdir}/librply.so
 %{_libdir}/libvbl_io.so
 %{_libdir}/libvcsl.so
 %{_libdir}/libvgl.so

From bbfc776dd7214216fd9110820577fd5a40f0ac61 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Fri, 19 Apr 2019 13:00:26 +0100
Subject: [PATCH 29/74] Built with openjpeg2 bundled---more patches still need
 review

---
 0005-Do-not-build-OUL.patch                   |  26 ----
 ...yConfig.cmake-has-wrong-include-path.patch |  26 ----
 ..._open-and-create-changed.-Thanks-to-.patch |  45 -------
 ...-Coin3D-Submitted-by-Volker-Frohlich.patch |  32 -----
 ...MVoleon-Submitted-by-Volker-Frohlich.patch |  31 -----
 ...Included-missing-vcl_cstdio.h-header.patch |  24 ----
 ...cause-of-error-in-function-prototype.patch |  23 ----
 vxl.spec                                      | 122 +++++++++++-------
 8 files changed, 72 insertions(+), 257 deletions(-)
 delete mode 100644 0005-Do-not-build-OUL.patch
 delete mode 100644 0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
 delete mode 100644 0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
 delete mode 100644 0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
 delete mode 100644 0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
 delete mode 100644 0020-Included-missing-vcl_cstdio.h-header.patch
 delete mode 100644 0023-Remove-volm-because-of-error-in-function-prototype.patch

diff --git a/0005-Do-not-build-OUL.patch b/0005-Do-not-build-OUL.patch
deleted file mode 100644
index 14e50b5..0000000
--- a/0005-Do-not-build-OUL.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dd4f9c285bba2b49eadfa4cbf4759ca00e731235 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:18:42 +0200
-Subject: [PATCH 05/23] Do not build OUL
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
-index 03ee1b5..b228422 100644
---- a/contrib/CMakeLists.txt
-+++ b/contrib/CMakeLists.txt
-@@ -18,7 +18,7 @@ IF( EXISTS ${vxl_SOURCE_DIR}/contrib/mul/CMakeLists.txt )
- ENDIF( EXISTS ${vxl_SOURCE_DIR}/contrib/mul/CMakeLists.txt )
- 
- IF( EXISTS ${vxl_SOURCE_DIR}/contrib/oul/CMakeLists.txt )
--  OPTION(BUILD_OUL "Build the Otago University library package?" YES)
-+  OPTION(BUILD_OUL "Build the Otago University library package?" NO)
- ENDIF( EXISTS ${vxl_SOURCE_DIR}/contrib/oul/CMakeLists.txt )
- 
- IF( EXISTS ${vxl_SOURCE_DIR}/contrib/prip/CMakeLists.txt )
--- 
-1.7.11.7
-
diff --git a/0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch b/0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
deleted file mode 100644
index 0ee826c..0000000
--- a/0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 21a10dc2f967a985437777ce03248a256c08c133 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:19:39 +0200
-Subject: [PATCH 06/23] BUG: rplyConfig.cmake has wrong include path
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index c8be547..fe04412 100644
---- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-@@ -4,7 +4,7 @@
- FIND_PACKAGE(rply REQUIRED)
- 
- INCLUDE_DIRECTORIES( ${BRL_INCLUDE_DIR} )
--INCLUDE_DIRECTORIES( ${RPLY_INCLUDE_DIR} )
-+INCLUDE_DIRECTORIES( /usr/include/rply )
- 
- SET( bmsh3d_algo_sources
-   bmsh3d_fileio.cxx           bmsh3d_fileio.h
--- 
-1.7.11.7
-
diff --git a/0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch b/0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
deleted file mode 100644
index bc2a4a6..0000000
--- a/0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 48e82457160bf6484c5c15e6cdcc2641349948cd Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:20:58 +0200
-Subject: [PATCH 07/23] Arguments of ply_open and create changed. Thanks to
- Thomas Bouffon for the patch
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx b/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx
-index 3bb2240..8ad4a4d 100644
---- a/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx
-+++ b/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx
-@@ -50,7 +50,7 @@ bool bmsh3d_load_ply (bmsh3d_mesh* M, const char* file)
-   parsed_mesh.mesh = M;
- 
-   // OPEN file
--  p_ply ply = ply_open(file, NULL, 0, NULL);
-+  p_ply ply = ply_open(file, NULL);
-   if (!ply)
-     return false;
- 
-@@ -92,7 +92,7 @@ bool bmsh3d_load_ply_v (bmsh3d_mesh* M, const char* file)
-   parsed_mesh.mesh = M;
- 
-   // OPEN file
--  p_ply ply = ply_open(file, NULL, 0, NULL);
-+  p_ply ply = ply_open(file, NULL);
-   if (!ply)
-     return false;
- 
-@@ -242,7 +242,7 @@ bool bmsh3d_save_ply (bmsh3d_mesh* M, const char* file, bool ascii_mode, vcl_str
-   e_ply_storage_mode storage_mode = (ascii_mode) ? PLY_ASCII : PLY_LITTLE_ENDIAN;
- 
-   // OPEN FILE
--  p_ply oply = ply_create(file, storage_mode, NULL, 0, NULL);
-+  p_ply oply = ply_create(file, storage_mode,NULL);
- 
-   vcl_cerr << "  saving " << file << " :\n\t"
-            << M->vertexmap().size() << " points, "
--- 
-1.7.11.7
-
diff --git a/0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch b/0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
deleted file mode 100644
index ad1078d..0000000
--- a/0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9cbbbb7fcd8474be298169603f94401efa060806 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:51:01 +0200
-Subject: [PATCH 12/23] Added Coin3D (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- config/cmake/Modules/NewCMake/FindCoin3D.cmake | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/config/cmake/Modules/NewCMake/FindCoin3D.cmake b/config/cmake/Modules/NewCMake/FindCoin3D.cmake
-index 800e578..39407a1 100644
---- a/config/cmake/Modules/NewCMake/FindCoin3D.cmake
-+++ b/config/cmake/Modules/NewCMake/FindCoin3D.cmake
-@@ -57,7 +57,7 @@ ELSE (WIN32)
-     SET(COIN3D_LIBRARY "-framework Coin3d" CACHE STRING "Coin3D library for OSX")
-    ELSE(APPLE)
- 
--  FIND_PATH(COIN3D_INCLUDE_DIR Inventor/So.h)
-+    FIND_PATH(COIN3D_INCLUDE_DIR Coin2/Inventor/So.h)
- 
-   FIND_LIBRARY(COIN3D_LIBRARY Coin)   
-   ENDIF(APPLE)
-@@ -70,5 +70,3 @@ INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Coin3D DEFAULT_MSG COIN3D_LIBRARY COIN3D_INCLUDE_DIR)
- 
- MARK_AS_ADVANCED(COIN3D_INCLUDE_DIR COIN3D_LIBRARY )
--
--
--- 
-1.7.11.7
-
diff --git a/0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch b/0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
deleted file mode 100644
index 9295391..0000000
--- a/0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 03679cdfb3253e9cdae7513c0c0e7e44e5beb641 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:51:36 +0200
-Subject: [PATCH 13/23] Added SIMVoleon (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- config/cmake/Modules/NewCMake/FindSIMVoleon.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake b/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake
-index c4658eb..f4f81d4 100644
---- a/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake
-+++ b/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake
-@@ -54,11 +54,13 @@ IF(COIN3D_FOUND)
- 
-       FIND_PATH(SIMVOLEON_INCLUDE_DIR VolumeViz/nodes/SoVolumeRender.h
-         /usr/include
-+        /usr/include/Coin2
-         /usr/local/include
-       )
- 
-       FIND_LIBRARY(SIMVOLEON_LIBRARY SimVoleon
-         /usr/lib
-+        /usr/lib64
-         /usr/local/lib
-       )   
- 
--- 
-1.7.11.7
-
diff --git a/0020-Included-missing-vcl_cstdio.h-header.patch b/0020-Included-missing-vcl_cstdio.h-header.patch
deleted file mode 100644
index 76cb786..0000000
--- a/0020-Included-missing-vcl_cstdio.h-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fc074ee4b8c2f09a554646ba983622dfb8a75fb5 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:41:23 +0100
-Subject: [PATCH 20/23] Included missing vcl_cstdio.h header
-
----
- .../core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx     | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx b/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx
-index 10fe8a7..1082e34 100644
---- a/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx
-+++ b/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx
-@@ -5,6 +5,7 @@
- 
- #include <vcl_iostream.h>
- #include <vcl_fstream.h>
-+#include <vcl_cstdio.h>
- #include <vpgl/vpgl_camera_double_sptr.h>
- #include <vpgl/vpgl_perspective_camera.h>
- #include <vpgl/io/vpgl_io_perspective_camera.h>
--- 
-1.7.11.7
-
diff --git a/0023-Remove-volm-because-of-error-in-function-prototype.patch b/0023-Remove-volm-because-of-error-in-function-prototype.patch
deleted file mode 100644
index ad9dd2f..0000000
--- a/0023-Remove-volm-because-of-error-in-function-prototype.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b26213c75a1a5f1b9d3ccabab89b1a68d7dffa24 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:50:10 +0100
-Subject: [PATCH 23/23] Remove volm because of error in function prototype
-
----
- contrib/brl/bbas/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/CMakeLists.txt b/contrib/brl/bbas/CMakeLists.txt
-index 63f57d4..1628c61 100644
---- a/contrib/brl/bbas/CMakeLists.txt
-+++ b/contrib/brl/bbas/CMakeLists.txt
-@@ -90,5 +90,5 @@ SUBDIRS(bcvr)
- SUBDIRS(bkml)
- 
- # volumetric matching tools
--SUBDIRS(volm)
-+#SUBDIRS(volm)
- 
--- 
-1.7.11.7
-
diff --git a/vxl.spec b/vxl.spec
index ae957ac..33f1a64 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    2.0.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -18,28 +18,15 @@ Patch1:     0001-v2.0.2-unbundle-rply.patch
 Patch2:     0002-v2.0.2-Use-Fedora-FindEXPAT.patch
 Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
 # Submitted upstream https://github.com/vxl/vxl/pull/626
-Patch27:   0004-v2.0.2-Version-shared-objects.patch
-# Patch4:     0004-v2.0.2-Correct-dcmtk-includes.patch
-# Patch5:     0004-Added-more-soname.patch
-# Patch6:     0005-Do-not-build-OUL.patch
-# Patch7:     0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch
-# Patch8:     0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch
-# Patch9:     0008-More-sonames.patch
-# Patch10:    0009-Bumped-up-version-to-1.14.patch
-# Patch11:    0011-Do-not-use-bundled-minizip.patch
-# Patch12:    0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch
-# Patch13:    0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch
+Patch4:   0004-v2.0.2-Version-shared-objects.patch
 # Patch14:    0014-Added-additional-search-path-for-xerces-Submitted-by.patch
 # Patch15:    0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
 # Patch16:    0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
-# Patch17:    0017-Add-sonames-to-vpgl-lib.patch
-# Patch18:    0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch
 # Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
 # Patch20:    0020-Included-missing-vcl_cstdio.h-header.patch
 # Patch21:    0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
 # Patch22:    0022-Include-missing-vcl_cstdio.h-header.patch
 # Patch23:    0023-Remove-volm-because-of-error-in-function-prototype.patch
-# Patch24:    0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
 # Patch25:    0025-Legacy-def1-r35963.patch
 # Patch26:    0026-Legacy-def2-r36001.patch
 
@@ -76,6 +63,10 @@ BuildRequires:  libdc1394-devel
 BuildRequires:  libgeotiff-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  minizip-devel
+# Does not build with latest version
+# https://github.com/vxl/vxl/issues/627
+# BuildRequires:  openjpeg2-devel
+BuildRequires:  python3-devel
 BuildRequires:  rply-devel
 BuildRequires:  SIMVoleon-devel
 BuildRequires:  shapelib-devel
@@ -83,6 +74,9 @@ BuildRequires:  texi2html
 BuildRequires:  xerces-c-devel
 BuildRequires:  zlib-devel
 
+# Bundled
+Provides:  bundled(libopenjpeg2) = 2.0.0
+
 #GUI needs wx, a desktop file and an icon
 
 %description
@@ -119,12 +113,17 @@ develop code based on VXL.
 # v3p/netlib (made by f2c) dependency not removed because of heavily modifications
 # QV is a Silicon Graphics' VRML parser from the 90s. Now unmantained.
 
-# For the time being, use bundled dcmtk. It does not build with newer dcmtk.
-# Issue filed here:
-# https://github.com/vxl/vxl/issues/550
-# Requires VXL_FORCE_V3P_DCMTK=ON
+# Bundled: dcmtk
+# Requires VXL_FORCE_V3P_DCMTK:BOOL=ON
 
-# for l in jpeg png zlib tiff geotiff rply dcmtk bzlib
+# Also bundled: openjpeg2
+# Requires VXL_FORCE_V3P_OPENJPEG2:BOOL=ON \
+# Also may be needed
+# -DOPENJPEG2_INCLUDE_DIR:PATH=%%{_includedir}/openjpeg-2.3 \
+# -DOPENJPEG2_LIBRARIES:PATH=%%{_libdir}/libopenjp2.so \
+
+
+# for l in jpeg png zlib tiff geotiff rply dcmtk bzlib openjpeg2
 for l in jpeg png zlib tiff geotiff bzlib
 do
     find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm {} +
@@ -150,45 +149,52 @@ done
 
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
     -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DVXL_USE_GEOTIFF:BOOL=ON \
     -DVXL_FORCE_B3P_EXPAT:BOOL=OFF \
     -DVXL_FORCE_V3P_DCMTK:BOOL=ON \
     -DVXL_FORCE_V3P_GEOTIFF:BOOL=OFF \
-    -DVXL_USING_NATIVE_KL=ON \
     -DVXL_FORCE_V3P_JPEG:BOOL=OFF \
-    -DVXL_FORCE_V3P_MPEG2:BOOL=OFF \
     -DVXL_FORCE_V3P_PNG:BOOL=OFF \
     -DVXL_FORCE_V3P_TIFF:BOOL=OFF \
     -DVXL_FORCE_V3P_ZLIB:BOOL=OFF \
     -DVXL_FORCE_V3P_RPLY:BOOL=OFF \
-    -DVXL_USING_NATIVE_ZLIB=ON \
-    -DVXL_USING_NATIVE_JPEG=ON \
-    -DVXL_USING_NATIVE_PNG=ON \
-    -DVXL_USING_NATIVE_TIFF=ON \
-    -DVXL_USING_NATIVE_GEOTIFF=ON \
-    -DVXL_USING_NATIVE_EXPAT=ON \
-    -DVXL_USING_NATIVE_SHAPELIB=ON \
-    -DVXL_USING_NATIVE_BZLIB2=ON \
-    -DBUILD_VGUI=OFF \
-    -DBUILD_BGUI3D=OFF \
-    -DBUILD_OXL:BOOL=ON \
-    -DBUILD_BRL=OFF \
-    -DBUILD_CORE_GEOMETRY:BOOL=ON \
-    -DBUILD_CORE_IMAGING:BOOL=ON \
-    -DBUILD_CORE_NUMERICS:BOOL=ON \
-    -DBUILD_CORE_PROBABILITY:BOOL=ON \
-    -DBUILD_CORE_SERIALISATION:BOOL=ON \
-    -DBUILD_CORE_UTILITIES:BOOL=ON \
-    -DBUILD_CORE_VIDEO:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=OFF \
-    -DBUILD_TESTING:BOOL=OFF \
-    -DBUILD_DOCUMENTATION:BOOL=ON \
+    -DVXL_FORCE_V3P_OPENJPEG2:BOOL=ON \
+    -DVXL_USING_NATIVE_ZLIB:BOOL=ON \
+    -DVXL_USING_NATIVE_JPEG:BOOL=ON \
+    -DVXL_USING_NATIVE_PNG:BOOL=ON \
+    -DVXL_USING_NATIVE_TIFF:BOOL=ON \
+    -DVXL_USING_NATIVE_GEOTIFF:BOOL=ON \
+    -DVXL_USING_NATIVE_EXPAT:BOOL=ON \
+    -DVXL_USING_NATIVE_EXPATPP:BOOL=ON \
+    -DVXL_USING_NATIVE_BZLIB2:BOOL=ON \
+    -DVXL_BUILD_VGUI:BOOL=OFF \
+    -DVXL_BUILD_BGUI3D:BOOL=OFF \
+    -DVXL_BUILD_OXL:BOOL=ON \
+    -DVXL_BUILD_BRL:BOOL=ON \
+    -DVXL_BUILD_BRL_PYTHON:BOOL=ON \
+    -DVXL_BUILD_GEL:BOOL=ON \
+    -DVXL_BUILD_RPL:BOOL=ON \
+    -DVXL_BUILD_CORE_GEOMETRY:BOOL=ON \
+    -DVXL_BUILD_CORE_IMAGING:BOOL=ON \
+    -DVXL_BUILD_CORE_NUMERICS:BOOL=ON \
+    -DVXL_BUILD_CORE_PROBABILITY:BOOL=ON \
+    -DVXL_BUILD_CORE_SERIALISATION:BOOL=ON \
+    -DVXL_BUILD_CORE_UTILITIES:BOOL=ON \
+    -DVXL_BUILD_CORE_VIDEO:BOOL=ON \
+    -DVXL_BUILD_EXAMPLES:BOOL=OFF \
+    -DBUILD_TESTING:BOOL=ON \
+    -DVXL_BUILD_DOCUMENTATION:BOOL=ON \
     -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
     -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
-    -DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
-    -DVNL_CONFIG_LEGACY_METHODS=ON .
+    -DEXPATPP_INCLUDE_DIR:PATH=%{_includedir} \
+    -DEXPATPP_LIBRARY:PATH=%{_libdir}/libexpatpp.so \
+    -DVNL_CONFIG_LEGACY_METHODS:BOOL=ON .
 
+
+
+# -DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
 # Why is expat stated, but not shapelib?
 # DCMDK Cmake -- Included in bundle, but why?
 #BUILD_VGUI? NO, it depends on box2m which in turns relies on OPENCL which is not available in FEDORA
@@ -201,7 +207,7 @@ done
 %make_install
 
 %check
-# No tests
+ctest .
 
 %ldconfig_scriptlets
 
@@ -211,6 +217,7 @@ done
 %{_libdir}/libtestlib.so.2.0
 %{_libdir}/libvcl.so.2.0
 %{_libdir}/libvgl.so.2.0
+%{_libdir}/libvidl.so.2.0
 %{_libdir}/libvil_io.so.2.0
 %{_libdir}/libvnl.so.2.0
 %{_libdir}/libvpgl_file_formats.so.2.0
@@ -219,6 +226,7 @@ done
 %{_libdir}/libtestlib.so.2.0.2
 %{_libdir}/libvcl.so.2.0.2
 %{_libdir}/libvgl.so.2.0.2
+%{_libdir}/libvidl.so.2.0.2
 %{_libdir}/libvil_io.so.2.0.2
 %{_libdir}/libvnl.so.2.0.2
 %{_libdir}/libvpgl_file_formats.so.2.0.2
@@ -239,7 +247,6 @@ done
 %{_libdir}/libvnl_xio.so.2.0.2
 %{_libdir}/libvpgl_io.so.2.0.2
 %{_libdir}/libvsl.so.2.0.2
-%{_libdir}/libopenjpeg2.so.2.0
 %{_libdir}/libvbl_io.so.2.0
 %{_libdir}/libvgl_algo.so.2.0
 %{_libdir}/libvil1.so.2.0
@@ -247,7 +254,6 @@ done
 %{_libdir}/libvpdl.so.2.0
 %{_libdir}/libvpgl.so.2.0
 %{_libdir}/libvul_io.so.2.0
-%{_libdir}/libopenjpeg2.so.2.0.0
 %{_libdir}/libvbl_io.so.2.0.2
 %{_libdir}/libvgl_algo.so.2.0.2
 %{_libdir}/libvil1.so.2.0.2
@@ -269,6 +275,9 @@ done
 %{_libdir}/libvpgl_algo.so.2.0.2
 %{_libdir}/libvpgl_xio.so.2.0.2
 %{_libdir}/libvul.so.2.0.2
+# Bundles
+%{_libdir}/libopenjpeg2.so.2.0
+%{_libdir}/libopenjpeg2.so.2.0.0
 
 %files devel
 %{_datadir}/%{name}
@@ -298,6 +307,7 @@ done
 %{_libdir}/libv3p_netlib.so
 %{_libdir}/libvcl.so
 %{_libdir}/libvgl_io.so
+%{_libdir}/libvidl.so
 %{_libdir}/libvil1.so
 %{_libdir}/libvil.so
 %{_libdir}/libvnl.so
@@ -309,6 +319,18 @@ done
 %doc %{_docdir}/*
 
 %changelog
+* Fri Apr 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
+- Enable OUL---why was it disabled?
+- Remove rply include patch: build seems to find it just fine.
+- Remove uneeded rply function call fix patch.
+- Remove Coin3D cmake config patch---included in cmake distribution now.
+- Remove SIMVoleon cmake patch---seems to find it just fine.
+- Correct CMake flags.
+- Enable BRL build
+- add Python BR
+- Add expatpp bits manually
+- File upstream issue and use bundled openjpeg2: https://github.com/vxl/vxl/issues/627
+
 * Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
 - Update to latest upstream release
 - Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)

From 084215b47968cd357b9750302d4ebed0ca6aa619 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Fri, 19 Apr 2019 18:48:13 +0100
Subject: [PATCH 30/74] Remove uneeded xerces BR

---
 0010-Use-system-FindEXPAT.patch               | 26 ------------
 ...-search-path-for-xerces-Submitted-by.patch | 40 -------------------
 vxl.spec                                      |  3 +-
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 0010-Use-system-FindEXPAT.patch
 delete mode 100644 0014-Added-additional-search-path-for-xerces-Submitted-by.patch

diff --git a/0010-Use-system-FindEXPAT.patch b/0010-Use-system-FindEXPAT.patch
deleted file mode 100644
index d9e90af..0000000
--- a/0010-Use-system-FindEXPAT.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2eb77e1b65646b0f20682ce8345917b84aa73d11 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:39:33 +0200
-Subject: [PATCH 10/23] Use system FindEXPAT
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bxml/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
-index 1e15c59..f513190 100644
---- a/contrib/brl/bbas/bxml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bxml/CMakeLists.txt
-@@ -12,7 +12,7 @@ SET( bxml_sources
-     bxml_find.cxx                bxml_find.h
- )
- 
--INCLUDE( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- IF(EXPAT_FOUND)
-  IF(EXPATPP_FOUND)
--- 
-1.7.11.7
-
diff --git a/0014-Added-additional-search-path-for-xerces-Submitted-by.patch b/0014-Added-additional-search-path-for-xerces-Submitted-by.patch
deleted file mode 100644
index f5af121..0000000
--- a/0014-Added-additional-search-path-for-xerces-Submitted-by.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 93f8c6e6fbd727769b436aa0e92dae9ca7f16be1 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:52:07 +0200
-Subject: [PATCH 14/23] Added additional search path for xerces (Submitted by
- Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bmods/find_xerces.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/contrib/brl/bmods/find_xerces.cmake b/contrib/brl/bmods/find_xerces.cmake
-index e3a65f7..97290cb 100644
---- a/contrib/brl/bmods/find_xerces.cmake
-+++ b/contrib/brl/bmods/find_xerces.cmake
-@@ -8,6 +8,7 @@
- FIND_PATH(XERCES_BXML_INCLUDE_PATH dom/DOM.hpp
-           ${vxl_SOURCE_DIR}/../xerces-c-src1_4_0/include
-           /usr/local/xerces-c-src1_4_0/include
-+          /usr/include/xercesc
-           ${vxl_SOURCE_DIR}/v3p/xerces-c-src1_4_0/include
- )
- 
-@@ -29,10 +30,13 @@ ENDIF(XERCES_BXML_INCLUDE_PATH)
- 
- # this line used for transit phase
- FIND_PATH(XERCES_NEW_BXML_INCLUDE_PATH xercesc/dom/Dom.hpp
-+          /usr/include
-           ${vxl_SOURCE_DIR}/../xerces-c2_2_0/include
- )
- 
- FIND_LIBRARY(XERCES_NEW_BXML_LIBRARY_PATH xerces-c_2
-+          /usr/lib
-+          /usr/lib64
-           ${vxl_SOURCE_DIR}/../xerces-c2_2_0/lib
-           ${vxl_BINARY_DIR}/v3p/lib
- )
--- 
-1.7.11.7
-
diff --git a/vxl.spec b/vxl.spec
index 33f1a64..5dc9192 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -19,7 +19,6 @@ Patch2:     0002-v2.0.2-Use-Fedora-FindEXPAT.patch
 Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
 # Submitted upstream https://github.com/vxl/vxl/pull/626
 Patch4:   0004-v2.0.2-Version-shared-objects.patch
-# Patch14:    0014-Added-additional-search-path-for-xerces-Submitted-by.patch
 # Patch15:    0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
 # Patch16:    0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
 # Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
@@ -71,7 +70,6 @@ BuildRequires:  rply-devel
 BuildRequires:  SIMVoleon-devel
 BuildRequires:  shapelib-devel
 BuildRequires:  texi2html
-BuildRequires:  xerces-c-devel
 BuildRequires:  zlib-devel
 
 # Bundled
@@ -330,6 +328,7 @@ ctest .
 - add Python BR
 - Add expatpp bits manually
 - File upstream issue and use bundled openjpeg2: https://github.com/vxl/vxl/issues/627
+- Remove unneeded xerces BR, and corresponding patch.
 
 * Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
 - Update to latest upstream release

From 621a0de8a9b3ea10d778382c76f9c8b91b67f578 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 24 Apr 2019 09:17:45 +0100
Subject: [PATCH 31/74] Update patches

---
 0001-v2.0.2-unbundle-rply.patch          |  32 ++--
 0002-v2.0.2-Use-Fedora-FindEXPAT.patch   |  66 +++----
 0003-v2.0.2-Use-Fedora-minizip.patch     |   2 +-
 0004-v2.0.2-Version-shared-objects.patch | 233 +----------------------
 4 files changed, 55 insertions(+), 278 deletions(-)

diff --git a/0001-v2.0.2-unbundle-rply.patch b/0001-v2.0.2-unbundle-rply.patch
index dc93658..ce7b683 100644
--- a/0001-v2.0.2-unbundle-rply.patch
+++ b/0001-v2.0.2-unbundle-rply.patch
@@ -36,7 +36,7 @@ Subject: [PATCH 1/4] v2.0.2: unbundle rply
  delete mode 100644 v3p/rply/rply.h
 
 diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab4561a7f3b8 100644
+index 5cf355e3fe..662ec284e9 100644
 --- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 +++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 @@ -1,8 +1,9 @@
@@ -60,7 +60,7 @@ index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab45
  if( BUILD_TESTING )
    add_subdirectory(tests)
 diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b8782402d18f64d 100644
+index cee22bd271..4714624fa3 100644
 --- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -73,7 +73,7 @@ index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b878240
      boxm_compute_scene_statistics.h
      boxm_crop_scene.h
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae8a69ffc0 100644
+index 92b959f740..fff9ae2d84 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 @@ -1,12 +1,14 @@
@@ -94,7 +94,7 @@ index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae
  # cpp process APIs.
  add_subdirectory(pro)
 diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb89539df76a93 100644
+index 1407ed9d31..c3ed4ed27d 100644
 --- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 @@ -1,6 +1,8 @@
@@ -117,7 +117,7 @@ index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb8953
  if(BUILD_TESTING)
    add_subdirectory(tests)
 diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f906345b98 100644
+index 251ef9a979..ae9baedaa4 100644
 --- a/v3p/CMakeLists.txt
 +++ b/v3p/CMakeLists.txt
 @@ -60,5 +60,4 @@ if(VXL_BUILD_CORE_IMAGING)
@@ -128,7 +128,7 @@ index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f9
  endif()
 diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
 deleted file mode 100644
-index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..0000000000000000000000000000000000000000
+index 9085a628a1..0000000000
 --- a/v3p/rply/CMakeLists.txt
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -143,7 +143,7 @@ index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..00000000000000000000000000000000
 -vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources})
 diff --git a/v3p/rply/LICENSE b/v3p/rply/LICENSE
 deleted file mode 100644
-index 02e7c5f385b5ca8c7e9df071455f3956122e9380..0000000000000000000000000000000000000000
+index 02e7c5f385..0000000000
 --- a/v3p/rply/LICENSE
 +++ /dev/null
 @@ -1,20 +0,0 @@
@@ -169,7 +169,7 @@ index 02e7c5f385b5ca8c7e9df071455f3956122e9380..00000000000000000000000000000000
 -DEALINGS IN THE SOFTWARE.
 diff --git a/v3p/rply/etc/convert.c b/v3p/rply/etc/convert.c
 deleted file mode 100644
-index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..0000000000000000000000000000000000000000
+index e90d4cd576..0000000000
 --- a/v3p/rply/etc/convert.c
 +++ /dev/null
 @@ -1,136 +0,0 @@
@@ -311,7 +311,7 @@ index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..00000000000000000000000000000000
 -}
 diff --git a/v3p/rply/etc/dump.c b/v3p/rply/etc/dump.c
 deleted file mode 100644
-index 7ae2341cf14962953aeefed659f560e1c486cf40..0000000000000000000000000000000000000000
+index 7ae2341cf1..0000000000
 --- a/v3p/rply/etc/dump.c
 +++ /dev/null
 @@ -1,44 +0,0 @@
@@ -361,7 +361,7 @@ index 7ae2341cf14962953aeefed659f560e1c486cf40..00000000000000000000000000000000
 -
 diff --git a/v3p/rply/etc/input.ply b/v3p/rply/etc/input.ply
 deleted file mode 100644
-index 87ba8546d03d8349b773d4a155429853c7591412..0000000000000000000000000000000000000000
+index 87ba8546d0..0000000000
 --- a/v3p/rply/etc/input.ply
 +++ /dev/null
 @@ -1,16 +0,0 @@
@@ -383,7 +383,7 @@ index 87ba8546d03d8349b773d4a155429853c7591412..00000000000000000000000000000000
 -3 1 0 2
 diff --git a/v3p/rply/etc/sconvert.c b/v3p/rply/etc/sconvert.c
 deleted file mode 100644
-index 97209e9b495bbea97c8043298460bce0d4c95197..0000000000000000000000000000000000000000
+index 97209e9b49..0000000000
 --- a/v3p/rply/etc/sconvert.c
 +++ /dev/null
 @@ -1,66 +0,0 @@
@@ -455,7 +455,7 @@ index 97209e9b495bbea97c8043298460bce0d4c95197..00000000000000000000000000000000
 -}
 diff --git a/v3p/rply/manual/manual.html b/v3p/rply/manual/manual.html
 deleted file mode 100644
-index 60b415341fa283d2d03c7e1dbdd913892196d407..0000000000000000000000000000000000000000
+index 60b415341f..0000000000
 --- a/v3p/rply/manual/manual.html
 +++ /dev/null
 @@ -1,993 +0,0 @@
@@ -1454,7 +1454,7 @@ index 60b415341fa283d2d03c7e1dbdd913892196d407..00000000000000000000000000000000
 -</html>
 diff --git a/v3p/rply/manual/reference.css b/v3p/rply/manual/reference.css
 deleted file mode 100644
-index 821215dc8279d81ff09c611166479df78fd2fd15..0000000000000000000000000000000000000000
+index 821215dc82..0000000000
 --- a/v3p/rply/manual/reference.css
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -1644,7 +1644,7 @@ CHXH8%
 
 diff --git a/v3p/rply/readme.txt b/v3p/rply/readme.txt
 deleted file mode 100644
-index 638124bc3f39c21a2fcbc453a950b026686d4a19..0000000000000000000000000000000000000000
+index 638124bc3f..0000000000
 --- a/v3p/rply/readme.txt
 +++ /dev/null
 @@ -1,24 +0,0 @@
@@ -1674,7 +1674,7 @@ index 638124bc3f39c21a2fcbc453a950b026686d4a19..00000000000000000000000000000000
 -
 diff --git a/v3p/rply/rply.c b/v3p/rply/rply.c
 deleted file mode 100644
-index bc99b135d21ccb835759ac6335b4e99c40e4decc..0000000000000000000000000000000000000000
+index bc99b135d2..0000000000
 --- a/v3p/rply/rply.c
 +++ /dev/null
 @@ -1,1570 +0,0 @@
@@ -3250,7 +3250,7 @@ index bc99b135d21ccb835759ac6335b4e99c40e4decc..00000000000000000000000000000000
 - * ---------------------------------------------------------------------- */
 diff --git a/v3p/rply/rply.h b/v3p/rply/rply.h
 deleted file mode 100644
-index 3c604fd88ee1667d404d7f0e80431f2d83eb9686..0000000000000000000000000000000000000000
+index 3c604fd88e..0000000000
 --- a/v3p/rply/rply.h
 +++ /dev/null
 @@ -1,367 +0,0 @@
diff --git a/0002-v2.0.2-Use-Fedora-FindEXPAT.patch b/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
index fb76af5..28ca4db 100644
--- a/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
+++ b/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
@@ -40,7 +40,7 @@ Subject: [PATCH 2/4] v2.0.2 Use Fedora FindEXPAT
  33 files changed, 33 insertions(+), 33 deletions(-)
 
 diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
-index 5b9d660530acd9310dfb554171d70cdc7417028f..de3997078024fe9a3283534cc5b0b9819af6a0a8 100644
+index 5b9d660530..de39970780 100644
 --- a/contrib/brl/b3p/expat/CMakeLists.txt
 +++ b/contrib/brl/b3p/expat/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -53,7 +53,7 @@ index 5b9d660530acd9310dfb554171d70cdc7417028f..de3997078024fe9a3283534cc5b0b981
  
    if(WIN32)
 diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
-index 4959c123c336ee7935b31dbeffc97f734c07d73a..71ecd0568b7f9e01f9e266af6ca6fe308fbc1484 100644
+index 4959c123c3..71ecd0568b 100644
 --- a/contrib/brl/b3p/expatpp/CMakeLists.txt
 +++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
 @@ -1,6 +1,6 @@
@@ -65,7 +65,7 @@ index 4959c123c336ee7935b31dbeffc97f734c07d73a..71ecd0568b7f9e01f9e266af6ca6fe30
  
    if( VXL_USING_NATIVE_EXPAT )
 diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d111d4713 100644
+index 6328cfd419..bb6a65f96d 100644
 --- a/contrib/brl/bbas/bkml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/CMakeLists.txt
 @@ -5,7 +5,7 @@ set(bkml_sources
@@ -78,7 +78,7 @@ index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index c4da5b9d289cdbd64ca12e20a8941856f5d91342..29e4cf838da65cb60f4580f1daee5f3ac3e4e4d2 100644
+index c4da5b9d28..29e4cf838d 100644
 --- a/contrib/brl/bbas/bvgl/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
 @@ -37,7 +37,7 @@ aux_source_directory(Templates bvgl_sources)
@@ -91,7 +91,7 @@ index c4da5b9d289cdbd64ca12e20a8941856f5d91342..29e4cf838da65cb60f4580f1daee5f3a
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-index 76995137ed8d81fb80c10bf6d9f810b9f4003210..88eebcd621c2f5dcc775374c77289a77f5ed7e53 100644
+index 76995137ed..88eebcd621 100644
 --- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
 @@ -16,7 +16,7 @@ set(bvgl_test_sources
@@ -104,7 +104,7 @@ index 76995137ed8d81fb80c10bf6d9f810b9f4003210..88eebcd621c2f5dcc775374c77289a77
  if(EXPAT_FOUND)
    set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
 diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
-index dace2292e7e09803845f90519be8fcb50fc2131a..78f35ac924ab58e1ec8836220217168ca29572e0 100644
+index dace2292e7..78f35ac924 100644
 --- a/contrib/brl/bbas/bwm/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/CMakeLists.txt
 @@ -26,7 +26,7 @@ endif()
@@ -117,7 +117,7 @@ index dace2292e7e09803845f90519be8fcb50fc2131a..78f35ac924ab58e1ec8836220217168c
  # Set CMake options for using vgui
  include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
 diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-index dc2102047f46fffb68d2f1e92c5718dd656c09a8..9c55cc59ba1dc8c87d6c304f9eef0551f0102e70 100644
+index dc2102047f..9c55cc59ba 100644
 --- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
 @@ -7,7 +7,7 @@ set(bwm_io_sources
@@ -130,7 +130,7 @@ index dc2102047f46fffb68d2f1e92c5718dd656c09a8..9c55cc59ba1dc8c87d6c304f9eef0551
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
-index 5408fe77a72b842784b3c05aaf30379f08fcddc1..2dd989f27c6b34ea72052eda258caf1c27f4f3f1 100644
+index 5408fe77a7..2dd989f27c 100644
 --- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
 @@ -11,7 +11,7 @@ set(bwm_video_sources
@@ -143,7 +143,7 @@ index 5408fe77a72b842784b3c05aaf30379f08fcddc1..2dd989f27c6b34ea72052eda258caf1c
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-index ca3c490d5e9674c465bd5a57f709882bad9c71ac..baff80256f9f13a71533b51b7e30876199c0c5ac 100644
+index ca3c490d5e..baff80256f 100644
 --- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -156,7 +156,7 @@ index ca3c490d5e9674c465bd5a57f709882bad9c71ac..baff80256f9f13a71533b51b7e308761
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
-index c027dfaa286137f879e6b70043e0b291663039d4..239f6e528e36121d243d763732287809062f57df 100644
+index c027dfaa28..239f6e528e 100644
 --- a/contrib/brl/bbas/bxml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bxml/CMakeLists.txt
 @@ -12,7 +12,7 @@ set( bxml_sources
@@ -169,7 +169,7 @@ index c027dfaa286137f879e6b70043e0b291663039d4..239f6e528e36121d243d763732287809
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
-index cf11103557090d878dd388f14f3b90e870695e2e..9047257fc5f78dcce4d52b6c2aa0e76c9b54931c 100644
+index cf11103557..9047257fc5 100644
 --- a/contrib/brl/bbas/volm/CMakeLists.txt
 +++ b/contrib/brl/bbas/volm/CMakeLists.txt
 @@ -6,7 +6,7 @@
@@ -182,7 +182,7 @@ index cf11103557090d878dd388f14f3b90e870695e2e..9047257fc5f78dcce4d52b6c2aa0e76c
    if(EXPATPP_FOUND)
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
-index 637c1ecfa8479088678c34f48ce022c7acd533a2..803917fd2496180d111afeed78a7f15d674ca4cd 100644
+index 637c1ecfa8..803917fd24 100644
 --- a/contrib/brl/bpro/CMakeLists.txt
 +++ b/contrib/brl/bpro/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -195,7 +195,7 @@ index 637c1ecfa8479088678c34f48ce022c7acd533a2..803917fd2496180d111afeed78a7f15d
  
  # Basic process classes
 diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..21b1fbec894cb1ae1911b21962d47617a6c96d73 100644
+index cbd9222c7f..21b1fbec89 100644
 --- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -208,7 +208,7 @@ index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..21b1fbec894cb1ae1911b21962d47617
      if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
 diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-index 3c5d70e0c6569aa51761f99782b51b7920e17681..0069fb9ff38fcd93a2e1db418599920d2c3043bb 100644
+index 3c5d70e0c6..0069fb9ff3 100644
 --- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
 @@ -4,7 +4,7 @@ project( betr_batch )
@@ -221,7 +221,7 @@ index 3c5d70e0c6569aa51761f99782b51b7920e17681..0069fb9ff38fcd93a2e1db418599920d
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-index f341e59f07f614bf38bee3f41305bbbd46f63653..e253c8f5011df5e19b1f2dba88acb26e61c17a39 100644
+index f341e59f07..e253c8f501 100644
 --- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -234,7 +234,7 @@ index f341e59f07f614bf38bee3f41305bbbd46f63653..e253c8f5011df5e19b1f2dba88acb26e
     if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
 diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
-index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..0ddd6033d50b38502a7ebbd986b474401a08b8a0 100644
+index 6c9da00de1..0ddd6033d5 100644
 --- a/contrib/brl/bseg/boxm/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/CMakeLists.txt
 @@ -1,5 +1,5 @@
@@ -245,7 +245,7 @@ index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..0ddd6033d50b38502a7ebbd986b47440
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
-index 4475e418be3d2475f24e6df71a18319efb242e38..14acc308ecbbe8c499c16ee60682e599ae49c55e 100644
+index 4475e418be..14acc308ec 100644
 --- a/contrib/brl/bseg/boxm2/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
 @@ -21,7 +21,7 @@ set(boxm2_sources
@@ -258,7 +258,7 @@ index 4475e418be3d2475f24e6df71a18319efb242e38..14acc308ecbbe8c499c16ee60682e599
  
    include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-index 861b960f4d44c92fc900280581cda2b87fce5f0d..c3ae5b39bf376fb5e24c722bde74f0b1ab3420fd 100644
+index 861b960f4d..c3ae5b39bf 100644
 --- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 @@ -1,6 +1,6 @@
@@ -270,7 +270,7 @@ index 861b960f4d44c92fc900280581cda2b87fce5f0d..c3ae5b39bf376fb5e24c722bde74f0b1
    if(EXPATPP_FOUND)
      #depends on OPENCL being found...
 diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-index 70e603743b280db75ea9bb006cbf63d867cdd16f..77f8f743f9c990f44b0403340c21777571483dff 100644
+index 70e603743b..77f8f743f9 100644
 --- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
 @@ -9,7 +9,7 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
@@ -283,7 +283,7 @@ index 70e603743b280db75ea9bb006cbf63d867cdd16f..77f8f743f9c990f44b0403340c217775
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-index 1d57861444e72e66e3ee04c96e496ee4b89b206f..a6f24b1da9d9ec9702595a9912ec10d2ae03ef9f 100644
+index 1d57861444..a6f24b1da9 100644
 --- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
 @@ -4,7 +4,7 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
@@ -296,7 +296,7 @@ index 1d57861444e72e66e3ee04c96e496ee4b89b206f..a6f24b1da9d9ec9702595a9912ec10d2
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-index b7e3039d7ee534d30de991a7e4aae3f940b7b360..c13969e15d090e63831455cee0ea61d1c5e98557 100644
+index b7e3039d7e..c13969e15d 100644
 --- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -309,7 +309,7 @@ index b7e3039d7ee534d30de991a7e4aae3f940b7b360..c13969e15d090e63831455cee0ea61d1
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
-index 977d68fdab136cf193f7e712e63bbd607113066a..97a895fa28ef6d9e9b11cb45f324d5e0ba39818b 100644
+index 977d68fdab..97a895fa28 100644
 --- a/contrib/brl/bseg/bstm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm/CMakeLists.txt
 @@ -15,7 +15,7 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
@@ -322,7 +322,7 @@ index 977d68fdab136cf193f7e712e63bbd607113066a..97a895fa28ef6d9e9b11cb45f324d5e0
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-index c94ddbcc4c159b771d85bb6a81a0e38d77750023..8b6aa9f1f2ff8b0c8712b0201dc22e140a53afcf 100644
+index c94ddbcc4c..8b6aa9f1f2 100644
 --- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
 @@ -12,7 +12,7 @@ if(DIRECTSHOW_FOUND)
@@ -335,7 +335,7 @@ index c94ddbcc4c159b771d85bb6a81a0e38d77750023..8b6aa9f1f2ff8b0c8712b0201dc22e14
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-index ba8815fe6bef5982f655a3c6f13afefb64743344..6abac60395a72f232cc718059315036a8e1639b7 100644
+index ba8815fe6b..6abac60395 100644
 --- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
 @@ -15,7 +15,7 @@ set(bstm_multi_sources
@@ -348,7 +348,7 @@ index ba8815fe6bef5982f655a3c6f13afefb64743344..6abac60395a72f232cc718059315036a
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..cefb928abc92300bdd5f19e4f067664cdf36f701 100644
+index a1fd1eb943..cefb928abc 100644
 --- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -361,7 +361,7 @@ index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..cefb928abc92300bdd5f19e4f067664c
  #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
  #mark_as_advanced( VXL_FORCE_V3P_RPLY )
 diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-index 25433e56f26dd49fb413480b1aa67a312f9999fb..550528c08c6afd2a08aedc230d8df63f705d41cb 100644
+index 25433e56f2..550528c08c 100644
 --- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -374,7 +374,7 @@ index 25433e56f26dd49fb413480b1aa67a312f9999fb..550528c08c6afd2a08aedc230d8df63f
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..5b2a2750de2225048bd4ff67fa6d310eeccc9e5c 100644
+index 0672b5d3d8..5b2a2750de 100644
 --- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -387,7 +387,7 @@ index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..5b2a2750de2225048bd4ff67fa6d310e
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-index 90102867454d6308ab766a13d101567562920633..abca67a186d7f8305c2f235b35924ecd7eddb8a5 100644
+index 9010286745..abca67a186 100644
 --- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -400,7 +400,7 @@ index 90102867454d6308ab766a13d101567562920633..abca67a186d7f8305c2f235b35924ecd
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..2b7731521f5f19579819ffd17370b474ad7e0a2f 100644
+index 052a160d9c..2b7731521f 100644
 --- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -413,7 +413,7 @@ index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..2b7731521f5f19579819ffd17370b474
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
-index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..d6ba4cc128b3005fa169f89512da9abcee1231e0 100644
+index fbda67337c..d6ba4cc128 100644
 --- a/contrib/brl/bseg/bvxm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
 @@ -38,7 +38,7 @@ set(bvxm_sources
@@ -426,7 +426,7 @@ index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..d6ba4cc128b3005fa169f89512da9abc
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-index 58ece0b8d3852237d36db89e868463369dc4502c..779c056a765516fa4934ca9de313366ec4b7adb5 100644
+index 58ece0b8d3..779c056a76 100644
 --- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
 @@ -2,7 +2,7 @@
@@ -439,7 +439,7 @@ index 58ece0b8d3852237d36db89e868463369dc4502c..779c056a765516fa4934ca9de313366e
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-index b7b0636f29e443a9e02a6354faf204f01c2617e9..0fc2e895f7a686f8009e30148f56a134fafe314d 100644
+index b7b0636f29..0fc2e895f7 100644
 --- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
 @@ -8,7 +8,7 @@ if(OPENCL_FOUND)
@@ -452,7 +452,7 @@ index b7b0636f29e443a9e02a6354faf204f01c2617e9..0fc2e895f7a686f8009e30148f56a134
      include_directories( ${EXPAT_INCLUDE_DIR} )
      include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
-index 26504576be394f4351e7ef1521ab3fff38616003..1fc507d257953975931e8cab9a86b97e4680e461 100644
+index 26504576be..1fc507d257 100644
 --- a/contrib/brl/bseg/vcon/CMakeLists.txt
 +++ b/contrib/brl/bseg/vcon/CMakeLists.txt
 @@ -4,7 +4,7 @@
diff --git a/0003-v2.0.2-Use-Fedora-minizip.patch b/0003-v2.0.2-Use-Fedora-minizip.patch
index 04df1cd..4ed1c3f 100644
--- a/0003-v2.0.2-Use-Fedora-minizip.patch
+++ b/0003-v2.0.2-Use-Fedora-minizip.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 3/4] v2.0.2 Use Fedora minizip
  1 file changed, 4 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..b2f4b5f6bdb4ed0cbbde6459cb201578a1823a5d 100644
+index 7fefd89f41..b2f4b5f6bd 100644
 --- a/contrib/brl/b3p/CMakeLists.txt
 +++ b/contrib/brl/b3p/CMakeLists.txt
 @@ -19,7 +19,3 @@ add_subdirectory(expatpp)
diff --git a/0004-v2.0.2-Version-shared-objects.patch b/0004-v2.0.2-Version-shared-objects.patch
index d6bedfb..f49c7e6 100644
--- a/0004-v2.0.2-Version-shared-objects.patch
+++ b/0004-v2.0.2-Version-shared-objects.patch
@@ -1,32 +1,17 @@
-From 2980591c7c7d178bfaa6d073e007fb8c50fec944 Mon Sep 17 00:00:00 2001
+From 83b49ba071e1298267db2422e9e8c387e19dbdec Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 18 Apr 2019 22:11:41 +0100
 Subject: [PATCH 4/4] v2.0.2 Version shared objects
 
 ---
- CMakeLists.txt                        | 26 +++++++++++++++++++++++++-
- core/testlib/CMakeLists.txt           |  1 +
- core/vgui/CMakeLists.txt              |  1 +
- core/vidl/gui/CMakeLists.txt          |  1 +
- core/vil/CMakeLists.txt               |  1 +
- core/vil/algo/CMakeLists.txt          |  1 +
- core/vnl/CMakeLists.txt               |  1 +
- core/vnl/algo/CMakeLists.txt          |  1 +
- core/vpdl/CMakeLists.txt              |  1 +
- core/vpgl/CMakeLists.txt              |  1 +
- core/vpgl/algo/CMakeLists.txt         |  1 +
- core/vpgl/file_formats/CMakeLists.txt |  1 +
- core/vpgl/io/CMakeLists.txt           |  1 +
- core/vpgl/xio/CMakeLists.txt          |  1 +
- v3p/netlib/CMakeLists.txt             |  4 ++++
- vcl/CMakeLists.txt                    |  2 ++
- 16 files changed, 44 insertions(+), 1 deletion(-)
+ CMakeLists.txt | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..b6cf7dfcdecb57929a266c466c1105948d17c7b5 100644
+index 230de81825..2452dd5536 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,10 +46,34 @@ foreach(p
+@@ -46,10 +46,17 @@ foreach(p
  endforeach()
  
  project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
@@ -41,218 +26,10 @@ index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..b6cf7dfcdecb57929a266c466c110594
 +SET(VXL_API_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
 +SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
 +    SOVERSION "${VXL_API_VERSION}")
-+
-+SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VIL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VIL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VPGL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VPGL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VPGL_FILE_FORMATS_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VPGL_IO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VPGL_XIO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VGUI_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VIDLGUI_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VPDL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
 +
  include(CMakeDependentOption)
  include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
  
-diff --git a/core/testlib/CMakeLists.txt b/core/testlib/CMakeLists.txt
-index 0dd61806dbf68ddc953b0284eff8bc37ddf0c247..2833f468acff665622c6cbf9467d0e6299cea586 100644
---- a/core/testlib/CMakeLists.txt
-+++ b/core/testlib/CMakeLists.txt
-@@ -33,6 +33,7 @@ set(testlib_sources
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}testlib
-   LIBRARY_SOURCES ${testlib_sources}
-   HEADER_INSTALL_DIR core/testlib)
-+set_target_properties(${VXL_LIB_PREFIX}testlib PROPERTIES ${TESTLIB_LIBRARY_PROPERTIES})
- target_link_libraries(${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl)
- 
- if( BUILD_TESTING )
-diff --git a/core/vgui/CMakeLists.txt b/core/vgui/CMakeLists.txt
-index fe1ecd4ec2debf573ec2eddf455c81129da88d70..9c6ed4abf45513eeb94ba4ac3a78575c89b3a7bc 100644
---- a/core/vgui/CMakeLists.txt
-+++ b/core/vgui/CMakeLists.txt
-@@ -525,6 +525,7 @@ set( vgui_sources ${vgui_sources}
- )
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vgui LIBRARY_SOURCES ${vgui_sources})
-+SET_TARGET_PROPERTIES(${VXL_LIB_PREFIX}vgui PROPERTIES ${VGUI_LIBRARY_PROPERTIES})
- set( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
- 
- # Dependencies on other vxl libraries
-diff --git a/core/vidl/gui/CMakeLists.txt b/core/vidl/gui/CMakeLists.txt
-index 138372f69bc5ca44b7180805a2036660ffb7e5c1..85d574a89073e5039373533891f717c6b0432424 100644
---- a/core/vidl/gui/CMakeLists.txt
-+++ b/core/vidl/gui/CMakeLists.txt
-@@ -12,6 +12,7 @@ set(vidl_gui_sources
-    )
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vidl_gui LIBRARY_SOURCES ${vidl_gui_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vidl_gui PROPERTIES ${VIDLGUI_LIBRARY_PROPERTIES})
- target_link_libraries( ${VXL_LIB_PREFIX}vidl_gui ${VXL_LIB_PREFIX}vidl ${VXL_LIB_PREFIX}vgui ${VXL_LIB_PREFIX}vil )
- 
- if( BUILD_TESTING )
-diff --git a/core/vil/CMakeLists.txt b/core/vil/CMakeLists.txt
-index 61672fe90edf7db26010613a2635ec355c8cf626..2734909d70af7c0d3c94febee8efe6aad6b1b666 100644
---- a/core/vil/CMakeLists.txt
-+++ b/core/vil/CMakeLists.txt
-@@ -335,6 +335,7 @@ set( vil_network_sources
- )
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vil LIBRARY_SOURCES ${vil_sources} ${vil_network_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vil PROPERTIES ${VIL_LIBRARY_PROPERTIES})
- 
- if(JPEG_FOUND)
-   target_link_libraries( ${VXL_LIB_PREFIX}vil ${JPEG_LIBRARIES} )
-diff --git a/core/vil/algo/CMakeLists.txt b/core/vil/algo/CMakeLists.txt
-index ee68c9106bbdefadc7b49a3eeee0ea5854b5160d..2b9a71f4303a073ddc2ae5e2b79d6988b512cc50 100644
---- a/core/vil/algo/CMakeLists.txt
-+++ b/core/vil/algo/CMakeLists.txt
-@@ -57,6 +57,7 @@ set( vil_algo_sources
- aux_source_directory(Templates vil_algo_sources)
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vil_algo LIBRARY_SOURCES ${vil_algo_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vil_algo PROPERTIES ${VIL_ALGO_LIBRARY_PROPERTIES})
- 
- target_link_libraries( ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vcl )
- 
-diff --git a/core/vnl/CMakeLists.txt b/core/vnl/CMakeLists.txt
-index 6388a7f4a7b277cf2df4926300c69b66fb038008..d40871b9ec8c0ce8fee2d82f787f478ed0749c6d 100644
---- a/core/vnl/CMakeLists.txt
-+++ b/core/vnl/CMakeLists.txt
-@@ -268,6 +268,7 @@ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vnl
-   LIBRARY_SOURCES ${vnl_sources}
-   HEADER_INSTALL_DIR vnl)
- target_link_libraries( ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vcl )
-+set_target_properties(${VXL_LIB_PREFIX}vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
- set(_curr_lib_name vnl)
- # If VXL_INSTALL_INCLUDE_DIR is the default value
- if("${VXL_INSTALL_INCLUDE_DIR}" STREQUAL "include/vxl")
-diff --git a/core/vnl/algo/CMakeLists.txt b/core/vnl/algo/CMakeLists.txt
-index 1666a0e089c74ba1212c7ccd0743c79b1ed420fe..a326fd6aea06fd26e6ae838b652d97f078bd8ae1 100644
---- a/core/vnl/algo/CMakeLists.txt
-+++ b/core/vnl/algo/CMakeLists.txt
-@@ -111,6 +111,7 @@ if(NETLIB_FOUND)
-   vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vnl_algo
-     LIBRARY_SOURCES ${vnl_algo_sources}
-     HEADER_INSTALL_DIR vnl/algo)
-+  set_target_properties(${VXL_LIB_PREFIX}vnl_algo PROPERTIES ${VNL_ALGO_LIBRARY_PROPERTIES})
-   target_link_libraries( ${VXL_LIB_PREFIX}vnl_algo ${NETLIB_LIBRARIES} ${VXL_LIB_PREFIX}vnl )
-   set(CURR_LIB_NAME vnl_algo)
-   set_vxl_library_properties(
-diff --git a/core/vpdl/CMakeLists.txt b/core/vpdl/CMakeLists.txt
-index 2ea8d4e2b64b33b87ca706394c5afae7a9446b78..eca0c4f010746278969d1992c27de914e82c0e1f 100644
---- a/core/vpdl/CMakeLists.txt
-+++ b/core/vpdl/CMakeLists.txt
-@@ -50,6 +50,7 @@ aux_source_directory(Templates vpdl_sources)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpdl LIBRARY_SOURCES ${vpdl_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vpdl PROPERTIES ${VPDL_LIBRARY_PROPERTIES})
- target_link_libraries( ${VXL_LIB_PREFIX}vpdl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl )
- set(CURR_LIB_NAME vpdl)
- set_vxl_library_properties(
-diff --git a/core/vpgl/CMakeLists.txt b/core/vpgl/CMakeLists.txt
-index 6b3589f61c4a29af52d77ffec73258b823505079..ae1e74dba44eecaf96c48156ccf0b6f679076f3c 100644
---- a/core/vpgl/CMakeLists.txt
-+++ b/core/vpgl/CMakeLists.txt
-@@ -35,6 +35,7 @@ aux_source_directory(Templates vpgl_sources)
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl LIBRARY_SOURCES ${vpgl_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vpgl PROPERTIES ${VPGL_LIBRARY_PROPERTIES})
- target_link_libraries(${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vbl)
- set(CURR_LIB_NAME vpgl)
- set_vxl_library_properties(
-diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
-index ab762c300616bd81b6de331acec8007d03102c19..97e50096c35b086e76b62a5de621637d3cfbc92f 100644
---- a/core/vpgl/algo/CMakeLists.txt
-+++ b/core/vpgl/algo/CMakeLists.txt
-@@ -43,6 +43,7 @@ endif()
- aux_source_directory(Templates vpgl_algo_sources)
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_algo LIBRARY_SOURCES ${vpgl_algo_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vpgl_algo PROPERTIES ${VPGL_ALGO_LIBRARY_PROPERTIES})
- 
- target_link_libraries(${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_file_formats ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
- 
-diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
-index cd33c8ec2bc94558274a95f1fbebf4faecafcd1b..5a1c40bd089049dace2a04e7db7385ceab2c3d84 100644
---- a/core/vpgl/file_formats/CMakeLists.txt
-+++ b/core/vpgl/file_formats/CMakeLists.txt
-@@ -21,6 +21,7 @@ if(TIFF_FOUND)
- endif()
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_file_formats LIBRARY_SOURCES ${vpgl_file_formats_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vpgl_file_formats PROPERTIES ${VPGL_FILE_FORMATS_LIBRARY_PROPERTIES})
- 
- target_link_libraries(${VXL_LIB_PREFIX}vpgl_file_formats ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl)
- 
-diff --git a/core/vpgl/io/CMakeLists.txt b/core/vpgl/io/CMakeLists.txt
-index eeaeef11a2055cc533e54469749d450aecbf085d..1204f88d373db213d793702f66f0f47926aa0a60 100644
---- a/core/vpgl/io/CMakeLists.txt
-+++ b/core/vpgl/io/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(vpgl_io_sources
- aux_source_directory(Templates vpgl_io_sources)
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_io LIBRARY_SOURCES ${vpgl_io_sources})
-+set_target_properties(${VXL_LIB_PREFIX}vpgl_io PROPERTIES ${VPGL_IO_LIBRARY_PROPERTIES})
- 
- target_link_libraries(${VXL_LIB_PREFIX}vpgl_io ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vbl_io)
- 
-diff --git a/core/vpgl/xio/CMakeLists.txt b/core/vpgl/xio/CMakeLists.txt
-index 4019d294eec7cada19ad7c2ef601b2b61f8fd9ef..8c367dc41ad8a0f79fed236da2f8e9079114c1dd 100644
---- a/core/vpgl/xio/CMakeLists.txt
-+++ b/core/vpgl/xio/CMakeLists.txt
-@@ -5,6 +5,7 @@ set(vpgl_xio_sources
- )
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_xio LIBRARY_SOURCES ${vpgl_xio_sources} )
-+set_target_properties(${VXL_LIB_PREFIX}vpgl_xio PROPERTIES ${VPGL_XIO_LIBRARY_PROPERTIES})
- target_link_libraries( ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vsl )
- 
- if(BUILD_TESTING)
-diff --git a/v3p/netlib/CMakeLists.txt b/v3p/netlib/CMakeLists.txt
-index 726a25a834893f8f051fbe627c490c52cc3af2b6..e670609dd775b7b092dfb1e10389832f1d1b69dd 100644
---- a/v3p/netlib/CMakeLists.txt
-+++ b/v3p/netlib/CMakeLists.txt
-@@ -9,6 +9,8 @@ set(netlib_sources
- 
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}netlib
-   LIBRARY_SOURCES ${netlib_sources})
-+set_target_properties(${VXL_LIB_PREFIX}netlib
-+    PROPERTIES ${NETLIB_LIBRARY_PROPERTIES})
- 
- if(UNIX)
-   target_link_libraries( ${VXL_LIB_PREFIX}netlib m )
-@@ -437,6 +439,8 @@ endif()
- # Create a netlib library with mangled symbols.
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}v3p_netlib
-   LIBRARY_SOURCES ${v3p_netlib_sources})
-+set_target_properties(${VXL_LIB_PREFIX}v3p_netlib
-+    PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
- if(UNIX)
-   target_link_libraries(${VXL_LIB_PREFIX}v3p_netlib m)
- endif()
-diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt
-index dd83858d156fe2d9c9c2a0dfbdac016ec6af582c..d6b92ed8395f5df2eb312ae19387e8ebed5367b4 100644
---- a/vcl/CMakeLists.txt
-+++ b/vcl/CMakeLists.txt
-@@ -193,6 +193,8 @@ set( vcl_sources
- vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vcl
-   LIBRARY_SOURCES ${vcl_sources}
-   )
-+set_target_properties(${VXL_LIB_PREFIX}vcl
-+    PROPERTIES ${VCL_LIBRARY_PROPERTIES})
- if(UNIX)
-   target_link_libraries(${VXL_LIB_PREFIX}vcl m)
- endif()
 -- 
 2.21.0
 

From 9363723f06f387d28bda7b2d3c8e046ead4da67e Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Fri, 17 May 2019 18:06:26 +0100
Subject: [PATCH 32/74] Update patches

---
 0001-v2.0.2-unbundle-rply.patch               |   34 +-
 0002-v2.0.2-Use-Fedora-FindEXPAT.patch        |  469 --------
 ...-v2.0.2-Use-Fedora-expat-and-expatpp.patch | 1056 +++++++++++++++++
 0003-v2.0.2-Use-Fedora-minizip.patch          |   25 +-
 0004-v2.0.2-Correct-dcmtk-includes.patch      |   65 -
 0004-v2.0.2-Version-shared-objects.patch      |   15 +-
 ...v2.0.2-Add-cmake-module-to-find-RPLY.patch |  120 ++
 ...-Update-function-arguments-in-declar.patch |   34 +
 0007-v2.0.2-fix-bkml-test.patch               |   58 +
 0008-v2.0.2-Correct-rply-includedir.patch     |  137 +++
 ...library-Submitted-by-Volker-Frohlich.patch |   85 --
 ...ary-2-2-Submitted-by-Volker-Frohlich.patch |  107 --
 ...ox2m-which-requires-OpenCL-libraries.patch |   35 -
 ....h-which-is-provided-by-fedora-repos.patch |   25 -
 ...-Include-missing-vcl_cstdio.h-header.patch |   24 -
 0025-Legacy-def1-r35963.patch                 |   37 -
 0026-Legacy-def2-r36001.patch                 |   46 -
 vxl-1.17.0-secondary.patch                    |   30 -
 vxl.spec                                      |  625 +++++++++-
 19 files changed, 2050 insertions(+), 977 deletions(-)
 delete mode 100644 0002-v2.0.2-Use-Fedora-FindEXPAT.patch
 create mode 100644 0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
 delete mode 100644 0004-v2.0.2-Correct-dcmtk-includes.patch
 create mode 100644 0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
 create mode 100644 0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
 create mode 100644 0007-v2.0.2-fix-bkml-test.patch
 create mode 100644 0008-v2.0.2-Correct-rply-includedir.patch
 delete mode 100644 0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
 delete mode 100644 0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
 delete mode 100644 0019-Removed-box2m-which-requires-OpenCL-libraries.patch
 delete mode 100644 0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
 delete mode 100644 0022-Include-missing-vcl_cstdio.h-header.patch
 delete mode 100644 0025-Legacy-def1-r35963.patch
 delete mode 100644 0026-Legacy-def2-r36001.patch
 delete mode 100644 vxl-1.17.0-secondary.patch

diff --git a/0001-v2.0.2-unbundle-rply.patch b/0001-v2.0.2-unbundle-rply.patch
index ce7b683..69f922c 100644
--- a/0001-v2.0.2-unbundle-rply.patch
+++ b/0001-v2.0.2-unbundle-rply.patch
@@ -1,7 +1,7 @@
 From 03d46e9ecaae8e18c892aecded6f918f6407344d Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 1/4] v2.0.2: unbundle rply
+Subject: [PATCH 1/8] v2.0.2: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
@@ -36,7 +36,7 @@ Subject: [PATCH 1/4] v2.0.2: unbundle rply
  delete mode 100644 v3p/rply/rply.h
 
 diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 5cf355e3fe..662ec284e9 100644
+index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab4561a7f3b8 100644
 --- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 +++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 @@ -1,8 +1,9 @@
@@ -60,7 +60,7 @@ index 5cf355e3fe..662ec284e9 100644
  if( BUILD_TESTING )
    add_subdirectory(tests)
 diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-index cee22bd271..4714624fa3 100644
+index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b8782402d18f64d 100644
 --- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -73,7 +73,7 @@ index cee22bd271..4714624fa3 100644
      boxm_compute_scene_statistics.h
      boxm_crop_scene.h
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index 92b959f740..fff9ae2d84 100644
+index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae8a69ffc0 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 @@ -1,12 +1,14 @@
@@ -94,7 +94,7 @@ index 92b959f740..fff9ae2d84 100644
  # cpp process APIs.
  add_subdirectory(pro)
 diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-index 1407ed9d31..c3ed4ed27d 100644
+index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb89539df76a93 100644
 --- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 @@ -1,6 +1,8 @@
@@ -117,7 +117,7 @@ index 1407ed9d31..c3ed4ed27d 100644
  if(BUILD_TESTING)
    add_subdirectory(tests)
 diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index 251ef9a979..ae9baedaa4 100644
+index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f906345b98 100644
 --- a/v3p/CMakeLists.txt
 +++ b/v3p/CMakeLists.txt
 @@ -60,5 +60,4 @@ if(VXL_BUILD_CORE_IMAGING)
@@ -128,7 +128,7 @@ index 251ef9a979..ae9baedaa4 100644
  endif()
 diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
 deleted file mode 100644
-index 9085a628a1..0000000000
+index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..0000000000000000000000000000000000000000
 --- a/v3p/rply/CMakeLists.txt
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -143,7 +143,7 @@ index 9085a628a1..0000000000
 -vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources})
 diff --git a/v3p/rply/LICENSE b/v3p/rply/LICENSE
 deleted file mode 100644
-index 02e7c5f385..0000000000
+index 02e7c5f385b5ca8c7e9df071455f3956122e9380..0000000000000000000000000000000000000000
 --- a/v3p/rply/LICENSE
 +++ /dev/null
 @@ -1,20 +0,0 @@
@@ -169,7 +169,7 @@ index 02e7c5f385..0000000000
 -DEALINGS IN THE SOFTWARE.
 diff --git a/v3p/rply/etc/convert.c b/v3p/rply/etc/convert.c
 deleted file mode 100644
-index e90d4cd576..0000000000
+index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/convert.c
 +++ /dev/null
 @@ -1,136 +0,0 @@
@@ -311,7 +311,7 @@ index e90d4cd576..0000000000
 -}
 diff --git a/v3p/rply/etc/dump.c b/v3p/rply/etc/dump.c
 deleted file mode 100644
-index 7ae2341cf1..0000000000
+index 7ae2341cf14962953aeefed659f560e1c486cf40..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/dump.c
 +++ /dev/null
 @@ -1,44 +0,0 @@
@@ -361,7 +361,7 @@ index 7ae2341cf1..0000000000
 -
 diff --git a/v3p/rply/etc/input.ply b/v3p/rply/etc/input.ply
 deleted file mode 100644
-index 87ba8546d0..0000000000
+index 87ba8546d03d8349b773d4a155429853c7591412..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/input.ply
 +++ /dev/null
 @@ -1,16 +0,0 @@
@@ -383,7 +383,7 @@ index 87ba8546d0..0000000000
 -3 1 0 2
 diff --git a/v3p/rply/etc/sconvert.c b/v3p/rply/etc/sconvert.c
 deleted file mode 100644
-index 97209e9b49..0000000000
+index 97209e9b495bbea97c8043298460bce0d4c95197..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/sconvert.c
 +++ /dev/null
 @@ -1,66 +0,0 @@
@@ -455,7 +455,7 @@ index 97209e9b49..0000000000
 -}
 diff --git a/v3p/rply/manual/manual.html b/v3p/rply/manual/manual.html
 deleted file mode 100644
-index 60b415341f..0000000000
+index 60b415341fa283d2d03c7e1dbdd913892196d407..0000000000000000000000000000000000000000
 --- a/v3p/rply/manual/manual.html
 +++ /dev/null
 @@ -1,993 +0,0 @@
@@ -1454,7 +1454,7 @@ index 60b415341f..0000000000
 -</html>
 diff --git a/v3p/rply/manual/reference.css b/v3p/rply/manual/reference.css
 deleted file mode 100644
-index 821215dc82..0000000000
+index 821215dc8279d81ff09c611166479df78fd2fd15..0000000000000000000000000000000000000000
 --- a/v3p/rply/manual/reference.css
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -1644,7 +1644,7 @@ CHXH8%
 
 diff --git a/v3p/rply/readme.txt b/v3p/rply/readme.txt
 deleted file mode 100644
-index 638124bc3f..0000000000
+index 638124bc3f39c21a2fcbc453a950b026686d4a19..0000000000000000000000000000000000000000
 --- a/v3p/rply/readme.txt
 +++ /dev/null
 @@ -1,24 +0,0 @@
@@ -1674,7 +1674,7 @@ index 638124bc3f..0000000000
 -
 diff --git a/v3p/rply/rply.c b/v3p/rply/rply.c
 deleted file mode 100644
-index bc99b135d2..0000000000
+index bc99b135d21ccb835759ac6335b4e99c40e4decc..0000000000000000000000000000000000000000
 --- a/v3p/rply/rply.c
 +++ /dev/null
 @@ -1,1570 +0,0 @@
@@ -3250,7 +3250,7 @@ index bc99b135d2..0000000000
 - * ---------------------------------------------------------------------- */
 diff --git a/v3p/rply/rply.h b/v3p/rply/rply.h
 deleted file mode 100644
-index 3c604fd88e..0000000000
+index 3c604fd88ee1667d404d7f0e80431f2d83eb9686..0000000000000000000000000000000000000000
 --- a/v3p/rply/rply.h
 +++ /dev/null
 @@ -1,367 +0,0 @@
diff --git a/0002-v2.0.2-Use-Fedora-FindEXPAT.patch b/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
deleted file mode 100644
index 28ca4db..0000000
--- a/0002-v2.0.2-Use-Fedora-FindEXPAT.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From 73535b3c72cf0ca6e1a5c9bef4861cbcbff45183 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 2/4] v2.0.2 Use Fedora FindEXPAT
-
----
- contrib/brl/b3p/expat/CMakeLists.txt              | 2 +-
- contrib/brl/b3p/expatpp/CMakeLists.txt            | 2 +-
- contrib/brl/bbas/bkml/CMakeLists.txt              | 2 +-
- contrib/brl/bbas/bvgl/CMakeLists.txt              | 2 +-
- contrib/brl/bbas/bvgl/tests/CMakeLists.txt        | 2 +-
- contrib/brl/bbas/bwm/CMakeLists.txt               | 2 +-
- contrib/brl/bbas/bwm/io/CMakeLists.txt            | 2 +-
- contrib/brl/bbas/bwm/video/CMakeLists.txt         | 2 +-
- contrib/brl/bbas/bwm/video/exe/CMakeLists.txt     | 2 +-
- contrib/brl/bbas/bxml/CMakeLists.txt              | 2 +-
- contrib/brl/bbas/volm/CMakeLists.txt              | 2 +-
- contrib/brl/bpro/CMakeLists.txt                   | 2 +-
- contrib/brl/bseg/bbgm_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/betr_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/bmdl_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/boxm/CMakeLists.txt              | 2 +-
- contrib/brl/bseg/boxm2/CMakeLists.txt             | 2 +-
- contrib/brl/bseg/boxm2/volm/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/boxm2_batch/CMakeLists.txt       | 2 +-
- contrib/brl/bseg/boxm_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/brec_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/bstm/CMakeLists.txt              | 2 +-
- contrib/brl/bseg/bstm_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/bstm_multi/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  | 2 +-
- contrib/brl/bseg/bvpl/functors/CMakeLists.txt     | 2 +-
- contrib/brl/bseg/bvpl/kernels/CMakeLists.txt      | 2 +-
- contrib/brl/bseg/bvpl_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt | 2 +-
- contrib/brl/bseg/bvxm/CMakeLists.txt              | 2 +-
- contrib/brl/bseg/bvxm_batch/CMakeLists.txt        | 2 +-
- contrib/brl/bseg/bvxm_bridge/CMakeLists.txt       | 2 +-
- contrib/brl/bseg/vcon/CMakeLists.txt              | 2 +-
- 33 files changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
-index 5b9d660530..de39970780 100644
---- a/contrib/brl/b3p/expat/CMakeLists.txt
-+++ b/contrib/brl/b3p/expat/CMakeLists.txt
-@@ -1,7 +1,7 @@
- project(expat C)
- #include_regular_expression("^.*$")
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(NOT VXL_USING_NATIVE_EXPAT)
- 
-   if(WIN32)
-diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
-index 4959c123c3..71ecd0568b 100644
---- a/contrib/brl/b3p/expatpp/CMakeLists.txt
-+++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
-@@ -1,6 +1,6 @@
- #This is brl/b3p/expatpp
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if( EXPAT_FOUND )
- 
-   if( VXL_USING_NATIVE_EXPAT )
-diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index 6328cfd419..bb6a65f96d 100644
---- a/contrib/brl/bbas/bkml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bkml/CMakeLists.txt
-@@ -5,7 +5,7 @@ set(bkml_sources
-   bkml_write.h bkml_write.cxx
- )
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
-diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index c4da5b9d28..29e4cf838d 100644
---- a/contrib/brl/bbas/bvgl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
-@@ -37,7 +37,7 @@ aux_source_directory(Templates bvgl_sources)
- 
- 
- #find expatpp library for
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${EXPAT_INCLUDE_DIR} )
-   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
-diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-index 76995137ed..88eebcd621 100644
---- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-+++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(bvgl_test_sources
- )
- 
- #Make sure expat library is found
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- if(EXPAT_FOUND)
-   set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
-diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
-index dace2292e7..78f35ac924 100644
---- a/contrib/brl/bbas/bwm/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/CMakeLists.txt
-@@ -26,7 +26,7 @@ endif()
- 
- include( ${BRL_MODULE_PATH}/FindSHAPELIB.cmake )
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- # Set CMake options for using vgui
- include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
-diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-index dc2102047f..9c55cc59ba 100644
---- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(bwm_io_sources
- )
- aux_source_directory(Templates bwm_io_sources)
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
-diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
-index 5408fe77a7..2dd989f27c 100644
---- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(bwm_video_sources
-                                  bwm_video_site_io_defs.h
- )
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
-diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-index ca3c490d5e..baff80256f 100644
---- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # This is contrib/bwm/exe/CMakeLists.txt
- # World Modeling GUI executables
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- if(EXPAT_FOUND)
-   if(EXPATPP_FOUND)
-diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
-index c027dfaa28..239f6e528e 100644
---- a/contrib/brl/bbas/bxml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bxml/CMakeLists.txt
-@@ -12,7 +12,7 @@ set( bxml_sources
-     bxml_find.cxx                bxml_find.h
- )
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
-diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
-index cf11103557..9047257fc5 100644
---- a/contrib/brl/bbas/volm/CMakeLists.txt
-+++ b/contrib/brl/bbas/volm/CMakeLists.txt
-@@ -6,7 +6,7 @@
- include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
- if(HAS_GEOTIFF)
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
-   if(EXPATPP_FOUND)
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
-index 637c1ecfa8..803917fd24 100644
---- a/contrib/brl/bpro/CMakeLists.txt
-+++ b/contrib/brl/bpro/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # brl/bpro/CMakeLists.txt
- # main package for processing operations
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
- 
- # Basic process classes
-diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-index cbd9222c7f..21b1fbec89 100644
---- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     if(EXPATPP_FOUND)
-     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
-diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-index 3c5d70e0c6..0069fb9ff3 100644
---- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-@@ -4,7 +4,7 @@ project( betr_batch )
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- 
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-index f341e59f07..e253c8f501 100644
---- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-    if(EXPATPP_FOUND)
-     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
-diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
-index 6c9da00de1..0ddd6033d5 100644
---- a/contrib/brl/bseg/boxm/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # contrib/brl/bseg/boxm/CMakeLists.txt
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
- 
- include_directories( ${EXPAT_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
-index 4475e418be..14acc308ec 100644
---- a/contrib/brl/bseg/boxm2/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
-@@ -21,7 +21,7 @@ set(boxm2_sources
-     boxm2_blocks_vis_graph.h          boxm2_blocks_vis_graph.cxx
-    )
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
- 
-   include_directories( ${EXPAT_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-index 861b960f4d..c3ae5b39bf 100644
---- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # This is contrib/brl/bseg/boxm2/volm/CMakeLists
- # volm depends on bkml and expat
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
-   if(EXPATPP_FOUND)
-     #depends on OPENCL being found...
-diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-index 70e603743b..77f8f743f9 100644
---- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-@@ -9,7 +9,7 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
- include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
- 
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-index 1d57861444..a6f24b1da9 100644
---- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-@@ -4,7 +4,7 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
- 
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-index b7e3039d7e..c13969e15d 100644
---- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # contrib/brl/bseg/brec_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
-index 977d68fdab..97a895fa28 100644
---- a/contrib/brl/bseg/bstm/CMakeLists.txt
-+++ b/contrib/brl/bseg/bstm/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
-                  bstm_time_block.h bstm_time_block.cxx
-                  bstm_util.cxx bstm_util.h)
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${EXPAT_INCLUDE_DIR} )
-   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
-diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-index c94ddbcc4c..8b6aa9f1f2 100644
---- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-@@ -12,7 +12,7 @@ if(DIRECTSHOW_FOUND)
- endif()
- 
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-index ba8815fe6b..6abac60395 100644
---- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-+++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(bstm_multi_sources
-   space_time_scene_parser.h space_time_scene_parser.hxx
-   )
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if (EXPAT_FOUND)
-   include_directories( ${EXPAT_INCLUDE_DIR} )
-   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-index a1fd1eb943..cefb928abc 100644
---- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
- # Brown Voxel Processing library for octrees
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
- #mark_as_advanced( VXL_FORCE_V3P_RPLY )
-diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-index 25433e56f2..550528c08c 100644
---- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
- # The kernel-related files for Brown Voxel Processing Library (BVPL)
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
- 
- include_directories( ${EXPAT_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-index 0672b5d3d8..5b2a2750de 100644
---- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
- # The kernel-related files for Brown Voxel Processing Library (BVPL)
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
- 
- include_directories( ${EXPAT_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-index 9010286745..abca67a186 100644
---- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-index 052a160d9c..2b7731521f 100644
---- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
-index fbda67337c..d6ba4cc128 100644
---- a/contrib/brl/bseg/bvxm/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
-@@ -38,7 +38,7 @@ set(bvxm_sources
- aux_source_directory(Templates bvxm_sources)
- 
- #find expatpp library for bvxm_world_params parser
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${EXPAT_INCLUDE_DIR} )
-   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
-diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-index 58ece0b8d3..779c056a76 100644
---- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-@@ -2,7 +2,7 @@
- if(HAS_GEOTIFF)
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-index b7b0636f29..0fc2e895f7 100644
---- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-@@ -8,7 +8,7 @@ if(OPENCL_FOUND)
-   include_directories( ${MUL_INCLUDE_DIR} )
- 
-   #find expatpp library
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-   if(EXPAT_FOUND)
-     include_directories( ${EXPAT_INCLUDE_DIR} )
-     include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
-diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
-index 26504576be..1fc507d257 100644
---- a/contrib/brl/bseg/vcon/CMakeLists.txt
-+++ b/contrib/brl/bseg/vcon/CMakeLists.txt
-@@ -4,7 +4,7 @@
- include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
- if(HAS_GEOTIFF)
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- if(EXPAT_FOUND)
-   if(EXPATPP_FOUND)
-     include_directories( ${BRL_INCLUDE_DIR} )
--- 
-2.21.0
-
diff --git a/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch b/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
new file mode 100644
index 0000000..46bf7f6
--- /dev/null
+++ b/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
@@ -0,0 +1,1056 @@
+From 5b1f1b76bb9c71c46ba867ce2170cb43d7ba0e2e Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 15:20:08 +0000
+Subject: [PATCH 2/8] v2.0.2 Use Fedora expat and expatpp
+
+---
+ CMakeLists.txt                                |  3 ++
+ config/cmake/fedora-modules/FindEXPATPP.cmake | 37 +++++++++++++++++
+ contrib/brl/b3p/expat/CMakeLists.txt          |  3 +-
+ contrib/brl/b3p/expatpp/CMakeLists.txt        | 22 +---------
+ contrib/brl/bbas/bhdfs/pro/CMakeLists.txt     |  3 +-
+ contrib/brl/bbas/bkml/CMakeLists.txt          |  2 +-
+ contrib/brl/bbas/bocl/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bbas/bvgl/CMakeLists.txt          |  3 +-
+ contrib/brl/bbas/bvgl/bvgl_labelme_parser.h   |  2 +-
+ contrib/brl/bbas/bvgl/tests/CMakeLists.txt    |  3 +-
+ contrib/brl/bbas/bwm/CMakeLists.txt           |  3 +-
+ contrib/brl/bbas/bwm/io/CMakeLists.txt        |  3 +-
+ contrib/brl/bbas/bwm/pro/CMakeLists.txt       |  3 +-
+ contrib/brl/bbas/bwm/video/CMakeLists.txt     |  3 +-
+ contrib/brl/bbas/bwm/video/exe/CMakeLists.txt |  3 +-
+ contrib/brl/bbas/bxml/CMakeLists.txt          |  9 ++--
+ contrib/brl/bbas/volm/CMakeLists.txt          |  3 +-
+ contrib/brl/bbas/volm/volm_osm_parser.h       |  2 +-
+ contrib/brl/bmods/FindEXPAT.cmake             | 41 ++-----------------
+ contrib/brl/bpro/CMakeLists.txt               |  3 +-
+ contrib/brl/bpro/bprb/tests/CMakeLists.txt    |  6 ++-
+ contrib/brl/bseg/bbgm/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bbgm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/betr_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bmdl/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bmdl_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/boxm/CMakeLists.txt          |  3 +-
+ contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |  3 +-
+ .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |  3 +-
+ .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |  3 +-
+ contrib/brl/bseg/boxm/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/boxm2/CMakeLists.txt         |  3 +-
+ .../bseg/boxm2/boxm2_bounding_box_parser.h    |  2 +-
+ contrib/brl/bseg/boxm2/boxm2_scene_parser.h   |  2 +-
+ contrib/brl/bseg/boxm2/pro/CMakeLists.txt     |  3 +-
+ .../boxm2_ingest_convex_mesh_process.cxx      |  2 +-
+ contrib/brl/bseg/boxm2/volm/CMakeLists.txt    |  3 +-
+ .../brl/bseg/boxm2/volm/pro/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/boxm2_batch/CMakeLists.txt   |  3 +-
+ .../brl/bseg/boxm2_multi/pro/CMakeLists.txt   |  3 +-
+ contrib/brl/bseg/boxm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/brec_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bstm/CMakeLists.txt          |  3 +-
+ contrib/brl/bseg/bstm/bstm_scene_parser.h     |  2 +-
+ contrib/brl/bseg/bstm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bstm_multi/CMakeLists.txt    |  3 +-
+ .../bseg/bstm_multi/space_time_scene_parser.h |  2 +-
+ .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |  3 +-
+ .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |  3 +-
+ contrib/brl/bseg/bvpl/functors/CMakeLists.txt |  3 +-
+ contrib/brl/bseg/bvpl/kernels/CMakeLists.txt  |  3 +-
+ .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |  3 +-
+ contrib/brl/bseg/bvpl/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bvpl_batch/CMakeLists.txt    |  3 +-
+ .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |  3 +-
+ contrib/brl/bseg/bvxm/CMakeLists.txt          |  3 +-
+ contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |  3 +-
+ .../brl/bseg/bvxm/bvxm_world_params_parser.h  |  2 +-
+ contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt |  3 +-
+ contrib/brl/bseg/bvxm/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bvxm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bvxm_bridge/CMakeLists.txt   |  3 +-
+ contrib/brl/bseg/vcon/CMakeLists.txt          |  3 +-
+ 63 files changed, 162 insertions(+), 118 deletions(-)
+ create mode 100644 config/cmake/fedora-modules/FindEXPATPP.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..dfc509d8fcd380991655331445baca4bcae2d94d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,6 +50,9 @@ project(VXL #Project name must be all caps to have properly generated VXL_VERSIO
+     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
+     LANGUAGES CXX C)
+ 
++
++set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
++
+ include(CMakeDependentOption)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
+ 
+diff --git a/config/cmake/fedora-modules/FindEXPATPP.cmake b/config/cmake/fedora-modules/FindEXPATPP.cmake
+new file mode 100644
+index 0000000000000000000000000000000000000000..88a29681aa67eb298662072c3817554bcf52dcf4
+--- /dev/null
++++ b/config/cmake/fedora-modules/FindEXPATPP.cmake
+@@ -0,0 +1,37 @@
++# Adapted from https://github.com/jirihnidek/verse-ply-uploader/blob/master/build_files/cmake/modules/FindEXPATPP.cmake
++# This module tries to find EXPATPP library and include files
++#
++# EXPATPP_INCLUDE_DIR, where to find verse.h
++# EXPATPP_LIBRARY_DIR, where to find libverse.so
++# EXPATPP_LIBRARIES, the library to link against
++# EXPATPP_FOUND, IF false, do not try to use Verse
++#
++
++FIND_PATH ( EXPATPP_INCLUDE_DIR expatpp.h
++    /usr/include
++    /usr/include/expatpp
++    /usr/local/include
++    /usr/local/include/expatpp
++)
++
++FIND_LIBRARY ( EXPATPP_LIBRARIES
++    NAMES expatpp libexpatpp
++    PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64
++)
++
++GET_FILENAME_COMPONENT( EXPATPP_LIBRARY_DIR ${EXPATPP_LIBRARIES} PATH )
++
++SET ( EXPATPP_FOUND "NO" )
++IF ( EXPATPP_INCLUDE_DIR )
++    IF ( EXPATPP_LIBRARIES )
++        SET ( EXPATPP_LIBRARY ${EXPATPP_LIBRARIES} )
++        SET ( EXPATPP_FOUND "YES" )
++    ENDIF ( EXPATPP_LIBRARIES )
++ENDIF ( EXPATPP_INCLUDE_DIR )
++
++MARK_AS_ADVANCED (
++    EXPATPP_LIBRARY_DIR
++    EXPATPP_INCLUDE_DIR
++    EXPATPP_LIBRARIES
++    EXPATPP_LIBRARY
++)
+diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
+index 5b9d660530acd9310dfb554171d70cdc7417028f..1304b5f634c977f3c7e28182c18db3f5231d0d50 100644
+--- a/contrib/brl/b3p/expat/CMakeLists.txt
++++ b/contrib/brl/b3p/expat/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ project(expat C)
+ #include_regular_expression("^.*$")
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(NOT VXL_USING_NATIVE_EXPAT)
+ 
+   if(WIN32)
+diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
+index 4959c123c336ee7935b31dbeffc97f734c07d73a..f25323d0dec43ee770a8506ce7197b77e20135c1 100644
+--- a/contrib/brl/b3p/expatpp/CMakeLists.txt
++++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
+@@ -1,22 +1,4 @@
+ #This is brl/b3p/expatpp
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+-if( EXPAT_FOUND )
+-
+-  if( VXL_USING_NATIVE_EXPAT )
+-    include_directories( ${EXPAT_INCLUDE_DIR} )
+-  else()
+-    include_directories( ${BRL_BINARY_DIR}/b3p/expat )
+-  endif()
+-
+-  set( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
+-
+-  vxl_add_library(LIBRARY_NAME expatpp LIBRARY_SOURCES ${expatpp_sources} )
+-  target_link_libraries( expatpp ${EXPAT_LIBRARIES} )
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-
+-endif()
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+diff --git a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
+index 11e9d815c387e06aadfb64bf3903f6fdef4455a6..57979102732f2178d17132c98a76de6b1769a9ac 100644
+--- a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # bhdfs's Process Library
+ 
+ # bprb depends on expat and bhdfs_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
+index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d111d4713 100644
+--- a/contrib/brl/bbas/bkml/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(bkml_sources
+   bkml_write.h bkml_write.cxx
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bocl/pro/CMakeLists.txt b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
+index 96e947876d3b004a2fdc4f2a93f2a63f9d29fe92..ba6ba1deb888221c728ae09aecf499c5bee21564 100644
+--- a/contrib/brl/bbas/bocl/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ # bprb depends on expat and boxm_ocl_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
+index c4da5b9d289cdbd64ca12e20a8941856f5d91342..260bcf1d88c948689647dd3acf0c9fd6a1ef0547 100644
+--- a/contrib/brl/bbas/bvgl/CMakeLists.txt
++++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
+@@ -37,7 +37,8 @@ aux_source_directory(Templates bvgl_sources)
+ 
+ 
+ #find expatpp library for
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
+index afa5d22968ddac11e7730e1a9f1d9ad17531848c..40327fb9ea912dacd877b0b2f8b02bdc2dbf7364 100644
+--- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
++++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
+@@ -14,7 +14,7 @@
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+index 76995137ed8d81fb80c10bf6d9f810b9f4003210..1cb0736454e6ac45a95f519b4bd65c4fbab268d4 100644
+--- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
++++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+@@ -16,7 +16,8 @@ set(bvgl_test_sources
+ )
+ 
+ #Make sure expat library is found
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+   set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
+diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
+index dace2292e7e09803845f90519be8fcb50fc2131a..a05c9d03660c04914676c92274b76c2f60c888a6 100644
+--- a/contrib/brl/bbas/bwm/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/CMakeLists.txt
+@@ -26,7 +26,8 @@ endif()
+ 
+ include( ${BRL_MODULE_PATH}/FindSHAPELIB.cmake )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ # Set CMake options for using vgui
+ include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
+diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
+index dc2102047f46fffb68d2f1e92c5718dd656c09a8..ba8c13a7067af11b3dc2958d46191f1598b2c098 100644
+--- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
+@@ -7,7 +7,8 @@ set(bwm_io_sources
+ )
+ aux_source_directory(Templates bwm_io_sources)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/pro/CMakeLists.txt b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
+index 920f31413c3c37e65df419dc0e35f7299c48c11c..21949a782cf5a94c7160f3f6ff11a73336b4b981 100644
+--- a/contrib/brl/bbas/bwm/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
+@@ -9,7 +9,8 @@ set(bwm_pro_sources
+     bwm_register.h    bwm_register.cxx
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
+index 5408fe77a72b842784b3c05aaf30379f08fcddc1..0787b9a74e2a2c4f33e9741b8cd68133f6842776 100644
+--- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
+@@ -11,7 +11,8 @@ set(bwm_video_sources
+                                  bwm_video_site_io_defs.h
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+index ca3c490d5e9674c465bd5a57f709882bad9c71ac..d232649ccb59bb8385ddfabe99586b65f9740db1 100644
+--- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/bwm/exe/CMakeLists.txt
+ # World Modeling GUI executables
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
+index c027dfaa286137f879e6b70043e0b291663039d4..72fed69f82a9e65a1850447fea9cd1d8e70a0168 100644
+--- a/contrib/brl/bbas/bxml/CMakeLists.txt
++++ b/contrib/brl/bbas/bxml/CMakeLists.txt
+@@ -12,7 +12,8 @@ set( bxml_sources
+     bxml_find.cxx                bxml_find.h
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+@@ -28,13 +29,15 @@ aux_source_directory(Templates bxml_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bxml LIBRARY_SOURCES ${bxml_sources})
+ 
+-target_link_libraries( bxml ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+-  target_link_libraries( bxml ${EXPATPP_LIBRARIES})
++  target_link_libraries( bxml ${EXPATPP_LIBRARIES} ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
+  endif()
++else()
++  target_link_libraries( bxml ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
+ endif()
+ 
++
+ add_subdirectory(bsvg)
+ 
+ if( BUILD_TESTING )
+diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
+index cf11103557090d878dd388f14f3b90e870695e2e..ebb93384f94c3fd40e8b30db85ca1d9a274d5996 100644
+--- a/contrib/brl/bbas/volm/CMakeLists.txt
++++ b/contrib/brl/bbas/volm/CMakeLists.txt
+@@ -6,7 +6,8 @@
+ include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+ if(HAS_GEOTIFF)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bbas/volm/volm_osm_parser.h b/contrib/brl/bbas/volm/volm_osm_parser.h
+index 82283250ddb5aef0de9e06f6346c2de276440851..289d5d5265f551f75e03a530cb79d30655e57201 100644
+--- a/contrib/brl/bbas/volm/volm_osm_parser.h
++++ b/contrib/brl/bbas/volm/volm_osm_parser.h
+@@ -20,7 +20,7 @@
+ #include <map>
+ #include <vector>
+ #include <utility>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/contrib/brl/bmods/FindEXPAT.cmake b/contrib/brl/bmods/FindEXPAT.cmake
+index 2be7c9a96338d5d4d6187764c6b4dad06caa52aa..cefa9c0a0e5a8a2841133fc9aa27a8995b599397 100644
+--- a/contrib/brl/bmods/FindEXPAT.cmake
++++ b/contrib/brl/bmods/FindEXPAT.cmake
+@@ -27,6 +27,10 @@ if(NOT EXPAT_FOUND)
+     if(EXPAT_FOUND)
+       set(VXL_USING_NATIVE_EXPAT "YES")
+     endif()
++    find_package(EXPATPP)
++    if(EXPATPP_FOUND)
++      set(VXL_USING_NATIVE_EXPATPP "YES")
++    endif()
+   endif()
+ 
+ 
+@@ -48,40 +52,3 @@ if(NOT EXPAT_FOUND)
+ 
+ endif()
+ #mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
+-
+-if(EXPAT_FOUND) # EXPATPP requires EXPAT
+-  find_path(EXPATPP_SYSTEM_INCLUDE_DIR NAMES expatpp.h )
+-  find_library(EXPATPP_SYSTEM_LIBRARY NAMES expatpp libexpatpp )
+-
+-  if( EXPATPP_SYSTEM_INCLUDE_DIR AND EXPATPP_SYSTEM_LIBRARY )
+-    set(VXL_USING_NATIVE_EXPATPP "YES")
+-    set(EXPATPP_LIBRARIES ${EXPATPP_SYSTEM_LIBRARY})
+-    set(EXPATPP_INCLUDE_DIRS ${EXPATPP_SYSTEM_INCLUDE_DIR})
+-  else()
+-    set(VXL_USING_NATIVE_EXPATPP NO)
+-    if(EXISTS ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp/expatpp.h)
+-      set( EXPATPP_FOUND YES )
+-      set( EXPATPP_LIBRARIES expatpp )
+-      set( EXPATPP_LIBRARY expatpp )
+-      set( EXPATPP_INCLUDE_DIRS ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp ${BRL_BINARY_DIR}/b3p/expatpp )
+-      set( EXPATPP_INCLUDE_DIR ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp ${BRL_BINARY_DIR}/b3p/expatpp )
+-      set( EXPATPP_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/contrib/brl/b3p/expatpp)
+-    else()
+-      unset(EXPATPP_SYSTEM_INCLUDE_DIR) #If not found, keep out of cmake window
+-      unset(EXPATPP_SYSTEM_LIBRARY)  # If not found, keep out of cmake window
+-      unset(EXPATPP_LIBRARIES)
+-      unset(EXPATPP_INCLUDE_DIRS)
+-      unset(EXPAT_FOUND)
+-      unset(EXPATPP_FOUND)
+-    endif()
+-  endif()
+-
+-  include(FindPackageHandleStandardArgs)
+-  # FOUND_VAR EXPATPP_FOUND  not supported in cmake 2.8.9
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS( EXPATPP
+-             REQUIRED_VARS EXPATPP_LIBRARY EXPATPP_INCLUDE_DIR
+-             FAIL_MESSAGE "MISSING: "
+-     )
+-endif()
+-mark_as_advanced(EXPATPP_SYSTEM_INCLUDE_DIR EXPATPP_SYSTEM_LIBRARY)
+-mark_as_advanced(EXPATPP_INCLUDE_DIR EXPATPP_LIBRARY)
+diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
+index 637c1ecfa8479088678c34f48ce022c7acd533a2..bb3562f59d7dbb62a6d29e40899528007ac76044 100644
+--- a/contrib/brl/bpro/CMakeLists.txt
++++ b/contrib/brl/bpro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # brl/bpro/CMakeLists.txt
+ # main package for processing operations
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ # Basic process classes
+diff --git a/contrib/brl/bpro/bprb/tests/CMakeLists.txt b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
+index cfb865611a04d59d087f42bd0fda75860a187d6a..954315f1bdde7c70677a36f0403d59d47590e67f 100644
+--- a/contrib/brl/bpro/bprb/tests/CMakeLists.txt
++++ b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
+@@ -1,6 +1,10 @@
+ # brl/bpro/bprb/tests/CMakeLists.txt
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/params.xml
+                 ${CMAKE_CURRENT_BINARY_DIR}/params.xml)
++
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
++
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+ 
+@@ -10,7 +14,7 @@ if(EXPAT_FOUND)
+    test_process_params.cxx
+    bprb_test_process.h bprb_test_process.cxx
+   )
+-  target_link_libraries( bprb_test_all bprb ${VXL_LIB_PREFIX}testlib expat expatpp)
++  target_link_libraries( bprb_test_all bprb ${VXL_LIB_PREFIX}testlib ${EXPAT_LIBRARIES} ${EXPATPP_LIBRARIES})
+ 
+   add_test( NAME bprb_test_process COMMAND $<TARGET_FILE:bprb_test_all> test_process )
+   add_test( NAME bprb_test_process_params COMMAND $<TARGET_FILE:bprb_test_all> test_process_params )
+diff --git a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
+index 013afc8146bbad91ed7599cd054dce44d9596d2b..365ef65b6706cb0c07acc35cfc74fb7df1e4065b 100644
+--- a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # brl/bseg/bbgm/pro/CMakeLists.txt
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..b9ed6f84597c389fad462ebcbba7883f0f8db24e 100644
+--- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     if(EXPATPP_FOUND)
+     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
+index 3c5d70e0c6569aa51761f99782b51b7920e17681..588c0df0c092e5b5b465d656c59cc3a2838bcf20 100644
+--- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
+@@ -4,7 +4,8 @@ project( betr_batch )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+index 76fe0891b77404b40bd3de7617c279376a59a248..7c73fe1bb06a7baca4b0dd42dfd41494f89a485b 100644
+--- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+@@ -9,7 +9,8 @@ if(ZLIB_FOUND)
+ endif()
+ 
+ # bprb depends on expat and bmdl_prodepends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+   if(TIFF_FOUND)
+diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+index f341e59f07f614bf38bee3f41305bbbd46f63653..6e8186a875d8fb3e28a3dd50dea3c527940438a5 100644
+--- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+    if(EXPATPP_FOUND)
+     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
+index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..6a0e5159f4f3ccf9caf6837a87492804cca12da1 100644
+--- a/contrib/brl/bseg/boxm/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ # contrib/brl/bseg/boxm/CMakeLists.txt
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+index 7afa616e35e2cdbb97bb27645f48ec6ed322f091..c821d10a77d9aac7398fe65c2439aece73ca9f5b 100644
+--- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+index 7bb150ce571cbb4b7fa520e15e2b81830dd4b496..112a19f789d109e34272f4134d94657cf29836f0 100644
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and boxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+index f9cf2251e609b78468224384a10206f9d69f6c40..41fe3f9dbdf4a379c5a9b53793a16bbeda07f264 100644
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and bvxm_prodepends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
+index ff6552a58c32238428c1776f77e1189be4f725c8..4c0cd29038a6f396d9a44cb8e3dceed5a1e79c41 100644
+--- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and bvxm_prodepends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
+index 4475e418be3d2475f24e6df71a18319efb242e38..476d43b151b8ea5b44de8573ccc09969664b62ad 100644
+--- a/contrib/brl/bseg/boxm2/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
+@@ -21,7 +21,8 @@ set(boxm2_sources
+     boxm2_blocks_vis_graph.h          boxm2_blocks_vis_graph.cxx
+    )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
+index d87dc359fe443d3ea435abbf720643bf85c11347..94f764c61dca61ec5f96c58735ff9d170a1ac4db 100644
+--- a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
++++ b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <iostream>
+ #include <map>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #include <boxm2/basic/boxm2_block_id.h>
+ #include <boxm2/boxm2_block_metadata.h>
+diff --git a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
+index 963a8a803db514ef1271ae9ff2fce8ef93b8c8e9..b697652f3614d1bf9a757430e443434b16020c95 100644
+--- a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
++++ b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <iostream>
+ #include <map>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #include <boxm2/basic/boxm2_block_id.h>
+ #include <boxm2/boxm2_block_metadata.h>
+diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+index ca91150930212f8265b9ad154f5356beeec7b600..7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a 100644
+--- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm2's Process Library
+ 
+ # bprb depends on expat and boxm2_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
+index 4a640a7120aa6875db5fb297104bc49a6913d086..43fd0d7817e8e193aed8877d0e0d24627d4b20ea 100644
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
++++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
+@@ -32,7 +32,7 @@
+ #include <bmsh3d/algo/bmsh3d_fileio.h>
+ #include <bmsh3d/bmsh3d_mesh_mc.h>
+ #include <vgl/vgl_intersection.h>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #include <boxm2/boxm2_bounding_box_parser.h>
+ 
+ namespace boxm2_ingest_convex_mesh_process_globals
+diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+index 861b960f4d44c92fc900280581cda2b87fce5f0d..24bf5c6f37c5b183ec449df124db4a28d75a8065 100644
+--- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # This is contrib/brl/bseg/boxm2/volm/CMakeLists
+ # volm depends on bkml and expat
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     #depends on OPENCL being found...
+diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+index 6ade9339d001532e1db0e88ccb322d087c6fddf8..bea0c2c32de9a86b55542c642a58e7e34ba07d02 100644
+--- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm2's Process Library
+ 
+ # bprb depends on expat and boxm2_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+index 70e603743b280db75ea9bb006cbf63d867cdd16f..b2282b0c64684ad59b040c602453ce98d89748e1 100644
+--- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+@@ -9,7 +9,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
+ include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
+index c0330db1e2f55a4cf426171ebd6fa101514f2d8b..68ab30dffc882570f04f7c4c34a5066d3b50b04b 100644
+--- a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm2 multi gpu or cpu Process Library
+ 
+ # bprb depends on expat and boxm2_multi_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bseg )
+   set(boxm2_multi_pro_sources
+diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+index 1d57861444e72e66e3ee04c96e496ee4b89b206f..643a44165489692f2ebb91c6c0de4a95f3e28e1c 100644
+--- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+@@ -4,7 +4,8 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
+index b7e3039d7ee534d30de991a7e4aae3f940b7b360..a47356c7845562b5b01ac715b79404e1d4dd50c0 100644
+--- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/brec_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
+index 977d68fdab136cf193f7e712e63bbd607113066a..77205c2e6bb540191efbc2e57e8b53ac719a720a 100644
+--- a/contrib/brl/bseg/bstm/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm/CMakeLists.txt
+@@ -15,7 +15,8 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
+                  bstm_time_block.h bstm_time_block.cxx
+                  bstm_util.cxx bstm_util.h)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bstm/bstm_scene_parser.h b/contrib/brl/bseg/bstm/bstm_scene_parser.h
+index 325aee9239e41f6fe9df5fb1a1252385de5e9e2b..f1b519d12f03da5cf1d2283f57bd96a3e9519456 100644
+--- a/contrib/brl/bseg/bstm/bstm_scene_parser.h
++++ b/contrib/brl/bseg/bstm/bstm_scene_parser.h
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <iostream>
+ #include <map>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #include <bstm/basic/bstm_block_id.h>
+ #include <bstm/bstm_block_metadata.h>
+diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+index c94ddbcc4c159b771d85bb6a81a0e38d77750023..18b5e9c5f8388baa8a6295f41db3353c3718be62 100644
+--- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+@@ -12,7 +12,8 @@ if(DIRECTSHOW_FOUND)
+ endif()
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+index ba8815fe6bef5982f655a3c6f13afefb64743344..1f57d0d9580309206776f921da24dbefeb5b103a 100644
+--- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+@@ -15,7 +15,8 @@ set(bstm_multi_sources
+   space_time_scene_parser.h space_time_scene_parser.hxx
+   )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if (EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
+index 062a2eda8ffa7e9f514d8b801b89b0251bac52d0..c5108c101805a270b30ff359cda5bf1fe705b4f6 100644
+--- a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
++++ b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
+@@ -20,7 +20,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..1f390f966cb5b7451f3598d8c5c474714b2ea76b 100644
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+ # Brown Voxel Processing library for octrees
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
+ #mark_as_advanced( VXL_FORCE_V3P_RPLY )
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+index 96064e507e6e51ffb27075737e54a8e96e3e8f95..bbc90f7cea4993002dfc553aae6130e152c8a849 100644
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ include_directories( ${BRL_INCLUDE_DIR}/bpro )
+ include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+index 25433e56f26dd49fb413480b1aa67a312f9999fb..f3659d539033b7a327e5cb935f54f4771f0a499d 100644
+--- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+ # The kernel-related files for Brown Voxel Processing Library (BVPL)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..615f02e3fa17b3b958a23e0ca9e0d78573265f59 100644
+--- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+ # The kernel-related files for Brown Voxel Processing Library (BVPL)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+index 67cdcf8e00f3541224d581d12ac52d51b07ef7a5..4279f1e47d7046d3dd05c27995a80c0214df7b6b 100644
+--- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # BVPL kenel's related processes
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+index 3f4b2b26bc7893084f77f8e739d5bb7be0224e06..03b7df907e515055f44a100fe8393c4eda71f3bc 100644
+--- a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvpl's Process Library
+ 
+ # bprb depends on expat and bvpl_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+index 90102867454d6308ab766a13d101567562920633..5583214c7bdd0b217693a894a2e84341289899c1 100644
+--- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..3bf956ba6c1c10579869863d828399680ead74b3 100644
+--- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
+index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..6c7b6091a820f956b0d55c1edac7857b09f5b4ac 100644
+--- a/contrib/brl/bseg/bvxm/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
+@@ -38,7 +38,8 @@ set(bvxm_sources
+ aux_source_directory(Templates bvxm_sources)
+ 
+ #find expatpp library for bvxm_world_params parser
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+index 8a1789161dac46c4e0506c32b261527e9542458d..4917b6eb59db38f9e3b48c0a83c4d7cc7843807e 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # bvxm_algo Process Library
+ 
+ # bprb depends on expat and this process library depends on bprb
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+  if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
+index e58cf620f556016a078aa677907da215c078b8e4..d707da04db8df2e4f27585d9c56e91e256ad9569 100644
+--- a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
++++ b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
+@@ -6,7 +6,7 @@
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
+index c2901f9c9087900fb1007b12ed63734c33f401e9..a41c67e51444fea891f31c18367b9dc60ff1c643 100644
+--- a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
+index 5d107edbd15026bc64905da88ec723161a33cbf5..5c6cbc56e49033c280608810e737c214db39d66b 100644
+--- a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+index 58ece0b8d3852237d36db89e868463369dc4502c..ed25993cc7b20d1ae3d6c18bff8b8b05be1f408c 100644
+--- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ if(HAS_GEOTIFF)
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+index b7b0636f29e443a9e02a6354faf204f01c2617e9..efc4aa9b30b7fcfcb69bb4aadb46a988849936c5 100644
+--- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+@@ -8,7 +8,8 @@ if(OPENCL_FOUND)
+   include_directories( ${MUL_INCLUDE_DIR} )
+ 
+   #find expatpp library
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if(EXPAT_FOUND)
+     include_directories( ${EXPAT_INCLUDE_DIR} )
+     include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
+index 26504576be394f4351e7ef1521ab3fff38616003..ed189bccd7ff9a2ca0317b4aa6bd99c18cd5507e 100644
+--- a/contrib/brl/bseg/vcon/CMakeLists.txt
++++ b/contrib/brl/bseg/vcon/CMakeLists.txt
+@@ -4,7 +4,8 @@
+ include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+ if(HAS_GEOTIFF)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     include_directories( ${BRL_INCLUDE_DIR} )
+-- 
+2.21.0
+
diff --git a/0003-v2.0.2-Use-Fedora-minizip.patch b/0003-v2.0.2-Use-Fedora-minizip.patch
index 4ed1c3f..db8230a 100644
--- a/0003-v2.0.2-Use-Fedora-minizip.patch
+++ b/0003-v2.0.2-Use-Fedora-minizip.patch
@@ -1,14 +1,15 @@
-From d356019e2510dc2eb0bcd161fd823561287871dc Mon Sep 17 00:00:00 2001
+From 28d2c2ca3c1ac934b026e733d613cb0c5556a5c3 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 3/4] v2.0.2 Use Fedora minizip
+Subject: [PATCH 3/8] v2.0.2 Use Fedora minizip
 
 ---
- contrib/brl/b3p/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
+ contrib/brl/b3p/CMakeLists.txt                                | 4 ----
+ .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 3 ++-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7fefd89f41..b2f4b5f6bd 100644
+index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..b2f4b5f6bdb4ed0cbbde6459cb201578a1823a5d 100644
 --- a/contrib/brl/b3p/CMakeLists.txt
 +++ b/contrib/brl/b3p/CMakeLists.txt
 @@ -19,7 +19,3 @@ add_subdirectory(expatpp)
@@ -19,6 +20,20 @@ index 7fefd89f41..b2f4b5f6bd 100644
 -add_subdirectory(minizip)
 -
 -
+diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
+index 7a907be4a4d50c58e8cc77495b03f031419b798d..6580049493239b513796127f225ece807e8f9a90 100644
+--- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
++++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
+@@ -37,7 +37,8 @@
+ #include <vul/vul_file.h>
+ 
+ #if HAS_ZLIB
+-#include <minizip/zip.h>
++#include <zip.h>
++#include <zlib.h>
+ #endif
+ 
+ #define WRITEBUFFERSIZE (16384)
 -- 
 2.21.0
 
diff --git a/0004-v2.0.2-Correct-dcmtk-includes.patch b/0004-v2.0.2-Correct-dcmtk-includes.patch
deleted file mode 100644
index 60a3167..0000000
--- a/0004-v2.0.2-Correct-dcmtk-includes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From d91d374811c2ecbb442607eaf0962669a4f741d9 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Thu, 15 Nov 2018 15:46:28 +0000
-Subject: [PATCH 4/4] v2.0.2 Correct dcmtk includes
-
----
- core/vil/file_formats/vil_dicom.cxx        | 14 +++++++-------
- core/vil/file_formats/vil_dicom_stream.cxx |  2 +-
- core/vil/file_formats/vil_dicom_stream.h   |  2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/core/vil/file_formats/vil_dicom.cxx b/core/vil/file_formats/vil_dicom.cxx
-index 482d6b7a3369d91a82e0ec77a9663b20a3399378..ab7398cac693ec34e472570825d0821c90b23b56 100644
---- a/core/vil/file_formats/vil_dicom.cxx
-+++ b/core/vil/file_formats/vil_dicom.cxx
-@@ -27,13 +27,13 @@
- #include <vil/vil_pixel_format.h>
- #include <vil/vil_exception.h>
- 
--#include <dcfilefo.h>
--#include <dcmetinf.h>
--#include <dcdatset.h>
--#include <dctagkey.h>
--#include <dcdeftag.h>
--#include <dcstack.h>
--#include <diinpxt.h>
-+#include <dcmtk/dcmdata/dcfilefo.h>
-+#include <dcmtk/dcmdata/dcmetinf.h>
-+#include <dcmtk/dcmdata/dcdatset.h>
-+#include <dcmtk/dcmdata/dctagkey.h>
-+#include <dcmtk/dcmdata/dcdeftag.h>
-+#include <dcmtk/dcmdata/dcstack.h>
-+#include <dcmtk/dcmimgle/diinpxt.h>
- 
- #include "vil_dicom_stream.h"
- //
-diff --git a/core/vil/file_formats/vil_dicom_stream.cxx b/core/vil/file_formats/vil_dicom_stream.cxx
-index f30ce5849eec05666fe6d81128b210542e56567a..ccc601d5db717b07a696f1804d3341ec3b4ceafa 100644
---- a/core/vil/file_formats/vil_dicom_stream.cxx
-+++ b/core/vil/file_formats/vil_dicom_stream.cxx
-@@ -4,7 +4,7 @@
- 
- #include "vil_dicom_stream.h"
- #include <vil/vil_stream.h>
--#include <dcerror.h>
-+#include <dcmtk/dcmdata/dcerror.h>
- 
- #include <cassert>
- #ifdef _MSC_VER
-diff --git a/core/vil/file_formats/vil_dicom_stream.h b/core/vil/file_formats/vil_dicom_stream.h
-index 79a639639a2bb1f627820bb508b358643b7405a9..14a765b6f6766e9dcdd7a50f92c681f473b77ae8 100644
---- a/core/vil/file_formats/vil_dicom_stream.h
-+++ b/core/vil/file_formats/vil_dicom_stream.h
-@@ -4,7 +4,7 @@
- // \file
- // \author Amitha Perera
- 
--#include <dcistrma.h>
-+#include <dcmtk/dcmdata/dcistrma.h>
- 
- class vil_stream;
- 
--- 
-2.21.0
-
diff --git a/0004-v2.0.2-Version-shared-objects.patch b/0004-v2.0.2-Version-shared-objects.patch
index f49c7e6..d6bd949 100644
--- a/0004-v2.0.2-Version-shared-objects.patch
+++ b/0004-v2.0.2-Version-shared-objects.patch
@@ -1,17 +1,17 @@
-From 83b49ba071e1298267db2422e9e8c387e19dbdec Mon Sep 17 00:00:00 2001
+From e1e1aab38d7328eb616facea21a3cfeb6b2c26c3 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 18 Apr 2019 22:11:41 +0100
-Subject: [PATCH 4/4] v2.0.2 Version shared objects
+Subject: [PATCH 4/8] v2.0.2 Version shared objects
 
 ---
- CMakeLists.txt | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 230de81825..2452dd5536 100644
+index dfc509d8fcd380991655331445baca4bcae2d94d..0748a6c7371b1fb8ff390f7c465d47f383c0868f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,10 +46,17 @@ foreach(p
+@@ -46,13 +46,19 @@ foreach(p
  endforeach()
  
  project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
@@ -19,6 +19,9 @@ index 230de81825..2452dd5536 100644
      DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
      LANGUAGES CXX C)
  
+-
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
+ 
 +SET(VXL_MAJOR_VERSION 2)
 +SET(VXL_MINOR_VERSION 0)
 +SET(VXL_BUILD_VERSION 2)
diff --git a/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch b/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
new file mode 100644
index 0000000..850d031
--- /dev/null
+++ b/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
@@ -0,0 +1,120 @@
+From aacd92f275ad6f78c8d13441e33baf36161318e6 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 14:11:31 +0100
+Subject: [PATCH 5/8] v2.0.2 Add cmake module to find RPLY
+
+---
+ CMakeLists.txt                                |  3 +-
+ config/cmake/fedora-modules/FindRPLY.cmake    | 39 +++++++++++++++++++
+ contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |  2 +-
+ contrib/brl/bseg/boxm/algo/CMakeLists.txt     |  2 +-
+ contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |  2 +-
+ .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |  2 +-
+ 6 files changed, 45 insertions(+), 5 deletions(-)
+ create mode 100644 config/cmake/fedora-modules/FindRPLY.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0748a6c7371b1fb8ff390f7c465d47f383c0868f..dfd9187aa0dab595d943629ecb1fe49c6f25094b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,7 +120,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
+ 
+ # Location of VXL's FindXXX.cmake CMake modules.
+ # This is identical to VXL_CMAKE_DIR.  Perhaps we should eliminate MODULE_PATH?
+-set( MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/config/cmake/Modules CACHE STATIC "VXL module path" )
++set( MODULE_PATH "${CMAKE_SOURCE_DIR}/config/cmake/Modules" CACHE PATH "VXL module path" )
++set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
+ 
+ # Options to add extra compiler and linker flags
+ #
+diff --git a/config/cmake/fedora-modules/FindRPLY.cmake b/config/cmake/fedora-modules/FindRPLY.cmake
+new file mode 100644
+index 0000000000000000000000000000000000000000..abe415bd9e1e392e242753df7053f8ae8a4b43ac
+--- /dev/null
++++ b/config/cmake/fedora-modules/FindRPLY.cmake
+@@ -0,0 +1,39 @@
++# Adapted from https://github.com/jirihnidek/verse-ply-uploader/blob/master/build_files/cmake/modules/FindRPLY.cmake
++# This module tries to find RPLY library and include files
++#
++# RPLY_INCLUDE_DIR, where to find verse.h
++# RPLY_LIBRARY_DIR, where to find libverse.so
++# RPLY_LIBRARIES, the library to link against
++# RPLY_FOUND, IF false, do not try to use Verse
++#
++
++FIND_PATH ( RPLY_INCLUDE_DIR rply.h
++    /usr/include
++    /usr/include/rply
++    /usr/local/include
++    /usr/local/include/rply
++)
++
++FIND_LIBRARY ( RPLY_LIBRARIES rply
++    /usr/local/lib
++    /usr/local/lib64
++    /usr/lib
++    /usr/lib64
++)
++
++GET_FILENAME_COMPONENT( RPLY_LIBRARY_DIR ${RPLY_LIBRARIES} PATH )
++
++SET ( RPLY_FOUND "NO" )
++IF ( RPLY_INCLUDE_DIR )
++    IF ( RPLY_LIBRARIES )
++        SET ( RPLY_LIBRARY ${RPLY_LIBRARIES} )
++        SET ( RPLY_FOUND "YES" )
++    ENDIF ( RPLY_LIBRARIES )
++ENDIF ( RPLY_INCLUDE_DIR )
++
++MARK_AS_ADVANCED (
++    RPLY_LIBRARY_DIR
++    RPLY_INCLUDE_DIR
++    RPLY_LIBRARIES
++    RPLY_LIBRARY
++)
+diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+index 662ec284e92840ebbcc0b3fc53eeab4561a7f3b8..1c2e6a70890f7556e387a6446cbb2af764c8907a 100644
+--- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
++++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # This is bbas/bmsh3d/algo/CMakeLists.txt
+ # Brown 3D Mesh Algorithm Library
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR} )
+ include_directories( ${RPLY_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+index 4714624fa3f1b30ecc5b99278b8782402d18f64d..16694fbbc4c2608c650a8f14d8d75e4da8de817e 100644
+--- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # brl/bseg/boxm/algo/CMakeLists.txt
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ include_directories( ${MUL_INCLUDE_DIR} )
+ include_directories( ${RPLY_INCLUDE_DIR} )
+ set(boxm_algo_sources
+diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
+index fff9ae2d8404c5631564eddc30c48cae8a69ffc0..d7ef6ed5fa345edf70cc5d2074fba2aed5f2d23f 100644
+--- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR}/bseg )
+ include_directories( ${RPLY_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+index c3ed4ed27d4d08902f8b56d158bb89539df76a93..19763fbd71ca8ee9071483e8ad3a86db8450f852 100644
+--- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR}/bseg )
+ include_directories( ${MUL_INCLUDE_DIR} )
+-- 
+2.21.0
+
diff --git a/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch b/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
new file mode 100644
index 0000000..ed20699
--- /dev/null
+++ b/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
@@ -0,0 +1,34 @@
+From a7c248224fed9685df171325ed39c7c3664a2158 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 16:16:56 +0100
+Subject: [PATCH 6/8] v2.0.2 bbas-baio Update function arguments in declaration
+
+---
+ contrib/brl/bbas/baio/baio_unix.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/brl/bbas/baio/baio_unix.cxx b/contrib/brl/bbas/baio/baio_unix.cxx
+index e8af7199f23f25cf09b4c3359690999ca27fd1ed..98fc11027683356a1e57514aafbe63e269b5b9da 100644
+--- a/contrib/brl/bbas/baio/baio_unix.cxx
++++ b/contrib/brl/bbas/baio/baio_unix.cxx
+@@ -34,7 +34,7 @@ baio::~baio()
+ }
+ 
+ //: Opens and reads file asynchronously
+-bool baio::read(std::string filename, char* buff, long BUFSIZE)
++bool baio::read(const std::string& filename, char* buff, long BUFSIZE)
+ {
+   // 1. call c open to get standard file handle
+   int fhandle = open(filename.c_str(), O_RDONLY);
+@@ -68,7 +68,7 @@ bool baio::read(std::string filename, char* buff, long BUFSIZE)
+ }
+ 
+ //: opens and writes file asynchronously
+-bool baio::write(std::string filename, char* buff, long BUFSIZE)
++bool baio::write(const std::string& filename, char* buff, long BUFSIZE)
+ {
+   // 1. call c open to get standard file handle
+   int fhandle = open(filename.c_str(), O_WRONLY | O_CREAT, 0666);
+-- 
+2.21.0
+
diff --git a/0007-v2.0.2-fix-bkml-test.patch b/0007-v2.0.2-fix-bkml-test.patch
new file mode 100644
index 0000000..8f6cdd6
--- /dev/null
+++ b/0007-v2.0.2-fix-bkml-test.patch
@@ -0,0 +1,58 @@
+From bfe8cdb20353b83e3e231fa72e2199e4d716d4cf Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 17:05:39 +0100
+Subject: [PATCH 7/8] v2.0.2 fix bkml test
+
+---
+ contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
+ contrib/brl/bbas/bkml/tests/CMakeLists.txt | 20 ++++++++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
+index bb6a65f96d9e2184fbd477d28ab24e6d111d4713..e34211b0f692353b23819618f38c3ef88544c1cc 100644
+--- a/contrib/brl/bbas/bkml/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/CMakeLists.txt
+@@ -6,6 +6,7 @@ set(bkml_sources
+ )
+ 
+ FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bkml/tests/CMakeLists.txt b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
+index 84c36469a492c95f87f3e766bcc95d7878b4f0aa..9eddec1f6657e6584883c5a7a6f885f1446ea4a9 100644
+--- a/contrib/brl/bbas/bkml/tests/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
+@@ -1,12 +1,24 @@
+ # This is contrib/brl/bbas/bkml/tests/CMakeLists.txt
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ add_executable(bkml_test_all
+                 test_driver.cxx
+                 test_bkml.cxx
+               )
+ 
+-target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
+-add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
++if(EXPAT_FOUND)
++  if(EXPATPP_FOUND)
++    target_link_libraries(bkml_test_all bkml expatpp expat ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
++    add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
+ 
+-add_executable(bkml_test_include test_include.cxx )
+-target_link_libraries( bkml_test_include bkml )
++    add_executable(bkml_test_include test_include.cxx )
++    target_link_libraries( bkml_test_include bkml expatpp expat)
++  endif()
++else()
++  target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
++  add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
++
++  add_executable(bkml_test_include test_include.cxx )
++  target_link_libraries( bkml_test_include bkml )
++endif()
+-- 
+2.21.0
+
diff --git a/0008-v2.0.2-Correct-rply-includedir.patch b/0008-v2.0.2-Correct-rply-includedir.patch
new file mode 100644
index 0000000..80c6ac4
--- /dev/null
+++ b/0008-v2.0.2-Correct-rply-includedir.patch
@@ -0,0 +1,137 @@
+From 6a863547324024a17eca177eb73def5a7cd8aeb9 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 23:32:15 +0100
+Subject: [PATCH 8/8] v2.0.2 Correct rply includedir
+
+---
+ contrib/brl/bbas/bvrml/pro/CMakeLists.txt      | 8 +++++++-
+ contrib/brl/bbas/bwm/exe/CMakeLists.txt        | 8 +++++++-
+ contrib/brl/bbas/volm/pro/CMakeLists.txt       | 8 +++++++-
+ contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt  | 7 +++++++
+ contrib/brl/bseg/boxm2/pro/CMakeLists.txt      | 7 +++++++
+ contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt | 7 +++++++
+ 6 files changed, 42 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
+index c1c82d0dd47a4e9f0a20f40d2d84bea93ab3fb15..3a82f2e0506f010264418129369366358da6f0c8 100644
+--- a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
+@@ -4,7 +4,13 @@ if (HAS_GEOTIFF)
+ include_directories( ${BRL_INCLUDE_DIR}/bpro )
+ include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+ include_directories( ${BRL_INCLUDE_DIR}/bbas )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
++  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
+ 
+ set(bvrml_pro_sources
+     bvrml_processes.h
+diff --git a/contrib/brl/bbas/bwm/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
+index 4b642eb2324183d68fd5c7783c80d57974632a42..43de7db5df610855d3d2ce3b9630231a28c3e028 100644
+--- a/contrib/brl/bbas/bwm/exe/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
+@@ -1,7 +1,13 @@
+ # This is brl/bbas/bwm/exe/CMakeLists.txt
+ # World Modeling GUI executables
+ 
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
++  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
++
+ include_directories( ${MUL_INCLUDE_DIR} )
+ include_directories( ${OXL_INCLUDE_DIR} )
+ 
+diff --git a/contrib/brl/bbas/volm/pro/CMakeLists.txt b/contrib/brl/bbas/volm/pro/CMakeLists.txt
+index 76c1216a4f91c61a9354ca8dc6cb490c63306e9c..aa028ca71f081ea5db5ffd17f27ee67b3d228d29 100644
+--- a/contrib/brl/bbas/volm/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/volm/pro/CMakeLists.txt
+@@ -4,7 +4,13 @@ if(VXL_BUILD_RPL)
+ include_directories( ${BRL_INCLUDE_DIR}/bbas )
+ include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+ include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply)
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
++  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
+ 
+   # The N-dimensional bin structure implementations use rpl/rsdl
+ 
+diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+index c821d10a77d9aac7398fe65c2439aece73ca9f5b..2a41c2db1aefe27fe538a16db4be4b9bfdd58bdf 100644
+--- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+@@ -3,13 +3,20 @@
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+ FIND_PACKAGE(EXPAT REQUIRED)
+ FIND_PACKAGE(EXPATPP REQUIRED)
++
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+   include_directories( ${BRL_INCLUDE_DIR}/bseg )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
+   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
+ 
+   set(boxm_algo_pro_sources
+       boxm_algo_processes.h
+diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+index 7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a..0536e327fdeb5ad650047ec038f77e1fcb3de1f0 100644
+--- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+@@ -11,7 +11,14 @@ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bbas )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
+   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
++
+ 
+   set(boxm2_pro_sources
+       boxm2_processes.h
+diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+index bea0c2c32de9a86b55542c642a58e7e34ba07d02..f19374be806992b72f7bfe0b57967d567b8086b2 100644
+--- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+@@ -11,7 +11,14 @@ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bbas )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
+   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
++
+ if(OPENCL_FOUND)
+   include_directories( ${OPENCL_INCLUDE_PATH} )
+   set( BOXM2_VOLM_PRO_LIBS boxm2_ocl)
+-- 
+2.21.0
+
diff --git a/0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch b/0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
deleted file mode 100644
index 9b5c090..0000000
--- a/0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From f5f4f002e47ce541d8020cd2ae3203bf1b08b9f7 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:54:20 +0200
-Subject: [PATCH 15/23] Manage KL library (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/gel/CMakeLists.txt         |  2 ++
- contrib/gel/vgel/kl/CMakeLists.txt | 46 ++++++++++++++++++++++----------------
- 2 files changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/contrib/gel/CMakeLists.txt b/contrib/gel/CMakeLists.txt
-index d9284db..d605337 100644
---- a/contrib/gel/CMakeLists.txt
-+++ b/contrib/gel/CMakeLists.txt
-@@ -4,6 +4,8 @@ PROJECT( gel )
- 
- doxygen_add_package(contrib/gel "GE Libraries")
- 
-+SET( GEL_MODULE_PATH ${vxl_SOURCE_DIR}/contrib/gel/gelmods )
-+
- SET( GEL_INCLUDE_DIR ${gel_SOURCE_DIR} CACHE STATIC "GE package include files" )
- SET( GEL_INSTALL_INCLUDE_DIR 
-   ${CMAKE_INSTALL_PREFIX}/include/vxl/contrib/gel
-diff --git a/contrib/gel/vgel/kl/CMakeLists.txt b/contrib/gel/vgel/kl/CMakeLists.txt
-index bbb86ed..986fe44 100644
---- a/contrib/gel/vgel/kl/CMakeLists.txt
-+++ b/contrib/gel/vgel/kl/CMakeLists.txt
-@@ -1,26 +1,34 @@
- # gel/vgel/kl/CMakeLists.txt
- 
--SET(vgel_kl_sources
--                      base.h
-- convolve.c           convolve.h
-- klt.c                klt.h
-- pnmio.c              pnmio.h
-- selectGoodFeatures.c
-- trackFeatures.c
-- error.c              error.h
-- klt_util.c           klt_util.h
-- pyramid.c            pyramid.h
-- storeFeatures.c
-- writeFeatures.c
--)
-+INCLUDE(${MODULE_PATH}/FindKL.cmake)
- 
--ADD_LIBRARY(vgel_kl ${vgel_kl_sources})
--INSTALL_TARGETS(/lib vgel_kl)
--INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
-+IF(NOT VXL_USING_NATIVE_KL)
-+    INCLUDE(${GEL_MODULE_PATH}/FindKL.cmake)
- 
--IF(UNIX)
--  TARGET_LINK_LIBRARIES(vgel_kl m)
--ENDIF(UNIX)
-+    INCLUDE_DIRECTORIES(${KL_INCLUDE_DIR})
-+
-+    SET( vgel_kl_sources
-+                          base.h
-+     convolve.c           convolve.h
-+     klt.c                klt.h
-+     pnmio.c              pnmio.h
-+     selectGoodFeatures.c
-+     trackFeatures.c
-+     error.c              error.h
-+     klt_util.c           klt_util.h
-+     pyramid.c            pyramid.h
-+     storeFeatures.c
-+     writeFeatures.c
-+    )
-+
-+    ADD_LIBRARY(vgel_kl ${vgel_kl_sources})
-+    INSTALL_TARGETS(/lib vgel_kl)
-+    INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
-+
-+    IF(UNIX)
-+      TARGET_LINK_LIBRARIES(vgel_kl m)
-+    ENDIF(UNIX)
-+ENDIF(NOT VXL_USING_NATIVE_KL)
- 
- IF( BUILD_TESTING )
-   SUBDIRS(tests)
--- 
-1.7.11.7
-
diff --git a/0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch b/0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
deleted file mode 100644
index 783b02d..0000000
--- a/0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b2b3a2da18579c9f6cc6849eded94fd57aadadc2 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:55:13 +0200
-Subject: [PATCH 16/23] Manage KL library 2/2 (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/gel/gelmods/FindKL.cmake  | 30 ++++++++++++++++++++++++
- contrib/gel/gelmods/FindKL2.cmake | 49 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 79 insertions(+)
- create mode 100644 contrib/gel/gelmods/FindKL.cmake
- create mode 100644 contrib/gel/gelmods/FindKL2.cmake
-
-diff --git a/contrib/gel/gelmods/FindKL.cmake b/contrib/gel/gelmods/FindKL.cmake
-new file mode 100644
-index 0000000..e79e485
---- /dev/null
-+++ b/contrib/gel/gelmods/FindKL.cmake
-@@ -0,0 +1,30 @@
-+# - Find KL library
-+# Find the native KL includes and library
-+# This module defines
-+#  KL_INCLUDE_DIR, where to find klt.h, etc.
-+#  KL_LIBRARIES, libraries to link against to use KL.
-+#  KL_FOUND, If false, do not try to use KL.
-+# also defined, but not for general use are
-+#  KL_LIBRARY, where to find the KL library.
-+
-+FIND_PATH( KL_INCLUDE_DIR klt.h
-+  /usr/include
-+  /usr/include/klt
-+  /usr/local/include
-+)
-+
-+SET( KL_NAMES ${KL_NAMES} klt )
-+FIND_LIBRARY( KL_LIBRARY
-+  NAMES ${KL_NAMES}
-+  PATHS /usr/lib
-+    /usr/lib64
-+    /usr/local/lib
-+)
-+
-+SET( KL_FOUND "NO" )
-+IF( KL_INCLUDE_DIR )
-+    IF( KL_LIBRARY )
-+        SET( KL_FOUND "YES" )
-+        SET( KL_LIBRARIES ${KL_LIBRARY} )
-+    ENDIF( KL_LIBRARY )
-+ENDIF( KL_INCLUDE_DIR )
-diff --git a/contrib/gel/gelmods/FindKL2.cmake b/contrib/gel/gelmods/FindKL2.cmake
-new file mode 100644
-index 0000000..daffa59
---- /dev/null
-+++ b/contrib/gel/gelmods/FindKL2.cmake
-@@ -0,0 +1,49 @@
-+#
-+# Find a KL library
-+#
-+# This file is used to manage using either a natively provided KL library or the one in v3p if provided.
-+#
-+#
-+# As per the standard scheme the following definitions are used
-+# KL_INCLUDE_DIR - where to find geotiff.h
-+# KL_LIBRARIES   - the set of libraries to include to use KL.
-+# KL_FOUND       - TRUE, if available somewhere on the system.
-+
-+# Additionally
-+# VXL_USING_NATIVE_KL  - True if we are using a KL library provided outside vxl (or v3p)
-+
-+
-+# If this FORCE variable is unset or is FALSE, try to find a native library.
-+IF( VXL_FORCE_V3P_KL )
-+ELSE( VXL_FORCE_V3P_KL )
-+  INCLUDE( ${MODULE_PATH}/NewCMake/FindKL.cmake )
-+ENDIF( VXL_FORCE_V3P_KL )
-+
-+  
-+IF(KL_FOUND)
-+
-+  SET(VXL_USING_NATIVE_KL "YES")
-+
-+ELSE(KL_FOUND)
-+
-+  #
-+  # At some point, in a "release" version, it is possible that someone
-+  # will not have the v3p geotiff library, so make sure the headers
-+  # exist.
-+  #
-+  
-+  IF(EXISTS ${vxl_SOURCE_DIR}/contrib/gel/vgel/kl/klt.h)
-+    # Use FIND_PATH here to allow the user to set the path to IGNORE
-+    # to disable geotiff support.
-+    FIND_PATH(KL_INCLUDE_DIR klt.h
-+      ${vxl_SOURCE_DIR}/v3p/geotiff
-+    )
-+    IF( KL_INCLUDE_DIR )
-+      SET( KL_FOUND "YES" )
-+      SET( KL_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_DIR}/include/vxl/v3p/geotiff)
-+      SET( KL_LIBRARIES geotiff )
-+    ENDIF( KL_INCLUDE_DIR )
-+  
-+  ENDIF(EXISTS ${vxl_SOURCE_DIR}/v3p/geotiff/geotiff.h)
-+  
-+ENDIF(KL_FOUND)
--- 
-1.7.11.7
-
diff --git a/0019-Removed-box2m-which-requires-OpenCL-libraries.patch b/0019-Removed-box2m-which-requires-OpenCL-libraries.patch
deleted file mode 100644
index b3355a3..0000000
--- a/0019-Removed-box2m-which-requires-OpenCL-libraries.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aefaa1d2e0e621d7f3ef2ea420c92bd0c0f29e64 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:40:49 +0100
-Subject: [PATCH 19/23] Removed box2m which requires OpenCL libraries
-
----
- contrib/brl/bseg/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/brl/bseg/CMakeLists.txt b/contrib/brl/bseg/CMakeLists.txt
-index b0e3a56..31ea0b5 100644
---- a/contrib/brl/bseg/CMakeLists.txt
-+++ b/contrib/brl/bseg/CMakeLists.txt
-@@ -48,10 +48,10 @@ SUBDIRS(boct)
- SUBDIRS(boxm)
- 
- # updated, gpu compatible octree based modeling
--SUBDIRS(boxm2)
-+#SUBDIRS(boxm2)
- 
- # updated, gpu compatible octree based modeling
--SUBDIRS(boxm2_batch)
-+#SUBDIRS(boxm2_batch)
- 
- # octree based modeling python interface
- SUBDIRS(boxm_batch)
-@@ -72,4 +72,4 @@ SUBDIRS(bapl)
- SUBDIRS(boxm_bridge)
- 
- #multi gpu library
--SUBDIRS(boxm2_multi)
-+#SUBDIRS(boxm2_multi)
--- 
-1.7.11.7
-
diff --git a/0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch b/0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
deleted file mode 100644
index 00ecf6a..0000000
--- a/0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 347dc1b1fe80c9b24a728b142698738f8b6dced2 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:47:07 +0100
-Subject: [PATCH 21/23] Use expatpp.h which is provided by fedora repos
-
----
- contrib/brl/bbas/bvgl/bvgl_labelme_parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-index 5740677..bded971 100644
---- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-+++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-@@ -2,7 +2,7 @@
- #ifndef bvgl_labelme_parser_h_
- #define bvgl_labelme_parser_h_
- 
--#include <expatpplib.h>
-+#include <expatpp.h>
- #include <vcl_string.h>
- #include <vcl_sstream.h>
- #include <vgl/vgl_polygon.h>
--- 
-1.7.11.7
-
diff --git a/0022-Include-missing-vcl_cstdio.h-header.patch b/0022-Include-missing-vcl_cstdio.h-header.patch
deleted file mode 100644
index 98ae0af..0000000
--- a/0022-Include-missing-vcl_cstdio.h-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ec88b62f858fd9c03dd58d18d4f52d4f1e9aa784 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:48:14 +0100
-Subject: [PATCH 22/23] Include missing vcl_cstdio.h header
-
----
- contrib/brl/bbas/volm/volm_io.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/brl/bbas/volm/volm_io.cxx b/contrib/brl/bbas/volm/volm_io.cxx
-index 07e695f..02964fb 100755
---- a/contrib/brl/bbas/volm/volm_io.cxx
-+++ b/contrib/brl/bbas/volm/volm_io.cxx
-@@ -11,6 +11,7 @@
- #include <bsol/bsol_algs.h>
- #include <vcl_iostream.h>
- #include <vcl_iomanip.h>
-+#include <vcl_cstdio.h>
- 
- //:
- // \file
--- 
-1.7.11.7
-
diff --git a/0025-Legacy-def1-r35963.patch b/0025-Legacy-def1-r35963.patch
deleted file mode 100644
index c857dc0..0000000
--- a/0025-Legacy-def1-r35963.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 849fcbd56d9e55a59608ea1df8da82dcb5dbeb68
-Author: peter_vanroose <peter_vanroose@4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a>
-Date:   Wed Nov 14 13:42:48 2012 +0000
-
-    added back in the vnl_math_* functions, now as #defines to their vnl_math::* counterparts in the "real" vnl_math namespace
-    
-    git-svn-id: https://svn.code.sf.net/p/vxl/svn/trunk@35963 4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a
-
-diff --git a/core/vnl/vnl_math.h b/core/vnl/vnl_math.h
-index c458dae..adb5fb4 100644
---- a/core/vnl/vnl_math.h
-+++ b/core/vnl/vnl_math.h
-@@ -659,4 +659,24 @@ namespace vnl_math
- 
- } // end of namespace vnl_math
- 
-+// Legacy definitions, for backward compatibility:
-+#define vnl_math_isnan vnl_math::isnan
-+#define vnl_math_isinf vnl_math::isinf
-+#define vnl_math_isfinite vnl_math::isfinite
-+#define vnl_math_rnd_halfinttoeven vnl_math::rnd_halfinttoeven
-+#define vnl_math_rnd_halfintup vnl_math::rnd_halfintup
-+#define vnl_math_rnd vnl_math::rnd
-+#define vnl_math_floor vnl_math::floor
-+#define vnl_math_ceil vnl_math::ceil
-+#define vnl_math_abs vnl_math::abs
-+#define vnl_math_max vnl_math::max
-+#define vnl_math_min vnl_math::min
-+#define vnl_math_sqr vnl_math::sqr
-+#define vnl_math_cube vnl_math::cube
-+#define vnl_math_sgn vnl_math::sgn
-+#define vnl_math_sgn0 vnl_math::sgn0
-+#define vnl_math_squared_magnitude vnl_math::squared_magnitude
-+#define vnl_math_cuberoot vnl_math::cuberoot
-+#define vnl_math_hypot vnl_math::hypot
-+
- #endif // vnl_math_h_
diff --git a/0026-Legacy-def2-r36001.patch b/0026-Legacy-def2-r36001.patch
deleted file mode 100644
index d687ed3..0000000
--- a/0026-Legacy-def2-r36001.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 528908a1663fc7e38ee8d7e426cd31853039679b
-Author: peter_vanroose <peter_vanroose@4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a>
-Date:   Fri Nov 16 12:43:57 2012 +0000
-
-    moved the backward compatibility #defines (vnl_math_floor etc. for vnl_math::floor etc.) inside #if VNL_CONFIG_LEGACY_METHODS; switching that option on will additionally trigger a "deprecated" compile warning
-    
-    git-svn-id: https://svn.code.sf.net/p/vxl/svn/trunk@36001 4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a
-
-diff --git a/core/vnl/vnl_math.h b/core/vnl/vnl_math.h
-index adb5fb4..34af06b 100644
---- a/core/vnl/vnl_math.h
-+++ b/core/vnl/vnl_math.h
-@@ -35,6 +35,7 @@
- //   Amitha Perera - 13 Sep 2002 - make constant initialization standards compliant.
- //   Peter Vanroose -22 Oct 2012 - was a class, now is a namespace
- //                                 also renamed functions vnl_math_isnan etc. to vnl_math::isnan
-+//   Peter Vanroose -15 Nov 2012 - the deprecated vnl_math_* #defines are now only available when VNL_CONFIG_LEGACY_METHODS==1
- // \endverbatim
- 
- #include <vcl_cmath.h>
-@@ -44,6 +45,9 @@
- #ifdef VNL_CHECK_FPU_ROUNDING_MODE
- # include <vcl_cassert.h>
- #endif
-+#if VNL_CONFIG_LEGACY_METHODS
-+# include <vcl_deprecated.h>
-+#endif
- 
- // Figure out when the fast implementation can be used
- #if VNL_CONFIG_ENABLE_SSE2_ROUNDING
-@@ -659,7 +663,7 @@ namespace vnl_math
- 
- } // end of namespace vnl_math
- 
--// Legacy definitions, for backward compatibility:
-+#if VNL_CONFIG_LEGACY_METHODS // Legacy definitions, for backward compatibility; deprecated!
- #define vnl_math_isnan vnl_math::isnan
- #define vnl_math_isinf vnl_math::isinf
- #define vnl_math_isfinite vnl_math::isfinite
-@@ -678,5 +682,6 @@ namespace vnl_math
- #define vnl_math_squared_magnitude vnl_math::squared_magnitude
- #define vnl_math_cuberoot vnl_math::cuberoot
- #define vnl_math_hypot vnl_math::hypot
-+#endif // VNL_CONFIG_LEGACY_METHODS
- 
- #endif // vnl_math_h_
diff --git a/vxl-1.17.0-secondary.patch b/vxl-1.17.0-secondary.patch
deleted file mode 100644
index 39e7e6e..0000000
--- a/vxl-1.17.0-secondary.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up vxl-git4e07960/core/vil/vil_round.h.secondary vxl-git4e07960/core/vil/vil_round.h
---- vxl-git4e07960/core/vil/vil_round.h.secondary	2012-12-05 08:23:37.072384920 -0500
-+++ vxl-git4e07960/core/vil/vil_round.h	2012-12-05 08:24:06.682385737 -0500
-@@ -25,9 +25,8 @@
- # endif
- #endif
- 
--// Turn on fast impl when using GCC on Intel-based machines with the following exception:
--//   PPC with Mac OS X
--#if defined(__GNUC__) && (!defined(__APPLE__)  || !defined(__ppc__) )
-+// Turn on fast impl when using GCC on Intel-based machines
-+#if defined(__GNUC__) && (defined(__i386__)  || defined(__x86_64__) )
- # define GCC_USE_FAST_IMPL 1
- #else
- # define GCC_USE_FAST_IMPL 0
-diff -up vxl-git4e07960/core/vnl/vnl_math.h.secondary vxl-git4e07960/core/vnl/vnl_math.h
---- vxl-git4e07960/core/vnl/vnl_math.h.secondary	2012-12-05 08:12:25.282386747 -0500
-+++ vxl-git4e07960/core/vnl/vnl_math.h	2012-12-05 08:13:05.142387632 -0500
-@@ -53,9 +53,8 @@
- #   include <emmintrin.h> // sse 2 intrinsics
- # endif
- #endif
--// Turn on fast impl when using GCC on Intel-based machines with the following exception:
--//   PPC with Mac OS X
--#if defined(__GNUC__) && (!defined(__APPLE__)  || !defined(__ppc__) )
-+// Turn on fast impl when using GCC on Intel-based machines
-+#if defined(__GNUC__) && (defined(__i386__)  || defined(__x86_64__))
- # define GCC_USE_FAST_IMPL 1
- #else
- # define GCC_USE_FAST_IMPL 0
diff --git a/vxl.spec b/vxl.spec
index 5dc9192..a9a068d 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -13,30 +13,20 @@ Source0:    %{name}-%{version}-clean.tar.gz
 
 # Patches generated from tree here:
 # https://github.com/sanjayankur31/vxl/tree/fedora-v2.0.2
-# Use system rply and don't use mpeg2
+# use system rply and don't use mpeg2
 Patch1:     0001-v2.0.2-unbundle-rply.patch
-Patch2:     0002-v2.0.2-Use-Fedora-FindEXPAT.patch
+Patch2:     0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
 Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
 # Submitted upstream https://github.com/vxl/vxl/pull/626
-Patch4:   0004-v2.0.2-Version-shared-objects.patch
-# Patch15:    0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch
-# Patch16:    0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch
+Patch4:     0004-v2.0.2-Version-shared-objects.patch
+Patch5:     0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
+Patch6:     0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
+Patch7:     0007-v2.0.2-fix-bkml-test.patch
+Patch8:     0008-v2.0.2-Correct-rply-includedir.patch
 # Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
-# Patch20:    0020-Included-missing-vcl_cstdio.h-header.patch
-# Patch21:    0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch
-# Patch22:    0022-Include-missing-vcl_cstdio.h-header.patch
 # Patch23:    0023-Remove-volm-because-of-error-in-function-prototype.patch
-# Patch25:    0025-Legacy-def1-r35963.patch
-# Patch26:    0026-Legacy-def2-r36001.patch
-
-
-# Patch50:    vxl-0.17.0-gcc5.diff
-# Patch51:    vxl-1.17.0-gcc6.patch
-
-# Patch100:   %{name}-1.17.0-secondary.patch
-
-#KL is used in an "UNMAINTAINED_LIBRARY", vgel is only built on request
 
+# Patch100:   %%{name}-1.17.0-secondary.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -50,7 +40,6 @@ BuildRequires:  git
 # Use bundled dcmtk until upstream updates their code to use newer dcmtk
 # https://github.com/vxl/vxl/issues/550
 # BuildRequires:  dcmtk-devel
-BuildRequires:  klt-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXmu-devel
@@ -65,7 +54,10 @@ BuildRequires:  minizip-devel
 # Does not build with latest version
 # https://github.com/vxl/vxl/issues/627
 # BuildRequires:  openjpeg2-devel
-BuildRequires:  python3-devel
+
+# Py2 only from the looks of it
+# BuildRequires:  python3-devel
+
 BuildRequires:  rply-devel
 BuildRequires:  SIMVoleon-devel
 BuildRequires:  shapelib-devel
@@ -147,7 +139,6 @@ done
 
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DVXL_USE_GEOTIFF:BOOL=ON \
     -DVXL_FORCE_B3P_EXPAT:BOOL=OFF \
@@ -166,14 +157,19 @@ done
     -DVXL_USING_NATIVE_GEOTIFF:BOOL=ON \
     -DVXL_USING_NATIVE_EXPAT:BOOL=ON \
     -DVXL_USING_NATIVE_EXPATPP:BOOL=ON \
+    -DVXL_USING_NATIVE_SHAPELIB:BOOL=ON \
     -DVXL_USING_NATIVE_BZLIB2:BOOL=ON \
     -DVXL_BUILD_VGUI:BOOL=OFF \
     -DVXL_BUILD_BGUI3D:BOOL=OFF \
     -DVXL_BUILD_OXL:BOOL=ON \
     -DVXL_BUILD_BRL:BOOL=ON \
-    -DVXL_BUILD_BRL_PYTHON:BOOL=ON \
+    -DVXL_BUILD_BRL_PYTHON:BOOL=OFF \
     -DVXL_BUILD_GEL:BOOL=ON \
+    -DVXL_BUILD_PRIP:BOOL=ON \
+    -DVXL_BUILD_CONVERSIONS:BOOL=ON \
+    -DVXL_BUILD_CUL:BOOL=ON \
     -DVXL_BUILD_RPL:BOOL=ON \
+    -DVXL_BUILD_CONTRIB:BOOL=ON \
     -DVXL_BUILD_CORE_GEOMETRY:BOOL=ON \
     -DVXL_BUILD_CORE_IMAGING:BOOL=ON \
     -DVXL_BUILD_CORE_NUMERICS:BOOL=ON \
@@ -186,14 +182,13 @@ done
     -DVXL_BUILD_DOCUMENTATION:BOOL=ON \
     -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
     -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
-    -DEXPATPP_INCLUDE_DIR:PATH=%{_includedir} \
-    -DEXPATPP_LIBRARY:PATH=%{_libdir}/libexpatpp.so \
     -DVNL_CONFIG_LEGACY_METHODS:BOOL=ON .
 
 
 
+# -DEXPATPP_INCLUDE_DIR:PATH=%%{_includedir} \
+# -DEXPATPP_LIBRARY:PATH=%%{_libdir}/libexpatpp.so \
 # -DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
-# Why is expat stated, but not shapelib?
 # DCMDK Cmake -- Included in bundle, but why?
 #BUILD_VGUI? NO, it depends on box2m which in turns relies on OPENCL which is not available in FEDORA
 #wxwidgets seems to be found
@@ -204,13 +199,24 @@ done
 %install
 %make_install
 
+# Stray file installed in a random location
+rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
+
 %check
-ctest .
+# 5/985 fail:
+# 713 - bil_algo_test_detect_ridges (SEGFAULT)
+# 781 - bkml_test_bkml (Child aborted)
+# 801 - volm_test_candidate_region_parser (Child aborted)
+# 967 - vifa_test_int_faces_attr (Child aborted)
+# 968 - vifa_test_int_faces_adj_attr (Child aborted)
+
+ctest . || exit 0
 
 %ldconfig_scriptlets
 
 %files
 %doc core/vxl_copyright.h
+%{_bindir}/octree
 %{_libdir}/libclipper.so.2.0
 %{_libdir}/libtestlib.so.2.0
 %{_libdir}/libvcl.so.2.0
@@ -273,6 +279,378 @@ ctest .
 %{_libdir}/libvpgl_algo.so.2.0.2
 %{_libdir}/libvpgl_xio.so.2.0.2
 %{_libdir}/libvul.so.2.0.2
+%{_libdir}/libbaio.so.2.0
+%{_libdir}/libbaio.so.2.0.2
+%{_libdir}/libbaml.so.2.0
+%{_libdir}/libbaml.so.2.0.2
+%{_libdir}/libbapl.so.2.0
+%{_libdir}/libbapl.so.2.0.2
+%{_libdir}/libbapl_io.so.2.0
+%{_libdir}/libbapl_io.so.2.0.2
+%{_libdir}/libbapl_pro.so.2.0
+%{_libdir}/libbapl_pro.so.2.0.2
+%{_libdir}/libbbas_pro.so.2.0
+%{_libdir}/libbbas_pro.so.2.0.2
+%{_libdir}/libbbgm.so.2.0
+%{_libdir}/libbbgm.so.2.0.2
+%{_libdir}/libbbgm_pro.so.2.0
+%{_libdir}/libbbgm_pro.so.2.0.2
+%{_libdir}/libbcvr.so.2.0
+%{_libdir}/libbcvr.so.2.0.2
+%{_libdir}/libbdgl.so.2.0
+%{_libdir}/libbdgl.so.2.0.2
+%{_libdir}/libbdpg.so.2.0
+%{_libdir}/libbdpg.so.2.0.2
+%{_libdir}/libbetr.so.2.0
+%{_libdir}/libbetr.so.2.0.2
+%{_libdir}/libbetr_pro.so.2.0
+%{_libdir}/libbetr_pro.so.2.0.2
+%{_libdir}/libbgrl.so.2.0
+%{_libdir}/libbgrl.so.2.0.2
+%{_libdir}/libbgrl2.so.2.0
+%{_libdir}/libbgrl2.so.2.0.2
+%{_libdir}/libbgrl2_algo.so.2.0
+%{_libdir}/libbgrl2_algo.so.2.0.2
+%{_libdir}/libbil.so.2.0
+%{_libdir}/libbil.so.2.0.2
+%{_libdir}/libbil_algo.so.2.0
+%{_libdir}/libbil_algo.so.2.0.2
+%{_libdir}/libbjson.so.2.0
+%{_libdir}/libbjson.so.2.0.2
+%{_libdir}/libbkml.so.2.0
+%{_libdir}/libbkml.so.2.0.2
+%{_libdir}/libbmdl.so.2.0
+%{_libdir}/libbmdl.so.2.0.2
+%{_libdir}/libbmdl_pro.so.2.0
+%{_libdir}/libbmdl_pro.so.2.0.2
+%{_libdir}/libbmsh3d.so.2.0
+%{_libdir}/libbmsh3d.so.2.0.2
+%{_libdir}/libbmsh3d_algo.so.2.0
+%{_libdir}/libbmsh3d_algo.so.2.0.2
+%{_libdir}/libbmsh3d_pro.so.2.0
+%{_libdir}/libbmsh3d_pro.so.2.0.2
+%{_libdir}/libbnabo.so.2.0
+%{_libdir}/libbnabo.so.2.0.2
+%{_libdir}/libbnl.so.2.0
+%{_libdir}/libbnl.so.2.0.2
+%{_libdir}/libbnl_algo.so.2.0
+%{_libdir}/libbnl_algo.so.2.0.2
+%{_libdir}/libboct.so.2.0
+%{_libdir}/libboct.so.2.0.2
+%{_libdir}/libboxm.so.2.0
+%{_libdir}/libboxm.so.2.0.2
+%{_libdir}/libboxm2.so.2.0
+%{_libdir}/libboxm2.so.2.0.2
+%{_libdir}/libboxm2_basic.so.2.0
+%{_libdir}/libboxm2_basic.so.2.0.2
+%{_libdir}/libboxm2_class.so.2.0
+%{_libdir}/libboxm2_class.so.2.0.2
+%{_libdir}/libboxm2_cpp.so.2.0
+%{_libdir}/libboxm2_cpp.so.2.0.2
+%{_libdir}/libboxm2_cpp_algo.so.2.0
+%{_libdir}/libboxm2_cpp_algo.so.2.0.2
+%{_libdir}/libboxm2_cpp_pro.so.2.0
+%{_libdir}/libboxm2_cpp_pro.so.2.0.2
+%{_libdir}/libboxm2_io.so.2.0
+%{_libdir}/libboxm2_io.so.2.0.2
+%{_libdir}/libboxm2_pro.so.2.0
+%{_libdir}/libboxm2_pro.so.2.0.2
+%{_libdir}/libboxm2_util.so.2.0
+%{_libdir}/libboxm2_util.so.2.0.2
+%{_libdir}/libboxm2_vecf.so.2.0
+%{_libdir}/libboxm2_vecf.so.2.0.2
+%{_libdir}/libboxm2_volm.so.2.0
+%{_libdir}/libboxm2_volm.so.2.0.2
+%{_libdir}/libboxm2_volm_conf.so.2.0
+%{_libdir}/libboxm2_volm_conf.so.2.0.2
+%{_libdir}/libboxm2_volm_desc.so.2.0
+%{_libdir}/libboxm2_volm_desc.so.2.0.2
+%{_libdir}/libboxm2_volm_io.so.2.0
+%{_libdir}/libboxm2_volm_io.so.2.0.2
+%{_libdir}/libboxm2_volm_pro.so.2.0
+%{_libdir}/libboxm2_volm_pro.so.2.0.2
+%{_libdir}/libboxm_algo.so.2.0
+%{_libdir}/libboxm_algo.so.2.0.2
+%{_libdir}/libboxm_algo_pro.so.2.0
+%{_libdir}/libboxm_algo_pro.so.2.0.2
+%{_libdir}/libboxm_algo_rt.so.2.0
+%{_libdir}/libboxm_algo_rt.so.2.0.2
+%{_libdir}/libboxm_algo_rt_pro.so.2.0
+%{_libdir}/libboxm_algo_rt_pro.so.2.0.2
+%{_libdir}/libboxm_algo_sp.so.2.0
+%{_libdir}/libboxm_algo_sp.so.2.0.2
+%{_libdir}/libboxm_algo_sp_pro.so.2.0
+%{_libdir}/libboxm_algo_sp_pro.so.2.0.2
+%{_libdir}/libboxm_algo_tests.so.2.0
+%{_libdir}/libboxm_algo_tests.so.2.0.2
+%{_libdir}/libboxm_basic.so.2.0
+%{_libdir}/libboxm_basic.so.2.0.2
+%{_libdir}/libboxm_pro.so.2.0
+%{_libdir}/libboxm_pro.so.2.0.2
+%{_libdir}/libboxm_sample.so.2.0
+%{_libdir}/libboxm_sample.so.2.0.2
+%{_libdir}/libboxm_sample_algo.so.2.0
+%{_libdir}/libboxm_sample_algo.so.2.0.2
+%{_libdir}/libboxm_tests.so.2.0
+%{_libdir}/libboxm_tests.so.2.0.2
+%{_libdir}/libboxm_util.so.2.0
+%{_libdir}/libboxm_util.so.2.0.2
+%{_libdir}/libbpgl.so.2.0
+%{_libdir}/libbpgl.so.2.0.2
+%{_libdir}/libbpgl_algo.so.2.0
+%{_libdir}/libbpgl_algo.so.2.0.2
+%{_libdir}/libbprb.so.2.0
+%{_libdir}/libbprb.so.2.0.2
+%{_libdir}/libbrad.so.2.0
+%{_libdir}/libbrad.so.2.0.2
+%{_libdir}/libbrad_io.so.2.0
+%{_libdir}/libbrad_io.so.2.0.2
+%{_libdir}/libbrad_pro.so.2.0
+%{_libdir}/libbrad_pro.so.2.0.2
+%{_libdir}/libbrdb.so.2.0
+%{_libdir}/libbrdb.so.2.0.2
+%{_libdir}/libbrec.so.2.0
+%{_libdir}/libbrec.so.2.0.2
+%{_libdir}/libbrec_pro.so.2.0
+%{_libdir}/libbrec_pro.so.2.0.2
+%{_libdir}/libbreg3d.so.2.0
+%{_libdir}/libbreg3d.so.2.0.2
+%{_libdir}/libbreg3d_pro.so.2.0
+%{_libdir}/libbreg3d_pro.so.2.0.2
+%{_libdir}/libbrip.so.2.0
+%{_libdir}/libbrip.so.2.0.2
+%{_libdir}/libbrip_pro.so.2.0
+%{_libdir}/libbrip_pro.so.2.0.2
+%{_libdir}/libbsgm.so.2.0
+%{_libdir}/libbsgm.so.2.0.2
+%{_libdir}/libbsgm_pro.so.2.0
+%{_libdir}/libbsgm_pro.so.2.0.2
+%{_libdir}/libbsl.so.2.0
+%{_libdir}/libbsl.so.2.0.2
+%{_libdir}/libbsol.so.2.0
+%{_libdir}/libbsol.so.2.0.2
+%{_libdir}/libbsta.so.2.0
+%{_libdir}/libbsta.so.2.0.2
+%{_libdir}/libbsta_algo.so.2.0
+%{_libdir}/libbsta_algo.so.2.0.2
+%{_libdir}/libbsta_io.so.2.0
+%{_libdir}/libbsta_io.so.2.0.2
+%{_libdir}/libbsta_pro.so.2.0
+%{_libdir}/libbsta_pro.so.2.0.2
+%{_libdir}/libbsta_vis.so.2.0
+%{_libdir}/libbsta_vis.so.2.0.2
+%{_libdir}/libbstm.so.2.0
+%{_libdir}/libbstm.so.2.0.2
+%{_libdir}/libbstm_basic.so.2.0
+%{_libdir}/libbstm_basic.so.2.0.2
+%{_libdir}/libbstm_cpp_algo.so.2.0
+%{_libdir}/libbstm_cpp_algo.so.2.0.2
+%{_libdir}/libbstm_cpp_pro.so.2.0
+%{_libdir}/libbstm_cpp_pro.so.2.0.2
+%{_libdir}/libbstm_io.so.2.0
+%{_libdir}/libbstm_io.so.2.0.2
+%{_libdir}/libbstm_multi.so.2.0
+%{_libdir}/libbstm_multi.so.2.0.2
+%{_libdir}/libbstm_multi_basic.so.2.0
+%{_libdir}/libbstm_multi_basic.so.2.0.2
+%{_libdir}/libbstm_multi_io.so.2.0
+%{_libdir}/libbstm_multi_io.so.2.0.2
+%{_libdir}/libbstm_pro.so.2.0
+%{_libdir}/libbstm_pro.so.2.0.2
+%{_libdir}/libbstm_util.so.2.0
+%{_libdir}/libbstm_util.so.2.0.2
+%{_libdir}/libbsvg.so.2.0
+%{_libdir}/libbsvg.so.2.0.2
+%{_libdir}/libbsvg_pro.so.2.0
+%{_libdir}/libbsvg_pro.so.2.0.2
+%{_libdir}/libbtol.so.2.0
+%{_libdir}/libbtol.so.2.0.2
+%{_libdir}/libbugl.so.2.0
+%{_libdir}/libbugl.so.2.0.2
+%{_libdir}/libbundler.so.2.0
+%{_libdir}/libbundler.so.2.0.2
+%{_libdir}/libbvgl.so.2.0
+%{_libdir}/libbvgl.so.2.0.2
+%{_libdir}/libbvgl_algo.so.2.0
+%{_libdir}/libbvgl_algo.so.2.0.2
+%{_libdir}/libbvgl_pro.so.2.0
+%{_libdir}/libbvgl_pro.so.2.0.2
+%{_libdir}/libbvpl.so.2.0
+%{_libdir}/libbvpl.so.2.0.2
+%{_libdir}/libbvpl_functors.so.2.0
+%{_libdir}/libbvpl_functors.so.2.0.2
+%{_libdir}/libbvpl_kernels.so.2.0
+%{_libdir}/libbvpl_kernels.so.2.0.2
+%{_libdir}/libbvpl_kernels_io.so.2.0
+%{_libdir}/libbvpl_kernels_io.so.2.0.2
+%{_libdir}/libbvpl_kernels_pro.so.2.0
+%{_libdir}/libbvpl_kernels_pro.so.2.0.2
+%{_libdir}/libbvpl_octree.so.2.0
+%{_libdir}/libbvpl_octree.so.2.0.2
+%{_libdir}/libbvpl_octree_io.so.2.0
+%{_libdir}/libbvpl_octree_io.so.2.0.2
+%{_libdir}/libbvpl_octree_pro.so.2.0
+%{_libdir}/libbvpl_octree_pro.so.2.0.2
+%{_libdir}/libbvpl_octree_sample.so.2.0
+%{_libdir}/libbvpl_octree_sample.so.2.0.2
+%{_libdir}/libbvpl_octree_tests_util.so.2.0
+%{_libdir}/libbvpl_octree_tests_util.so.2.0.2
+%{_libdir}/libbvpl_pro.so.2.0
+%{_libdir}/libbvpl_pro.so.2.0.2
+%{_libdir}/libbvpl_util.so.2.0
+%{_libdir}/libbvpl_util.so.2.0.2
+%{_libdir}/libbvpl_util_io.so.2.0
+%{_libdir}/libbvpl_util_io.so.2.0.2
+%{_libdir}/libbvrml.so.2.0
+%{_libdir}/libbvrml.so.2.0.2
+%{_libdir}/libbvrml_pro.so.2.0
+%{_libdir}/libbvrml_pro.so.2.0.2
+%{_libdir}/libbvxm.so.2.0
+%{_libdir}/libbvxm.so.2.0.2
+%{_libdir}/libbvxm_algo.so.2.0
+%{_libdir}/libbvxm_algo.so.2.0.2
+%{_libdir}/libbvxm_algo_pro.so.2.0
+%{_libdir}/libbvxm_algo_pro.so.2.0.2
+%{_libdir}/libbvxm_grid.so.2.0
+%{_libdir}/libbvxm_grid.so.2.0.2
+%{_libdir}/libbvxm_grid_io.so.2.0
+%{_libdir}/libbvxm_grid_io.so.2.0.2
+%{_libdir}/libbvxm_grid_pro.so.2.0
+%{_libdir}/libbvxm_grid_pro.so.2.0.2
+%{_libdir}/libbvxm_io.so.2.0
+%{_libdir}/libbvxm_io.so.2.0.2
+%{_libdir}/libbvxm_pro.so.2.0
+%{_libdir}/libbvxm_pro.so.2.0.2
+%{_libdir}/libbwm_video.so.2.0
+%{_libdir}/libbwm_video.so.2.0.2
+%{_libdir}/libbxml.so.2.0
+%{_libdir}/libbxml.so.2.0.2
+%{_libdir}/libclsfy.so.2.0
+%{_libdir}/libclsfy.so.2.0.2
+%{_libdir}/libdepth_map.so.2.0
+%{_libdir}/libdepth_map.so.2.0.2
+%{_libdir}/libfhs.so.2.0
+%{_libdir}/libfhs.so.2.0.2
+%{_libdir}/libgeml.so.2.0
+%{_libdir}/libgeml.so.2.0.2
+%{_libdir}/libgevd.so.2.0
+%{_libdir}/libgevd.so.2.0.2
+%{_libdir}/libgmvl.so.2.0
+%{_libdir}/libgmvl.so.2.0.2
+%{_libdir}/libgst.so.2.0
+%{_libdir}/libgst.so.2.0.2
+%{_libdir}/libgtrl.so.2.0
+%{_libdir}/libgtrl.so.2.0.2
+%{_libdir}/libicam.so.2.0
+%{_libdir}/libicam.so.2.0.2
+%{_libdir}/libicam_pro.so.2.0
+%{_libdir}/libicam_pro.so.2.0.2
+%{_libdir}/libihog.so.2.0
+%{_libdir}/libihog.so.2.0.2
+%{_libdir}/libihog_pro.so.2.0
+%{_libdir}/libihog_pro.so.2.0.2
+%{_libdir}/libimesh.so.2.0
+%{_libdir}/libimesh.so.2.0.2
+%{_libdir}/libimesh_algo.so.2.0
+%{_libdir}/libimesh_algo.so.2.0.2
+%{_libdir}/libipts.so.2.0
+%{_libdir}/libipts.so.2.0.2
+%{_libdir}/libm23d.so.2.0
+%{_libdir}/libm23d.so.2.0.2
+%{_libdir}/libmbl.so.2.0
+%{_libdir}/libmbl.so.2.0.2
+%{_libdir}/libmcal.so.2.0
+%{_libdir}/libmcal.so.2.0.2
+%{_libdir}/libmfpf.so.2.0
+%{_libdir}/libmfpf.so.2.0.2
+%{_libdir}/libmipa.so.2.0
+%{_libdir}/libmipa.so.2.0.2
+%{_libdir}/libmmn.so.2.0
+%{_libdir}/libmmn.so.2.0.2
+%{_libdir}/libmsdi.so.2.0
+%{_libdir}/libmsdi.so.2.0.2
+%{_libdir}/libmsm.so.2.0
+%{_libdir}/libmsm.so.2.0.2
+%{_libdir}/libmsm_utils.so.2.0
+%{_libdir}/libmsm_utils.so.2.0.2
+%{_libdir}/libmvl.so.2.0
+%{_libdir}/libmvl.so.2.0.2
+%{_libdir}/libmvl2.so.2.0
+%{_libdir}/libmvl2.so.2.0.2
+%{_libdir}/libosl.so.2.0
+%{_libdir}/libosl.so.2.0.2
+%{_libdir}/libouel.so.2.0
+%{_libdir}/libouel.so.2.0.2
+%{_libdir}/libouml.so.2.0
+%{_libdir}/libouml.so.2.0.2
+%{_libdir}/liboxl_vrml.so.2.0
+%{_libdir}/liboxl_vrml.so.2.0.2
+%{_libdir}/libpdf1d.so.2.0
+%{_libdir}/libpdf1d.so.2.0.2
+%{_libdir}/librgrl.so.2.0
+%{_libdir}/librgrl.so.2.0.2
+%{_libdir}/librrel.so.2.0
+%{_libdir}/librrel.so.2.0.2
+%{_libdir}/librsdl.so.2.0
+%{_libdir}/librsdl.so.2.0.2
+%{_libdir}/libsdet.so.2.0
+%{_libdir}/libsdet.so.2.0.2
+%{_libdir}/libsdet_pro.so.2.0
+%{_libdir}/libsdet_pro.so.2.0.2
+%{_libdir}/libvcon_pro.so.2.0
+%{_libdir}/libvcon_pro.so.2.0.2
+%{_libdir}/libvdgl.so.2.0
+%{_libdir}/libvdgl.so.2.0.2
+%{_libdir}/libvdtop.so.2.0
+%{_libdir}/libvdtop.so.2.0.2
+%{_libdir}/libvepl.so.2.0
+%{_libdir}/libvepl.so.2.0.2
+%{_libdir}/libvidl_pro.so.2.0
+%{_libdir}/libvidl_pro.so.2.0.2
+%{_libdir}/libvifa.so.2.0
+%{_libdir}/libvifa.so.2.0.2
+%{_libdir}/libvil3d.so.2.0
+%{_libdir}/libvil3d.so.2.0.2
+%{_libdir}/libvil3d_algo.so.2.0
+%{_libdir}/libvil3d_algo.so.2.0.2
+%{_libdir}/libvil3d_io.so.2.0
+%{_libdir}/libvil3d_io.so.2.0.2
+%{_libdir}/libvil_pro.so.2.0
+%{_libdir}/libvil_pro.so.2.0.2
+%{_libdir}/libvimt.so.2.0
+%{_libdir}/libvimt.so.2.0.2
+%{_libdir}/libvimt3d.so.2.0
+%{_libdir}/libvimt3d.so.2.0.2
+%{_libdir}/libvimt_algo.so.2.0
+%{_libdir}/libvimt_algo.so.2.0.2
+%{_libdir}/libvipl.so.2.0
+%{_libdir}/libvipl.so.2.0.2
+%{_libdir}/libvmal.so.2.0
+%{_libdir}/libvmal.so.2.0.2
+%{_libdir}/libvmap.so.2.0
+%{_libdir}/libvmap.so.2.0.2
+%{_libdir}/libvolm.so.2.0
+%{_libdir}/libvolm.so.2.0.2
+%{_libdir}/libvolm_conf.so.2.0
+%{_libdir}/libvolm_conf.so.2.0.2
+%{_libdir}/libvolm_desc.so.2.0
+%{_libdir}/libvolm_desc.so.2.0.2
+%{_libdir}/libvolm_pro.so.2.0
+%{_libdir}/libvolm_pro.so.2.0.2
+%{_libdir}/libvpdfl.so.2.0
+%{_libdir}/libvpdfl.so.2.0.2
+%{_libdir}/libvpgl_pro.so.2.0
+%{_libdir}/libvpgl_pro.so.2.0.2
+%{_libdir}/libvpyr.so.2.0
+%{_libdir}/libvpyr.so.2.0.2
+%{_libdir}/libvsol.so.2.0
+%{_libdir}/libvsol.so.2.0.2
+%{_libdir}/libvsph.so.2.0
+%{_libdir}/libvsph.so.2.0.2
+%{_libdir}/libvtol.so.2.0
+%{_libdir}/libvtol.so.2.0.2
+%{_libdir}/libvtol_algo.so.2.0
+%{_libdir}/libvtol_algo.so.2.0.2
 # Bundles
 %{_libdir}/libopenjpeg2.so.2.0
 %{_libdir}/libopenjpeg2.so.2.0.0
@@ -311,12 +689,207 @@ ctest .
 %{_libdir}/libvnl.so
 %{_libdir}/libvpgl_algo.so
 %{_libdir}/libvpgl.so
+%{_libdir}/libmipa.so
+%{_libdir}/libmfpf.so
+%{_libdir}/libmcal.so
+%{_libdir}/libmbl.so
+%{_libdir}/libm23d.so
+%{_libdir}/libipts.so
+%{_libdir}/libimesh_algo.so
+%{_libdir}/libimesh.so
+%{_libdir}/libihog_pro.so
+%{_libdir}/libihog.so
+%{_libdir}/libicam_pro.so
+%{_libdir}/libicam.so
+%{_libdir}/libgst.so
+%{_libdir}/libgmvl.so
+%{_libdir}/libgevd.so
+%{_libdir}/libgtrl.so
+%{_libdir}/libgeml.so
+%{_libdir}/libfhs.so
+%{_libdir}/libdepth_map.so
+%{_libdir}/libclsfy.so
+%{_libdir}/libbxml.so
+%{_libdir}/libbwm_video.so
+%{_libdir}/libbvxm_pro.so
+%{_libdir}/libbvxm_io.so
+%{_libdir}/libbvxm_grid_pro.so
+%{_libdir}/libbvxm_grid_io.so
+%{_libdir}/libbvxm_grid.so
+%{_libdir}/libbvxm_algo_pro.so
+%{_libdir}/libbvxm_algo.so
+%{_libdir}/libbvxm.so
+%{_libdir}/libbvrml_pro.so
+%{_libdir}/libbvrml.so
+%{_libdir}/libbvpl_util_io.so
+%{_libdir}/libbvpl_util.so
+%{_libdir}/libbvpl_pro.so
+%{_libdir}/libbvpl_octree_tests_util.so
+%{_libdir}/libbvpl_octree_sample.so
+%{_libdir}/libbvpl_octree_pro.so
+%{_libdir}/libbvpl_octree_io.so
+%{_libdir}/libbvpl_octree.so
+%{_libdir}/libbvpl_kernels_pro.so
+%{_libdir}/libbvpl_kernels_io.so
+%{_libdir}/libbvpl_kernels.so
+%{_libdir}/libbvpl_functors.so
+%{_libdir}/libbvpl.so
 %{_libdir}/libvsl.so
+%{_libdir}/libbvgl_pro.so
+%{_libdir}/libbvgl_algo.so
+%{_libdir}/libbvgl.so
+%{_libdir}/libbundler.so
+%{_libdir}/libbugl.so
+%{_libdir}/libbtol.so
+%{_libdir}/libbsvg_pro.so
+%{_libdir}/libbsvg.so
+%{_libdir}/libbstm_util.so
+%{_libdir}/libbstm_pro.so
+%{_libdir}/libbstm_multi_io.so
+%{_libdir}/libbstm_multi_basic.so
+%{_libdir}/libbstm_multi.so
+%{_libdir}/libbstm_io.so
+%{_libdir}/libbstm_cpp_pro.so
+%{_libdir}/libbstm_cpp_algo.so
+%{_libdir}/libbstm_basic.so
+%{_libdir}/libbstm.so
+%{_libdir}/libbsta_vis.so
+%{_libdir}/libbsta_pro.so
+%{_libdir}/libbsta_io.so
+%{_libdir}/libbsta_algo.so
+%{_libdir}/libbsta.so
+%{_libdir}/libbsol.so
+%{_libdir}/libbsl.so
+%{_libdir}/libbsgm_pro.so
+%{_libdir}/libbsgm.so
+%{_libdir}/libbrip_pro.so
+%{_libdir}/libbrip.so
+%{_libdir}/libbreg3d_pro.so
+%{_libdir}/libbreg3d.so
+%{_libdir}/libbrec_pro.so
+%{_libdir}/libbrec.so
+%{_libdir}/libbrdb.so
+%{_libdir}/libbrad_pro.so
+%{_libdir}/libbrad_io.so
+%{_libdir}/libbrad.so
+%{_libdir}/libbprb.so
+%{_libdir}/libbpgl_algo.so
+%{_libdir}/libbpgl.so
+%{_libdir}/libboxm_util.so
+%{_libdir}/libboxm_tests.so
+%{_libdir}/libboxm_sample_algo.so
+%{_libdir}/libboxm_sample.so
+%{_libdir}/libboxm_pro.so
+%{_libdir}/libboxm_basic.so
+%{_libdir}/libboxm_algo_tests.so
+%{_libdir}/libboxm_algo_sp_pro.so
+%{_libdir}/libboxm_algo_sp.so
+%{_libdir}/libboxm_algo_rt_pro.so
+%{_libdir}/libboxm_algo_rt.so
+%{_libdir}/libboxm_algo_pro.so
+%{_libdir}/libboxm_algo.so
+%{_libdir}/libboxm2_volm_pro.so
+%{_libdir}/libboxm2_volm_io.so
+%{_libdir}/libboxm2_volm_conf.so
+%{_libdir}/libboxm2_volm.so
+%{_libdir}/libboxm2_vecf.so
+%{_libdir}/libboxm2_util.so
+%{_libdir}/libboxm2_pro.so
+%{_libdir}/libboxm2_io.so
+%{_libdir}/libboxm2_cpp_pro.so
+%{_libdir}/libboxm2_cpp_algo.so
+%{_libdir}/libboxm2_cpp.so
+%{_libdir}/libboxm2_class.so
+%{_libdir}/libboxm2_basic.so
+%{_libdir}/libboxm2.so
+%{_libdir}/libboxm.so
+%{_libdir}/libboct.so
+%{_libdir}/libbnl_algo.so
+%{_libdir}/libbnl.so
+%{_libdir}/libbnabo.so
+%{_libdir}/libbmsh3d_pro.so
+%{_libdir}/libbmsh3d_algo.so
+%{_libdir}/libboxm2_volm_desc.so
+%{_libdir}/libbmsh3d.so
+%{_libdir}/libbmdl_pro.so
+%{_libdir}/libbmdl.so
+%{_libdir}/libbkml.so
+%{_libdir}/libbjson.so
+%{_libdir}/libbil_algo.so
+%{_libdir}/libbil.so
+%{_libdir}/libbgrl2_algo.so
+%{_libdir}/libbgrl2.so
+%{_libdir}/libbgrl.so
+%{_libdir}/libbetr_pro.so
+%{_libdir}/libbetr.so
+%{_libdir}/libbdpg.so
+%{_libdir}/libbdgl.so
+%{_libdir}/libbcvr.so
+%{_libdir}/libbbgm_pro.so
+%{_libdir}/libbbgm.so
+%{_libdir}/libbbas_pro.so
+%{_libdir}/libbapl_pro.so
+%{_libdir}/libbapl_io.so
+%{_libdir}/libbapl.so
+%{_libdir}/libbaml.so
+%{_libdir}/libbaio.so
+%{_libdir}/libmmn.so
+%{_libdir}/libmsdi.so
+%{_libdir}/libmsm.so
+%{_libdir}/libmsm_utils.so
+%{_libdir}/libmvl.so
+%{_libdir}/libmvl2.so
+%{_libdir}/libosl.so
+%{_libdir}/libouel.so
+%{_libdir}/libouml.so
+%{_libdir}/liboxl_vrml.so
+%{_libdir}/libpdf1d.so
+%{_libdir}/librgrl.so
+%{_libdir}/librrel.so
+%{_libdir}/librsdl.so
+%{_libdir}/libsdet.so
+%{_libdir}/libsdet_pro.so
+%{_libdir}/libvcon_pro.so
+%{_libdir}/libvdgl.so
+%{_libdir}/libvdtop.so
+%{_libdir}/libvepl.so
+%{_libdir}/libvidl_pro.so
+%{_libdir}/libvifa.so
+%{_libdir}/libvil3d.so
+%{_libdir}/libvil3d_algo.so
+%{_libdir}/libvil3d_io.so
+%{_libdir}/libvil_pro.so
+%{_libdir}/libvimt.so
+%{_libdir}/libvimt3d.so
+%{_libdir}/libvimt_algo.so
+%{_libdir}/libvipl.so
+%{_libdir}/libvmal.so
+%{_libdir}/libvmap.so
+%{_libdir}/libvolm.so
+%{_libdir}/libvolm_conf.so
+%{_libdir}/libvolm_desc.so
+%{_libdir}/libvolm_pro.so
+%{_libdir}/libvpdfl.so
+%{_libdir}/libvpgl_pro.so
+%{_libdir}/libvpyr.so
+%{_libdir}/libvsol.so
+%{_libdir}/libvsph.so
+%{_libdir}/libvtol.so
+%{_libdir}/libvtol_algo.so
 
 %files doc
 %doc %{_docdir}/*
 
 %changelog
+* Fri Apr 26 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
+- Add complete file list
+- Remove no longer needed BR: klt
+- Remove more unneeded patches
+- Add patch to include FindRPLY.cmake
+- Use system shapelib and expat
+- More patches to complete build
+- Document failing tests, do not let them fail build
+
 * Fri Apr 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
 - Enable OUL---why was it disabled?
 - Remove rply include patch: build seems to find it just fine.

From ac36540f2d5eacbcbc764d27677c42e6611ed385 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 28 May 2019 11:18:50 +0100
Subject: [PATCH 33/74] Fix builds on 32 bit arches

---
 ...nditional-compilation-was-exactly-wr.patch | 103 ++++++++++++++++++
 vxl.spec                                      |  26 +++--
 2 files changed, 117 insertions(+), 12 deletions(-)
 create mode 100644 0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch

diff --git a/0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch b/0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
new file mode 100644
index 0000000..a61aeab
--- /dev/null
+++ b/0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
@@ -0,0 +1,103 @@
+From c3fd27959f51e0469a7a6075e975f245ac306f3d Mon Sep 17 00:00:00 2001
+From: Hans Johnson <hans-johnson@uiowa.edu>
+Date: Thu, 29 Nov 2018 14:11:12 -0600
+Subject: [PATCH] BUG:  Logic for conditional compilation was exactly wrong
+
+---
+ core/vsl/Templates/vsl_vector_io+int_64-.cxx | 2 +-
+ core/vsl/vsl_binary_explicit_io.h            | 4 ++--
+ core/vsl/vsl_binary_io.cxx                   | 2 +-
+ core/vsl/vsl_binary_io.h                     | 2 +-
+ core/vsl/vsl_block_binary.cxx                | 2 +-
+ core/vsl/vsl_block_binary.h                  | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/core/vsl/Templates/vsl_vector_io+int_64-.cxx b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
+index fcdafc0270..02c7a13c36 100644
+--- a/core/vsl/Templates/vsl_vector_io+int_64-.cxx
++++ b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
+@@ -1,6 +1,6 @@
+ #include <vxl_config.h>
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ #include <vsl/vsl_vector_io.hxx>
+ VSL_VECTOR_IO_INSTANTIATE(vxl_int_64);
+ 
+diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h
+index 9ff669fce0..49536d172c 100644
+--- a/core/vsl/vsl_binary_explicit_io.h
++++ b/core/vsl/vsl_binary_explicit_io.h
+@@ -141,7 +141,7 @@ macro (int);
+ macro (unsigned int);
+ macro (long);
+ macro (unsigned long);
+-#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ macro (vxl_int_64);
+ macro (vxl_uint_64);
+ #endif
+@@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer
+ 
+ /////////////////////////////////////////////////////////////////////////
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ 
+ //: Decode a buffer of arbitrary length integers
+ // Converts from the integers from the arbitrary length format into
+diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx
+index c36142bd41..9477642b0b 100644
+--- a/core/vsl/vsl_binary_io.cxx
++++ b/core/vsl/vsl_binary_io.cxx
+@@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short);
+ MACRO_MAKE_INTEGER_READ_WRITE(unsigned short);
+ MACRO_MAKE_INTEGER_READ_WRITE(long);
+ MACRO_MAKE_INTEGER_READ_WRITE(unsigned long);
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG)
++#if VXL_INT_64_IS_LONGLONG
+ MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64);
+ MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64);
+ #endif
+diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h
+index d38478aea5..9498f844c8 100644
+--- a/core/vsl/vsl_binary_io.h
++++ b/core/vsl/vsl_binary_io.h
+@@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n );
+ inline void vsl_print_summary(std::ostream& os, unsigned long n )
+ {  os << n; }
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ 
+ //: Write  to vsl_b_ostream
+ void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n );
+diff --git a/core/vsl/vsl_block_binary.cxx b/core/vsl/vsl_block_binary.cxx
+index 017a651e99..c4220bebf6 100644
+--- a/core/vsl/vsl_block_binary.cxx
++++ b/core/vsl/vsl_block_binary.cxx
+@@ -285,7 +285,7 @@ template void vsl_block_binary_write_byte_impl(vsl_b_ostream &, const unsigned c
+ template void vsl_block_binary_read_byte_impl(vsl_b_istream &, signed char*, std::size_t);
+ template void vsl_block_binary_read_byte_impl(vsl_b_istream &, unsigned char*, std::size_t);
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_int_64*, std::size_t);
+ template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_uint_64*, std::size_t);
+ template void vsl_block_binary_read_int_impl(vsl_b_istream &, vxl_int_64*, std::size_t);
+diff --git a/core/vsl/vsl_block_binary.h b/core/vsl/vsl_block_binary.h
+index 014bb8d055..2ceafb0186 100644
+--- a/core/vsl/vsl_block_binary.h
++++ b/core/vsl/vsl_block_binary.h
+@@ -218,7 +218,7 @@ inline void vsl_block_binary_read(vsl_b_istream &is, unsigned long* begin, std::
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ 
+ //: Write a block of signed longs to a vsl_b_ostream
+ // This function is very speed efficient, but
+-- 
+2.21.0
+
diff --git a/vxl.spec b/vxl.spec
index a9a068d..07c400b 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    2.0.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -23,10 +23,10 @@ Patch5:     0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
 Patch6:     0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
 Patch7:     0007-v2.0.2-fix-bkml-test.patch
 Patch8:     0008-v2.0.2-Correct-rply-includedir.patch
-# Patch19:    0019-Removed-box2m-which-requires-OpenCL-libraries.patch
-# Patch23:    0023-Remove-volm-because-of-error-in-function-prototype.patch
 
-# Patch100:   %%{name}-1.17.0-secondary.patch
+# Fixes https://github.com/vxl/vxl/issues/638
+# Thanks jjames@fedoraproject.org for pointing it out
+Patch9:     0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -79,7 +79,6 @@ platforms.
 
 %package    doc
 Summary:    Documentation for VXL library
-Requires:   %{name} = %{version}-%{release}
 BuildArch:  noarch
 
 %description doc
@@ -126,9 +125,6 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 
 # v3p/mpeg2 lib in fedora is not enough to build the target. Moreover it is in rpmfusion repo
 
-#TODO: Various
-#vxl-devel.x86_64: E: invalid-soname /usr/lib64/libvvid.so libvvid.so
-
 # Fix executable permissions on source file
 # not using "." for find since it sometimes crashes within the .git folder
 for f in config contrib core scripts v3p vcl; do
@@ -170,11 +166,11 @@ done
     -DVXL_BUILD_CUL:BOOL=ON \
     -DVXL_BUILD_RPL:BOOL=ON \
     -DVXL_BUILD_CONTRIB:BOOL=ON \
+    -DVXL_BUILD_CORE_SERIALISATION:BOOL=ON \
     -DVXL_BUILD_CORE_GEOMETRY:BOOL=ON \
     -DVXL_BUILD_CORE_IMAGING:BOOL=ON \
     -DVXL_BUILD_CORE_NUMERICS:BOOL=ON \
     -DVXL_BUILD_CORE_PROBABILITY:BOOL=ON \
-    -DVXL_BUILD_CORE_SERIALISATION:BOOL=ON \
     -DVXL_BUILD_CORE_UTILITIES:BOOL=ON \
     -DVXL_BUILD_CORE_VIDEO:BOOL=ON \
     -DVXL_BUILD_EXAMPLES:BOOL=OFF \
@@ -184,12 +180,12 @@ done
     -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
     -DVNL_CONFIG_LEGACY_METHODS:BOOL=ON .
 
-
-
+# Other stuff
 # -DEXPATPP_INCLUDE_DIR:PATH=%%{_includedir} \
 # -DEXPATPP_LIBRARY:PATH=%%{_libdir}/libexpatpp.so \
 # -DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
-# DCMDK Cmake -- Included in bundle, but why?
+
+# These comments from older spec versions need verification:
 #BUILD_VGUI? NO, it depends on box2m which in turns relies on OPENCL which is not available in FEDORA
 #wxwidgets seems to be found
 #Multiple versions of QT found please set DESIRED_QT_VERSION
@@ -878,9 +874,15 @@ ctest . || exit 0
 %{_libdir}/libvtol_algo.so
 
 %files doc
+%doc core/vxl_copyright.h
 %doc %{_docdir}/*
 
 %changelog
+* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-3
+- Fix 32 bit arch builds: https://github.com/vxl/vxl/issues/638
+- Remove invalid comments
+- Do not make docs require the base package
+
 * Fri Apr 26 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
 - Add complete file list
 - Remove no longer needed BR: klt

From 4478b00d19e32fbe266ba50cc72eab51f6f3643e Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 28 May 2019 21:55:53 +0100
Subject: [PATCH 34/74] Fix build failures on arm7hl

We now include a commit that was made post release as a patch. This
commit removes the boxm library that was causing the build to fail. This
also removes the obsolete octree library.
---
 ...ved-the-obsolete-octree-library-boxm.patch | 53224 ++++++++++++++++
 vxl.spec                                      |    67 +-
 2 files changed, 53233 insertions(+), 58 deletions(-)
 create mode 100644 0001-removed-the-obsolete-octree-library-boxm.patch

diff --git a/0001-removed-the-obsolete-octree-library-boxm.patch b/0001-removed-the-obsolete-octree-library-boxm.patch
new file mode 100644
index 0000000..381131f
--- /dev/null
+++ b/0001-removed-the-obsolete-octree-library-boxm.patch
@@ -0,0 +1,53224 @@
+From 7d506bfca1762c2bb055df3a82d7eab928d98263 Mon Sep 17 00:00:00 2001
+From: Joseph Mundy <jlm@visionsystemsinc.com>
+Date: Sat, 2 Feb 2019 10:43:26 -0500
+Subject: [PATCH] removed the obsolete octree library boxm
+
+---
+ contrib/brl/bseg/CMakeLists.txt               |   12 -
+ contrib/brl/bseg/boxm/CMakeLists.txt          |   52 -
+ ...ee+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
+ ...ree+short.vnl_vector_fixed+double.10--.cxx |    9 -
+ ...tree+short.vnl_vector_fixed+float.10--.cxx |    9 -
+ ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
+ ...ll+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
+ .../boxm_block+boct_tree+short.bool--.cxx     |    5 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    9 -
+ .../boxm_block+boct_tree+short.char--.cxx     |    5 -
+ .../boxm_block+boct_tree+short.float--.cxx    |    5 -
+ .../boxm_block+boct_tree+short.int--.cxx      |    8 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...ee+short.vnl_vector_fixed+double.10---.cxx |   17 -
+ ...ree+short.vnl_vector_fixed+float.10---.cxx |   17 -
+ ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
+ ..._block_iterator+boct_tree+short.bool--.cxx |    5 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
+ ..._block_iterator+boct_tree+short.char--.cxx |    5 -
+ ...block_iterator+boct_tree+short.float--.cxx |    5 -
+ ...m_block_iterator+boct_tree+short.int--.cxx |    8 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ .../boxm_scene+boct_tree+short.bool--.cxx     |    5 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
+ .../boxm_scene+boct_tree+short.char--.cxx     |    5 -
+ .../boxm_scene+boct_tree+short.float--.cxx    |    5 -
+ .../boxm_scene+boct_tree+short.int--.cxx      |    8 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
+ ...3d+boxm_block+boct_tree+short.bool--~-.cxx |   11 -
+ ...short.bsta_num_obs+bsta_gauss_sf1---~-.cxx |   10 -
+ ...3d+boxm_block+boct_tree+short.char--~-.cxx |   11 -
+ ...d+boxm_block+boct_tree+short.float--~-.cxx |   11 -
+ ..._3d+boxm_block+boct_tree+short.int--~-.cxx |   14 -
+ ...ct_tree+short.vgl_point_3d+double---~-.cxx |   12 -
+ .../vbl_array_3d+vsl_b_ifstream~-.cxx         |    9 -
+ .../vbl_io_smart_ptr+boxm_scene_base-.cxx     |    5 -
+ .../vbl_smart_ptr+boxm_scene_base-.cxx        |    4 -
+ contrib/brl/bseg/boxm/algo/CMakeLists.txt     |   38 -
+ .../boxm/algo/boxm_compute_scene_difference.h |   98 -
+ .../boxm/algo/boxm_compute_scene_statistics.h |  100 -
+ contrib/brl/bseg/boxm/algo/boxm_crop_scene.h  |   95 -
+ .../brl/bseg/boxm/algo/boxm_fill_in_mesh.h    |  316 ---
+ .../bseg/boxm/algo/boxm_fill_internal_cells.h |   80 -
+ contrib/brl/bseg/boxm/algo/boxm_init_scene.h  |   60 -
+ .../bseg/boxm/algo/boxm_linear_operations.h   |   60 -
+ contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx |  239 ---
+ contrib/brl/bseg/boxm/algo/boxm_merge_mog.h   |   65 -
+ contrib/brl/bseg/boxm/algo/boxm_refine.h      |  100 -
+ .../brl/bseg/boxm/algo/boxm_save_block_raw.h  |  155 --
+ .../brl/bseg/boxm/algo/boxm_save_scene_raw.h  |  277 ---
+ .../boxm/algo/boxm_save_scene_raw_general.h   |  824 --------
+ .../bseg/boxm/algo/boxm_scene_levels_utils.h  |   97 -
+ .../brl/bseg/boxm/algo/boxm_split_sample.h    |  105 -
+ contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h |  156 --
+ contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |   40 -
+ .../bseg/boxm/algo/pro/boxm_algo_processes.h  |   28 -
+ .../bseg/boxm/algo/pro/boxm_algo_register.cxx |   35 -
+ .../bseg/boxm/algo/pro/boxm_algo_register.h   |   11 -
+ .../boxm_compute_entropy_process.cxx          |   83 -
+ ...m_compute_expected_color_scene_process.cxx |   83 -
+ .../boxm_compute_scene_difference_process.cxx |   91 -
+ .../boxm_create_scene_from_ply_process.cxx    |  257 ---
+ .../processes/boxm_describe_scene_process.cxx |  106 -
+ .../boxm_explore_cells_at_level_process.cxx   |   61 -
+ .../boxm_fill_internal_cells_process.cxx      |   72 -
+ .../pro/processes/boxm_init_scene_process.cxx |  111 --
+ .../boxm_line_backproject_process.cxx         |  259 ---
+ .../boxm_linear_combination_process.cxx       |  102 -
+ .../processes/boxm_merge_mixtures_process.cxx |   90 -
+ .../processes/boxm_refine_scene_process.cxx   |  119 --
+ .../processes/boxm_remove_level0_process.cxx  |   87 -
+ ...boxm_render_expected_edge_vrml_process.cxx |  149 --
+ .../boxm_replace_const_app_process.cxx        |   95 -
+ .../pro/processes/boxm_roi_init_process.cxx   |  195 --
+ .../boxm_roi_init_rational_camera_process.cxx |  310 ---
+ .../boxm_save_occupancy_raw_process.cxx       |  229 ---
+ .../processes/boxm_save_scene_raw_process.cxx |  140 --
+ .../processes/boxm_split_scene_process.cxx    |   97 -
+ .../bseg/boxm/algo/pro/tests/CMakeLists.txt   |    2 -
+ .../bseg/boxm/algo/pro/tests/test_include.cxx |    4 -
+ contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt  |   46 -
+ ...dge_tangent_updater+short.float.float-.cxx |    4 -
+ .../boxm_edge_updater+short.float.float-.cxx  |    3 -
+ ....BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
+ ...XM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
+ ...t.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
+ ...OXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
+ ...OXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
+ ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
+ ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
+ ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
+ ...or+short.boxm_inf_line_sample+float---.cxx |    7 -
+ .../boxm/algo/rt/boxm_change_3d_functor.h     |  100 -
+ .../algo/rt/boxm_change_probability_functor.h |   83 -
+ .../rt/boxm_compute_num_rays_statistics.h     |   65 -
+ .../boxm/algo/rt/boxm_edge_tangent_updater.h  |   76 -
+ .../algo/rt/boxm_edge_tangent_updater.hxx     |  291 ---
+ .../brl/bseg/boxm/algo/rt/boxm_edge_updater.h |   34 -
+ .../bseg/boxm/algo/rt/boxm_edge_updater.hxx   |  110 -
+ .../boxm/algo/rt/boxm_expected_edge_functor.h |   53 -
+ .../rt/boxm_generate_edge_sample_functor.h    |   65 -
+ ...oxm_generate_edge_tangent_sample_functor.h |   78 -
+ .../rt/boxm_generate_opt2_sample_functor.h    |  197 --
+ .../rt/boxm_generate_opt3_sample_functor.h    |  219 --
+ .../rt/boxm_generate_opt_sample_functor.h     |  164 --
+ .../rt/boxm_generate_shadow_sample_functor.h  |  212 --
+ .../bseg/boxm/algo/rt/boxm_opt2_optimizer.h   |   37 -
+ .../bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx |  152 --
+ .../bseg/boxm/algo/rt/boxm_opt3_optimizer.h   |   37 -
+ .../bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx |  172 --
+ .../algo/rt/boxm_opt_appearance_estimator.h   |   85 -
+ .../algo/rt/boxm_opt_rt_bayesian_optimizer.h  |   36 -
+ .../rt/boxm_opt_rt_bayesian_optimizer.hxx     |  151 --
+ .../boxm/algo/rt/boxm_pre_infinity_functor.h  |   67 -
+ .../rt/boxm_render_expected_depth_functor.h   |  109 -
+ .../boxm_render_expected_edge_image_functor.h |  109 -
+ ...nder_expected_edge_tangent_image_functor.h |  126 --
+ .../rt/boxm_render_expected_image_functor.h   |  103 -
+ ...oxm_render_expected_shadow_image_functor.h |  120 --
+ .../bseg/boxm/algo/rt/boxm_rpc_registration.h |  447 -----
+ .../algo/rt/boxm_shadow_app_initializer.h     |   45 -
+ .../algo/rt/boxm_shadow_app_initializer.hxx   |  122 --
+ .../rt/boxm_shadow_appearance_estimator.h     |  114 --
+ .../algo/rt/boxm_shadow_bayes_optimizer.h     |   51 -
+ .../algo/rt/boxm_shadow_bayes_optimizer.hxx   |  195 --
+ .../boxm/algo/rt/boxm_sun_vis_prob_functor.h  |  103 -
+ .../boxm/algo/rt/boxm_update_image_functor.h  |  172 --
+ contrib/brl/bseg/boxm/algo/rt/dummy.cxx       |    0
+ .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |   29 -
+ .../boxm/algo/rt/pro/boxm_algo_rt_processes.h |   29 -
+ .../algo/rt/pro/boxm_algo_rt_register.cxx     |   33 -
+ .../boxm/algo/rt/pro/boxm_algo_rt_register.h  |   11 -
+ .../boxm_change_probabilty_process.cxx        |  120 --
+ .../processes/boxm_edge_update_process.cxx    |  280 ---
+ .../boxm_estimate_camera_process.cxx          |  199 --
+ .../boxm_generate_edge_samples_process.cxx    |  139 --
+ .../boxm_generate_opt2_samples_process.cxx    |  142 --
+ .../boxm_generate_opt3_samples_process.cxx    |  114 --
+ .../boxm_generate_opt_samples_process.cxx     |  102 -
+ .../processes/boxm_opt2_update_process.cxx    |  153 --
+ .../processes/boxm_opt3_update_process.cxx    |  153 --
+ .../boxm_opt_bayesian_update_process.cxx      |  145 --
+ .../processes/boxm_ray_statistics_process.cxx |  107 -
+ .../boxm_render_expected_depth_rt_process.cxx |  114 --
+ .../boxm_render_expected_edge_process.cxx     |  162 --
+ .../boxm_render_expected_rt_process.cxx       |  143 --
+ .../boxm_rpc_registration_process.cxx         |  119 --
+ .../pro/processes/boxm_update_rt_process.cxx  |  136 --
+ .../boxm/algo/rt/pro/tests/CMakeLists.txt     |    2 -
+ .../boxm/algo/rt/pro/tests/test_include.cxx   |    4 -
+ .../bseg/boxm/algo/rt/tests/CMakeLists.txt    |   16 -
+ .../algo/rt/tests/test_bayesian_optimizer.cxx |  102 -
+ .../bseg/boxm/algo/rt/tests/test_driver.cxx   |   15 -
+ .../bseg/boxm/algo/rt/tests/test_edges.cxx    |   26 -
+ .../bseg/boxm/algo/rt/tests/test_include.cxx  |   30 -
+ .../algo/rt/tests/test_shadow_appearance.cxx  |   72 -
+ .../algo/rt/tests/test_template_include.cxx   |    9 -
+ contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt  |   22 -
+ .../algo/sp/boxm_compute_volume_visibility.h  |  172 --
+ .../boxm/algo/sp/boxm_depth_image_triangle.h  |  127 --
+ .../brl/bseg/boxm/algo/sp/boxm_render_image.h |  166 --
+ .../boxm/algo/sp/boxm_render_image_triangle.h |  167 --
+ contrib/brl/bseg/boxm/algo/sp/boxm_update.h   |  374 ----
+ .../bseg/boxm/algo/sp/boxm_update_triangle.h  |  356 ----
+ contrib/brl/bseg/boxm/algo/sp/dummy.cxx       |    0
+ .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |   27 -
+ ...brdb_value_t+vil_image_view_base_sptr-.cxx |   10 -
+ .../boxm/algo/sp/pro/boxm_algo_sp_processes.h |   14 -
+ .../algo/sp/pro/boxm_algo_sp_register.cxx     |   18 -
+ .../boxm/algo/sp/pro/boxm_algo_sp_register.h  |   11 -
+ .../boxm_render_expected_process.cxx          |  117 --
+ .../sp/pro/processes/boxm_update_process.cxx  |  107 -
+ .../boxm_volume_visibility_process.cxx        |  129 --
+ .../boxm/algo/sp/pro/tests/CMakeLists.txt     |    2 -
+ .../boxm/algo/sp/pro/tests/test_include.cxx   |    4 -
+ .../bseg/boxm/algo/sp/tests/CMakeLists.txt    |   19 -
+ .../algo/sp/tests/test_compute_visibility.cxx |   90 -
+ .../bseg/boxm/algo/sp/tests/test_driver.cxx   |   17 -
+ .../bseg/boxm/algo/sp/tests/test_include.cxx  |    8 -
+ .../boxm/algo/sp/tests/test_render_image.cxx  |  103 -
+ .../bseg/boxm/algo/sp/tests/test_update.cxx   |  259 ---
+ .../algo/sp/tests/test_update_multi_bin.cxx   |  262 ---
+ .../brl/bseg/boxm/algo/tests/CMakeLists.txt   |   31 -
+ .../tests/test_boxm_fill_internal_cells.cxx   |  112 --
+ .../boxm/algo/tests/test_boxm_scene_crop.cxx  |  129 --
+ .../brl/bseg/boxm/algo/tests/test_driver.cxx  |   23 -
+ .../boxm/algo/tests/test_fill_in_mesh.cxx     |  121 --
+ .../brl/bseg/boxm/algo/tests/test_include.cxx |   17 -
+ .../algo/tests/test_linear_operations.cxx     |   82 -
+ .../boxm/algo/tests/test_remove_level0.cxx    |   54 -
+ .../boxm/algo/tests/test_save_scene_raw.cxx   |  122 --
+ .../bseg/boxm/algo/tests/test_upload_mesh.cxx |  127 --
+ .../brl/bseg/boxm/algo/tests/test_utils.cxx   |   71 -
+ contrib/brl/bseg/boxm/algo/tests/test_utils.h |   18 -
+ contrib/brl/bseg/boxm/basic/CMakeLists.txt    |   21 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
+ ...block_iterator+boct_tree+short.float--.cxx |    5 -
+ ...m_block_iterator+boct_tree+short.int--.cxx |    5 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |    6 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |   13 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |    7 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...terator+short.boxm_edge_sample+float--.cxx |    7 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
+ ...tor+short.boxm_inf_line_sample+float--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    6 -
+ ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...h_iterator+short.vgl_point_3d+double--.cxx |    5 -
+ ...brdb_value_t+boxm_array_1d_float_sptr-.cxx |    4 -
+ .../vbl_io_smart_ptr+boxm_array_1d_float-.cxx |    4 -
+ .../vbl_smart_ptr+boxm_array_1d_float-.cxx    |    4 -
+ .../basic/boxm_block_vis_graph_iterator.h     |   53 -
+ .../basic/boxm_block_vis_graph_iterator.hxx   |  173 --
+ .../boxm/basic/boxm_block_vis_graph_node.h    |   52 -
+ .../boxm/basic/boxm_cell_vis_graph_iterator.h |   54 -
+ .../basic/boxm_cell_vis_graph_iterator.hxx    |  131 --
+ .../bseg/boxm/basic/boxm_num_rays_functor.h   |   44 -
+ .../bseg/boxm/basic/boxm_raytrace_function.h  |  618 ------
+ .../bseg/boxm/basic/boxm_seg_length_functor.h |   46 -
+ .../bseg/boxm/basic/boxm_util_data_types.cxx  |   17 -
+ .../bseg/boxm/basic/boxm_util_data_types.h    |   30 -
+ .../brl/bseg/boxm/basic/tests/CMakeLists.txt  |   15 -
+ .../boxm/basic/tests/test_block_vis_graph.cxx |   48 -
+ .../boxm/basic/tests/test_cell_vis_graph.cxx  |   54 -
+ .../brl/bseg/boxm/basic/tests/test_driver.cxx |   13 -
+ .../bseg/boxm/basic/tests/test_include.cxx    |    9 -
+ .../basic/tests/test_template_include.cxx     |    4 -
+ contrib/brl/bseg/boxm/boxm_apm_traits.cxx     |   86 -
+ contrib/brl/bseg/boxm/boxm_apm_traits.h       |  206 --
+ contrib/brl/bseg/boxm/boxm_aux_scene.h        |   54 -
+ contrib/brl/bseg/boxm/boxm_aux_scene.hxx      |  121 --
+ contrib/brl/bseg/boxm/boxm_aux_traits.h       |   74 -
+ contrib/brl/bseg/boxm/boxm_block.h            |   58 -
+ contrib/brl/bseg/boxm/boxm_block.hxx          |   80 -
+ contrib/brl/bseg/boxm/boxm_export.h           |   23 -
+ contrib/brl/bseg/boxm/boxm_io_scene_base.cxx  |   25 -
+ contrib/brl/bseg/boxm/boxm_io_scene_base.h    |   21 -
+ contrib/brl/bseg/boxm/boxm_scene.h            |  559 ------
+ contrib/brl/bseg/boxm/boxm_scene.hxx          | 1764 -----------------
+ contrib/brl/bseg/boxm/boxm_scene_base.cxx     |   35 -
+ contrib/brl/bseg/boxm/boxm_scene_base.h       |   85 -
+ contrib/brl/bseg/boxm/boxm_scene_parser.cxx   |  277 ---
+ contrib/brl/bseg/boxm/boxm_scene_parser.h     |  108 -
+ contrib/brl/bseg/boxm/pro/CMakeLists.txt      |   29 -
+ ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
+ ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
+ ...tree+short.vnl_vector_fixed+float.3---.cxx |    6 -
+ .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
+ ...ee+short.vnl_vector_fixed+float.3---~-.cxx |   12 -
+ contrib/brl/bseg/boxm/pro/boxm_processes.h    |   16 -
+ contrib/brl/bseg/boxm/pro/boxm_register.cxx   |   27 -
+ contrib/brl/bseg/boxm/pro/boxm_register.h     |   11 -
+ .../boxm_camera_viewing_scene_process.cxx     |  131 --
+ .../processes/boxm_clean_scene_process.cxx    |  102 -
+ ...oxm_construct_scene_from_image_process.cxx |  219 --
+ .../processes/boxm_create_scene_process.cxx   |  218 --
+ .../boxm_force_write_blocks_process.cxx       |  102 -
+ .../pro/processes/boxm_load_scene_process.cxx |   73 -
+ .../processes/boxm_proj_local_cam_process.cxx |  103 -
+ .../processes/boxm_upload_mesh_process.cxx    |  148 --
+ .../brl/bseg/boxm/pro/tests/CMakeLists.txt    |    2 -
+ .../brl/bseg/boxm/pro/tests/test_include.cxx  |    4 -
+ contrib/brl/bseg/boxm/sample/CMakeLists.txt   |   29 -
+ ...ct_tree+short.boxm_edge_sample+float--.cxx |    5 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
+ ...ct_tree+short.boxm_opt2_sample+float--.cxx |    4 -
+ ...boct_tree+short.boxm_rt_sample+float--.cxx |    4 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    5 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   12 -
+ ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    9 -
+ ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    5 -
+ ..._tree+short.boxm_scalar_sample+float--.cxx |    4 -
+ ...ee_cell+short.boxm_edge_sample+float--.cxx |    5 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
+ ...ee_cell+short.boxm_opt2_sample+float--.cxx |    4 -
+ ...tree_cell+short.boxm_rt_sample+float--.cxx |    4 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   11 -
+ ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |   10 -
+ ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ..._cell+short.boxm_scalar_sample+float--.cxx |    4 -
+ ..._reader+short.boxm_edge_sample+float--.cxx |    8 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    5 -
+ ...der+short.boxm_inf_line_sample+float--.cxx |    5 -
+ ..._reader+short.boxm_opt2_sample+float--.cxx |    5 -
+ ...ll_reader+short.boxm_rt_sample+float--.cxx |    5 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...eader+short.boxm_scalar_sample+float--.cxx |    5 -
+ ...le+float-.boxm_aux_edge_sample+float--.cxx |    5 -
+ ...loat-.boxm_edge_tangent_sample+float--.cxx |    7 -
+ ...M_APM_MOB_GREY-.boxm_rt_sample+float--.cxx |    7 -
+ ...APM_MOG_GREY-.boxm_opt2_sample+float--.cxx |    7 -
+ ...M_APM_MOG_GREY-.boxm_rt_sample+float--.cxx |    7 -
+ ....boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx |    7 -
+ ..._SIMPLE_GREY-.boxm_opt2_sample+float--.cxx |    7 -
+ ...PM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx |    7 -
+ ...IMPLE_GREY-.boxm_scalar_sample+float--.cxx |    8 -
+ ...xm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx |    7 -
+ ...float.boxm_edge_tangent_sample+float--.cxx |    7 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |   13 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |    6 -
+ ...ee+short.boxm_inf_line_sample+float---.cxx |    6 -
+ ...t_tree+short.boxm_opt2_sample+float---.cxx |    9 -
+ ...oct_tree+short.boxm_rt_sample+float---.cxx |    9 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   12 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...tree+short.boxm_scalar_sample+float---.cxx |    9 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   11 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
+ .../Templates/boxm_edge_sample+float-.cxx     |    4 -
+ .../boxm_edge_tangent_sample+float-.cxx       |    3 -
+ .../Templates/boxm_inf_line_sample+float-.cxx |    3 -
+ .../Templates/boxm_opt2_sample+float-.cxx     |    4 -
+ .../Templates/boxm_plane_obs+float-.cxx       |    3 -
+ .../Templates/boxm_rt_sample+float-.cxx       |    3 -
+ .../boxm_sample+BOXM_APM_MOB_GREY-.cxx        |    7 -
+ .../boxm_sample+BOXM_APM_MOG_GREY-.cxx        |    9 -
+ .../boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx     |    4 -
+ ...xm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx |    4 -
+ .../Templates/boxm_scalar_sample+float-.cxx   |    4 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
+ ...t_tree+short.boxm_opt2_sample+float---.cxx |    6 -
+ ...oct_tree+short.boxm_rt_sample+float---.cxx |    6 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    6 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   11 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    6 -
+ ...tree+short.boxm_scalar_sample+float---.cxx |    6 -
+ .../boxm_scene+boct_tree+short.int--.cxx      |    5 -
+ ...tree+short.boxm_edge_sample+float---~-.cxx |   16 -
+ ...rt.boxm_edge_tangent_sample+float---~-.cxx |   17 -
+ ...tree+short.boxm_opt2_sample+float---~-.cxx |   13 -
+ ...t_tree+short.boxm_rt_sample+float---~-.cxx |   13 -
+ ...ort.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx |   13 -
+ ...ort.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx |   17 -
+ ....boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx |   18 -
+ ...ample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx |   13 -
+ ...ee+short.boxm_scalar_sample+float---~-.cxx |   13 -
+ ...mage_view+boxm_inf_line_sample+float--.cxx |    5 -
+ .../brl/bseg/boxm/sample/algo/CMakeLists.txt  |   18 -
+ ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
+ ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
+ ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
+ ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
+ ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
+ .../boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx   |    3 -
+ ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...oxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx |   14 -
+ .../sample/algo/boxm_mob_grey_processor.cxx   |   83 -
+ .../sample/algo/boxm_mob_grey_processor.h     |   35 -
+ .../sample/algo/boxm_mog_grey_processor.cxx   |  286 ---
+ .../sample/algo/boxm_mog_grey_processor.h     |   50 -
+ .../sample/algo/boxm_sigma_normalizer.cxx     |  104 -
+ .../boxm/sample/algo/boxm_sigma_normalizer.h  |   43 -
+ .../algo/boxm_simple_grey_processor.cxx       |  437 ----
+ .../sample/algo/boxm_simple_grey_processor.h  |   86 -
+ .../boxm/sample/algo/tests/CMakeLists.txt     |   11 -
+ .../boxm/sample/algo/tests/test_driver.cxx    |   11 -
+ .../boxm/sample/algo/tests/test_include.cxx   |    6 -
+ .../algo/tests/test_sigma_normalizer.cxx      |   59 -
+ .../brl/bseg/boxm/sample/boxm_edge_sample.h   |   97 -
+ .../brl/bseg/boxm/sample/boxm_edge_sample.hxx |  137 --
+ .../boxm/sample/boxm_edge_tangent_sample.h    |   69 -
+ .../boxm/sample/boxm_edge_tangent_sample.hxx  |   79 -
+ .../bseg/boxm/sample/boxm_inf_line_sample.h   |   55 -
+ .../bseg/boxm/sample/boxm_inf_line_sample.hxx |   79 -
+ .../brl/bseg/boxm/sample/boxm_opt2_sample.h   |   72 -
+ .../brl/bseg/boxm/sample/boxm_opt2_sample.hxx |   83 -
+ .../brl/bseg/boxm/sample/boxm_opt3_sample.h   |   76 -
+ .../brl/bseg/boxm/sample/boxm_opt3_sample.hxx |   92 -
+ contrib/brl/bseg/boxm/sample/boxm_plane_obs.h |   45 -
+ .../brl/bseg/boxm/sample/boxm_plane_obs.hxx   |   69 -
+ contrib/brl/bseg/boxm/sample/boxm_rt_sample.h |   70 -
+ .../brl/bseg/boxm/sample/boxm_rt_sample.hxx   |   81 -
+ contrib/brl/bseg/boxm/sample/boxm_sample.h    |   68 -
+ contrib/brl/bseg/boxm/sample/boxm_sample.hxx  |   71 -
+ .../bseg/boxm/sample/boxm_sample_multi_bin.h  |   63 -
+ .../boxm/sample/boxm_sample_multi_bin.hxx     |   98 -
+ .../brl/bseg/boxm/sample/boxm_scalar_sample.h |   55 -
+ .../bseg/boxm/sample/boxm_scalar_sample.hxx   |   70 -
+ .../brl/bseg/boxm/sample/boxm_update_sample.h |   17 -
+ .../boxm/sample/boxm_vis_implicit_sample.h    |   16 -
+ contrib/brl/bseg/boxm/sample/dummy.cxx        |    0
+ .../brl/bseg/boxm/sample/tests/CMakeLists.txt |    4 -
+ .../bseg/boxm/sample/tests/test_include.cxx   |   14 -
+ .../sample/tests/test_template_include.cxx    |   12 -
+ contrib/brl/bseg/boxm/tests/CMakeLists.txt    |   32 -
+ contrib/brl/bseg/boxm/tests/camera0.txt       |  104 -
+ contrib/brl/bseg/boxm/tests/frame_00000.txt   |    7 -
+ .../brl/bseg/boxm/tests/test_binary_io.cxx    |   75 -
+ .../brl/bseg/boxm/tests/test_block_iter.cxx   |   47 -
+ .../bseg/boxm/tests/test_cell_iterator.cxx    |   51 -
+ contrib/brl/bseg/boxm/tests/test_driver.cxx   |   21 -
+ contrib/brl/bseg/boxm/tests/test_include.cxx  |   10 -
+ .../tests/test_load_neighboring_blocks.cxx    |   89 -
+ .../bseg/boxm/tests/test_region_finder.cxx    |   80 -
+ .../bseg/boxm/tests/test_template_include.cxx |    5 -
+ contrib/brl/bseg/boxm/tests/test_utils.cxx    |   72 -
+ contrib/brl/bseg/boxm/tests/test_utils.h      |   17 -
+ contrib/brl/bseg/boxm/util/CMakeLists.txt     |   23 -
+ ...triangle_interpolation_iterator+float-.cxx |    3 -
+ .../bseg/boxm/util/boxm_cell_data_traits.cxx  |   25 -
+ .../bseg/boxm/util/boxm_cell_data_traits.h    |   89 -
+ .../brl/bseg/boxm/util/boxm_plane_ransac.h    |  126 --
+ .../boxm/util/boxm_quad_scan_iterator.cxx     |  188 --
+ .../bseg/boxm/util/boxm_quad_scan_iterator.h  |   66 -
+ .../boxm/util/boxm_rational_camera_utils.cxx  |   36 -
+ .../boxm/util/boxm_rational_camera_utils.h    |   30 -
+ .../boxm/util/boxm_raytrace_operations.cxx    |  232 ---
+ .../bseg/boxm/util/boxm_raytrace_operations.h |  452 -----
+ contrib/brl/bseg/boxm/util/boxm_test_util.cxx |  141 --
+ contrib/brl/bseg/boxm/util/boxm_test_util.h   |   37 -
+ .../boxm_triangle_interpolation_iterator.h    |   53 -
+ .../boxm_triangle_interpolation_iterator.hxx  |  100 -
+ .../boxm/util/boxm_triangle_scan_iterator.cxx |   59 -
+ .../boxm/util/boxm_triangle_scan_iterator.h   |   46 -
+ contrib/brl/bseg/boxm/util/boxm_utils.cxx     | 1469 --------------
+ contrib/brl/bseg/boxm/util/boxm_utils.h       |  168 --
+ contrib/brl/bseg/boxm/util/boxm_vrml_util.h   |  214 --
+ .../brl/bseg/boxm/util/tests/CMakeLists.txt   |   18 -
+ contrib/brl/bseg/boxm/util/tests/camera0.txt  |  104 -
+ .../brl/bseg/boxm/util/tests/frame_00000.txt  |    7 -
+ .../util/tests/test_boxm_plane_ransac.cxx     |   79 -
+ .../tests/test_boxm_rational_camera_utils.cxx |   24 -
+ .../brl/bseg/boxm/util/tests/test_driver.cxx  |   15 -
+ .../brl/bseg/boxm/util/tests/test_include.cxx |   12 -
+ .../boxm/util/tests/test_quad_interpolate.cxx |  117 --
+ .../boxm/util/tests/test_template_include.cxx |    3 -
+ contrib/brl/bseg/boxm_batch/CMakeLists.txt    |   59 -
+ contrib/brl/bseg/boxm_batch/reg_boxm.cxx      |  135 --
+ contrib/brl/bseg/boxm_batch/reg_boxm.h        |   12 -
+ .../brl/bseg/boxm_batch/tests/CMakeLists.txt  |    2 -
+ .../bseg/boxm_batch/tests/test_include.cxx    |    3 -
+ contrib/brl/bseg/boxm_bridge/CMakeLists.txt   |   25 -
+ .../boxm_bridge/boxm2_normails_to_boxm.cxx    |  233 ---
+ .../brl/bseg/boxm_bridge/boxm2_to_boxm.cxx    |  292 ---
+ contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h  |   24 -
+ .../boxm_bridge/boxm_normals_to_boxm2.cxx     |  326 ---
+ .../brl/bseg/boxm_bridge/boxm_to_boxm2.cxx    |  262 ---
+ contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h  |   30 -
+ .../brl/bseg/boxm_bridge/tests/CMakeLists.txt |    2 -
+ .../bseg/boxm_bridge/tests/test_include.cxx   |    4 -
+ contrib/brl/bseg/bvpl/CMakeLists.txt          |    1 -
+ .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |   71 -
+ ..._sample+bsta_num_obs+bsta_gauss_sf1---.cxx |   11 -
+ ..._tree+short.bvpl_octree_sample+float--.cxx |    6 -
+ ..._tree+short.bvpl_pca_basis_sample+10--.cxx |    6 -
+ ..._tree+short.bvpl_taylor_basis2_sample-.cxx |    6 -
+ ...sample+bsta_num_obs+bsta_gauss_sf1----.cxx |   20 -
+ ...tree+short.bvpl_octree_sample+float---.cxx |   17 -
+ ...tree+short.bvpl_pca_basis_sample+10---.cxx |   11 -
+ ...tree+short.bvpl_taylor_basis2_sample--.cxx |   12 -
+ .../Templates/bvpl_global_pca+125-.cxx        |    2 -
+ .../bvpl_global_taylor+double.10-.cxx         |    3 -
+ .../Templates/bvpl_global_taylor+float.3-.cxx |    3 -
+ ...l_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
+ .../vbl_smart_ptr+bvpl_global_corners-.cxx    |    4 -
+ .../vbl_smart_ptr+bvpl_global_pca+125--.cxx   |    5 -
+ ...art_ptr+bvpl_global_taylor+double.10--.cxx |    5 -
+ .../vbl_smart_ptr+bvpl_pca_error_scenes-.cxx  |    4 -
+ .../vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
+ .../vnl_matrix_fixed+double.125.125-.cxx      |    2 -
+ .../bvpl_octree/bvpl_block_kernel_operator.h  |  134 --
+ .../bvpl_octree/bvpl_block_vector_operator.h  |  146 --
+ .../bvpl/bvpl_octree/bvpl_cell_data_traits.h  |   34 -
+ .../bvpl/bvpl_octree/bvpl_corner_detector.h   |  299 ---
+ .../bvpl/bvpl_octree/bvpl_corner_functors.h   |   68 -
+ .../bvpl_octree/bvpl_discover_pca_kernels.cxx | 1028 ----------
+ .../bvpl_octree/bvpl_discover_pca_kernels.h   |  309 ---
+ .../bvpl_gauss3D_steerable_filters.cxx        |  512 -----
+ .../bvpl_gauss3D_steerable_filters.h          |   61 -
+ .../bvpl/bvpl_octree/bvpl_global_corners.cxx  |  475 -----
+ .../bvpl/bvpl_octree/bvpl_global_corners.h    |   71 -
+ .../bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx |    5 -
+ .../bseg/bvpl/bvpl_octree/bvpl_global_pca.h   |  153 --
+ .../bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx | 1018 ----------
+ .../bvpl/bvpl_octree/bvpl_global_taylor.cxx   |   12 -
+ .../bvpl/bvpl_octree/bvpl_global_taylor.h     |  100 -
+ .../bvpl/bvpl_octree/bvpl_global_taylor.hxx   |  645 ------
+ .../bvpl_octree/bvpl_octree_kernel_operator.h |  142 --
+ .../bvpl/bvpl_octree/bvpl_octree_neighbors.h  |   78 -
+ .../bvpl_octree/bvpl_octree_vector_operator.h |   84 -
+ .../bvpl_octree_vector_operator_impl.h        |   30 -
+ .../bvpl/bvpl_octree/bvpl_octree_vrml_util.h  |   84 -
+ .../bvpl_octree/bvpl_pca_error_scenes.cxx     |   50 -
+ .../bvpl/bvpl_octree/bvpl_pca_error_scenes.h  |   39 -
+ .../bvpl_octree/bvpl_scene_kernel_operator.h  |  213 --
+ .../bvpl_scene_neighborhood_operator.cxx      |    6 -
+ .../bvpl_scene_neighborhood_operator.h        |   97 -
+ .../bvpl_octree/bvpl_scene_statistics.cxx     |   80 -
+ .../bvpl/bvpl_octree/bvpl_scene_statistics.h  |  102 -
+ .../bvpl_octree/bvpl_scene_vector_operator.h  |  178 --
+ .../bvpl/bvpl_octree/bvpl_taylor_basis.cxx    |  258 ---
+ .../bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h |   50 -
+ .../bvpl_octree/bvpl_taylor_scenes_map.cxx    |   61 -
+ .../bvpl/bvpl_octree/bvpl_taylor_scenes_map.h |   41 -
+ .../bseg/bvpl/bvpl_octree/io/CMakeLists.txt   |   20 -
+ ...o_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
+ .../vbl_io_smart_ptr+bvpl_global_corners-.cxx |    4 -
+ ...vbl_io_smart_ptr+bvpl_global_pca+125--.cxx |    6 -
+ ...art_ptr+bvpl_global_taylor+double.10--.cxx |    6 -
+ ...bl_io_smart_ptr+bvpl_pca_error_scenes-.cxx |    4 -
+ ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
+ .../io/bvpl_io_discover_pca_kernels.cxx       |   50 -
+ .../io/bvpl_io_discover_pca_kernels.h         |   43 -
+ .../bvpl_octree/io/bvpl_io_global_corners.cxx |   50 -
+ .../bvpl_octree/io/bvpl_io_global_corners.h   |   44 -
+ .../bvpl_octree/io/bvpl_io_global_pca.cxx     |   50 -
+ .../bvpl/bvpl_octree/io/bvpl_io_global_pca.h  |   44 -
+ .../bvpl_octree/io/bvpl_io_global_taylor.h    |   75 -
+ .../io/bvpl_io_pca_error_scenes.cxx           |   50 -
+ .../bvpl_octree/io/bvpl_io_pca_error_scenes.h |   43 -
+ .../io/bvpl_io_taylor_scenes_map.cxx          |   50 -
+ .../io/bvpl_io_taylor_scenes_map.h            |   38 -
+ .../bvpl/bvpl_octree/io/tests/CMakeLists.txt  |    2 -
+ .../bvpl_octree/io/tests/test_include.cxx     |    8 -
+ .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |   31 -
+ .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
+ ...alue_t+bvpl_discover_pca_kernels_sptr-.cxx |    6 -
+ ...brdb_value_t+bvpl_global_corners_sptr-.cxx |    6 -
+ ...brdb_value_t+bvpl_global_pca_125_sptr-.cxx |    6 -
+ ...db_value_t+bvpl_pca_error_scenes_sptr-.cxx |    6 -
+ ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
+ ...rt_ptr+bvpl_global_taylor+double.10---.cxx |    8 -
+ .../bvpl_octree/pro/bvpl_octree_processes.h   |   61 -
+ .../bvpl_octree/pro/bvpl_octree_register.cxx  |   81 -
+ .../bvpl_octree/pro/bvpl_octree_register.h    |   11 -
+ .../bvpl_block_avg_value_process.cxx          |   81 -
+ .../bvpl_block_kernel_operator_process.cxx    |  208 --
+ .../bvpl_compute_gauss_gradients.cxx          |   86 -
+ .../processes/bvpl_create_scene_process.cxx   |   88 -
+ .../bvpl_grad_scene_to_bin_process.cxx        |  136 --
+ .../processes/bvpl_nonmax_supp_process.cxx    |  178 --
+ .../bvpl_plane_propagate_process.cxx          |  209 --
+ .../pro/processes/bvpl_save_vrml_process.cxx  |   89 -
+ .../bvpl_scene_histogram_process.cxx          |   66 -
+ .../bvpl_scene_kernel_operator_process.cxx    |  179 --
+ .../bvpl_scene_vector_operator_process.cxx    |  151 --
+ .../bvpl_compute_beaudet_measure_process.cxx  |   64 -
+ .../bvpl_compute_harris_measure_process.cxx   |   65 -
+ .../bvpl_corner_statistics_process.cxx        |   57 -
+ .../bvpl_load_global_corners_process.cxx      |   50 -
+ .../bvpl_threshold_corners_process.cxx        |   61 -
+ .../pca/bvpl_add_pca_errors_process.cxx       |   94 -
+ ...pl_combine_pairwise_statistics_process.cxx |   95 -
+ .../bvpl_compute_pca_error_block_process.cxx  |   69 -
+ .../bvpl_compute_pca_error_scene_process.cxx  |  132 --
+ .../bvpl_compute_pca_test_error_process.cxx   |   59 -
+ .../bvpl_discover_pca_features_process.cxx    |   98 -
+ .../processes/pca/bvpl_global_pca_process.cxx |   64 -
+ .../pca/bvpl_init_global_pca_process.cxx      |   50 -
+ .../pca/bvpl_load_global_pca_process.cxx      |   50 -
+ .../bvpl_load_pca_error_scenes_process.cxx    |   58 -
+ .../pca/bvpl_load_pca_info_process.cxx        |   55 -
+ ...l_normalize_pca_training_error_process.cxx |   61 -
+ .../pca/bvpl_pca_global_add_error_process.cxx |   77 -
+ .../bvpl_pca_global_proj_error_process.cxx    |   63 -
+ .../bvpl_pca_global_statistics_process.cxx    |   75 -
+ .../pca/bvpl_pca_project_process.cxx          |   63 -
+ .../bvpl_compute_sf_raw_response_process.cxx  |   70 -
+ .../bvpl_init_sf_response_scene_process.cxx   |   87 -
+ .../taylor/bvpl_add_taylor_errors_process.cxx |   90 -
+ ...pl_compute_taylor_coefficients_process.cxx |   80 -
+ .../bvpl_compute_taylor_error_process.cxx     |   78 -
+ ...bvpl_explore_coefficient_scene_process.cxx |   77 -
+ .../bvpl_init_global_taylor_process.cxx       |   68 -
+ .../bvpl_load_global_taylor_process.cxx       |   52 -
+ .../bvpl_load_taylor_scenes_process.cxx       |   72 -
+ .../bvpl_taylor_global_add_error_process.cxx  |   77 -
+ .../bvpl_taylor_global_proj_error_process.cxx |   63 -
+ .../bvpl/bvpl_octree/pro/tests/CMakeLists.txt |   16 -
+ .../test_bvpl_plane_propagation_process.cxx   |  144 --
+ .../bvpl_octree/pro/tests/test_driver.cxx     |   10 -
+ .../bvpl_octree/pro/tests/test_include.cxx    |    4 -
+ .../bvpl/bvpl_octree/python/pca/readme.txt    |    7 -
+ .../pca/reconstruction_error/add_pca_error.py |  193 --
+ .../compute_pca_error_scene.py                |  164 --
+ .../extract_pca_kernels.py                    |   61 -
+ .../python/pca/reconstruction_error/pca.sh    |   68 -
+ .../pca/reconstruction_error/save_pca_raw.py  |  108 -
+ .../pca/training_error/extract_pca_kernels.py |   66 -
+ .../normalized_training_error.py              |   42 -
+ .../python/pca/training_error/pca.sh          |   42 -
+ .../bseg/bvpl/bvpl_octree/python/readme.txt   |    1 -
+ .../reconstruction_error/add_taylor_error.py  |  183 --
+ .../compute_taylor_error_scene.py             |  156 --
+ .../reconstruction_error/explore_histogram.py |  113 --
+ .../run_taylor_kernels.py                     |   98 -
+ .../reconstruction_error/save_taylor_raw.py   |  146 --
+ .../taylor/reconstruction_error/taylor.sh     |   67 -
+ .../taylor_kernel_threads.py                  |   72 -
+ .../bvpl/bvpl_octree/sample/CMakeLists.txt    |   16 -
+ .../bsta_gaussian_sphere+float.1-.cxx         |    3 -
+ ...e_sample+bsta_num_obs+bsta_gauss_sf1--.cxx |    7 -
+ .../Templates/bvpl_octree_sample+float-.cxx   |    3 -
+ .../Templates/bvpl_pca_basis_sample+10-.cxx   |    3 -
+ .../bvpl_octree/sample/bvpl_octree_sample.h   |   57 -
+ .../bvpl_octree/sample/bvpl_octree_sample.hxx |   70 -
+ .../sample/bvpl_pca_basis_sample.h            |   57 -
+ .../sample/bvpl_pca_basis_sample.hxx          |   72 -
+ .../sample/bvpl_taylor_basis_sample.cxx       |   58 -
+ .../sample/bvpl_taylor_basis_sample.h         |   59 -
+ .../bvpl_octree/sample/tests/CMakeLists.txt   |    4 -
+ .../bvpl_octree/sample/tests/test_include.cxx |    5 -
+ .../sample/tests/test_template_include.cxx    |    4 -
+ .../bvpl/bvpl_octree/tests/CMakeLists.txt     |   35 -
+ .../bvpl/bvpl_octree/tests/test_driver.cxx    |   19 -
+ .../tests/test_gauss3D_steerable_filters.cxx  |  127 --
+ .../bvpl/bvpl_octree/tests/test_include.cxx   |   24 -
+ .../tests/test_octree_kernel_operator.cxx     |  352 ----
+ .../tests/test_octree_neighbors.cxx           |   92 -
+ .../bvpl_octree/tests/test_pca_kernels.cxx    |  304 ---
+ .../bvpl_octree/tests/test_taylor_basis.cxx   |  143 --
+ .../tests/test_template_include.cxx           |    4 -
+ .../bvpl/bvpl_octree/tests/test_utils.cxx     |   94 -
+ .../bseg/bvpl/bvpl_octree/tests/test_utils.h  |   20 -
+ .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |    2 +-
+ ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
+ ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
+ .../kernels/pro/bvpl_kernels_register.cxx     |    1 -
+ .../bvpl_load_taylor_responses_process.cxx    |   53 -
+ .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |   44 -
+ .../bvpl_octree_batch/reg_bvpl_octree.cxx     |   61 -
+ .../bseg/bvpl_octree_batch/reg_bvpl_octree.h  |   10 -
+ .../bvpl_octree_batch/tests/CMakeLists.txt    |    2 -
+ .../bvpl_octree_batch/tests/test_include.cxx  |    3 -
+ contrib/brl/bseg/bvxm/algo/CMakeLists.txt     |    3 +-
+ .../brl/bseg/bvxm/algo/bvxm_boxm_convert.h    |  152 --
+ contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |    3 +-
+ .../bseg/bvxm/algo/pro/bvxm_algo_processes.h  |    2 +-
+ .../bseg/bvxm/algo/pro/bvxm_algo_register.cxx |    2 +-
+ .../boxm_scene_to_bvxm_grid_process.cxx       |  129 --
+ .../brl/bseg/bvxm/algo/tests/CMakeLists.txt   |    3 -
+ .../tests/test_boxm_scene_to_bvxm_grid.cxx    |  111 --
+ .../brl/bseg/bvxm/algo/tests/test_driver.cxx  |    4 +-
+ .../brl/bseg/bvxm/algo/tests/test_include.cxx |    1 -
+ 653 files changed, 7 insertions(+), 47919 deletions(-)
+ delete mode 100644 contrib/brl/bseg/boxm/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_init_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_refine.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_split_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/dummy.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/dummy.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_traits.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_block.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_block.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_export.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.h
+ delete mode 100644 contrib/brl/bseg/boxm/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_update_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/dummy.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/tests/camera0.txt
+ delete mode 100644 contrib/brl/bseg/boxm/tests/frame_00000.txt
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_binary_io.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_block_iter.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_region_finder.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_vrml_util.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/camera0.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/frame_00000.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_batch/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.h
+ delete mode 100644 contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_batch/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
+ delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
+ delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
+ delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
+ delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
+ delete mode 100644 contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
+
+diff --git a/contrib/brl/bseg/CMakeLists.txt b/contrib/brl/bseg/CMakeLists.txt
+index f2b53d63ae..0d20b12438 100644
+--- a/contrib/brl/bseg/CMakeLists.txt
++++ b/contrib/brl/bseg/CMakeLists.txt
+@@ -41,18 +41,12 @@ add_subdirectory(brec_batch)
+ # octree
+ add_subdirectory(boct)
+ 
+-# octree based modeling
+-add_subdirectory(boxm)
+-
+ # updated, gpu compatible octree based modeling
+ add_subdirectory(boxm2)
+ 
+ # updated, gpu compatible octree based modeling
+ add_subdirectory(boxm2_batch)
+ 
+-# octree based modeling python interface
+-add_subdirectory(boxm_batch)
+-
+ # semi-global matching
+ add_subdirectory(bsgm)
+ 
+@@ -62,15 +56,9 @@ add_subdirectory(bvpl)
+ # voxel processing library python interface
+ add_subdirectory(bvpl_batch)
+ 
+-# voxel processing library python interface for octrees
+-add_subdirectory(bvpl_octree_batch)
+-
+ # Brown affine patch library, SIFT keypoint & descriptor
+ add_subdirectory(bapl)
+ 
+-#the bridge lib to convert between boxm and boxm2 scenes
+-add_subdirectory(boxm_bridge)
+-
+ #multi gpu library
+ add_subdirectory(boxm2_multi)
+ 
+diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
+deleted file mode 100644
+index 6a0e5159f4..0000000000
+--- a/contrib/brl/bseg/boxm/CMakeLists.txt
++++ /dev/null
+@@ -1,52 +0,0 @@
+-# contrib/brl/bseg/boxm/CMakeLists.txt
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-
+-include_directories( ${EXPAT_INCLUDE_DIR} )
+-include_directories( ${GEL_INCLUDE_DIR} )
+-include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+-
+-set(boxm_sources
+-    boxm_export.h
+-    boxm_block.hxx                         boxm_block.h
+-    boxm_scene_base.cxx                    boxm_scene_base.h
+-    boxm_scene.hxx                         boxm_scene.h
+-    boxm_aux_scene.hxx                     boxm_aux_scene.h
+-    boxm_scene_parser.cxx                  boxm_scene_parser.h
+-    boxm_apm_traits.cxx                    boxm_apm_traits.h
+-    boxm_aux_traits.h
+-    boxm_io_scene_base.h                   boxm_io_scene_base.cxx
+-)
+-
+-aux_source_directory(Templates boxm_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm LIBRARY_SOURCES  ${boxm_sources})
+-
+-target_link_libraries(boxm boct bsta brdb ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl_algo vsol expatpp ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vcl)
+-
+-#processes
+-add_subdirectory(pro)
+-
+-#util
+-add_subdirectory(util)
+-
+-#samples
+-add_subdirectory(sample)
+-
+-#basic algorithms involving scenes
+-add_subdirectory(algo)
+-
+-#basic structures
+-add_subdirectory(basic)
+-
+-
+-#tests
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-endif()
+-
+-#install the .h .hxx and libs
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+deleted file mode 100644
+index 3c4f37b302..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boct/boct_tree.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-BOCT_TREE_INSTANTIATE(short, gauss_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
+deleted file mode 100644
+index 7612eb4071..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<double,10> vector;
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
+deleted file mode 100644
+index 63921f9183..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<float,10> vector;
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+deleted file mode 100644
+index fb055c2df5..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<float,3> vector;
+-
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+deleted file mode 100644
+index 1a7c7d6247..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boct/boct_tree_cell.hxx>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-BOCT_TREE_CELL_INSTANTIATE(short, gauss_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
+deleted file mode 100644
+index c104d2eed5..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,bool>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index e629c522cb..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
+deleted file mode 100644
+index 562247092f..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,char>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
+deleted file mode 100644
+index 3c0bdbf155..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,float>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 247d59847c..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,int>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short,short int>  short_tree_type;
+-BOXM_BLOCK_INSTANTIATE(short_tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 5bee916221..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
+deleted file mode 100644
+index 177fcfeeee..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<double,10> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
+deleted file mode 100644
+index 5f31529e08..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<float,10> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+deleted file mode 100644
+index ac40b5ec2d..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
+deleted file mode 100644
+index 5834cafab6..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,bool >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index b4bce045ed..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_scene.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
+deleted file mode 100644
+index 09f831722a..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,char >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+deleted file mode 100644
+index 4129f1a830..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,float >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 50ef71285a..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,int >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short,short int >  short_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(short_tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 2cd39a3534..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <vgl/vgl_point_3d.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
+deleted file mode 100644
+index 02bbdc01a7..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,bool > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index 88886e65c2..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_scene.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_SCENE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
+deleted file mode 100644
+index 273a95c2a6..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,char > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
+deleted file mode 100644
+index cf8ef6a19e..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,float > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 234256af7c..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,int > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+-
+-typedef boct_tree<short, short int > short_tree;
+-BOXM_SCENE_INSTANTIATE(short_tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 4f9dff9071..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+deleted file mode 100644
+index 5de38b0662..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
+deleted file mode 100644
+index 08145d2ca1..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, bool > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
+deleted file mode 100644
+index a84c7ef3e4..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_block.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
+deleted file mode 100644
+index 0464e1208e..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, char > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
+deleted file mode 100644
+index f3ea04b9df..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,float> tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
+deleted file mode 100644
+index 01b86c0776..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, int > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-typedef boct_tree<short, short > short_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<short_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
+deleted file mode 100644
+index ff3080df2c..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
+deleted file mode 100644
+index 912522b858..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vsl/vsl_binary_io.h>
+-
+-VBL_ARRAY_3D_INSTANTIATE(vsl_b_ifstream*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
+deleted file mode 100644
+index 7158d38f30..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_io_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(boxm_scene_base);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
+deleted file mode 100644
+index f9544ebe70..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(boxm_scene_base);
+diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+deleted file mode 100644
+index 16694fbbc4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
++++ /dev/null
+@@ -1,38 +0,0 @@
+-# brl/bseg/boxm/algo/CMakeLists.txt
+-FIND_PACKAGE(RPLY REQUIRED)
+-include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${RPLY_INCLUDE_DIR} )
+-set(boxm_algo_sources
+-    boxm_compute_scene_statistics.h
+-    boxm_crop_scene.h
+-    boxm_fill_in_mesh.h
+-    boxm_fill_internal_cells.h
+-    boxm_init_scene.h
+-    boxm_refine.h
+-    boxm_save_block_raw.h
+-    boxm_save_scene_raw.h
+-    boxm_save_scene_raw_general.h
+-    boxm_upload_mesh.h
+-    boxm_merge_mog.h                        boxm_merge_mog.cxx
+-    boxm_split_sample.h
+-    boxm_compute_scene_difference.h
+-    boxm_linear_operations.h
+-    boxm_scene_levels_utils.h
+-   )
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo LIBRARY_SOURCES ${boxm_algo_sources})
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_algo boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-#raytracing algorithms
+-add_subdirectory(rt)
+-
+-#splatting algorithms
+-add_subdirectory(sp)
+-
+-#processes
+-add_subdirectory(pro)
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
+deleted file mode 100644
+index 5043e4a2a3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#ifndef boxm_compute_scene_difference_h_
+-#define boxm_compute_scene_difference_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_operations.h>
+-#include <vgl/vgl_point_3d.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-void boxm_compute_block_difference(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block1,
+-                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block2,
+-                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * blockout,
+-                                   float threshold)
+-{
+-  typedef boxm_sample<BOXM_APM_MOG_GREY> data_type;
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  typedef boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> > cell_type;
+-
+-  tree_type* tree1 = block1->get_tree();
+-  tree_type* tree2 = block2->get_tree();
+-  tree_type* treeout = blockout->get_tree();
+-
+-  std::vector<cell_type*> leaves=tree1->leaf_cells();
+-  std::vector<cell_type*> leavesout=treeout->leaf_cells();
+-
+-  for (unsigned i=0;i<leaves.size();i++)
+-  {
+-    cell_type *cell1=leaves[i];
+-    cell_type *cellout=leavesout[i];
+-    vgl_point_3d<double> p=cell1->local_bounding_box(tree1->root_level()).centroid();
+-    cell_type *cell2=tree2->locate_point(p);
+-    if (cell2)
+-    {
+-      data_type data1=cell1->data();
+-      double len1=tree1->cell_bounding_box(cell1).width();
+-
+-      data_type data2=cell2->data();
+-      double len2=tree2->cell_bounding_box(cell2).width();
+-
+-      data_type dataout=cellout->data();
+-
+-      double p1=1-std::exp(-data1.alpha*len1);
+-      double p2=1-std::exp(-data2.alpha*len2);
+-
+-      double p=p1+p2-2*p1*p2;
+-
+-      double alphaout=-std::log(1-p)/len1;
+-      if (p<threshold)
+-          alphaout=0.0;
+-      dataout.alpha=(float)alphaout;
+-      if (p1>p2)
+-        dataout.appearance_=data1.appearance_;
+-      else
+-        dataout.appearance_=data2.appearance_;
+-
+-      cellout->set_data(dataout);
+-    }
+-  }
+-}
+-
+-
+-void boxm_compute_scene_difference(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene1,
+-                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene2,
+-                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&sceneout,
+-                                   float threshold)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >tree_type;
+-  boxm_block_iterator<tree_type> iter1(&scene1);
+-  boxm_block_iterator<tree_type> iter2(&scene2);
+-
+-  // scene out is cloned as scene1.
+-  scene1.clone_blocks(sceneout);
+-  boxm_block_iterator<tree_type> iterout(&sceneout);
+-
+-  for (; !iter1.end(); iter1++,iter2++,iterout++) {
+-    std::cout<<'.';
+-    scene1.load_block(iter1.index());
+-    scene2.load_block(iter2.index());
+-    sceneout.load_block(iterout.index());
+-
+-    //boxm_block<tree_type>* block1 = *iter1;
+-    //boxm_block<tree_type>* block2 = *iter2;
+-    //boxm_block<tree_type>* blockout = *iterout;
+-
+-    boxm_compute_block_difference((*iter1),(*iter2),(*iterout), threshold);
+-    sceneout.write_active_block();
+-  }
+-}
+-
+-#endif // boxm_compute_scene_difference_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
+deleted file mode 100644
+index c697a4e6b4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_compute_scene_statistics_h
+-#define boxm_compute_scene_statistics_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_histogram.h>
+-
+-//: Compute histogram of a simple-type scenes. e.g. T_data = float, double
+-template <class T_loc, class T_data>
+-bool boxm_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist )//, bsta_histogram<float>& level_hist, unsigned& n_leaves)
+-{
+-  std::cout << " Using compute_scene_statistics\n";
+-
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-
+-  //(1) Traverse the leaves of the scene
+-  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
+-
+-  iterator.begin();
+-  float cell_count = 0;
+-  float max = (float)(*iterator)->data();
+-  float min = max;
+-  float this_val = max;
+-  while (!iterator.end()) {
+-    cell_count++;
+-    this_val = (float)(*iterator)->data();
+-    if ( this_val > max)  max = this_val;
+-    if ( this_val < min)  min = this_val;
+-    ++iterator;
+-  }
+-
+-  unsigned int nbins = (unsigned int)std::abs(max-min);// std::floor(std::sqrt(cell_count));
+-  response_hist = bsta_histogram<float>(min, max, nbins);
+-  scene->unload_active_blocks();
+-  iterator.begin();
+-  while (!iterator.end()) {
+-    response_hist.upcount((float)(*iterator)->data(), 1.0f);
+-    ++iterator;
+-  }
+-
+-  scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-//: Compute histogram for appearance model scene - where alpha, omega etc are relevant
+-template <class T_loc, class T_data>
+-bool compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene, bsta_histogram<float>& omega_hist, bsta_histogram<float>& sigma_hist, bsta_histogram<float>& level_hist, unsigned& n_leaves)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc,T_data> cell_type;
+-
+-  omega_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
+-  sigma_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
+-  level_hist = bsta_histogram<float>(0.0f, 10.0f, 10);
+-  boxm_block_iterator<tree_type> bit = scene.iterator();
+-  for (;!bit.end(); ++bit)
+-  {
+-    vgl_point_3d<int> block_index = bit.index();
+-    scene.load_block(block_index);
+-    boxm_block<tree_type> * block = scene.get_active_block();
+-    tree_type* tree=block->get_tree();
+-    if (!tree) return false;
+-    int n_levels = tree->number_levels();
+-    int fin_level = tree->finest_level();
+-    for (int level = n_levels-1; level>=fin_level; --level)
+-    {
+-      std::vector<cell_type *> cells_at_level =
+-        tree->leaf_cells_at_level(static_cast<unsigned>(level));
+-      level_hist.upcount(static_cast<float>(level),
+-                         static_cast<float>(cells_at_level.size()));
+-    }
+-    std::vector<cell_type *> leaves = tree->leaf_cells();
+-    n_leaves = leaves.size();
+-    for (typename std::vector<cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
+-    {
+-      T_data data = (*cit)->data();
+-      vgl_box_3d<double> bb = tree->cell_bounding_box(*cit);
+-      double dx = bb.width(), dy = bb.height(), dz = bb.depth();
+-      double diag = std::sqrt(dx*dx + dy*dy + dz*dz);
+-      double alpha = data.alpha;
+-      double omega = 1.0 - std::exp(-alpha*diag);
+-      omega_hist.upcount(static_cast<float>(omega), 1.0f);
+-
+-      if (scene.appearence_model() == BOXM_APM_SIMPLE_GREY)
+-      {
+-        float sigma = data.appearance_.sigma();
+-        sigma_hist.upcount(sigma, 1.0f);
+-      }
+-    }
+-  }
+-  return true;
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h b/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
+deleted file mode 100644
+index 63aa888efa..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
++++ /dev/null
+@@ -1,95 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_crop_scene.h
+-#ifndef boxm_crop_scene_h
+-#define boxm_crop_scene_h
+-
+-//:
+-// \file
+-// \brief  Template functions to create a new scene that is a cropped portion of another
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  January 11, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <class T_data>
+-boxm_scene<boct_tree<short, T_data> > *  boxm_crop_scene(boxm_scene<boct_tree<short,T_data> > *scene_in,vgl_box_3d<double> bbox)
+-{
+-  //only one-block scenes are supported for now
+-  if (!(scene_in->world_dim().x() == 1 && scene_in->world_dim().y()==1 && scene_in->world_dim().z()==1))
+-  {
+-    std::cerr << "In bvxm_crop_scene -- Input scene has more than one block, which is not supported\n";
+-    return nullptr;
+-  }
+-
+-  //get the tree inside the block and locate region
+-  boxm_block_iterator<boct_tree<short, T_data> > iter_in = scene_in->iterator();
+-  iter_in.begin();
+-
+-  //there is no need to increase iterator, since there should only be one block in the scene
+-  scene_in->load_block(iter_in.index());
+-  boct_tree<short, T_data>  *tree_in= (*iter_in)->get_tree();
+-
+-  boct_tree_cell<short,T_data>* root = tree_in->locate_region_global(bbox, true);
+-
+-  //most parameters of the output scene are the same as those of the input scene,
+-  //except the ROI which is determined by the root node
+-  double cell_length = 1.0/(double)(1<<(tree_in->root_level() - root->level()));
+-  double cell_origin_x = (double)(root->get_code().x_loc_)/(double)(1<<(tree_in->root_level()));
+-  double cell_origin_y = (double)(root->get_code().y_loc_)/(double)(1<<(tree_in->root_level()));
+-  double cell_origin_z = (double)(root->get_code().z_loc_)/(double)(1<<(tree_in->root_level()));
+-
+-  vgl_box_3d<double> global_bbox = tree_in->bounding_box();
+-
+-  vgl_point_3d<double> origin(cell_origin_x, cell_origin_y, cell_origin_z);
+-
+-  vgl_point_3d<double> min_point((global_bbox.min_x() + global_bbox.width()*origin.x()),
+-                                 (global_bbox.min_y() + global_bbox.height()*origin.y()),
+-                                 (global_bbox.min_z() + global_bbox.depth()*origin.z()));
+-
+-  vgl_vector_3d<double> block_dim(cell_length*global_bbox.width(),
+-                                  cell_length*global_bbox.height(),
+-                                  cell_length*global_bbox.depth());
+-
+-  boxm_scene<boct_tree<short, T_data> > *scene_out =
+-  new boxm_scene<boct_tree<short, T_data> >(scene_in->lvcs(),min_point,block_dim,scene_in->world_dim(), scene_in->save_internal_nodes());
+-
+-  scene_out->set_paths(scene_in->path(), "cropped");
+-  scene_out->set_appearance_model(scene_in->appearence_model());
+-  scene_out->clean_scene();
+-  boxm_block_iterator<boct_tree<short, T_data> > iter_out = scene_out->iterator();
+-  iter_out.begin();
+-  scene_out->load_block(iter_out.index());
+-
+-
+-  //Region of interest in [0,1)x[0,1)x[0,1) coordinates
+-  vgl_point_3d<double> norm_bbox_min((bbox.min_x()-global_bbox.min_x())/global_bbox.width(),
+-                                     (bbox.min_y()-global_bbox.min_y())/global_bbox.height(),
+-                                     (bbox.min_z()-global_bbox.min_z())/global_bbox.depth());
+-  vgl_point_3d<double> norm_bbox_max((bbox.max_x()-global_bbox.min_x())/global_bbox.width(),
+-                                     (bbox.max_y()-global_bbox.min_y())/global_bbox.height(),
+-                                     (bbox.max_z()-global_bbox.min_z())/global_bbox.depth());
+-
+-
+-  //output tree
+-  boct_tree<short, T_data >  *tree_out = tree_in->clone_and_intersect(root, tree_in->root_level(), vgl_box_3d<double>(norm_bbox_min,norm_bbox_max));
+-
+-  //write the output tree
+-  (*iter_out)->init_tree(tree_out);
+-  scene_out->write_active_block();
+-  scene_out->write_scene("/cropped_scene.xml");
+-
+-  return scene_out;
+-}
+-
+-
+-#endif // boxm_crop_scene_h
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
+deleted file mode 100644
+index f41af5bca8..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
++++ /dev/null
+@@ -1,316 +0,0 @@
+-#ifndef boxm_fill_in_mesh_h_
+-#define boxm_fill_in_mesh_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_operations.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bool is_mesh_in_block(imesh_mesh & mesh, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
+-{
+-  imesh_face_array_base& fs = mesh.faces();
+-  std::list<vgl_point_3d<double> > v_list;
+-  vgl_box_3d<double> bb_global;
+-
+-  for (unsigned i=0; i < fs.size(); ++i)
+-  {
+-    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
+-    for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-      unsigned int v_id = fs(i,j);
+-      vgl_point_3d<double> v;
+-      if (use_lvcs) {
+-        double lx, ly, lz;
+-        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                             vpgl_lvcs::wgs84,lx,ly,lz);
+-        v=vgl_point_3d<double>(lx,ly,lz);
+-      }
+-      else
+-        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-      bb_global.add(v);
+-      v_list.push_back(v);
+-    }
+-  }
+-
+-  vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
+-  if (inters.is_empty())
+-    return false;
+-
+-  return true;
+-}
+-
+-template <class T_loc, class T_data>
+-bool are_meshes_in_block(std::vector<imesh_mesh>  meshes, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
+-{
+-  bool flag=false;
+-  for (auto & meshe : meshes)
+-  {
+-    meshe.compute_face_normals(true);
+-    imesh_face_array_base& fs = meshe.faces();
+-    std::list<vgl_point_3d<double> > v_list;
+-    vgl_box_3d<double> bb_global;
+-
+-    for (unsigned i=0; i < fs.size(); ++i)
+-    {
+-      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-      for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-        unsigned int v_id = fs(i,j);
+-        vgl_point_3d<double> v;
+-        if (use_lvcs) {
+-          double lx, ly, lz;
+-          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                               vpgl_lvcs::wgs84,lx,ly,lz);
+-          v=vgl_point_3d<double>(lx,ly,lz);
+-        }
+-        else
+-          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-        bb_global.add(v);
+-        v_list.push_back(v);
+-      }
+-    }
+-
+-    vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
+-    if (!inters.is_empty())
+-      flag=true;
+-  }
+-  return flag;
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
+-                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  for (auto & meshe : meshes)
+-  {
+-    imesh_face_array_base& fs = meshe.faces();
+-    std::list<vgl_point_3d<double> > v_list;
+-    vgl_box_3d<double> bb_scale, bb_global;
+-    for (unsigned i=0; i < fs.size(); ++i)
+-    {
+-      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-      for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-        unsigned int v_id = fs(i,j);
+-        vgl_point_3d<double> v;
+-        if (use_lvcs) {
+-          double lx, ly, lz;
+-          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                               vpgl_lvcs::wgs84,lx,ly,lz);
+-          v=vgl_point_3d<double>(lx,ly,lz);
+-        }
+-        else
+-          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-        bb_global.add(v);
+-        vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-        v.set(diff.x(), diff.y(), diff.z());
+-        // the local coordinates inside the box region
+-        v_list.push_back(v);
+-        //convert the values into [0,1] range
+-        v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-        bb_scale.add(v);
+-      }
+-    }
+-    // check if polygon's bounding box intersects with the block
+-    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-    if (inters.is_empty())
+-      continue;
+-
+-    // locate the polygon bounding box in tree
+-    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
+-    if (region) {
+-      // test all the children for intersection
+-      std::vector<boct_tree_cell<T_loc,T_data>*> children;
+-      if (!region->is_leaf())
+-        region->leaf_children(children);
+-      else // insert the node itself, if no children
+-        children.push_back(region);
+-      for (unsigned i=0; i<children.size(); i++) {
+-        boct_tree_cell<T_loc,T_data>* cell=children[i];
+-        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
+-        if (contains_point(meshe,cell_bb.centroid())) {
+-          cell->set_data(val);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
+-template <>
+-void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
+-                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
+-                                  bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  for (auto & meshe : meshes)
+-  {
+-    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
+-    {
+-      imesh_face_array_base& fs = meshe.faces();
+-      std::list<vgl_point_3d<double> > v_list;
+-      vgl_box_3d<double> bb_scale, bb_global;
+-
+-      for (unsigned i=0; i < fs.size(); ++i)
+-      {
+-        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-        for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-          unsigned int v_id = fs(i,j);
+-          vgl_point_3d<double> v;
+-          if (use_lvcs) {
+-            double lx, ly, lz;
+-            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                                 vpgl_lvcs::wgs84,lx,ly,lz);
+-            v=vgl_point_3d<double>(lx,ly,lz);
+-          }
+-          else
+-            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-          bb_global.add(v);
+-          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-          v.set(diff.x(), diff.y(), diff.z());
+-          // the local coordinates inside the box region
+-          v_list.push_back(v);
+-          //convert the values into [0,1] range
+-          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-          bb_scale.add(v);
+-        }
+-      }
+-
+-      // check if polygon's bounding box intersects with the block
+-      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-      if (inters.is_empty())
+-        continue;
+-
+-      meshe.compute_face_normals();
+-
+-      // locate the polygon bounding box in tree
+-      boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
+-      if (region)
+-      {
+-        // test all the children for intersection
+-        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
+-        if (!region->is_leaf())
+-          region->leaf_children(children);
+-        else // insert the node itself, if no children
+-          children.push_back(region);
+-        for (auto cell : children) {
+-          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
+-
+-          if (contains_point(meshe,cell_bb.centroid())) {
+-            boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
+-            tempdata.set_appearance(val.appearance());
+-            tempdata.alpha*=val.alpha;
+-            cell->set_data(tempdata);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-template <>
+-void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > > *block,
+-                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
+-                                  bool use_lvcs, boxm_sample<BOXM_APM_SIMPLE_GREY> val)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  for (auto & meshe : meshes)
+-  {
+-    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
+-    {
+-      imesh_face_array_base& fs = meshe.faces();
+-      std::list<vgl_point_3d<double> > v_list;
+-      vgl_box_3d<double> bb_scale, bb_global;
+-
+-      for (unsigned i=0; i < fs.size(); ++i)
+-      {
+-        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-        for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-          unsigned int v_id = fs(i,j);
+-          vgl_point_3d<double> v;
+-          if (use_lvcs) {
+-            double lx, ly, lz;
+-            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                                 vpgl_lvcs::wgs84,lx,ly,lz);
+-            v=vgl_point_3d<double>(lx,ly,lz);
+-          }
+-          else
+-            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-          bb_global.add(v);
+-          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-          v.set(diff.x(), diff.y(), diff.z());
+-          // the local coordinates inside the box region
+-          v_list.push_back(v);
+-          //convert the values into [0,1] range
+-          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-          bb_scale.add(v);
+-        }
+-      }
+-
+-      // check if polygon's bounding box intersects with the block
+-      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-      if (inters.is_empty())
+-        continue;
+-
+-      meshe.compute_face_normals();
+-
+-      // locate the polygon bounding box in tree
+-      boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >* region=tree->locate_region(inters);
+-      if (region)
+-      {
+-        // test all the children for intersection
+-        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >*> children;
+-        if (!region->is_leaf())
+-          region->leaf_children(children);
+-        else // insert the node itself, if no children
+-          children.push_back(region);
+-        for (auto cell : children) {
+-          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
+-
+-          if (contains_point(meshe,cell_bb.centroid())) {
+-            boxm_sample<BOXM_APM_SIMPLE_GREY> tempdata=cell->data();
+-            tempdata.set_appearance(val.appearance());
+-            tempdata.alpha*=val.alpha;
+-            cell->set_data(tempdata);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_fill_in_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                  std::vector<imesh_mesh> meshes, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  vpgl_lvcs lvcs=scene.lvcs();
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  for (; !iter.end(); iter++) {
+-    vgl_box_3d<double> block_bb=scene.get_block_bbox(iter.index().x(),iter.index().y(),iter.index().z());
+-    if (are_meshes_in_block<T_loc, T_data >(meshes,block_bb,lvcs,use_lvcs))
+-    {
+-      scene.load_block(iter.index());
+-      boxm_block<tree_type>* block = *iter;
+-      boxm_fill_in_mesh_into_block(block, meshes, lvcs, use_lvcs, val);
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-#endif // boxm_fill_in_mesh_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h b/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
+deleted file mode 100644
+index 6d81beef0f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
++++ /dev/null
+@@ -1,80 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_fill_internal_cells.h
+-#ifndef boxm_fill_internal_cells_h
+-#define boxm_fill_internal_cells_h
+-//:
+-// \file
+-// \brief Class in charged of filling the intermediate nodes of a tree.
+-// \author Maria Isabel Restrepo mir@lems.brown.edu
+-// \date  Feb 3, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: A class to combine children cells and fill intermediate nodes
+-template <class T_data>
+-class boxm_fill_internal_cells
+-{
+- public:
+-  typedef boct_tree<short,T_data> tree_type;
+-
+-  boxm_scene<boct_tree<short,T_data> > * traverse_and_fill(boxm_scene<boct_tree<short,T_data> > *scene_in)
+-  {
+-    // Most parameters of the output scene are the same as those of the input scene
+-    // but we need to change the mode of the scene to be saving internal nodes
+-    bool save_internal_nodes = true;
+-    boxm_scene<tree_type> *scene_out = new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
+-                                                                 scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
+-                                                                 false, save_internal_nodes);
+-    std::string block_pref = scene_in->block_prefix() + "_all_nodes";
+-    scene_out->set_paths(scene_in->path(), block_pref);
+-    scene_out->set_appearance_model(scene_in->appearence_model());
+-
+-    scene_out->write_scene(block_pref + ".xml");
+-
+-    //Iterate through the blocks
+-    boxm_block_iterator<tree_type> iter_in = scene_in->iterator();
+-    boxm_block_iterator<tree_type> iter_out = scene_out->iterator();
+-
+-    iter_in.begin();
+-    iter_out.begin();
+-
+-    while (!iter_in.end() && !iter_out.end())
+-    {
+-      scene_in->load_block(iter_in.index());
+-      scene_out->load_block(iter_out.index());
+-
+-      tree_type *tree_in= (*iter_in)->get_tree();
+-      // Copy input tree into output tree and fill
+-      tree_type *tree_out = tree_in->clone();
+-      this->traverse_and_fill(tree_out);
+-      (*iter_out)->init_tree(tree_out);
+-      std::cout << "writing block: " << iter_out.index() <<std::endl;
+-      scene_out->write_active_block();
+-
+-      iter_in++; iter_out++;
+-    }
+-
+-    return scene_out;
+-  }
+-
+- protected:
+-
+-  //: Traverses a tree and fills intermediate cells with the average of the 8 children.
+-  // If there is need to fill cells with something different to the average, this function can be made abstract and
+-  // write specializations. As in the template method design pattern
+-  void traverse_and_fill(tree_type *tree_to_fill)
+-  {
+-    tree_to_fill->fill_with_average();
+-  }
+-};
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h b/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
+deleted file mode 100644
+index 9325f47c46..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
++++ /dev/null
+@@ -1,60 +0,0 @@
+-#ifndef boxm_init_scene_h_
+-#define boxm_init_scene_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: This method inits the blocks (octrees) of the scene of type boxm_sample
+-template <boxm_apm_type APM_TYPE>
+-void boxm_init_scene(boxm_scene<boct_tree<short, boxm_sample<APM_TYPE> > > &scene)
+-{
+-  typedef boct_tree<short, boxm_sample<APM_TYPE> > tree_type;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  float pinit=scene.pinit();
+-  float dimx=(float)scene.block_dim().x();
+-  float numbercells=(float)(1<<(scene.init_level()-1));
+-
+-  float alpha_init=-std::log(1-pinit)*numbercells/dimx;
+-  for (; !iter.end(); iter++) {
+-       vgl_point_3d<int> index=iter.index();
+-    if (!scene.discover_block(index.x(),index.y(),index.z()))
+-    {
+-      boxm_sample<APM_TYPE> initsample(alpha_init);
+-      tree_type* tree= new tree_type(initsample,scene.max_level(),scene.init_level());
+-      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
+-      scene.set_block(index,block);
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-//: Initializes a general scene
+-template <class T_data>
+-void boxm_init_scene(boxm_scene<boct_tree<short, T_data> > &scene)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  float dimx=(float)scene.block_dim().x();
+-
+-  for (; !iter.end(); iter++) {
+-    vgl_point_3d<int> index=iter.index();
+-    if (!scene.discover_block(index.x(),index.y(),index.z()))
+-    {
+-      T_data initdata;
+-      tree_type* tree= new tree_type(initdata,scene.max_level(),scene.init_level());
+-      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
+-      scene.set_block(index,block);
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-#endif // boxm_init_scene_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h b/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
+deleted file mode 100644
+index 01726ab977..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
++++ /dev/null
+@@ -1,60 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_linear_operations.h
+-#ifndef boxm_linear_operations_h
+-#define boxm_linear_operations_h
+-//:
+-// \file
+-// \brief Functions to perfoms linear operations on boxm scenes and/or blocks
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  2-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_block.h>
+-#include <boct/boct_tree.h>
+-#include <cassert>
+-#ifdef DEBUG
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-//: Computes the linear combination of two blocks in place. i.e block1 = s1*block1 +  s2*block2
+-template<class T_data>
+-bool boxm_linear_combination(boxm_block<boct_tree<short, T_data> > *block1, boxm_block<boct_tree<short, T_data> > *block2, float s1, float s2)
+-{
+-  boct_tree<short, T_data> *tree1 = block1->get_tree();
+-  boct_tree<short, T_data> *tree2 = block2->get_tree();
+-
+-  std::vector<boct_tree_cell<short, T_data>* > cells1 = tree1->leaf_cells();
+-  std::vector<boct_tree_cell<short, T_data>* > cells2 = tree2->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it1 = cells1.begin();
+-  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it2 = cells2.begin();
+-
+-  for (; (it1!=cells1.end())&&(it2!= cells2.end()); it1++, it2++)
+-  {
+-    boct_tree_cell<short,T_data> *cell1 = *it1;
+-    boct_tree_cell<short,T_data> *cell2 = *it2;
+-
+-#ifdef DEBUG
+-    //if level and location code of cells isn't the same quit
+-    boct_loc_code<short> code1 = cell1->get_code();
+-    boct_loc_code<short> code2 = cell2->get_code();
+-    if (!(code1.isequal(code2)))
+-    {
+-      std::cerr << "In boxm_linear_combination: Blocks must have the same structure\n";
+-      return false;
+-    }
+-#endif
+-
+-    cell1->set_data(s1*cell1->data() + s2*cell2->data());
+-  }
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
+deleted file mode 100644
+index e7e2f6585c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
++++ /dev/null
+@@ -1,239 +0,0 @@
+-#include <vector>
+-#include <iostream>
+-#include <limits>
+-#include "boxm_merge_mog.h"
+-//:
+-// \file
+-
+-#include <boxm/boxm_scene.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vnl/vnl_math.h> // for vnl_math::sqr()
+-
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-
+-void boxm_merge_mog::kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian)
+-{
+-  //When merging components of gaussian mixtures, we need to perform the following calculations
+-  //1. find the normalizing weight of the new component.
+-  //   In this case this value is 1 because we are merging all the components
+-  //2. find the mean
+-  //3. find the variance
+-
+-  float mean = 0.0f;
+-  float var = 0.0f;
+-
+-  //CAUTION: only mixtures of 3 modes are supported for now.
+-  assert(mixture.num_components() == 3);
+-  unsigned num_components = mixture.num_components();
+-
+-  for (unsigned i = 0; i<num_components; ++i)
+-  {
+-    // note: these equations omit the weight of the final distribution
+-    // only because in this case it is 1
+-    mean += mixture.weight(i) * mixture.distribution(i).mean();
+-    var  += mixture.weight(i) *(mixture.distribution(i).var() +
+-                                vnl_math::sqr(mixture.distribution(i).mean()));
+-  }
+-  if (var <  vnl_math::sqr(mean))
+-    std::cout<< "This should not happen: " << mixture << std::endl;
+-  var -= vnl_math::sqr(mean);
+-  assert(var >= 0);
+-
+-  gaussian.set_mean(mean);
+-  gaussian.set_var(var);
+-  return;
+-}
+-
+-//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
+-//  Thus the resulting grid contains unimodal gaussians
+-bool boxm_merge_mog::kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &mog_scene,
+-                                    boxm_scene<boct_tree<short, gauss_type> > &gauss_scene)
+-{
+-    // iterate through the scene
+-    boxm_block_iterator<mog_tree_type > mog_iter = mog_scene.iterator();
+-    boxm_block_iterator<gauss_tree_type > gauss_iter = gauss_scene.iterator();
+-
+-    for (mog_iter.begin(), gauss_iter.begin(); !mog_iter.end(); ++mog_iter, ++gauss_iter) {
+-      mog_scene.load_block(mog_iter.index());
+-      gauss_scene.load_block(gauss_iter.index());
+-      mog_tree_type  *mog_tree = (*mog_iter)->get_tree();
+-      gauss_tree_type  *gauss_tree = mog_tree->clone_to_type<gauss_type>();
+-#if 0
+-      gauss_tree->init_cells(func_max.min_response());
+-#endif
+-      this->kl_merge_octree(mog_tree,gauss_tree);
+-      (*gauss_iter)->init_tree(gauss_tree);
+-      gauss_scene.write_active_block();
+-    }
+-
+-    return true;
+-}
+-
+-//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
+-//  Thus the resulting grid contains unimodal gaussians
+-bool boxm_merge_mog::kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree,
+-                                     boct_tree<short, gauss_type> *gauss_tree)
+-{
+-  // iterate through the trees
+-  std::vector<mog_cell_type*> mog_cells = mog_tree->all_cells();
+-  std::vector<gauss_cell_type*> gauss_cells = gauss_tree->all_cells();
+-
+-  if (mog_cells.size()!=gauss_cells.size() ) {
+-    std::cerr << "Different size vectors in boxm_merge_mog::kl_merge_octree\n";
+-    return false;
+-  }
+-
+-
+-  for (unsigned i = 0; i < mog_cells.size(); ++i)
+-  {
+-    gauss_type result_gauss;
+-    this->kl_merge(mog_cells[i]->data(), result_gauss);
+-    gauss_cells[i]->set_data(result_gauss);
+-  }
+-  return true;
+-}
+-
+-/********************** Non-class functions************************************/
+-
+-//: Computes the differential entropy of a gaussian scene- only for leave cells
+-bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene_in,boxm_scene<boct_tree<short, float> >& scene_out)
+-{
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
+-
+-  //iterate through the leaf cells computing entropy
+-  boxm_cell_iterator<boct_tree<short, gauss_type > > it_in =
+-  scene_in.cell_iterator(&boxm_scene<boct_tree<short, gauss_type> >::load_block);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it_out =
+-  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
+-
+-  it_in.begin();
+-  it_out.begin();
+-
+-  while ( !(it_in.end() || it_out.end()) ) {
+-    boct_tree_cell<short,gauss_type> *cell_in = *it_in;
+-    boct_tree_cell<short,float> *cell_out = *it_out;
+-
+-    boct_loc_code<short> out_code = cell_in->get_code();
+-    boct_loc_code<short> in_code = cell_out->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++it_in;
+-      ++it_out;
+-      continue;
+-    }
+-
+-    double h = 0.5*std::log(vnl_math::pi*vnl_math::e*2*cell_in->data().var());
+-    cell_out->set_data(float(h));
+-    ++it_in;
+-    ++it_out;
+-  }
+-
+-  return true;
+-}
+-
+-
+-//: Compute expectation given that the voxel is occupied
+-bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
+-  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
+-
+-  //iterate through the leaf cells computing mean appearance
+-  boxm_cell_iterator<scene_tree_type > it_in =
+-  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it_out =
+-  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
+-
+-  it_in.begin();
+-  it_out.begin();
+-
+-  while ( !(it_in.end() || it_out.end()) ) {
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
+-    boct_tree_cell<short,float> *cell_out = *it_out;
+-
+-    boct_loc_code<short> out_code = cell_in->get_code();
+-    boct_loc_code<short> in_code = cell_out->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++it_in;
+-      ++it_out;
+-      continue;
+-    }
+-
+-    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
+-    // update alpha integral
+-    float vis_color = float(1.0 - std::exp(- cell_in->data().alpha * it_in.length()))*(mean_color+grey_offset);
+-    cell_out->set_data(vis_color);
+-    ++it_in;
+-    ++it_out;
+-  }
+-
+-  scene_in.unload_active_blocks();
+-  scene_out.unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-#if 0
+-//: Compute total expectation E(I) = E(I| X \in S) P(X \in S) + E(I| X !\in S) P(X !\in S)
+-//  Expected appearance of a non surface voxel is not defined. Every intensity is equally likely therefore E(I| X !\in S) = 127.5 for I in [0,255]
+-bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
+-  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
+-
+-  //iterate through the leaf cells computing mean appearance
+-  boxm_cell_iterator<scene_tree_type > it_in =
+-  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it_out =
+-  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
+-
+-  it_in.begin();
+-  it_out.begin();
+-
+-  while ( !(it_in.end() || it_out.end()) )
+-  {
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
+-    boct_tree_cell<short,float> *cell_out = *it_out;
+-
+-    boct_loc_code<short> out_code = cell_in->get_code();
+-    boct_loc_code<short> in_code = cell_out->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++it_in;
+-      ++it_out;
+-      continue;
+-    }
+-
+-    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
+-    //alpha integral
+-    float vis = std::exp(- cell_in->data().alpha * it_in.length());
+-    float vis_color = (1.0f - vis) *mean_color;
+-    float invis_color = vis * 0.5f; // E(I| X !\in S) = 127.5/255
+-    cell_out->set_data(vis_color + invis_color);
+-    ++it_in;
+-    ++it_out;
+-  }
+-
+-  scene_in.unload_active_blocks();
+-  scene_out.unload_active_blocks();
+-
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
+deleted file mode 100644
+index 1c39b9e84c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_merge_mog.h
+-#ifndef boxm_merge_mog_h_
+-#define boxm_merge_mog_h_
+-//:
+-// \file
+-// \brief class with methods to merge gaussian mixtures.
+-// \author Isabel Restrepo
+-// \date April 20, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   Nov 7 2009 - Isabel Restrepo: Copied from bvxm
+-// \endverbatim
+-
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gaussian_indep.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-//:
+-// Only floating point are supported for now and mixtures with 3 components.
+-// This class can be further templated if necessary
+-class boxm_merge_mog
+-{
+- private:
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef bsta_mixture_fixed<gauss_type, 3> mix_gauss;
+-  typedef bsta_num_obs<mix_gauss> mix_gauss_type;
+-  typedef boct_tree<short, mix_gauss_type> mog_tree_type;
+-  typedef boct_tree<short, gauss_type> gauss_tree_type;
+-  typedef boct_tree_cell<short, mix_gauss_type> mog_cell_type;
+-  typedef boct_tree_cell<short, gauss_type> gauss_cell_type;
+-
+- public:
+-
+-  // === Scene operations ===
+-
+-  //: Merges the components of the gaussian mixtures at each voxel into a single gaussian, that minimizes KL divergence.
+-  //  The resulting scene contains unimodal Gaussians.
+-  bool kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &app_scene,  boxm_scene<boct_tree<short, gauss_type> > &gauss_app);
+-
+-  bool kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree, boct_tree<short, gauss_type> *gauss_tree);
+-
+-#if 0
+-  //: Converts a mixture of gaussians grid into an unimodal gaussian grid corresponding to the most probable mode
+-  static bool mpm_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> app_scene,  boxm_scene<boct_tree<short, gauss_type> gauss_app);
+-#endif
+-
+-  // === Distribution operations ===
+-
+-  //: Merges all the components in the mixture into one component that minimizes the KL divergence between the two distributions
+-  static void kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian);
+-};
+-
+-
+-//: Computes the differential entropy of a gaussian scene- only for leave cells
+-bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene,boxm_scene<boct_tree<short, float > >& scene_out);
+-
+-//: Computes expected color of a voxel as mean/occupancy
+-bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset);
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_refine.h b/contrib/brl/bseg/boxm/algo/boxm_refine.h
+deleted file mode 100644
+index c3f464f906..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_refine.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_refine_h_
+-#define boxm_refine_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-void boxm_refine_block(boxm_block<boct_tree<T_loc, T_data> > *block,
+-                       float occlusion_prob_thresh, unsigned & num_split, bool reset_appearance = true)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  tree_type* tree = block->get_tree();
+-  float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
+-  // get the leaf nodes of the block
+-  std::vector<boct_tree_cell<T_loc, T_data>*> leaf_nodes = tree->leaf_cells();
+-#ifdef DEBUG
+-  std::cout << "  NUMBER OF LEAF NODES=" << leaf_nodes.size();
+-#endif
+-  std::vector<boct_tree_cell<T_loc, T_data >*> split_list;
+-  for (unsigned i=0; i<leaf_nodes.size(); i++) {
+-    boct_tree_cell<T_loc, T_data>* cell = leaf_nodes[i];
+-    T_data data = cell->data();
+-
+-    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
+-    float alpha_int = data.alpha * side_len;
+-
+-    if ((alpha_int > max_alpha_int) && (cell->level() > 0)) {
+-      split_list.push_back(cell);
+-      // make sure neighbor cells are not already coarser than this cell
+-      // get all the faces;
+-#if 0
+-      boct_face_idx faces = ALL;
+-      std::vector<boct_tree_cell<T_loc, T_data >*> neighbors;
+-      cell->find_neighbors(faces, neighbors, cell->level()+1);
+-      split_list.insert(split_list.end(), neighbors.begin(), neighbors.end());
+-#endif
+-    }
+-  }
+-  num_split+=(int)split_list.size();
+-#ifdef DEBUG
+-  std::cout<<" Splitting "<<split_list.size()<<" cells" << std::endl;
+-#endif
+-  // splitting
+-  for (unsigned i=0; i<split_list.size(); i++) {
+-    boct_tree_cell<T_loc, T_data>* cell = split_list[i];
+-    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
+-    float new_alpha = max_alpha_int / side_len;
+-
+-    T_data old_sample = cell->data();
+-    typename T_data::apm_datatype app;
+-    if (!reset_appearance) {
+-      // if it is not set, transfer the old appearance to the new sample
+-      T_data new_sample = old_sample;
+-      new_sample.alpha=new_alpha;
+-      cell->split(new_sample);
+-    }
+-    else {
+-      T_data new_sample = T_data();
+-      new_sample.alpha = new_alpha;
+-      cell->split(new_sample);
+-    }
+-  }
+-}
+-
+-//: This method refines the blocks (octrees) of the scene
+-// If there are some cells with big values they are spitted into new child cells;
+-// the data of the cell is copied to the children's data. The purpose of this
+-// method is to elaborate the octree at the areas where more details exist.
+-// returns the number of leaf nodes in the refined octree
+-template <class T_loc, class T_data>
+-unsigned int boxm_refine_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                               float occlusion_prob_thresh,
+-                               bool reset_appearance = true)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  unsigned int nleaves = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  //float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boxm_refine_block(block, occlusion_prob_thresh,nleaves, reset_appearance);
+-    //nleaves += block->size();
+-    scene.write_active_block();
+-  }
+-  std::cout<<"Total No of leaves split "<<nleaves<<std::endl;
+-  return nleaves;
+-}
+-
+-#endif // boxm_refine_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
+deleted file mode 100644
+index 65c03397ce..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
++++ /dev/null
+@@ -1,155 +0,0 @@
+-#ifndef boxm_save_block_raw_h_
+-#define boxm_save_block_raw_h_
+-
+-#include <vector>
+-#include <new>
+-#include <iostream>
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/util/boxm_cell_data_traits.h>
+-
+-#include <bsta/bsta_attributes.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-void boxm_save_block_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                         vgl_point_3d<int> block_idx,
+-                         std::string filename,
+-                         unsigned int resolution_level)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  scene.load_block(block_idx);
+-  boxm_block<tree_type>* block = scene.get_block(block_idx);
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  tree_type* tree = block->get_tree();
+-
+-  // query the finest level of the tree and do not make the resolution smaller than that
+-  if (tree->finest_level() > (int)resolution_level)
+-    resolution_level = tree->finest_level();
+-
+-  // get origin of block
+-  vgl_point_3d<double> min = block_bb.min_point();
+-
+-  const unsigned int ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-  // assume that bounding box is a cube
+-  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-  // origin should specify center of first cell
+-  vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-  int data_size = ncells*ncells*ncells;
+-  int y_size = ncells*ncells;
+-  float *data = nullptr;
+-  data = new (std::nothrow)float[data_size];
+-
+-  if (data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-    return;
+-  }
+-  // init to zero
+-  for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-    *dp = 0.0f;
+-  }
+-
+-  double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-  out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-  std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-  for (unsigned i=0; i<cells.size(); i++)
+-  {
+-    vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-    float cell_val = boxm_cell_to_float(cells[i], step_len);
+-
+-    unsigned int level = cells[i]->get_code().level;
+-
+-    if (level == resolution_level) {
+-      // just copy value to output array
+-      int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
+-      if (out_index >= data_size)
+-        std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-      else
+-        data[out_index] = cell_val;
+-    }
+-    else if (level > resolution_level) {
+-      // cell is bigger than output cells.  copy value to all contained output cells.
+-      const unsigned int us_factor = 1 << (level - resolution_level);
+-      const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-      const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-      const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-      for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-        for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-          for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-            int out_index = z*y_size + y*ncells + x;
+-            //std::cout << level << "  " << out_index << std::endl;
+-            if (out_index >= data_size)
+-              std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-            else
+-              data[out_index] = cell_val;
+-          }
+-        }
+-      }
+-    }
+-    else {
+-      // cell is smaller than output cells. increment output cell value
+-      unsigned int ds_factor = 1 << (resolution_level - level);
+-      double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-      const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-      const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-      const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-      unsigned int out_index = static_cast<unsigned int>((node_z)*y_size + (node_y)*ncells + (node_x));
+-      data[out_index] += float(cell_val*update_weight);
+-    }
+-  }
+-  // convert float values to char
+-
+-  unsigned char *byte_data = nullptr;
+-  byte_data = new (std::nothrow) unsigned char[data_size];
+-  if (byte_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
+-    return;
+-  }
+-
+-  float* dp = data;
+-  for (unsigned char* bdp = byte_data; dp < data + data_size; ++dp, ++bdp) {
+-    //double P = 1.0 - std::exp(-*dp*step_len);
+-    *bdp = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5)); // always positive so this is an ok way to round
+-  }
+-  delete[] data;
+-
+-  // write header
+-  unsigned char data_type = 0; // 0 means unsigned byte
+-
+-  vxl_uint_32 nx = ncells;
+-  vxl_uint_32 ny = ncells;
+-  vxl_uint_32 nz = ncells;
+-
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx),sizeof(nx));
+-  os.write(reinterpret_cast<char*>(&ny),sizeof(ny));
+-  os.write(reinterpret_cast<char*>(&nz),sizeof(nz));
+-
+-  os.write((char*)byte_data,data_size);
+-  delete[] byte_data;
+-
+-  return;
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
+deleted file mode 100644
+index f3051e8f6e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
++++ /dev/null
+@@ -1,277 +0,0 @@
+-#ifndef boxm_save_scene_raw_h_
+-#define boxm_save_scene_raw_h_
+-//:
+-// \file
+-// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
+-//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
+-//         And then these sets of data combined and saved in a raw file.
+-//
+-// \author Gamze Tunali
+-// \date   September 9, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vector>
+-#include <new>
+-#include <iostream>
+-#include <sstream>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_cell_data_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-
+-#include <bsta/bsta_histogram.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vsl/vsl_binary_io.h>
+-#include <vpl/vpl.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-template <class T_loc, class T_data>
+-void boxm_save_scene_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                         std::string filename,
+-                         unsigned int resolution_level)
+-{
+-  float minv = 1.0e10, maxv = 0.0;
+-  bsta_histogram<float> h(0.0f, 1.0f, 20);
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  unsigned int finest_level=scene.finest_level();
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  if (resolution_level < finest_level)
+-  resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    float *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)float[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-    // init to zero
+-    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = 0.0f;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      float cell_val = boxm_cell_to_float(cells[i], step_len);
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              //int out_index=x*y_size + y*ncells + z;
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-              //////int out_index=z + y*ncells + x*ncells*ncells;
+-              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
+-
+-        data[out_index] += float(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << fn << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    float* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      //double P = 1.0 - std::exp(-*dp*step_len);
+-      // always positive so this is an ok way to round
+-      float fv = *dp;
+-      h.upcount(fv, 1.0f);
+-      if (fv<minv) minv = fv;
+-      if (fv>maxv) maxv = fv;
+-      unsigned char c = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5));
+-      vsl_b_write(os, (char) c);
+-    }
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-  scene.unload_active_blocks();
+-
+-  assert(ncells > 0);
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  char* byte_data = new (std::nothrow) char[row_data_size];
+-  if (byte_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type = 0; // 0 means unsigned byte
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read(byte_data, ncells);
+-            os.write((char*)byte_data,ncells);
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] byte_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-  std::cout << "Volume Histogram(" << minv << ' ' << maxv << "):[0->1]20bins\n";
+-  h.print();
+-  return;
+-}
+-
+-#endif // boxm_save_scene_raw_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
+deleted file mode 100644
+index 28753c4595..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
++++ /dev/null
+@@ -1,824 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
+-#ifndef boxm_save_scene_raw_general_h
+-#define boxm_save_scene_raw_general_h
+-
+-//:
+-// \file
+-// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
+-//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
+-//         And then these sets of data combined and saved in a raw file.
+-//
+-// \author Gamze Tunali
+-// \date   September 9, 2009
+-// \verbatim
+-//  Modifications
+-//   February 17, 2011 Isabel Restrepo: Modified functions to use with more general scenes.
+-//                                      Double, float values are not converted to byte, nor assumptions are made. Values are saves as they are
+-// \endverbatim
+-
+-#include <vector>
+-#include <new>
+-#include <iostream>
+-#include <sstream>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_cell_data_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <bsta/bsta_histogram.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vsl/vsl_binary_io.h>
+-#include <vpl/vpl.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-#include <vul/vul_file.h>
+-
+-
+-//: Traits for saving grids of different datatypes to Drishti .raw file
+-template <class T>
+-class boxm_dristhi_traits;
+-
+-//: Drishti datatypes for header:
+-// * 0 : unsigned byte - 1 byte per voxel
+-// * 1 : signed byte - 1 byte per voxel
+-// * 2 : unsigned short - 2 bytes per voxel
+-// * 3 : signed short - 2 bytes per voxel
+-// * 4 : integer - 4 bytes per voxel
+-// * 8 : float - 4 bytes per voxel
+-
+-//: Drishti traits specializations. Please extent as needed
+-
+-template <>
+-class boxm_dristhi_traits<float>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 8;}
+-};
+-
+-
+-template <>
+-class boxm_dristhi_traits<unsigned char>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 0;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<char>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 1;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<short>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 3;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<unsigned int>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 4;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<bsta_num_obs<bsta_gauss_sf1> >
+-{
+- public:
+-  static unsigned char dristhi_header() {return 8;}
+-};
+-
+-
+-template <class T_loc>
+-void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, bool > > &scene,
+-                                 std::string filename,
+-                                 unsigned int resolution_level)
+-{
+-  unsigned long n_zeros = 0;
+-  unsigned long n_ones = 0;
+-  unsigned long n_zeros_level0 = 0;
+-  unsigned long n_ones_level0 = 0;
+-
+-  typedef boct_tree<T_loc, bool > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  unsigned int finest_level=scene.finest_level();
+-
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    unsigned char *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)unsigned char[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-
+-    // init to zero
+-    for (unsigned char* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = (unsigned char)0.0;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, bool > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      unsigned char cell_val = (unsigned char)cells[i]->data()*255;
+-      if (cells[i]->data()) {
+-        n_ones++;
+-        if (cells[i]->get_code().level ==0)
+-          n_ones_level0++;
+-      }
+-      else {
+-        n_zeros++;
+-        if (cells[i]->get_code().level ==0)
+-          n_zeros_level0++;
+-      }
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-
+-        data[out_index] += (unsigned char)(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << filename << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    unsigned char* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      unsigned char v = *dp;
+-      vsl_b_write(os, (unsigned char)v);
+-    }
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-
+-  scene.unload_active_blocks();
+-
+-  assert(ncells > 0);
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  unsigned char* read_data = new (std::nothrow) unsigned char[row_data_size];
+-  if (read_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type= 0;
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read(reinterpret_cast<char*>(read_data), ncells*sizeof(unsigned char));
+-            os.write(reinterpret_cast<char*>(read_data),ncells*sizeof(unsigned char));
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] read_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-
+-  std::cout << "Number of true cells : " << n_ones << "\n Number of false cells: " << n_zeros << std::endl;
+-  std::cout << "Number of true cells at level 0 : " << n_ones_level0 << "\n Number of false cells at level 0: " << n_zeros_level0 << std::endl;
+-
+-  return;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                 std::string filename,
+-                                 unsigned int resolution_level)
+-{
+-  std::cout << " Using boxm_save_scene_raw_general\n";
+-  bsta_histogram<float> hist;
+-  boxm_compute_scene_statistics(&scene, hist);
+-  hist.pretty_print();
+-
+-  std::stringstream ss;
+-  ss << vul_file::strip_extension(filename) << "_hist_plot.txt" ;
+-  std::ofstream hist_arrays_ofs((ss.str()).c_str());
+-  hist.print_to_arrays(hist_arrays_ofs);
+-  hist_arrays_ofs.close();
+-
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  unsigned int finest_level=scene.finest_level();
+-
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    T_data *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)T_data[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-
+-    // init to zero
+-    for (T_data* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = (T_data)0.0;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      T_data cell_val = cells[i]->data();
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-
+-        data[out_index] += (T_data)(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << filename << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    T_data* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      T_data v = *dp;
+-      if (v > 19 || v < -1)
+-        std::cerr << "Error, v: " << v << '\n';
+-      vsl_b_write(os, (T_data)v);
+-    }
+-    std::cerr << " Data Correct ? " << '\n';
+-
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-
+-  scene.unload_active_blocks();
+-
+-  assert(ncells > 0);
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  T_data* read_data = new (std::nothrow) T_data[row_data_size];
+-  if (read_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type = boxm_dristhi_traits<T_data>::dristhi_header();
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read((char*)read_data, ncells*sizeof(T_data));
+-            os.write((char*)read_data,ncells*sizeof(T_data));
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] read_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-  return;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_save_scene_raw_general_to_byte(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                         std::string filename,
+-                                         unsigned int resolution_level)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  std::cout << " Using boxm_save_scene_raw_general_to_byte\n";
+-
+-  bsta_histogram<float> hist;
+-  boxm_compute_scene_statistics(&scene, hist);
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  unsigned int finest_level=scene.finest_level();
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    float *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)float[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-    // init to zero
+-    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = 0.0f;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      float cell_val = boxm_cell_to_float(cells[i], step_len);
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              //int out_index=x*y_size + y*ncells + z;
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-              //////int out_index=z + y*ncells + x*ncells*ncells;
+-              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
+-
+-        data[out_index] += float(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << filename << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    T_data minv = hist.min();
+-    T_data maxv = hist.max();
+-    T_data rangev = maxv-minv;
+-
+-    float* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      unsigned char c = (unsigned char)(std::floor((255.0f * float((*dp)-minv)/float(rangev)) + 0.5f));
+-      vsl_b_write(os, (char) c);
+-    }
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-  assert(ncells > 0);
+-
+-  scene.unload_active_blocks();
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  char* byte_data = new (std::nothrow) char[row_data_size];
+-  if (byte_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type = 0; // 0 means unsigned byte
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read(byte_data, ncells);
+-            os.write((char*)byte_data,ncells);
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] byte_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-  std::cout << "Volume Histogram\n";
+-  hist.pretty_print();
+-  return;
+-}
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h b/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
+deleted file mode 100644
+index bdfb1db979..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
++++ /dev/null
+@@ -1,97 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_scene_levels_utils.h
+-#ifndef boxm_scene_levels_utils_h
+-#define boxm_scene_levels_utils_h
+-//:
+-// \file
+-// \brief Functions to explore the levels of an octre
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Sep-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_data>
+-boxm_scene<boct_tree<short, bool> >* boxm_explore_cells_at_level(boxm_scene<boct_tree<short, T_data> > *scene_in, short level)
+-{
+-  //parameters and structure of the output scene are the same as those of the input scene
+-  boxm_scene<boct_tree<short, bool> > *scene_out = new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-  scene_out->set_paths(scene_in->path(), "level");
+-  scene_out->set_appearance_model(BOXM_BOOL);
+-  scene_out->write_scene("level.xml");
+-
+-  scene_in->template clone_blocks_to_type<boct_tree<short, bool> >(*scene_out, false);
+-
+-  //iterate through the leaf cells
+-  boxm_cell_iterator<boct_tree<short, T_data> > it_in =
+-    scene_in->cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block, true);
+-  boxm_cell_iterator<boct_tree<short, bool> > it_out =
+-    scene_out->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
+-
+-  for (it_in.begin(), it_out.begin(); !it_in.end() && !it_out.end(); ++it_in, ++it_out)
+-  {
+-    boct_tree_cell<short,T_data > *cell_in = *it_in;
+-    boct_tree_cell<short,bool > *cell_out = *it_out;
+-
+-    //check for level
+-    if ((cell_in->level() == level)) {
+-      cell_out->set_data(true);
+-    }
+-  }
+-
+-  scene_in->unload_active_blocks();
+-  scene_out->unload_active_blocks();
+-
+-  return scene_out;
+-}
+-
+-
+-template <class T_data>
+-void boxm_remove_level_0_leaves(boxm_scene<boct_tree<short, T_data> > *scene_in)
+-{
+-  typedef boct_tree<short,T_data> tree_type;
+-
+-  //Iterate through the blocks
+-  boxm_block_iterator<tree_type> it_in = scene_in->iterator();
+-  for (it_in.begin(); !it_in.end(); ++it_in)
+-  {
+-    scene_in->load_block(it_in.index());
+-    tree_type *tree_in= (*it_in)->get_tree();
+-
+-    std::vector<boct_tree_cell<short, T_data> * > all_cells =  tree_in->all_cells();
+-    typename std::vector<boct_tree_cell<short, T_data> * >::iterator cells_it = all_cells.begin();
+-
+-    for (; cells_it!=all_cells.end(); cells_it++) {
+-      boct_tree_cell<short, T_data> * cell_in = *cells_it;
+-      //check for level
+-      short level = cell_in->level();
+-      if (level == 0) {
+-        cell_in = nullptr;
+-      }
+-      else {
+-        if (level == 1)
+-          cell_in->set_children_null();
+-        //shift loccode one space to the rigth
+-        boct_loc_code<short> shift_code;
+-        shift_code.set_code(cell_in->get_code().x_loc_ >> 1, cell_in->get_code().y_loc_ >> 1, cell_in->get_code().z_loc_ >> 1);
+-        shift_code.set_level(level - 1);
+-        cell_in->set_code(shift_code);
+-      }
+-    }
+-
+-    tree_in->reset_num_levels(tree_in->number_levels() - 1);
+-    scene_in->write_active_block();
+-    std::cout << '.';
+-  }
+-  std::cout << "\nCleaning\n";
+-  scene_in->unload_active_blocks();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h b/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
+deleted file mode 100644
+index eb982606db..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
++++ /dev/null
+@@ -1,105 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_split_sample.h
+-#ifndef boxm_split_sample_h
+-#define boxm_split_sample_h
+-//:
+-// \file
+-// \brief  A class enclosing set of functions to split a boxm_sample scenes/trees into appearance and occupancy scenes/trees
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  December 3, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<boxm_apm_type APM_MODEL>
+-class boxm_split_sample
+-{
+- public:
+-  typedef boct_tree<short, boxm_sample<APM_MODEL> > sample_tree_type;
+-  typedef boct_tree_cell<short, boxm_sample<APM_MODEL> > sample_cell_type;
+-
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
+-  typedef boct_tree<short, apm_datatype> apm_tree_type;
+-  typedef boct_tree_cell<short, apm_datatype> apm_cell_type;
+-
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype alpha_datatype;
+-  typedef boct_tree<short, alpha_datatype> alpha_tree_type;
+-  typedef boct_tree_cell<short, alpha_datatype> alpha_cell_type;
+-
+-  //: A function to split an boxm_sample scene, into an appearance and an occupancy scene
+-  void split_scene(boxm_scene<sample_tree_type> &scene_in, boxm_scene<apm_tree_type> &apm_scene, boxm_scene<alpha_tree_type > &alpha_scene);
+-
+-  //: A function to split an boxm_sample tree, into an appearance and an occupancy tree
+-  void split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree);
+-};
+-
+-
+-//: A function to split an boxm_sample scene, into an appearance and an occupancy scene
+-template<boxm_apm_type APM_MODEL>
+-void boxm_split_sample<APM_MODEL>::split_scene(boxm_scene<sample_tree_type> &scene_in,
+-                                               boxm_scene<apm_tree_type> &apm_scene,
+-                                               boxm_scene<alpha_tree_type > &alpha_scene)
+-{
+-  //missing:check that dimensions of all scenes agree
+-
+-  //iterate through blocks in the scenes
+-  boxm_block_iterator<sample_tree_type> iter_in = scene_in.iterator();
+-  boxm_block_iterator<apm_tree_type> apm_iter = apm_scene.iterator();
+-  boxm_block_iterator<alpha_tree_type> alpha_iter = alpha_scene.iterator();
+-
+-  iter_in.begin();
+-  apm_iter.begin();
+-  alpha_iter.begin();
+-  while (!iter_in.end() || !apm_iter.end() ||!alpha_iter.end())
+-  {
+-    scene_in.load_block(iter_in.index());
+-    apm_scene.load_block(apm_iter.index());
+-    alpha_scene.load_block(alpha_iter.index());
+-
+-    sample_tree_type *tree_in= (*iter_in)->get_tree();
+-    apm_tree_type *apm_tree = tree_in->template clone_to_type<apm_datatype>();
+-    alpha_tree_type *alpha_tree = tree_in->template clone_to_type<alpha_datatype>();
+-    this->split_tree(tree_in, apm_tree,alpha_tree);
+-    (*apm_iter)->init_tree(apm_tree);
+-    (*alpha_iter)->init_tree(alpha_tree);
+-    apm_scene.write_active_block();
+-    alpha_scene.write_active_block();
+-
+-    iter_in++; apm_iter++; alpha_iter++;
+-  }
+-}
+-
+-
+-//: A function to split an boxm_sample tree, into an appearance and an occupancy tree
+-template<boxm_apm_type APM_MODEL>
+-void boxm_split_sample<APM_MODEL>::split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree)
+-{
+-  //iterate through the trees
+-  std::vector<sample_cell_type*> sample_cells = tree_in->all_cells();
+-  std::vector<apm_cell_type*> apm_cells = apm_tree->all_cells();
+-  std::vector<alpha_cell_type*> alpha_cells = alpha_tree->all_cells();
+-
+-  if (sample_cells.size()!=apm_cells.size() || apm_cells.size()!=alpha_cells.size()){
+-    std::cerr << "Different size vectors in split_sample_scene::split_tree\n";
+-    return;
+-  }
+-
+-  for (unsigned i = 0; i < sample_cells.size(); i++)
+-  {
+-    boxm_sample<APM_MODEL> sample = sample_cells[i]->data();
+-    apm_cells[i]->set_data(sample.appearance_);
+-    alpha_cells[i]->set_data(sample.alpha);
+-  }
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
+deleted file mode 100644
+index 63fe2ff02b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
++++ /dev/null
+@@ -1,156 +0,0 @@
+-#ifndef boxm_render_mesh_h_
+-#define boxm_render_mesh_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <imesh/imesh_mesh.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-void boxm_upload_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
+-                                 imesh_mesh& mesh, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  imesh_face_array_base& fs = mesh.faces();
+-  for (unsigned i=0; i < fs.size(); ++i)
+-  {
+-    std::list<vgl_point_3d<double> > v_list;
+-    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
+-    vgl_box_3d<double> bb_scale, bb_global;
+-    for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-      unsigned int v_id = fs(i,j);
+-      vgl_point_3d<double> v;
+-      if (use_lvcs) {
+-        double lx, ly, lz;
+-        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                             vpgl_lvcs::wgs84,lx,ly,lz);
+-        v=vgl_point_3d<double>(lx,ly,lz);
+-      }
+-      else
+-        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-      bb_global.add(v);
+-      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-      v.set(diff.x(), diff.y(), diff.z());
+-      // the local coordinates inside the box region
+-      v_list.push_back(v);
+-      //convert the values into [0,1] range
+-      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-      bb_scale.add(v);
+-    }
+-    // check if polygon's bounding box intersects with the block
+-    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-    if (inters.is_empty())
+-      return;
+-
+-    // locate the polygon bounding box in tree
+-    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
+-    if (region) {
+-      // test all the children for intersection
+-      std::vector<boct_tree_cell<T_loc,T_data>*> children;
+-      if (!region->is_leaf())
+-        region->leaf_children(children);
+-      else // insert the node itself, if no children
+-        children.push_back(region);
+-      for (unsigned i=0; i<children.size(); i++) {
+-        boct_tree_cell<T_loc,T_data>* cell=children[i];
+-        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
+-        if (vgl_intersection<double>(cell_bb, v_list)) {
+-          cell->set_data(val);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
+-template <>
+-void boxm_upload_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
+-                                 imesh_mesh& mesh, vpgl_lvcs& lvcs,
+-                                 bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  imesh_face_array_base& fs = mesh.faces();
+-  for (unsigned i=0; i < fs.size(); ++i)
+-  {
+-    std::list<vgl_point_3d<double> > v_list;
+-    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
+-    vgl_box_3d<double> bb_scale, bb_global;
+-    for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-      unsigned int v_id = fs(i,j);
+-      vgl_point_3d<double> v;
+-      if (use_lvcs) {
+-        double lx, ly, lz;
+-        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                             vpgl_lvcs::wgs84,lx,ly,lz);
+-        v=vgl_point_3d<double>(lx,ly,lz);
+-      }
+-      else
+-        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-      bb_global.add(v);
+-      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-      v.set(diff.x(), diff.y(), diff.z());
+-      // the local coordinates inside the box region
+-      v_list.push_back(v);
+-      //convert the values into [0,1] range
+-      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-      bb_scale.add(v);
+-    }
+-    // check if polygon's bounding box intersects with the block
+-    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,0.999,0.999,0.999), bb_scale);
+-    if (inters.is_empty())
+-      return;
+-
+-    // locate the polygon bounding box in tree
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
+-    if (region) {
+-      // test all the children for intersection
+-      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
+-      if (!region->is_leaf())
+-        region->leaf_children(children);
+-      else // insert the node itself, if no children
+-        children.push_back(region);
+-      for (auto cell : children) {
+-        vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
+-        if (vgl_intersection<double>(cell_bb, v_list)) {
+-          boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
+-          tempdata.set_appearance(val.appearance());
+-          tempdata.alpha*=val.alpha;
+-          cell->set_data(tempdata);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-//: calls all the blocks for drawing meshes
+-template <class T_loc, class T_data>
+-void boxm_upload_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                 imesh_mesh& mesh, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  vpgl_lvcs lvcs=scene.lvcs();
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  mesh.compute_face_normals(true);
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boxm_upload_mesh_into_block(block, mesh, lvcs, use_lvcs, val);
+-    scene.write_active_block();
+-  }
+-}
+-
+-#endif // boxm_render_mesh_h_
+diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+deleted file mode 100644
+index 2a41c2db1a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,40 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and bvxm_pro depends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-FIND_PACKAGE(RPLY REQUIRED)
+-if(RPLY_FOUND)
+-  include_directories( ${RPLY_INCLUDE_DIR} )
+-else()
+-  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
+-endif()
+-
+-  set(boxm_algo_pro_sources
+-      boxm_algo_processes.h
+-      boxm_algo_register.h   boxm_algo_register.cxx
+-  )
+-
+-  #aux_source_directory(Templates boxm_algo_pro_sources)
+-  aux_source_directory(processes boxm_algo_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_algo_pro LIBRARY_SOURCES ${boxm_algo_pro_sources} )
+-
+-  target_link_libraries(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil vsol ${VXL_LIB_PREFIX}vgl brip ${VXL_LIB_PREFIX}vcl rply)
+-  # Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
+-  # Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
+-  # Need vil_pro  only for the instantiation of brdb_value_t<vil_smart_ptr<vil_image_view_base> >
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
+deleted file mode 100644
+index f22427eeed..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
++++ /dev/null
+@@ -1,28 +0,0 @@
+-#ifndef boxm_algo_processes_h_
+-#define boxm_algo_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_describe_scene_process);
+-DECLARE_FUNC_CONS(boxm_init_scene_process);
+-DECLARE_FUNC_CONS(boxm_line_backproject_process);
+-DECLARE_FUNC_CONS(boxm_refine_scene_process);
+-DECLARE_FUNC_CONS(boxm_replace_const_app_process);
+-DECLARE_FUNC_CONS(boxm_roi_init_process);
+-DECLARE_FUNC_CONS(boxm_roi_init_rational_camera_process);
+-DECLARE_FUNC_CONS(boxm_save_occupancy_raw_process);
+-DECLARE_FUNC_CONS(boxm_save_scene_raw_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
+-DECLARE_FUNC_CONS(boxm_merge_mixtures_process);
+-DECLARE_FUNC_CONS(boxm_split_scene_process);
+-DECLARE_FUNC_CONS(boxm_compute_scene_difference_process);
+-DECLARE_FUNC_CONS(boxm_compute_entropy_process);
+-DECLARE_FUNC_CONS(boxm_compute_expected_color_scene_process);
+-DECLARE_FUNC_CONS(boxm_linear_combination_process);
+-DECLARE_FUNC_CONS(boxm_explore_cells_at_level_process);
+-DECLARE_FUNC_CONS(boxm_fill_internal_cells_process);
+-DECLARE_FUNC_CONS(boxm_remove_level0_process);
+-DECLARE_FUNC_CONS(boxm_create_scene_from_ply_process);
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
+deleted file mode 100644
+index b883c164fa..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
++++ /dev/null
+@@ -1,35 +0,0 @@
+-#include "boxm_algo_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "boxm_algo_processes.h"
+-
+-void boxm_algo_register::register_datatype()
+-{
+-}
+-
+-void boxm_algo_register::register_process()
+-{
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_describe_scene_process,"boxmDescribeSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_init_scene_process,"boxmInitSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process,"boxmLineBackprojectProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_refine_scene_process, "boxmRefineSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_replace_const_app_process,"boxmReplaceConstAppProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_process, "boxmROIInitProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_rational_camera_process, "boxmROIInitRationalCameraProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_occupancy_raw_process, "boxmSaveOccupancyRawProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_scene_raw_process, "boxmSaveSceneRawProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_vrml_process, "boxmRenderExpectedEdgeVRMLProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_merge_mixtures_process, "boxmMergeMixturesProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_split_scene_process ,"boxmSplitSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_scene_difference_process, "boxmComputeSceneDifferenceProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_entropy_process, "boxmComputeEntropyProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_expected_color_scene_process, "boxmComputeExpectedColorSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_linear_combination_process, "boxmLinearCombinationProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_explore_cells_at_level_process, "boxmExploreCellsAtLevelProcess");
+-  REG_PROCESS_FUNC_CONS2(boxm_fill_internal_cells_process);
+-  REG_PROCESS_FUNC_CONS2(boxm_remove_level0_process);
+-  REG_PROCESS_FUNC_CONS2(boxm_create_scene_from_ply_process);
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
+deleted file mode 100644
+index 3c21937894..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_algo_register_h_
+-#define boxm_algo_register_h_
+-
+-class boxm_algo_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_algo_register_h_
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
+deleted file mode 100644
+index 1b8cf32459..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-//:
+-// \file
+-// \brief A process that outputs the differential entropy of the gaussian stored at every leave cell
+-// \author Isabel Restrepo
+-// \date 15-Nov-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/algo/boxm_merge_mog.h>
+-
+-
+-//:global variables
+-namespace boxm_compute_entropy_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_compute_entropy_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_entropy_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_compute_entropy_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_entropy_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef boct_tree<short, gauss_type> gauss_tree_type;
+-
+-  auto *gauss_scene = dynamic_cast<boxm_scene<gauss_tree_type>* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!gauss_scene) {
+-    std::cout <<  " :-- Scene is not of valid type!\n";
+-    return false;
+-  }
+-
+-  //parameters and structure of the output scene are the same as those of the input scene
+-  boxm_scene<boct_tree<short, float> > *entropy_scene = new boxm_scene<boct_tree<short, float> >(gauss_scene->lvcs(), gauss_scene->origin(), gauss_scene->block_dim(), gauss_scene->world_dim(), gauss_scene->max_level(), gauss_scene->init_level());
+-  entropy_scene->set_paths(gauss_scene->path(), "entropy");
+-  entropy_scene->set_appearance_model(BOXM_FLOAT);
+-
+-  compute_differential_entropy(*gauss_scene, *entropy_scene);
+-  gauss_scene->write_scene("entropy_scene.xml");
+-  pro.set_output_val<boxm_scene_base_sptr>(0, entropy_scene);
+-  std::cout<<"Exiting" << std::endl;
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
+deleted file mode 100644
+index e99f978d28..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-//:
+-// \file
+-// \brief A process that computes the "expected visible color"  at each voxel
+-// \author Isabel Restrepo
+-// \date 17-Nov-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/algo/boxm_merge_mog.h>
+-
+-
+-//:global variables
+-namespace boxm_compute_expected_color_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_compute_expected_color_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_expected_color_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float"; //offset for appearance values
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_compute_expected_color_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_expected_color_scene_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  auto grey_offset = pro.get_input<float>(1);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
+-
+-  auto *scene = dynamic_cast<boxm_scene<scene_tree_type>* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!scene) {
+-    std::cout <<  " :-- Scene is not of valid type!\n";
+-    return false;
+-  }
+-
+-  //parameters and structure of the output scene are the same as those of the input scene
+-  boxm_scene<boct_tree<short, float> > *mean_color_scene = new boxm_scene<boct_tree<short, float> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  mean_color_scene->set_paths(scene->path(), "mean_color");
+-  mean_color_scene->set_appearance_model(BOXM_FLOAT);
+-
+-  compute_expected_color(*scene, *mean_color_scene, grey_offset);
+-  mean_color_scene->write_scene("mean_color_scene.xml");
+-  pro.set_output_val<boxm_scene_base_sptr>(0, mean_color_scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
+deleted file mode 100644
+index f7efed8c52..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
++++ /dev/null
+@@ -1,91 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
+-
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for computing the difference between two scenes.
+-//
+-// \author Vishal Jain
+-// \date Sept 8, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_parser.h>
+-#include <boxm/algo/boxm_compute_scene_difference.h>
+-
+-//: global variables
+-namespace boxm_compute_scene_difference_process_globals
+-{
+-  //this process takes no outputs
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: sets input and output types
+-bool boxm_compute_scene_difference_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_scene_difference_process_globals;
+-
+-  // process takes 1 input and no outputs
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "boxm_scene_base_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "float";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//: creates a scene from parameters
+-bool boxm_compute_scene_difference_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_scene_difference_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_compute_scene_difference_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene1_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr scene2_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr sceneout_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto t = pro.get_input<float>(i++);
+-
+-  if (scene1_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
+-      scene2_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
+-      sceneout_ptr->appearence_model() == BOXM_APM_MOG_GREY )
+-  {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *scene1 = static_cast<boxm_scene<tree_type>*> (scene1_ptr.as_pointer());
+-      auto *scene2 = static_cast<boxm_scene<tree_type>*> (scene2_ptr.as_pointer());
+-      auto *sceneout = static_cast<boxm_scene<tree_type>*> (sceneout_ptr.as_pointer());
+-
+-    boxm_compute_scene_difference(*scene1,*scene2,*sceneout,t);
+-  }
+-  else {
+-    std::cout << "boxm_compute_scene_difference_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
+deleted file mode 100644
+index fdf40edf0e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
++++ /dev/null
+@@ -1,257 +0,0 @@
+-//:
+-// \file
+-// \brief A process that creates a boxm scene from a .ply file
+-// \author Isabel Restrepo
+-// \date 2-Jan-2012
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <rply.h>   //.ply parser
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boct/util/boct_construct_tree.h>
+-#define DEBUG_PLY
+-
+-class boxm_vgl_point_3d_coord_compare
+-{
+- public:
+-  boxm_vgl_point_3d_coord_compare() = default;
+-  ~boxm_vgl_point_3d_coord_compare() = default;
+-
+-  bool operator() ( vgl_point_3d<int> const& pa, vgl_point_3d<int> pb ) const
+-  {
+-    if      ( pa.x() != pb.x() ) return pa.x() < pb.x();
+-    else if ( pa.y() != pb.y() ) return pa.y() < pb.y();
+-    else                         return pa.z() < pb.z();
+-  }
+-};
+-
+-
+-class boxm_apperace_fileio_parsed_ply_
+-{
+- public:
+-  double p[3];  //holds location
+-  unsigned char color; //holds color
+-  double grey_offset; //offset the floating point (0,1) color value
+-  //accumulated data in the shape of leaf cells
+-  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
+-  boxm_scene<boct_tree<short, float> > *scene;
+-};
+-
+-bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
+-                         std::map<vgl_point_3d<int>,
+-                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
+-                         const float &grey_offset);
+-
+-//: Call-back function for a "vertex" element
+-int boxm_plyio_vertex_cb_(p_ply_argument argument);
+-
+-//: global variables
+-namespace boxm_create_scene_from_ply_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool boxm_create_scene_from_ply_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_from_ply_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; //path to .ply file
+-  input_types_[1] = "boxm_scene_base_sptr"; //the scene to fill up
+-  input_types_[2] = "float"; //offset for appearance values
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool boxm_create_scene_from_ply_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_from_ply_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  std::string ply_file = pro.get_input<std::string>(0);
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(1);
+-  auto grey_offset = pro.get_input<float>(2);
+-
+-  // Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-  // cast input scene
+-  auto *scene = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  // Map to hold the index of block and the cell containing appearance (0,1)
+-  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
+-
+-  boxm_block_iterator<boct_tree<short, float> > block_iter = scene->iterator();
+-
+-  for (block_iter.begin(); !block_iter.end(); ++block_iter)
+-  {
+-    data[block_iter.index()]= std::vector<boct_tree_cell<short, float> >();
+-  }
+-
+-  if (!boxm_load_color_ply(ply_file, scene, data, grey_offset)){
+-    pro.set_output_val<boxm_scene_base_sptr>(0, nullptr);
+-    return false;
+-  }
+-
+-
+-  //construct trees
+-  for (block_iter.begin(); !block_iter.end(); ++block_iter)
+-  {
+-    std::cout << "In block: " << block_iter.index() << "Number of leaves: " <<data[block_iter.index()].size() << std::endl;
+-    boct_tree_cell<short, float>* root = boct_construct_tree(data[block_iter.index()], scene->max_level(), 0.0f );
+-    auto* tree = new boct_tree<short,float>(root,  scene->max_level());
+-    vgl_box_3d<double> tree_bbox= scene->get_block_bbox(block_iter.index());
+-    tree->set_bbox(tree_bbox);
+-
+-    scene->load_block(block_iter.index());
+-    (*block_iter)->init_tree(tree);
+-    scene->write_active_block();
+-    data[block_iter.index()].clear();
+-  }
+-
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
+-
+-  return true;
+-}
+-
+-
+-// ============================== PLY ==============================
+-
+-
+-bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
+-                         std::map<vgl_point_3d<int>,
+-                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
+-                         const float &grey_offset)
+-{
+-  long nvertices;
+-
+-  boxm_apperace_fileio_parsed_ply_ parsed_ply;
+-  parsed_ply.grey_offset = grey_offset;
+-  parsed_ply.data = data;
+-  parsed_ply.scene = scene;
+-
+-
+-  // OPEN file
+-#ifdef DEBUG_PLY
+-  std::cerr << " loading " << ply_file << " :\n";
+-  std::cerr << " gray_offset " << parsed_ply.grey_offset << grey_offset << " :\n";
+-
+-#endif
+-
+-  p_ply ply = ply_open(ply_file.c_str(), nullptr, 0, nullptr);
+-  if (!ply){
+-    std::cerr << "Couldn't open ply file: " << ply_file << '\n';
+-    return false;
+-  }
+-
+-  // Read HEADER
+-  if (!ply_read_header(ply)) return false;
+-
+-  // vertex
+-  nvertices =
+-  ply_set_read_cb(ply, "vertex", "x",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 0);
+-  ply_set_read_cb(ply, "vertex", "y",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 1);
+-  ply_set_read_cb(ply, "vertex", "z",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 2);
+-  ply_set_read_cb(ply, "vertex", "diffuse_red",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 3);
+-
+-#ifdef DEBUG_PLY
+-  std::cerr << nvertices << " points\n";
+-#endif
+-
+-  // Read DATA
+-  if (!ply_read(ply)) return false;
+-
+-  // CLOSE file
+-  ply_close(ply);
+-
+-  data=parsed_ply.data;
+-
+-#ifdef DEBUG_PLY
+-  std::cerr << "  done.\n";
+-#endif
+-
+-  return true;
+-}
+-
+-
+-//: Call-back function for a "vertex" element
+-int boxm_plyio_vertex_cb_(p_ply_argument argument)
+-{
+-  long index;
+-  void* temp;
+-  ply_get_argument_user_data(argument, &temp, &index);
+-
+-  auto* parsed_ply =  (boxm_apperace_fileio_parsed_ply_*) temp;
+-  //std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
+-
+-  switch (index)
+-  {
+-    case 0: // "x" coordinate
+-      parsed_ply->p[0] = ply_get_argument_value(argument);
+-      break;
+-    case 1: // "y" coordinate
+-      parsed_ply->p[1] = ply_get_argument_value(argument);
+-      break;
+-    case 2: // "z" coordinate
+-      parsed_ply->p[2] = ply_get_argument_value(argument);
+-      break;
+-    case 3:
+-    {
+-      parsed_ply->color = (unsigned char)ply_get_argument_value(argument);
+-      //insert data
+-      vgl_point_3d<int> block_index(-1,-1,-1);
+-      if (parsed_ply->scene->get_block_index(vgl_point_3d<double>(parsed_ply->p), block_index))
+-      {
+-        //convert point into local(tree coordinates)
+-        vgl_box_3d<double> global_bbox= parsed_ply->scene->get_block_bbox(block_index);
+-        vgl_point_3d<double> norm_p((parsed_ply->p[0]-global_bbox.min_x())/global_bbox.width(),
+-                                    (parsed_ply->p[1]-global_bbox.min_y())/global_bbox.height(),
+-                                    (parsed_ply->p[2]-global_bbox.min_z())/global_bbox.depth());
+-        // convert point to location code.
+-        boct_loc_code<short> loc_code(norm_p, parsed_ply->scene->max_level()-1);
+-        boct_tree_cell<short, float> leaf_cell(loc_code);
+-        float expected_color = float(parsed_ply->color)/255.0f + float(parsed_ply->grey_offset);
+-        if (expected_color > 2.0f || expected_color < 0.0f)
+-          std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
+-        leaf_cell.set_data(expected_color);
+-        parsed_ply->data[block_index].push_back(leaf_cell);
+-      }
+-      break;
+-    }
+-    default:
+-      assert(!"This should not happen: index out of range");
+-      break;
+-  }
+-  return 1;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
+deleted file mode 100644
+index 2fb47d460f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
++++ /dev/null
+@@ -1,106 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A process for describing the attributes of a scene
+-//
+-// \author J.L. Mundy
+-// \date January 24, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <bsta/bsta_histogram_sptr.h>
+-
+-namespace boxm_describe_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 4;
+-}
+-
+-bool boxm_describe_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_describe_scene_process_globals;
+-
+-  //process takes 1 input
+-  //input[0]: scene binary file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  // process has 4 outputs:
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "bsta_histogram_sptr"; // Omega Histogram
+-  output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
+-  output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
+-  output_types_[3] = "unsigned";            // Number of leaves
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-// This process produces four outputs
+-//  1) The distribution of "Omega" values where Omega = 1-e^( alpha x length )
+-//  2) The distribution of "Sigma" values where Sigma is the std_dev of
+-//     the appearance model. (currently implemented only for simple grey)
+-//  3) The histogram of levels for leaves in the octree
+-//  4) The number of leaves in the tree
+-//
+-bool boxm_describe_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_describe_scene_process_globals;
+-
+-  if ( !pro.verify_inputs() ) {
+-    std::cerr << pro.name() << ": invalid inputs\n";
+-    return false;
+-  }
+-  unsigned n_leaves = 0;
+-  //assign tree type
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      std::cerr<<"boxm_describe_scene_process not yet implemented for Gaussian mixture\n";
+-      return false;//not implemented
+-    }
+-    else
+-    {
+-      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/Gaussian mixture\n";
+-      return false;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
+-  {
+-    if (!scene_ptr->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
+-
+-      bsta_histogram<float> omega_hist, sigma_hist, level_hist;
+-      if (!compute_scene_statistics(*scene, omega_hist, sigma_hist,
+-                                    level_hist, n_leaves))
+-        return false;
+-      std::cout << "Omega Hist\n";
+-      omega_hist.print_vals_prob();
+-      std::cout << "Sigma Hist\n";
+-      sigma_hist.print_vals_prob();
+-      std::cout << "Level Hist\n";
+-      level_hist.print_vals_prob();
+-      std::cout << "Number of Leaves " << n_leaves << '\n';
+-      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(omega_hist));
+-      pro.set_output_val<bsta_histogram_sptr>(1, new bsta_histogram<float>(sigma_hist));
+-      pro.set_output_val<bsta_histogram_sptr>(2, new bsta_histogram<float>(level_hist));
+-      pro.set_output_val<unsigned>(3, n_leaves);
+-    }
+-    else {
+-      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/simple_grey\n";
+-      return false;
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
+deleted file mode 100644
+index 1dfc74a8ee..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \brief A process to label cells at a given leve
+-// \author Isabel Restrepo
+-// \date 15-Sep-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-
+-
+-//:global variables
+-namespace boxm_explore_cells_at_level_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_explore_cells_at_level_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_explore_cells_at_level_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr"; //scene in
+-  input_types_[1] = "unsigned"; //octree level
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr"; //label scene
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_explore_cells_at_level_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_explore_cells_at_level_process_globals;
+-
+-  //get inputs
+-  boxm_scene_base_sptr scene_in_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  auto level = pro.get_input<unsigned>(1);
+-
+-  if (scene_in_base->appearence_model() == BOXM_FLOAT)
+-  {
+-    typedef boct_tree<short, float > type;
+-
+-    auto* scene = dynamic_cast<boxm_scene<type>*>(scene_in_base.as_pointer());
+-
+-    if (!scene)
+-      return false;
+-
+-    //store output
+-    pro.set_output_val<boxm_scene_base_sptr>(0, boxm_explore_cells_at_level(scene,level));
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
+deleted file mode 100644
+index c222d74cd7..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
+-//:
+-// \file
+-// \brief process fills the internal cells of the octrees in the scene
+-//
+-// \author Isabel Restrepo
+-// \date December 3, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <boxm/algo/boxm_fill_internal_cells.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace boxm_fill_internal_cells_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 1 input and 1 output.
+-// input[0]: The input scene
+-// output[0]: The output scene
+-
+-bool boxm_fill_internal_cells_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_fill_internal_cells_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_fill_internal_cells_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_fill_internal_cells_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
+-  {
+-    boxm_fill_internal_cells<float> filler;
+-    pro.set_output_val<boxm_scene_base_sptr>(0, filler.traverse_and_fill(scene_in));
+-    return true;
+-  }
+-
+-  std::cerr << "In boxm_fill_internal_cells_process: Unsupportted scene type\n";
+-  return false;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
+deleted file mode 100644
+index e023ca2500..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
++++ /dev/null
+@@ -1,111 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
+-
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for initializing a new boxm_scene when there is not a saved one.
+-//        It receives the parameters from a parameter file in XML
+-//
+-// \author Vishal Jain
+-// \date Feb 8, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene_parser.h>
+-#include <boxm/algo/boxm_init_scene.h>
+-
+-//: global variables
+-namespace boxm_init_scene_process_globals
+-{
+-  //this process takes no outputs
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: sets input and output types
+-bool boxm_init_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_init_scene_process_globals;
+-
+-  // process takes 1 input and no outputs
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//: creates a scene from parameters
+-bool boxm_init_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_init_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_init_scene_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_init_scene_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_init_scene<BOXM_APM_MOG_GREY>(*s);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_init_scene<BOXM_APM_SIMPLE_GREY>(*s);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_init_scene<BOXM_APM_MOB_GREY >(*s);
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_init_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
+deleted file mode 100644
+index b8767b24bc..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
++++ /dev/null
+@@ -1,259 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
+-#include <iostream>
+-#include <cstdio>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for computing the backprojection of lines.
+-//         Lines are represented as an image with 3 plane images (plane 0=a, plane1=b,
+-//         plane2=c, line is defined as ax+by=c). The backprojection, which is a plane
+-//         is stored as an other image with 4 planes (ax+by+cz=d) as the output.
+-//
+-// \author Gamze Tunali
+-// \date   Feb 4, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <vpgl/vpgl_proj_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-#include <vpgl/algo/vpgl_ray.h>
+-
+-#include <vgl/vgl_plane_3d.h>
+-
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: globals
+-namespace boxm_line_backproject_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: set input and output types
+-// process takes 2 inputs and has 1 output:
+-// input[0]: The edge image (vil_image_view<float> with three planes for (a,b,c))
+-// input[1]: camera
+-// output[0]: The plane image
+-bool boxm_line_backproject_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_line_backproject_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  input_types_[i++] = "vpgl_camera_double_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j = 0;
+-  output_types_[j++] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-vpgl_rational_camera<double>
+-perspective_to_rational(vpgl_perspective_camera<double>&cam_pers)
+-{
+-  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
+-  std::vector<double> neu_u,den_u,neu_v,den_v;
+-  double x_scale = 1.0, x_off = 0.0, y_scale = 1.0, y_off = 0.0, z_scale = 1.0, z_off = 0.0, u_scale = 1.0, u_off = 0.0, v_scale = 1.0, v_off = 0.0;
+-
+-  for (int i=0; i<20; i++) {
+-    neu_u.push_back(0.0);
+-    neu_v.push_back(0.0);
+-    den_u.push_back(0.0);
+-    den_v.push_back(0.0);
+-  }
+-
+-  int vector_map[] = {9,15,18,19};
+-
+-  for (int i=0; i<4; i++) {
+-    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
+-    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
+-    den_u[vector_map[i]] = cam_pers_matrix(2,i);
+-    den_v[vector_map[i]] = cam_pers_matrix(2,i);
+-  }
+-
+-  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
+-                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
+-                                       u_scale,u_off,v_scale,v_off);
+-  return cam_rat;
+-}
+-
+-//: optimizes rpc camera parameters based on edges
+-bool boxm_line_backproject_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_line_backproject_process_globals;
+-
+-  // check number of inputs
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The number of inputs should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  unsigned i = 0;
+-
+-  // image
+-  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-
+-  // make sure that image has 3 planes
+-  if (edge_image_sptr->nplanes() != 3) {
+-    std::cerr << "boxm_line_backproject_process: The edge image is expected to have 3 planes!\n";
+-    return false;
+-  }
+-
+-  vil_image_view<float> *plane_image;
+-  if (edge_image_sptr->pixel_format() == VIL_PIXEL_FORMAT_FLOAT) {
+-    vil_image_view<float> edge_image(edge_image_sptr);
+-    unsigned ni=edge_image.ni();
+-    unsigned nj=edge_image.nj();
+-
+-    // the output image
+-    plane_image = new vil_image_view<float>(ni,nj,4);
+-    float col, row, theta;
+-
+-    if (camera->type_name() == "vpgl_proj_camera") {
+-      auto* cam = dynamic_cast<vpgl_proj_camera<double>*>(camera.ptr());
+-
+-      for (unsigned i=0; i<ni; i++) {
+-        for (unsigned j=0; j<nj; j++) {
+-          col =edge_image(i,j,0); // sub-pixel column
+-          row =edge_image(i,j,1); // sub_pixel row
+-          theta=edge_image(i,j,2); // orientation in radians
+-
+-          if (col<0 || row<0) // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
+-            (*plane_image)(i,j) = 0.0f;
+-          else {
+-            // get two points on the line
+-            vgl_point_2d<double> p1(col,row);
+-
+-            float x = col + 0.5f*std::cos(theta);
+-            float y = row + 0.5f*std::sin(theta);
+-            vgl_point_2d<double> p2(x,y);
+-
+-            vgl_line_2d<double> line(p1,p2);
+-
+-            //create a line and backproject it
+-            vgl_homg_line_2d<double> image_line(line);
+-            vgl_homg_plane_3d<double> plane = cam->backproject(image_line);
+-            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
+-            std::cout << "ZERO a,b,c,d" << std::endl;
+-            (*plane_image)(i,j,0)=float(plane.a());
+-            (*plane_image)(i,j,1)=float(plane.b());
+-            (*plane_image)(i,j,2)=float(plane.c());
+-            (*plane_image)(i,j,3)=float(plane.d());
+-          }
+-        }
+-      }
+-    }
+-    else if (camera->type_name() == "vpgl_local_rational_camera") {
+-      auto* cam = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
+-      for (unsigned i=0; i<ni; i++) {
+-        for (unsigned j=0; j<nj; j++) {
+-          col =edge_image(i,j,0); // sub-pixel column
+-          row =edge_image(i,j,1); // sub_pixel row
+-          theta=edge_image(i,j,2); // orientation in radians
+-
+-          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
+-            (*plane_image)(i,j,0) = 0.0f;
+-            (*plane_image)(i,j,1) = 0.0f;
+-            (*plane_image)(i,j,2) = 0.0f;
+-            (*plane_image)(i,j,3) = 0.0f;
+-          }
+-          else {
+-            // get two point on the line
+-            vgl_point_2d<double> p1(col, row);
+-
+-            float x = col + 0.5f*std::cos(theta);
+-            float y = row + 0.5f*std::sin(theta);
+-            vgl_point_2d<double> p2(x,y);
+-
+-            //backproject it
+-            vgl_plane_3d<double> plane;
+-            if (vpgl_ray::plane_ray(*cam, p1, p2, plane)) {
+-              (*plane_image)(i,j,0)=float(plane.a());
+-              (*plane_image)(i,j,1)=float(plane.b());
+-              (*plane_image)(i,j,2)=float(plane.c());
+-              (*plane_image)(i,j,3)=float(plane.d());
+-            }
+-            else { // the backprojection was unsuccessful
+-              std::cout << i << ',' << j << "NO PLANE!!!!!" << std::endl;
+-              (*plane_image)(i,j,0) = 0.0f;
+-              (*plane_image)(i,j,1) = 0.0f;
+-              (*plane_image)(i,j,2) = 0.0f;
+-              (*plane_image)(i,j,3) = 0.0f;
+-            }
+-          }
+-        }
+-      }
+-    }
+-    else if (camera->type_name() == "vpgl_perspective_camera") {
+-      auto* cam = dynamic_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-      auto* proj_cam = static_cast<vpgl_proj_camera<double>*>(cam);
+-      for (unsigned i=0; i<ni; i++) {
+-        for (unsigned j=0; j<nj; j++) {
+-          col =edge_image(i,j,0); // sub-pixel column
+-          row =edge_image(i,j,1); // sub_pixel row
+-          theta=edge_image(i,j,2); // orientation in radians
+-
+-          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
+-            (*plane_image)(i,j,0) = 0.0f;
+-            (*plane_image)(i,j,1) = 0.0f;
+-            (*plane_image)(i,j,2) = 0.0f;
+-            (*plane_image)(i,j,3) = 0.0f;
+-          }
+-          else {
+-            // get two point on the line
+-            vgl_point_2d<double> p1(col, row);
+-
+-            float x = col + 0.5f*std::cos(theta);
+-            float y = row + 0.5f*std::sin(theta);
+-            vgl_point_2d<double> p2(x,y);
+-
+-            vgl_line_2d<double> line(p1,p2);
+-
+-            //create a line and backproject it
+-            vgl_homg_line_2d<double> image_line(line);
+-
+-            vgl_homg_plane_3d<double> plane = proj_cam->backproject(image_line);
+-            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
+-            std::cout << "ZERO a,b,c,d" << std::endl;
+-            (*plane_image)(i,j,0)=float(plane.a());
+-            (*plane_image)(i,j,1)=float(plane.b());
+-            (*plane_image)(i,j,2)=float(plane.c());
+-            (*plane_image)(i,j,3)=float(plane.d());
+-          }
+-        }
+-      }
+-    }
+-    else {
+-      std::cerr << "boxm_line_backproject_process: The camera type [" << camera->type_name() << "]is not defined yet!\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_line_backproject_process: This pixel format is not supported yet!\n";
+-    return false;
+-  }
+-  // output
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, plane_image);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
+deleted file mode 100644
+index 3cdbcbe8e4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-//:
+-// \file
+-// \brief A process to perform linear combination of blocks in situ i.e block1 = s1*block1+ s2*block2
+-// \author Isabel Restrepo
+-// \date 2-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_linear_operations.h>
+-
+-//:global variables
+-namespace boxm_linear_combination_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_linear_combination_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_linear_combination_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr" ; //scene1
+-  input_types_[i++] = "boxm_scene_base_sptr" ; //scene2
+-  input_types_[i++] = "float" ; //s1
+-  input_types_[i++] = "float" ; //s2
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_linear_combination_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_linear_combination_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base1 = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr scene_base2 = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto s1 = pro.get_input<float>(i++);
+-  auto s2 = pro.get_input<float>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!(scene_base1 && scene_base2))
+-  {
+-    std::cerr << "In boxm_linear_combination_process: Null input scene\n";
+-    return false;
+-  }
+-
+-  switch (scene_base1->appearence_model())
+-  {
+-    case BOXM_FLOAT:
+-    {
+-      if (scene_base2->appearence_model()!= BOXM_FLOAT)
+-      {
+-        std::cerr << "In boxm_linear_combination_process, datatype not supported\n";
+-        return false;
+-      }
+-      auto *scene1 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base1.as_pointer());
+-      auto *scene2 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base2.as_pointer());
+-
+-      scene1->load_block(block_i,block_j,block_k);
+-      scene2->load_block(block_i,block_j,block_k);
+-
+-      boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(block_i,block_j,block_k);
+-      boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(block_i,block_j,block_k);
+-
+-      //The result is block1 = s1*block1+ s2*block2
+-      boxm_linear_combination(block1, block2, s1, s2);
+-
+-      //make sure to write the block back to disk
+-      scene1->write_active_block();
+-
+-      //clean memory
+-      scene1->unload_active_blocks();
+-      scene2->unload_active_blocks();
+-
+-      break;
+-    }
+-    default:
+-      std::cerr << "In boxm_linear_combination_process: Invalid datatype\n";
+-      return false;
+-      break;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
+deleted file mode 100644
+index 700f8bba5c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
++++ /dev/null
+@@ -1,90 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief process that merges all gaussian mixtures in a  boxm_scene into unimodal gaussians
+-//
+-// \author Isabel Restrepo
+-// \date December 8, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/algo/boxm_merge_mog.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace boxm_merge_mixtures_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 1 input and 1 output.
+-// input[0]: The sample scene
+-// output[0]: The appearance scene
+-
+-bool boxm_merge_mixtures_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_merge_mixtures_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_merge_mixtures_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_merge_mixtures_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-  typedef boct_tree<short, apm_datatype> mog_tree_type;
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef boct_tree<short, gauss_type> gauss_tree_type;
+-
+-  auto *mog_scene = dynamic_cast<boxm_scene<mog_tree_type>* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!mog_scene) {
+-    std::cout <<  " :-- Grid is not of valid type!\n";
+-    return false;
+-  }
+-
+-  //parameters of the output scene are the same as those of the input scene
+-  boxm_scene<gauss_tree_type> *gauss_scene = new boxm_scene<gauss_tree_type>(mog_scene->lvcs(), mog_scene->origin(), mog_scene->block_dim(), mog_scene->world_dim());
+-  gauss_scene->set_paths(mog_scene->path(), "bsta_gauss_sf1");
+-  gauss_scene->set_appearance_model(BSTA_GAUSS_F1);
+-
+-  boxm_merge_mog merger;
+-  merger.kl_merge_scene( *mog_scene, *gauss_scene);
+-  gauss_scene->write_scene("gaussf1_scene.xml");
+-  pro.set_output_val<boxm_scene_base_sptr>(0, gauss_scene);
+-  std::cout<<"Exiting" << std::endl;
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
+deleted file mode 100644
+index 6b3f53a79c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
++++ /dev/null
+@@ -1,119 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to refine the block (octrees) of the scene
+-//        If there are some cells with big values they are spit into
+-//        new child cells; the data of the cell is copied to the
+-//        children's data. The purpose of this process is to elaborate
+-//        the octree at the areas where more details exist.
+-//
+-// \author Gamze Tunali
+-// \date April 24, 2009
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-namespace boxm_refine_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_refine_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_refine_scene_process_globals;
+-
+-  //process takes 3 inputs
+-  //input[0]: The scene
+-  //input[1]: The threshold for splitting
+-  //input[2]: bool for resetting the appearence model
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float";
+-  input_types_[2] = "bool";
+-
+-  //process has 1 output
+-  //output[0]: The number of leaf cells in the refined scene
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "int";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_refine_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_refine_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_refine_scene_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto thresh = pro.get_input<float>(i++);
+-  bool reset = pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_refine_scene_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned int ncells = 0;
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (scene->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, thresh, reset);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, thresh, reset);
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  // set output
+-  pro.set_output_val<int>(0,ncells);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
+deleted file mode 100644
+index 67086ac142..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
++++ /dev/null
+@@ -1,87 +0,0 @@
+-//:
+-// \file
+-// \brief A process to remove level 0 of the octrees
+-// \author Isabel Restrepo
+-// \date Nov 23 2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-
+-//:global variables
+-namespace boxm_remove_level0_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_remove_level0_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_remove_level0_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr"; //scene_in
+-  input_types_[1] = "vcl_string"; //block_prefix for scene out
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr"; //scene_out
+-
+-  return pro.set_input_types(input_types_)
+-      && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool boxm_remove_level0_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_remove_level0_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string block_pref = pro.get_input<std::string>(1);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
+-  {
+-    //clone the input scene
+-    boxm_scene<boct_tree<short, float> > *scene_out = new boxm_scene<boct_tree<short, float> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
+-                                                                                               scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
+-                                                                                               scene_in->load_all_blocks(), scene_in->save_internal_nodes());
+-
+-    scene_out->set_paths(scene_in->path(), block_pref);
+-    scene_out->set_appearance_model(scene_in->appearence_model());
+-    std::cout << "Cloning\n";
+-    scene_in->clone_blocks(*scene_out);
+-
+-    std::cout << "Restructuring\n";
+-    boxm_remove_level_0_leaves(scene_out);
+-    std::cout << "Done\n";
+-
+-    //write the scene after the number of levels has been adjusted
+-    scene_out->set_octree_levels(scene_in->max_level() - 1, scene_in->init_level());
+-    scene_out->write_scene(block_pref + ".xml");
+-
+-    pro.set_output_val<boxm_scene_base_sptr>(0, scene_out);
+-    return true;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
+deleted file mode 100644
+index c14dfbda09..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
++++ /dev/null
+@@ -1,149 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <bvrml/bvrml_write.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-namespace boxm_render_expected_edge_vrml_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_render_expected_edge_vrml_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_vrml_process_globals;
+-
+-  // process takes 4 inputs and no output
+-  //input[0]: scene binary file
+-  //input[1]: the path for vrml file
+-  //input[2]: threshold
+-  //input[3]: s (to write every s cell)
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "float";
+-  input_types_[3] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_edge_vrml_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_vrml_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< '\n';
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  //vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  std::string path = pro.get_input<std::string>(i++);
+-  auto threshold = pro.get_input<float>(i++);
+-  int s = pro.get_input<int>(i++); // FIXME - unused!
+-
+-  std::ofstream stream(path.c_str());
+-
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE)
+-  {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cout << "boxm_render_expected_edge_process: the scene is not of expected type" << std::endl;
+-        return false;
+-      }
+-      bvrml_write::write_vrml_header(stream);
+-#if 0
+-      vgl_point_3d<double> origin(0.0,0.0,0.0);
+-      vgl_vector_3d<double> dirx(1,0,0);
+-      vgl_vector_3d<double> diry(0,1,0);
+-      vgl_vector_3d<double> dirz(0,0,1);
+-      bvrml_write::write_vrml_line(stream,origin,dirx,3,1,0,0);
+-      bvrml_write::write_vrml_line(stream,origin,diry,3,0,1,0);
+-      bvrml_write::write_vrml_line(stream,origin,dirz,3,0,0,1);
+-#endif
+-      // for each block
+-      boxm_block_iterator<type> iter(scene);
+-      iter.begin();
+-      while (!iter.end())
+-      {
+-        scene->load_block(iter.index());
+-        boxm_block<type>* block = *iter;
+-        type* tree = block->get_tree();
+-        std::vector<boct_tree_cell<short,boxm_inf_line_sample<float> >*> cells = tree->leaf_cells();
+-
+-        // iterate over cells
+-        for (auto cell : cells)
+-        {
+-          boxm_inf_line_sample<float> data = cell->data();
+-          vgl_infinite_line_3d<float> line = data.line_;
+-          vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
+-          // TODO: revise with segment length
+-          if (!(line.x0().x()==0 && line.x0().y()==0)) {
+-            //if (data.num_obs_ > threshold)
+-            {
+-              vgl_point_3d<double> p0,p1;
+-              vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
+-              // convert to line type (from float to double)
+-              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
+-
+-              vgl_infinite_line_3d<double> dline(x0,dir);
+-              if (vgl_intersection<double>(bb, dline, p0, p1)) {
+-                vgl_vector_3d<double> dir(p1-p0);
+-                double length=dir.length();
+-                dir/=length;
+-                std::cout<<data.residual_<<' ';
+-                if (data.residual_<threshold)
+-                {
+-                  bvrml_write::write_vrml_line(stream, p0,dir,float(length),1.f,0.f,0.f);
+-                  //bvrml_write::write_vrml_disk(stream,p0,dir,data.residual_,0.f,1.0f,0.f);
+-                }
+-              }
+-            }
+-          }
+-        }
+-        iter++;
+-      }
+-    }
+-    else
+-    {
+-      std::cerr << "Ray tracing version not yet implemented\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_render_expected_edge_vrml_process: undefined APM type\n";
+-    return false;
+-  }
+-
+-  // no output
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
+deleted file mode 100644
+index 1ca0a383ac..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
++++ /dev/null
+@@ -1,95 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to replace the appearance model for the whole scene by a constant appearance model
+-// \author Vishal Jain
+-// \date July 28, 2009
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean);
+-
+-namespace boxm_replace_const_app_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_replace_const_app_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_replace_const_app_process_globals;
+-
+-  //process takes 2 inputs and no output
+-  //input[0]: The scene
+-  //input[1]: mean value for appearance
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_replace_const_app_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_replace_const_app_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_replace_const_app_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto meanval = pro.get_input<float>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_replace_const_app_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-    boxm_replace_constant_app(*s,meanval );
+-  }
+-  else {
+-    std::cout << "boxm_replace_const_app_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+-
+-void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean)
+-{
+-  boxm_block_iterator<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype app=boxm_utils::obtain_mog_grey_single_mode(mean);
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >* block = *iter;
+-    boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >* tree = block->get_tree();
+-
+-    std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> leaf_cells=tree->leaf_cells();
+-    for (auto & leaf_cell : leaf_cells)
+-    {
+-      boxm_sample<BOXM_APM_MOG_GREY> new_data(leaf_cell->data().alpha,app);
+-      leaf_cell->set_data(new_data);
+-    }
+-    scene.write_active_block();
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
+deleted file mode 100644
+index ce50f795ba..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
++++ /dev/null
+@@ -1,195 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for clipping and image based on a 3D bounding box.
+-//        -  Input:
+-//             - Image path (string)
+-//             - boxm_voxel_world_sptr
+-//
+-//        -  Output:
+-//             - modified rational camera "vpgl_camera_double_sptr"
+-//             - clipped image area (NITF) "vil_image_view_base_sptr"
+-//
+-//        -  Params:
+-//             -geographic uncertainty (error) in meters
+-//
+-// \author  Copied from boxm/pro
+-// \date    May 5, 2008
+-// \verbatim
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <vsol/vsol_box_2d_sptr.h>
+-#include <vsol/vsol_box_2d.h>
+-
+-#include <brip/brip_roi.h>
+-
+-#include <vil/vil_load.h>
+-#include <vil/vil_crop.h>
+-#include <vil/file_formats/vil_nitf2_image.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-//: globals variables and functions
+-namespace boxm_roi_init_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 3;
+-
+-  //functions
+-  bool roi_init(const std::string& img_path,
+-                const vpgl_camera_double_sptr& camera,
+-                vgl_box_3d<double> box,
+-                vil_image_view<unsigned char> & roi_img);
+-
+-  //: projects the box on the image by taking the union of all the projected corners
+-  vgl_box_2d<double>* project_box(const vpgl_camera_double_sptr& cam,
+-                                  vgl_box_3d<double> box);
+-}
+-
+-//: set input and output types
+-bool boxm_roi_init_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_process_globals;
+-
+-  //this process takes 3 input:
+-  //the filename of the image, the camera and the voxel world
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned  i=0;
+-  input_types_[i++] = "vcl_string";                // image path
+-  input_types_[i++] = "vpgl_camera_double_sptr";   //  camera
+-  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
+-
+-  //output
+-  unsigned j = 0;
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
+-  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
+-  output_types_[j++] = "float"; // uncertainty
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-bool boxm_roi_init_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_process_globals;
+-  //static const parameters
+-  static const std::string error = "error";
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs:
+-  unsigned i = 0;
+-  // image
+-  std::string image_path = pro.get_input<std::string>(i++);
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  //voxel_world
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  vil_image_view_base_sptr img_ptr=vil_load(image_path.c_str());
+-  auto *temp=new vil_image_view<unsigned char>();
+-  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
+-  {
+-    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
+-    {
+-        vgl_box_2d<double>* roi_box = project_box(camera, scene->get_world_bbox());
+-        brip_roi broi(img->ni(), img->nj());
+-        vsol_box_2d_sptr bb = new vsol_box_2d();
+-        bb->add_point(roi_box->min_x(), roi_box->min_y());
+-        bb->add_point(roi_box->max_x(), roi_box->max_y());
+-        bb = broi.clip_to_image_bounds(bb);
+-        if (bb->width() <= 0 || bb->height() <= 0) {
+-            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
+-            return false;
+-        }
+-        temp->set_size(int(bb->width()),int(bb->height()));
+-        temp->deep_copy(vil_crop(*img,(unsigned int)bb->get_min_x(),
+-                            (unsigned int)bb->width(),
+-                            (unsigned int)bb->get_min_y(),
+-                            (unsigned int)bb->height()));
+-    }
+-  }
+-  if (temp->ni() == 0 || temp->nj() == 0)
+-    return false;
+-
+-  //Store outputs
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<vpgl_camera_double_sptr >(j++, camera);
+-  // store image output
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, temp);
+-  // store uncertainty
+-  pro.set_output_val<float>(j++, 0);
+-
+-  return true;
+-}
+-
+-//: roi_init function
+-bool boxm_roi_init_process_globals::roi_init(const std::string&  img_path,
+-                                             const vpgl_camera_double_sptr& camera,
+-                                             vgl_box_3d<double> box,
+-                                             vil_image_view<unsigned char> & roi_img)
+-{
+-  vil_image_view_base_sptr img_ptr=vil_load(img_path.c_str());
+-  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
+-  {
+-    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
+-    {
+-        vgl_box_2d<double>* roi_box = project_box(camera, box);
+-        brip_roi broi(img->ni(), img->nj());
+-        vsol_box_2d_sptr bb = new vsol_box_2d();
+-        bb->add_point(roi_box->min_x(), roi_box->min_y());
+-        bb->add_point(roi_box->max_x(), roi_box->max_y());
+-        bb = broi.clip_to_image_bounds(bb);
+-        if (bb->width() <= 0 || bb->height() <= 0) {
+-            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
+-            return false;
+-        }
+-
+-         vil_image_view<unsigned char> temp=vil_crop(*img,
+-                                                     (unsigned int)bb->get_min_x(),
+-                                                     (unsigned int)bb->width(),
+-                                                     (unsigned int)bb->get_min_y(),
+-                                                     (unsigned int)bb->height());
+-        roi_img=temp;
+-        return true;
+-    }
+-    else
+-      return false;
+-  }
+-  else // non-supported pixel format
+-    return false;
+-}
+-
+-//: project_box function
+-vgl_box_2d<double>* boxm_roi_init_process_globals::project_box( const vpgl_camera_double_sptr& cam,
+-                                                                vgl_box_3d<double> box)
+-{
+-  // create a box with uncertainty
+-  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
+-
+-  auto* roi = new vgl_box_2d<double>();
+-
+-  for (auto & box_corner : box_corners) {
+-      double u,v;
+-      cam->project(box_corner.x(),box_corner.y(),box_corner.z(),u,v);
+-      vgl_point_2d<double> p2d(u,v);
+-      std::cout<<u<<' '<<v<<'\n';
+-      roi->add(p2d);
+-  }
+-  return roi;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
+deleted file mode 100644
+index fbfe3b9704..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
++++ /dev/null
+@@ -1,310 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for clipping and image based on a 3D bounding box.
+-// *  Input:
+-//   - Image path (string)
+-//   - boxm_voxel_world_sptr
+-//
+-// *  Output:
+-//   - modified rational camera "vpgl_camera_double_sptr"
+-//   - clipped image area (NITF) "vil_image_view_base_sptr"
+-//
+-// *  Params:
+-//   - geographic uncertainty (error) in meters
+-//
+-// \author  Copied from boxm/pro
+-// \date    May 5, 2008
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <vsol/vsol_box_2d_sptr.h>
+-#include <vsol/vsol_box_2d.h>
+-
+-#include <brip/brip_roi.h>
+-
+-#include <vil/vil_load.h>
+-#include <vil/file_formats/vil_nitf2_image.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-#include <vpgl/vpgl_lvcs.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-//: globals variables and functions
+-namespace boxm_roi_init_rational_camera_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 3;
+-
+-  // functions
+-  bool roi_init(std::string const& image_path,
+-                vpgl_rational_camera<double>* camera,
+-                vgl_box_3d<double> box,
+-                const vpgl_lvcs& lvcs,
+-                float uncertainty,
+-                vil_image_view<unsigned char>* nitf_image_unsigned_char,
+-                vpgl_local_rational_camera<double>& local_camera);
+-
+-  //: projects the box on the image by taking the union of all the projected corners
+-  vgl_box_2d<double>* project_box(vpgl_rational_camera<double>* cam,
+-                                  vpgl_lvcs lvcs,
+-                                  vgl_box_3d<double> box,
+-                                  float r);
+-}
+-
+-//:set input and output types
+-bool boxm_roi_init_rational_camera_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_rational_camera_process_globals;
+-
+-  //this process takes 3 input:
+-  //the filename of the image, the camera and the voxel world
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned  i=0;
+-  input_types_[i++] = "vcl_string";                // NITF image path
+-  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
+-  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
+-
+-  //output
+-  unsigned j = 0;
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
+-  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
+-  output_types_[j++] = "float"; // uncertainty
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-bool boxm_roi_init_rational_camera_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_rational_camera_process_globals;
+-  //static const parameters
+-  static const std::string error = "error";
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-  // uncertainty (meters) -- SHOULD BE A PARAM
+-  float uncertainty=10.0;
+-  if ( !pro.parameters()->get_value(error, uncertainty) ) {
+-    std::cout << pro.name() << ": error in retrieving parameters\n";
+-    return false;
+-  }
+-
+-  // get the inputs:
+-  unsigned i = 0;
+-  // image
+-  std::string image_path = pro.get_input<std::string>(i++);
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  //voxel_world
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  auto* img_ptr = new vil_image_view<unsigned char>();
+-  auto* rat_camera =
+-  dynamic_cast<vpgl_rational_camera<double>*> (camera.as_pointer());
+-
+-  if (!rat_camera) {
+-    std::cerr << "The camera input is not a rational camera\n";
+-    return false;
+-  }
+-
+-  vpgl_local_rational_camera<double> local_camera;
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY ||
+-      scene->appearence_model() == BOXM_EDGE_FLOAT ||
+-      scene->appearence_model() == BOXM_EDGE_LINE) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-
+-    if (!roi_init(image_path, rat_camera, s->get_world_bbox(),(s->lvcs()), uncertainty, img_ptr, local_camera)) {
+-      std::cerr << "The process has failed!\n";
+-      return false;
+-    }
+-
+-    if (img_ptr->ni() == 0 || img_ptr->nj() == 0)
+-      return false;
+-
+-    //Store outputs
+-    unsigned j = 0;
+-    // update the camera and store
+-    pro.set_output_val<vpgl_camera_double_sptr >(j++, new vpgl_local_rational_camera<double> (local_camera));
+-    // store image output
+-    pro.set_output_val<vil_image_view_base_sptr>(j++, img_ptr);
+-    // store uncertainty
+-    pro.set_output_val<float>(j++, uncertainty);
+-  }
+-  else {
+-    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+-
+-//: roi_init function
+-bool boxm_roi_init_rational_camera_process_globals::roi_init(std::string const& image_path,
+-                                                             vpgl_rational_camera<double>* camera,
+-                                                             vgl_box_3d<double> box,
+-                                                             const vpgl_lvcs& lvcs,
+-                                                             float uncertainty,
+-                                                             vil_image_view<unsigned char>* nitf_image_unsigned_char,
+-                                                             vpgl_local_rational_camera<double>& local_camera)
+-{
+-  // read the image and extract the camera
+-  vil_image_resource_sptr img = vil_load_image_resource(image_path.c_str());
+-  std::string format = img->file_format();
+-  std::string prefix = format.substr(0,4);
+-  if (prefix.compare("nitf") != 0) {
+-    std::cerr << "boxm_roi_init_rational_camera_process::execute - The image should be an NITF\n";
+-    return false;
+-  }
+-
+-  auto* nitf =  static_cast<vil_nitf2_image*> (img.ptr());
+-
+-  vgl_box_2d<double>* roi_box = project_box(camera, lvcs, box, uncertainty);
+-
+-  brip_roi broi(nitf->ni(), nitf->nj());
+-  vsol_box_2d_sptr bb = new vsol_box_2d();
+-  bb->add_point(roi_box->min_x(), roi_box->min_y());
+-  bb->add_point(roi_box->max_x(), roi_box->max_y());
+-  bb = broi.clip_to_image_bounds(bb);
+-
+-  if (bb->width() <= 0 || bb->height() <= 0) {
+-    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
+-    return false;
+-  }
+-
+-  vil_image_view_base_sptr roi = nitf->get_copy_view((unsigned int)bb->get_min_x(),
+-                                                     (unsigned int)bb->width(),
+-                                                     (unsigned int)bb->get_min_y(),
+-                                                     (unsigned int)bb->height());
+-  if (!roi) {
+-    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
+-    return false;
+-  }
+-
+-  if (!roi.as_pointer())
+-    return false;
+-
+-  if (roi->pixel_format() == VIL_PIXEL_FORMAT_UINT_16)
+-  {
+-    vil_image_view<vxl_uint_16> nitf_image_vxl_uint_16(roi);
+-
+-    *nitf_image_unsigned_char = vil_image_view<unsigned char> (roi->ni(),roi->nj(),roi->nplanes());
+-
+-    int bigendian = 0;
+-    { union { unsigned int i; char c[4]; } u; u.i = 1; bigendian = u.c[0] == 0; }
+-    for (unsigned m=0; m<nitf_image_unsigned_char->ni(); ++m)
+-    {
+-      for (unsigned n=0; n<nitf_image_unsigned_char->nj(); ++n)
+-      {
+-        for (unsigned p=0; p<nitf_image_unsigned_char->nplanes(); ++p)
+-        {
+-          // we will ignore the most significant 5 bits and less significant 3 bits
+-          vxl_uint_16 curr_pixel_val = nitf_image_vxl_uint_16(m,n,p);
+-
+-          if (bigendian) {
+-            auto* arr = (unsigned char*) &curr_pixel_val;
+-            // [defgh3][5abc]
+-            // --> [abcdefgh]
+-            unsigned char big = *arr;
+-            unsigned char small = *(++arr);
+-            big >>= 3;
+-            small <<= 5;
+-            curr_pixel_val = big || small;
+-          }
+-          else { // little endian
+-            // [5abc][defgh3]
+-            // --> [abcdefgh]
+-            curr_pixel_val <<= 5;
+-            // [defgh3][5abc]
+-            // --> [abcdefgh]
+-            curr_pixel_val >>= 8;
+-          }
+-
+-          auto pixel_val = static_cast<unsigned char> (curr_pixel_val);
+-
+-#if 0
+-          //This is how Thom uses to get the region
+-          int temp_pix_val = int(int(curr_pixel_val)*255.0/1500.0);
+-          if (temp_pix_val > 255)
+-            temp_pix_val =255;
+-          unsigned char pixel_val = static_cast<unsigned char>(temp_pix_val);
+-          //end hack
+-#endif
+-
+-          (*nitf_image_unsigned_char)(m,n,p) = pixel_val;
+-        }
+-      }
+-    }
+-  }
+-  else if (roi->pixel_format() == VIL_PIXEL_FORMAT_BYTE) {
+-    *nitf_image_unsigned_char = vil_image_view<unsigned char>(roi);
+-  }
+-  else
+-    std::cout << "boxm_roi_init_rational_camera_process - Unsupported Pixel Format = " << roi->pixel_format() << std::endl;
+-
+-  double u, v;
+-  camera->image_offset(u, v);
+-  double tu =  u - roi_box->min_x();
+-  double tv =  v - roi_box->min_y();
+-  camera->set_image_offset(tu, tv);
+-  local_camera = vpgl_local_rational_camera<double> (lvcs, *camera);
+-  delete roi_box;
+-
+-  return true;
+-}
+-
+-//:project_box function
+-vgl_box_2d<double>*boxm_roi_init_rational_camera_process_globals::project_box( vpgl_rational_camera<double>* cam,
+-                                                                               vpgl_lvcs lvcs,
+-                                                                               vgl_box_3d<double> box,
+-                                                                               float r)
+-{
+-  double xoff, yoff, zoff;
+-  xoff = cam->offset(vpgl_rational_camera<double>::X_INDX);
+-  yoff = cam->offset(vpgl_rational_camera<double>::Y_INDX);
+-  zoff = cam->offset(vpgl_rational_camera<double>::Z_INDX);
+-
+-  // global to local
+-  double lx, ly, lz;
+-  lvcs.global_to_local(xoff, yoff, zoff, vpgl_lvcs::wgs84, lx, ly, lz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  double center[3];
+-  center[0] = lx;
+-  center[1] = ly;
+-  center[2] = lz;
+-
+-  // create a box with uncertainty
+-  vgl_box_3d<double> cam_box(center, 2*r, 2*r, 2*r, vgl_box_3d<double>::centre);
+-  std::vector<vgl_point_3d<double> > cam_corners = boxm_utils::corners_of_box_3d(cam_box);
+-  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
+-  auto* roi = new vgl_box_2d<double>();
+-
+-  double lon, lat, gz;
+-  for (auto cam_corner : cam_corners) {
+-    lvcs.local_to_global(cam_corner.x(), cam_corner.y(), cam_corner.z(),
+-                         vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-    vpgl_rational_camera<double>* new_cam = cam->clone();
+-    new_cam->set_offset(vpgl_rational_camera<double>::X_INDX, lon);
+-    new_cam->set_offset(vpgl_rational_camera<double>::Y_INDX, lat);
+-    new_cam->set_offset(vpgl_rational_camera<double>::Z_INDX, gz);
+-
+-    // project the box
+-    for (auto & box_corner : box_corners) {
+-      // convert the box corners to world coordinates
+-      lvcs.local_to_global(box_corner.x(), box_corner.y(), box_corner.z(),
+-                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-      vgl_point_2d<double> p2d = new_cam->project(vgl_point_3d<double>(lon, lat, gz));
+-      roi->add(p2d);
+-    }
+-  }
+-  return roi;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
+deleted file mode 100644
+index 8c8b260f04..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
++++ /dev/null
+@@ -1,229 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <sstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for writing the occupancy probability of scenes to drishti raw files
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   Sep 11, 2009   Gamze Tunali
+-//                  Added scene writing option, input number is increased to 4 and if 4th
+-//                  input is 0, blocks saved as raw files separately, if 1, then blocks
+-//                  combined to generate 1 raw file for the whole scene
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boxm/algo/boxm_save_scene_raw.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-namespace boxm_save_occupancy_raw_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_save_occupancy_raw_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_occupancy_raw_process_globals;
+-
+-  // process takes 4 inputs but has no outputs
+-  //input[0]: scene binary file
+-  //input[1]: output file (raw) path
+-  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
+-  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_save_occupancy_raw_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_occupancy_raw_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string filepath = pro.get_input<std::string>(i++);
+-  auto resolution =  pro.get_input<unsigned>(i++);
+-  auto whole = pro.get_input<unsigned>(i++);
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if (!whole) {
+-        boxm_block_iterator<type> it(scene);
+-        it.begin();
+-        while (!it.end()) {
+-          std::stringstream strm;
+-          vgl_point_3d<int> index = it.index();
+-          strm << index.x() << '_' << index.y() << '_' << index.z();
+-          std::string str(strm.str());
+-          std::string s = filepath + str + ".raw";
+-          boxm_save_block_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
+-          it++;
+-        }
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if (!whole) {
+-        boxm_block_iterator<type> it(scene);
+-        it.begin();
+-        while (!it.end()) {
+-          std::stringstream strm;
+-          vgl_point_3d<int> index = it.index();
+-          strm << index.x() << '_' << index.y() << '_' << index.z();
+-          std::string str(strm.str());
+-          std::string s = filepath + str + ".raw";
+-          boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
+-          it++;
+-        }
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    if (!whole) {
+-      boxm_block_iterator<type> it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_ptr.as_pointer())) {
+-    if (!whole) {
+-      boxm_block_iterator<boct_tree<short, float> > it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,float >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,float >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BSTA_MOG_F1){
+-    if (!whole) {
+-      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>* > (scene_ptr.as_pointer());
+-      boxm_block_iterator<tree_type> it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      //boxm_save_scene_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_ptr.as_pointer())) {
+-    if (!whole) {
+-      boxm_block_iterator<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    if (!whole) {
+-      boxm_block_iterator<type> it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
+-    typedef boct_tree<short, boxm_edge_sample<float> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    boxm_save_scene_raw<short,boxm_edge_sample<float> >(*scene, filepath + ".raw", resolution);
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
+-    typedef boct_tree<short, boxm_scalar_sample<float> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    boxm_save_scene_raw<short,boxm_scalar_sample<float> >(*scene, filepath + ".raw", resolution);
+-  }
+-  else {
+-    std::cout << "boxm_save_occupancy_raw_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
+deleted file mode 100644
+index 5f4d68c008..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
++++ /dev/null
+@@ -1,140 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <sstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for writing general scenes to drishti raw files. Values in voxels are saved as they are
+-//
+-// \author Isabel Restrepo
+-// \date Feb 17, 2011
+-// \verbatim
+-//  Modifications
+-//  <None>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_save_scene_raw_general.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-namespace boxm_save_scene_raw_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_save_scene_raw_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_scene_raw_process_globals;
+-
+-  // process takes 4 inputs but has no outputs
+-  //input[0]: scene binary file
+-  //input[1]: output file (raw) path
+-  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
+-  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_save_scene_raw_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_scene_raw_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string filepath = pro.get_input<std::string>(i++);
+-  auto resolution =  pro.get_input<unsigned>(i++);
+-  auto whole = pro.get_input<unsigned>(i++);
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_FLOAT)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
+-      return false;
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, float > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if(!scene)
+-        return false;
+-      if (!whole) {
+-        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
+-        return false;
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw_general_to_byte<short,float>(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  // check the scene's app model
+-  else if (scene_ptr->appearence_model() == BOXM_CHAR)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
+-      return false;
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, char > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if(!scene)
+-        return false;
+-      if (!whole) {
+-        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
+-        return false;
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw_general<short,char>(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  // check the scene's app model
+-  else if (scene_ptr->appearence_model() == BOXM_BOOL)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
+-      return false;
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, bool > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if(!scene)
+-        return false;
+-      if (!whole) {
+-        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
+-        return false;
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw_general<short>(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_save_scene_raw_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
+deleted file mode 100644
+index d5b044d0db..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
++++ /dev/null
+@@ -1,97 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
+-//:
+-// \file
+-// \brief process that splits a boxm_scene of boxm samples into an appearance and occupancy scene
+-//
+-// \author Isabel Restrepo
+-// \date December 3, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <boxm/algo/boxm_split_sample.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace boxm_split_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-//: process takes 1 input and two outputs.
+-// input[0]: The sample scene
+-// output[0]: The appearance scene
+-// output[1]: The alpha scene
+-
+-bool boxm_split_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_split_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-  output_types_[1] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_split_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_split_scene_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  //: Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > sample_tree_type;
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-  typedef boct_tree<short, apm_datatype> apm_tree_type;
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype alpha_type;
+-  typedef boct_tree<short, alpha_type> alpha_tree_type;
+-
+-  auto *scene_in = static_cast<boxm_scene<sample_tree_type>* > (scene_base.as_pointer());
+-
+-  // parameters of the output scene are the same as those of the input scene
+-  boxm_scene<apm_tree_type> *apm_scene = new boxm_scene<apm_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
+-                                                                       scene_in->max_level(), scene_in->init_level());
+-  apm_scene->set_paths(scene_in->path(), "apm_mog_grey");
+-  apm_scene->set_appearance_model(BSTA_MOG_F1);
+-  boxm_scene<alpha_tree_type > *alpha_scene = new boxm_scene<alpha_tree_type >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
+-                                                                               scene_in->max_level(), scene_in->init_level());
+-  alpha_scene->set_paths(scene_in->path(), "alpha");
+-  alpha_scene->set_appearance_model(BOXM_FLOAT);
+-  boxm_split_sample<BOXM_APM_MOG_GREY> splitter;
+-
+-  splitter.split_scene( *scene_in, *apm_scene, *alpha_scene);
+-
+-  apm_scene->write_scene("apm_scene.xml");
+-  alpha_scene->write_scene("/alpha_scene.xml");
+-
+-  pro.set_output_val<boxm_scene_base_sptr>(0, apm_scene);
+-  pro.set_output_val<boxm_scene_base_sptr>(1, alpha_scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index 2c499a1c2f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_algo_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_pro_test_include boxm_algo_pro)
+diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
+deleted file mode 100644
+index 8ee327ed5f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/pro/boxm_algo_processes.h>
+-#include <boxm/algo/pro/boxm_algo_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
+deleted file mode 100644
+index 6140bcbb4a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
++++ /dev/null
+@@ -1,46 +0,0 @@
+-# brl/bseg/boxm/algo/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_algo_rt_sources
+-    boxm_change_probability_functor.h
+-    boxm_edge_tangent_updater.h             boxm_edge_tangent_updater.hxx
+-    boxm_edge_updater.h                     boxm_edge_updater.hxx
+-    boxm_generate_edge_sample_functor.h
+-    boxm_generate_edge_tangent_sample_functor.h
+-    boxm_generate_opt2_sample_functor.h
+-    boxm_generate_opt3_sample_functor.h
+-    boxm_generate_opt_sample_functor.h
+-    boxm_opt2_optimizer.h                   boxm_opt2_optimizer.hxx
+-    boxm_opt3_optimizer.h                   boxm_opt3_optimizer.hxx
+-    boxm_opt_appearance_estimator.h
+-    boxm_opt_rt_bayesian_optimizer.h        boxm_opt_rt_bayesian_optimizer.hxx
+-    boxm_pre_infinity_functor.h
+-    boxm_render_expected_depth_functor.h
+-    boxm_render_expected_edge_image_functor.h
+-    boxm_render_expected_edge_tangent_image_functor.h
+-    boxm_render_expected_image_functor.h
+-    boxm_render_expected_shadow_image_functor.h
+-    boxm_rpc_registration.h
+-    boxm_sun_vis_prob_functor.h
+-    boxm_update_image_functor.h
+-    boxm_compute_num_rays_statistics.h
+-    boxm_expected_edge_functor.h
+-    boxm_shadow_appearance_estimator.h
+-    boxm_generate_shadow_sample_functor.h
+-    boxm_shadow_app_initializer.h            boxm_shadow_app_initializer.hxx
+-    boxm_shadow_bayes_optimizer.h            boxm_shadow_bayes_optimizer.hxx
+-    dummy.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_algo_rt_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo_rt LIBRARY_SOURCES ${boxm_algo_rt_sources})
+-
+-#processes
+-add_subdirectory(pro)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_algo_rt boxm boxm_sample boxm_sample_algo boxm_basic boxm_util ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vgl_algo bsta ${VXL_LIB_PREFIX}vnl sdet brip ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo )
+-
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
+deleted file mode 100644
+index ef11ac6b96..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
+-
+-BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(short,float,float);
+-BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(short,float,float);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
+deleted file mode 100644
+index 8d4e1a9f37..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/algo/rt/boxm_edge_updater.hxx>
+-
+-BOXM_EDGE_UPDATER_INSTANTIATE(short,float,float);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
+deleted file mode 100644
+index ca43ee5ebf..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT2_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
+deleted file mode 100644
+index fc93c9b10a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT2_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index a9b24b175b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index 318336e55b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY, BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 89f46b6393..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 0c8a2da7d1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 1cc6084872..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 8a9638f4b1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
+deleted file mode 100644
+index 71036d42a6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <bpgl/bpgl_camera_estimator.hxx>
+-#include <boxm/algo/rt/boxm_expected_edge_functor.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boxm_inf_line_sample<float> sample;
+-typedef boxm_expected_edge_functor<short,sample > functor;
+-BPGL_CAMERA_ESTIMATOR_INSTANTIATE(functor);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
+deleted file mode 100644
+index 5700690341..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_change_3d_functor_h
+-#define boxm_change_3d_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM>
+-class boxm_change_3d_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_change_3d_functor(vil_image_view<float> const& change_image, float prob_ratio)
+-    : change_image_(change_image),
+-      vis_img_(change_image.ni(),change_image.nj(), 1),
+-      alpha_integral_(change_image.ni(),change_image.nj(), 1),
+-      prob_ratio_(prob_ratio)
+-  {
+-    vis_img_.fill(1.0f);
+-    alpha_integral_.fill(0.0f);
+-
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM>& cell_value, boxm_scalar_sample<float>& scalar)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-
+-    // update segment length sum
+-    scalar.seg_len_ += seg_len;
+-
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-
+-    float back_prob = change_image_(i,j);
+-    float fore_prob = 1.0f/(1.0f + prob_ratio_*back_prob);
+-
+-    // set change prob in auxiliary voxel
+-    scalar.scalar_sum_ += Omega * fore_prob * seg_len;
+-
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> change_image_;
+-  vil_image_view<float> alpha_integral_;
+-  vil_image_view<float> vis_img_;
+-  float prob_ratio_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_change_3d(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                    vpgl_camera_double_sptr cam,
+-                    vil_image_view<float> &change_image,
+-                    std::string chng_name,
+-                    float prob_ratio)
+-{
+-  typedef boxm_scalar_sample<float> sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,chng_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-
+-  std::cout<<"Chng visibility"<<std::endl;
+-  // functor to compute 3-d change prob
+-  typedef boxm_change_3d_functor<T_data::apm_type> change_functor;
+-
+-  // set up the raytrace function
+-  boxm_raytrace_function<change_functor,T_loc, T_data, sample_datatype> raytracer_chng(scene,aux_scene,cam.ptr(),change_image.ni(),change_image.nj());
+-
+-  // construct the change probability functor
+-  change_functor chng_func(change_image, prob_ratio);
+-
+-  // run the functor over the octree
+-  raytracer_chng.run(chng_func);
+-
+-  std::cout<<"Change 3-d Done."<<std::endl;
+-}
+-
+-#endif // boxm_change_3d_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
+deleted file mode 100644
+index a5d584f2c0..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
++++ /dev/null
+@@ -1,83 +0,0 @@
+-#ifndef boxm_change_probability_functor_h
+-#define boxm_change_probability_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_change_probability_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_change_probability_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const & image, vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob,
+-                                  vil_image_view<float> &mask_vis,
+-                                  unsigned int ni,unsigned nj,
+-                                  bool scene_read_only=false,bool is_aux=true)
+-    : image_(image), change_prob_(change_prob),  vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    change_prob_.fill(nil);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float prob_den  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), image_(i,j));
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    change_prob_(i,j) +=  prob_den* Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image_;
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_change_prob_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                         vil_image_view<typename T_data::obs_datatype> const& image,
+-                         vpgl_camera_double_sptr cam,
+-                         vil_image_view<typename T_data::obs_datatype> &change_prob,
+-                         vil_image_view<float> & mask,
+-                         int /*bin*/ = -1,
+-                         bool /*use_black_background*/ = false)
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
+-  typedef boxm_change_probability_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > chng_functor;
+-  boxm_raytrace_function<chng_functor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),change_prob.ni(),change_prob.nj());
+-  chng_functor functor(image, change_prob,mask,change_prob.ni(),change_prob.nj(),true,false);
+-  raytracer.run(functor);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h b/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
+deleted file mode 100644
+index 144d5bd7bf..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#ifndef boxm_compute_num_rays_statistics_h
+-#define boxm_compute_num_rays_statistics_h
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_histogram.h>
+-#include <boxm/basic/boxm_num_rays_functor.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-template <class T_loc, class T_data>
+-bool compute_ray_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene,
+-                            vpgl_camera_double_sptr cam,
+-                            bsta_histogram<float>& num_rays_hist,
+-                            unsigned ni, unsigned nj)
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> >::CLONE);
+-
+-  typedef boxm_num_rays_functor<T_data::apm_type,boxm_scalar_sample<sample_datatype> > functor_type;
+-  boxm_raytrace_function<functor_type,T_loc, T_data,boxm_scalar_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),ni,nj);
+-  functor_type num_rays_functor;
+-  raytracer.run(num_rays_functor);
+-
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  typedef boct_tree<T_loc, boxm_scalar_sample<sample_datatype> > aux_tree_type;
+-  typedef boct_tree_cell<T_loc,boxm_scalar_sample<sample_datatype> > aux_cell_type;
+-
+-  num_rays_hist = bsta_histogram<float>(0.0f, 80.0f, 40);
+-  boxm_block_iterator<tree_type> bit = scene.iterator();
+-  float avg_rays=0;
+-  float num_cells=0;
+-  for (; !bit.end(); ++bit)
+-  {
+-    vgl_point_3d<int> block_index = bit.index();
+-    //aux_scene.load_block(block_index);
+-    boxm_block<aux_tree_type> * block = aux_scene.get_block(block_index);
+-    aux_tree_type* tree=block->get_tree();
+-    if (!tree) return false;
+-    std::vector<aux_cell_type *> leaves = tree->leaf_cells();
+-    for (typename std::vector<aux_cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
+-    {
+-      boxm_scalar_sample<sample_datatype>  data = (*cit)->data();
+-      num_rays_hist.upcount(static_cast<float>(data.scalar_sum_), 1.0f);
+-      avg_rays+=data.scalar_sum_;
+-      num_cells++;
+-    }
+-  }
+-
+-  //aux_scene.clean_scene();
+-  std::cout<<"Avg num of rays per cell "<<avg_rays/num_cells<<std::endl
+-          << "[#rays]=Frequency" << '\n';
+-
+-  for (unsigned int i=0; i<num_rays_hist.nbins(); i++)
+-  {
+-      std::cout<< '[' << num_rays_hist.avg_bin_value(i) << "]=" << num_rays_hist.counts(i) << '\n';
+-  }
+-
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
+deleted file mode 100644
+index 510fb1158d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
++++ /dev/null
+@@ -1,76 +0,0 @@
+-#ifndef boxm_edge_tangent_updater_h_
+-#define boxm_edge_tangent_updater_h_
+-//:
+-// \file
+-// \brief class to find the optimal intersecting 3D lines for each voxel in the scene
+-//
+-// \author G. Tunali
+-//
+-// \verbatim
+-//  Modifications
+-//    Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
+-// \endverbatim
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <vil/vil_image_view.h>
+-
+-template<class T_loc, class APM, class AUX>
+-class boxm_edge_tangent_updater
+-{
+- public:
+-
+-  boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
+-                            std::vector<std::string>  image_ids, bool use_ransac=true, float ransac_ortho_thres = 0.01f, float ransac_volume_ratio = 128.0f, int ransac_consensus_cnt = 3);
+-
+-  ~boxm_edge_tangent_updater()= default;
+-
+-  bool add_cells();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-  bool use_ransac_;
+-
+-  float ransac_ortho_thres_;
+-  float ransac_volume_ratio_;
+-  int ransac_consensus_cnt_;  // number of images that need to contribute planes to a hypothesis for a cell to be assigned a 3D edge
+-                              // there should be at least ransac_consensus_cnt_+1 training images for some consensus to be met at any voxel, otherwise edge world will be empty
+-
+-  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
+-};
+-
+-template<class T_loc, class APM, class AUX>
+-class boxm_edge_tangent_refine_updates
+-{
+- public:
+-
+-  boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene, int consensus_cnt,
+-                                   std::vector<vil_image_view<float> >  edge_images,
+-                                   std::vector<vpgl_camera_double_sptr>  cameras);
+-
+-  ~boxm_edge_tangent_refine_updates() = default;
+-
+-  bool refine_cells();
+-
+- protected:
+-  std::vector<vil_image_view<float> > edge_images_; // edge_img(ix, iy, 0) = static_cast<float>(x); subpixel location of edge
+-                                                   // edge_img(ix, iy, 1) = static_cast<float>(y);
+-                                                   // edge_img(ix, iy, 2) = static_cast<float>(dir); tangent direction of the edgel
+-  std::vector<vpgl_camera_double_sptr> cameras_;
+-
+-  int consensus_cnt_;  // how many images need to be in agreement for an edgel to survive
+-  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
+deleted file mode 100644
+index 5c3d68f321..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
++++ /dev/null
+@@ -1,291 +0,0 @@
+-#ifndef boxm_edge_tangent_updater_hxx_
+-#define boxm_edge_tangent_updater_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_edge_tangent_updater.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/util/boxm_plane_ransac.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <bsta/bsta_histogram.h>
+-
+-template <class T_loc, class APM, class AUX>
+-boxm_edge_tangent_updater<T_loc,APM,AUX>::boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc,
+-                                                                    boxm_inf_line_sample<APM> > > &scene,
+-                                                                    std::vector<std::string>  image_ids,
+-                                                                    bool use_ransac,
+-                                                                    float ransac_ortho_thres,
+-                                                                    float ransac_volume_ratio,
+-                                                                    int ransac_concensus_cnt)
+-: image_ids_(std::move(image_ids)), use_ransac_(use_ransac), ransac_ortho_thres_(ransac_ortho_thres), ransac_volume_ratio_(ransac_volume_ratio), ransac_consensus_cnt_(ransac_concensus_cnt), scene_(scene)
+-{}
+-
+-
+-template <class T_loc, class APM, class AUX>
+-bool boxm_edge_tangent_updater<T_loc,APM,AUX>::add_cells()
+-{
+-  // get auxiliary scenes associated with each input image
+-
+-  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> > > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> >
+-    aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>,
+-              boxm_edge_tangent_sample<AUX> >::LOAD, BOXM_EDGE_TANGENT_LINE);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_edge_tangent_sample<APM> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
+-    int nums=0;
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, boxm_edge_tangent_sample<AUX> > *> aux_readers(aux_scenes.size());
+-    std::vector<unsigned> aux_samples_num(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-      aux_samples_num[i] = 0;
+-    }
+-    //int a;
+-    //std::cin>>a;
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
+-      // initialize the cell
+-      boxm_inf_line_sample<AUX> data(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(0,0),vgl_vector_3d<AUX>(1,1,1)));
+-      cell->set_data(data);
+-
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, boxm_edge_tangent_sample<AUX> > temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().num_obs()>0)
+-        {
+-            aux_samples.push_back(temp_cell.data());
+-            //aux_samples_num[j]++;
+-        }
+-      }
+-
+-      if (aux_samples.size() > 1)
+-      {
+-        std::vector<vgl_plane_3d<AUX> > planes;
+-        std::vector<AUX> weights;
+-
+-        for (unsigned int k=0;k<aux_samples.size(); ++k) {
+-          boxm_edge_tangent_sample<APM> s = aux_samples[k];
+-          for (unsigned int j=0; j<s.num_obs(); j++) {
+-            boxm_plane_obs<AUX> obs = s.obs(j);
+-            weights.push_back(obs.seg_len_);
+-            vgl_plane_3d<AUX> plane(obs.plane_);
+-            planes.push_back(plane);
+-          }
+-        }
+-        nums+=planes.size();
+-        if (planes.size() > 1) {
+-          if (use_ransac_) {
+-            vgl_infinite_line_3d<AUX> line;
+-            float residual=1e5;
+-            vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
+-
+-            // ransac_consensus_cnt_ used to be hard-coded here to 5; made it into a parameter with a default value of 3
+-            if (boxm_plane_ransac<AUX>(aux_samples, weights, line, residual,bb, ransac_consensus_cnt_, ransac_ortho_thres_, ransac_volume_ratio_)) {
+-              boxm_inf_line_sample<AUX> data(line,aux_samples.size());
+-              data.residual_=residual;
+-
+-              // now set the clipped line
+-              // convert to type double
+-              vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
+-              vgl_point_3d<double> p0,p1;
+-              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
+-              vgl_infinite_line_3d<double> dline(x0,dir);
+-              if (!vgl_intersection<double>(bb, dline, p0, p1))
+-                data.residual_=0;
+-              else {
+-                // convert back to type AUX
+-                vgl_point_3d<AUX> p0_t(AUX(p0.x()), AUX(p0.y()), AUX(p0.z()));
+-                vgl_point_3d<AUX> p1_t(AUX(p1.x()), AUX(p1.y()), AUX(p1.z()));
+-                vgl_line_3d_2_points<AUX> line_clipped(p0_t,p1_t);
+-                data.line_clipped_ = line_clipped;
+-              }
+-
+-              cell->set_data(data);
+-            }
+-            else
+-            {
+-              boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-              cell->set_data(sample);
+-            }
+-          }
+-          else
+-          {
+-            boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-            cell->set_data(sample);
+-          }
+-        }
+-        else
+-        {
+-          boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-          cell->set_data(sample);
+-        }
+-      }
+-      else
+-      {
+-        boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-        cell->set_data(sample);
+-      }
+-    }
+-    nums/=cells.size();
+-
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-#if 0
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-#endif
+-  return true;
+-}
+-
+-template <class T_loc, class APM, class AUX>
+-boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
+-                                                                                  int consensus_cnt,
+-                                                                                  std::vector<vil_image_view<float> >  edge_images,
+-                                                                                  std::vector<vpgl_camera_double_sptr>  cameras)
+-: edge_images_(std::move(edge_images)), cameras_(std::move(cameras)), consensus_cnt_(consensus_cnt), scene_(scene)
+-{}
+-
+-template <class T_loc, class APM, class AUX>
+-bool boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::refine_cells()
+-{
+-  std::cout << "using " << edge_images_.size() << " images to refine edge world!" << std::endl;
+-
+-  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
+-      boxm_inf_line_sample<AUX> cell_value = cell->data();
+-
+-      // update residual of cell_value based on the visibility and support of this 3D line in all the images
+-      if (cell_value.residual_<1.0)
+-      {
+-        // go through each image
+-        int cnt = 0;
+-        for (unsigned k = 0; k < edge_images_.size(); k++) {
+-          int ni = edge_images_[k].ni();
+-          int nj = edge_images_[k].nj();
+-          // project this 3D line to the image
+-          double u1,v1,u2,v2;
+-          vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
+-          vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
+-          cameras_[k]->project(p1.x(),p1.y(),p1.z(),u1,v1);
+-          cameras_[k]->project(p2.x(),p2.y(),p2.z(),u2,v2);
+-
+-          double line_angle = vnl_math::angle_0_to_2pi(std::atan2(v2-v1, -(u2-u1)));
+-          double line_angle2 = vnl_math::angle_0_to_2pi(line_angle + vnl_math::pi); // line segment is symmetric
+-
+-          // find mid point of line seg
+-          int cent_i = int(u1+(u2-u1)/2.0);
+-          int cent_j = int(v1+(v2-v1)/2.0);
+-
+-          // check a neighborhood of 10x10 in the image to find the edgel that is nearest to this line segment
+-          double angle_of_min = 0.0;
+-          double dist = 10.0;
+-          for (int ii = cent_i - 10; ii < cent_i + 10; ii++) {
+-            if (ii < 0 || ii >= ni) continue;
+-            for (int jj = cent_j - 10; jj < cent_j + 10; jj++) {
+-              if (jj < 0 || jj >= nj) continue;
+-              double ex = edge_images_[k](ii,jj,0);
+-              double ey = edge_images_[k](ii,jj,1);
+-              double dir = edge_images_[k](ii,jj,2);
+-              double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, ex, ey);
+-              if (dist_to_seg < dist) {
+-                dist = dist_to_seg;
+-                angle_of_min = dir;
+-              }
+-            }
+-          }
+-          if (dist < 10.0)
+-            if (std::abs(angle_of_min - line_angle) < vnl_math::pi/16.0 || std::abs(angle_of_min - line_angle2) < vnl_math::pi/16.0)
+-              cnt++;
+-        }
+-
+-        if (cnt >= consensus_cnt_)
+-          cell_value.residual_ = AUX(1.0)-AUX(cnt)/AUX(edge_images_.size());
+-        else
+-          cell_value.residual_ = AUX(1.0);
+-        cell->set_data(cell_value);
+-      }
+-    }
+-    scene_.write_active_block();
+-    iter++;
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_edge_tangent_updater<T1,T2,T3 >
+-
+-#define BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(T1,T2,T3) \
+-template class boxm_edge_tangent_refine_updates<T1,T2,T3 >
+-
+-#endif // boxm_edge_tangent_updater_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
+deleted file mode 100644
+index 646f92a418..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
++++ /dev/null
+@@ -1,34 +0,0 @@
+-#ifndef boxm_edge_updater_h_
+-#define boxm_edge_updater_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-template<class T_loc, class APM, class AUX>
+-class boxm_edge_updater
+-{
+- public:
+-  boxm_edge_updater(boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene,
+-                    std::vector<std::string>  image_ids);
+-
+-  ~boxm_edge_updater()= default;
+-
+-  bool add_cells();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
+deleted file mode 100644
+index 029f503587..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
++++ /dev/null
+@@ -1,110 +0,0 @@
+-#ifndef boxm_edge_updater_hxx_
+-#define boxm_edge_updater_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_edge_updater.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class APM, class AUX>
+-boxm_edge_updater<T_loc,APM,AUX>::boxm_edge_updater(boxm_scene<boct_tree<T_loc,
+-                                                    boxm_edge_sample<APM> > > &scene,
+-                                                    std::vector<std::string>  image_ids)
+-: image_ids_(std::move(image_ids)), scene_(scene)
+-{}
+-
+-
+-template <class T_loc, class APM, class AUX>
+-bool boxm_edge_updater<T_loc,APM,AUX>::add_cells()
+-{
+-  // get auxiliary scenes associated with each input image
+-  //typedef typename boxm_aux_traits<AUX>::sample_datatype AUX;
+-
+-  typedef boct_tree<T_loc, boxm_edge_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> >::LOAD);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_aux_edge_sample<APM> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_edge_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_edge_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, boxm_aux_edge_sample<AUX> > *> aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_edge_sample<APM> >* cell = cells[i];
+-      boxm_edge_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, boxm_aux_edge_sample<AUX> > temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-
+-      //std::vector<typename boxm_edge_sample<APM> > obs_vector(aux_samples.size());
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        data.edge_prob_ += aux_samples[s].obs_/aux_samples[s].seg_len_;
+-      }
+-      data.num_obs_ += 1;
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_EDGE_UPDATER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_edge_updater<T1,T2,T3 >
+-
+-#endif // boxm_edge_updater_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
+deleted file mode 100644
+index b0d443ca27..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#ifndef boxm_expected_edge_functor_h_
+-#define boxm_expected_edge_functor_h_
+-//:
+-// \file
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
+-
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_transform.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-
+-//: Functor class to compute (1-x)
+-// assumes that max range value is "1"
+-// only sensible for real types
+-class boxm_exp_edge_vil_not_functor
+-{
+- public:
+-  float operator()(float x)       const { return x<1.0f?(1.0f-x):0.0f; }
+-  double operator()(double x)     const { return x<1.0?1.0-x:0.0; }
+-};
+-
+-template <class T_loc, class T_data>
+-class boxm_expected_edge_functor
+-{
+- public:
+-  boxm_expected_edge_functor(boxm_scene<boct_tree<T_loc, T_data > > &scene)
+-    : scene_(scene) {}
+-  ~boxm_expected_edge_functor() = default;
+-
+-  bool apply(const vpgl_camera_double_sptr& cam, vil_image_view<float> *img_eei)
+-  {
+-    boxm_render_edge_tangent_image_rt(scene_,cam,*img_eei);
+-    // now take the inverse of this image, pixels which contain edges will have values closer to 1 and others will be zero
+-    boxm_exp_edge_vil_not_functor nt;
+-    vil_transform(*img_eei, nt);
+-
+-    // now blur this image
+-    *img_eei = brip_vil_float_ops::gaussian(*img_eei, 1.0f);
+-
+-    return true;
+-  }
+-
+- private:
+-  boxm_scene<boct_tree<T_loc, T_data > > scene_;
+-};
+-
+-#undef BOXM_EXPECTED_EDGE_INSTANTIATE
+-#define BOXM_EXPECTED_EDGE_INSTANTIATE(T1,T2) \
+-template class boxm_expected_edge_functor<T1, T2 >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
+deleted file mode 100644
+index 756c0ca4a6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#ifndef boxm_generate_edge_sample_functor_h
+-#define boxm_generate_edge_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T, class T_aux>
+-class boxm_generate_edge_sample_functor
+-{
+- public:
+-  boxm_generate_edge_sample_functor(vil_image_view<float> &observation,
+-                                    unsigned int /*ni*/=0,unsigned /*nj*/=0)
+-    : obs_(observation)
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        T &cell_value, // FIXME: unused...
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-    aux_val.obs_ += obs_(i,j) * seg_len;
+-    aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> &obs_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_edge_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                  vpgl_camera_double_sptr cam,
+-                                  vil_image_view<float> &obs,
+-                                  std::string iname)
+-{
+-    typedef boxm_aux_edge_sample<float> aux_datatype;
+-    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE);
+-    typedef boxm_generate_edge_sample_functor<boxm_edge_sample<float>,aux_datatype> func;
+-    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PROCESSING EDGE IMAGE\n";
+-    func functor(obs,obs.ni(),obs.nj());
+-    raytracer.run(functor);
+-
+-    //aux_scene.clean_scene();
+-    std::cerr << "DONE.\n";
+-}
+-
+-#endif // boxm_generate_edge_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
+deleted file mode 100644
+index 009e75228c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
++++ /dev/null
+@@ -1,78 +0,0 @@
+-#ifndef boxm_generate_edge_tangent_sample_functor_h
+-#define boxm_generate_edge_tangent_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vgl/vgl_homg_plane_3d.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T, class T_aux>
+-class boxm_generate_edge_tangent_sample_functor
+-{
+- public:
+-  boxm_generate_edge_tangent_sample_functor(vil_image_view<float> &observation,
+-                                            unsigned int /*ni*/=0, unsigned /*nj*/=0)
+-    : obs_(observation)
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-    // make sure that the image has 4 planes ((a,b,c,d) params of a plane ax+by+cz=d )
+-    if (observation.nplanes() != 4)
+-      std::cerr << "boxm_generate_edge_tangent_sample_functor: the image does not have 4 planes\n";
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        T &cell_value, // FIXME - unused
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-    float a = obs_(i,j,0);
+-    float b = obs_(i,j,1);
+-    float c = obs_(i,j,2);
+-    float d = obs_(i,j,3);
+-
+-    if (a||b||c||d) {
+-      vgl_homg_plane_3d<float> p(a,b,c,d);
+-      boxm_plane_obs<float> observation(p,seg_len);
+-      aux_val.insert(observation);
+-    }
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> &obs_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_edge_tangent_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                          vpgl_camera_double_sptr cam,
+-                                          vil_image_view<float> &obs,
+-                                          std::string iname)
+-{
+-    typedef boxm_edge_tangent_sample<float> aux_datatype;
+-    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE, BOXM_EDGE_TANGENT_LINE);
+-    typedef boxm_generate_edge_tangent_sample_functor<boxm_inf_line_sample<float>,aux_datatype> func;
+-    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PROCESSING EDGE IMAGE\n";
+-    func functor(obs,obs.ni(),obs.nj());
+-    raytracer.run(functor);
+-    //aux_scene.clean_scene();
+-    std::cerr << "DONE.\n";
+-}
+-
+-#endif // boxm_generate_edge_tangent_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
+deleted file mode 100644
+index 5cbaef86fc..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
++++ /dev/null
+@@ -1,197 +0,0 @@
+-#ifndef boxm_generate_opt2_sample_functor_h
+-#define boxm_generate_opt2_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_opt2_sample_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_opt2_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                           vil_image_view<float> const& beta_denom,
+-                                           float model_prior,
+-                                           vil_image_view<float> const& alt_prob_img)
+-    : scene_read_only_(true) /*only reads info from the scene*/, is_aux_(true) /*needs to write aux*/,
+-      model_prior_(model_prior), alt_prob_img_(alt_prob_img), obs_(image), beta_denom_(beta_denom),
+-      vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    vis_img_.fill(1.0f);
+-    pre_img_.fill(0.0f);
+-    alpha_integral_.fill(0.0f);
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs = aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    // accumulate aux sample values
+-    aux_val.pre_ += (pre * model_prior_ + alt_prob_img_(i,j)) * seg_len;
+-    aux_val.vis_ += vis * model_prior_ * seg_len;
+-
+-    const float beta_num = pre + vis*PI;
+-    const float beta_num_expanded = (beta_num  * model_prior_) + alt_prob_img_(i,j);
+-    const float beta_denom = beta_denom_(i,j);
+-    const float beta_denom_expanded = (beta_denom * model_prior_) + alt_prob_img_(i,j);
+-
+-    float beta = 1.0f;
+-    if (beta_denom_expanded > 1e-5f) {
+-      beta =  beta_num_expanded / beta_denom_expanded;
+-    }
+-    const float old_PQ = (float)(1.0 - std::exp(-cell_value.alpha*seg_len));
+-    const float new_PQ = old_PQ * beta;
+-    const float pass_prob_old = 1.0f - old_PQ;
+-    float pass_prob = 1.0f - new_PQ;
+-
+-    // compute expected information gained from update
+-    const float weight = new_PQ * std::log(new_PQ / old_PQ) + pass_prob * std::log(pass_prob / pass_prob_old);
+-    // ensure log doesn't go to infinity
+-    if (pass_prob < 1e-5f) {
+-      pass_prob = 1e-5f;
+-    }
+-    aux_val.log_pass_prob_sum_ += std::log(pass_prob) * weight/seg_len;
+-    aux_val.weighted_seg_len_sum_ += weight; // += seg_len * weight/seg_len;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  float model_prior_;
+-  vil_image_view<float> const& alt_prob_img_;
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& beta_denom_;
+-
+-  //vil_image_view<float> const& pre_inf_;
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data, boxm_aux_type AUX_T>
+-void boxm_generate_opt2_samples(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                vpgl_camera_double_sptr cam,
+-                                vil_image_view<typename T_data::obs_datatype> &obs,
+-                                std::string iname,
+-                                std::vector<float> const& alt_appearance_priors,
+-                                std::vector<typename T_data::apm_datatype> const& alt_appearance_models,
+-                                bool black_background = false)
+-{
+-  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
+-  //std::cout << "scene.save_platform_independent() = " << scene.save_platform_independent() << std::endl;
+-  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 0"<<std::endl;
+-  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-  raytracer_0.run(pass_0_functor);
+-
+-  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-  vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-
+-  typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-  boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 1"<<std::endl;
+-  pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-  raytracer_1.run(pass_1_functor);
+-
+-  // compute observation probability for "infinity" appearance model
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    // use single-mode gaussian centered at 0
+-    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
+-    typename T_data::obs_mathtype black(0);
+-    const float black_std_dev = 8.0f/255;
+-    const gauss_type appearance_dist(black, black_std_dev*black_std_dev);
+-
+-    //float peak=T_data::apm_processor::expected_color(background_apm);
+-    //std::cout<<"Peak: "<<peak<<std::endl;
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-    for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-      *PI_it = appearance_dist.prob_density(*img_it);
+-    }
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-  }
+-  else {
+-    // assume uniform prob. density on interval [0, 1]
+-    //PI_inf.fill(1.0f);
+-    // don't actually have to compute anything since multiplying by 1
+-    inf_term = vis_inf;
+-  }
+-  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
+-  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
+-
+-  // compute model prior
+-  float model_prior = 1.0f;
+-  for (float alt_appearance_prior : alt_appearance_priors) {
+-    model_prior -= alt_appearance_prior;
+-  }
+-  // sanity check
+-  if (model_prior <= 0.0f) {
+-    std::cerr << "error: boxm_generate_opt2_samples : alt_appearance_priors sum to " << 1.0f - model_prior << " >= 1.0!\n";
+-  }
+-
+-  // compute alternate appearance probability for each pixel in the image
+-  vil_image_view<float> alt_prob_img(obs.ni(), obs.nj());
+-  alt_prob_img.fill(0.0f);
+-  const unsigned int n_alt = alt_appearance_priors.size();
+-  if (n_alt > 0) {
+-    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-    typename vil_image_view<float>::iterator alt_prob_it = alt_prob_img.begin();
+-    for (; img_it != obs.end(); ++img_it, ++alt_prob_it) {
+-      for (unsigned int a=0; a< n_alt; ++a) {
+-        const float alt_prob_density = boxm_apm_traits<T_data::apm_type>::apm_processor::prob_density(alt_appearance_models[a],*img_it);
+-        *alt_prob_it +=  alt_prob_density * alt_appearance_priors[a];
+-      }
+-    }
+-  }
+-
+-  // run the raytrace function
+-  std::cout<<"PASS 2"<<std::endl;
+-  typedef boxm_generate_opt2_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
+-  boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  pass_2 pass_2_functor(obs,beta_denom_img, model_prior, alt_prob_img);
+-  raytracer_2.run(pass_2_functor);
+-
+-  //aux_scene.clean_scene();
+-  std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_opt2_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
+deleted file mode 100644
+index 2447f5f483..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
++++ /dev/null
+@@ -1,219 +0,0 @@
+-#ifndef boxm_generate_opt3_sample_functor_h
+-#define boxm_generate_opt3_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM>
+-class pre_inf_functor
+-{
+-  typedef typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype aux_null_t;
+- public:
+-  //: "default" constructor
+-  pre_inf_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                  vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
+-    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //no need to write aux
+-    is_aux_=false;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value, aux_null_t & /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),obs_(i,j)); // aux_val.PI_;
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-  vil_image_view<float> alpha_integral_;
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> &pre_img_;
+-};
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_opt3_sample_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_opt3_sample_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                    vil_image_view<float> const& beta_denom)
+-    : obs_(image), beta_denom_(beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux &aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), obs_(i,j));
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = (float)std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    // update observation distribution
+-    aux_val.update_obs_dist(obs_(i,j),vis);
+-    aux_val.weighted_vis_sum_ += vis*seg_len;
+-
+-    const float old_PQ = 1.0f - (float)std::exp(-cell_value.alpha * seg_len);
+-    float new_PQ = old_PQ;
+-    const float beta_denom_val = beta_denom_(i,j);
+-    const double epsilon = 1e-6;
+-    if (beta_denom_val > epsilon) {
+-      const float beta = (pre + vis*PI) / beta_denom_val;
+-      new_PQ = old_PQ * beta;
+-    }
+-    double pass_prob = 1.0 - new_PQ;
+-    if (pass_prob < epsilon) {
+-      pass_prob = epsilon;
+-    }
+-    aux_val.log_pass_prob_sum_ += (float)std::log(pass_prob);
+-    aux_val.seg_len_sum_ += seg_len;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& beta_denom_;
+-
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data, boxm_aux_type AUX_T>
+-void boxm_generate_opt3_sample(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                               vpgl_camera_double_sptr cam,
+-                               vil_image_view<typename T_data::obs_datatype> &obs,
+-                               std::string image_id,
+-                               bool black_background = false)
+-{
+-  typedef boxm_opt3_sample<boxm_aux_traits<AUX_T>::APM_TYPE> aux_sample_datatype;
+-  boxm_aux_scene<T_loc, T_data, aux_sample_datatype> aux_scene(&scene, image_id, boxm_aux_scene<T_loc, T_data, aux_sample_datatype>::CLONE);
+-#if 0
+-  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 0"<<std::endl;
+-  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-  raytracer_0.run(pass_0_functor);
+-#endif
+-  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-  typedef pre_inf_functor<T_data::apm_type> pre_inf_functor_t;
+-  boxm_raytrace_function<pre_inf_functor_t, T_loc, T_data> raytracer_1(scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 1"<<std::endl;
+-  pre_inf_functor_t pass_1_functor(obs,pre_inf,vis_inf);
+-  raytracer_1.run(pass_1_functor);
+-
+-  vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
+-
+-  // compute observation probability for "infinity" appearance model
+-  vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    // use single-mode gaussian centered at 0
+-    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
+-    typename T_data::obs_mathtype black(0);
+-    const float black_std_dev = 8.0f/255;
+-    const gauss_type appearance_dist(black, black_std_dev);
+-#if 0
+-    float peak=T_data::apm_processor::expected_color(background_apm);
+-    std::cout<<"Peak: "<<peak<<std::endl;
+-#endif
+-    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-    for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-      *PI_it = appearance_dist.prob_density(*img_it);
+-    }
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-  }
+-  else {
+-    // assume uniform prob. density on interval [0, 1]
+-    //PI_inf.fill(1.0f);
+-    // don't actually have to compute anything since multiplying by 1
+-    inf_term = vis_inf;
+-  }
+-  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
+-
+-#ifdef DEBUG
+-  vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
+-  vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
+-  vil_save(beta_denom_img, "E:/tests/capitol/beta_denom_img.tiff");
+-  vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
+-#endif
+-
+-  std::cout<<"PASS 2"<<std::endl;
+-  typedef boxm_generate_opt3_sample_functor<T_data::apm_type, aux_sample_datatype> pass_2_functor_t;
+-  boxm_raytrace_function<pass_2_functor_t, T_loc, T_data, aux_sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  pass_2_functor_t pass_2_functor(obs, beta_denom_img);
+-  raytracer_2.run(pass_2_functor);
+-#if 0
+-  aux_scene.clean_scene();
+-#endif
+-  std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_opt3_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
+deleted file mode 100644
+index c23998293f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
++++ /dev/null
+@@ -1,164 +0,0 @@
+-#ifndef boxm_generate_opt_sample_functor_h
+-#define boxm_generate_opt_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_opt_sample_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_opt_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                          vil_image_view<float> const& Beta_denom)
+-  : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs= aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    // accumulate aux sample values
+-    aux_val.pre_ += pre * seg_len;
+-    aux_val.vis_ += vis * seg_len;
+-
+-    const float Beta_num = pre + vis*PI;
+-    float Beta = 1.0f;
+-    if (Beta_denom_(i,j) < 1e-6) {
+-      if (Beta_num > 1e-5) {
+-        Beta = 10.0f;
+-      }
+-    }
+-    else {
+-      Beta = Beta_num / Beta_denom_(i,j);
+-    }
+-    if (Beta < 0) {
+-      if (Beta < -1e-5) {
+-        std::cerr << " error: beta = " << Beta << "  setting to 0. " << '\n';
+-      }
+-      Beta = 0;
+-    }
+-    aux_val.Beta_ += Beta * seg_len;
+-    //aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& Beta_denom_;
+-
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_opt_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                 vpgl_camera_double_sptr cam,
+-                                 vil_image_view<typename T_data::obs_datatype> &obs,
+-                                 std::string iname,
+-                                 bool black_background = false)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 0"<<std::endl;
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-
+-    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 1"<<std::endl;
+-    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-    raytracer_1.run(pass_1_functor);
+-
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-
+-
+-    if (black_background) {
+-        std::cout << "using black background model" << std::endl;
+-        typename T_data::obs_datatype black(0.0f);
+-        float background_std_dev = 8.0f/255; // ???????????? 4/255 Vishal's
+-        typename T_data::apm_datatype background_apm(black, background_std_dev*background_std_dev,1.0f);
+-
+-        float peak=T_data::apm_processor::expected_color(background_apm);
+-        std::cout<<"Peak: "<<peak<<std::endl;
+-        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-        for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
+-        }
+-    }
+-    else {
+-        PI_inf.fill(1.0f);
+-    }
+-
+-    vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
+-    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
+-#ifdef DEBUG
+-    vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
+-    vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
+-    vil_save(Beta_denom_img, "E:/tests/capitol/Beta_denom_img.tiff");
+-    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
+-#endif
+-    std::cout<<"PASS 2"<<std::endl;
+-    typedef boxm_generate_opt_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
+-    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    pass_2 pass_2_functor(obs,Beta_denom_img);
+-    raytracer_2.run(pass_2_functor);
+-
+-#if 0
+-    aux_scene.clean_scene();
+-#endif
+-    std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_opt_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
+deleted file mode 100644
+index 551c049134..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
++++ /dev/null
+@@ -1,212 +0,0 @@
+-#ifndef boxm_generate_shadow_sample_functor_h
+-#define boxm_generate_shadow_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_shadow_sample_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_shadow_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                             vil_image_view<float> const& Beta_denom, float shadow_prior, vil_image_view<float> const& shadow_density)
+-    : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1), shadow_prior_(shadow_prior), shadow_density_(shadow_density)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs= aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    float alpha_l = cell_value.alpha * seg_len; //change
+-    alpha_integral_(i,j) += alpha_l;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    // accumulate aux sample values
+-    aux_val.pre_ += pre * seg_len;
+-    aux_val.vis_ += vis * seg_len;  //<<changed Feb 05, 2010
+-    float Beta_num = pre + vis*PI;
+-    Beta_num *=(1.0f - shadow_prior_);
+-    Beta_num += shadow_density_(i,j);
+-    float Beta = 1.0f;
+-    if (Beta_denom_(i,j) < 1e-6) {
+-      if (Beta_num > 1e-5) {
+-        Beta = 10.0f;
+-      }
+-    }
+-    else {
+-      Beta = Beta_num / Beta_denom_(i,j);
+-    }
+-    if (Beta < 0) {
+-      if (Beta < -1e-5) {
+-        std::cerr << " error: beta = " << Beta << "  setting to 0.\n";
+-      }
+-      Beta = 0;
+-    }
+-#if 0
+-    if (mean_obs == 0.0f){
+-      std::cout << PI << ' ' << shadow_density_(i,j) << ' '
+-               << pre << ' ' << vis << ' ' << Beta_denom_(i,j)
+-               << ' ' << Beta << '\n';
+-    }
+-#endif
+-    aux_val.Beta_ += Beta * seg_len;
+-    //New discrete probability computations
+-    float PQ_prior = 1.0f - std::exp(-alpha_l);
+-    float PQ_post = Beta*PQ_prior;
+-    if (PQ_post>=0.999f) PQ_post = 0.999f;
+-    //         v------note minus sign
+-    float lg = -std::log(1.0f-PQ_post);
+-    aux_val.log_sum_ += lg;
+-    //End of new discrete probability calculations
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-  float shadow_prior_;
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& Beta_denom_;
+-
+-  //vil_image_view<float> const& pre_inf_;
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-  vil_image_view<float> shadow_density_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_initial_shadow_sampler_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                    vpgl_camera_double_sptr cam,
+-                                    vil_image_view<typename T_data::obs_datatype> &obs,
+-                                    std::string iname)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"Collect Observations"<<std::endl;
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-    std::cout<<"Samples collected\n"<<std::endl;
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_shadow_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                    vpgl_camera_double_sptr cam,
+-                                    vil_image_view<typename T_data::obs_datatype> &obs,
+-                                    std::string iname,
+-                                    float shadow_prior,
+-                                    float shadow_mean,
+-                                    float shadow_sigma,
+-                                    bool black_background = false)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 0"<<std::endl;
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-
+-    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 1"<<std::endl;
+-    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-    raytracer_1.run(pass_1_functor);
+-
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-
+-
+-    if (black_background) {
+-        std::cout << "using black background model" << std::endl;
+-        typename T_data::obs_datatype black(0.0f);
+-        float background_std_dev = 8.0f/255;//???????????? 4/255 Vishal's
+-        typename T_data::apm_datatype background_apm(black, background_std_dev,1.0f);
+-
+-        float peak=T_data::apm_processor::expected_color(background_apm);
+-        std::cout<<"Peak: "<<peak<<std::endl;
+-        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-        for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
+-        }
+-    }
+-    else {
+-        PI_inf.fill(1.0f);
+-    }
+-
+-    vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
+-    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
+-
+-    boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
+-    vil_image_view<float> shadow_density(obs.ni(), obs.nj());
+-    for (unsigned j=0; j<obs.nj(); ++j)
+-      for (unsigned i=0; i<obs.ni(); ++i)
+-      {
+-        float sh_density =
+-          boxm_simple_grey_processor::prob_density(shadow_dist, obs(i,j));
+-        sh_density *=2.0f;//if Gaussian centered at 0
+-        shadow_density(i,j) = sh_density*shadow_prior;
+-        Beta_denom_img(i,j) *= (1.0f-shadow_prior);
+-        Beta_denom_img(i,j) += shadow_density(i,j);
+-      }
+-
+-#if 0
+-    vil_save(vis_inf, "E:/ShadowSite/vis_inf.tiff");
+-    vil_save(pre_inf, "E:/ShadowSite/pre_inf.tiff");
+-    vil_save(Beta_denom_img, "E:/ShadowSite/Beta_denom_img.tiff");
+-    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
+-#endif
+-    std::cout<<"PASS 2"<<std::endl;
+-    typedef boxm_generate_shadow_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
+-    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    pass_2 pass_2_functor(obs,Beta_denom_img, shadow_prior, shadow_density);
+-    raytracer_2.run(pass_2_functor);
+-
+-    //aux_scene.clean_scene();
+-    std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_shadow_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
+deleted file mode 100644
+index 0b7a1f34f7..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#ifndef boxm_opt2_bayesian_optimizer_h_
+-#define boxm_opt2_bayesian_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_opt2_optimizer
+-{
+- public:
+-  boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                      std::vector<std::string>  image_ids);
+-
+-  ~boxm_opt2_optimizer()= default;
+-
+-  bool update();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
+deleted file mode 100644
+index ae00724692..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
++++ /dev/null
+@@ -1,152 +0,0 @@
+-#ifndef boxm_opt2_optimizer_hxx_
+-#define boxm_opt2_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_opt2_optimizer.h"
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_opt2_optimizer<T_loc,APM,AUX>::boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                        std::vector<std::string>  image_ids)
+-                                                        : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_opt2_optimizer<T_loc,APM,AUX>::update()
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_opt2_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-      std::vector<float> pre_vector;
+-      std::vector<float> vis_vector;
+-      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector;
+-
+-      // UPDATE METHOD #1 : "OR" of occlusion probabilities
+-      double log_pass_prob_sum = 0.0;
+-      double weighted_seg_len_sum = 0.0;
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        const float obs_seg_len = aux_samples[s].seg_len_;
+-        const float obs_weighted_seg_len = aux_samples[s].weighted_seg_len_sum_;
+-
+-        if (obs_seg_len > 1e-6) {
+-          if (obs_weighted_seg_len > 1e-6) {
+-            log_pass_prob_sum += aux_samples[s].log_pass_prob_sum_;
+-            weighted_seg_len_sum += obs_weighted_seg_len;
+-          }
+-          // add observation and vis,pre to list
+-          obs_vector.push_back(aux_samples[s].obs_ / obs_seg_len);
+-          pre_vector.push_back(aux_samples[s].pre_ / obs_seg_len);
+-          vis_vector.push_back(aux_samples[s].vis_ / obs_seg_len);
+-        }
+-      }
+-      // update the occlusion density
+-      if (weighted_seg_len_sum > 1e-6) {
+-        data.alpha = (float)(-log_pass_prob_sum / weighted_seg_len_sum);
+-      }
+-
+-      // do bounds check on new alpha value
+-      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-      const float cell_len = float(cell_bb.width());
+-      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-      if (data.alpha > max_alpha) {
+-        data.alpha = max_alpha;
+-      }
+-      if (data.alpha < min_alpha) {
+-        data.alpha = min_alpha;
+-      }
+-      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
+-        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n';
+-        //std::cerr << " log_alpha_sum = " << log_alpha_sum << ", n_actual_samples = " << n_actual_samples << '\n';
+-      }
+-      // update with new appearance
+-      const float min_sigma = 0.02f;
+-      boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, pre_vector, vis_vector, data.appearance_, min_sigma);
+-
+-      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_OPT2_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-  template class boxm_opt2_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_opt2_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
+deleted file mode 100644
+index d19ab2d9f4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#ifndef boxm_opt3_optimizer_h_
+-#define boxm_opt3_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
+-class boxm_opt3_optimizer
+-{
+- public:
+-  boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                      std::vector<std::string>  image_ids);
+-
+-  ~boxm_opt3_optimizer()= default;
+-
+-  bool optimize_cells();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
+deleted file mode 100644
+index da5f7ba0fb..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
++++ /dev/null
+@@ -1,172 +0,0 @@
+-#ifndef boxm_opt3_optimizer_hxx_
+-#define boxm_opt3_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_opt3_optimizer.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-
+-#include <vnl/vnl_random.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
+-boxm_opt3_optimizer<T_loc,APM,AUX_APM>::boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                            std::vector<std::string>  image_ids)
+-                                                            : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
+-bool boxm_opt3_optimizer<T_loc,APM,AUX_APM>::optimize_cells()
+-{
+-  constexpr unsigned int n_samples_per_obs = 10;
+-
+-  // get auxiliary scenes associated with each input image
+-  typedef boxm_opt3_sample<AUX_APM> aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  typedef typename boxm_apm_traits<APM>::obs_datatype obs_t;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<float> vis_vector;
+-  std::vector<obs_t> obs_vector;
+-  vnl_random rand_gen;
+-  std::vector<boxm_opt3_sample<AUX_APM> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        aux_samples.push_back(temp_cell.data());
+-      }
+-
+-      vis_vector.clear();
+-      obs_vector.clear();
+-
+-      double log_alpha_sum = 0.0;
+-      unsigned int n_actual_observations = 0;
+-
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        double total_seg_len = aux_samples[s].seg_len_sum_;
+-
+-        if (total_seg_len > 1e-6) {
+-          ++n_actual_observations;
+-          // compute mean vis
+-          float obs_vis = (float)(aux_samples[s].weighted_vis_sum_ / total_seg_len);
+-          // draw samples from obs_dist
+-
+-          for (unsigned int n=0; n<n_samples_per_obs; ++n) {
+-            obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::sample(aux_samples[s].obs_dist_, rand_gen);
+-            //obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::expected_color(aux_samples[s].obs_dist_);
+-            obs_vector.push_back(obs_sample);
+-            vis_vector.push_back(obs_vis);
+-          }
+-          double alpha_s = -aux_samples[s].log_pass_prob_sum_ / total_seg_len;
+-          log_alpha_sum += std::log(alpha_s);
+-        }
+-      }
+-      float alpha_new = 0.0f;
+-      if (n_actual_observations > 0) {
+-        //std::cout << "cell IN " << data.alpha << ' ' << data.appearance_<< std::endl;
+-        // compute new alpha value
+-        alpha_new = (float)std::exp(log_alpha_sum / n_actual_observations);
+-
+-        // do bounds check on new alpha value
+-        vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-        const float cell_len = float(cell_bb.width());
+-        const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-        const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-        if (alpha_new > max_alpha) {
+-          alpha_new = max_alpha;
+-        }
+-        if (alpha_new < min_alpha) {
+-          alpha_new = min_alpha;
+-        }
+-        if (!((alpha_new >= min_alpha) && (alpha_new <= max_alpha)) ){
+-          std::cerr << std::endl << "error: alpha_new = " << alpha_new << '\n'
+-                   << "n_actual_observations = " << n_actual_observations << " log_alpha_sum = " << log_alpha_sum << '\n';
+-          alpha_new = min_alpha;
+-        }
+-        else {
+-          data.alpha = alpha_new;
+-        }
+-        // update with new appearance
+-        //std::cout << obs_vector.size() << ' ' << std::endl;
+-        if (obs_vector.size() != n_samples_per_obs * n_actual_observations) {
+-          std::cerr << "error: n_samples_per_obs = " << n_samples_per_obs << " n_actual_observations = " << n_actual_observations << " obs_vector.size() " << obs_vector.size() << '\n';
+-        }
+-        boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, vis_vector, data.appearance_, 0.025f);
+-        //std::cout << "cell OUT " << data.alpha << data.appearance_ << std::endl << std::endl;
+-        cell->set_data(data);
+-      }
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_OPT3_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-  template class boxm_opt3_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_opt3_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
+deleted file mode 100644
+index c6f87c3817..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
++++ /dev/null
+@@ -1,85 +0,0 @@
+-#ifndef boxm_opt_appearance_estimator_h_
+-#define boxm_opt_appearance_estimator_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#if 0
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM>
+-void boxm_opt_compute_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
+-                                 std::vector<float> const& pre,
+-                                 std::vector<float> const& vis,
+-                                 typename boxm_apm_traits<APM>::apm_datatype &model)
+-{
+-  const float min_sigma=0.1f;
+-  // initialize appearance model estimate using visibility probabilities as weights.
+-  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,vis,model,min_sigma);
+-#if 1
+-  // use EM to refine estimate until convergence.
+-  unsigned int nobs= obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  std::vector<float> obs_weights = vis;
+-
+-  const float epsilon = 1e-4f;
+-  constexpr unsigned int max_its = 100;
+-  const float min_weight_change = 1e-5f;
+-  for (unsigned int i=0; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION
+-    for (unsigned int n=0; n<nobs; ++n) {
+-      // for each observation, assign probabilities to each of 3 possibilities
+-      // P1: observation is generated by appearance model.
+-      // P2: point is visible, but observation is generated by a point "behind" this one. (i.e. point is not on a surface)
+-      // P3: point is not visible - observation is generated by a point "ahead" of this one.
+-      const float P1 = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
+-      const float P2 = 0.0f; //post_prob[n];
+-      const float P3 = pre[n];
+-      const float normalizing_factor = P1 + P2 + P3;
+-      float new_obs_weight = 0;
+-      if (normalizing_factor > epsilon) {
+-        new_obs_weight = P1 / normalizing_factor;
+-      }
+-
+-      // compute delta weight for convergence check
+-      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
+-      if (weight_delta > max_weight_change) {
+-        max_weight_change = weight_delta;
+-      }
+-      obs_weights[n] = new_obs_weight;
+-    }
+-    // check for convergence
+-    if (max_weight_change < min_weight_change) {
+-#if 0
+-    if (nobs > 1) {
+-      std::cout << "EM converged in " << i << " iterations." << std::endl;
+-      float total_prob = 0.0f;
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        total_prob += obs_weights[n];
+-      }
+-      std::cout << "total prob for " << nobs << " observations = " << total_prob << std::endl
+-               << "sigma = " << model.sigma() << ",  gauss_weight = " << model.gauss_weight() << std::endl;
+-    }
+-#endif
+-      break;
+-    }
+-    // MAXIMIZATION
+-    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_sigma);
+-  }
+-
+-  // adjust model to account for small sample sizes.
+-  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
+-#endif
+-  return;
+-}
+-
+-#endif // boxm_opt_appearance_estimator_h_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
+deleted file mode 100644
+index 7275093568..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
++++ /dev/null
+@@ -1,36 +0,0 @@
+-#ifndef boxm_opt_rt_bayesian_optimizer_h_
+-#define boxm_opt_rt_bayesian_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_opt_rt_bayesian_optimizer
+-{
+- public:
+-  boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                 std::vector<std::string>  image_ids);
+-
+-  ~boxm_opt_rt_bayesian_optimizer()= default;
+-
+-  bool optimize_cells(double damping_factor);
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
+deleted file mode 100644
+index 10f61e8572..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
++++ /dev/null
+@@ -1,151 +0,0 @@
+-#ifndef boxm_opt_rt_bayesian_optimizer_hxx_
+-#define boxm_opt_rt_bayesian_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_opt_rt_bayesian_optimizer.h"
+-#include "boxm_opt_appearance_estimator.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                                              std::vector<std::string>  image_ids)
+-: image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-
+-      //boxm_sample<APM> &cell_data = cell_it->data();
+-      std::vector<float> pre_vector(aux_samples.size());
+-      std::vector<float> vis_vector(aux_samples.size());
+-      //std::vector<float> post_prob_vector(aux_samples.size());
+-      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector(aux_samples.size());
+-      double Beta = 1.0;
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        float seg_len = aux_samples[s].seg_len_;
+-        if (seg_len > 1e-5) {
+-          Beta *= (aux_samples[s].Beta_ / seg_len);
+-          obs_vector[s] = aux_samples[s].obs_ / seg_len;
+-          pre_vector[s] = aux_samples[s].pre_ / seg_len;
+-          vis_vector[s] = aux_samples[s].vis_ / seg_len;
+-          //post_prob_vector[s] = aux_samples[s].post_prob_ / seg_len;
+-        }
+-        else {
+-          pre_vector[s] = 0.0f;
+-          vis_vector[s] = 0.0f;
+-          //post_prob_vector[s] = 0.0f;
+-          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
+-        }
+-      }
+-      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
+-
+-      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
+-        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
+-
+-      data.alpha *= (float)damped_Beta;
+-      // do bounds check on new alpha value
+-      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-      const float cell_len = float(cell_bb.width());
+-      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-      if (data.alpha > max_alpha) {
+-        data.alpha = max_alpha;
+-      }
+-      if (data.alpha < min_alpha) {
+-        data.alpha = min_alpha;
+-      }
+-      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
+-        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n'
+-                 << "damped_Beta = " << damped_Beta << '\n';
+-      }
+-      // update with new appearance
+-      boxm_opt_compute_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_);
+-      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_opt_rt_bayesian_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_opt_rt_bayesian_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
+deleted file mode 100644
+index 0d50efd8a4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
++++ /dev/null
+@@ -1,67 +0,0 @@
+-#ifndef boxm_pre_infinity_functor_h
+-#define boxm_pre_infinity_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_pre_infinity_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_pre_infinity_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                            vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
+-    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute average intensity for the cell
+-    const float mean_obs_ =aux_val.obs_/aux_val.seg_len_;
+-    // compute appearance probability of observation
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),mean_obs_); // aux_val.PI_;
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-  vil_image_view<float> alpha_integral_;
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> &pre_img_;
+-};
+-
+-#endif // boxm_pre_infinity_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
+deleted file mode 100644
+index bfd4c3b08d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
++++ /dev/null
+@@ -1,109 +0,0 @@
+-#ifndef boxm_render_expected_depth_functor_h
+-#define boxm_render_expected_depth_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-#include <vil/vil_transform.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_depth_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_depth_functor(vil_image_view<float> &expected,
+-                                     vil_image_view<float> &mask_vis,
+-                                     vgl_point_3d<double> cam_center,
+-                                     unsigned int ni,unsigned nj,
+-                                     bool scene_read_only=false,
+-                                     bool is_aux=true)
+-  : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj,1), center_(cam_center)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    expected_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value, T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    const float depthexp = (float)(s1 - center_).length();
+-#if 0
+-    // compute appearance probability of observation
+-    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
+-#endif
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    expected_(i,j) += depthexp * Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> &expected_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-  vgl_point_3d<double> center_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-class normalize_expected_functor_depth_rt
+-{
+- public:
+-  normalize_expected_functor_depth_rt(float depth_max):depth_max_(depth_max) {}
+-
+-  void operator()(float mask, float &pix) const
+-  {
+-    pix += mask*depth_max_;
+-  }
+-
+- private:
+-  float depth_max_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_depth_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vpgl_camera_double_sptr cam,
+-                          vil_image_view<float> &expected,
+-                          vil_image_view<float> &mask,
+-                          int bin = -1,                      // FIXME - unused
+-                          bool use_black_background = false) // FIXME - unused
+-{
+-  if (vpgl_perspective_camera<double> *pcam=dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-  {
+-    typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> >::LOAD);
+-
+-    typedef boxm_render_expected_depth_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
+-    boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
+-    expfunctor exp_functor(expected,mask,pcam->camera_center(),expected.ni(),expected.nj(),true,false);
+-    raytracer.run(exp_functor);
+-
+-    float max_depth=(float)boxm_utils::max_point_to_box_dist(scene.get_world_bbox(),pcam->camera_center());
+-
+-    normalize_expected_functor_depth_rt norm_fn(max_depth);
+-    vil_transform2<float,float, normalize_expected_functor_depth_rt >(mask,expected,norm_fn);
+-  }
+-}
+-
+-#endif // boxm_render_expected_depth_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
+deleted file mode 100644
+index c210b8d20f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
++++ /dev/null
+@@ -1,109 +0,0 @@
+-#ifndef boxm_render_expected_edge_image_functor_h
+-#define boxm_render_expected_edge_image_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <vnl/vnl_math.h>
+-#include <vil/vil_transform.h>
+-#include <sdet/sdet_img_edge.h>
+-
+-#ifdef DEBUG
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_edge_image_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_edge_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
+-                                          vil_image_view<float> &mask_vis, // FIXME: unused...
+-                                          unsigned int /*ni*/=0, unsigned /*nj*/=0,
+-                                          bool scene_read_only=false,
+-                                          bool is_aux=true)
+-    : expected_(expected)
+-  {
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    expected_.fill(nil);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> /*s0*/, // currently unused, see below
+-                        vgl_point_3d<double> /*s1*/,
+-                        boxm_edge_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    //const float seg_len = (float)(s1-s0).length(); // FIXME: unused...
+-
+-    // TODO: revise with segment length
+-    const float exp  = cell_value.edge_prob_;
+-
+-    // keep the max value in expected image
+-    // if (expected_(i,j) < exp)
+-    expected_(i,j) =  std::max(expected_(i,j), exp);
+-
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_expected_functor_edge
+-{
+- public:
+-  normalize_expected_functor_edge(float n_normal, unsigned int dof) : n_normal_(n_normal), dof_(dof)
+-  {
+-#ifdef DEBUG
+-    std::cout << "Degrees of freedom: " << dof << std::endl;
+-#endif
+-  }
+-
+-  void operator()(float mask, float &pix) const
+-  {
+-    pix = sdet_img_edge::convert_edge_statistics_to_probability(pix,n_normal_,dof_);
+-  }
+-
+-  float n_normal_;
+-  unsigned int dof_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_edge_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                               vpgl_camera_double_sptr cam,
+-                               vil_image_view<float> &expected,
+-                               vil_image_view<float> & mask,
+-                               float n_normal,
+-                               unsigned int num_samples, //degrees of freedom
+-                               int bin = -1) // FIXME - unused
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> >::LOAD);
+-  typedef boxm_render_expected_edge_image_functor<BOXM_EDGE_FLOAT,sample_datatype > expfunctor;
+-  boxm_raytrace_function<expfunctor,T_loc, T_data > raytracer(scene,cam.ptr(),expected.ni(),expected.nj());
+-  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
+-  raytracer.run(exp_functor);
+-
+-  normalize_expected_functor_edge<T_data> norm_fn(n_normal,num_samples-1);
+-  vil_transform2<float,float, normalize_expected_functor_edge<T_data> >(mask,expected,norm_fn);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
+deleted file mode 100644
+index 17f8da724c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
++++ /dev/null
+@@ -1,126 +0,0 @@
+-#ifndef boxm_render_expected_edge_tangent_image_functor_h
+-#define boxm_render_expected_edge_tangent_image_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <vnl/vnl_math.h>
+-#include <vil/vil_image_view.h>
+-#include <sdet/sdet_img_edge.h>
+-#include <vgl/vgl_distance.h>
+-#ifdef DEBUG
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_edge_tangent_image_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_edge_tangent_image_functor(vil_image_view<float > &expected,
+-                                                  vpgl_camera_double_sptr cam,
+-                                                  //float threshold,
+-                                                  unsigned int /*ni*/=0, unsigned /*nj*/=0,
+-                                                  bool scene_read_only=false,
+-                                                  bool is_aux=true)
+-  : expected_(expected), num_obs_(expected.ni(),expected.nj()), cam_(cam), residual(1.0)
+-  {
+-    expected_.fill(1.0);
+-    num_obs_.fill(0);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> /*s0*/, // FIXME - unused
+-                        vgl_point_3d<double> /*s1*/, // FIXME - unused
+-                        boxm_inf_line_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    //std::cout<< cell_value.residual_<<' ';
+-#if 0
+-    if (cell_value.residual_<residual) {
+-      if (expected_(i,j) > cell_value.residual_)
+-        expected_(i,j) = cell_value.residual_;
+-    }
+-#endif
+-    if (cell_value.residual_<residual) {
+-      if (expected_(i,j) > cell_value.residual_) {
+-        double u1,v1,u2,v2;
+-        vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
+-        vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
+-        cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
+-        cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
+-        vgl_point_2d<double> img_p1(u1,v1);
+-        vgl_point_2d<double> img_p2(u2,v2);
+-        double dist = length(img_p1-img_p2);
+-        if (dist > 1.0)  // for img lines shorter than a pixel don't bother
+-        {
+-          double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, i, j);
+-          if (dist_to_seg <= 0.5) { // if the current pixel is less than 0.5 pixels closer to the projected line then mark it
+-            expected_(i,j)=cell_value.residual_;
+-          }
+-        }
+-      }
+-    }
+-#if 0
+-    if (cell_value.num_obs_>2 && cell_value.residual_<residual && cell_value.num_obs_>num_obs_(i,j))
+-    {
+-      num_obs_(i,j)=cell_value.num_obs_;
+-      double u1,v1,u2,v2;
+-      vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
+-      vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
+-      cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
+-      cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
+-      if ((u1-u2)==0 && v1-v2==0)
+-      {
+-        expected_(i,j,0)=-1;
+-        expected_(i,j,1)=-1;
+-        expected_(i,j,2)=-1;
+-      }
+-      else
+-      {
+-        expected_(i,j,0)=float(u1+u2)/2;
+-        expected_(i,j,1)=float(v1+v2)/2;
+-        expected_(i,j,2)=float(vnl_math::angle_0_to_2pi(std::atan2(v2-v1,u2-u1)));
+-      }
+-    }
+-#endif // 0
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float > &expected_;
+-  vil_image_view<unsigned> num_obs_;
+-  vpgl_camera_double_sptr cam_;
+-  float residual;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_render_edge_tangent_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                       vpgl_camera_double_sptr cam,
+-                                       vil_image_view<float> &expected)
+-                                     //  float n_normal, // FIXME - unused
+-                                     //  unsigned int num_samples, // FIXME - unused
+-                                     //  float threshold) // degrees of freedom
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> >::LOAD);
+-  typedef boxm_render_expected_edge_tangent_image_functor<BOXM_EDGE_LINE,sample_datatype > expfunctor;
+-  boxm_raytrace_function<expfunctor,T_loc, T_data> raytracer(scene, cam.ptr(),expected.ni(),expected.nj());
+-  expfunctor exp_functor(expected,cam,/*threshold,*/expected.ni(),expected.nj(),true,false);
+-  raytracer.run(exp_functor);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
+deleted file mode 100644
+index 51a2c930ce..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
++++ /dev/null
+@@ -1,103 +0,0 @@
+-#ifndef boxm_render_expected_image_functor_h
+-#define boxm_render_expected_image_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <vil/vil_transform.h>
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_image_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
+-                                     vil_image_view<float> &mask_vis,
+-                                     unsigned int ni,unsigned nj,
+-                                     bool scene_read_only=false,bool is_aux=true)
+-    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    expected_.fill(nil);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    expected_(i,j) +=  exp* Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_expected_functor_rt
+-{
+- public:
+-  normalize_expected_functor_rt(bool use_black_background) : use_black_background_(use_black_background) {}
+-
+-  void operator()(float mask, typename T_data::obs_datatype &pix) const
+-  {
+-    if (!use_black_background_) {
+-      pix += mask*0.5f;
+-    }
+-  }
+-  bool use_black_background_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vpgl_camera_double_sptr cam,
+-                          vil_image_view<typename T_data::obs_datatype> &expected,
+-                          vil_image_view<float> & mask,
+-                          int /*bin*/ = -1,
+-                          bool use_black_background = false)
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
+-  typedef boxm_render_expected_image_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
+-  boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
+-  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
+-  raytracer.run(exp_functor);
+-
+-  normalize_expected_functor_rt<T_data> norm_fn(use_black_background);
+-  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_rt<T_data> >(mask,expected,norm_fn);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
+deleted file mode 100644
+index acbde275c3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
++++ /dev/null
+@@ -1,120 +0,0 @@
+-#ifndef boxm_render_expected_shadow_image_functor_h
+-#define boxm_render_expected_shadow_image_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <vil/vil_transform.h>
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_render_expected_shadow_image_functor
+-{
+- public:
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
+-  //: "default" constructor
+-  boxm_render_expected_shadow_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
+-                                            vil_image_view<float> &mask_vis,
+-                                            unsigned int ni,unsigned nj,
+-                                            bool scene_read_only=false,bool is_aux=true)
+-    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    expected_.fill(nil);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value,
+-                        T_aux& aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
+-
+-    //compute sun visibility
+-    float length_sum = aux_val.seg_len_;
+-    float avg_sun_vis = 1.0f;
+-    if (length_sum>0.0f)
+-      avg_sun_vis = aux_val.vis_/length_sum;
+-
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    expected_(i,j) +=  exp * Omega * avg_sun_vis;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_shadow_functor
+-{
+- public:
+-
+-  normalize_shadow_functor(bool use_black_background)
+-    {use_black_background_ = use_black_background;}
+-
+-  void operator()(float mask, typename T_data::obs_datatype &pix) const
+-  {
+-    if (!use_black_background_) {
+-      pix += mask*0.5f;
+-    }
+-  }
+-  bool use_black_background_;
+-};
+-
+-
+-template <class T_loc, boxm_apm_type APM ,  boxm_aux_type AUX>
+-void boxm_render_shadow_image_rt(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                 std::string const& aux_scene_id,
+-                                 vpgl_camera_double_sptr cam,
+-                                 vil_image_view<typename boxm_sample<APM>::obs_datatype> &expected,
+-                                 vil_image_view<float> & mask,
+-                                 bool use_black_background = false)
+-{
+-  typedef boxm_sample<APM> T_data;
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
+-  boxm_aux_scene<T_loc, T_data, T_aux> aux_scene(&scene, aux_scene_id, boxm_aux_scene<T_loc, T_data, T_aux>::LOAD);
+-
+-  typedef boxm_render_expected_shadow_image_functor<T_loc, APM, AUX > exp_funct;
+-
+-  boxm_raytrace_function<exp_funct, T_loc, T_data, T_aux > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
+-  exp_funct expf(expected,mask,expected.ni(),expected.nj(),true,true);
+-  raytracer.run(expf);
+-
+-  normalize_shadow_functor<T_data> norm_fn(use_black_background);
+-  vil_transform2<float,typename T_data::obs_datatype, normalize_shadow_functor<T_data> >(mask,expected,norm_fn);
+-
+-  //  aux_scene.clean_scene();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h b/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
+deleted file mode 100644
+index 78df79d9c4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
++++ /dev/null
+@@ -1,447 +0,0 @@
+-#ifndef boxm_rpc_registration_h_
+-#define boxm_rpc_registration_h_
+-//:
+-// \file
+-// This part contains the correction rpc camera parameters using the expected
+-// edge image obtained from the world (scene) and edge map of the current image.
+-// if the camera parameters are manually corrected by the user, this part should
+-// be omitted by setting the "rpc_correction_flag" parameter to 0 (false) in the
+-// boxm_rpc_registration_process.
+-//
+-// \author Ibrahim Eden
+-// \date   Jan, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//     Feb 1st, 2010 Gamze Tunali
+-//         This piece of code is moved from bvxm_rpc_registration process to this file
+-//         as a standalone function to be used in boxm/opt/boxm_rpc_registration_process
+-// \endverbatim
+-
+-
+-#include <iostream>
+-#include <fstream>
+-#include <limits>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-#include <vpgl/algo/vpgl_backproject.h>
+-#include <vpgl/vpgl_lvcs.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vil/vil_image_view.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-int convert_uncertainty_from_meters_to_pixels(float uncertainty,
+-                                              vpgl_lvcs lvcs,
+-                                              vpgl_camera_double_sptr camera)
+-{
+-  // estimate the offset search size in the image space
+-  vgl_box_3d<double> box_uncertainty(-uncertainty,-uncertainty,-uncertainty,uncertainty,uncertainty,uncertainty);
+-  std::vector<vgl_point_3d<double> > box_uncertainty_corners = boxm_utils::corners_of_box_3d(box_uncertainty);
+-  vgl_box_2d<double> roi_uncertainty;
+-
+-  for (auto curr_corner : box_uncertainty_corners) {
+-    vgl_point_3d<double> curr_pt;
+-    if (camera->type_name()=="vpgl_local_rational_camera") {
+-      curr_pt.set(curr_corner.x(),curr_corner.y(),curr_corner.z());
+-    }
+-    else if (camera->type_name()=="vpgl_rational_camera") {
+-      double lon, lat, gz;
+-      lvcs.local_to_global(curr_corner.x(), curr_corner.y(), curr_corner.z(),
+-                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-      curr_pt.set(lon, lat, gz);
+-    }
+-    else // dummy initialisation, to avoid compiler warning
+-      curr_pt.set(-1e99, -1e99, -1.0);
+-
+-    double curr_u,curr_v;
+-    camera->project(curr_pt.x(),curr_pt.y(),curr_pt.z(),curr_u,curr_v);
+-    vgl_point_2d<double> p2d_uncertainty(curr_u,curr_v);
+-    roi_uncertainty.add(p2d_uncertainty);
+-  }
+-
+-  return vnl_math::ceil(0.5*std::max(roi_uncertainty.width(),roi_uncertainty.height()));
+-}
+-
+-template<class T_loc, class T_data>
+-bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
+-                           vil_image_view<vxl_byte> edge_image,
+-                           vil_image_view<vxl_byte> expected_edge_image,
+-                           vpgl_camera_double_sptr camera,
+-                           vpgl_camera_double_sptr camera_out,
+-                           bool rpc_shift_3d_flag,
+-                           float uncertainty,
+-                           float n_normal, // FIXME - unused
+-                           unsigned num_observations)
+-{
+-  double max_prob = std::numeric_limits<double>::min();
+-  unsigned int best_offset_u = 0, best_offset_v = 0;
+-
+-  typedef boct_tree<T_loc,T_data> tree_type;
+-  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-
+-  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
+-  int ni = edge_image.ni();
+-  int nj = edge_image.nj();
+-
+-  // this is the two level offset search algorithm
+-  int offset_lower_limit_u = -offset_search_size;
+-  int offset_lower_limit_v = -offset_search_size;
+-  int offset_upper_limit_u =  offset_search_size;
+-  int offset_upper_limit_v =  offset_search_size;
+-  std::cout << "Estimating image offsets:" << std::endl;
+-  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
+-    std::cout << '.';
+-    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
+-      // for each offset pair (u,v)
+-      double prob = 0.0;
+-      double norm = 0.0;
+-      // find the total probability of the edge image given the expected edge image
+-      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
+-        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
+-          if (edge_image(m,n)==255) {
+-            prob += expected_edge_image(m-u,n-v);
+-          }
+-          norm += expected_edge_image(m-u,n-v);
+-        }
+-      }
+-
+-      if (norm>0.0)
+-          prob/=norm;
+-
+-      // if maximum is found
+-      if (prob > max_prob) {
+-        max_prob = prob;
+-        best_offset_u = u;
+-        best_offset_v = v;
+-      }
+-    }
+-  }
+-  std::cout << std::endl;
+-
+-  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
+-  // local variables
+-  std::ifstream file_inp;
+-  std::ofstream file_out;
+-  file_out.clear();
+-  file_out.open("offsets.txt",std::ofstream::app);
+-  file_out << best_offset_u << ' ' << best_offset_v << '\n';
+-  file_out.close();
+-
+-  double nlx=0.f,nly=0.f,nlz=0.f;
+-  double motion_mult = 0.0;
+-  if (rpc_shift_3d_flag)
+-  {
+-    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
+-
+-    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
+-    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
+-
+-    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
+-    vgl_point_3d<double> init_point(0.0,0.0,0.001);
+-    vgl_point_3d<double> world_point;
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
+-
+-    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
+-    motion_plane_normal = normalize(motion_plane_normal);
+-    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
+-
+-    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
+-    vgl_point_3d<double> moved_origin;
+-    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
+-
+-    vgl_vector_3d<double> motion = moved_origin - origin_3d;
+-
+-    motion_mult = 1.0/((double)(num_observations+1));
+-    motion = motion*motion_mult;
+-
+-    double lx,ly,lz;
+-    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
+-    lx = rpc_origin.x();
+-    ly = rpc_origin.y();
+-    lz = rpc_origin.z();
+-
+-    lx = lx*(1.0f-(double)motion_mult);
+-    ly = ly*(1.0f-(double)motion_mult);
+-    lz = lz*(1.0f-(double)motion_mult);
+-
+-    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
+-    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
+-
+-    nlx = (double)pt_3d_updated.x();
+-    nly = (double)pt_3d_updated.y();
+-    nlz = (double)pt_3d_updated.z();
+-
+-    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
+-    scene->set_rpc_origin(new_rpc_origin);
+-  }
+-
+-  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
+-  // the following block of code takes care of different input camera types
+-  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
+-  bool is_local_cam = true;
+-  bool is_rational_cam = true;
+-  vpgl_local_rational_camera<double> *cam_inp_local;
+-  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
+-    is_local_cam = false;
+-  }
+-  vpgl_rational_camera<double> *cam_inp_rational;
+-  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
+-    is_rational_cam = false;
+-  }
+-
+-  if (is_local_cam) {
+-    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
+-    double offset_u,offset_v;
+-    cam_out_local.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_local.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
+-  }
+-  else if (is_rational_cam) {
+-    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
+-    double offset_u,offset_v;
+-    cam_out_rational.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_rational.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
+-  }
+-  else {
+-    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
+-    return false;
+-  }
+-
+-  return true;
+-}
+-
+-
+-template<class T_loc, class T_data>
+-bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
+-                           vil_image_view<float> edge_image,
+-                           vil_image_view<float > expected_edge_image,
+-                           vpgl_camera_double_sptr camera,
+-                           vpgl_camera_double_sptr camera_out,
+-                           bool rpc_shift_3d_flag,
+-                           float uncertainty,
+-                           unsigned num_observations)
+-{
+-  double max_cost = std::numeric_limits<double>::max();
+-  unsigned int best_offset_u = 0, best_offset_v = 0;
+-  double subpixel_best_offset_u = 0.0, subpixel_best_offset_v = 0.0;
+-
+-  typedef boct_tree<T_loc,T_data> tree_type;
+-  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-
+-  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
+-  int ni = edge_image.ni();
+-  int nj = edge_image.nj();
+-
+-  std::cout<<ni<<','<<nj<<','<<expected_edge_image.ni()<<','<<expected_edge_image.nj();
+-  // this is the two level offset search algorithm
+-  int offset_lower_limit_u = -offset_search_size;
+-  int offset_lower_limit_v = -offset_search_size;
+-  int offset_upper_limit_u =  offset_search_size;
+-  int offset_upper_limit_v =  offset_search_size;
+-  std::cout << "Estimating image offsets:" << std::endl;
+-  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
+-    std::cout << '.';
+-    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
+-      // for each offset pair (u,v)
+-      double cost = 0.0;
+-      double norm = 0.0;
+-      // find the total probability of the edge image given the expected edge image
+-      for (int m=offset_search_size+1; m<ni-offset_search_size-1; m++) {
+-        for (int n=offset_search_size+1; n<nj-offset_search_size-1; n++) {
+-          if (edge_image(m,n,0)>-1 && edge_image(m,n,1)>-1 && edge_image(m,n,2)>-1) {
+-            if (expected_edge_image(m-u,n-v,0)>0 && expected_edge_image(m-u,n-v,1)>0 && expected_edge_image(m-u,n-v,2)>0) {
+-            //std::cout<<'.';
+-            float sintheta1=std::sin(edge_image(m,n,2));
+-            float costheta1=std::cos(edge_image(m,n,2));
+-
+-            float sintheta2=std::sin(expected_edge_image(m-u,n-v,2));
+-            float costheta2=std::cos(expected_edge_image(m-u,n-v,2));
+-#if 0
+-            float dx=expected_edge_image(m-u,n-v,0)+u-edge_image(m,n,0);
+-            float dy=expected_edge_image(m-u,n-v,1)+v-edge_image(m,n,1);
+-
+-            float dist=std::sqrt(dx*dx+dy*dy);
+-            if (dist<min_dist)
+-              min_dist=dist;
+-
+-            float dist1=std::sqrt((dx*sintheta1*sintheta1+dy*sintheta1*costheta1)*(dx*sintheta1*sintheta1+dy*sintheta1*costheta1)
+-                                +(dy*costheta1*costheta1+dx*sintheta1*costheta1)*(dy*costheta1*costheta1+dx*sintheta1*costheta1));
+-            float dist2=std::sqrt((dx*sintheta2*sintheta2+dy*sintheta2*costheta2)*(dx*sintheta2*sintheta2+dy*sintheta2*costheta2)
+-                                +(dy*costheta2*costheta2+dx*sintheta2*costheta2)*(dy*costheta2*costheta2+dx*sintheta2*costheta2));
+-            if ((dist1+dist2)/2<min_dist)
+-              min_dist=(dist1+dist2)/2;
+-#endif // 0
+-            float dist=(1-std::fabs(sintheta1*sintheta2+costheta2*costheta1));//+std::sqrt(dx*dx+dy*dy);
+-            cost += dist;//(dist1+dist2)/2;
+-          }
+-          else
+-          {
+-            cost+=0.5;
+-          }
+-          norm += 1;
+-        }
+-      }
+-    }
+-
+-    if (norm>0.0)
+-        cost/=norm;
+-
+-      //std::cout<<cost<<"u "<<u<<" v"<<v<<'\n';
+-      // if maximum is found
+-      if (cost < max_cost) {
+-        max_cost = cost;
+-        best_offset_u = u;
+-        best_offset_v = v;
+-      }
+-    }
+-  }
+-  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
+-  double subpixel_offset_limit=0.5;
+-  max_cost = std::numeric_limits<double>::max();
+-  for (double u=-subpixel_offset_limit; u<=subpixel_offset_limit; ) {
+-    std::cout << '.';
+-    for (double v=-subpixel_offset_limit; v<=subpixel_offset_limit; ) {
+-      // for each offset pair (u,v)
+-      double cost = 0.0;
+-      // find the total probability of the edge image given the expected edge image
+-      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
+-        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
+-          if (edge_image(m,n,0)!=-1 || edge_image(m,n,1)!=-1 || edge_image(m,n,2)!=-1) {
+-            if (expected_edge_image(m-best_offset_u,n-best_offset_v,0)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,1)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,2)>0) {
+-              double dx=expected_edge_image(m-best_offset_u,n-best_offset_v,0)+best_offset_u+u-edge_image(m,n,0);
+-              double dy=expected_edge_image(m-best_offset_u,n-best_offset_v,1)+best_offset_v+v-edge_image(m,n,1);
+-              double dist=std::sqrt(dx*dx+dy*dy);
+-              cost += dist;
+-            }
+-          }
+-        }
+-      }
+-      //std::cout<<cost<<' ';
+-      if (cost < max_cost) {
+-          max_cost = cost;
+-          subpixel_best_offset_u = (double)u;
+-          subpixel_best_offset_v = (double)v;
+-      }
+-
+-      v=v+0.05;
+-    }
+-    u+=0.05;
+-  }
+-  std::cout << "Estimated changes in offsets (u,v)=(" << subpixel_best_offset_u << ',' << subpixel_best_offset_v << ')' << std::endl;
+-
+-  // local variables
+-  std::ifstream file_inp;
+-  std::ofstream file_out;
+-  file_out.clear();
+-  file_out.open("offsets.txt",std::ofstream::app);
+-  file_out << best_offset_u +subpixel_best_offset_u<< ' ' << best_offset_v+subpixel_best_offset_v << '\n';
+-  file_out.close();
+-
+-  double nlx=0.f,nly=0.f,nlz=0.f;
+-  double motion_mult = 0.0;
+-  if (rpc_shift_3d_flag)
+-  {
+-    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
+-
+-    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
+-    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
+-
+-    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
+-    vgl_point_3d<double> init_point(0.0,0.0,0.001);
+-    vgl_point_3d<double> world_point;
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
+-
+-    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
+-    motion_plane_normal = normalize(motion_plane_normal);
+-    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
+-
+-    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
+-    vgl_point_3d<double> moved_origin;
+-    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
+-
+-    vgl_vector_3d<double> motion = moved_origin - origin_3d;
+-
+-    motion_mult = 1.0/((double)(num_observations+1));
+-    motion = motion*motion_mult;
+-
+-    double lx,ly,lz;
+-    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
+-    lx = rpc_origin.x();
+-    ly = rpc_origin.y();
+-    lz = rpc_origin.z();
+-
+-    lx = lx*(1.0f-(double)motion_mult);
+-    ly = ly*(1.0f-(double)motion_mult);
+-    lz = lz*(1.0f-(double)motion_mult);
+-
+-    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
+-    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
+-
+-    nlx = (double)pt_3d_updated.x();
+-    nly = (double)pt_3d_updated.y();
+-    nlz = (double)pt_3d_updated.z();
+-
+-    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
+-    scene->set_rpc_origin(new_rpc_origin);
+-  }
+-
+-  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
+-  // the following block of code takes care of different input camera types
+-  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
+-  bool is_local_cam = true;
+-  bool is_rational_cam = true;
+-  vpgl_local_rational_camera<double> *cam_inp_local;
+-  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
+-    is_local_cam = false;
+-  }
+-  vpgl_rational_camera<double> *cam_inp_rational;
+-  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
+-    is_rational_cam = false;
+-  }
+-
+-  if (is_local_cam) {
+-    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
+-    double offset_u,offset_v;
+-    cam_out_local.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_local.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
+-  }
+-  else if (is_rational_cam) {
+-    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
+-    double offset_u,offset_v;
+-    cam_out_rational.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_rational.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
+-  }
+-  else {
+-    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
+-    return false;
+-  }
+-
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
+deleted file mode 100644
+index 0d4d93d05d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
++++ /dev/null
+@@ -1,45 +0,0 @@
+-#ifndef boxm_shadow_app_initializer_h_
+-#define boxm_shadow_app_initializer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_shadow_app_initializer
+-{
+-public:
+-
+-  boxm_shadow_app_initializer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                              std::vector<std::string>  image_ids,
+-                              float min_app_sigma,
+-                              float shadow_prior,
+-                              float shadow_mean, float shadow_sigma,
+-                              bool verbose=false);
+-
+-  ~boxm_shadow_app_initializer()= default;
+-
+-  bool initialize();
+-
+-protected:
+-
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  float min_app_sigma_;
+-  float shadow_prior_;
+-  float shadow_mean_;
+-  float shadow_sigma_;
+-  bool verbose_;
+-};
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
+deleted file mode 100644
+index 22c469ec72..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
++++ /dev/null
+@@ -1,122 +0,0 @@
+-#ifndef boxm_shadow_app_initializer_hxx_
+-#define boxm_shadow_app_initializer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_shadow_app_initializer.h"
+-#include "boxm_shadow_appearance_estimator.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_shadow_app_initializer<T_loc,APM,AUX>::boxm_shadow_app_initializer(
+-            boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-            std::vector<std::string>  image_ids, float min_app_sigma,
+-            float shadow_prior, float shadow_mean, float shadow_sigma,
+-            bool verbose)
+-  : image_ids_(std::move(image_ids)), scene_(scene), min_app_sigma_(min_app_sigma),
+-    shadow_prior_(shadow_prior), shadow_mean_(shadow_mean),
+-    shadow_sigma_(shadow_sigma),verbose_(verbose)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_shadow_app_initializer<T_loc,APM,AUX>::initialize()
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-            return false;
+-        }
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
+-      std::vector<obs_type> obs_vector;
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        float seg_len = aux_samples[s].seg_len_;
+-        obs_type obs = aux_samples[s].obs_;
+-        if ( seg_len > 1e-5 && (obs > obs_type(0)) ){
+-          obs_vector.push_back(obs / seg_len);
+-        }
+-      }
+-      unsigned n_obs = obs_vector.size();
+-      if(n_obs>1){
+-      std::vector<float> pre_vector(n_obs, 0.0f);
+-      std::vector<float> vis_vector(n_obs, 1.0f);
+-      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector,
+-                                          vis_vector, data.appearance_,
+-                                          min_app_sigma_, shadow_prior_,
+-                                          shadow_mean_, shadow_sigma_,
+-                                          verbose_);
+-      cell->set_data(data);
+-      }
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-  // clear the aux scenes
+-  for (unsigned i=0; i<aux_scenes.size(); i++)
+-    aux_scenes[i].clean_scene();
+-  return true;
+-}
+-
+-
+-#define BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_shadow_app_initializer<T1,T2,T3 >
+-
+-#endif // boxm_shadow_app_initializer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
+deleted file mode 100644
+index 15dd5763ba..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
++++ /dev/null
+@@ -1,114 +0,0 @@
+-#ifndef boxm_shadow_appearance_estimator_h_
+-#define boxm_shadow_appearance_estimator_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#if 1
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM>
+-void boxm_compute_shadow_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
+-                                    std::vector<float> const& pre,
+-                                    std::vector<float> const& vis,
+-                                    typename boxm_apm_traits<APM>::apm_datatype &model,
+-                                    float min_app_sigma,
+-                                    float shadow_prior,
+-                                    float shadow_mean, float shadow_sigma,
+-                                    bool verbose = false)
+-{
+-  std::vector<float> obs_weights(vis.size(), 0.0f);
+-  std::vector<float> sh_density(vis.size(), 0.0f);
+-  //assume that the initial appearance distribution is uniform on [0 1]
+-  //thus a reasonable initialization for weights is
+-  //
+-  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
+-  //
+-  //, where Psh is shadow_prior and psh(x) is the shadow density function,
+-  // sh_density. vis is the visibilty probability
+-  //
+-  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
+-  for(unsigned n = 0; n<obs.size(); ++n)
+-    {
+-      //2.0 x density since centered on zero
+-      sh_density[n] =
+-        2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
+-      float neu = vis[n]*(1-shadow_prior);
+-      float weight =
+-        neu/(neu + sh_density[n]*shadow_prior);
+-      obs_weights[n]=weight;
+-    }
+-  std::vector<float> initial_weights = obs_weights;
+-  // initial estimate for the illuminated appearance model
+-  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
+-  double initial_mean = model.color();
+-  double initial_sigma = model.sigma();
+-#if 1
+-  // use EM to refine estimate until convergence.
+-  unsigned int nobs= obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  const float epsilon = 1e-4f;
+-  constexpr unsigned int max_its = 100;
+-  const float min_weight_change = 1e-5f;
+-  unsigned int i=0;
+-  for (; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION - determine the weights
+-    for (unsigned int n=0; n<nobs; ++n) {
+-
+-      float PI = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
+-      float neu = PI*(1-shadow_prior);
+-      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
+-      float new_obs_weight = 0;
+-      if (den > epsilon) {
+-        new_obs_weight = neu / den;
+-      }
+-      // compute delta weight for convergence check
+-      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
+-      if (weight_delta > max_weight_change) {
+-        max_weight_change = weight_delta;
+-      }
+-      obs_weights[n] = new_obs_weight;
+-    }
+-    // check for convergence
+-    if (max_weight_change < min_weight_change)
+-      break;
+-    // MAXIMIZATION - determine the parameters of the appearance distribution
+-    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
+-  }
+-  if(verbose) {
+-    bool print = false;
+-    for(unsigned n = 0; n<obs.size(); ++n)
+-      if(obs[n]>0) print = true;
+-      if(i<max_its&&print){
+-        std::cout << "converged after " << i << " iterations.\n";
+-        std::cout << " initial mean = " << initial_mean << " final mean = "
+-                 << model.color() << '\n';
+-        std::cout << " initial sigma = " << initial_sigma << " final sigma = "
+-                 << model.sigma() << '\n';
+-      }else{ std::cout << "failed to converge\n";}
+-
+-      std::cout << "Initial (Observations, Weights):\n";
+-      for(unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
+-      std::cout << '\n';
+-      std::cout << "Final (Observations, Weights):\n";
+-      for(unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
+-      std::cout << '\n';
+-  }
+-
+-  // adjust model to account for small sample sizes.
+-  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
+-#endif
+-  return;
+-}
+-
+-#endif // boxm_shadow_appearance_estimator_h_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
+deleted file mode 100644
+index beaa3b2c7d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
++++ /dev/null
+@@ -1,51 +0,0 @@
+-#ifndef boxm_shadow_bayes_optimizer_h_
+-#define boxm_shadow_bayes_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vgl/vgl_point_3d.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_shadow_bayes_optimizer
+-{
+-public:
+-
+-  boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                              std::vector<std::string>  image_ids,
+-                              float min_app_sigma,
+-                              float shadow_prior,
+-                              float shadow_mean, float shadow_sigma,
+-                              bool verbose=false,
+-                              vgl_point_3d<double> debug_pt =
+-                              vgl_point_3d<double>(0,0,0)
+-                              );
+-
+-  ~boxm_shadow_bayes_optimizer()= default;
+-
+-  bool optimize_cells(double damping_factor);
+-
+-protected:
+-
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-  float min_app_sigma_;
+-  float shadow_prior_;
+-  float shadow_mean_;
+-  float shadow_sigma_;
+-  bool verbose_;
+-  vgl_point_3d<double> debug_pt_;
+-};
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
+deleted file mode 100644
+index a2d24ee683..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
++++ /dev/null
+@@ -1,195 +0,0 @@
+-#ifndef boxm_shadow_bayes_optimizer_hxx_
+-#define boxm_shadow_bayes_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_shadow_bayes_optimizer.h"
+-#include "boxm_shadow_appearance_estimator.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                                        std::vector<std::string>  image_ids, float min_app_sigma,
+-                                                                        float shadow_prior, float shadow_mean, float shadow_sigma,
+-                                                                        bool verbose, vgl_point_3d<double> debug_pt)
+-  : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f),
+-    min_app_sigma_(min_app_sigma), shadow_prior_(shadow_prior),
+-    shadow_mean_(shadow_mean), shadow_sigma_(shadow_sigma),
+-    verbose_(verbose), debug_pt_(debug_pt)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    boct_tree_cell<T_loc,boxm_sample<APM> >* debug_cell  = nullptr;
+-    if (verbose_)
+-      debug_cell = tree->locate_point_global(debug_pt_);
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-      unsigned n_samp = aux_samples.size();
+-      std::vector<float> pre_vector(n_samp);
+-      std::vector<float> vis_vector(n_samp);
+-      // new discrete probability code
+-      float log_sum = 0.0f;
+-      float total_length_sum = 0.0f;
+-      //===
+-      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
+-      std::vector<obs_type> obs_vector(n_samp);
+-//#if 0 // old beta calculation
+-      double Beta = 1.0;
+-//#endif
+-      if (verbose_&&cell == debug_cell){
+-        std::cout << "Contents of Debug Cell\n"
+-                 << "s    vis[s]    pre[s]    beta[s]\n";
+-      }
+-      double vis_sum = 0;
+-      for (unsigned int s=0; s<n_samp; ++s) {
+-        float seg_len_sum = aux_samples[s].seg_len_;
+-        obs_type obs = aux_samples[s].obs_;
+-        if (seg_len_sum > 1e-5) {
+-          obs_vector[s] = obs / seg_len_sum;
+-          float pre = aux_samples[s].pre_ / seg_len_sum;
+-          float vis = aux_samples[s].vis_ / seg_len_sum;
+-          pre_vector[s] = pre;
+-          vis_vector[s] = vis;
+-
+-//#if 0 // old beta calculation
+-          double beta_s = (aux_samples[s].Beta_ / seg_len_sum);
+-          Beta *= beta_s;
+-//#else // New discrete prob code
+-          log_sum += aux_samples[s].log_sum_;
+-          total_length_sum += seg_len_sum;
+-//#endif
+-          // ====
+-          if (cell == debug_cell)
+-          {
+-            std::cout << s << ' ' << vis << ' ' << pre << ' '
+-                     << beta_s << '\n';
+-          }
+-        }
+-        else {
+-          pre_vector[s] = 0.0f;
+-          vis_vector[s] = 0.0f;
+-          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
+-        }
+-      }
+-      vis_sum /= n_samp;
+-
+-#if 0 // old beta calculation
+-      double damped_Beta = 1.0;
+-      if (n_samp>1.0){
+-        damped_Beta = std::pow(Beta, 1.0/n_samp);
+-      }
+-#else
+-      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
+-
+-      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
+-        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
+-
+-      data.alpha *= static_cast<float>(damped_Beta);
+-
+-      float alpha_post = data.alpha;
+-      if (total_length_sum > 0.0f) alpha_post = log_sum/total_length_sum;
+-      data.alpha = alpha_post;
+-#endif
+-      // do bounds check on new alpha value
+-      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-      const float cell_len = float(cell_bb.width());
+-      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-      if (data.alpha > max_alpha) {
+-        data.alpha = max_alpha;
+-      }
+-      if (data.alpha < min_alpha) {
+-        data.alpha = min_alpha;
+-      }
+-      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
+-        std::cerr << "\nerror: data.alpha = " << data.alpha << std::endl;
+-      }
+-      // update with new appearance
+-      bool print_p = false;
+-      if (verbose_&&cell == debug_cell){
+-        std::cout << "Cell Level = " << cell->level()
+-                 << "  AlphaPosterior  = " << data.alpha << '\n';
+-        print_p = true;
+-      }
+-      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_, min_app_sigma_, shadow_prior_, shadow_mean_, shadow_sigma_, print_p);
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    ++iter;
+-  }
+-
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_shadow_bayes_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_shadow_bayes_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
+deleted file mode 100644
+index 798aac81a9..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
++++ /dev/null
+@@ -1,103 +0,0 @@
+-#ifndef boxm_sun_vis_prob_functor_h
+-#define boxm_sun_vis_prob_functor_h
+-//:
+-//\file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <bpgl/algo/bpgl_camera_from_box.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_sun_vis_prob_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_sun_vis_prob_functor(unsigned sun_ni, unsigned sun_nj)
+-  : sun_ni_(sun_ni), sun_nj_(sun_nj)
+-  {
+-    alpha_integral_ = vil_image_view<float>(sun_ni_, sun_nj_);
+-    alpha_integral_.fill(0.0f);
+-
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-
+-    // accumulate segment length
+-    aux_val.seg_len_ += seg_len;
+-
+-    // current sun visibility
+-    const float sun_vis = std::exp(-alpha_integral_(i,j));
+-
+-    // update sun vis
+-    aux_val.vis_ +=  sun_vis * seg_len;
+-
+-    // update alpha integral along sun ray i, j
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  unsigned sun_ni_;
+-  unsigned sun_nj_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data, boxm_aux_type AUX_T>
+-void boxm_sun_vis_prob(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                       vgl_vector_3d<double> sun_angle,
+-                       std::string sun_occ_name)
+-{
+-  // scene bounding box
+-  vgl_box_3d<double> world_bb = scene.get_world_bbox();
+-  unsigned max_level = scene.max_level();
+-  unsigned sun_ni = 1<<max_level;//twice as many
+-  unsigned sun_nj = sun_ni;
+-  vpgl_affine_camera<double> sun_cam =
+-  bpgl_camera_from_box::affine_camera_from_box(world_bb, -sun_angle, sun_ni, sun_nj);
+-
+-  vpgl_camera_double_sptr cam = new vpgl_affine_camera<double> (sun_cam);
+-
+-  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,sun_occ_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-
+-  std::cout<<"Sun visibility"<<std::endl;
+-  // functor to accumulate sun visibility
+-  typedef boxm_sun_vis_prob_functor<T_data::apm_type, sample_datatype> sun_vis;
+-
+-  // set up the raytrace function
+-  boxm_raytrace_function<sun_vis,T_loc, T_data, sample_datatype> raytracer_vis(scene,aux_scene,cam.ptr(),sun_ni,sun_nj);
+-
+-  // construct the sun visibility functor need only sun ray space dimensions
+-  sun_vis sun_vis_functor(sun_ni, sun_nj);
+-
+-  // run the functor over the octree
+-  raytracer_vis.run(sun_vis_functor);
+-  std::cout<<"Sun Occlusion Done."<<std::endl;
+-}
+-
+-#endif // boxm_sun_vis_prob_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
+deleted file mode 100644
+index cc1567a545..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
++++ /dev/null
+@@ -1,172 +0,0 @@
+-#ifndef boxm_update_image_functor_h
+-#define boxm_update_image_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
+-#include <vil/vil_math.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_update_image_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_update_image_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                   vil_image_view<float> const& normalizing_img)
+-  : obs_(image), norm_(normalizing_img), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs= aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    aux_val.vis_+=seg_len*vis_img_(i,j);
+-
+-    if(norm_(i,j)>1e-10f)
+-        aux_val.updatefactor_+=(((pre_img_(i,j)+vis_img_(i,j)*PI)/norm_(i,j))* seg_len);
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& norm_;
+-  //vil_image_view<float> const& pre_inf_;
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_update_image_functor_pass_3
+-{
+- public:
+-  //: default constructor
+-  boxm_update_image_functor_pass_3()
+-  {
+-    //only reads info from the scene
+-    scene_read_only_=false;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    if (aux_val.seg_len_>1e-10)
+-    {
+-      boxm_apm_traits<APM>::apm_processor::update(cell_value.appearance(),
+-                                                  aux_val.obs_/aux_val.seg_len_,
+-                                                  aux_val.vis_/aux_val.seg_len_);
+-      cell_value.alpha*=(aux_val.updatefactor_/aux_val.seg_len_);
+-      aux_val.seg_len_=0;
+-      aux_val.obs_=0;
+-      aux_val.vis_=0;
+-      aux_val.updatefactor_=0.0;
+-    }
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_update_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vpgl_camera_double_sptr cam,
+-                          vil_image_view<typename T_data::obs_datatype> &obs,
+-                          bool black_background = false)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data, sample_datatype > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::storage_subdir(), boxm_aux_scene<T_loc, T_data, sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type, sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0, T_loc, T_data, sample_datatype> raytracer_0(scene, aux_scene, cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PASS 0\n";
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-
+-    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-    boxm_raytrace_function<pass_1,T_loc, T_data,sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PASS 1\n";
+-    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-    raytracer_1.run(pass_1_functor);
+-
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-
+-    typename T_data::apm_datatype background_apm;
+-
+-    if (black_background) {
+-        std::cerr << "using black background model\n";
+-        for (unsigned int i=0; i<4; ++i) {
+-            T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
+-            float peak=T_data::apm_processor::prob_density(background_apm,0.0f);
+-            std::cout<<"Peak: "<<peak<<std::endl;
+-        }
+-        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-        for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
+-        }
+-    }
+-    else {
+-        PI_inf.fill(0.5f);
+-    }
+-
+-    vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-    vil_image_view<float> norm_img(obs.ni(), obs.nj());
+-    vil_math_image_sum<float,float,float>(pre_inf,inf_term,norm_img);
+-    std::cerr << "PASS 2\n";
+-    typedef boxm_update_image_functor_pass_2<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_2;
+-    boxm_raytrace_function<pass_2,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    pass_2 pass_2_functor(obs,norm_img);
+-    raytracer_2.run(pass_2_functor);
+-    std::cerr << "PASS 3\n";
+-    typedef boxm_update_image_functor_pass_3<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_3;
+-    boxm_iterate_cells_function<pass_3,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> cell_tracer_3(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-
+-    pass_3 pass_3_functor;
+-    cell_tracer_3.run(pass_3_functor);
+-
+-    aux_scene.clean_scene();
+-    std::cerr << "DONE.\n";
+-}
+-
+-#endif // boxm_update_image_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/dummy.cxx b/contrib/brl/bseg/boxm/algo/rt/dummy.cxx
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+deleted file mode 100644
+index 112a19f789..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and boxm_pro depends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+- # include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+- # include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-  set(boxm_algo_rt_pro_sources
+-      boxm_algo_rt_processes.h
+-      boxm_algo_rt_register.h   boxm_algo_rt_register.cxx
+-  )
+-
+-  #aux_source_directory(Templates boxm_algo_rt_pro_sources)
+-  aux_source_directory(processes boxm_algo_rt_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_algo_rt_pro LIBRARY_SOURCES ${boxm_algo_rt_pro_sources} )
+-
+-  target_link_libraries(boxm_algo_rt_pro boxm_algo_rt boxm_algo_pro boxm boxm_sample boxm_sample_algo boct bprb brdb brip sdet ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
+deleted file mode 100644
+index 1ec223e9d5..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
++++ /dev/null
+@@ -1,29 +0,0 @@
+-#ifndef boxm_algo_rt_processes_h_
+-#define boxm_algo_rt_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_opt_bayesian_update_process);
+-DECLARE_FUNC_CONS(boxm_update_rt_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_rt_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_depth_rt_process);
+-DECLARE_FUNC_CONS(boxm_generate_opt_samples_process);
+-DECLARE_FUNC_CONS(boxm_generate_edge_samples_process);
+-DECLARE_FUNC_CONS(boxm_edge_update_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_edge_process);
+-DECLARE_FUNC_CONS(boxm_rpc_registration_process);
+-DECLARE_FUNC_CONS(boxm_line_backproject_process);
+-DECLARE_FUNC_CONS(boxm_generate_opt2_samples_process);
+-DECLARE_FUNC_CONS(boxm_opt2_update_process);
+-DECLARE_FUNC_CONS(boxm_generate_opt3_samples_process);
+-DECLARE_FUNC_CONS(boxm_opt3_update_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
+-DECLARE_FUNC_CONS(boxm_ray_statistics_process);
+-DECLARE_FUNC_CONS(boxm_change_probability_process);
+-DECLARE_FUNC_CONS(boxm_estimate_camera_process);
+-DECLARE_FUNC_CONS(boxm_edge_refine_updates_process);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
+deleted file mode 100644
+index d0ebc7375e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
++++ /dev/null
+@@ -1,33 +0,0 @@
+-#include "boxm_algo_rt_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "boxm_algo_rt_processes.h"
+-
+-void boxm_algo_rt_register::register_datatype()
+-{
+-}
+-
+-void boxm_algo_rt_register::register_process()
+-{
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt_bayesian_update_process,"boxmOptBayesianUpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_rt_process,"boxmUpdateRTProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_rt_process, "boxmRenderExpectedRTProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_depth_rt_process, "boxmRenderExpectedDepthRTProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt_samples_process, "boxmGenerateOptSamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_edge_samples_process, "boxmGenerateEdgeSamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_update_process, "boxmEdgeUpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_process, "boxmRenderExpectedEdgeProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_rpc_registration_process, "boxmRPCRegistrationProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process, "boxmLineBackprojectProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt2_update_process,"boxmOpt2UpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt3_update_process,"boxmOpt3UpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt2_samples_process,"boxmGenerateOpt2SamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt3_samples_process,"boxmGenerateOpt3SamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_ray_statistics_process,"boxmRayStatisticsProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_change_probability_process,"boxmChangeProbabilityProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_estimate_camera_process,"boxmEstimateCameraProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_refine_updates_process, "boxmEdgeRefineUpdatesProcess");
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
+deleted file mode 100644
+index c060c1220f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_algo_rt_register_h_
+-#define boxm_algo_rt_register_h_
+-
+-class boxm_algo_rt_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_algo_rt_register_h_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
+deleted file mode 100644
+index d7d9002e0c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
++++ /dev/null
+@@ -1,120 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining expected depth map for the world
+-//
+-// \author Vishal Jain
+-// \date Aug 26, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_change_probability_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_change_probability_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_change_probability_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_change_probability_process_globals;
+-
+-  //process takes 4 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vil_image_view_base_sptr";
+-  input_types_[2] = "vpgl_camera_double_sptr";
+-  //input_types_[3] = "unsigned";
+-  //input_types_[4] = "unsigned";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_change_probability_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_change_probability_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vil_image_view_base_sptr input_img_ptr=pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-
+-  unsigned ni=input_img_ptr->ni();
+-  unsigned nj=input_img_ptr->nj();
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    vil_image_view<float> mask(ni,nj,1);
+-    vil_image_view<float> expected(ni,nj,1);
+-
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene,img_in, camera, expected, mask);
+-    img_mask = new vil_image_view<float>(mask);
+-    img = new vil_image_view<float>(expected);
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    vil_image_view<float> mask(ni,nj,1);
+-    vil_image_view<float> expected(ni,nj,1);
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene,img_in, camera, expected, mask);
+-    img_mask = new vil_image_view<float>(mask);
+-    img = new vil_image_view<float>(expected);
+-  }
+-  else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
+deleted file mode 100644
+index 1593ab6590..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
++++ /dev/null
+@@ -1,280 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of edge images
+-// \author Gamze Tunali
+-// \date   Jan, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
+-#include <boxm/algo/rt/boxm_edge_updater.h>
+-
+-#include <vil/vil_load.h>
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-
+-namespace boxm_edge_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 6;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_edge_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_edge_update_process_globals;
+-
+-  // process takes 6 inputs:
+-  //input[0]: The scene
+-  //input[1]: Image list filename
+-  //input[2]: Use ransac?
+-  //input[3]: consensus cnt, param of ransac algo, value depends on number of training images
+-  //          unless planes from this number of images agree at a voxel on a hypothesis, a 3D edge won't be formed,
+-  //          there should be at least this number of training images during the update for any kind of consensus to be met at any voxel
+-  //          (if consensus cnt < training img cnt --> edge world will be empty)
+-  //input[4]: orthogonality threshold, a good value 0.01, param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
+-  //input[5]: volume ratio denominator: a good value 128 , param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
+-  //          algo checks whether a current plane is within cell_volume/denominator radius of current hypothesis
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "bool";
+-  input_types_[3] = "int";
+-  input_types_[4] = "float";
+-  input_types_[5] = "float";
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_edge_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_edge_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-  bool use_ransac=pro.get_input<bool>(2);
+-  int consensus_cnt = pro.get_input<int>(3);
+-  auto ortho_thres = pro.get_input<float>(4);
+-  auto vol_ratio = pro.get_input<float>(5);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  std::cout << "using image ids: ";
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    std::cout << img_id << std::endl;
+-    image_ids.push_back(img_id);
+-    std::cout << img_id << ' ';
+-  }
+-  ifs.close();
+-  std::cout << std::endl;
+-
+-  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
+-    std::cout << "appearance model EDGE_FLOAT\n";
+-    typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
+-    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-    }
+-    boxm_edge_updater<short,float,float> updater(*scene, image_ids);
+-    updater.add_cells();
+-  }
+-  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
+-    std::cout << "appearance model EDGE_LINE\n";
+-    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-    }
+-
+-    boxm_edge_tangent_updater<short,float,float> updater(*scene, image_ids, use_ransac, ortho_thres, vol_ratio, consensus_cnt);
+-    updater.add_cells();
+-  }
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+-
+-//: set input and output types
+-bool boxm_edge_refine_updates_process_cons(bprb_func_process& pro)
+-{
+-  // process takes 3 inputs:
+-  //input[0]: The scene
+-  //input[1]: Image list filename
+-  //input[2]: camera list filename
+-  //input[3]: consensus cnt,
+-  std::vector<std::string> input_types_(4);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "int";
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(0);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_edge_refine_updates_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_edge_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != 4)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << 4 << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-  std::string cam_list_fname = pro.get_input<std::string>(2);
+-  int consensus_cnt = pro.get_input<int>(3);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<vil_image_view<float> > images;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  std::cout << "using image ids: ";
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    std::cout << "loading: " << img_id << std::endl;
+-
+-    vil_image_view_base_sptr loaded_image = vil_load(img_id.c_str() );
+-    if ( !loaded_image || loaded_image->pixel_format() != VIL_PIXEL_FORMAT_FLOAT) {
+-      std::cerr << "Failed to load image file: " << img_id << " or format is not FLOAT img!\n";
+-      return false;
+-    }
+-    vil_image_view<float> img(loaded_image);
+-    images.push_back(img);
+-  }
+-  ifs.close();
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifsc(cam_list_fname.c_str());
+-  if (!ifsc.good()) {
+-    std::cerr << "error opening file " << cam_list_fname << '\n';
+-    return false;
+-  }
+-
+-  std::vector<vpgl_camera_double_sptr> cameras;
+-  unsigned int n_cameras = 0;
+-  ifsc >> n_cameras;
+-  if (n_cameras != n_images) {
+-    std::cerr << "camera file and image file do not contain equal numbers of items!\n";
+-    return false;
+-  }
+-
+-  std::cout << "using cameras: ";
+-  for (unsigned int i=0; i<n_cameras; ++i) {
+-    std::string img_id;
+-    ifsc >> img_id;
+-    std::cout << "loading camera: " << img_id << std::endl;
+-
+-    vpgl_camera_double_sptr ratcam = read_local_rational_camera<double>(img_id);
+-    if ( !ratcam.as_pointer() ) {
+-      std::cerr << "Rational camera isn't local... trying global\n";
+-      ratcam = read_rational_camera<double>(img_id);
+-      if ( !ratcam.as_pointer() ) {
+-        std::cout << " camera: " << img_id << " is not local or global rational camera, not supporting any other type for now!\n";
+-        return false;
+-      }
+-    }
+-
+-    cameras.push_back(ratcam);
+-  }
+-  ifsc.close();
+-  std::cout << std::endl;
+-
+-  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
+-    std::cout << "appearance model EDGE_FLOAT\n";
+-    std::cerr << "this process is not defined for this type of scene!\n";
+-    return false;
+-  }
+-  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
+-    std::cout << "appearance model EDGE_LINE\n";
+-    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-    }
+-
+-    boxm_edge_tangent_refine_updates<short,float,float> refiner(*scene, consensus_cnt, images, cameras);
+-    refiner.refine_cells();
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
+deleted file mode 100644
+index d1010864dd..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
++++ /dev/null
+@@ -1,199 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
+-//:
+-// \file
+-#include <iostream>
+-#include <cstdio>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-
+-#include <vnl/algo/vnl_amoeba.h>
+-
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <bpgl/bpgl_camera_estimator.h>
+-#include <bpgl/bpgl_camera_estimator_amoeba.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-#include <boxm/algo/rt/boxm_expected_edge_functor.h>
+-
+-//: globals
+-namespace boxm_estimate_camera_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 3;
+-
+-  // parameter strings
+-  const std::string theta_range_ =  "theta_range";
+-  const std::string theta_step_ =  "theta_step";
+-  const std::string phi_range_ =  "phi_range";
+-  const std::string phi_step_ =  "phi_step";
+-  const std::string rot_range_ =  "rot_range";
+-  const std::string rot_step_ =  "rot_step";
+-  const std::string max_iter_rot_angle_ =  "max_iter_rot_angle";
+-  const std::string max_iter_cam_center_ =  "max_iter_cam_center";
+-}
+-
+-//: set input and output types
+-bool boxm_estimate_camera_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_estimate_camera_process_globals;
+-
+-  // process takes 3 inputs:
+-  //input[0]: The scene
+-  //input[1]: Initial camera
+-  //input[2]: Edge image
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "vpgl_camera_double_sptr";
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  // process has 3 outputs:
+-  // output[0]: The optimized camera
+-  // output[1]: Expected edge image (after camera correction)
+-  // output[2]: Expected edge image (before camera correction)
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j = 0;
+-  output_types_[j++] = "vpgl_camera_double_sptr";
+-  output_types_[j++] = "vil_image_view_base_sptr";
+-  output_types_[j++] = "vil_image_view_base_sptr";
+-  return pro.set_output_types(output_types_);
+-}
+-
+-//:  optimizes camera parameters based on edges
+-bool boxm_estimate_camera_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_estimate_camera_process_globals;
+-
+-  //check number of inputs
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  unsigned i = 0;
+-
+-  // scene
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // camera
+-  vpgl_camera_double_sptr cam_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto *cam_init = dynamic_cast<vpgl_perspective_camera<double>*>(cam_inp.ptr());
+-
+-  // image
+-  vil_image_view_base_sptr img_e_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vil_image_view<vxl_byte> img_e_vb(img_e_sptr);
+-
+-  vil_image_view<float> img_e;
+-  brip_vil_float_ops::normalize_to_interval<vxl_byte,float>(img_e_vb,img_e,0.0f,1.0f);
+-
+-  unsigned ni = img_e.ni();
+-  unsigned nj = img_e.nj();
+-
+-  double deg2rad = vnl_math::pi_over_180;
+-
+-  // parameters are in degrees
+-  double theta_range = 12.0, theta_step = 0.05, phi_range = 12.0, phi_step = 0.05, rot_range = 10.0, rot_step = 1.0;
+-  int max_iter_rot_angle = 5, max_iter_cam_center = 50;
+-
+-  pro.parameters()->get_value(theta_range_, theta_range);
+-  pro.parameters()->get_value(theta_step_, theta_step);
+-  pro.parameters()->get_value(phi_range_, phi_range);
+-  pro.parameters()->get_value(phi_step_, phi_step);
+-  pro.parameters()->get_value(rot_range_, rot_range);
+-  pro.parameters()->get_value(rot_step_, rot_step);
+-  pro.parameters()->get_value(max_iter_rot_angle_, max_iter_rot_angle);
+-  pro.parameters()->get_value(max_iter_cam_center_, max_iter_cam_center);
+-
+-#if 0
+-  std::cout << "printing boxm_estimate_camera_process parameters:\n"
+-           << "theta_range: " << theta_range << '\n'
+-           << "theta_step: " << theta_step << '\n'
+-           << "phi_range: " << phi_range << '\n'
+-           << "phi_step: " << phi_step << '\n'
+-           << "rot_range: " << rot_range << '\n'
+-           << "rot_step: " << rot_step << '\n'
+-           << "max_iter_rot_angle: " << max_iter_rot_angle << '\n'
+-           << "max_iter_cam_center: " << max_iter_cam_center << '\n';
+-#endif
+-
+-  // change the parameters into radians
+-  theta_range *= deg2rad; theta_step *= deg2rad; phi_range *= deg2rad; phi_step *= deg2rad; rot_range *= deg2rad; rot_step *= deg2rad;
+-
+-  auto *img_eei = new vil_image_view<float>(ni,nj,1);
+-  img_eei->fill(0.0f);
+-
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
+-        return false;
+-      }
+-
+-      // create the functor that finds edges
+-      typedef boxm_expected_edge_functor<short, boxm_inf_line_sample<float> > func_type;
+-      func_type func(*scene);
+-      bpgl_camera_estimator<func_type > cam_estimator(func);
+-      cam_estimator.set_estimation_params(theta_range,theta_step,phi_range,phi_step,rot_range,rot_step,max_iter_rot_angle);
+-
+-      func.apply(cam_inp,img_eei);
+-
+-      auto *img_eei_before_correction = new vil_image_view<vxl_byte>(ni,nj,1);
+-      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_before_correction,0.0f,255.0f);
+-
+-      bpgl_camera_estimator_amoeba<func_type> cost_ftn(cam_estimator,img_e,cam_inp);
+-      vnl_vector<double> x(2,1.0);
+-      vnl_amoeba amoeba(cost_ftn);
+-      amoeba.verbose = 1;
+-      amoeba.default_verbose = true;
+-      amoeba.set_relative_diameter(3.0);
+-      amoeba.set_max_iterations(max_iter_cam_center);
+-      amoeba.minimize(x);
+-      auto *cam_est = new vpgl_perspective_camera<double>(*cam_init);
+-      cost_ftn.get_result(x,cam_est);
+-
+-      vpgl_camera_double_sptr cam_ptr = new vpgl_perspective_camera<double>(*cam_est);
+-      func.apply(cam_ptr,img_eei);
+-
+-      auto *img_eei_vb = new vil_image_view<vxl_byte>(ni,nj,1);
+-      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_vb,0.0f,255.0f);
+-
+-      delete cam_est;
+-      delete img_eei;
+-
+-      // output
+-      unsigned j = 0;
+-      // update the camera and store
+-      pro.set_output_val<vpgl_camera_double_sptr>(j++, cam_ptr);
+-      // update the edge image after update and store
+-      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_vb);
+-      // update the edge image before update and store
+-      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_before_correction);
+-
+-      return true;
+-    }
+-    else
+-    {
+-      std::cerr << "boxm_estimate_camera_process: Multibin version not yet implemented\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_estimate_camera_process: undefined APM type\n";
+-    return false;
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
+deleted file mode 100644
+index bb10974eef..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
++++ /dev/null
+@@ -1,139 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Sep 15, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-
+-#include <sdet/sdet_img_edge.h>
+-
+-namespace boxm_generate_edge_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_generate_edge_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_edge_samples_process_globals;
+-
+-  //process takes 5 inputs
+-  //input[0]: The cropped edge image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: n_normal
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "float";
+-
+-  //output
+-  unsigned j = 0;
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[j++] = "float"; // new n_normal value
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_edge_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_edge_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << "boxm_generate_edge_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr edge_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string img_name =  pro.get_input<std::string>(i++);
+-  auto n_normal = pro.get_input<float>(i++);
+-
+-  // get parameters
+-  int edge_prob_mask_size = 21;
+-  pro.parameters()->get_value("edge_prob_mask_size",edge_prob_mask_size);
+-  float edge_prob_mask_sigma = 1.0f;
+-  pro.parameters()->get_value("edge_prob_mask_sigma",edge_prob_mask_sigma);
+-
+-  // check the input validity
+-  if ((edge_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-     std::cout << "boxm_generate_edge_samples_process: null input value, cannot run" << std::endl;
+-     return false;
+-  }
+-
+-  float new_n_normal=0.0;
+-
+-
+-  if (scene->appearence_model() == BOXM_EDGE_FLOAT) {
+-    vil_image_view<float> edge_prob_image;
+-    sdet_img_edge::estimate_edge_prob_image(edge_image, edge_prob_image, edge_prob_mask_size, edge_prob_mask_sigma);
+-    float edge_prob_image_mean;
+-    vil_math_mean(edge_prob_image_mean,edge_prob_image,0);
+-    vil_image_view<float> img(edge_prob_image);
+-    new_n_normal = n_normal + edge_prob_image_mean;
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_generate_edge_sample_rt<short,boxm_edge_sample<float> > (*s, camera, img, img_name);
+-    }
+-    else
+-    {
+-      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
+-    }
+-  }
+-  if (scene->appearence_model() == BOXM_EDGE_LINE) {
+-    // get the edges as an image with 3 planes (a,b,c)
+-    if (!scene->multi_bin())
+-    {
+-      typedef boxm_inf_line_sample<float> sample_type;
+-      typedef boct_tree<short, sample_type> tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      // for this case, the image should be with 4 planes, representing plane definitions
+-      vil_image_view<float> img(edge_image);
+-      boxm_generate_edge_tangent_sample_rt<short,sample_type> (*s, camera, img, img_name);
+-    }
+-    else
+-    {
+-      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_generate_edge_samples_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  pro.set_output_val<float>(0, float(new_n_normal));
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
+deleted file mode 100644
+index 06261e8d44..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
++++ /dev/null
+@@ -1,142 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to generate samples needed for boxm_opt2_optimizer_process from a given image/camera pair
+-//
+-// \author Daniel Crispell
+-// \date Feb 17, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_generate_opt2_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_generate_opt2_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt2_samples_process_globals;
+-
+-  // process takes 7 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: shadow prior
+-  //input[5]: shadow sigma
+-  //input[6]: use black background
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "float";
+-  input_types_[5] = "float";
+-  input_types_[6] = "bool";
+-
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_opt2_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt2_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_generate_opt2_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(0);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(1);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(2);
+-  std::string img_name =  pro.get_input<std::string>(3); // TODO - unused!!
+-  auto shadow_prior = pro.get_input<float>(4);
+-  auto shadow_sigma = pro.get_input<float>(5);
+-  bool use_black_background =  pro.get_input<bool>(6);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-    std::cout << "boxm_generate_opt2_samples_process: null input value, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      // create alternate appearance models
+-      std::vector<float> alt_appearance_priors;
+-      std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype> alt_appearance_models;
+-      if (shadow_prior > 0.0f) {
+-        boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype shadow_model(0.0f, shadow_sigma);
+-        alt_appearance_priors.push_back(shadow_prior);
+-        alt_appearance_models.push_back(shadow_model);
+-      }
+-      if (!scene->multi_bin()) {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
+-      }
+-      else {
+-        std::cerr << "error: multi-bin scenes not supported\n";
+-      }
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      // create alternate appearance models
+-      std::vector<float> alt_appearance_priors;
+-      std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype> alt_appearance_models;
+-      if (shadow_prior > 0.0f) {
+-        boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype shadow_model;
+-        // insert a single mode with mean at 0
+-        bsta_gauss_sf1 single_mode(0.0f, shadow_sigma*shadow_sigma);
+-        shadow_model.insert(bsta_num_obs<bsta_gauss_sf1>(single_mode), 1.0f);
+-        alt_appearance_priors.push_back(shadow_prior);
+-        alt_appearance_models.push_back(shadow_model);
+-      }
+-      if (!scene->multi_bin()) {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
+-      }
+-      else {
+-        std::cerr << "error: multi-bin scenes not supported\n";
+-      }
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_generate_opt2_samples_process: unsupported APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
+deleted file mode 100644
+index 0eb591c79c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
++++ /dev/null
+@@ -1,114 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to generate samples needed for boxm_opt3_optimizer_process from a given image/camera pair
+-//
+-// \author Daniel Crispell
+-// \date Feb 17, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_generate_opt3_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_generate_opt3_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt3_samples_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: use black background
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_opt3_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt3_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_generate_opt3_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-    std::cout << "boxm_generate_opt3_samples_process: null input value, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      if (!scene->multi_bin())
+-      {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
+-      }
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      if (!scene->multi_bin())
+-      {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
+-      }
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_generate_opt3_samples_process: unsupported APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
+deleted file mode 100644
+index fac0d9d3ae..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Sep 15, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_generate_opt_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_generate_opt_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt_samples_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: use black background
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_opt_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_generate_opt_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-     std::cout << "boxm_generate_opt_samples_process: null input value, cannot run" << std::endl;
+-     return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_generate_opt_sample_rt(*s, camera,img,img_name,use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_generate_opt_samples_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
+deleted file mode 100644
+index 30a4014572..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
++++ /dev/null
+@@ -1,153 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
+-// \author Daniel Crispell
+-// \date   February 17, 2010
+-//
+-// \verbatim
+-//  Modifications
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/algo/rt/boxm_opt2_optimizer.h>
+-
+-namespace boxm_opt2_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 2;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_opt2_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt2_update_process_globals;
+-
+-  // process takes 2 inputs:
+-  //input[0]: The scene
+-  //input[1]: The filename of the text file containing list of image names
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_opt2_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt2_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  boxm_apm_type apm_type = scene_base->appearence_model();
+-
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    image_ids.push_back(img_id);
+-  }
+-  ifs.close();
+-
+-  switch (apm_type)
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt2_optimizer<short,BOXM_APM_SIMPLE_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
+-      optimizer.update();
+-
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt2_optimizer<short,BOXM_APM_MOG_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
+-      optimizer.update();
+-
+-      break;
+-    }
+-#if 0 // commented out
+-   case BOXM_APM_SIMPLE_RGB:
+-    {
+-      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#endif // 0
+-   default:
+-    std::cerr << "error - boxm_opt2_update_process: unsupported appearance model type " << apm_type << '\n';
+-    return false;
+-  }
+-
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
+deleted file mode 100644
+index 47f40dd19a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
++++ /dev/null
+@@ -1,153 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
+-// \author Daniel Crispell
+-// \date   February 17, 2010
+-//
+-// \verbatim
+-//  Modifications
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/algo/rt/boxm_opt3_optimizer.h>
+-
+-namespace boxm_opt3_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 2;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_opt3_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt3_update_process_globals;
+-
+-  // process takes 2 inputs:
+-  //input[0]: The scene
+-  //input[1]: The filename of the text file containing list of image names
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_opt3_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt3_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  boxm_apm_type apm_type = scene_base->appearence_model();
+-
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    image_ids.push_back(img_id);
+-  }
+-  ifs.close();
+-
+-  switch (apm_type)
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt3_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells();
+-
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt3_optimizer<short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells();
+-
+-      break;
+-    }
+-#if 0 // commented out
+-   case BOXM_APM_SIMPLE_RGB:
+-    {
+-      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#endif // 0
+-   default:
+-    std::cerr << "error - boxm_opt3_update_process: unsupported appearance model type " << apm_type << '\n';
+-    return false;
+-  }
+-
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
+deleted file mode 100644
+index 56d4d9051d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
++++ /dev/null
+@@ -1,145 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of images, using a damped version of Bayes' rule
+-// \author Daniel Crispell
+-// \date   April 2, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   Aug 3, 2009  Gamze Tunali - Moved from lemsvxl/psm_opt to vxl
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
+-
+-namespace boxm_opt_bayesian_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 3;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_opt_bayesian_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt_bayesian_update_process_globals;
+-
+-  // process takes 3 inputs:
+-  //input[0]: The scene
+-  //input[1]: The damping value
+-  //input[2]: The filename of the text file containing list of image names
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float";
+-  input_types_[2] = "vcl_string";
+-
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_opt_bayesian_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt_bayesian_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  boxm_apm_type apm_type = scene_base->appearence_model();
+-
+-  auto damping_factor = pro.get_input<float>(1);
+-
+-  std::string image_list_fname = pro.get_input<std::string>(2);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << std::endl;
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    image_ids.push_back(img_id);
+-  }
+-  ifs.close();
+-
+-  switch (apm_type)
+-  {
+-    case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#if 0 // commented out
+-    case BOXM_APM_SIMPLE_RGB:
+-    {
+-      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#endif // 0
+-    default:
+-      std::cerr << "error - boxm_opt_bayesian_update_process: unsupported appearance model type " << apm_type << std::endl;
+-      return false;
+-  }
+-
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
+deleted file mode 100644
+index 5507b5b55b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
++++ /dev/null
+@@ -1,107 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A process for describing the attributes of a scene
+-//
+-// \author J.L. Mundy
+-// \date January 24, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <bsta/bsta_histogram_sptr.h>
+-#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
+-
+-namespace boxm_ray_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_ray_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_ray_statistics_process_globals;
+-
+-  //process takes 2 input
+-  //input[0]: scene binary file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";  //ni
+-  input_types_[3] = "unsigned";  //nj
+-
+-  // process has 1 output:
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "bsta_histogram_sptr"; // No of rays per cell Histogram
+-  //output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
+-  //output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
+-  //output_types_[3] = "unsigned";            // Number of leaves
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//: This process produces one output:
+-//  * The distribution of "Omega" values where Omega = 1-e^( alpha x length )
+-//  The following three outputs are no longer present:
+-//  * The distribution of "Sigma" values where Sigma is the std_dev of
+-//    the appearance model. (currently implemented only for simple grey)
+-//  * The histogram of levels for leaves in the octree
+-//  * The number of leaves in the tree
+-//
+-bool boxm_ray_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_ray_statistics_process_globals;
+-
+-  if ( !pro.verify_inputs() ) {
+-    std::cerr << pro.name() << ": invalid inputs\n";
+-    return false;
+-  }
+-  // assign tree type
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
+-  vpgl_camera_double_sptr cam_ptr = pro.get_input<vpgl_camera_double_sptr>(1);
+-  auto ni = pro.get_input<unsigned>(2);
+-  auto nj = pro.get_input<unsigned>(3);
+-
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
+-
+-      bsta_histogram<float> num_rays_hist;
+-      if (!compute_ray_statistics<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
+-        return false;
+-      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));    }
+-    else
+-    {
+-      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/Gaussian mixture\n";
+-      return false;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
+-  {
+-    if (!scene_ptr->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
+-
+-      bsta_histogram<float> num_rays_hist;
+-      if (!compute_ray_statistics<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
+-        return false;
+-      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));
+-    }
+-    else {
+-      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/simple_grey\n";
+-      return false;
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
+deleted file mode 100644
+index 5af8acd7f8..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
++++ /dev/null
+@@ -1,114 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining expected depth map for the world
+-//
+-// \author Vishal Jain
+-// \date Aug 26, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_image_view.h>
+-
+-namespace boxm_render_expected_depth_rt_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_depth_rt_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_depth_rt_process_globals;
+-
+-  //process takes 4 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_depth_rt_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_depth_rt_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-      vil_image_view<float> mask(ni,nj,1);
+-      vil_image_view<float> expected(ni,nj,1);
+-
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask);
+-      img_mask = new vil_image_view<float>(mask);
+-      img = new vil_image_view<float>(expected);
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-      vil_image_view<float> mask(ni,nj,1);
+-      vil_image_view<float> expected(ni,nj,1);
+-
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask);
+-      img_mask = new vil_image_view<float>(mask);
+-      img = new vil_image_view<float>(expected);
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-      vil_image_view<float> mask(ni,nj,1);
+-      vil_image_view<float> expected(ni,nj,1);
+-
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask);
+-      img_mask = new vil_image_view<float>(mask);
+-      img = new vil_image_view<float>(expected);
+-  } else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
+deleted file mode 100644
+index 74ee8c9a88..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
++++ /dev/null
+@@ -1,162 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-namespace boxm_render_expected_edge_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_edge_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_process_globals;
+-
+-  //process takes 7 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4]: n_normal
+-  //input[5]: num samples used for update
+-  //input[6]: Threshold for edges
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "float";
+-  input_types_[5] = "unsigned";
+-  input_types_[6] = "float";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[1]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_edge_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-  auto n_normal = pro.get_input<float>(i++);
+-  // number of updates
+-  auto num_updates = pro.get_input<unsigned>(i++);
+-  //float threshold = pro.get_input<float>(i++); // FIXME: unused; see line 138
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
+-    vil_image_view<boxm_apm_traits<BOXM_EDGE_FLOAT>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_edge_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
+-        return false;
+-      }
+-      boxm_render_edge_image_rt<short, boxm_edge_sample<float> >(*scene, camera, expected, mask,n_normal,num_updates);
+-    }
+-    else
+-    {
+-      std::cerr << "Ray tracing version not yet implemented\n";
+-      return false;
+-    }
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<vxl_byte>(ni,nj,expected.nplanes());
+-    for (unsigned i=0; i<ni; i++) {
+-      for (unsigned j=0; j<nj; j++) {
+-        (*expected_byte)(i,j) = static_cast<unsigned char>(255.0*(expected(i,j)));
+-      }
+-    }
+-    img = expected_byte;
+-        img_mask = new vil_image_view<float>(mask);
+-
+-    auto *ex = new vil_image_view<float>(ni,nj,expected.nplanes());
+-    for (unsigned i=0; i<ni; i++) {
+-      for (unsigned j=0; j<nj; j++) {
+-        (*ex)(i,j) = expected(i,j);//static_cast<unsigned char>(255.0*(expected(i,j)));
+-      }
+-    }
+-    img = ex;
+-      unsigned j = 0;
+-    pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-    pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-    return true;
+-  }
+-
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
+-    vil_image_view<float > expected(ni,nj,1);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
+-        return false;
+-      }
+-      boxm_render_edge_tangent_image_rt<short, boxm_inf_line_sample<float> >(*scene, camera, expected);//, n_normal,num_updates, threshold);
+-
+-      auto *edge_image=new  vil_image_view<float >(ni,nj,1);
+-      *edge_image=expected;
+-
+-      unsigned j = 0;
+-      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
+-      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
+-      return true;
+-    }
+-    else
+-    {
+-      std::cerr << "Ray tracing version not yet implemented\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_render_expected_edge_process: undefined APM type\n";
+-    return false;
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
+deleted file mode 100644
+index f92621784d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
++++ /dev/null
+@@ -1,143 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for rendering an expected image of a given scene and camera.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_render_expected_rt_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_rt_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_rt_process_globals;
+-
+-  //process takes 5 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4]: black background?
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "bool";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_rt_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_rt_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
+-    }
+-    else
+-    {
+-       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
+-       return false;
+-    }
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
+-    }
+-    else
+-    {
+-       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
+-       return false;
+-    }
+-  //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
+-    }
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  } else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
+deleted file mode 100644
+index b3c1ee031e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
++++ /dev/null
+@@ -1,119 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
+-#include <iostream>
+-#include <cstdio>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for registering the RPC camera based on the edges in the world
+-// \author Gamze Tunali
+-// \date   Feb 1st, 2010
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-#include <boxm/algo/rt/boxm_rpc_registration.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: globals
+-namespace boxm_rpc_registration_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 8;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: set input and output types
+-bool boxm_rpc_registration_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_rpc_registration_process_globals;
+-
+-  // process takes 8 inputs:
+-  // input[0]: The scene
+-  // input[1]: The current camera
+-  // input[2]: The current edge image
+-  // input[3]: The expected edge image
+-  // input[4]: The flag indicating whether to align the 3D voxel world along with image
+-  // input[5]: Uncertainty in meters
+-  // input[6]: n_normal
+-  // input[7]: num_observation
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "vpgl_camera_double_sptr";
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  input_types_[i++] = "bool";
+-  input_types_[i++] = "float";
+-  input_types_[i++] = "float";
+-  input_types_[i++] = "unsigned";
+-
+-  // process has 1 output:
+-  // output[0]: The optimized camera
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j = 0;
+-  output_types_[j++] = "vpgl_camera_double_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:  optimizes rpc camera parameters based on edges
+-bool boxm_rpc_registration_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_rpc_registration_process_globals;
+-
+-  //check number of inputs
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  unsigned i = 0;
+-
+-  // scene
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // camera
+-  vpgl_camera_double_sptr camera_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
+-
+-  // image
+-  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-
+-  vil_image_view_base_sptr expected_edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-
+-  // boolean parameter specifying the voxel world alignment state
+-  bool rpc_shift_3d_flag = pro.get_input<bool>(i++);
+-
+-  // uncertainty in meters
+-  auto uncertainty = pro.get_input<float>(i++);
+-
+-  // n_normal
+-  auto n_normal = pro.get_input<float>(i++);
+-
+-  // number of observations
+-  auto num_observation = pro.get_input<unsigned>(i++);
+-
+-  std::string edge_type="subpixel";//pro.get_input<std::string>(i++);
+-
+-  vpgl_camera_double_sptr camera_out;
+-
+-  if (edge_type=="subpixel")
+-  {
+-    vil_image_view<float > expected_edge_image(expected_edge_image_sptr);
+-    vil_image_view<float> edge_image(edge_image_sptr);
+-    boxm_rpc_registration<short,boxm_inf_line_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty, num_observation);
+-  }
+-  else {
+-    vil_image_view<vxl_byte> expected_edge_image(expected_edge_image_sptr);
+-    vil_image_view<vxl_byte> edge_image(edge_image_sptr);
+-    boxm_rpc_registration<short,boxm_edge_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty,n_normal, num_observation);
+-  }
+-
+-  // output
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<vpgl_camera_double_sptr>(j++, camera_out);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
+deleted file mode 100644
+index 128496aee8..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
++++ /dev/null
+@@ -1,136 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Apr 21, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_update_image_functor.h>
+-#include <boxm/boxm_apm_traits.h> // for BOXM_APM_MOG_GREY
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_update_rt_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_update_rt_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_rt_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: The bin index to be updated
+-  //input[4]: Use black background?
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_update_rt_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_rt_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_update_rt_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  /* unsigned bin_index = */   pro.get_input<unsigned>(i++);
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-     std::cout << "boxm_update_rt_process: null input value, cannot run" << std::endl;
+-     return false;
+-  }
+-
+-  // Mixture of Gaussians
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, camera,img, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  // Mixture of Beta's
+-  } else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, camera,img, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  } else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_image_rt(*s, camera,img, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_update_rt_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index 1b63879e8e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_algo_rt_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_rt_pro_test_include boxm_algo_rt_pro)
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
+deleted file mode 100644
+index f43a3a7286..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/pro/boxm_algo_rt_processes.h>
+-#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
+deleted file mode 100644
+index 73a8978f93..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-add_executable( boxm_algo_rt_test_all
+-  test_driver.cxx
+-  test_bayesian_optimizer.cxx
+-  test_edges.cxx
+-  test_shadow_appearance.cxx
+- )
+-
+-target_link_libraries( boxm_algo_rt_test_all boxm_algo_rt boxm boxm_util boxm_sample boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME boxm_algo_rt_test_bayesian_optimizer COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_bayesian_optimizer  )
+-add_test( NAME boxm_algo_rt_test_edges COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_edges  )
+-add_test( NAME boxm_algo_rt_test_shadow_appearance COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_shadow_appearance  )
+-add_executable( boxm_algo_rt_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_rt_test_include boxm_algo_rt)
+-add_executable( boxm_algo_rt_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_algo_rt_test_template_include boxm_algo_rt)
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
+deleted file mode 100644
+index 5ec14a4181..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
+-#include <boct/boct_tree.h>
+-#include <vul/vul_file.h>
+-
+-static void test_bayesian_optimizer()
+-{
+-  typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
+-  typedef boxm_rt_sample<float> aux_type;
+-
+-  // create the main scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_octree_levels(3,2);
+-  scene.set_paths("./boxm_scene", "block");
+-  scene.set_appearance_model(BOXM_APM_SIMPLE_GREY);
+-  x_write(std::cout, scene, "scene");
+-  vul_file::make_directory("./boxm_scene");
+-  scene.write_scene();
+-  //vsl_b_ofstream os("scene.bin");
+-  //scene.b_write(os);
+-  //os.close();
+-
+-  boxm_block_iterator<boct_tree<short,data_type> > iter(&scene);
+-  // default model
+-  boxm_simple_grey apm(0.3f, 0.4f, 0.5f);
+-
+-  boxm_sample<BOXM_APM_SIMPLE_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(apm);
+-
+-  // sample 1
+-  boxm_sample<BOXM_APM_SIMPLE_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(apm);
+-
+-  // sample 2
+-  boxm_sample<BOXM_APM_SIMPLE_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(apm);
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
+-    boct_tree<short,data_type> * tree= block->get_tree();//new boct_tree<short,data_type>(3,2);
+-    boct_tree_cell<short,data_type>* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,data_type>* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    block->get_tree()->print();
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  // create the auxiliary scenes for each image
+-  std::vector<std::string> image_names;
+-  image_names.emplace_back("image1");
+-  image_names.emplace_back("image2");
+-  image_names.emplace_back("image3");
+-  std::vector<boxm_scene<boct_tree<short,aux_type> >*> aux_scenes(image_names.size());
+-
+-  // create aux scenes
+-  for (unsigned i=0; i<image_names.size(); i++) {
+-    aux_scenes[i] = new boxm_scene<boct_tree<short,aux_type> >(scene.lvcs(), scene.origin(), scene.block_dim(), scene.world_dim());
+-    aux_scenes[i]->set_path(scene.path(),  image_names[i]);
+-    iter.begin();
+-    while (!iter.end()) {
+-      scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-      boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
+-      boct_tree<short,data_type>* tree=block->get_tree();
+-      boct_tree<short,aux_type>* aux_tree = tree->clone_to_type<aux_type>();
+-      boct_tree_cell<short,aux_type>* cell1=aux_tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-      boxm_rt_sample<float> rt;
+-      rt.seg_len_=1.0;
+-      cell1->set_data(rt);
+-      boct_tree_cell<short,aux_type>* cell2=aux_tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-      rt.seg_len_=0.5;
+-      cell2->set_data(rt);
+-      aux_scenes[i]->set_block(iter.index(), new boxm_block<boct_tree<short,aux_type> >(block->bounding_box(), aux_tree));
+-      aux_scenes[i]->write_active_block();
+-      ++iter;
+-    }
+-  }
+-
+-  boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> opt(scene, image_names);
+-  opt.optimize_cells(0.01);
+-
+-  for (unsigned i=0; i<image_names.size(); i++) {
+-    delete aux_scenes[i];
+-  }
+-}
+-
+-TESTMAIN(test_bayesian_optimizer);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
+deleted file mode 100644
+index 7473709bdf..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_bayesian_optimizer );
+-DECLARE( test_edges );
+-DECLARE( test_shadow_appearance );
+-
+-void register_tests()
+-{
+-  REGISTER( test_bayesian_optimizer );
+-  REGISTER( test_edges );
+-  REGISTER( test_shadow_appearance );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
+deleted file mode 100644
+index 6f6a62f9c6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
++++ /dev/null
+@@ -1,26 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boct/boct_tree.h>
+-
+-static void test_edges()
+-{
+-  typedef boxm_inf_line_sample<float> data_type;
+-  // create the main scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
+-  // create the auxiliary scenes for each image
+-  std::vector<std::string> image_names;
+-  image_names.emplace_back("image1");
+-  image_names.emplace_back("image2");
+-  image_names.emplace_back("image3");
+-  //boxm_edge_tangent_updater<short, float, aux_type> u(scene,imgs);
+-}
+-
+-TESTMAIN(test_edges);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
+deleted file mode 100644
+index 6b1edbffb5..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#include <boxm/algo/rt/boxm_change_3d_functor.h>
+-#include <boxm/algo/rt/boxm_change_probability_functor.h>
+-#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
+-#include <boxm/algo/rt/boxm_edge_updater.h>
+-#include <boxm/algo/rt/boxm_expected_edge_functor.h>
+-#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_shadow_sample_functor.h>
+-#include <boxm/algo/rt/boxm_opt2_optimizer.h>
+-#include <boxm/algo/rt/boxm_opt3_optimizer.h>
+-#include <boxm/algo/rt/boxm_opt_appearance_estimator.h>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
+-#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_shadow_image_functor.h>
+-#include <boxm/algo/rt/boxm_rpc_registration.h>
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
+-#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
+-#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.h>
+-#include <boxm/algo/rt/boxm_sun_vis_prob_functor.h>
+-#include <boxm/algo/rt/boxm_update_image_functor.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
+deleted file mode 100644
+index f97877bc43..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
+-
+-namespace test_shadow_appearance_globals
+-{
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_type;
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype app_type;
+-}
+-
+-
+-static void test_shadow_appearance()
+-{
+-  using namespace test_shadow_appearance_globals;
+-  //normalized observations square building (I-A)/(mu+ - A), partly in shadow
+-  double obs_arr[] = {0.600555,0.7,0.061111,0.748335,0.77611,0.68611,
+-                      0.148889,0.855555,0.664445,0.651665,0.101111,
+-                      0.0272222,0.67278,0.70389,0.1733335,0.77111,
+-                      0.701665,0.64778,0.65111,0.72611,0.82889,0.735,
+-                      0.077222,0.0816665,0.051111,0.71722,0.61722,
+-                      0.065,0.095,0.0866665,0.58611,0.665555};
+-  std::vector<obs_type> obs;
+-  std::vector<float> pre, vis;
+-  for (double i : obs_arr) {
+-    obs.push_back(static_cast<obs_type>(i));
+-    pre.push_back(0.0f);
+-    vis.push_back(1.0f);
+-  }
+-  float min_app_sigma = 0.05f;
+-  float shadow_prior = 0.5f;
+-  float shadow_mean = 0.0f;
+-  float shadow_sigma = 0.05f;
+-  bool verbose = true;
+-  app_type model;
+-  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(obs, pre, vis,
+-                                                       model,
+-                                                       min_app_sigma,
+-                                                       shadow_prior,
+-                                                       shadow_mean,
+-                                                       shadow_sigma,
+-                                                       verbose);
+-  double er = std::fabs(0.70034355-model.color())+
+-    std::fabs(model.sigma()- 1.0/11.954589);
+-  TEST_NEAR("test shadow appearance EM", er, 0.0, 1e-6);
+-  // normalized observations for dark road surface
+-double dark_obs_arr[] ={0.0477778,0.0666665,0.0072222,0.175,0.12,
+-                        0.162778,0.003333335,0.188889,0.233889,
+-                        0.0605555,0.0077778,0.004444445,0.0883335,
+-                        0.15,0.0716665,0.1233335,0.1983335,0.15,
+-                        0.0883335,0.03944445,0.122222,0.125,0.25,
+-                        0.005,0.0122222,0.1,0.1166665,0.03166665,
+-                        0.015,0.01,0.1016665,0.167222};
+-  std::vector<obs_type> dark_obs;
+-  for (double i : dark_obs_arr)
+-    dark_obs.push_back(static_cast<obs_type>(i));
+-  app_type dark_model;
+-  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(dark_obs, pre, vis,
+-                                                       dark_model,
+-                                                       min_app_sigma,
+-                                                       shadow_prior,
+-                                                       shadow_mean,
+-                                                       shadow_sigma,
+-                                                       verbose);
+-  double dark_er = std::fabs(0.14765342-dark_model.color())
+-                 + std::fabs(dark_model.sigma()- 1.0/16.097824);
+-  TEST_NEAR("test dark surface shadow appearance EM", dark_er, 0.0, 1e-6);
+-}
+-
+-TESTMAIN(test_shadow_appearance);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
+deleted file mode 100644
+index 03c12cb61b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
+-#include <boxm/algo/rt/boxm_edge_updater.hxx>
+-#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
+-#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
+-#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
+deleted file mode 100644
+index 16a9fc1839..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
++++ /dev/null
+@@ -1,22 +0,0 @@
+-# brl/bseg/boxm/algo/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_algo_sp_sources
+-    boxm_compute_volume_visibility.h
+-    boxm_depth_image_triangle.h
+-    boxm_render_image.h
+-    boxm_render_image_triangle.h
+-    boxm_update.h
+-    boxm_update_triangle.h
+-    dummy.cxx
+-   )
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo_sp LIBRARY_SOURCES ${boxm_algo_sp_sources})
+-
+-#processes
+-add_subdirectory(pro)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_algo_sp boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h b/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
+deleted file mode 100644
+index 1f1bbbd6c9..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
++++ /dev/null
+@@ -1,172 +0,0 @@
+-#ifndef boxm_compute_volume_visibility_h
+-#define boxm_compute_volume_visibility_h
+-#include <iostream>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-float boxm_compute_point_visibility(vgl_point_3d<double> point,
+-                                    boxm_scene<boct_tree<T_loc, T_data > > & scene,
+-                                    vpgl_camera_double_sptr & camera )
+-{
+-  typedef boct_tree<T_loc,T_data > tree_type;
+-  // locate the cells corresponding to query volume.
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    // make a test for vertices for behind-front case
+-    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-
+-    std::cout<<"The point is "<<point;
+-    if (cam->is_behind_camera(vgl_homg_point_3d<double>(point)))
+-    return 1.0f;
+-    // first block of intersection
+-
+-    // case 1 : when the camera lies inside the scene
+-    vgl_homg_point_3d<double> cam_center_homg = cam->camera_center();
+-    vgl_point_3d<double> cam_center(cam_center_homg);
+-    vgl_point_3d<int> curr_block_index;
+-
+-    vgl_vector_3d<double> dir=(point-cam_center);
+-    double lambda0=dir.length();
+-    dir/=lambda0;
+-
+-    boxm_block<tree_type> * curr_block=scene.get_block(cam_center);
+-    vgl_point_3d<double> entry_point=cam_center;
+-    double lambda=0;
+-
+-    // case 2: camera lies outside the scene
+-    if (!curr_block)
+-    {
+-      vgl_box_3d<double> world_bb=scene.get_world_bbox();
+-      boct_face_idx face_id;
+-      if (!boxm_utils::cube_entry_point(world_bb,cam_center,dir,entry_point,lambda,face_id))
+-      return 1.0f;
+-      if (!scene.get_block_index(entry_point,curr_block_index))
+-      return 1.0f;
+-    }
+-    else
+-    {
+-      scene.get_block_index(cam_center,curr_block_index);
+-    }
+-
+-    scene.load_block(curr_block_index);
+-    curr_block=scene.get_active_block();
+-    bool continue_flag=true;
+-
+-    tree_type * tree=curr_block->get_tree();
+-
+-    vgl_point_3d<double> exit_point;
+-    boct_face_idx face_id=NONE;
+-    double alpha_int=0;
+-    boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(entry_point);
+-    while (continue_flag)
+-    {
+-      // do processing in the block
+-      if (curr_cell)
+-      {
+-        if (boxm_utils::cube_exit_point(tree->cell_bounding_box(curr_cell),
+-        cam_center,dir,exit_point,lambda,face_id))
+-        {
+-          if (lambda>lambda0)
+-          continue_flag=false;
+-          else
+-          {
+-            std::vector<boct_tree_cell<T_loc,T_data > * > neighbors;
+-            curr_cell->find_neighbors(face_id,neighbors,tree->root_level());
+-
+-            vgl_vector_3d<double> len(exit_point-entry_point);
+-            T_data data=curr_cell->data();
+-            alpha_int-=data.alpha*len.length();
+-            curr_cell=nullptr;
+-#if 0
+-            std::cout<<"Lambda= "<<lambda<<" lambda0= "<<lambda0
+-                    <<" exit_point="<<exit_point<<"# of neighbors"<< neighbors.size()<<std::endl;
+-#endif
+-            double min_dist=1e5;
+-            int min_i=-1;
+-            for (unsigned i=0;i<neighbors.size();++i)
+-            {
+-              vgl_box_3d<double> bbox=tree->cell_bounding_box(neighbors[i]);
+-              double dist=0;
+-              if (exit_point.x()<bbox.min_x())
+-                dist+=std::fabs(exit_point.x()-bbox.min_x());
+-              if (exit_point.x()>bbox.max_x())
+-                dist+=std::fabs(exit_point.x()-bbox.max_x());
+-              if (exit_point.y()<bbox.min_y())
+-                dist+=std::fabs(exit_point.y()-bbox.min_y());
+-              if (exit_point.y()>bbox.max_y())
+-                dist+=std::fabs(exit_point.y()-bbox.max_y());
+-              if (exit_point.z()<bbox.min_z())
+-                dist+=std::fabs(exit_point.z()-bbox.min_z());
+-              if (exit_point.z()>bbox.max_z())
+-                dist+=std::fabs(exit_point.z()-bbox.max_z());
+-
+-              if (dist<min_dist)
+-              {
+-                min_dist=dist;
+-                min_i=i;
+-              }
+-            }
+-            if (min_i>=0)
+-              curr_cell=neighbors[min_i];
+-            else if (neighbors.size()>0)
+-            {
+-              std::cout<<"ERROR"<<std::endl;return -1.0f;
+-            }
+-            entry_point=exit_point;
+-          }
+-        }
+-      }
+-      // when the block is exhausted obtain a new block
+-      else
+-      {
+-        if (face_id==X_LOW)
+-          curr_block_index.set(curr_block_index.x()-1,curr_block_index.y(),curr_block_index.z());
+-        if (face_id==X_HIGH)
+-          curr_block_index.set(curr_block_index.x()+1,curr_block_index.y(),curr_block_index.z());
+-        if (face_id==Y_LOW)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y()-1,curr_block_index.z());
+-        if (face_id==Y_HIGH)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y()+1,curr_block_index.z());
+-        if (face_id==Z_LOW)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()-1);
+-        if (face_id==Z_HIGH)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()+1);
+-
+-        if (scene.valid_index(curr_block_index))
+-        {
+-          scene.load_block(curr_block_index);
+-          curr_block=scene.get_active_block();
+-          tree=curr_block->get_tree();
+-          curr_cell=tree->locate_point_global(entry_point);
+-        }
+-        else
+-        {
+-          continue_flag=false;
+-        }
+-      }
+-    }
+-    return (float)std::exp(alpha_int);
+-  }
+-  else
+-  {
+-  std::cout<<"Not a perspective camera"<<std::endl;
+-  return -1.0f;
+-  }
+-}
+-
+-
+-template <class T_loc, class T_data>
+-float boxm_compute_volume_visibility(vgl_box_3d<double> bbox,
+-                                     boxm_scene<boct_tree<T_loc,T_data> > & scene,
+-                                     vpgl_camera_double_sptr & cam )
+-{
+-  // locate the cells corresponding to query volume.
+-  return boxm_compute_point_visibility<T_loc,T_data>(bbox.centroid(),scene,cam);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
+deleted file mode 100644
+index bb07d38325..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
++++ /dev/null
+@@ -1,127 +0,0 @@
+-#ifndef boxm_depth_image_triangle_h_
+-#define boxm_depth_image_triangle_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include "boxm_render_image.h"
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_transform.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vul/vul_timer.h>
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_depth_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                         vpgl_camera_double_sptr cam,
+-                                         vil_image_view<float> &expected,
+-                                         vil_image_view<float> &mask)
+-{
+-  unsigned ni=expected.ni();
+-  unsigned nj=expected.nj();
+-  expected.fill(0.0f);
+-  vgl_plane_3d<double> projection_plane;
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
+-  vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
+-  vul_timer t;
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
+-  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
+-
+-  while (block_vis_iter.next())
+-  {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) // code for each block
+-    {
+-      t.mark();
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      t.mark();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_depth(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
+-      normalize_expected_functor norm_fn;
+-
+-      double xverts[8];
+-      double yverts[8];
+-      float vertdists[8];
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        vis_end.fill(0.0f);
+-        temp_depth.fill(0.0f);
+-        temp_weights.fill(0.0f);
+-        alpha_img_.fill(0.0f);
+-
+-        std::cout<<'.';
+-
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          //if (sample.alpha>0.001)
+-          {
+-            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-            // get  alpha
+-            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-            boxm_depth_fill(xverts, yverts, vertdists, vis_face_ids,temp_depth);
+-          }
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights_);
+-
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( temp_depth,pix_weights_, temp_depth);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(temp_depth,expected,expected);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-    }
+-  }
+-  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
+deleted file mode 100644
+index d6cd56258c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
++++ /dev/null
+@@ -1,166 +0,0 @@
+-#ifndef boxm_render_image_h_
+-#define boxm_render_image_h_
+-
+-#include <vector>
+-#include <sstream>
+-#include <iostream>
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_transform.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vul/vul_timer.h>
+-
+-class normalize_expected_functor
+-{
+- public:
+-  normalize_expected_functor() = default;
+-
+-  void operator()(float  norm, float & val) const
+-  {
+-    if (norm>0)
+-      val/=norm;
+-  }
+-};
+-
+-class image_exp_functor
+-{
+- public:
+-  float operator()(float x) const { return x<0?std::exp(x):1.0f; }
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_image_splatting(boxm_scene<boct_tree<T_loc,T_data> >& scene,
+-                                 vpgl_camera_double_sptr cam,
+-                                 vil_image_view<typename T_data::obs_datatype>& expected,
+-                                 vil_image_view<float>& /*mask*/,       // TODO: use this param
+-                                 int bin=-1,
+-                                 bool /*use_black_background*/ = false) // TODO: use this param
+-{
+-  unsigned ni=expected.ni();
+-  unsigned nj=expected.nj();
+-  expected.fill(0.0f);
+-
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
+-  vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
+-
+-  vul_timer t;
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
+-  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
+-
+-  int cnt=0;
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-
+-      t.mark();
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
+-
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      std::cout<<"Block: "<<curr_block->bounding_box()<<std::endl
+-              <<"Tree: "<<curr_block->get_tree()->number_levels()
+-              << " #of leaf cells "<<curr_block->get_tree()->leaf_cells().size()<<std::endl;
+-
+-      t.mark();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(expected.ni(),expected.nj(),3);
+-      vil_image_view<float> back_xyz(expected.ni(),expected.nj(),3);
+-      vil_image_view<float> alphas(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
+-      normalize_expected_functor norm_fn;
+-
+-      double  xverts[8];
+-      double  yverts[8];
+-
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        front_xyz.fill(0.0f);
+-        back_xyz.fill(0.0f);
+-        alphas.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        temp_weights.fill(0.0f);
+-        std::cout<<'.';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          //if (sample.alpha>0.001)
+-          {
+-            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-            boxm_utils::project_corners(corners,cam,xverts,yverts);
+-            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-            boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
+-            // get expected color of cell
+-            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
+-            // get  alpha
+-            boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-            // fill expected value image
+-            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
+-            boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
+-         }
+-        }
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(expected.ni(),expected.nj(),1);
+-
+-        len_seg.fill(0.0f);
+-        std::stringstream s,s1;
+-
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,back_xyz);
+-        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
+-        vil_math_sqrt<float>(len_seg);
+-        vil_math_image_product(len_seg,alphas, alphas);
+-        vil_transform2(temp_weights,temp_expected,norm_fn);
+-        ++cnt;
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,vis);
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( temp_expected,vis, temp_expected);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(temp_expected,expected,expected);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
+deleted file mode 100644
+index abcca0dbe5..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
++++ /dev/null
+@@ -1,167 +0,0 @@
+-#ifndef boxm_render_image_triangle_h_
+-#define boxm_render_image_triangle_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include "boxm_render_image.h"
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_transform.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vul/vul_timer.h>
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_expected_functor_splatting
+-{
+- public:
+-  normalize_expected_functor_splatting(bool use_black_background) : use_black_background_(use_black_background) {}
+-
+-  void operator()(float mask, typename T_data::obs_datatype &pix) const
+-  {
+-    if (!use_black_background_) {
+-      pix += mask*0.5f;
+-    }
+-  }
+-  bool use_black_background_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_render_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                          vpgl_camera_double_sptr cam,
+-                                          vil_image_view<typename T_data::obs_datatype> &expected,
+-                                          vil_image_view<float> &/*mask*/, // FIXME: use this param
+-                                          int bin=-1,
+-                                          bool use_black_background = false)
+-{
+-  unsigned ni=expected.ni();
+-  unsigned nj=expected.nj();
+-  expected.fill(0.0f);
+-  vgl_plane_3d<double> projection_plane;
+-  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
+-    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
+-    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,expected.ni(),expected.nj());
+-  }
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
+-  vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
+-  vul_timer t;
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
+-  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
+-
+-  while (block_vis_iter.next())
+-  {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) // code for each block
+-    {
+-      t.mark();
+-      //if (block_indices[i].x()!=2 || block_indices[i].z()!=0)
+-      //  continue;
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      t.mark();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
+-      normalize_expected_functor norm_fn;
+-
+-      double  xverts[8];
+-      double  yverts[8];
+-      float vertdists[8];
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        temp_weights.fill(0.0f);
+-        alpha_img_.fill(0.0f);
+-
+-        std::cout<<'.';
+-
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          //if (sample.alpha>0.001)
+-          {
+-            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-            {
+-              boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-            }
+-            else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-              boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-            }
+-            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-            //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
+-            // get expected color of cell
+-            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
+-            // get  alpha
+-            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-
+-            cube_fill_value(xverts, yverts, vis_face_ids, temp_expected,  cell_expected);            // fill expected value image
+-            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
+-            //boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
+-          }
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights_);
+-
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( temp_expected,pix_weights_, temp_expected);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(temp_expected,expected,expected);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-    }
+-  }
+-  normalize_expected_functor_splatting<T_data> norm_fn(use_black_background);
+-  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_splatting<T_data> >(vis,expected,norm_fn);
+-
+-  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
+deleted file mode 100644
+index 9642cdd4c1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
++++ /dev/null
+@@ -1,374 +0,0 @@
+-#ifndef boxm_update_h_
+-#define boxm_update_h_
+-//:
+-//\file
+-#include <iostream>
+-#include "boxm_render_image.h"
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#include <vul/vul_timer.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: functor used for normalizing cell_expected image
+-template <class T_loc, class T_data>
+-void boxm_update_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                       vpgl_camera_double_sptr cam,
+-                       vil_image_view<typename T_data::obs_mathtype> &img,
+-                       vil_image_view<float> &norm_img,
+-                       typename T_data::apm_datatype background_model, int bin)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-
+-  vil_image_view<float> pre(ni,nj,1); pre.fill(0.0f);
+-  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
+-
+-#if 0 // TODO: vgl_plane_3d<double> has no constructor with 3 double params....???!!!
+-  //       and projection_plane is unused ..!!
+-  if (vpgl_rational_camera<double> const* rcam = dynamic_cast<vpgl_rational_camera<double> const*>(cam.as_pointer())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(bbox.min_x(),bbox.min_y(),bbox.max_z());
+-    vgl_plane_3d<double> bottom(bbox.min_x(),bbox.min_y(),bbox.min_z());
+-    vgl_plane_3d<double> projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
+-  }
+-#endif // 0
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(ni,nj,1);
+-      vil_image_view<float> back_xyz(ni,nj,1);
+-      vil_image_view<float> alphas(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      int cnt=0;
+-      while (frontier_it.next())
+-      {
+-        ++cnt;
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        front_xyz.fill(0.0f);
+-        back_xyz.fill(0.0f);
+-        alphas.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-        std::cout<<cnt<<' ';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (vpgl_camera_double_sptr pcam = dynamic_cast<vpgl_perspective_camera<double>*>(cam.as_pointer()))
+-          {
+-            boxm_utils::project_corners(corners,pcam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double>* rcam = dynamic_cast<vpgl_rational_camera<double>*>(cam.as_pointer())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,vgl_plane_3d<double>(),xverts,yverts,vertdists);
+-            // TODO: 3rd argument should most likely be a "real" plane!!!
+-          }
+-
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          // get  alpha
+-          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-        }
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
+-        //vil_math_sum_sqr<float,float>(back_xyz,len_seg);
+-        //vil_math_sqrt<float>(len_seg);
+-
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, img, len_seg,cell_mean_obs,xverts,yverts)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-            // fill obs probability density image
+-            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,cell_PI, xverts,yverts);
+-          }
+-        }
+-        vil_math_image_product(len_seg,alphas, alphas);
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,vis);
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( PI_img,vis, PI_img);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(PI_img,pre,pre);
+-
+-        vis.deep_copy(vis_end);
+-#if 0
+-        if (cnt == 70) {
+-          std::cout << "saving debug images" << std::endl;
+-          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
+-          vil_save(len_seg,(output_dir + "len_seg.tiff").c_str());
+-          vil_save(alphas,(output_dir + "alphas.tiff").c_str());
+-          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
+-          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
+-          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
+-          vil_save(vis,(output_dir + "vis.tiff").c_str());
+-          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
+-          vil_save(img,(output_dir + "obs.tiff").c_str());
+-        }
+-#endif
+-      }
+-
+-      scene.write_active_block();
+-    }
+-  }
+-  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
+-  for (unsigned int j=0; j<img.nj(); ++j) {
+-    for (unsigned int i=0; i<img.ni(); ++i) {
+-      // this will have to be modified slightly when we deal with multi-plane images -dec
+-      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
+-    }
+-  }
+-
+-  vil_math_image_product(PI_background, vis, norm_img);
+-  vil_math_image_sum(pre,norm_img,norm_img);
+-  safe_inverse_functor inv_func(1e-8f);
+-  vil_transform(norm_img, inv_func);
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_update_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                       vpgl_camera_double_sptr cam,
+-                       vil_image_view<typename T_data::obs_mathtype> &img,
+-                       vil_image_view<float> &norm_img, int bin)
+-{
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  typedef boct_tree_cell<T_loc, T_data > cell_type;
+-  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
+-  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
+-  vil_image_view<float> pix_weights(ni,nj,1);
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-
+-  vul_timer t;  t.mark();
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(ni,nj,1);
+-      vil_image_view<float> back_xyz(ni,nj,1);
+-      vil_image_view<float> alphas(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      vil_image_view<float> update_factor(ni,nj,1);
+-      unsigned count=0;
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        front_xyz.fill(0.0f);
+-        back_xyz.fill(0.0f);
+-        alphas.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-
+-        std::cout<<'.';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          // get  alpha
+-          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-        }
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
+-
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          //// get  alpha
+-          //boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, img,len_seg, cell_mean_obs,xverts,yverts)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-#if 0
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-#endif // 0
+-            // fill obs probability density image
+-            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,(float)cell_PI, xverts,yverts);
+-          }
+-          float cell_mean_vis = 0.0f;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, vis, len_seg,cell_mean_vis,xverts,yverts)) {
+-            // update appearance model
+-            if (cell_mean_vis > 1e-6) {
+-              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
+-            }
+-          }
+-          (*cell_it)->set_data(sample);
+-        }
+-#if 0
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
+-        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
+-        vil_math_sqrt<float>(len_seg);
+-#endif // 0
+-        vil_math_image_product(len_seg,alphas, alphas);
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights);
+-        // multiply PI by vis..
+-        vil_math_image_product(PI_img, vis, update_factor);
+-        // ..add preX to get numerator term for update..
+-        vil_math_image_sum(pre_img, update_factor, update_factor);
+-        //.. and normalize
+-        vil_math_image_product(norm_img, update_factor, update_factor);
+-
+-        float max_cell_P=0.99f;
+-        float min_cell_P=0.001f;
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
+-          float mean_update_factor = 0.0f;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, update_factor,len_seg, mean_update_factor,xverts,yverts))
+-          {  // update alpha value
+-            sample.alpha *= mean_update_factor;
+-            // do bounds check on new alpha value
+-            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
+-            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
+-            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
+-            if (sample.alpha > max_alpha)
+-            sample.alpha = max_alpha;
+-
+-            if (sample.alpha < min_alpha)
+-            sample.alpha = min_alpha;
+-
+-            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
+-              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
+-                       << "mean_update_factor = " << mean_update_factor << '\n';
+-            }
+-            (*cell_it)->set_data(sample);
+-          }
+-        }
+-        // multiply cell_PI by cell weights
+-        vil_math_image_product(pix_weights, PI_img, PI_img);
+-        // update pre_img
+-        vil_math_image_sum(PI_img, pre_img, pre_img);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_update(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                 vil_image_view<typename T_data::obs_datatype> &img,
+-                 vpgl_camera_double_sptr cam, int bin=-1,
+-                 bool black_background = false)
+-{
+-  typename T_data::apm_datatype background_apm;
+-
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    for (unsigned int i=0; i<4; ++i) {
+-      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
+-      T_data::apm_processor::prob_density(background_apm,0.0f);
+-    }
+-  }
+-  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
+-  boxm_update_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
+-  std::cout << "update: pass1 completed" << std::endl;
+-  vil_save(norm_img,"D:/vj/scripts/boxm/exp1/norm.tiff");
+-  boxm_update_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
+-  std::cout << "update: pass2 completed" << std::endl;
+-
+-  return;
+-}
+-
+-#endif // boxm_update_h_
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
+deleted file mode 100644
+index 723284ff3b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
++++ /dev/null
+@@ -1,356 +0,0 @@
+-#ifndef boxm_update_triangle_h_
+-#define boxm_update_triangle_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vil/vil_math.h>
+-#include <vul/vul_timer.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: functor used for normalizing cell_expected image
+-template <class T_loc, class T_data>
+-void boxm_update_triangle_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                vpgl_camera_double_sptr cam,
+-                                vil_image_view<typename T_data::obs_mathtype> &img,
+-                                vil_image_view<float> &norm_img,
+-                                typename T_data::apm_datatype background_model, int bin)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-
+-  vil_image_view<float> pre(ni,nj,1);
+-  vil_image_view<float> vis(ni,nj,1);
+-  vil_image_view<float> alpha_integral(ni,nj,1);
+-  vil_image_view<float> PI_img(ni,nj,1);
+-  vil_image_view<float> pix_weights_(ni,nj,1);
+-  vil_image_view<float> alpha_img_(ni,nj,1);
+-
+-  alpha_integral.fill(0.0f);
+-  pre.fill(0.0f);
+-  vis.fill(1.0f);
+-
+-  vgl_plane_3d<double> projection_plane;
+-  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
+-    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
+-    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
+-  }
+-
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next())
+-  {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) // code for each block
+-    {
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(ni,nj,1);
+-      vil_image_view<float> back_xyz(ni,nj,1);
+-      vil_image_view<float> alphas(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      int cnt=0;
+-
+-      while (frontier_it.next())
+-      {
+-        ++cnt;
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        alpha_img_.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-          {
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-          }
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-
+-
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-            // fill obs probability density image
+-            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
+-          }
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights_);
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( pix_weights_,PI_img, PI_img);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(PI_img,pre,pre);
+-        vis.deep_copy(vis_end);
+-#if 0
+-        if (cnt == 10) {
+-          std::cout << "saving debug images" << std::endl;
+-          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
+-          vil_save(alpha_img_,(output_dir + "alpha_img.tiff").c_str());
+-          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
+-          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
+-          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
+-          vil_save(vis,(output_dir + "vis.tiff").c_str());
+-          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
+-          vil_save(img,(output_dir + "obs.tiff").c_str());
+-        }
+-#endif
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
+-  for (unsigned int j=0; j<img.nj(); ++j) {
+-    for (unsigned int i=0; i<img.ni(); ++i) {
+-      // this will have to be modified slightly when we deal with multi-plane images -dec
+-      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
+-    }
+-  }
+-
+-  vil_math_image_product(PI_background, vis, norm_img);
+-  vil_math_image_sum(pre,norm_img,norm_img);
+-  safe_inverse_functor inv_func(1e-8f);
+-  vil_transform(norm_img, inv_func);
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_update_triangle_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                vpgl_camera_double_sptr cam,
+-                                vil_image_view<typename T_data::obs_mathtype> &img,
+-                                vil_image_view<float> &norm_img, int bin)
+-{
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  typedef boct_tree_cell<T_loc, T_data > cell_type;
+-  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
+-  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(ni,nj,1);
+-  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
+-  vil_image_view<float> pix_weights(ni,nj,1);
+-  alpha_integral.fill(0.0f);
+-  pre_img.fill(0.0f);
+-  vis.fill(1.0f);
+-
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-  vgl_plane_3d<double> projection_plane;
+-  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
+-    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
+-    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
+-  }
+-  vul_timer t;  t.mark();
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> alpha_img_(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      vil_image_view<float> update_factor(ni,nj,1);
+-
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-        alpha_img_.fill(0.0f);
+-
+-        std::cout<<'.';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-          {
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-          }
+-
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-#if 0
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-#endif // 0
+-            // fill obs probability density image
+-            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
+-          }
+-          float cell_mean_vis = 0.0f;
+-          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,vis,cell_mean_vis)) {
+-            // update appearance model
+-            if (cell_mean_vis > 1e-6) {
+-              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
+-            }
+-          }
+-          (*cell_it)->set_data(sample);
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights);
+-        // multiply PI by vis..
+-        vil_math_image_product(PI_img, vis, update_factor);
+-        // ..add preX to get numerator term for update..
+-        vil_math_image_sum(pre_img, update_factor, update_factor);
+-        //.. and normalize
+-        vil_math_image_product(norm_img, update_factor, update_factor);
+-
+-
+-        float max_cell_P=0.99f;
+-        float min_cell_P=0.001f;
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-          {
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-          }
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-
+-          float mean_update_factor = 0.0f;
+-          if (cube_mean(xverts,yverts,vertdists,vis_face_ids, update_factor, mean_update_factor))
+-          {
+-            // update alpha value
+-            sample.alpha *= mean_update_factor;
+-            // do bounds check on new alpha value
+-            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
+-            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
+-            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
+-            if (sample.alpha > max_alpha)
+-            sample.alpha = max_alpha;
+-
+-            if (sample.alpha < min_alpha)
+-            sample.alpha = min_alpha;
+-
+-            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
+-              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
+-                       << "mean_update_factor = " << mean_update_factor << '\n';
+-            }
+-            (*cell_it)->set_data(sample);
+-          }
+-        }
+-        // multiply cell_PI by cell weights
+-        vil_math_image_product(pix_weights, PI_img, PI_img);
+-        // update pre_img
+-        vil_math_image_sum(PI_img, pre_img, pre_img);
+-        vis.deep_copy(vis_end);
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_update_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vil_image_view<typename T_data::obs_datatype> &img,
+-                          vpgl_camera_double_sptr cam, int bin=-1,
+-                          bool black_background = false)
+-{
+-  typename T_data::apm_datatype background_apm;
+-
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    for (unsigned int i=0; i<4; ++i) {
+-      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
+-      T_data::apm_processor::prob_density(background_apm,0.0f);
+-    }
+-  }
+-  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
+-  boxm_update_triangle_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
+-  std::cout << "update: pass1 completed" << std::endl;
+-  boxm_update_triangle_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
+-  std::cout << "update: pass2 completed" << std::endl;
+-
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/dummy.cxx b/contrib/brl/bseg/boxm/algo/sp/dummy.cxx
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+deleted file mode 100644
+index 41fe3f9dbd..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,27 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and bvxm_prodepends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-  set(boxm_algo_sp_pro_sources
+-      boxm_algo_sp_processes.h
+-      boxm_algo_sp_register.h   boxm_algo_sp_register.cxx
+-     )
+-  aux_source_directory(Templates boxm_algo_sp_pro_sources)
+-  aux_source_directory(processes boxm_algo_sp_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_algo_sp_pro LIBRARY_SOURCES ${boxm_algo_sp_pro_sources} )
+-  target_link_libraries(boxm_algo_sp_pro boxm boxm_algo_sp boxm_util bprb brdb brip sdet vsol vil_pro ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil)
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
+deleted file mode 100644
+index 5339909524..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vil/vil_image_view_base.h>
+-#include <vil/io/vil_io_smart_ptr.h>
+-
+-#include <vil/io/vil_io_image_view_base.h>
+-
+-typedef vil_image_view_base_sptr img_sptr;
+-
+-BRDB_VALUE_INSTANTIATE(img_sptr, "vil_image_view_base_sptr");
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
+deleted file mode 100644
+index 24cdc3672a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#ifndef boxm_algo_sp_processes_h_
+-#define boxm_algo_sp_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_volume_visibility_process);
+-DECLARE_FUNC_CONS(boxm_update_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_process);
+-
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
+deleted file mode 100644
+index 8acaac16c3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#include "boxm_algo_sp_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "boxm_algo_sp_processes.h"
+-
+-void boxm_algo_sp_register::register_datatype()
+-{
+-}
+-
+-void boxm_algo_sp_register::register_process()
+-{
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_process,"boxmUpdateSPProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_process, "boxmRenderExpectedProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_volume_visibility_process, "boxmVolumeVisibilityProcess");
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
+deleted file mode 100644
+index 5b7f15d213..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_algo_sp_register_h_
+-#define boxm_algo_sp_register_h_
+-
+-class boxm_algo_sp_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_algo_sp_register_h_
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
+deleted file mode 100644
+index 6ffd752df2..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
++++ /dev/null
+@@ -1,117 +0,0 @@
+-// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
+-
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_render_expected_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_process_globals;
+-
+-  //process takes 5 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4]: bin number
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "unsigned";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_splatting_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,true);
+-    }
+-    else
+-    {
+-      auto bin = pro.get_input<unsigned>(i++);
+-      std::cout<<"Multi Bin"<<std::endl;
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_splatting_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,bin,true);
+-    }
+-
+-    //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  }
+-  else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
+deleted file mode 100644
+index bf3d27ab6d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
++++ /dev/null
+@@ -1,107 +0,0 @@
+-// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Apr 21, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-namespace boxm_update_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: The bin index to be updated
+-  //input[4]: ???
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_update_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto bin_index =  pro.get_input<unsigned>(i++);
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-    std::cout << "boxm_update_process: null input value, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      //boxm_update<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, false);
+-      boxm_update_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Multi Bin Update"<<std::endl;
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, img, camera, bin_index,use_black_background);
+-    }
+-    //vil_image_view<float> image = *vil_convert_cast(float(), input_image);
+-  }
+-  else {
+-    std::cout << "boxm_update_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
+deleted file mode 100644
+index 34ecc27c3f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
++++ /dev/null
+@@ -1,129 +0,0 @@
+-// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
+-//:
+-// \file
+-// \brief A class for obtaining visibility of a volume
+-//
+-// \author Vishal Jain
+-// \date Apr 30, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_volume_visibility_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 10;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_volume_visibility_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_volume_visibility_process_globals;
+-
+-  //process takes 10 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4-9]: bounding box
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "float";
+-  input_types_[5] = "float";
+-  input_types_[6] = "float";
+-  input_types_[7] = "float";
+-  input_types_[8] = "float";
+-  input_types_[9] = "float";
+-
+-  // process has 1 output:
+-  // output[0]: rendered image
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_volume_visibility_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_volume_visibility_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-
+-  auto min_x=pro.get_input<float>(i++);
+-  auto min_y=pro.get_input<float>(i++);
+-  auto min_z=pro.get_input<float>(i++);
+-
+-  auto max_x=pro.get_input<float>(i++);
+-  auto max_y=pro.get_input<float>(i++);
+-  auto max_z=pro.get_input<float>(i++);
+-
+-  vgl_box_3d<double> query(min_x,min_y,min_z,
+-                           max_x,max_y,max_z);
+-
+-  double xverts[8];
+-  double yverts[8];
+-
+-  boxm_utils::project_corners(boxm_utils::corners_of_box_3d(query),camera,xverts,yverts);
+-  boct_face_idx face_id=boxm_utils::visible_faces(query,camera,xverts,yverts);
+-  vil_image_view_base_sptr img;
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    float val=1.0;
+-
+-    if (!scene_ptr->multi_bin()){
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      val=boxm_compute_volume_visibility<short, boxm_sample<BOXM_APM_MOG_GREY> >(query,*scene, camera);
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      val=boxm_compute_volume_visibility<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(query,*scene, camera);
+-    }
+-    vil_image_view<float> img_vol(ni,nj);img_vol.fill(0.0);
+-    boxm_utils::project_cube_fill_val(face_id,img_vol,val,xverts,yverts);
+-    auto *vol_vis = new vil_image_view<unsigned char>(img_vol.ni(),img_vol.nj(),img_vol.nplanes());
+-    vil_convert_stretch_range_limited(img_vol,*vol_vis, 0.0f, 1.0f);
+-    img = vol_vis;
+-
+-    std::cout<<"\n Visibility is "<<val;
+-  }
+-  else {
+-    std::cout << "boxm_volume_visibility_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index bc15f419d9..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_algo_sp_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_sp_pro_test_include boxm_algo_sp_pro)
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
+deleted file mode 100644
+index bfdbc4ffa3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/sp/pro/boxm_algo_sp_processes.h>
+-#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
+deleted file mode 100644
+index 99806c193d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,19 +0,0 @@
+-add_executable( boxm_algo_sp_test_all
+-  test_driver.cxx
+-  test_compute_visibility.cxx
+-  test_render_image.cxx
+-  test_update.cxx
+-  test_update_multi_bin.cxx
+- )
+-
+-target_link_libraries( boxm_algo_sp_test_all boxm_algo_sp boxm_algo boxm boxm_util boxm_sample boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME boxm_algo_sp_test_compute_visibility COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_compute_visibility  )
+-add_test( NAME boxm_algo_sp_test_render_image COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_render_image  )
+-if( VXL_RUN_FAILING_TESTS )
+-add_test( NAME boxm_algo_sp_test_update COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update  )
+-endif()
+-add_test( NAME boxm_algo_sp_test_update_multi_bin COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update_multi_bin  )
+-
+-add_executable( boxm_algo_sp_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_sp_test_include boxm_algo_sp)
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
+deleted file mode 100644
+index 69c019a479..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
++++ /dev/null
+@@ -1,90 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_test_util.h>
+-
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_compute_visibility()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,3);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("./boxm_scene1", "block");
+-  vul_file::make_directory("./boxm_scene1");
+-  std::ofstream os("scene1.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3> s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3> s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3> s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
+-    if (iter.index().z()==1)
+-    {
+-      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells=tree->leaf_cells();
+-      s1_sample.alpha=0.6f;
+-
+-      for (auto & leaf_cell : leaf_cells)
+-      {
+-        leaf_cell->set_data(s1_sample);
+-      }
+-      block->init_tree(tree);
+-      scene.write_active_block();
+-    }
+-    else
+-    {
+-      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells= tree->leaf_cells();
+-      s1_sample.alpha=0.01f;
+-
+-      for (auto & leaf_cell : leaf_cells)
+-      {
+-        leaf_cell->set_data(s1_sample);
+-      }
+-      block->init_tree(tree);
+-      scene.write_active_block();
+-    }
+-
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-
+-  double X=5,Y=5,Z;
+-  for (Z=40; Z>-10; --Z)
+-  {
+-    boxm_compute_point_visibility<short,boxm_sample<BOXM_APM_MOG_GREY> >(vgl_point_3d<double>(X,Y,Z),scene, camera);
+-  }
+-  vpl_rmdir("./boxm_scene1");
+-  vpl_unlink("./scene1.xml");
+-}
+-
+-TESTMAIN(test_compute_visibility);
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
+deleted file mode 100644
+index 2ea0124c63..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_compute_visibility );
+-DECLARE( test_render_image );
+-DECLARE( test_update );
+-DECLARE( test_update_multi_bin );
+-
+-void register_tests()
+-{
+-  REGISTER( test_compute_visibility );
+-  REGISTER( test_render_image );
+-  REGISTER( test_update );
+-  REGISTER( test_update_multi_bin );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
+deleted file mode 100644
+index 85e7588707..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
+-#include <boxm/algo/sp/boxm_depth_image_triangle.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <boxm/algo/sp/boxm_update.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
+deleted file mode 100644
+index c36e76f0dd..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
++++ /dev/null
+@@ -1,103 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree_cell.h>
+-#include <vpl/vpl.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-
+-static void test_render_image()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,3);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("./boxm_scene1", "block");
+-  vul_file::make_directory("./boxm_scene1");
+-  std::ofstream os("scene1.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
+-
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
+-  expected.fill(0.0);
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
+-  mask.fill(0.0);
+-
+-  boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,camera,expected,mask);
+-  vpl_rmdir("boxm_scene1");
+-  vpl_unlink("scene1.xml");
+-}
+-
+-TESTMAIN(test_render_image);
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
+deleted file mode 100644
+index 9e530c4af6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
++++ /dev/null
+@@ -1,259 +0,0 @@
+-#include <iostream>
+-#include <sstream>
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_homg_point_3d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_load.h>
+-#include <vil/vil_save.h>
+-#include <vil/vil_convert.h>
+-#if 0
+-#include <vpl/vpl.h>
+-#endif
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_z(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/36.;
+-  std::vector<vgl_point_3d<double> > centers;
+-  for (unsigned i=0; i<11; i++) {
+-    // double x = boxm_camera_dist*std::cos(alpha)/10;
+-    double z = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
+-    std::cout << centers[i] << std::endl;
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
+-    rat_cameras.push_back(rat_cam);
+-
+-    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-    for (auto c : corners) {
+-      double u,v, u2, v2;
+-      vpgl_perspective_camera<double> persp_cam;
+-      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
+-      bb.add(vgl_point_2d<double> (u,v));
+-
+-      if (verbose)
+-      {
+-        std::cout << "Perspective [" << u << ',' << v << "]\n"
+-                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
+-      }
+-    }
+-    std::cout << bb << std::endl;
+-  }
+-  return rat_cameras;
+-}
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_yz(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  std::cout << "centroid: " << centroid << std::endl;
+-  double alpha = (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/40.;
+-  std::vector<vgl_point_3d<double> > centers;
+-
+-  for (unsigned i=0; i<num_train_images; i++) {
+-    double x = boxm_camera_dist*std::cos(alpha);
+-    double y = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
+-  if (verbose)
+-    std::cout << centers[i] << std::endl;
+-
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> persp_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vgl_point_3d<double> camera_center  = centers[i];
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
+-    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-
+-    //save the camera to file
+-    std::stringstream cam_file;
+-    vul_file::make_directory("./cams");
+-    cam_file << "./cams/cam_" << i << ".txt";
+-    std::ofstream cam_out(cam_file.str().c_str());
+-    cam_out << persp_cam;
+-
+-    if (verbose) {
+-      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-      for (auto c : corners) {
+-        double u,v;
+-        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-        bb.add(vgl_point_2d<double> (u,v));
+-        std::cout << "Perspective [" << u << ',' << v << "]\n"<< std::endl;
+-      }
+-      std::cout << bb << std::endl;
+-    }
+-  }
+-  return persp_cameras;
+-}
+-
+-
+-static void test_update()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-#ifdef SET_APPEARENCE_MODEL_EXISTS
+-  scene.set_appearence_model(BOXM_APM_MOG_GREY);
+-#endif
+-  scene.set_paths("boxm_scene2", "block");
+-  vul_file::make_directory("boxm_scene2");
+-  std::ofstream os("scene2.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
+-
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(4,3);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-#if 0
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-#endif
+-  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z(world);
+-
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
+-
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    expected.fill(0.0);
+-    mask.fill(0.0);
+-
+-    boxm_render_image_splatting_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask);
+-    std::stringstream ss;
+-    ss << "./boxm_scene2/img" << i << ".tif";
+-#if 0
+-    vil_image_view<unsigned char> expected_byte(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,expected_byte, 0.0f, 1.0f);
+-#endif
+-
+-    vil_save(expected, ss.str().data());
+-  }
+-#if 0
+-  vpl_rmdir("./boxm_scene1");
+-  vpl_unlink("./scene1.xml");
+-#endif
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
+-                                                                          block_dim, world_dim, 4U, 3U);
+-  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene_new.set_paths("./boxm_scene_update", "block");
+-  vul_file::make_directory("./boxm_scene_update");
+-  std::ofstream os1("./boxm_scene_update/scene.xml");
+-  x_write(os1, scene_new, "scene");
+-  os1.close();
+-
+-  // update the world, with all the generated images and cameras
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss;
+-    ss << "./boxm_scene2/img" << i << ".tif";
+-    expected = vil_load(ss.str().data());
+-    boxm_update_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i] );
+-  }
+-
+-  // regenerate the images from world
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss; ss << "boxm_scene2/img_new" << i << ".tif";
+-    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
+-    boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask);
+-    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
+-    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
+-
+-    vil_save(expected_byte, ss.str().data());
+-  }
+-}
+-
+-TESTMAIN(test_update);
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
+deleted file mode 100644
+index 27c310aea1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
++++ /dev/null
+@@ -1,262 +0,0 @@
+-#include <iostream>
+-#include <sstream>
+-#include <testlib/testlib_test.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_homg_point_3d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_load.h>
+-#include <vil/vil_save.h>
+-#include <vil/vil_convert.h>
+-#ifdef CLEANUP
+-#include <vpl/vpl.h>
+-#endif
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_z_multi_bin(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/36.;
+-  std::vector<vgl_point_3d<double> > centers;
+-  for (unsigned i=0; i<11; i++) {
+-    double z = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
+-    std::cout << centers[i] << std::endl;
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
+-    rat_cameras.push_back(rat_cam);
+-
+-    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-    for (auto c : corners) {
+-      double u,v, u2, v2;
+-      vpgl_perspective_camera<double> persp_cam;
+-      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
+-      bb.add(vgl_point_2d<double> (u,v));
+-
+-      if (verbose)
+-      {
+-        std::cout << "Perspective [" << u << ',' << v << "]\n"
+-                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
+-      }
+-    }
+-    std::cout << bb << std::endl;
+-  }
+-  return rat_cameras;
+-}
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_yz_multi_bin(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  std::cout << "centroid: " << centroid << std::endl;
+-  double alpha = (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/40.;
+-  std::vector<vgl_point_3d<double> > centers;
+-
+-  for (unsigned i=0; i<num_train_images; i++) {
+-    double x = boxm_camera_dist*std::cos(alpha);
+-    double y = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
+-  if (verbose)
+-    std::cout << centers[i] << std::endl;
+-
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> persp_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vgl_point_3d<double> camera_center  = centers[i];
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
+-    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-
+-    //save the camera to file
+-    std::stringstream cam_file;
+-    vul_file::make_directory("./cams");
+-    cam_file << "./cams/cam_" << i << ".txt";
+-    std::ofstream cam_out(cam_file.str().c_str());
+-    cam_out << persp_cam;
+-
+-    if (verbose) {
+-      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-      for (auto c : corners) {
+-        double u,v;
+-        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-        bb.add(vgl_point_2d<double> (u,v));
+-        std::cout << "Perspective [" << u << ',' << v << ']' << std::endl << std::endl;
+-      }
+-      std::cout << bb << std::endl;
+-    }
+-  }
+-  return persp_cameras;
+-}
+-
+-
+-static void test_update_multi_bin()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,1);
+-  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-#ifdef SET_APPEARENCE_MODEL_EXISTS
+-  scene.set_appearence_model(BOXM_APM_MOG_GREY);
+-#endif
+-  scene.set_paths("boxm_scene2_mb", "block");
+-  vul_file::make_directory("boxm_scene2_mb");
+-  std::ofstream os("scene2.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1,5);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1,5);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1,3);
+-
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(4,3);
+-    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-#if 0
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-#endif
+-  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z_multi_bin(world);
+-
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
+-
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    expected.fill(0.0);
+-    mask.fill(0.0);
+-
+-    boxm_render_image_splatting<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,3);
+-    std::stringstream ss;
+-    ss << "./boxm_scene2_mb/img3" << i << ".tif";
+-    vil_save(expected, ss.str().data());
+-
+-    expected.fill(0.0);
+-    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,5);
+-    std::stringstream ss1;
+-    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
+-    vil_save(expected, ss1.str().data());
+-  }
+-#ifdef CLEANUP
+-  vpl_rmdir("./boxm_scene1");
+-  vpl_unlink("./scene1.xml");
+-#endif
+-  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
+-                                                                                    block_dim, world_dim, 4U, 3U);
+-  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene_new.set_paths("./boxm_scene_update", "block");
+-  vul_file::make_directory("./boxm_scene_update");
+-  std::ofstream os1("./boxm_scene_update/scene.xml");
+-  x_write(os1, scene_new, "scene");
+-  os1.close();
+-
+-  // update the world, with all the generated images and cameras
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss;
+-    ss << "./boxm_scene2_mb/img3" << i << ".tif";
+-    expected = vil_load(ss.str().data());
+-    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],3 );
+-    std::stringstream ss1;
+-    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
+-    expected = vil_load(ss1.str().data());
+-    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],5 );
+-  }
+-
+-  // regenerate the images from world
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss; ss << "boxm_scene2_mb/img_new" << i << ".tif";
+-    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
+-    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask,3);
+-    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
+-    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
+-
+-    vil_save(expected_byte, ss.str().data());
+-  }
+-}
+-
+-TESTMAIN(test_update_multi_bin);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
+deleted file mode 100644
+index 5e823166ae..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,31 +0,0 @@
+-add_executable( boxm_algo_test_all
+-  test_driver.cxx
+-  test_fill_in_mesh.cxx
+-  test_save_scene_raw.cxx
+-  test_upload_mesh.cxx
+-  test_boxm_fill_internal_cells.cxx
+-  test_boxm_scene_crop.cxx
+-  test_linear_operations.cxx
+-  test_remove_level0.cxx
+-
+- )
+-
+-set(boxm_algo_test_all_sources
+-    test_utils.h    test_utils.cxx
+-    )
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo_tests LIBRARY_SOURCES  ${boxm_algo_test_all_sources})
+-
+-target_link_libraries( boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
+-target_link_libraries( boxm_algo_test_all boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
+-
+-add_test( NAME boxm_algo_test_fill_in_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_fill_in_mesh  )
+-add_test( NAME boxm_algo_test_save_scene_raw COMMAND $<TARGET_FILE:boxm_algo_test_all> test_save_scene_raw  )
+-add_test( NAME boxm_algo_test_upload_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_upload_mesh  )
+-add_test( NAME boxm_algo_test_fill_internal_cells COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_fill_internal_cells  )
+-add_test( NAME boxm_algo_test_scene_crop COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_scene_crop  )
+-add_test( NAME boxm_algo_test_linear_operations COMMAND $<TARGET_FILE:boxm_algo_test_all> test_linear_operations )
+-add_test( NAME boxm_algo_remove_level0 COMMAND $<TARGET_FILE:boxm_algo_test_all> test_remove_level0 )
+-
+-add_executable( boxm_algo_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_test_include boxm_algo)
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
+deleted file mode 100644
+index 509f828fb6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
++++ /dev/null
+@@ -1,112 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date February 4, 2010
+-
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/boxm_fill_internal_cells.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-const bool debug = false;
+-
+-void build_tree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  // Create tree
+-  tree->split();
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    leaves[1]->set_data(0.1f);
+-    leaves[1]->split();
+-    for (auto & leave : leaves)
+-      leave->set_data(0.1f);
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "All Levels" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
+-    for (auto & leave : leaves) {
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-}
+-
+-static void test_boxm_fill_internal_cells()
+-{
+-  //Create a dummy scene
+-  typedef boct_tree<short,float > tree_type;
+-  auto *tree = new boct_tree<short,float>(3);
+-  build_tree(tree);
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-
+-  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
+-  std::string scene_path=".";
+-  scene->set_paths(scene_path, "in_block");
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->clean_scene();
+-
+-  boxm_block_iterator<tree_type >  iter =scene->iterator();
+-  iter.begin();
+-  scene->load_block(iter.index());
+-  boxm_block<tree_type> *block = scene->get_active_block();
+-  block->init_tree(tree);
+-  scene->write_active_block();
+-
+-  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
+-
+-  boxm_fill_internal_cells<float> filler;
+-  boxm_scene<tree_type> *scene_out = filler.traverse_and_fill(scene);
+-
+-  //check that output scene is correct
+-  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
+-  iter_out.begin();
+-  scene_out->load_block(iter_out.index());
+-  boxm_block<tree_type> *block_out = scene_out->get_active_block();
+-  boct_tree<short, float>  *tree_out= block_out->get_tree();
+-  std::vector<boct_tree_cell<short,float>*> cells = tree_out->all_cells();
+-  bool result = true;
+-  for (auto & cell : cells)
+-  {
+-    if (!cell->is_leaf())
+-    {
+-      boct_tree_cell<short,float>* children = cell->children();
+-      float avg =0;
+-      for (unsigned c=0; c<8; c++)
+-      {
+-        avg+=children[c].data();
+-      }
+-      result = result && (cell->data()==(avg/8.f));
+-    }
+-  }
+-  TEST("Valid average cells", result, true);
+-
+-  if (debug) {
+-    std::cout << "Printing Output Tree" << std::endl;
+-    for (auto & cell : cells) {
+-      std::cout<< cell->get_code().x_loc_ << ','
+-              << cell->get_code().y_loc_ << ','
+-              << cell->get_code().z_loc_ << ','
+-              << cell->get_code().level << ','
+-              << cell->data() << std::endl;
+-    }
+-  }
+-
+-  scene->clean_scene();
+-  scene_out->clean_scene();
+-}
+-
+-TESTMAIN(test_boxm_fill_internal_cells);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
+deleted file mode 100644
+index 73eff00099..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
++++ /dev/null
+@@ -1,129 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov. 16, 2009.
+-
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/boxm_crop_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-const bool debug = true;
+-
+-void fill_sample_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-  tree->init_cells(0.1f);
+-  tree->split();
+-  std::cout << "Level 1" << std::endl;
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5f);
+-    if (debug)
+-      for (auto & leave : leaves) {
+-        std::cout<< leave->get_code().x_loc_ << ','
+-                << leave->get_code().y_loc_ << ','
+-                << leave->get_code().z_loc_ << ','
+-                << leave->data() << std::endl;
+-      }
+-
+-    leaves[1]->split();
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "Level 0" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (auto & leave : leaves) {
+-      leave->set_data(0.9f);
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "All Levels" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
+-    for (auto & leave : leaves) {
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-}
+-
+-static void test_boxm_scene_crop()
+-{
+-  //Create a dummy scene
+-  typedef boct_tree<short,float > tree_type;
+-  auto *tree = new boct_tree<short,float>(3);
+-  fill_sample_octree(tree);
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-
+-  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
+-  std::string scene_path=".";
+-  scene->set_paths(scene_path, "in_block");
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->clean_scene();
+-
+-  boxm_block_iterator<tree_type >  iter =scene->iterator();
+-  iter.begin();
+-  scene->load_block(iter.index());
+-  boxm_block<tree_type> *block = scene->get_active_block();
+-  block->init_tree(tree);
+-  scene->write_active_block();
+-
+-  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
+-
+-  boxm_scene<tree_type> *scene_out = boxm_crop_scene<float>(scene, bbox);
+-
+-  //check that output scene is correct
+-  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
+-  iter_out.begin();
+-  scene_out->load_block(iter_out.index());
+-  boxm_block<tree_type> *block_out = scene_out->get_active_block();
+-  boct_tree<short, float>  *tree_out= block_out->get_tree();
+-
+-  std::vector<boct_tree_cell<short,float>*> leaves_out = tree_out->leaf_cells();
+-  bool result = true;
+-  for (auto & i : leaves_out)
+-  {
+-    result = result && (std::abs(i->data() - 0.9)< 1e-5);
+-  }
+-
+-  TEST("Valid cropped tree", result, true);
+-
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree_out->all_cells();
+-  if (debug) {
+-    std::cout << "Printing Output Tree" << std::endl;
+-    for (auto & leave : leaves) {
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-
+-  scene->clean_scene();
+-  scene_out->clean_scene();
+-}
+-
+-TESTMAIN(test_boxm_scene_crop);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
+deleted file mode 100644
+index 299ce36aab..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_fill_in_mesh );
+-DECLARE( test_save_scene_raw );
+-DECLARE( test_upload_mesh );
+-DECLARE( test_boxm_fill_internal_cells );
+-DECLARE( test_boxm_scene_crop );
+-DECLARE( test_linear_operations );
+-DECLARE( test_remove_level0 );
+-
+-void register_tests()
+-{
+-  REGISTER( test_fill_in_mesh );
+-  REGISTER( test_save_scene_raw );
+-  REGISTER( test_upload_mesh );
+-  REGISTER( test_boxm_fill_internal_cells );
+-  REGISTER( test_boxm_scene_crop );
+-  REGISTER( test_linear_operations );
+-  REGISTER( test_remove_level0 );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
+deleted file mode 100644
+index 564a5c4359..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
++++ /dev/null
+@@ -1,121 +0,0 @@
+-#include <iostream>
+-#include <limits>
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_fill_in_mesh.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boct/boct_tree_cell.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_fileio.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static void test_fill_in_mesh()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("./boxm_fill_in", "block");
+-  vul_file::make_directory("./boxm_fill_in");
+-  std::ofstream os("scene.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  //// create a mesh
+-  unsigned int num_faces=6;
+-  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(8));
+-  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
+-  imesh_vertex<3>& vert0 = (*verts)[0]; imesh_vertex<3>& vert4 = (*verts)[4];
+-  vert0[0]=2;                           vert4[0]=2;
+-  vert0[1]=2;                           vert4[1]=2;
+-  vert0[2]=4;                           vert4[2]=8;
+-  imesh_vertex<3>& vert1 = (*verts)[1]; imesh_vertex<3>& vert5 = (*verts)[5];
+-  vert1[0]=4;                           vert5[0]=4;
+-  vert1[1]=2;                           vert5[1]=2;
+-  vert1[2]=4;                           vert5[2]=8;
+-  imesh_vertex<3>& vert2 = (*verts)[2]; imesh_vertex<3>& vert6 = (*verts)[6];
+-  vert2[0]=4;                           vert6[0]=4;
+-  vert2[1]=4;                           vert6[1]=4;
+-  vert2[2]=4;                           vert6[2]=8;
+-
+-  imesh_vertex<3>& vert3 = (*verts)[3]; imesh_vertex<3>& vert7 = (*verts)[7];
+-  vert3[0]=2;                           vert7[0]=2;
+-  vert3[1]=4;                           vert7[1]=4;
+-  vert3[2]=4;                           vert7[2]=8;
+-
+-  std::vector<unsigned int> face(4,0);
+-  face[0]=4;face[1]=5;face[2]=6;face[3]=7;
+-  (*faces)[0]=face;
+-  face[0]=3;face[1]=2;face[2]=1;face[3]=0;
+-  (*faces)[1]=face;
+-  face[0]=0;face[1]=4;face[2]=7;face[3]=3;
+-  (*faces)[2]=face;
+-  face[0]=1;face[1]=2;face[2]=6;face[3]=5;
+-  (*faces)[3]=face;
+-  face[0]=1;face[1]=5;face[2]=4;face[3]=0;
+-  (*faces)[4]=face;
+-  face[0]=3;face[1]=7;face[2]=6;face[3]=2;
+-  (*faces)[5]=face;
+-
+-
+-  imesh_mesh mesh;
+-#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
+-  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
+-  mesh.set_vertices(std::move(tempv));
+-  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
+-  mesh.set_faces(std::move(tempf));
+-#else
+-  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
+-  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
+-#endif
+-
+-  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(7,6);
+-    boxm_sample<BOXM_APM_MOG_GREY> s;
+-    s.alpha=std::numeric_limits<float>::max();
+-    tree->init_cells(s);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> val;
+-  val.alpha=0;
+-  std::vector<imesh_mesh> meshes; meshes.push_back(mesh);
+-  boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, meshes, false, val);
+-
+-  std::vector<std::string> fnames;
+-  boxm_block_iterator<tree_type> it(&scene);
+-
+-  // check the first block
+-  scene.load_block(it.index().x(),it.index().y(),it.index().z());
+-  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
+-
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vgl_point_3d<double>(3,3,6));
+-  TEST("Centroid of the mesh is in the octree", cell0->data().alpha, 0.0f);
+-
+-
+-  vpl_rmdir("boxm_fill_in");
+-  vpl_unlink("scene.xml");
+-}
+-
+-TESTMAIN(test_fill_in_mesh);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
+deleted file mode 100644
+index c59d7e8540..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <boxm/algo/boxm_compute_scene_difference.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <boxm/algo/boxm_crop_scene.h>
+-#include <boxm/algo/boxm_fill_in_mesh.h>
+-#include <boxm/algo/boxm_fill_internal_cells.h>
+-#include <boxm/algo/boxm_init_scene.h>
+-#include <boxm/algo/boxm_linear_operations.h>
+-#include <boxm/algo/boxm_merge_mog.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boxm/algo/boxm_save_scene_raw.h>
+-#include <boxm/algo/boxm_save_scene_raw_general.h>
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-#include <boxm/algo/boxm_split_sample.h>
+-#include <boxm/algo/boxm_upload_mesh.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx b/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
+deleted file mode 100644
+index 0e4fe4f91c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
++++ /dev/null
+@@ -1,82 +0,0 @@
+-//:
+-// \file
+-// \brief Test linear combinations of blocks
+-// \author Isabel Restrepo
+-// \date 2-Feb-2011
+-
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/boxm_linear_operations.h>
+-#include "test_utils.h"
+-
+-void test_linear_operations()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
+-  boxm_scene<boct_tree<short, float> > *scene2 = create_scene(2,2,2,true, "test_scene2");
+-
+-  float s1 = 2.0, s2=3.0;
+-  for (unsigned i = 0; i< 2; i++)
+-    for (unsigned j = 0; j < 2; j++)
+-      for (unsigned k = 0; k< 2; k++)
+-      {
+-        scene1->load_block(i,j,k);
+-        scene2->load_block(i,j,k);
+-
+-        boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(i,j,k);
+-        boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(i,j,k);
+-
+-        //The result is block1 = s1*block1+ s2*block2
+-        boxm_linear_combination(block1, block2, s1, s2);
+-
+-        //make sure to write the block back to disk
+-        scene1->write_active_block();
+-
+-        //clean memory
+-        scene1->unload_active_blocks();
+-        scene2->unload_active_blocks();
+-      }
+-
+-
+-  //Test the output scene. Scene1 should contain the result i.e (2*0.8 + 3*0.8) and scene2 should be unchanged
+-  boxm_cell_iterator<boct_tree<short, float> > it1 =
+-  scene1->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it2 =
+-  scene2->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
+-
+-  it1.begin();
+-  it2.begin();
+-  bool result = true;
+-
+-  while ( !(it1.end() || it2.end()) ) {
+-
+-    boct_tree_cell<short,float > *cell1 = *it1;
+-    boct_tree_cell<short,float > *cell2 = *it2;
+-
+-    if (std::abs(cell1->data()- 4.0f) > 1.0e-7){
+-      std::cerr << "Data1 is incorrect: "<< cell1->data()  <<"Error: " << std::abs(cell1->data()- 4.0f) << '\n';
+-      result = false;
+-      break;
+-    }
+-
+-    if (std::abs(cell2->data()- 0.8f) > 1.0e-7){
+-      std::cerr << "Data2 is incorrect: " << cell2->data()<<'\n';
+-      result = false;
+-      break;
+-    }
+-
+-    ++it1;
+-    ++it2;
+-  }
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_linear_operations " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  TEST("Output data is correct", result, true);
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_linear_operations);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx b/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
+deleted file mode 100644
+index 1243faf34f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
++++ /dev/null
+@@ -1,54 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov 23 2011
+-
+-#include <testlib/testlib_test.h>
+-#include "test_utils.h"
+-
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-
+-
+-void test_remove_level0()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
+-
+-  //clone the input scene
+-  boxm_scene<boct_tree<short, float> > *scene2 = new boxm_scene<boct_tree<short, float> >(scene1->lvcs(), scene1->origin(), scene1->block_dim(),
+-                                                                                          scene1->world_dim(), scene1->max_level(), scene1->init_level(),
+-                                                                                          scene1->load_all_blocks(), scene1->save_internal_nodes());
+-
+-  std::stringstream block_pref;
+-  block_pref << scene1->block_prefix() << "_max_level_"  << (scene1->max_level() - 1);
+-  scene2->set_paths(scene1->path(), block_pref.str());
+-  scene2->set_appearance_model(scene1->appearence_model());
+-
+-  std::cout << "Cloning\n";
+-  scene1->clone_blocks(*scene2);
+-  std::cout << "Restructuring\n";
+-  boxm_remove_level_0_leaves(scene2);
+-  std::cout << "Done\n";
+-
+-  //Show contents of the scenes scene
+-  boxm_block_iterator<boct_tree<short, float> > it1 = scene1->iterator();
+-  boxm_block_iterator<boct_tree<short, float> > it2 = scene2->iterator();
+-  for (it1.begin(), it2.begin(); !it1.end() && !it2.end(); ++it1, ++it2)
+-  {
+-    scene1->load_block(it1.index());
+-    scene2->load_block(it2.index());
+-
+-    boxm_block<boct_tree<short, float> > *block1 = scene1->get_active_block();
+-    boxm_block<boct_tree<short, float> > *block2 = scene2->get_active_block();
+-
+-    block1->get_tree()->print();
+-    block2->get_tree()->print();
+-  }
+-
+-  scene1->unload_active_blocks();
+-  scene2->unload_active_blocks();
+-}
+-
+-
+-TESTMAIN(test_remove_level0);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx b/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
+deleted file mode 100644
+index 62b425171a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
++++ /dev/null
+@@ -1,122 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_save_scene_raw.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boct/boct_tree_cell.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_lvcs.h>
+-
+-static int test_save_scene_raw()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(5,5,5);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("boxm_scene1", "block");
+-  vul_file::make_directory("boxm_scene1");
+-  std::ofstream os("scene1.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  unsigned max_level=10, init_level=3;
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
+-
+-
+-  float count=0.1f;
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree;
+-    if (iter.index().x()==0 && iter.index().y()==0 && iter.index().z()==0) {
+-      tree = new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level);
+-    }
+-    else {
+-      tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level-1);
+-    }
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.9));
+-    s2_sample.alpha=count;
+-
+-    cel11->set_data(s2_sample);
+-    //boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.51));
+-    //cell2->set_data(s2_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-    count+=0.1f;
+-  }
+-
+-
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
+-
+-  float thresh=0.02f;
+-  bool reset=false;
+-  for (unsigned i=0; i<10; i++) {
+-    boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, thresh, reset);
+-    boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene, "scene.raw", 0);
+-#ifdef DEBUG_LEAKS
+-    std::cerr << "Leaks at test_save_scene_raw " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-  }
+-
+-  SUMMARY();
+-}
+-
+-TESTMAIN(test_save_scene_raw);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
+deleted file mode 100644
+index ced456755e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
++++ /dev/null
+@@ -1,127 +0,0 @@
+-#include <iostream>
+-#include <limits>
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_upload_mesh.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boct/boct_tree_cell.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_fileio.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static void test_upload_mesh()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-
+-#if 0
+-  if (vul_file_is_directory("./boxm_upload"))
+-  {
+-    vul_file_iterator fiter("./boxm_upload/*");
+-    while (!fiter)
+-    {
+-      vpl_unlink(fiter());
+-      fiter++;
+-    }
+-    vpl_rmdir("./boxm_upload");
+-  }
+-#endif // 0
+-
+-  scene.set_paths("./boxm_upload", "block");
+-  vul_file::make_directory("./boxm_upload");
+-  std::ofstream os("scene.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  // create a mesh
+-  unsigned int num_faces=1;
+-  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(3));
+-  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
+-  imesh_vertex<3>& vert0 = (*verts)[0];
+-  vert0[0]=2;
+-  vert0[1]=2;
+-  vert0[2]=4;
+-  imesh_vertex<3>& vert1 = (*verts)[1];
+-  vert1[0]=8;
+-  vert1[1]=2;
+-  vert1[2]=4;
+-  imesh_vertex<3>& vert2 = (*verts)[2];
+-  vert2[0]=8;
+-  vert2[1]=8;
+-  vert2[2]=4;
+-
+-  for (unsigned int f=0; f<num_faces; ++f) {
+-    std::vector<unsigned int>& face = (*faces)[f];
+-    unsigned int cnt=3;
+-    face.resize(cnt,0);
+-    for (unsigned int v=0; v<cnt; ++v)
+-      face[v]=v;
+-  }
+-  imesh_mesh mesh;
+-#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
+-  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
+-  mesh.set_vertices(std::move(tempv));
+-  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
+-  mesh.set_faces(std::move(tempf));
+-#else
+-  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
+-  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
+-#endif
+-
+-  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(6,5);
+-    boxm_sample<BOXM_APM_MOG_GREY> s;
+-    s.alpha=std::numeric_limits<float>::max();
+-    tree->init_cells(s);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> val;
+-  val.alpha=0;
+-  boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, mesh, false, val);
+-
+-  std::vector<std::string> fnames;
+-  boxm_block_iterator<tree_type> it(&scene);
+-  it.begin();
+-  // check the first block
+-  scene.load_block(it.index().x(),it.index().y(),it.index().z());
+-  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vert0.operator vgl_point_3d<double>());
+-  TEST("Vertex 0 is in the octree", cell0->data().alpha, 0.0f);
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell1 = tree->locate_point_global(vert1.operator vgl_point_3d<double>());
+-  TEST("Vertex 1 is in the octree", cell1->data().alpha, 0.0f);
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2 = tree->locate_point_global(vert2.operator vgl_point_3d<double>());
+-  TEST("Vertex 2 is in the octree", cell2->data().alpha, 0.0f);
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell = tree->locate_point_global(vgl_point_3d<double>(1,1,1));
+-  TEST_NEAR("A non-polygon point should be non-zero", cell->data().alpha, std::numeric_limits<float>::max(), 1e-6);
+-
+-  vpl_rmdir("./boxm_upload");
+-  vpl_unlink("./scene.xml");
+-}
+-
+-TESTMAIN(test_upload_mesh);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx b/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
+deleted file mode 100644
+index f286501eee..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#include "test_utils.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Aug-2010
+-
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-#include <utility>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i)
+-{
+-  tree-> split(); //now we have 8 cells
+-  //tree->print();
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  leaves[i]->set_data(0.8f);
+-  leaves[i]->split();
+-}
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz, bool uniform, std::string scene_name)
+-{
+-  //crete the input scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-
+-  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
+-
+-    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
+-
+-  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path("./");
+-  scene->set_paths(scene_path,  std::move(scene_name));
+-
+-  unsigned cell_index = 7;
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene->load_block(iter.index());
+-    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
+-    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
+-
+-    float init_val = 0.5f;
+-    if (uniform)
+-      init_val = 0.8f;
+-
+-    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
+-    //tree->print();
+-    init_tree(tree, cell_index);
+-    //tree->print();
+-    block->init_tree(tree);
+-    scene->write_active_block();
+-    if (cell_index == 0) cell_index = 7;
+-    cell_index--;
+-    ++iter;
+-  }
+-  return scene;
+-}
+-
+-void clean_up()
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());
+-    vul_file::delete_file_glob(file_it());
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.h b/contrib/brl/bseg/boxm/algo/tests/test_utils.h
+deleted file mode 100644
+index f646d0b390..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_utils.h
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#ifndef boxm_algo_test_utils_h_
+-#define boxm_algo_test_utils_h_
+-//:
+-// \file
+-// \brief  A file containing utility functions for other tests
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <boxm/boxm_scene.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i);
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
+-                                                   bool uniform = false, std::string scene_name = "test_scene");
+-
+-void clean_up();
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/CMakeLists.txt
+deleted file mode 100644
+index a5e13d6975..0000000000
+--- a/contrib/brl/bseg/boxm/basic/CMakeLists.txt
++++ /dev/null
+@@ -1,21 +0,0 @@
+-# brl/bseg/boxm/basic/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_basic_sources
+-    boxm_block_vis_graph_iterator.h     boxm_block_vis_graph_iterator.hxx
+-    boxm_block_vis_graph_node.h
+-    boxm_cell_vis_graph_iterator.h      boxm_cell_vis_graph_iterator.hxx
+-    boxm_raytrace_function.h
+-    boxm_seg_length_functor.h
+-    boxm_num_rays_functor.h
+-    boxm_util_data_types.h boxm_util_data_types.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_basic_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_basic LIBRARY_SOURCES ${boxm_basic_sources})
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_basic boxm boxm_util boxm_sample boxm_sample_algo boct ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index b4bce045ed..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_scene.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+deleted file mode 100644
+index 4129f1a830..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,float >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 450ee3e72c..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,int>  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 2cd39a3534..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <vgl/vgl_point_3d.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index 60ef86952b..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index d4a5a0384f..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boct_tree<short, boxm_edge_tangent_sample<float> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short, boxm_inf_line_sample<float> > aux_tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type);
+-
+-typedef boct_tree<short, float > aux_tree_type2;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type2);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index 10b6aa91a5..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 72ebcd47fb..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index 0fcf5fd35c..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 3ad032ddf2..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 9ee11b98ea..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index c2743dff25..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_node.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index fb158b16d1..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_sample<float>);
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index b561f8e125..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_tangent_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
+deleted file mode 100644
+index 343941bf71..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_inf_line_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index 69a4394c0b..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 2bf0739edf..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+deleted file mode 100644
+index 29aadb8cb1..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index ed5b966521..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
+deleted file mode 100644
+index c961518029..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,vgl_point_3d<double>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx b/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
+deleted file mode 100644
+index 84a7a2e75f..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-BRDB_VALUE_INSTANTIATE(boxm_array_1d_float_sptr,"boxm_array_1d_float_sptr");
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
+deleted file mode 100644
+index d887b99938..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
+deleted file mode 100644
+index 2a77fe6767..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <vbl/vbl_smart_ptr.hxx>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-VBL_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
+deleted file mode 100644
+index 70f36b1047..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#ifndef boxm_block_vis_graph_iterator_h_
+-#define boxm_block_vis_graph_iterator_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include <map>
+-#include "boxm_block_vis_graph_node.h"
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T>
+-class boxm_block_vis_graph_iterator
+-{
+- public:
+-  boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam, boxm_scene<T>* scene,
+-                                unsigned img_ni, unsigned img_nj, bool rev_iter=false);
+-
+-  ~boxm_block_vis_graph_iterator()= default;
+-
+-  bool next();
+-
+-  std::vector<boxm_block<T>*> frontier_blocks();
+-
+-  std::vector<vgl_point_3d<int> > frontier_indices() const {return to_process_indices_; }
+-
+-  void set_reverse_iter(bool reverse) { reverse_it_ = reverse; }
+-
+- private:
+-
+-  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
+-
+-  //: visibility graph, indexed by the block indices
+-  vis_graph_type vis_graph_;
+-
+-  //: blocks that can be seen by the camera unoccluded
+-  std::vector<typename vis_graph_type::iterator> curr_blocks_;
+-
+-  std::vector<vgl_point_3d<int> > to_process_indices_;
+-
+-  //: the camera
+-  vpgl_camera_double_sptr camera_;
+-
+-  boxm_scene<T>* scene_;
+-
+-  bool reverse_it_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
+deleted file mode 100644
+index 4baa6d8992..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
++++ /dev/null
+@@ -1,173 +0,0 @@
+-#ifndef boxm_block_vis_graph_iterator_hxx_
+-#define boxm_block_vis_graph_iterator_hxx_
+-
+-#include "boxm_block_vis_graph_iterator.h"
+-#include "boxm_block_vis_graph_node.h"
+-#include <boxm/util/boxm_utils.h>
+-#include <boct/boct_tree_cell.h>
+-
+-template <class T>
+-boxm_block_vis_graph_iterator<T>::boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam,
+-                                                                boxm_scene<T>* scene,
+-                                                                unsigned img_ni,
+-                                                                unsigned img_nj,
+-                                                                bool rev_iter)
+-    : camera_(cam), scene_(scene), reverse_it_(rev_iter)
+-{
+-  // compute the visibility graph
+-  boxm_block_iterator<T> iter = scene->iterator();
+-  for (; !iter.end(); iter++) {
+-    boxm_block<T>* block = *iter;
+-    if (boxm_utils::is_visible(block->bounding_box(), cam, img_ni, img_nj))
+-      vis_graph_.insert(std::make_pair<vgl_point_3d<int>,boxm_block_vis_graph_node<T> >(iter.index(),boxm_block_vis_graph_node<T>()));
+-  }
+-
+-  typename vis_graph_type::iterator vis_iter;
+-  for (vis_iter=vis_graph_.begin(); vis_iter!=vis_graph_.end(); vis_iter++) {
+-    vgl_point_3d<int> idx = vis_iter->first;
+-    boxm_block<T>* block = scene->get_block(idx);
+-    boct_face_idx vis_faces = boxm_utils::visible_faces(block->bounding_box(), cam);
+-
+-    vgl_point_3d<int> neighbor_idx = vis_iter->first;
+-    bool face_in = false;
+-    if (vis_faces & X_HIGH) {
+-      // check for neighbor on X_HIGH face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(1,0,0);
+-      face_in = true;
+-    } else if (vis_faces & X_LOW) {
+-      // check for neighbor on X_LOW face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(1,0,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
+-      face_in = true;
+-    }
+-
+-    if (face_in) {
+-      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
+-      if (nit == vis_graph_.end()) {
+-        vis_iter->second.in_count++;
+-        curr_blocks_.push_back(vis_iter);
+-      } else {
+-        vis_iter->second.in_count++;
+-        nit->second.out_links.push_back(vis_iter);
+-      }
+-    }
+-
+-    face_in = false;
+-    neighbor_idx = vis_iter->first;
+-    if (vis_faces & Y_HIGH) {
+-      // check for neighbor on Y_HIGH face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,1,0);
+-      face_in = true;
+-    } else if (vis_faces & Y_LOW) {
+-      // check for neighbor on Y_LOW face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,1,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
+-      face_in = true;
+-    }
+-
+-    if (face_in) {
+-      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
+-      if (nit == vis_graph_.end()) {
+-        vis_iter->second.in_count++;
+-        curr_blocks_.push_back(vis_iter);
+-      } else {
+-        vis_iter->second.in_count++;
+-        nit->second.out_links.push_back(vis_iter);
+-      }
+-    }
+-
+-    face_in=false;
+-    neighbor_idx = vis_iter->first;
+-    if (vis_faces & Z_HIGH) {
+-      // check for neighbor on Z_HIGH face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,0,1);
+-      face_in = true;
+-    }else if (vis_faces & Z_LOW) {
+-      // check for neighbor on Y_LOW face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,0,1);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
+-      face_in = true;
+-     }
+-
+-    if (face_in) {
+-      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
+-      if (nit == vis_graph_.end()) {
+-        vis_iter->second.in_count++;
+-        curr_blocks_.push_back(vis_iter);
+-      }
+-      else {
+-        vis_iter->second.in_count++;
+-        nit->second.out_links.push_back(vis_iter);
+-      }
+-    }
+-  }
+-}
+-
+-template <class T>
+-bool boxm_block_vis_graph_iterator<T>::next()
+-{
+-  typename std::vector<typename vis_graph_type::iterator>::iterator block_iter = curr_blocks_.begin();
+-  std::vector<typename vis_graph_type::iterator> to_process;
+-
+-  for (; block_iter != curr_blocks_.end(); block_iter++) {
+-    //std::cout << (*block_iter)->first;
+-    //std::cout << (*block_iter)->second.in_count << std::endl;
+-    if (--((*block_iter)->second.in_count) == 0)
+-      to_process.push_back(*block_iter);
+-  }
+-
+-  if (to_process.size() == 0) {
+-    to_process_indices_.resize(0);
+-    return false;
+-  }
+-  to_process_indices_.resize(to_process.size());
+-
+-  std::vector<vgl_point_3d<int> >::iterator to_proc_it = to_process_indices_.begin();
+-  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter, ++to_proc_it) {
+-    *to_proc_it = (*block_iter)->first;
+-  }
+-
+-  // add linked blocks to list for next iteration
+-  curr_blocks_.clear();
+-  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter) {
+-    std::vector<typename vis_graph_type::iterator > &links = (*block_iter)->second.out_links;
+-    typename std::vector<typename vis_graph_type::iterator >::iterator neighbor_it = links.begin();
+-    for (; neighbor_it != links.end(); ++neighbor_it) {
+-      curr_blocks_.push_back(*neighbor_it);
+-    }
+-  }
+-  return true;
+-}
+-
+-template <class T>
+-std::vector<boxm_block<T>*> boxm_block_vis_graph_iterator<T>::frontier_blocks()
+-{
+-  std::vector<boxm_block<T>*> frontier;
+-
+-  std::vector<vgl_point_3d<int> > blocks = to_process_indices_;
+-  for (auto index : blocks) {
+-    frontier.push_back(scene_->get_block(index)); //.x(), index.y(), index.z());
+-  }
+-
+-  return frontier;
+-}
+-
+-#define BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(T) \
+-template class boxm_block_vis_graph_iterator<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
+deleted file mode 100644
+index 1d615b1477..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
++++ /dev/null
+@@ -1,52 +0,0 @@
+-#ifndef boxm_block_vis_graph_node_h_
+-#define boxm_block_vis_graph_node_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include <map>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vgl/vgl_point_3d.h>
+-
+-//: A comparison functor for vgl_point_3d's. Needed to create a std::set of vgl_point_3d<int>'s.
+-template <class T>
+-class vgl_point_3d_cmp
+-{
+- public:
+-  vgl_point_3d_cmp() = default;
+-
+-  bool operator()(vgl_point_3d<T> const& v0, vgl_point_3d<T> const& v1) const
+-  {
+-    if (v0.z() != v1.z())
+-      return v0.z() < v1.z();
+-    else if (v0.y() != v1.y())
+-      return v0.y() < v1.y();
+-    else
+-      return v0.x() < v1.x();
+-  }
+-};
+-
+-template <class T>
+-class boxm_block_vis_graph_node
+-{
+- public:
+-  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
+-
+-  boxm_block_vis_graph_node() : in_count(0) {}
+-  ~boxm_block_vis_graph_node()= default;
+-
+-  int dec_in_count() { return --in_count; }
+-
+-  //: the number of incoming edges to this node
+-  int in_count;
+-
+-  //: graph links to the outgoing blocks
+-  std::vector<typename vis_graph_type::iterator> out_links;
+-};
+-
+-#define BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(T) \
+-template class boxm_block_vis_graph_node<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
+deleted file mode 100644
+index 6bc8372e16..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#ifndef boxm_cell_vis_graph_iterator_h_
+-#define boxm_cell_vis_graph_iterator_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <vector>
+-#include <boct/boct_tree_cell.h>
+-#include <boct/boct_tree.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-class boxm_cell_vis_graph_iterator
+-{
+- public:
+-  boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
+-                               boct_tree<T_loc,T_data>* tree,
+-                               unsigned img_ni,
+-                               unsigned img_nj);
+-
+-  ~boxm_cell_vis_graph_iterator() = default;
+-
+-  bool next();
+-
+-  std::vector<boct_tree_cell<T_loc,T_data>*> frontier() { return frontier_; }
+-
+-  void set_reverse_iter(bool reverse) { reverse_iter_ = reverse; }
+-
+- private:
+-  //: the camera
+-  vpgl_camera_double_sptr camera_;
+-
+-  //: blocks that can be seen by the camera unoccluded
+-  std::vector<boct_tree_cell<T_loc,T_data>*> frontier_;
+-  std::vector<boct_tree_cell<T_loc,T_data>*> curr_cells_;
+-  bool reverse_iter_;
+-
+-  unsigned img_ni_;
+-  unsigned img_nj_;
+-
+-  //: recursive function
+-  void check_cell_visibility(boct_tree<T_loc,T_data>* tree,
+-                             boct_tree_cell<T_loc,T_data>* tree_cell);
+-
+-  void form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,
+-                           boct_face_idx face_idx,
+-                           boct_tree<T_loc,T_data>* tree);
+-
+-  std::vector<boct_tree_cell<T_loc,T_data>* > list_of_vis_nodes_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
+deleted file mode 100644
+index 4108982a68..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
++++ /dev/null
+@@ -1,131 +0,0 @@
+-#ifndef boxm_cell_vis_graph_iterator_hxx_
+-#define boxm_cell_vis_graph_iterator_hxx_
+-
+-#include "boxm_cell_vis_graph_iterator.h"
+-#include <boxm/util/boxm_utils.h>
+-
+-template <class T_loc,class T_data>
+-boxm_cell_vis_graph_iterator<T_loc,T_data>::boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
+-                                                                         boct_tree<T_loc,T_data>* tree,
+-                                                                         unsigned img_ni,
+-                                                                         unsigned img_nj) : camera_(cam),img_ni_(img_ni), img_nj_(img_nj)
+-{
+-  if (!tree)
+-  {
+-   std::cout<<"No Tree found"<<std::endl;
+-  }
+-  else
+-  {
+-    list_of_vis_nodes_.clear();
+-    // check if each node is visible or notr
+-    check_cell_visibility(tree,tree->root());
+-    // compute the visibility graph
+-    for (unsigned i=0;i<list_of_vis_nodes_.size();i++)
+-    {
+-      boct_face_idx vis_faces = boxm_utils::visible_faces(tree->cell_bounding_box(list_of_vis_nodes_[i]), cam);
+-      if (vis_faces & ::X_HIGH) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],X_HIGH,tree);
+-      }
+-      else if (vis_faces & ::X_LOW) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],X_LOW,tree);
+-      }
+-      if (vis_faces & ::Y_HIGH) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Y_HIGH,tree);
+-      }
+-      else if (vis_faces & ::Y_LOW) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Y_LOW,tree);
+-      }
+-      if (vis_faces & ::Z_HIGH) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Z_HIGH,tree);
+-      }
+-      else if (vis_faces & ::Z_LOW) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Z_LOW,tree);
+-      }
+-    }
+-    list_of_vis_nodes_.clear();
+-  }
+-}
+-
+-template <class T_loc,class T_data>
+-bool boxm_cell_vis_graph_iterator<T_loc,T_data>::next()
+-{
+-  std::vector<boct_tree_cell<T_loc,T_data>* > to_process;
+-  std::vector<boct_tree_cell<T_loc,T_data>* > to_process_refine;
+-
+-  typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator cell_it = curr_cells_.begin();
+-  for (; cell_it != curr_cells_.end(); ++cell_it) {
+-    // decrement each cell's count in list. if count == 0, add to list of nodes to process
+-    if (--((*cell_it)->vis_node()->incoming_count) == 0) {
+-      to_process.push_back(*cell_it);
+-    }
+-  }
+-  if (to_process.size() == 0) {
+-    return false;
+-  }
+-   frontier_.clear();
+-
+-  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
+-    frontier_.push_back((*cell_it));
+-  }
+-  // add linked cells to list for next iteration
+-  curr_cells_.clear();
+-  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
+-    std::vector<boct_tree_cell<T_loc,T_data>* > links = (*cell_it)->vis_node()->outgoing_links;
+-    typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator neighbor_it = links.begin();
+-    for (; neighbor_it != links.end(); ++neighbor_it) {
+-      curr_cells_.push_back(*neighbor_it);
+-    }
+-  }
+-  return true;
+-}
+-
+-template<class T_loc,class T_data>
+-void boxm_cell_vis_graph_iterator<T_loc,T_data>::check_cell_visibility(boct_tree<T_loc,T_data>* tree,
+-                                                                       boct_tree_cell<T_loc,T_data>* tree_cell)
+-{
+-  vgl_box_3d<double> bbox=tree->cell_bounding_box(tree_cell);
+-  if (boxm_utils::is_visible(bbox, camera_,img_ni_, img_nj_, true))
+-  {
+-    // base case for recursion
+-    if (tree_cell->is_leaf())
+-    {
+-      boct_cell_vis_graph_node<T_loc,T_data> * node=new boct_cell_vis_graph_node<T_loc,T_data>();
+-      node->visible=true;
+-      tree_cell->set_vis_node(node);
+-      list_of_vis_nodes_.push_back(tree_cell);
+-    }
+-    else
+-    {
+-      boct_tree_cell<T_loc,T_data>* children = tree_cell->children();
+-      for (unsigned i=0; i<8; i++)
+-      check_cell_visibility(tree,&children[i]);
+-    }
+-  }
+-}
+-
+-template<class T_loc,class T_data>
+-void boxm_cell_vis_graph_iterator<T_loc,T_data>::form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,boct_face_idx face_idx,boct_tree<T_loc,T_data>* tree)
+-{
+-  boct_cell_vis_graph_node<T_loc,T_data>* vis_node=cell->vis_node();
+-  std::vector<boct_tree_cell<T_loc,T_data>*> neighbors;
+-  cell->find_neighbors(face_idx, neighbors,tree->root_level());
+-  typename std::vector<boct_tree_cell<T_loc,T_data>*>::iterator neighbor_it = neighbors.begin();
+-  bool visible_neighbors=false;
+-  for (; neighbor_it != neighbors.end(); ++neighbor_it) {
+-    boct_cell_vis_graph_node<T_loc,T_data>* neighbor_vis_node=(*neighbor_it)->vis_node();
+-    if (neighbor_vis_node) {
+-      vis_node->incoming_count++;
+-      neighbor_vis_node->outgoing_links.push_back(cell);
+-      visible_neighbors=true;
+-    }
+-  }
+-  if (!visible_neighbors) {
+-    vis_node->incoming_count++;
+-    curr_cells_.push_back(cell);
+-  }
+-}
+-
+-#define BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(T1,T2) \
+-template class boxm_cell_vis_graph_iterator<T1,T2 >
+-
+-#endif // boxm_cell_vis_graph_iterator_hxx_
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h b/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
+deleted file mode 100644
+index 98703eec22..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
++++ /dev/null
+@@ -1,44 +0,0 @@
+-#ifndef boxm_num_rays_functor_h
+-#define boxm_num_rays_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_histogram.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include "boxm_raytrace_function.h"
+-
+-//: this functor is to compute no of rays passing through a cell
+-// Works for boxm_scalar_sample
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_num_rays_functor
+-{
+- public:
+-  boxm_num_rays_functor()
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int /*i*/, unsigned int /*j*/,  // FIXME: both unused!
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> & /*cell_value*/,       // FIXME: unused...
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-
+-    aux_val.scalar_sum_+=1;
+-    //std::cout<<aux_val.scalar_sum_<<' ';
+-    aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h b/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
+deleted file mode 100644
+index 88897fd462..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
++++ /dev/null
+@@ -1,618 +0,0 @@
+-#ifndef boxm_raytrace_function_h_
+-#define boxm_raytrace_function_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vpgl/vpgl_affine_camera.h>
+-#include <vpgl/algo/vpgl_backproject.h>
+-#include <vpgl/algo/vpgl_ray.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/vgl_homg_point_2d.h>
+-#include <vgl/vgl_line_3d_2_points.h>
+-
+-#include <vul/vul_timer.h>
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<class F, class T_loc, class T_data, class T_aux = typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype>
+-class boxm_raytrace_function
+-{
+-  // null scene used as placeholder for operations that don't require an auxiliary scene
+-  boxm_aux_scene<T_loc, T_data, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> null_scene_;
+-
+- public:
+-    typedef boct_tree<T_loc,T_data> tree_type;
+-    typedef boct_tree<T_loc,T_aux> aux_tree_type;
+-    typedef boct_tree_cell<T_loc,T_data> cell_type;
+-
+-    //: constructor for functions with no auxiliary scene needed
+-    boxm_raytrace_function(boxm_scene<tree_type> &scene,
+-                           vpgl_camera_double_sptr cam,
+-                           unsigned int ni, unsigned int nj,
+-                           bool reverse_traversal = false,
+-                           unsigned int i0 = 0, unsigned int j0 = 0
+-                          )
+-    : scene_(scene), aux_scene_(null_scene_), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
+-
+-    //: constructor for functions using an auxiliary scene
+-    boxm_raytrace_function(boxm_scene<tree_type> &scene,
+-                           boxm_aux_scene<T_loc, T_data,  T_aux> &aux_scene,
+-                           vpgl_camera_double_sptr cam,
+-                           unsigned int ni, unsigned int nj,
+-                           bool reverse_traversal = false,
+-                           unsigned int i0 = 0, unsigned int j0 = 0)
+-    : scene_(scene), aux_scene_(aux_scene), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
+-
+-    bool run_single_ray(F& step_functor,float i, float j)
+-    {
+-        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
+-        continue_trace.fill(true);
+-        // code to iterate over the blocks in order of visibility
+-        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
+-        while (block_vis_iter.next())
+-        {
+-            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-            for (unsigned i=0; i<block_indices.size(); i++) // code for each block
+-            {
+-                scene_.load_block(block_indices[i]);
+-                boxm_block<tree_type> * curr_block=scene_.get_active_block();
+-                boxm_block<aux_tree_type> * curr_aux_block=NULL;
+-                if (step_functor.is_aux_)
+-                    curr_aux_block=aux_scene_.get_block(block_indices[i]);
+-
+-                if (debug_lvl_ > 0)
+-                    std::cout << "processing block at index (" <<block_indices[i] << ')' << std::endl;
+-                // make sure block projects to inside of image
+-                vgl_box_3d<double> block_bb = curr_block->bounding_box();
+-
+-                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
+-                    continue;
+-
+-
+-                vgl_box_2d<double> img_bb;
+-
+-                // initialize ray_origin() function for this block
+-                if (!generate_ray_init(block_bb, img_bb)) {
+-                    continue;
+-                }
+-                tree_type * tree=curr_block->get_tree();
+-
+-                aux_tree_type * aux_tree=NULL;
+-                if (step_functor.is_aux_)
+-                {
+-                    aux_tree=curr_aux_block->get_tree();
+-                }
+-
+-                 // get direction of vector and enter point - this depends on which camera type we have
+-                vgl_point_3d<double> ray_origin;
+-                vgl_vector_3d<double> direction;
+-                vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
+-                std::vector<vgl_point_3d<double> > plane_intersections(6);
+-                // add 0.5 to get center of pixel
+-                generate_ray(i , j, block_bb, ray_origin, direction);
+-
+-                // compute intersection of each plane with ray
+-                double lambda[6];
+-                lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
+-                lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
+-                lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
+-                lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
+-                lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
+-                lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
+-
+-                if (block_bb.contains(ray_origin))
+-                    enter_pt=ray_origin;
+-                else
+-                {
+-                    for (unsigned int face=0; face<6; ++face) {
+-                        plane_intersections[face] = ray_origin + (direction * lambda[face]);
+-                    }
+-
+-                    // determine which point is the entrance point based on direction
+-                    const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
+-                    if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
+-                        (direction.z() < -epsilon) )
+-                    {
+-                        // ray intersects the zmax plane
+-                        // check zmax first since it is probably the most common
+-                        enter_pt = plane_intersections[5];
+-                    }
+-                    else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
+-                        (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
+-                        (direction.x() > epsilon) )
+-                    {
+-                        // ray intersects the xmin plane
+-                        enter_pt = plane_intersections[0];
+-                    }
+-                    else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
+-                        (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
+-                        (direction.x() < -epsilon) )
+-                    {
+-                        // ray intersects the xmax plane
+-                        enter_pt = plane_intersections[1];
+-                    }
+-                    else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
+-                        (direction.y() > epsilon) )
+-                    {
+-                        // ray intersects the ymin plane
+-                        enter_pt = plane_intersections[2];
+-                    }
+-                    else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
+-                        (direction.y() < -epsilon) )
+-                    {
+-                        // ray intersects the ymax plane
+-                        enter_pt = plane_intersections[3];
+-                    }
+-                    else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
+-                        (direction.z() > epsilon) )
+-                    {
+-                        // ray intersects the zmin plane
+-                        enter_pt = plane_intersections[4];
+-                    }
+-                    else {
+-                        // no entry point into this block found
+-                        continue;
+-                    }
+-                }
+-                boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(enter_pt);
+-                while (true)
+-                {
+-                    boct_loc_code<T_loc> cell_code(curr_cell->get_code());
+-
+-                    boct_tree_cell<T_loc,T_aux > * curr_aux_cell=NULL;
+-                    if (step_functor.is_aux_)
+-                        curr_aux_cell=aux_tree->get_cell(cell_code);
+-                    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
+-                    // find exit point of cell
+-                    vgl_point_3d<double> exit_pt;
+-                    double lambda=0;
+-                    boct_face_idx face_id=NONE;
+-                    bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
+-                    if (!found_exit) {
+-                        std::cerr << "error: could not find cell exit point\n"
+-                                 << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
+-                                 << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
+-                                 << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
+-                                 << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
+-                        assert(found_exit);
+-                        break;
+-                    }
+-                    T_data cell_val=curr_cell->data();
+-                    T_aux aux_val;
+-                    if (step_functor.is_aux_)
+-                        aux_val=curr_aux_cell->data();
+-                    continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(enter_pt, exit_pt, cell_val,aux_val);
+-                    curr_cell->set_data(cell_val);
+-                    if (step_functor.is_aux_)
+-                        curr_aux_cell->set_data(aux_val);
+-                    // normalize the point to [0-1]to obtain the index.
+-                    vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
+-                                                      (exit_pt.y()-block_bb.min_y())/block_bb.height(),
+-                                                      (exit_pt.z()-block_bb.min_z())/block_bb.depth());
+-                    // obtain the code for the exit point
+-                    boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level());
+-                    cell_type *neighborcell=NULL;
+-                    if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
+-                        curr_cell=neighborcell->traverse_force(exit_loc_code);
+-                    else
+-                    {
+-                        std::cerr << "NO NEIGHBORS FOUND!\n";
+-                        break;
+-                    }
+-                    enter_pt=exit_pt;
+-                }
+-                if (!step_functor.scene_read_only_)
+-                    scene_.write_active_block();
+-                if (step_functor.is_aux_)
+-                    aux_scene_.write_active_block();
+-            }
+-        }
+-        scene_.unload_active_blocks();
+-        aux_scene_.unload_active_blocks();
+-        return true;
+-    }
+-
+-    bool run(F& step_functor)
+-    {
+-        vul_timer timer;
+-        float total_load_time = 0.0f;
+-        float total_compute_time = 0.0f;
+-        float total_save_time = 0.0f;
+-        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
+-        continue_trace.fill(true);
+-        // code to iterate over the blocks in order of visibility
+-        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
+-        while (block_vis_iter.next())
+-        {
+-            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-            for (auto & block_indice : block_indices) // code for each block
+-            {
+-                timer.mark();
+-                scene_.load_block(block_indice);
+-                boxm_block<tree_type> * curr_block=scene_.get_active_block();
+-
+-                if (debug_lvl_ > 0)
+-                    std::cout << "processing block at index (" <<block_indice << ')' << std::endl;
+-                // make sure block projects to inside of image
+-                vgl_box_3d<double> block_bb = curr_block->bounding_box();
+-
+-                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
+-                    continue;
+-                vgl_box_2d<double> img_bb;
+-                // initialize ray_origin() function for this block
+-                if (!generate_ray_init(block_bb, img_bb)) {
+-                    continue;
+-                }
+-
+-                tree_type * tree=curr_block->get_tree();
+-
+-                boxm_block<aux_tree_type> * curr_aux_block=nullptr;
+-                aux_tree_type * aux_tree=nullptr;
+-                if (step_functor.is_aux_)
+-                {
+-                   curr_aux_block=aux_scene_.get_block(block_indice);
+-                   aux_tree=curr_aux_block->get_tree();
+-                }
+-                float load_time = (float)timer.all() / 1e3f;
+-                total_load_time += load_time;
+-                timer.mark();
+-                // for each image pixel
+-                for (unsigned int i = int(img_bb.min_x()+0.99); i <= img_bb.max_x(); ++i)
+-                {
+-                    if (debug_lvl_ > 1) {
+-                        if (!(i % 10))
+-                            std::cout << '.';
+-                    }
+-                    for (unsigned int j = int(img_bb.min_y()+0.99); j <= img_bb.max_y(); ++j)
+-                    {
+-                        if (!continue_trace(i - img_i0_ , j - img_j0_)) {
+-                            continue;
+-                        }
+-                        // get direction of vector and enter point - this depends on which camera type we have
+-                        vgl_point_3d<double> ray_origin;
+-                        vgl_vector_3d<double>direction;
+-                        vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
+-                        vgl_point_3d<double> exit_pt;
+-                        // add 0.5 to get center of pixel
+-                        generate_ray((float)i + 0.5f, (float)j + 0.5f, block_bb, ray_origin, direction);
+-                        if (!entry_point(block_bb,ray_origin,direction,enter_pt))
+-                            continue;
+-                        // normalize the entry point to [0,1]
+-                        vgl_point_3d<double> enter_pt_norm((enter_pt.x()-block_bb.min_x())/block_bb.width(),
+-                                                           (enter_pt.y()-block_bb.min_y())/block_bb.height(),
+-                                                           (enter_pt.z()-block_bb.min_z())/block_bb.depth());
+-                        boct_loc_code<T_loc> curr_cell_code(enter_pt_norm,tree->root_level());
+-                        boct_tree_cell<T_loc,T_data > * curr_cell=tree->root()->traverse_force(curr_cell_code);
+-
+-                        boct_tree_cell<T_loc, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> aux_cell_null;
+-
+-                        while (continue_trace(i-img_i0_, j-img_j0_))
+-                        {
+-                            boct_tree_cell<T_loc,T_aux > *curr_aux_cell= reinterpret_cast<boct_tree_cell<T_loc,T_aux>*>(&aux_cell_null);
+-                            if (step_functor.is_aux_)
+-                            {
+-                                boct_loc_code<T_loc> cell_code(curr_cell->get_code());
+-                                curr_aux_cell=aux_tree->get_cell(cell_code);
+-                            }
+-                            // get the canonical bounding box
+-                            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
+-                            // find exit point of cell
+-
+-                            double lambda=0;
+-                            boct_face_idx face_id=NONE;
+-                            bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
+-                            if (!found_exit) {
+-                                std::cerr << "error: could not find cell exit point\n"
+-                                         << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
+-                                         << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
+-                                         << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
+-                                         << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
+-                                assert(found_exit);
+-                                break;
+-                            }
+-                            T_data cell_val=curr_cell->data();
+-                            T_aux aux_val=curr_aux_cell->data();
+-
+-
+-                            continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(i,j, enter_pt, exit_pt, cell_val,aux_val);
+-
+-                            curr_cell->set_data(cell_val);
+-                            if (step_functor.is_aux_)
+-                                curr_aux_cell->set_data(aux_val);
+-                             vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
+-                                                               (exit_pt.y()-block_bb.min_y())/block_bb.height(),
+-                                                              (exit_pt.z()-block_bb.min_z())/block_bb.depth());
+-
+-                            // obtain the code for the exit point
+-                            boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level(), tree->max_val());
+-                            cell_type *neighborcell=nullptr;
+-                            if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
+-                                curr_cell=neighborcell->traverse_force(exit_loc_code);
+-                            else
+-                                break;
+-                            enter_pt=exit_pt;
+-                        }
+-                    }
+-                }
+-                float compute_time = (float)timer.all() / 1e3f;
+-                total_compute_time += compute_time;
+-                timer.mark();
+-
+-                if (!step_functor.scene_read_only_)
+-                    scene_.write_active_block();
+-                if (step_functor.is_aux_)
+-                    aux_scene_.write_active_block();
+-
+-                float save_time = (float)timer.all() /  1e3f;
+-                total_save_time += save_time;
+-                //std::cout << "load: " << load_time << "s  compute: " << compute_time << "s  save: " << save_time << 's' << std::endl;
+-            }
+-        }
+-        scene_.unload_active_blocks();
+-        aux_scene_.unload_active_blocks();
+-
+-        //std::cout << "total load: " << total_load_time << "s  total compute: " << total_compute_time << "s  total save: " << total_save_time << 's' << std::endl;
+-        return true;
+-    }
+-
+- protected:
+-
+-    bool generate_ray_init(vgl_box_3d<double> const& block_bb, vgl_box_2d<double> &img_bb)
+-    {
+-        // determine intersection of block bounding box projection and image bounds
+-        vgl_box_2d<double> img_bounds;
+-        img_bounds.add(vgl_point_2d<double>(img_i0_,img_j0_));
+-        img_bounds.add(vgl_point_2d<double>(img_i0_ + img_ni_ - 1, img_j0_ + img_nj_ - 1));
+-
+-        vgl_box_2d<double> block_projection;
+-        double u,v;
+-        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-
+-        img_bb=vgl_intersection(img_bounds,block_projection);
+-
+-        if (img_bb.is_empty())
+-            return false;
+-        else
+-            return true;
+-    }
+-
+-    void generate_ray(float i, float j, vgl_box_3d<double> const& /*block_bb*/, vgl_point_3d<double> &ray_origin, vgl_vector_3d<double> &norm_direction)
+-    {
+-      if (cam_->type_name() == "vpgl_perspective_camera") {
+-        vpgl_perspective_camera<double> const* pcam =
+-          static_cast<vpgl_perspective_camera<double> const*>(cam_.ptr());
+-        // backproject image point to a ray
+-        ray_origin = pcam->camera_center();
+-        vgl_line_3d_2_points<double> cam_ray = pcam->backproject(vgl_point_2d<double>((double)i,(double)j));
+-        norm_direction=cam_ray.direction();
+-        normalize(norm_direction);
+-        return;
+-      }
+-      if (cam_->type_name() == "vpgl_proj_camera") {
+-        vpgl_proj_camera<double> const* prcam =
+-          static_cast<vpgl_proj_camera<double> const*>(cam_.ptr());
+-        ray_origin = prcam->camera_center();
+-        vgl_homg_line_3d_2_points<double>  cam_ray =
+-          prcam->backproject(vgl_homg_point_2d<double>((double)i,(double)j));
+-        vgl_homg_point_3d<double> hp = cam_ray.point_infinite();
+-        vgl_vector_3d<double> direction(hp.x(), hp.y(), hp.z());
+-        norm_direction=direction;
+-        normalize(norm_direction);
+-        return;
+-      }
+-      if (cam_->type_name() == "vpgl_affine_camera") {
+-        vgl_homg_point_2d<double> ph(i, j);
+-        vpgl_affine_camera<double> const * afcam =
+-          static_cast<vpgl_affine_camera<double> const*>(cam_.ptr());
+-        vgl_homg_line_3d_2_points<double>  cam_ray =
+-          afcam->backproject(ph);
+-        vgl_homg_point_3d<double> hpinf = cam_ray.point_infinite();
+-        vgl_homg_point_3d<double> hpfin = cam_ray.point_finite();
+-        vgl_vector_3d<double> direction(hpinf.x(), hpinf.y(), hpinf.z());
+-        norm_direction=direction;
+-        normalize(norm_direction);
+-        vgl_point_3d<double> temp(hpfin);
+-        ray_origin = temp;
+-        return;
+-      }
+-      if (cam_->type_name() == "vpgl_local_rational_camera") {
+-        vpgl_local_rational_camera<double> const* lrcam =
+-          static_cast<vpgl_local_rational_camera<double> const*>(cam_.ptr());
+-        vpgl_ray::ray(*lrcam,(double)i, (double)j, ray_origin, norm_direction);
+-        return;
+-      }
+-      else {
+-        std::cerr << "In boxm_raytrace_function: camera type not handled\n";
+-        assert(false);
+-      }
+-    }
+-
+-    bool entry_point(vgl_box_3d<double> & block_bb, vgl_point_3d<double>  &ray_origin,
+-                     vgl_vector_3d<double> &direction, vgl_point_3d<double> & enter_pt)
+-    {
+-      double lambda[6];
+-      std::vector<vgl_point_3d<double> > plane_intersections(6);
+-
+-      lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
+-      lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
+-      lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
+-      lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
+-      lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
+-      lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
+-
+-      if (block_bb.contains(ray_origin))
+-          enter_pt=ray_origin;
+-      else
+-      {
+-          for (unsigned int face=0; face<6; ++face) {
+-              plane_intersections[face] = ray_origin + (direction * lambda[face]);
+-          }
+-
+-          // determine which point is the entrance point based on direction
+-          const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
+-          if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
+-              (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
+-              (direction.z() < -epsilon) )
+-          {
+-              // ray intersects the zmax plane
+-              // check zmax first since it is probably the most common
+-              enter_pt = plane_intersections[5];
+-          }
+-          else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
+-              (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
+-              (direction.x() > epsilon) )
+-          {
+-              // ray intersects the xmin plane
+-              enter_pt = plane_intersections[0];
+-          }
+-          else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
+-              (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
+-              (direction.x() < -epsilon) )
+-          {
+-              // ray intersects the xmax plane
+-              enter_pt = plane_intersections[1];
+-          }
+-          else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
+-              (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
+-              (direction.y() > epsilon) )
+-          {
+-              // ray intersects the ymin plane
+-              enter_pt = plane_intersections[2];
+-          }
+-          else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
+-              (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
+-              (direction.y() < -epsilon) )
+-          {
+-              // ray intersects the ymax plane
+-              enter_pt = plane_intersections[3];
+-          }
+-          else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
+-              (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
+-              (direction.z() > epsilon) )
+-          {
+-              // ray intersects the zmin plane
+-              enter_pt = plane_intersections[4];
+-          }
+-          else {
+-              // no entry point into this block found
+-              return false;;
+-          }
+-      }
+-      return true;
+-    }
+-
+-    boxm_scene<tree_type> &scene_;
+-    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
+-
+-    bool reverse_traversal_;
+-
+-    const vpgl_camera_double_sptr cam_;
+-    unsigned int img_i0_;
+-    unsigned int img_j0_;
+-    unsigned int img_ni_;
+-    unsigned int img_nj_;
+-
+-    unsigned int debug_lvl_;
+-};
+-
+-template<class F, class T_loc, class T_data, class T_aux>
+-class boxm_iterate_cells_function
+-{
+- public:
+-    typedef boct_tree<T_loc,T_data> tree_type;
+-    typedef boct_tree<T_loc,T_aux> aux_tree_type;
+-    typedef boct_tree_cell<T_loc,T_data> cell_type;
+-    typedef boct_tree_cell<T_loc,T_aux> aux_cell_type;
+-    //: constructor
+-    boxm_iterate_cells_function(boxm_scene<tree_type> &scene,
+-                                boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene,
+-                                vpgl_camera_double_sptr cam,
+-                                unsigned int ni, unsigned int nj )
+-    : scene_(scene), aux_scene_(aux_scene), img_ni_(ni), img_nj_(nj), cam_(cam)
+-    {}
+-
+-
+-    bool run(F& step_functor)
+-    {
+-        // code to iterate over the blocks in order of visibility
+-        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
+-        while (block_vis_iter.next())
+-        {
+-            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-            for (auto & block_indice : block_indices) // code for each block
+-            {
+-                scene_.load_block(block_indice);
+-                boxm_block<tree_type> * curr_block=scene_.get_active_block();
+-                boxm_block<aux_tree_type> * curr_aux_block=aux_scene_.get_block(block_indice);
+-                tree_type * tree=curr_block->get_tree();
+-                aux_tree_type * aux_tree=curr_aux_block->get_tree();
+-
+-                std::vector<cell_type*> leaves=tree->leaf_cells();
+-                for (unsigned i=0;i<leaves.size();i++)
+-                {
+-                    T_data cell_val=leaves[i]->data();
+-                    boct_loc_code<T_loc> cell_code(leaves[i]->get_code());
+-                    aux_cell_type * aux_cell=aux_tree->get_cell(cell_code);
+-                    T_aux aux_val=aux_cell->data();
+-                    step_functor.step_cell(cell_val,aux_val);
+-                    leaves[i]->set_data(cell_val);
+-                    aux_cell->set_data(aux_val);
+-                }
+-                scene_.write_active_block();
+-                aux_scene_.write_active_block();
+-            }
+-        }
+-        return true;
+-    }
+-
+- protected:
+-    boxm_scene<tree_type> &scene_;
+-    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
+-    bool reverse_traversal_;
+-
+-    unsigned img_ni_;
+-    unsigned img_nj_;
+-
+-    const vpgl_camera_double_sptr cam_;
+-};
+-
+-#endif // boxm_raytrace_function_h_
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h b/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
+deleted file mode 100644
+index ea44cd7eed..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
++++ /dev/null
+@@ -1,46 +0,0 @@
+-#ifndef boxm_seg_length_functor_h
+-#define boxm_seg_length_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include "boxm_raytrace_function.h"
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_seg_length_functor
+-{
+- public:
+-  boxm_seg_length_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &observation,
+-                          unsigned int /*ni*/=0, unsigned /*nj*/=0)
+-    : obs_(observation)
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> & /*cell_value*/,    // FIXME: unused...
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-    aux_val.obs_ += obs_(i,j) * seg_len;
+-    aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &obs_;
+-};
+-
+-#endif // boxm_seg_length_functor_h
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
+deleted file mode 100644
+index a6f2af30f1..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include "boxm_util_data_types.h"
+-
+-// Binary write boxm_render_probe_manager scene to stream
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_write(vsl_b_ostream &, boxm_array_1d_float const&) {}
+-
+-// Binary load boxm_render_probe_manager scene from stream.
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_read(vsl_b_istream &, boxm_array_1d_float &) {}
+-
+-// Binary load boxm_render_probe_manager scene from stream.
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_read(vsl_b_istream&, boxm_array_1d_float*) {}
+-
+-// Binary write scene pointer to stream
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_write(vsl_b_ostream&, const boxm_array_1d_float* &) {}
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
+deleted file mode 100644
+index 827e172bbc..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#ifndef boxm_util_data_types_h
+-#define boxm_util_data_types_h
+-//:
+-// \file
+-#include <vbl/vbl_ref_count.h>
+-#include <vbl/vbl_smart_ptr.h>
+-#include <vbl/vbl_array_1d.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-class boxm_array_1d_float: public vbl_ref_count
+-{
+- public:
+-  boxm_array_1d_float(unsigned n):data_array(n,-1.0f){}
+-  vbl_array_1d<float> data_array;
+-};
+-
+-typedef vbl_smart_ptr<boxm_array_1d_float> boxm_array_1d_float_sptr;
+-
+-//: Binary write boxm_render_probe_manager scene to stream
+-void vsl_b_write(vsl_b_ostream & os, boxm_array_1d_float const& a);
+-
+-//: Binary load boxm_render_probe_manager scene from stream.
+-void vsl_b_read(vsl_b_istream & is, boxm_array_1d_float &a);
+-
+-void vsl_b_read(vsl_b_istream& is, boxm_array_1d_float* b);
+-
+-//: Binary write  scene pointer to stream
+-void vsl_b_write(vsl_b_ostream& os, const boxm_array_1d_float* &b);
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
+deleted file mode 100644
+index 96c61fe483..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-add_executable( boxm_basic_test_all
+-  test_driver.cxx
+-  test_block_vis_graph.cxx
+-  test_cell_vis_graph.cxx
+- )
+-
+-target_link_libraries( boxm_basic_test_all boxm_basic boxm boxm_util ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME boxm_basic_test_block_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_block_vis_graph  )
+-add_test( NAME boxm_basic_test_cell_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_cell_vis_graph  )
+-
+-add_executable( boxm_basic_test_include test_include.cxx )
+-target_link_libraries( boxm_basic_test_include boxm_basic)
+-add_executable( boxm_basic_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_basic_test_template_include boxm_basic)
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
+deleted file mode 100644
+index 70a87b0476..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
++++ /dev/null
+@@ -1,48 +0,0 @@
+-
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_block_vis_graph()
+-{
+-  // create scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,3);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  vul_file::make_directory("boxm_scene");
+-  scene.set_paths("boxm_scene", "block");
+-
+-
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-  boxm_block_vis_graph_iterator<tree_type> block_vis_iter(camera, &scene, IMAGE_U, IMAGE_V);
+-
+-  int vis_count = -1;
+-  std::vector<boxm_block<tree_type>*> blocks;
+-  int counts[] = {4,4,4};
+-  while (block_vis_iter.next()) {
+-    int block_count = 0;
+-    ++vis_count;
+-    std::cout << "Frontier\n";
+-    blocks = block_vis_iter.frontier_blocks();
+-    for (unsigned i=0; i<blocks.size(); ++i) {
+-      std::cout << i << "- " << blocks[i]->bounding_box() << std::endl;
+-      ++block_count;
+-    }
+-    TEST("block count", block_count, counts[vis_count]);
+-  }
+-  vpl_rmdir("boxm_scene");
+-  TEST("vis count", ++vis_count, 3);
+-}
+-
+-TESTMAIN(test_block_vis_graph);
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
+deleted file mode 100644
+index d9e2da00f7..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_cell_vis_graph()
+-{
+-  // create scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_paths("boxm_scene_cell", "block");
+-  vul_file::make_directory("boxm_scene_cell");
+-
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-  boxm_block_iterator<boct_tree<short,vgl_point_3d<double> > > iter(&scene);
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,vgl_point_3d<double> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,vgl_point_3d<double> >(3,2);
+-    block->init_tree(tree);
+-    boxm_cell_vis_graph_iterator<short,vgl_point_3d<double> > cell_iterator(camera,tree,IMAGE_U, IMAGE_V);
+-    double cnt=30;
+-    while (cell_iterator.next()){
+-      std::cout<<"Frontier\n";
+-      std::vector<boct_tree_cell<short,vgl_point_3d<double> > *> vis_cells=cell_iterator.frontier();
+-      for (auto & vis_cell : vis_cells)
+-      {
+-        vgl_box_3d<double> box=tree->cell_bounding_box(vis_cell);
+-        TEST("Returns correct frontier",cnt,box.max_z());
+-      }
+-      cnt-=5;
+-    }
+-
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vpl_rmdir("boxm_scene_cell");
+-}
+-
+-TESTMAIN(test_cell_vis_graph);
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx b/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
+deleted file mode 100644
+index 1e4f60a571..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_block_vis_graph );
+-DECLARE( test_cell_vis_graph );
+-
+-void register_tests()
+-{
+-  REGISTER( test_block_vis_graph );
+-  REGISTER( test_cell_vis_graph );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
+deleted file mode 100644
+index cbaeca0acc..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_block_vis_graph_node.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_num_rays_functor.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
+deleted file mode 100644
+index 131baa9347..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx b/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
+deleted file mode 100644
+index 1d3c646178..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
++++ /dev/null
+@@ -1,86 +0,0 @@
+-#include "boxm_apm_traits.h"
+-
+-const char* boxm_apm_types::app_model_strings[]  = { "apm_mog_grey",
+-                                                     "apm_mog_rgb",
+-                                                     "apm_simple_grey",
+-                                                     "apm_simple_rgb",
+-                                                     "apm_mob_grey",
+-                                                     "float",
+-                                                     "int",
+-                                                     "short",
+-                                                     "char",
+-                                                     "bool",
+-                                                     "vnl_double_10",
+-                                                     "vnl_float_10",
+-                                                     "vnl_float_3",
+-                                                     "bsta_mog_f1",
+-                                                     "bsta_gauss_f1",
+-                                                     "bvpl_sample_float",
+-                                                     "bvpl_sample_gauss_f1",
+-                                                     "bvpl_pca_basis_sample_10",
+-                                                     "edge_float",
+-                                                     "edge_line",
+-                                                     "edge_tangent_line",
+-                                                     "scalar_float",
+-                                                     "dbrec3d_part_instance",
+-                                                     "dbrec3d_pair_composite_instance",
+-                                                     "apm_na",
+-                                                     "apm_unknown" };
+-
+-
+-boxm_apm_type boxm_apm_types::str_to_enum(const char* s)
+-{
+-  for (int i=0; i < int(BOXM_APM_UNKNOWN); i++)
+-  {
+-    if (std::strcmp(s, boxm_apm_types::app_model_strings[i]) == 0)
+-      return (boxm_apm_type) i;
+-  }
+-  return BOXM_APM_UNKNOWN;
+-}
+-
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.color_);
+-  vsl_b_write(os, sample.one_over_sigma_);
+-  //vsl_b_write(os, sample.gauss_weight_);
+-}
+-
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.color_);
+-    vsl_b_read(is, sample.one_over_sigma_);
+-    //vsl_b_read(is, sample.gauss_weight_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm)
+-{
+-  os << "color: " << apm.color() << ", one_over_sigma: " << apm.one_over_sigma() << std::endl;
+-  return os;
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.h b/contrib/brl/bseg/boxm/boxm_apm_traits.h
+deleted file mode 100644
+index 17f80b5a70..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_apm_traits.h
++++ /dev/null
+@@ -1,206 +0,0 @@
+-#ifndef boxm_appearance_model_traits_h_
+-#define boxm_appearance_model_traits_h_
+-//:
+-// \file
+-// \brief A class for appearance model traits
+-//
+-// \author Daniel Crispell
+-// \date April 03, 2009
+-
+-#include <iostream>
+-#include <iosfwd>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_gauss_if3.h>
+-#include <bsta/bsta_beta.h>
+-#include <bsta/bsta_beta_f1.h>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include "boxm_export.h"
+-
+-class boxm_mog_grey_processor;
+-class boxm_mog_rgb_processor;
+-class boxm_simple_grey_processor;
+-class boxm_mob_grey_processor;
+-
+-enum boxm_apm_type
+-{
+-  BOXM_APM_MOG_GREY = 0,
+-  BOXM_APM_MOG_RGB,
+-  BOXM_APM_SIMPLE_GREY,
+-  BOXM_APM_SIMPLE_RGB,
+-  BOXM_APM_MOB_GREY,
+-  BOXM_FLOAT,
+-  BOXM_INT,
+-  BOXM_SHORT,
+-  BOXM_CHAR,
+-  BOXM_BOOL,
+-  VNL_DOUBLE_10,
+-  VNL_FLOAT_10,
+-  VNL_FLOAT_3,
+-  BSTA_MOG_F1,
+-  BSTA_GAUSS_F1,
+-  BVPL_SAMPLE_FLOAT,
+-  BVPL_SAMPLE_BSTA_GAUSS_F1,
+-  BVPL_PCA_BASIS_SAMPLE_10,
+-  BOXM_EDGE_FLOAT,
+-  BOXM_EDGE_LINE,
+-  BOXM_EDGE_TANGENT_LINE,
+-  BOXM_SCALAR_FLOAT,
+-  DBREC3D_PART_INSTANCE,
+-  DBREC3D_PAIR_COMPOSITE_INSTANCE,
+-  BOXM_APM_NA,
+-  BOXM_APM_UNKNOWN
+-};
+-
+-class boxm_apm_types
+-{
+- public:
+-  static boxm_EXPORT_DATA const char* app_model_strings[];
+-  static boxm_apm_type str_to_enum(const char* s);
+-};
+-
+-//: Pixel properties for templates.
+-template <boxm_apm_type>
+-class boxm_apm_traits;
+-
+-
+-//: traits for a mixture of gaussian appearance model of gray-scale images
+-template<>
+-class boxm_apm_traits<BOXM_APM_MOG_GREY>
+-{
+- public:
+-  static const unsigned int n_gaussian_modes_ = 3;
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
+-  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
+-
+- public:
+-  static const unsigned int obs_dim = 1;
+-  typedef  mix_gauss_sf1_type apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_mog_grey_processor apm_processor;
+-};
+-
+-
+-//: traits for a mixture of gaussian appearance model of rgb images
+-template<>
+-class boxm_apm_traits<BOXM_APM_MOG_RGB>
+-{
+- public:
+-  static const unsigned int n_gaussian_modes_ = 3;
+-
+-  typedef bsta_num_obs<bsta_gauss_if3> gauss_type_if3;
+-  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_if3, n_gaussian_modes_> > mix_gauss_if3_type;
+-
+- public:
+-  static const unsigned int obs_dim = 3;
+-  typedef  mix_gauss_if3_type apm_datatype;
+-  typedef vil_rgb<float> obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_mog_rgb_processor apm_processor;
+-};
+-
+-
+-//: traits for a simple one-valued appearance model of grey-scale images
+-class boxm_simple_grey
+-{
+- public:
+-  boxm_simple_grey() : color_(0.5f), one_over_sigma_(1.0f),gauss_weight_(1.0f) {}
+-  boxm_simple_grey(float colour, float std_dev, float gauss_wght=1.0f) : color_(colour), one_over_sigma_(1/std_dev), gauss_weight_(gauss_wght)  { check_vals(); }
+-  boxm_simple_grey(vnl_vector_fixed<float,3> const& params) : color_(params[0]), one_over_sigma_(1.0f/params[1])  { check_vals(); }
+-  static short version_no() { return 1; }
+-  inline float color() const { return color_; }
+-  inline float sigma() const { return 1.0f/one_over_sigma_; }
+-  inline float gauss_weight() const { return gauss_weight_; }
+-  inline float one_over_sigma() const { return one_over_sigma_; }
+-
+- protected:
+-  inline void check_vals()
+-  {
+-    if (!(color_ > 0.0f))
+-      color_ = 0.0f;
+-    if (!(color_ < 1.0f))
+-      color_ = 1.0f;
+-    if (!(one_over_sigma_ < 1e4))
+-      one_over_sigma_ = 1e4f;
+-    if (!(one_over_sigma_ > 1e-4))
+-      one_over_sigma_ = 1e-4f;
+-  }
+-
+- public:
+-  float color_;
+-  float one_over_sigma_;
+-  float gauss_weight_;
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_APM_SIMPLE_GREY>
+-{
+- public:
+-  static const unsigned int n_gaussian_modes_ = 1;
+-  static const unsigned int obs_dim = 1;
+-  static const unsigned int n_params = 3;
+-  typedef boxm_simple_grey apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_simple_grey_processor apm_processor;
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_APM_MOB_GREY>
+-{
+- public:
+-  static const unsigned int n_beta_modes_ = 3;
+-
+-  typedef bsta_num_obs<bsta_beta_f1> beta_type;
+-  typedef bsta_num_obs<bsta_mixture_fixed<beta_type, n_beta_modes_> > mix_beta_type;
+-
+- public:
+-  static const unsigned int obs_dim = 1;
+-  typedef  mix_beta_type apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_mob_grey_processor apm_processor;
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_EDGE_FLOAT>
+-{
+- public:
+-  static const unsigned int obs_dim = 1;
+-  static const unsigned int n_params = 2;
+-  typedef boxm_edge_sample<float> apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-#if 0
+-  typedef boxm_edge_processor apm_processor;
+-#endif
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_EDGE_LINE>
+-{
+- public:
+-  static const unsigned int obs_dim = 1;
+-  static const unsigned int n_params = 2;
+-  typedef boxm_inf_line_sample<float> apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-};
+-
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample);
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample);
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample);
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample);
+-std::ostream& operator << (std::ostream& os, const boxm_simple_grey& sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.h b/contrib/brl/bseg/boxm/boxm_aux_scene.h
+deleted file mode 100644
+index 40a2a56914..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_aux_scene.h
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#ifndef boxm_aux_scene_h_
+-#define boxm_aux_scene_h_
+-//:
+-// \file
+-// \brief  an auxiliary scene keeps a set of octrees for a given main scene
+-//
+-// \author Gamze Tunali
+-// \date   July 31, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell_reader.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_block.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-
+-template <class T_loc, class T, class T_AUX>
+-class boxm_aux_scene
+-{
+- public:
+-   typedef enum {EMPTY=0, CLONE, LOAD, UNDEFINED } tree_creation_type ;
+-   typedef  boct_tree<T_loc, T> tree_type;
+-   typedef  boct_tree<T_loc, T_AUX> aux_tree_type;
+-   boxm_aux_scene() : aux_scene_(nullptr), aux_storage_dir_("") {}
+-   boxm_aux_scene(boxm_scene<tree_type>* scene, std::string suffix,
+-                  tree_creation_type type, boxm_apm_type app_model=BOXM_APM_UNKNOWN);
+-
+-   ~boxm_aux_scene(){ /*delete aux_scene_;*/ }
+-
+-   void init_scene(){}
+-
+-
+-   boxm_block<boct_tree<T_loc,T_AUX> > * get_block(vgl_point_3d<int> index){
+-       aux_scene_->load_block(index);
+-       return aux_scene_->get_active_block();
+-   }
+-
+-   //: get an incremental reader for a scene block
+-   boct_tree_cell_reader<T_loc, T_AUX >* get_block_incremental(vgl_point_3d<int> block_idx);
+-
+-   void write_active_block() { aux_scene_->write_active_block(); }
+-  void unload_active_blocks() { aux_scene_->unload_active_blocks(); }
+-   void clean_scene();
+-
+- private:
+-  boxm_scene<aux_tree_type>* aux_scene_;
+-  std::string aux_storage_dir_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx b/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
+deleted file mode 100644
+index d3ceaf9c84..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
++++ /dev/null
+@@ -1,121 +0,0 @@
+-#ifndef boxm_aux_scene_hxx_
+-#define boxm_aux_scene_hxx_
+-
+-#include "boxm_aux_scene.h"
+-#include <boxm/boxm_aux_traits.h>
+-
+-#include <vpl/vpl.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T, class T_AUX>
+-boxm_aux_scene<T_loc,T,T_AUX>::boxm_aux_scene(boxm_scene<tree_type>* scene,
+-                                              std::string storage_suffix,
+-                                              tree_creation_type type,
+-                                              boxm_apm_type app_model)
+-: aux_scene_(nullptr)
+-{
+-  std::string aux_storage_dir;
+-  aux_storage_dir_ = scene->path();
+-  aux_scene_ = new boxm_scene<aux_tree_type >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->load_all_blocks(),scene->save_internal_nodes(), scene->save_platform_independent());
+-  aux_scene_->set_path(aux_storage_dir_,  storage_suffix);
+-  aux_scene_->set_appearance_model(app_model);
+-  aux_scene_->set_octree_levels(scene->max_level(),scene->init_level());
+-  if (type != EMPTY)
+-  {
+-    // loop through valid blocks and init same blocks in aux scene
+-    boxm_block_iterator<tree_type > iter(scene);
+-    iter.begin();
+-    while (!iter.end()) {
+-      if (scene->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-        if (type == LOAD) {
+-          if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-#if 0
+-            // auxiliary block file exist
+-            aux_scene_->load_block(iter.index());
+-            boxm_block<boct_tree<T_loc,T_AUX> > * block=aux_scene_->get_active_block();
+-            assert(block->get_tree() != 0);
+-#endif
+-          }
+-        }
+-        else if (type==CLONE) {  //clone from the primary block
+-          scene->load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-          boxm_block<boct_tree<T_loc,T> > * block=scene->get_active_block();
+-          boct_tree<T_loc,T>* tree=block->get_tree();
+-          aux_tree_type *aux_tree = tree->template clone_to_type<T_AUX>();
+-          boxm_block<aux_tree_type >* aux_block = new boxm_block<aux_tree_type >(block->bounding_box(),aux_tree );
+-          aux_scene_->set_block(iter.index(), aux_block);
+-          aux_scene_->write_active_block();
+-        }
+-      }
+-      ++iter;
+-    }
+-    aux_scene_->write_scene(storage_suffix+".xml");
+-    scene->unload_active_blocks();
+-    aux_scene_->unload_active_blocks();
+-    }
+-}
+-
+-
+-template <class T_loc, class T, class T_AUX>
+-boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::get_block_incremental(vgl_point_3d<int> block_idx)
+-{
+-  if (aux_scene_) {
+-    std::string path=aux_scene_->gen_block_path(block_idx.x(), block_idx.y(), block_idx.z());
+-    boct_tree_cell_reader<T_loc, T_AUX>* reader = new boct_tree_cell_reader<T_loc, T_AUX>(path);
+-    reader->begin();
+-    return reader;
+-  }
+-  else {
+-    return nullptr;
+-  }
+-}
+-
+-template <class T_loc, class T, class T_AUX>
+-void boxm_aux_scene<T_loc,T,T_AUX>::clean_scene()
+-{
+-  std::cout<<"Clean AUX scene "<<std::endl;
+-  aux_scene_->unload_active_blocks();
+-  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(aux_scene_);
+-  iter.begin();
+-  if (!aux_scene_->load_all_blocks())
+-  {
+-    while (!iter.end()) {
+-      if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-        std::string filename=aux_scene_->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
+-        vpl_unlink(filename.c_str());
+-      }
+-      iter++;
+-    }
+-  }
+-  else
+-  {
+-    while (!iter.end()) {
+-      if (iter->get_tree()!=nullptr)
+-      {
+-        iter->delete_tree();
+-        iter->set_tree(nullptr);
+-      }
+-      iter++;
+-    }
+-  }
+-}
+-
+-#if 0 // commented out
+-template <class T_loc, class T, class T_AUX>
+-boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::save_scene()
+-{
+-  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(&aux_scene);
+-  iter.begin();
+-  while (!iter.end()) {
+-    // body
+-  }
+-}
+-#endif // 0
+-
+-#define BOXM_AUX_SCENE_INSTANTIATE(T1,T2,T3) \
+-template class boxm_aux_scene<T1,T2,T3 >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_aux_traits.h b/contrib/brl/bseg/boxm/boxm_aux_traits.h
+deleted file mode 100644
+index 4e4c5113da..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_aux_traits.h
++++ /dev/null
+@@ -1,74 +0,0 @@
+-#ifndef boxm_aux_traits_h_
+-#define boxm_aux_traits_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/sample/boxm_vis_implicit_sample.h>
+-#include <boxm/sample/boxm_update_sample.h>
+-
+-enum boxm_aux_type
+-{
+-  BOXM_AUX_VIS_IMPLICIT,
+-  BOXM_AUX_UPDATE,
+-  BOXM_AUX_OPT_GREY,
+-  BOXM_AUX_OPT_RT_GREY,
+-  BOXM_AUX_OPT_RGB,
+-  BOXM_AUX_OPT_RT_RGB,
+-  BOXM_AUX_NULL,
+-  BOXM_AUX_UNKNOWN,
+-  BOXM_AUX_OPT2_GREY,
+-  BOXM_AUX_OPT2_RGB,
+-  BOXM_AUX_OPT3_MOG_GREY,
+-  BOXM_AUX_OPT3_MOG_RGB,
+-  BOXM_AUX_SCALAR_SAMPLE
+-};
+-
+-//: sample properties for templates.
+-template <boxm_aux_type>
+-class boxm_aux_traits;
+-
+-//: traits for a visibility-based implicit surface sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_VIS_IMPLICIT>
+-{
+- public:
+-  typedef boxm_vis_implicit_sample sample_datatype;
+-
+-  static std::string storage_subdir() { return "vis_implicit"; }
+-};
+-
+-template<>
+-class boxm_aux_traits<BOXM_AUX_UPDATE>
+-{
+- public:
+-  typedef boxm_update_sample sample_datatype;
+-
+-  static std::string storage_subdir() { return "update_work";}
+-};
+-
+-//: traits for a null sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_NULL>
+-{
+- public:
+-  typedef float sample_datatype;
+-
+-  static std::string storage_subdir() { return "null"; }
+-};
+-template<>
+-class boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>
+-{
+- public:
+-  typedef float sample_datatype;
+-
+-  static std::string storage_subdir() { return "scalar"; }
+-};
+-
+-
+-
+-#endif // boxm_aux_traits_h_
+diff --git a/contrib/brl/bseg/boxm/boxm_block.h b/contrib/brl/bseg/boxm/boxm_block.h
+deleted file mode 100644
+index 6bda381539..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_block.h
++++ /dev/null
+@@ -1,58 +0,0 @@
+-#ifndef boxm_block_h_
+-#define boxm_block_h_
+-//:
+-// \file
+-// \brief  a block is a smallest area that is going to be processed with an octree
+-//
+-// \author Gamze Tunali
+-// \date Apr 01, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vgl/vgl_box_3d.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-template <class T>
+-class boxm_block
+-{
+- public:
+-  //: Default Constructor
+-  boxm_block(): octree_(nullptr) {}
+-  //: Destructor
+-  ~boxm_block() { if (octree_) delete octree_; }
+-  //: Constructor from boundinf box
+-  boxm_block(vgl_box_3d<double> bbox): bbox_(bbox), octree_(nullptr) {}
+-  //: Constructor from bounding box and octree
+-  boxm_block(vgl_box_3d<double> bbox, T* tree) : bbox_(bbox), octree_(tree) {octree_->set_bbox(bbox_);}
+-  //: Returns the number of leaf cells in the tree
+-  unsigned int size();
+-  //: Initializes octree and bounding-box
+-  void init_tree(T * octree);
+-  //: Sets the current octree
+-  void set_tree(T * octree);
+-
+-  // Accessors
+-  vgl_box_3d<double> bounding_box() const { return bbox_; }
+-  T* get_tree() { return octree_; }
+-
+-  //: Releases memory
+-  void delete_tree() { delete octree_; octree_ = nullptr; }
+-
+-  // IO
+-  void b_read(vsl_b_istream &s);
+-  void b_write(vsl_b_ostream &s, const bool save_internal_nodes_, const bool platform_independent = true);
+-  static short version_no() { return 1; }
+-
+-  bool operator==(boxm_block<T> const& other) const {
+-    return bbox_ == other.bounding_box()
+-        && octree_ == other.octree_;
+-  }
+-
+- private:
+-  vgl_box_3d<double> bbox_;
+-  T* octree_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_block.hxx b/contrib/brl/bseg/boxm/boxm_block.hxx
+deleted file mode 100644
+index a8f27f2bfe..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_block.hxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-#ifndef boxm_block_hxx_
+-#define boxm_block_hxx_
+-
+-#include <iostream>
+-#include "boxm_block.h"
+-
+-#include <vgl/io/vgl_io_box_3d.h>
+-template <class T>
+-void boxm_block<T>::init_tree(T * octree)
+-{
+-  if(octree_){
+-   //release old memory unless the same tree
+-   if(octree!=octree_)
+-     delete octree_;
+-   }
+-  octree_=octree;
+-  octree->set_bbox(bbox_);
+-}
+-
+-template <class T>
+-void boxm_block<T>::set_tree(T * octree)
+-{
+-  if(octree_) //release old memory
+-    delete octree_;
+-  octree_=octree;
+-}
+-
+-template <class T>
+-unsigned int boxm_block<T>::size()
+-{
+-  if (octree_) {
+-    return octree_->size();
+-  }
+-  else {
+-    return 0;
+-  }
+-}
+-
+-template <class T>
+-void boxm_block<T>::b_read(vsl_b_istream &is)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case (1):
+-      vsl_b_read(is, bbox_);
+-      // if already allocated, destroy it and read from the file
+-      if (octree_ != nullptr) {
+-        delete octree_;
+-      }
+-      octree_ = new T();
+-      octree_->b_read(is);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_block<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      return;
+-  }
+-}
+-
+-
+-template <class T>
+-void boxm_block<T>::b_write(vsl_b_ostream &os, const bool save_internal_nodes, const bool platform_independent)
+-{
+-  vsl_b_write(os, version_no());
+-  vsl_b_write(os, bbox_);
+-#if 0
+-  std::cout << "Internal Nodes 3: " << save_internal_nodes << std::endl;
+-#endif
+-  octree_->b_write(os, save_internal_nodes, platform_independent);
+-}
+-
+-#define BOXM_BLOCK_INSTANTIATE(T) \
+-template class boxm_block<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_export.h b/contrib/brl/bseg/boxm/boxm_export.h
+deleted file mode 100644
+index 7827178bdf..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_export.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#ifndef BOXM_EXPORT_H
+-#define BOXM_EXPORT_H
+-
+-#include <vxl_config.h> // get BUILD_SHARED_LIBS
+-
+-#ifndef BUILD_SHARED_LIBS  // if not a shared build
+-# define boxm_EXPORT_DATA
+-#else  // this is a shared build
+-# ifdef boxm_EXPORTS  // if building this library
+-#  if defined(_WIN32) || defined(WIN32)
+-#   define boxm_EXPORT_DATA __declspec(dllexport)
+-#  else
+-#   define boxm_EXPORT_DATA
+-#  endif
+-# else // we are using this library and it is built shared
+-#  if defined(_WIN32) || defined(WIN32)
+-#   define boxm_EXPORT_DATA __declspec(dllimport)
+-#  else
+-#   define boxm_EXPORT_DATA
+-#  endif
+-# endif
+-#endif
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
+deleted file mode 100644
+index b1415333d6..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
++++ /dev/null
+@@ -1,25 +0,0 @@
+-#include "boxm_io_scene_base.h"
+-//:
+-// \file
+-
+-
+-//: Binary write boxm scene to stream
+-void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base const& /*scene_base*/)
+-{
+-}
+-
+-
+-//: Binary load boxm scene from stream.
+-void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base& /*scene_base*/)
+-{
+-}
+-
+-//: Binary write boxm scene pointer to stream
+-void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base* /*ph*/)
+-{
+-}
+-
+-//: Binary write boxm scene pointer to stream
+-void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base* const& /*ph*/)
+-{
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.h b/contrib/brl/bseg/boxm/boxm_io_scene_base.h
+deleted file mode 100644
+index 1abc4fa90c..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_io_scene_base.h
++++ /dev/null
+@@ -1,21 +0,0 @@
+-#ifndef boxm_io_scene_base_h_
+-#define boxm_io_scene_base_h_
+-//:
+-// \file
+-#include <boxm/boxm_scene_base.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary write boxm scene to stream
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene_base const& scene_base);
+-
+-//: Binary load boxm scene from stream.
+-void vsl_b_read(vsl_b_istream & is, boxm_scene_base &scene_base);
+-
+-//: Binary load boxm scene pointer from stream.
+-void vsl_b_read(vsl_b_istream& is, boxm_scene_base* p);
+-
+-//: Binary write boxm scene pointer to stream
+-void vsl_b_write(vsl_b_ostream& os, const boxm_scene_base* &p);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_scene.h b/contrib/brl/bseg/boxm/boxm_scene.h
+deleted file mode 100644
+index 8d1bd207d3..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene.h
++++ /dev/null
+@@ -1,559 +0,0 @@
+-#ifndef boxm_scene_h_
+-#define boxm_scene_h_
+-//:
+-// \file
+-// \brief  The main class to keep the 3D world data. It is a grid of boxm_blocks containing octrees.
+-//
+-// \author Gamze Tunali
+-// \date Apr 03, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <string>
+-#include <iostream>
+-#include <iosfwd>
+-#include <set>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <bvgl/bvgl_point_3d_cmp.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vbl/vbl_array_3d.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <boct/boct_tree.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-class boxm_scene_parser;
+-template <class T> class boxm_block_iterator;
+-template <class T> class boxm_cell_iterator;
+-
+-template <class T>
+-class boxm_scene :public boxm_scene_base
+-{
+- public:
+-  typedef typename T::loc_type loc_type;
+-  typedef typename T::datatype datatype;
+-
+-  //: Default constructor
+-  boxm_scene() : active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
+-
+-  //: Constructor from lvcs, world origin, dimension of the block (in world coordinates) and number of blocks(world_dim)
+-  boxm_scene(const vpgl_lvcs& lvcs,
+-             const vgl_point_3d<double>& origin,
+-             const vgl_vector_3d<double>& block_dim,
+-             const vgl_vector_3d<unsigned>& world_dim,
+-             const bool load_all_blocks=false,
+-             const bool save_internal_nodes_ = false,
+-             const bool save_platform_independent_ = true);
+-
+-  //: Constructor from lvcs, world origin, dimension of the block, number of blocks and initialization level
+-  boxm_scene(const vpgl_lvcs& lvcs,
+-             const vgl_point_3d<double>& origin,
+-             const vgl_vector_3d<double>& block_dim,
+-             const vgl_vector_3d<unsigned>& world_dim,
+-             unsigned max_level, unsigned init_level,
+-             const bool load_all_blocks=false,
+-             const bool save_internal_nodes_ = false,
+-             const bool save_platform_independent_ = true);
+-
+-  //: Constructor when lvcs is not available. World origin, block dimensions and number of blocks
+-  boxm_scene( const vgl_point_3d<double>& origin,
+-              const vgl_vector_3d<double>& block_dim,
+-              const vgl_vector_3d<unsigned>& world_dim,
+-              const bool load_all_blocks=false,
+-              const bool save_internal_nodes_ = false,
+-              const bool save_platform_independent_ = true);
+-
+-  //: Copy constructor
+-  boxm_scene(const boxm_scene& scene);
+-
+-  //: Constructor from base_scene
+-  boxm_scene(const boxm_scene_base& scene_base):
+-  boxm_scene_base(scene_base),active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
+-
+-  //: Destructor
+-  ~boxm_scene() override;
+-
+-  bool discover_block(vgl_point_3d<unsigned> index) { return discover_block(index.x(),index.y(),index.z()); }
+-
+-  bool discover_block(unsigned i, unsigned j, unsigned k);
+-
+-  //: Loads block into memory.
+-  // Returns true if the block bin file is found on disc, otherwise returns false and creates a new tree for the block
+-  bool load_block(unsigned i, unsigned j, unsigned k);
+-
+-  // Load block into memory without using global variables
+-  bool load_block_thread_safe(unsigned i, unsigned j, unsigned k);
+-
+-  //: Loads block into memory.
+-  bool load_block(vgl_point_3d<int> i) { return load_block(i.x(), i.y(), i.z()); }
+-
+-  //: Loads a block and all its neighboring(adjacent) blocks
+-  bool load_block_and_neighbors(unsigned i, unsigned j, unsigned k);
+-
+-  //: Loads a block and all its neighboring(adjacent) blocks
+-  bool load_block_and_neighbors(vgl_point_3d<int> i) { return load_block_and_neighbors(i.x(), i.y(), i.z()); }
+-
+-  //: Reads and loads all blocks into memorty
+-  bool read_all_blocks();
+-
+-  //: Write the active block to disk
+-  void write_active_block(bool unload_block=true);
+-
+-  //: Write the active block to disk
+-  void write_active_block(bool unload_block=false) const;
+-
+-  //: Write the active blocks to disk
+-  void write_active_blocks(bool unload_block=true);
+-
+-  //: Write the active blocks to disk
+-  void write_active_blocks(bool unload_block=false) const;
+-
+-  //: Write the specified block to disk without changing global variables
+-  void write_block_thread_safe(unsigned i, unsigned j, unsigned k);
+-
+-  //: Returns the active block(in memory)
+-  boxm_block<T>* get_active_block();
+-
+-  //: Returns the index of active block
+-  vgl_point_3d<int> active_block() const { return active_block_; }
+-
+-  //: Returns the indices of active neighbors;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >& active_blocks() { return active_blocks_; }
+-
+-  vpgl_lvcs lvcs() const { return lvcs_; }
+-
+-  vgl_point_3d<double> origin() const { return origin_; }
+-
+-  void set_origin(vgl_point_3d<double> o) { origin_=o; }
+-
+-  vgl_vector_3d<double> block_dim() const { return block_dim_; }
+-
+-  bool save_internal_nodes() const { return save_internal_nodes_; }
+-
+-  bool save_platform_independent() const { return save_platform_independent_; }
+-
+-  bool load_all_blocks() const { return load_all_blocks_; }
+-
+-  void block_num(int &x, int &y, int &z) const {
+-    x=(int) blocks_.get_row1_count();
+-    y=(int) blocks_.get_row2_count();
+-    z=(int) blocks_.get_row3_count();
+-  }
+-
+-  vgl_vector_3d<unsigned> world_dim() const override {
+-    unsigned x=(unsigned) blocks_.get_row1_count();
+-    unsigned y=(unsigned) blocks_.get_row2_count();
+-    unsigned z=(unsigned) blocks_.get_row3_count();
+-    return {x,y,z};
+-  }
+-
+-  std::string path() const { return scene_path_; }
+-
+-  std::string block_prefix() const { return block_pref_; }
+-
+-  void set_path(std::string path, std::string block_prefix) { scene_path_=path; block_pref_= block_prefix; }
+-
+-  void b_read(vsl_b_istream & s);
+-
+-  void b_write(vsl_b_ostream& s) const;
+-
+-  //: Returns the block this point resides in
+-  boxm_block<T>* get_block(vgl_point_3d<double> const& p) const;
+-
+-  //: Returns the index of the block containing this point
+-  bool get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index);
+-
+-  //: Returns a block, assumes block is in memory - if not it returns null
+-  boxm_block<T>* get_block(unsigned i, unsigned j, unsigned k) const { return blocks_(i,j,k); }
+-
+-  //: Returns a block, assumes block is in memory - if not it returns null
+-  boxm_block<T>* get_block(const vgl_point_3d<int>& idx) { return blocks_(idx.x(), idx.y(), idx.z()); }
+-
+-  //: Returns a read-only block, assumes block is in memory - if not it returns null
+-  const boxm_block<T>* get_block_read_only(unsigned i, unsigned j, unsigned k) { return blocks_(i,j,k); }
+-
+-  //: Return all leaf cells in a region
+-  void leaves_in_region(vgl_box_3d<double>, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
+-
+-  //: Return the level of the smallest cell entirely containing the 3d region
+-  short level_region(vgl_box_3d<double> box);
+-
+-  //: Return all leaf_data in a region - data is copied to new memory location
+-  void leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data);
+-
+-  //: Returns the data of all cells at a given level, that are contained in the specified region
+-  void cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level);
+-
+-  //: Return all leaf cells between an inner box and an outter box
+-  void leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
+-
+-  //: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
+-  void change_leaves_in_region(vgl_box_3d<double> box, const datatype &cell_data);
+-  void change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<datatype> &all_data);
+-
+-  //: Locate point in scene coordinates. Assumes that the block containing the point is already loaded into memory
+-  boct_tree_cell<loc_type, datatype>* locate_point_in_memory(vgl_point_3d<double> &p, unsigned level = 0);
+-
+-  void set_block(vgl_point_3d<int> const& idx, boxm_block<T>* block)
+-  {
+-    if (blocks_(idx.x(),idx.y(),idx.z())) // release memory
+-      delete blocks_(idx.x(),idx.y(),idx.z());
+-
+-    blocks_(idx.x(),idx.y(),idx.z()) = block; active_block_=idx;
+-  }
+-
+-  void set_block(int i, int j, int k , boxm_block<T>* block) { set_block(vgl_point_3d<int>(i,j,k), block); }
+-
+-  //: Write scene xml file at the scenes' path
+-  void write_scene(std::string filename = "scene.xml");
+-
+-  //: Write scene xml file at the location indicated by path
+-  void write_scene(std::string path, std::string filename);
+-
+-  void load_scene(std::string filename);
+-
+-  void load_scene(boxm_scene_parser& parser);
+-
+-  void force_write_blocks();
+-
+-  static short version_no() { return 1; }
+-
+-  boxm_block_iterator<T> iterator() { return boxm_block_iterator<T>(this); }
+-
+-  boxm_block_iterator<T> const_iterator() const { return boxm_block_iterator<T>(this); }
+-
+-  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned), bool read_only = false)
+-  {
+-    boxm_cell_iterator<T> cell_iter(this->iterator(), block_loading_func, read_only);
+-    return cell_iter;
+-  }
+-
+-  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned) const, bool read_only)
+-  {
+-    assert (read_only);
+-    boxm_cell_iterator<T> cell_iter(this->const_iterator(), block_loading_func, read_only);
+-    return cell_iter;
+-  }
+-
+-  vgl_box_3d<double> get_world_bbox() const override;
+-
+-  //: Return the dimensions of the scene along each axis - this are equivalent to bbox width, length and depth
+-  void axes_length(double &x_length,double &y_length, double &z_length) const;
+-
+-  //: Return true if the block index is valid
+-  bool valid_index(vgl_point_3d<int> const& idx) const { return valid_index(idx.x(), idx.y(), idx.z()); }
+-
+-
+-  //: Return true if the block index is valid
+-  inline bool valid_index(int const& x, int const& y, int const& z) const {
+-    return  x >= (int)0 && x < (int)blocks_.get_row1_count() &&
+-            y >= (int)0 && y < (int)blocks_.get_row2_count() &&
+-            z >= (int)0 && z < (int)blocks_.get_row3_count();
+-   }
+-
+-  void set_pinit(float pinit) { pinit_=pinit; }
+-
+-  float pinit() const { return pinit_; }
+-
+-  vgl_box_3d<double> get_block_bbox(vgl_point_3d<int> const& idx) const { return get_block_bbox(idx.x(), idx.y(), idx.z()); }
+-
+-  vgl_box_3d<double> get_block_bbox(int x, int y, int z) const;
+-
+-  //: generates a name for the block binary file based on the 3D vector index
+-  std::string gen_block_path(int x, int y, int z) const;
+-
+-  void clean_scene();
+-
+-  //: Returns a scene with the same structure and initialized with given value
+-  void clone_blocks(boxm_scene<T> &scene_out, datatype data);
+-
+-  //: Returns a scene with the same structure and data
+-  void clone_blocks(boxm_scene<T> &scene_out);
+-
+-  //: Returns a scene of a different type with the same structure  and initialized with given value
+-  template <class T_out>
+-  void clone_blocks_to_type(boxm_scene<T_out> &scene_out, typename boxm_scene<T_out>::datatype data )
+-  {
+-    std::cout << "Clone blocks to type\n";
+-    boxm_block_iterator<T> iter(this);
+-    boxm_block_iterator<T_out> iter_out = scene_out.iterator();
+-    iter.begin();
+-    iter_out.begin();
+-    while (!iter.end())
+-    {
+-      load_block(iter.index());
+-      scene_out.load_block(iter.index());
+-      T_out  *tree_out =(*iter)->get_tree()->template clone_to_type<typename boxm_scene<T_out>::datatype>();
+-      (*iter_out)->init_tree(tree_out);
+-      tree_out->init_cells(data);
+-      scene_out.write_active_block();
+-      ++iter;
+-      ++iter_out;
+-    }
+-  }
+-
+-  //: Returns a scene of a vector type with the same structure and vector initialized to the the same data
+-  template <unsigned DIM>
+-  void clone_blocks_to_vector(boxm_scene<boct_tree<short, vnl_vector_fixed<datatype, DIM> > > &scene_out)
+-  {
+-    typedef boct_tree<short, vnl_vector_fixed<datatype, DIM> > type_tree_out;
+-    std::cout << "Clone blocks to type\n";
+-    boxm_block_iterator<T> iter(this);
+-    boxm_block_iterator<type_tree_out> iter_out = scene_out.iterator();
+-    iter.begin();
+-    iter_out.begin();
+-    while (!iter.end())
+-    {
+-      load_block(iter.index());
+-      scene_out.load_block(iter.index());
+-      type_tree_out  *tree_out =(*iter)->get_tree()->template clone_to_vector<DIM>();
+-      (*iter_out)->init_tree(tree_out);
+-      scene_out.write_active_block();
+-      ++iter;
+-      ++iter_out;
+-    }
+-  }
+-
+-  //: Unload active blocks
+-  void unload_active_blocks() const;
+-
+-  //: Print out the trees in the scene
+-  void print();
+-
+-  //: Return the finest level in the scene
+-  short finest_level();
+-
+-  //: Return the length of finest-level cell in the scene
+-  double finest_cell_length();
+-
+-  //: Return the length of cells at a given level in the scene
+-  double cell_length(unsigned level);
+-
+-  //: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
+-  double finest_cell_length_in_memory() const;
+-
+-  //: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
+-  short finest_level_in_memory() const;
+-
+-  //: Return the number of leaf nodes in the scene
+-  unsigned long size();
+-
+-  vgl_point_3d<double> rpc_origin() const { return rpc_origin_; }
+-
+-  void set_rpc_origin(vgl_point_3d<double>& new_rpc_origin) {
+-    vgl_point_3d<double> old_origin = origin();
+-    vgl_point_3d<double> new_origin(
+-      old_origin.x() + new_rpc_origin.x() - rpc_origin_.x(),
+-      old_origin.y() + new_rpc_origin.y() - rpc_origin_.y(),
+-      old_origin.z() + new_rpc_origin.z() - rpc_origin_.z());
+-    set_origin(new_origin);
+-    rpc_origin_ = new_rpc_origin;
+-  }
+-
+- protected:
+-  vpgl_lvcs lvcs_;
+-  vgl_point_3d<double> origin_;
+-  vgl_point_3d<double> rpc_origin_;
+-
+-  //: World dimensions of a block .e.g 1 meter x 1 meter x 1 meter
+-  vgl_vector_3d<double> block_dim_;
+-
+-  vbl_array_3d<boxm_block<T>*> blocks_;
+-
+-  //: index of the blocks (3D array) that is active; only one active block at a time
+-  mutable vgl_point_3d<int> active_block_;
+-
+-  //: if neighbors of the active block are loaded into memory, their indices are stored in this set
+-  mutable std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  active_blocks_;
+-
+-  float pinit_;
+-
+-  //: Flag that indicates whether internal nodes of the trees should be saved
+-  bool save_internal_nodes_;
+-
+-  //: Flag that indicates whether the octree data should be saved in a platform-independent way (slower)
+-  bool save_platform_independent_;
+-
+-  //: Flag to load all the blocks in the memory
+-  bool load_all_blocks_;
+-
+-  // ************** private methods *******************
+-
+-  void create_block(unsigned i, unsigned j, unsigned k);
+-
+-  void create_blocks(const vgl_vector_3d<double>& block_dim, const vgl_vector_3d<unsigned>& world_dim);
+-  bool parse_config(boxm_scene_parser& parser);
+-
+-  bool parse_xml_string(std::string xml, boxm_scene_parser& parser);
+-
+-  //: Load all blocks in between min-max indices. This method is private and the user needs to take care of unloading the blocks
+-  bool load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
+-
+-  //: Unload all blocks in between min-max indices.
+-  bool unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
+-
+-
+-  //: A helper function to generate the indices of neighboring blocks
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  neighboring_blocks(vgl_point_3d<int> idx)
+-  {
+-    std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > neighbors;
+-    for (int i = -1; i <= 1; i++)
+-    {
+-      int active_i = idx.x() + i;
+-      if (active_i >= 0 && active_i < int(blocks_.get_row1_count()))
+-        for (int j = -1; j <= 1; j++)
+-        {
+-          int active_j = idx.y() + j;
+-          if (active_j >= 0 && active_j < int(blocks_.get_row2_count()) )
+-            for (int k = -1; k <= 1; k++)
+-            {
+-              int active_k = idx.z() + k;
+-              if (active_k >= 0 && active_k < int(blocks_.get_row3_count()))
+-                neighbors.insert(vgl_point_3d<int>(active_i, active_j, active_k));
+-            }
+-        }
+-    }
+-    return neighbors;
+-  }
+-};
+-
+-template <class T>
+-class boxm_block_iterator
+-{
+-  friend class boxm_cell_iterator<T>;
+-
+- public:
+-  boxm_block_iterator(boxm_scene<T> const* scene): i_(0), j_(0), k_(0), scene_(scene) {}
+-
+-  //: Copy constructor
+-  boxm_block_iterator(boxm_block_iterator<T> const& other): i_(other.i_), j_(other.j_), k_(other.k_), scene_(other.scene_) {}
+-
+-  ~boxm_block_iterator() = default;
+-
+-  boxm_block_iterator<T>& begin();
+-
+-  bool end();
+-
+-  boxm_block_iterator<T>& operator=(const boxm_block_iterator<T>& that);
+-
+-  bool operator==(const boxm_block_iterator<T>& that);
+-
+-  bool operator!=(const boxm_block_iterator<T>& that);
+-
+-  boxm_block_iterator<T>& operator++();  // pre-inc
+-
+-  boxm_block_iterator<T> operator++(int); // post-inc
+-
+-  boxm_block_iterator<T>& operator--();
+-
+-  boxm_block<T>* operator*();
+-
+-  boxm_block<T>* operator->();
+-
+-  vgl_point_3d<int> index() const { return vgl_point_3d<int>(i_,j_,k_); }
+-
+- private:
+-  int i_;
+-  int j_;
+-  int k_;
+-
+-  boxm_scene<T> const* scene_;
+-};
+-
+-
+-//: A class to iterate through all -or only leaf- cells in a boxm_scene
+-template <class T>
+-class boxm_cell_iterator
+-{
+- public:
+-  typedef bool (boxm_scene<T>::*ptr2func)(unsigned, unsigned, unsigned);
+-  typedef bool (boxm_scene<T>::*ptr2constfunc)(unsigned, unsigned, unsigned) const;
+-  typedef typename T::loc_type loc_type;
+-  typedef typename T::datatype datatype;
+-
+-  //: Copy constructor
+-  boxm_cell_iterator(boxm_cell_iterator<T> const& other)
+-   : block_iterator_(other.block_iterator_), cells_(other.cells_),
+-     block_loading_func_(other.block_loading_func_), read_only_(other.read_only_) {}
+-
+-  //: Constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
+-  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2func block_loading_func, bool read_only = false, bool use_internal_cells = false)
+-    : block_iterator_(iter), block_loading_func_((ptr2constfunc)block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) {}
+-
+-  //: "Const" constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
+-  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2constfunc block_loading_func, bool read_only, bool use_internal_cells = false)
+-    : block_iterator_(iter), block_loading_func_(block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) { assert(read_only); }
+-
+-  //: Destructor
+-  ~boxm_cell_iterator() = default;
+-
+-  //: Iterator begin
+-  boxm_cell_iterator<T>& begin(bool use_internal_cells=false);
+-
+-  //: Iterator end
+-  bool end();
+-
+-  /*************** Operators ****************/
+-
+-  boxm_cell_iterator<T>& operator=( const boxm_cell_iterator<T>& that);
+-
+-  bool operator==(const boxm_cell_iterator<T>& that);
+-
+-  bool operator!=(const boxm_cell_iterator<T>& that);
+-
+-  //: Prefix increment. When the end of the block is reached, it writes the block to disk and loads the next one
+-  boxm_cell_iterator<T>& operator++();
+-
+-  //: Increment. When the end of the block is reached, it writes the block to disk and loads the next one
+-  boxm_cell_iterator<T> operator+=(unsigned const &rhs);
+-
+-  boct_tree_cell<loc_type, datatype>* operator*();
+-
+-  boct_tree_cell<loc_type, datatype>* operator->();
+-
+-  /*************** Data accessor *************/
+-  //: Return the global origin of the current cell
+-  vgl_point_3d<double> global_origin();
+-
+-  //: Return the global centroid of the current cell - use only if cells are cubical
+-  vgl_point_3d<double> global_centroid();
+-
+-  //: Return the global length of this cell
+-  double length();
+-
+- private:
+-
+-  boxm_block_iterator<T> block_iterator_;
+-  std::vector<boct_tree_cell<loc_type ,datatype >* > cells_;
+-  typename std::vector< boct_tree_cell<loc_type , datatype >* >::const_iterator cells_iterator_;
+-  ptr2constfunc block_loading_func_;
+-  bool read_only_;
+-  bool use_internal_cells_;
+-};
+-
+-
+-//: generates an XML file from the member variables
+-template <class T>
+-void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name="boxm_scene");
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene);
+-
+-
+-#endif // boxm_scene_h_
+diff --git a/contrib/brl/bseg/boxm/boxm_scene.hxx b/contrib/brl/bseg/boxm/boxm_scene.hxx
+deleted file mode 100644
+index b398bcc2ad..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene.hxx
++++ /dev/null
+@@ -1,1764 +0,0 @@
+-#ifndef boxm_scene_hxx_
+-#define boxm_scene_hxx_
+-//:
+-// \file
+-#include <cmath>
+-#include <cstdio>
+-#include <sstream>
+-#include <iostream>
+-#include <algorithm>
+-#include <iterator>
+-#include "boxm_scene.h"
+-//
+-#include "boxm_apm_traits.h"
+-#include "boxm_scene_parser.h"
+-
+-#include <vgl/xio/vgl_xio_point_3d.h>
+-#include <vgl/xio/vgl_xio_vector_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vsl/vsl_basic_xml_element.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vpgl/xio/vpgl_xio_lvcs.h>
+-
+-#include <vpl/vpl.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
+-                          const vgl_point_3d<double>& origin,
+-                          const vgl_vector_3d<double>& block_dim,
+-                          const vgl_vector_3d<unsigned>& world_dim,
+-                          const bool load_all_blocks,
+-                          const bool save_internal_nodes,
+-                          const bool save_platform_independent)
+-: lvcs_(lvcs),
+-  origin_(origin),
+-  block_dim_(block_dim),
+-  active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-  save_internal_nodes_(save_internal_nodes),
+-  save_platform_independent_(save_platform_independent),
+-  load_all_blocks_(load_all_blocks)
+-{
+-  create_blocks(block_dim, world_dim);
+-}
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene( const vgl_point_3d<double>& origin,
+-                           const vgl_vector_3d<double>& block_dim,
+-                           const vgl_vector_3d<unsigned>& world_dim,
+-                           const bool load_all_blocks,
+-                           const bool save_internal_nodes,
+-                           const bool save_platform_independent)
+-: origin_(origin),
+-  block_dim_(block_dim),
+-  active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-  save_internal_nodes_(save_internal_nodes),
+-  save_platform_independent_(save_platform_independent),
+-  load_all_blocks_(load_all_blocks)
+-{
+-  create_blocks(block_dim, world_dim);
+-}
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene(const boxm_scene& scene)
+-: boxm_scene_base(scene),
+-  lvcs_(scene.lvcs()),
+-  origin_(scene.origin()),
+-  block_dim_(scene.block_dim()),
+-  active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-  save_internal_nodes_(scene.save_internal_nodes()),
+-  save_platform_independent_(scene.save_platform_independent()),
+-  load_all_blocks_(scene.load_all_blocks())
+-{
+-  int x,y,z;
+-  scene.block_num(x,y,z);
+-  create_blocks(block_dim_, vgl_vector_3d<unsigned>(x,y,z));
+-}
+-
+-
+-template <class T>
+-void boxm_scene<T>::create_blocks(const vgl_vector_3d<double>& /*block_dim*/,
+-                                  const vgl_vector_3d<unsigned>& world_dim)
+-{
+-  // compute the dimensions of 3D array
+-  unsigned x_dim = world_dim.x(); // = static_cast<int>(std::floor(world_dim.x()/block_dim.x()));
+-  unsigned y_dim = world_dim.y(); // = static_cast<int>(std::floor(world_dim.y()/block_dim.y()));
+-  unsigned z_dim = world_dim.z(); // = static_cast<int>(std::floor(world_dim.z()/block_dim.z()));
+-
+-  // pointers are initialized to NULL
+-  blocks_ =  vbl_array_3d<boxm_block<T>*>(x_dim, y_dim, z_dim, (boxm_block<T>*)nullptr);
+-  for (unsigned i=0; i<x_dim; ++i) {
+-    for (unsigned j=0; j<y_dim; ++j) {
+-      for (unsigned k=0; k<z_dim; ++k) {
+-        create_block(i,j,k);
+-      }
+-    }
+-  }
+-}
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
+-                          const vgl_point_3d<double>& origin,
+-                          const vgl_vector_3d<double>& block_dim,
+-                          const vgl_vector_3d<unsigned>& world_dim,
+-                          unsigned max_level, unsigned init_level,
+-                          const bool load_all_blocks,
+-                          const bool save_internal_nodes,
+-                          const bool save_platform_independent)
+-: lvcs_(lvcs),
+-origin_(origin),
+-block_dim_(block_dim),
+-active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-save_internal_nodes_(save_internal_nodes),
+-save_platform_independent_(save_platform_independent),
+-load_all_blocks_(load_all_blocks)
+-{
+-  create_blocks(block_dim, world_dim);
+-  set_octree_levels(max_level, init_level);
+-}
+-
+-template <class T>
+-void boxm_scene<T>::create_block(unsigned i, unsigned j, unsigned k)
+-{
+-  if (blocks_(i,j,k) == NULL) {
+-    vgl_box_3d<double> bbox = get_block_bbox(i,j,k);
+-    blocks_(i,j,k) = new boxm_block<T>(bbox);
+-  }
+-}
+-
+-template <class T>
+-boxm_scene<T>::~boxm_scene()
+-{
+-  // delete the blocks
+-  int x_dim, y_dim, z_dim;
+-  block_num(x_dim, y_dim, z_dim);
+-  for (int i=0; i<x_dim; i++) {
+-    for (int j=0; j<y_dim; j++) {
+-      for (int k=0; k<z_dim; k++) {
+-        if (blocks_(i,j,k))
+-          delete blocks_(i,j,k);
+-      }
+-    }
+-  }
+-}
+-
+-//: Returns a scene with the same structure and initialized with given value
+-template<class T>
+-void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out, datatype data)
+-{
+-  boxm_block_iterator<T> iter(this);
+-  boxm_block_iterator<T> iter_out = scene_out.iterator();
+-  iter.begin();
+-  iter_out.begin();
+-  while (!iter.end())
+-  {
+-    load_block(iter.index());
+-    scene_out.load_block(iter_out.index());
+-    T  *tree_out = (*iter)->get_tree()->clone_all();
+-    tree_out->init_cells(data);
+-    (*iter_out)->init_tree(tree_out);
+-    scene_out.write_active_block();
+-    ++iter;
+-    ++iter_out;
+-  }
+-}
+-
+-//: Returns a scene with the same structure and data
+-template<class T>
+-void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out)
+-{
+-  boxm_block_iterator<T> iter(this);
+-  boxm_block_iterator<T> iter_out = scene_out.iterator();
+-  iter.begin();
+-  iter_out.begin();
+-  while (!iter.end())
+-  {
+-    load_block(iter.index());
+-    T  *tree_out = (*iter)->get_tree()->clone_all();
+-    (*iter_out)->init_tree(tree_out);
+-    scene_out.write_active_block();
+-    ++iter;
+-    ++iter_out;
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_active_block(bool unload_block)
+-{
+-  if (valid_index(active_block_)&& (!load_all_blocks_))
+-  {
+-    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
+-    std::string path = gen_block_path(x,y,z);
+-    vsl_b_ofstream os(path);
+-#ifdef DEBUG
+-    std::cout << "block path: " << path << '\n'
+-             << "Load All blocks " << load_all_blocks_ << '\n'
+-             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-#endif
+-    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-
+-    // delete the block's data
+-    if (unload_block)
+-    {
+-      boxm_block<T>* block = blocks_(x,y,z);
+-      block->delete_tree();
+-      block->set_tree(nullptr);
+-      active_block_.set(-1,-1,-1);
+-    }
+-    os.close();
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_active_block(bool unload_block) const
+-{
+-  assert(!unload_block); // use the "non-const" method ::write_active_block if you want to delete the block's data
+-
+-  if (valid_index(active_block_)&& (!load_all_blocks_))
+-  {
+-    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
+-    std::string path = gen_block_path(x,y,z);
+-    vsl_b_ofstream os(path);
+-#ifdef DEBUG
+-    std::cout << "block path: " << path << '\n'
+-             << "Load All blocks " << load_all_blocks_ << '\n'
+-             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-#endif
+-    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-    os.close();
+-  }
+-}
+-
+-
+-template <class T>
+-void boxm_scene<T>::write_active_blocks(bool unload_block)
+-{
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
+-  for (; it!=active_blocks_.end(); it++)
+-  {
+-    vgl_point_3d<int> bidx = *it;
+-    if (valid_index(bidx)&& (!load_all_blocks_))
+-    {
+-      int x=bidx.x(), y=bidx.y(), z=bidx.z();
+-      std::string path = gen_block_path(x,y,z);
+-      vsl_b_ofstream os(path);
+-  #ifdef DEBUG
+-      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
+-              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-  #endif
+-      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-
+-      // delete the block's data
+-      if (unload_block)
+-      {
+-        boxm_block<T>* block = blocks_(x,y,z);
+-        block->delete_tree();
+-        block->set_tree(nullptr);
+-        active_block_.set(-1,-1,-1);
+-      }
+-      os.close();
+-    }
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_active_blocks(bool unload_block) const
+-{
+-  assert(!unload_block); // use the "non-const" method ::write_active_blocks if you want to delete the block's data
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
+-  for (; it!=active_blocks_.end(); it++)
+-  {
+-    vgl_point_3d<int> bidx = *it;
+-    if (valid_index(bidx)&& (!load_all_blocks_))
+-    {
+-      int x=bidx.x(), y=bidx.y(), z=bidx.z();
+-      std::string path = gen_block_path(x,y,z);
+-      vsl_b_ofstream os(path);
+-  #ifdef DEBUG
+-      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
+-              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-  #endif
+-      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-      os.close();
+-    }
+-  }
+-}
+-
+-//: Writes and unloads the specified block. It doesn't modify global variables
+-template <class T>
+-void boxm_scene<T>::write_block_thread_safe(unsigned i, unsigned j, unsigned k)
+-{
+-  if (valid_index(i,j,k)&& (!load_all_blocks_))
+-  {
+-    std::string path = gen_block_path(i,j,k);
+-    vsl_b_ofstream os(path);
+-
+-    if (blocks_(i,j,k))
+-      blocks_(i,j,k)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-
+-    // delete the block's data
+-    boxm_block<T>* block = blocks_(i,j,k);
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-
+-    os.close();
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::force_write_blocks()
+-{
+-  boxm_block_iterator<T> iter(this);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    int x=iter.index().x(), y=iter.index().y(), z=iter.index().z();
+-    if (blocks_(x,y,z)->get_tree()!=nullptr)
+-    {
+-      std::cout<<" ? ";
+-      std::string path = gen_block_path(x,y,z);
+-      vsl_b_ofstream os(path);
+-      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-      os.close();
+-    }
+-    iter++;
+-  }
+-}
+-
+-//: Returns the block this point resides in
+-template <class T>
+-boxm_block<T>* boxm_scene<T>::get_block(vgl_point_3d<double> const& p) const
+-{
+-  vgl_box_3d<double> world(get_world_bbox());
+-  if (world.contains(p)) {
+-    // find the block index
+-    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
+-    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
+-    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
+-    return blocks_(i,j,k);
+-  }
+-  else {
+-#ifdef DEBUG
+-    std::cerr << "Point " << p << " is out of world " << world << '\n';
+-#endif
+-    return nullptr;
+-  }
+-}
+-
+-
+-//: Returns the index of the block containing this point
+-template <class T>
+-bool boxm_scene<T>::get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index)
+-{
+-  vgl_box_3d<double> world(get_world_bbox());
+-  if (world.contains(p)) {
+-    // find the block index
+-    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
+-    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
+-    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
+-    // boundary case
+-    double tol = 1e-9;
+-    if (std::abs(p.x()-world.max_x())<tol)
+-      i-=1;
+-    if (std::abs(p.y()-world.max_y())<tol)
+-      j-=1;
+-    if (std::abs(p.z()-world.max_z())<tol)
+-      k-=1;
+-
+-    index=vgl_point_3d<int>(i,j,k);
+-    return true;
+-  }
+-  else {
+-#ifdef DEBUG
+-    std::cerr << "Point " << p << " is out of world " << world << '\n';
+-#endif
+-    return false;
+-  }
+-}
+-
+-template <class T>
+-boxm_block<T>* boxm_scene<T>::get_active_block()
+-{
+-  if (valid_index(active_block_)) {
+-    boxm_block<T>* block = blocks_(active_block_.x(),active_block_.y(),active_block_.z());
+-    if (block->get_tree() == nullptr)
+-      load_block(active_block_.x(),active_block_.y(),active_block_.z());
+-    return block;
+-  }
+-  else {
+-    std::cerr << "index"<<active_block_<<"  is out of world\n";
+-    return nullptr;
+-  }
+-}
+-
+-template <class T>
+-vgl_box_3d<double> boxm_scene<T>::get_world_bbox() const
+-{
+-  vgl_point_3d<double> min_p(origin_.x(), origin_.y(), origin_.z());
+-  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x()*blocks_.get_row1_count(),
+-                             min_p.y()+block_dim_.y()*blocks_.get_row2_count(),
+-                             min_p.z()+block_dim_.z()*blocks_.get_row3_count());
+-
+-  vgl_box_3d<double> bbox(min_p, max_p);
+-  return bbox;
+-}
+-
+-template <class T>
+-void boxm_scene<T>::axes_length(double &x_length,double &y_length, double &z_length) const
+-{
+-  x_length = block_dim_.x()*blocks_.get_row1_count();
+-  y_length = block_dim_.y()*blocks_.get_row2_count();
+-  z_length = block_dim_.z()*blocks_.get_row3_count();
+-}
+-
+-
+-template <class T>
+-vgl_box_3d<double> boxm_scene<T>::get_block_bbox(int x, int y, int z) const
+-{
+-  vgl_point_3d<double> min_p(block_dim_.x()*x+origin_.x(), block_dim_.y()*y+origin_.y(), block_dim_.z()*z+origin_.z());
+-  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x(), min_p.y()+block_dim_.y(), min_p.z()+block_dim_.z());
+-
+-  vgl_box_3d<double> bbox(min_p, max_p);
+-  return bbox;
+-}
+-
+-template <class T>
+-std::string boxm_scene<T>::gen_block_path(int x, int y, int z) const
+-{
+-  std::stringstream strm;
+-
+-  strm << scene_path_ << '/' << block_pref_ << '_' <<  x << '_' << y << '_' << z << ".bin";
+-
+-  return strm.str();
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::discover_block(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-  std::string block_path = gen_block_path(i,j,k);
+-  vsl_b_ifstream os(block_path);
+-
+-  // if the binary block file is not found, return "false"
+-  return !os == false;
+-}
+-
+-//: returns true if the block bin file is found on disc, false otherwise.
+-// If false, a new tree is create for the block
+-template <class T>
+-bool boxm_scene<T>::load_block(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-
+-  if (!load_all_blocks_)
+-  {
+-    // this does not save the active block so make sure to save it first
+-    if (valid_index(active_block_)) {
+-      if (!(active_block_ == vgl_point_3d<int>(i,j,k)))
+-      {
+-        int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
+-        boxm_block<T>* block = blocks_(x,y,z);
+-        block->delete_tree();
+-        block->set_tree(nullptr);
+-      }
+-    }
+-  }
+-
+-  active_block_.set(i,j,k);
+-
+-  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
+-  {
+-    std::string block_path = gen_block_path(i,j,k);
+-    vsl_b_ifstream os(block_path);
+-
+-    // if the binary block file is not found
+-    if (!os) {
+-      if (blocks_(i,j,k)->get_tree()==nullptr) {
+-        T* tree= new T(max_tree_level_,init_tree_level_);
+-        blocks_(i,j,k)->init_tree(tree);
+-      }
+-      return false;
+-    }
+-    blocks_(i,j,k)->b_read(os);
+-    os.close();
+-  }
+-
+-  return true;
+-}
+-
+-
+-//: Load block into memory - this doesn't use global variables so user is responsible for unloading it
+-template <class T>
+-bool boxm_scene<T>::load_block_thread_safe(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-
+-  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
+-  {
+-    std::string block_path = gen_block_path(i,j,k);
+-    vsl_b_ifstream os(block_path);
+-
+-    // if the binary block file is not found
+-    if (!os) {
+-      if (blocks_(i,j,k)->get_tree()==nullptr) {
+-        T* tree= new T(max_tree_level_,init_tree_level_);
+-        blocks_(i,j,k)->init_tree(tree);
+-      }
+-      return false;
+-    }
+-    blocks_(i,j,k)->b_read(os);
+-    os.close();
+-  }
+-
+-  return true;
+-}
+-
+-//: Reads and loads all blocks into memorty
+-template <class T>
+-bool boxm_scene<T>::read_all_blocks()
+-{
+-  load_all_blocks_ = true;
+-  this->unload_active_blocks();
+-
+-  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
+-    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
+-      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
+-        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) // read it from file
+-        {
+-          std::string block_path = gen_block_path(block_i,block_j,block_k);
+-          vsl_b_ifstream os(block_path);
+-
+-          // if the binary block file is not found
+-          if (!os) {
+-            if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
+-              T* tree= new T(max_tree_level_,init_tree_level_);
+-              blocks_(block_i,block_j,block_k)->init_tree(tree);
+-            }
+-          }
+-          else
+-            blocks_(block_i,block_j,block_k)->b_read(os);
+-
+-          active_blocks_.insert(vgl_point_3d<int>(block_i, block_j, block_k));
+-          os.close();
+-        }
+-      }
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::load_block_and_neighbors(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-
+-  active_block_.set(i,j,k);
+-  // Set unused blocks to null and load new blocks
+-  // this is to avoid rereading blocks that are already in memory
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks  = neighboring_blocks(vgl_point_3d<int>(i,j,k));
+-  new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
+-  bvgl_point_3d_cmp<int>  cmp;
+-  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
+-                     new_active_blocks.begin(), new_active_blocks.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
+-                     cmp);
+-
+-  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
+-                     active_blocks_.begin(), active_blocks_.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
+-                     cmp);
+-
+-  active_blocks_.clear();
+-  active_blocks_ = new_active_blocks;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
+-
+-  for (; unload_it!=blocks_to_unload.end(); unload_it++)
+-  {
+-    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-  }
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
+-
+-  for (; load_it!=blocks_to_load.end(); load_it++)
+-  {
+-    int block_i = (*load_it).x();
+-    int block_j = (*load_it).y();
+-    int block_k = (*load_it).z();
+-
+-    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
+-    {
+-      std::string block_path = gen_block_path(block_i,block_j,block_k);
+-      vsl_b_ifstream os(block_path);
+-
+-      // if the binary block file is not found
+-      if (!os) {
+-        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
+-          T* tree= new T(max_tree_level_,init_tree_level_);
+-          blocks_(block_i,block_j,block_k)->init_tree(tree);
+-        }
+-        return false;
+-      }
+-      blocks_(block_i,block_j,block_k)->b_read(os);
+-      assert(blocks_(block_i,block_j,block_k)!=NULL);
+-      assert(blocks_(block_i,block_j,block_k)->get_tree()!=nullptr);
+-
+-      os.close();
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-//: Return the finest level in the scene
+-template <class T>
+-short boxm_scene<T>::finest_level()
+-{
+-  // iterate through the blocks requesting the finest level
+-  boxm_block_iterator<T > iter=this->const_iterator();
+-  iter.begin();
+-  short finest_level = this->max_tree_level_;
+-  while (!iter.end()) {
+-    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      short this_level = get_active_block()->get_tree()->finest_level();
+-      if (this_level < finest_level)
+-        finest_level = this_level;
+-    }
+-    iter++;
+-  }
+-
+-  return finest_level;
+-}
+-
+-
+-//: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
+-template <class T>
+-short boxm_scene<T>::finest_level_in_memory() const
+-{
+-  if (!load_all_blocks_)
+-    return -1;
+-
+- // iterate through the blocks requesting the finest level
+-  short finest_level = this->max_tree_level_;
+-  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
+-    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
+-      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
+-        if (blocks_(block_i,block_j,block_k)) {
+-            short this_level = blocks_(block_i,block_j,block_k)->get_tree()->finest_level();
+-            if (this_level < finest_level)
+-              finest_level = this_level;
+-          }
+-      }
+-    }
+-  }
+-
+-  return finest_level;
+-}
+-
+-//: Return the length of finest-level cell in the scene
+-template <class T>
+-double  boxm_scene<T>::finest_cell_length()
+-{
+-  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level()));
+-
+-  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
+-    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
+-             << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
+-  }
+-
+-  return local_cell_length * block_dim_.x();
+-}
+-
+-//: Return the length of cells at a given level in the scene
+-template <class T>
+-double  boxm_scene<T>::cell_length(unsigned level)
+-{
+-  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - level));
+-
+-  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
+-    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
+-    << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
+-  }
+-
+-  return local_cell_length * block_dim_.x();
+-}
+-
+-//: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
+-template <class T>
+-double  boxm_scene<T>::finest_cell_length_in_memory() const
+-{
+-  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level_in_memory()));
+-
+-  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7))
+-    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n";
+-
+-  return local_cell_length * block_dim_.x();
+-}
+-
+-//: Return the number of leaf nodes in the scene
+-template <class T>
+-unsigned long boxm_scene<T>::size()
+-{
+-  // iterate through the blocks requesting the finest level
+-  boxm_block_iterator<T > iter=this->const_iterator();
+-  iter.begin();
+-  unsigned long size = 0;
+-  while (!iter.end()) {
+-    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z()))
+-    {
+-      size += get_active_block()->get_tree()->size();
+-    }
+-
+-    iter++;
+-  }
+-
+-  return size;
+-}
+-
+-template <class T>
+-void boxm_scene<T>::b_read(vsl_b_istream & is)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      std::string xml="";
+-      vsl_b_read(is, xml);
+-      std::cout << xml << std::endl;
+-      boxm_scene_parser parser;
+-      parse_xml_string(xml, parser);
+-      break;
+-#if 0
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scene<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      return;
+-#endif
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::b_write(vsl_b_ostream & s) const
+-{
+-  // create an XML stream for the parameters
+-  std::stringstream strm;
+-  boxm_scene<T> scene(this->lvcs(), this->origin(), this->block_dim(), this->world_dim());
+-  x_write(strm, scene, "scene");
+-  std::string str(strm.str());
+-
+-  short v = boxm_scene<T>::version_no();
+-  vsl_b_write(s, v);
+-  // write the XML as char stream
+-  vsl_b_write(s, str);
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_scene(std::string filename)
+-{
+-  std::string fullpath=scene_path_+ "/" + filename;
+-  std::ofstream os(fullpath.c_str());
+-  x_write(os, *this, "boxm_scene");
+-  this->filename_ = fullpath;
+-  os.close();
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_scene(std::string path, std::string filename)
+-{
+-  std::string fullpath= path+ "/" + filename;
+-  std::ofstream os(fullpath.c_str());
+-  x_write(os, *this, "boxm_scene");
+-  this->filename_ = fullpath;
+-  os.close();
+-}
+-
+-template <class T>
+-void boxm_scene<T>::load_scene(std::string filename)
+-{
+-  boxm_scene_parser parser;
+-  boxm_scene_base::load_scene(filename, parser);
+-  this->filename_ = filename;
+-  parse_config(parser);
+-}
+-
+-template <class T>
+-void boxm_scene<T>::load_scene(boxm_scene_parser& parser)
+-{
+-  parse_config(parser);
+-}
+-
+-template <class T>
+-void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name)
+-{
+-  vsl_basic_xml_element scene_elm(name);
+-  scene_elm.x_write_open(os);
+-
+-  vsl_basic_xml_element app_model(APP_MODEL_TAG);
+-  app_model.add_attribute("type", boxm_apm_types::app_model_strings[scene.appearence_model()]);
+-  app_model.x_write(os);
+-
+-  vsl_basic_xml_element bin(MULTI_BIN_TAG);
+-  bin.add_attribute("value", scene.multi_bin()? 1 : 0);
+-  bin.x_write(os);
+-
+-  vsl_basic_xml_element save_nodes(SAVE_INTERNAL_NODES_TAG);
+-  save_nodes.add_attribute("value", scene.save_internal_nodes()? 1 : 0);
+-  save_nodes.x_write(os);
+-
+-  vsl_basic_xml_element save_platform_independent(SAVE_PLATFORM_INDEPENDENT_TAG);
+-  save_platform_independent.add_attribute("value", scene.save_platform_independent()? 1 : 0);
+-  save_platform_independent.x_write(os);
+-
+-  vsl_basic_xml_element load_all_blocks(LOAD_ALL_BLOCKS_TAG);
+-  load_all_blocks.add_attribute("value", scene.load_all_blocks()? 1 : 0);
+-  load_all_blocks.x_write(os);
+-
+-  vpgl_lvcs lvcs=scene.lvcs();
+-  x_write(os, lvcs, LVCS_TAG);
+-  x_write(os, scene.origin(), LOCAL_ORIGIN_TAG);
+-  x_write(os, scene.block_dim(), BLOCK_DIMENSIONS_TAG);
+-
+-  vsl_basic_xml_element blocks(BLOCK_NUM_TAG);
+-  int x_dim, y_dim, z_dim;
+-  scene.block_num(x_dim, y_dim, z_dim);
+-  blocks.add_attribute("x_dimension", x_dim);
+-  blocks.add_attribute("y_dimension", y_dim);
+-  blocks.add_attribute("z_dimension", z_dim);
+-  blocks.x_write(os);
+-
+-  vsl_basic_xml_element paths(SCENE_PATHS_TAG);
+-  paths.add_attribute("path", scene.path());
+-  paths.add_attribute("block_prefix", scene.block_prefix());
+-  paths.x_write(os);
+-
+-  vsl_basic_xml_element tree(OCTREE_LEVELS_TAG);
+-  tree.add_attribute("max", (int) scene.max_level());
+-  tree.add_attribute("init", (int) scene.init_level());
+-  tree.x_write(os);
+-
+-  scene_elm.x_write_close(os);
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::parse_config(boxm_scene_parser& parser)
+-{
+-  vpgl_lvcs lvcs;
+-  parser.lvcs(lvcs);
+-  vgl_vector_3d<unsigned> dims = parser.block_nums();
+-
+-  lvcs_ = lvcs;
+-  origin_ =  parser.origin();
+-  block_dim_ = parser.block_dim();
+-  create_blocks(block_dim_, dims);
+-
+-  parser.paths(scene_path_, block_pref_);
+-  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
+-  multi_bin_ = parser.multi_bin();
+-  save_internal_nodes_ =parser.save_internal_nodes();
+-  save_platform_independent_ = parser.save_platform_independent();
+-  load_all_blocks_ = parser.load_all_blocks();
+-  pinit_=parser.p_init();
+-#if 0
+-  std::cout << "Internal Nodes 1: " << save_internal_nodes_ << std::endl;
+-#endif
+-  parser.levels(max_tree_level_, init_tree_level_);
+-  return true;
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::parse_xml_string(std::string xml, boxm_scene_parser& parser)
+-{
+-  if (xml.size() == 0) {
+-    std::cerr << "XML string is empty\n";
+-    return false;
+-  }
+-  if (!parser.parseString(xml.data())) {
+-    std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
+-             << parser.XML_GetCurrentLineNumber() << '\n';
+-
+-    return false;
+-  }
+-
+-  vpgl_lvcs lvcs;
+-  parser.lvcs(lvcs);
+-  vgl_vector_3d<unsigned> nums = parser.block_nums();
+-
+-  lvcs_ = lvcs;
+-  origin_ =  parser.origin();
+-  block_dim_ = parser.block_dim();
+-  create_blocks(block_dim_, nums);
+-
+-  parser.paths(scene_path_, block_pref_);
+-  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
+-  multi_bin_ = parser.multi_bin();
+-  pinit_=parser.p_init();
+-  load_all_blocks_ = parser.load_all_blocks();
+-
+-  return true;
+-}
+-
+-template <class T>
+-void boxm_scene<T>::clean_scene()
+-{
+-  boxm_block_iterator<T > iter=this->iterator();
+-  iter.begin();
+-  while (!iter.end()) {
+-    if (this->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      std::string filename=this->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
+-      vpl_unlink(filename.c_str());
+-    }
+-    iter++;
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::print()
+-{
+-  boxm_block_iterator<T > iter=this->const_iterator();
+-  iter.begin();
+-  while (!iter.end()) {
+-    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      std::cout << "Printing Block : " <<  iter.index() << std::endl;
+-      get_active_block()->get_tree()->print();
+-    }
+-    ++iter;
+-  }
+-}
+-
+-//: Load all blocks in between min-max indices.
+-template <class T>
+-bool boxm_scene<T>::load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
+-{
+-  if (!valid_index(min_idx) || !valid_index(max_idx))
+-    return false;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks;
+-
+-  for (int i = min_idx.x(); i <= max_idx.x(); i++)
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-      for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-        new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
+-
+-  // Set unused blocks to null and load new blocks
+-  // this is to avoid rereading blocks that are already in memory
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
+-  bvgl_point_3d_cmp<int>  cmp;
+-  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
+-                     new_active_blocks.begin(), new_active_blocks.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
+-                     cmp);
+-
+-  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
+-                     active_blocks_.begin(), active_blocks_.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
+-                     cmp);
+-
+-  active_blocks_.clear();
+-  active_blocks_ = new_active_blocks;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
+-
+-  for (; unload_it!=blocks_to_unload.end(); unload_it++)
+-  {
+-    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-  }
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
+-
+-  for (; load_it!=blocks_to_load.end(); load_it++)
+-  {
+-    int block_i = (*load_it).x();
+-    int block_j = (*load_it).y();
+-    int block_k = (*load_it).z();
+-
+-    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
+-    {
+-      std::string block_path = gen_block_path(block_i,block_j,block_k);
+-      vsl_b_ifstream os(block_path);
+-
+-      // if the binary block file is not found
+-      if (!os) {
+-        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
+-          T* tree= new T(max_tree_level_,init_tree_level_);
+-          blocks_(block_i,block_j,block_k)->init_tree(tree);
+-        }
+-        return false;
+-      }
+-      blocks_(block_i,block_j,block_k)->b_read(os);
+-      os.close();
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-//: Unload all blocks in between min-max indices.
+-template <class T>
+-bool boxm_scene<T>::unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
+-{
+-  if (!valid_index(min_idx) || !valid_index(max_idx))
+-    return false;
+-
+-  for (int i = min_idx.x(); i <= max_idx.x(); i++)
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-      for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        block->delete_tree();
+-        block->set_tree(nullptr);
+-      }
+-  return true;
+-}
+-
+-//: Unload active blocks.
+-template <class T>
+-void boxm_scene<T>::unload_active_blocks() const
+-{
+-  // unload active block
+-  if (valid_index(active_block_))
+-  {
+-    boxm_block<T>* block = blocks_(active_block_.x(), active_block_.y(),active_block_.z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-    active_block_ = vgl_point_3d<int>(-1,-1,-1);
+-  }
+-
+-  if (active_blocks_.size()==0)
+-    return;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = active_blocks_.begin();
+-
+-  for (; unload_it!=active_blocks_.end(); unload_it++)
+-  {
+-    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-  }
+-  active_blocks_.clear();
+-
+-  return;
+-}
+-
+-
+-//: Locate all cells within a 3d region, which coordinates are given in scene coordinates.
+-//  Use with care --- blocks need to be unloaded by user to not create memory leaks
+-template <class T>
+-void boxm_scene<T>::leaves_in_region(vgl_box_3d<double> box, std::vector<boct_tree_cell<typename T::loc_type, typename T::datatype>* > &cells)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-  cells.clear();
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
+-    return;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
+-        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
+-      }
+-    }
+-  }
+-
+-  // FIXME: I should unload the blocks
+-  return;
+-}
+-
+-//: Level of the cell containing a 3d region, which coordinates are given in scene coordinates.
+-template <class T>
+-short boxm_scene<T>::level_region(vgl_box_3d<double> box)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::level_region: Region does not intersect scene\n";
+-    return -1;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-//#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-//#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return -1;
+-
+-  short level = -1;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        std::cout << ".....In tree with box dimension: " << get_block_bbox(i,j,k).width() << ", " << get_block_bbox(i,j,k).depth() << ", " << get_block_bbox(i,j,k).height()
+-            << "looking for box with dim: " << box.width() << ", " << box.depth() << ", " <<box.height() <<std::endl;
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-
+-        boct_tree_cell<loc_type, datatype>* region_cell = tree->locate_region_global(local_box_exclusive);
+-        if (region_cell->level() > level)
+-          level = region_cell->level();
+-
+-        std::cout << "level: " << level << box <<std::endl;
+-
+-      }
+-    }
+-  }
+-  this->unload_active_blocks();
+-  return level;
+-}
+-
+-
+-
+-
+-//: Return all leaf cells between an inner box and an outter box
+-template <class T>
+-void boxm_scene<T>::leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<typename T::loc_type, typename T::datatype> > &cell_data)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-  cell_data.clear();
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
+-    return;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
+-
+-        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
+-        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
+-          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
+-                                                                (*temp_cell_it)->level(), (*temp_cell_it)->data()));
+-        }
+-      }
+-    }
+-  }
+-  unload_active_blocks();
+-  return;
+-}
+-
+-//: Returns the data of all cells at a given level, that are contained in the specified region
+-template <class T>
+-void boxm_scene<T>::cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-  cell_data.clear();
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
+-    return;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_region_cells_global(local_box_exclusive, temp_cells, level);
+-
+-        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
+-        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
+-          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
+-                                                                 (*temp_cell_it)->level(), (*temp_cell_it)->data()));
+-        }
+-      }
+-    }
+-  }
+-  unload_active_blocks();
+-  return;
+-}
+-
+-//: Return all leaf cells between an inner box and an outter box. Use with care --- blocks need to be unloaded by user
+-template <class T>
+-void boxm_scene<T>::leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells)
+-{
+-  if (!outer_box.contains(inner_box))
+-    return;
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<double> min_point = outer_box.min_point();
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<double> max_point = outer_box.max_point();
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),outer_box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_outer_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                                     local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-
+-        vgl_box_3d<double> local_inner_box_exclusive = vgl_intersection(local_outer_box_exclusive,inner_box);
+-
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_leaves_in_hollow_region_global(local_outer_box_exclusive, local_inner_box_exclusive, temp_cells);
+-        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
+-      }
+-    }
+-  }
+-
+-  // FIXME: I should unload the blocks
+-  return;
+-}
+-
+-//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
+-template <class T>
+-void boxm_scene<T>::change_leaves_in_region(vgl_box_3d<double> box, const typename T::datatype &cell_data)
+-{
+-  // load blocks intersecting the region
+-  vgl_point_3d<double> min_point = box.min_point();
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<double> max_point = box.max_point();
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-
+-        tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
+-
+-        std::string path = gen_block_path(i,j,k);
+-        vsl_b_ofstream os(path);
+-        block->b_write(os, save_internal_nodes_, save_platform_independent_);
+-      }
+-    }
+-  }
+-
+-  unload_active_blocks();
+-  return;
+-}
+-
+-//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
+-template <class T>
+-void boxm_scene<T>::change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<typename T::datatype> &all_data)
+-{
+-  if (boxes.size()!= all_data.size()) {
+-    std::cerr << "Error in boxm_scene<T>::change_leaves_in_regions --> Input vectors don't have the same size\n";
+-    return;
+-  }
+-
+-  for (unsigned bi = 0; bi < boxes.size(); bi++)
+-  {
+-    const vgl_box_3d<double> &box = boxes[bi];
+-    const datatype &cell_data=all_data[bi];
+-    // load blocks intersecting the region
+-    vgl_point_3d<double> min_point = box.min_point();
+-    vgl_point_3d<int> min_idx;
+-    get_block_index(min_point, min_idx);
+-
+-    vgl_point_3d<double> max_point = box.max_point();
+-    vgl_point_3d<int> max_idx;
+-    get_block_index(max_point, max_idx);
+-
+-    if (!load_blocks(min_idx, max_idx))
+-      return;
+-
+-    // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-    for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-    {
+-      for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-      {
+-        for (int i = min_idx.x(); i <= max_idx.x();i++)
+-        {
+-          boxm_block<T>* block = blocks_(i,j,k);
+-          vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-          // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-          // if this is not done, the endpoint may be out of bounds
+-          vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                                 local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-          T *tree = block->get_tree();
+-          if (!tree)
+-            continue;
+-
+-          tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
+-
+-          std::string path = gen_block_path(i,j,k);
+-          vsl_b_ofstream os(path);
+-          block->b_write(os, save_internal_nodes_, save_platform_independent_);
+-        }
+-      }
+-    }
+-  }
+-
+-  unload_active_blocks();
+-  return;
+-}
+-
+-
+-//: Locate point
+-template <class T>
+-boct_tree_cell<typename T::loc_type, typename T::datatype>* boxm_scene<T>::locate_point_in_memory(vgl_point_3d<double> &p, unsigned level)
+-{
+-  // get the indices for the block containing this point
+-  vgl_point_3d<int> block_idx;
+-  if (!get_block_index(p, block_idx))
+-    return nullptr;
+-
+-#ifdef DEBUG
+-  std::cout << "Requesting blocks : "<< block_idx<< '\n'
+-           << "Active blocks :" << std::endl;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
+-  for (; it!=active_blocks_.end(); it++) {
+-    std::cout << *it << std::endl;
+-    boxm_block<T > *block = get_block(*it);
+-    if (!block)
+-      std::cerr << " NULL block\n";
+-    T *tree = block->get_tree();
+-    if (!tree)
+-      std::cerr << " NULL tree\n";
+-  }
+-#endif
+-
+-  // get the block, if block is not already in memory, return null
+-  boxm_block<T>* block = blocks_(block_idx.x(), block_idx.y(), block_idx.z());
+-  if (!block) {
+-    std::cerr << "In locate_point_in_memory: NULL block\n";
+-    return nullptr;
+-  }
+-  T *tree = block->get_tree();
+-  if (!tree) {
+-    std::cerr << "In locate_point_in_memory: NULL tree\n";
+-    return nullptr;
+-  }
+-  return tree->locate_point_global(p, (short)level);
+-}
+-
+-/************************************************ BOXM_BLOCK_ITERATOR *******************************************/
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::begin()
+-{
+-  i_=j_=k_=0;
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_block_iterator<T>::end()
+-{
+-  int x,y,z;
+-  scene_->block_num(x,y,z);
+-
+-  // if ((i_==x-1) && (j_==y-1) && (k_==z-1))
+-  bool end = (k_==z || k_ == -1);
+-
+-  //:If end, release memory
+-  if (end)
+-    scene_->unload_active_blocks();
+-
+-  return end;
+-}
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::operator=(const boxm_block_iterator<T>& that)
+-{
+-  this->i_ = that.i_;
+-  this->j_ = that.j_;
+-  this->k_ = that.k_;
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_block_iterator<T>::operator==(const boxm_block_iterator<T>& that)
+-{
+-  return (this->i_ == that.i_) && (this->j_ == that.j_) && (this->k_ == that.k_) && (this->scene_ == that.scene_);
+-}
+-
+-template <class T>
+-bool boxm_block_iterator<T>::operator!=(const boxm_block_iterator<T>& that)
+-{
+-  return (this->i_ != that.i_) || (this->j_ != that.j_) == (this->k_ != that.k_) || (this->scene_ != that.scene_);
+-}
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::operator++()
+-{
+-  int x,y,z;
+-  scene_->block_num(x,y,z);
+-
+-  if (++i_==x) {
+-    i_=0;
+-    if (++j_==y) {
+-      j_=0;
+-      ++k_;
+-    }
+-  }
+-  return *this;
+-}
+-
+-template <class T>
+-boxm_block_iterator<T> boxm_block_iterator<T>::operator++(int)
+-{
+-  boxm_block_iterator<T> old = *this;
+-  ++*this;
+-  return old;
+-}
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::operator--()
+-{
+-  int x,y,z;
+-
+-  scene_->block_num(x,y,z);
+-  if (--i_==-1) {
+-    i_=0;
+-    if (--j_==-1) {
+-      j_=0;
+-      k_--;
+-    }
+-  }
+-  return *this;
+-}
+-
+-template <class T>
+-boxm_block<T>* boxm_block_iterator<T>::operator*()
+-{
+-  return scene_->get_block(i_,j_,k_);
+-}
+-
+-template <class T>
+-boxm_block<T>*  boxm_block_iterator<T>::operator->()
+-{
+-  return scene_->get_block(i_,j_,k_);
+-}
+-
+-/************************************************ BOXM_CELL_ITERATOR *******************************************/
+-template <class T>
+-boxm_cell_iterator<T>& boxm_cell_iterator<T>::begin(bool use_internal_cells)
+-{
+-  use_internal_cells_= use_internal_cells;
+-
+-  // unload all blocks from memory
+-  block_iterator_.scene_->unload_active_blocks();
+-  block_iterator_.begin();
+-
+-  // load active block using function pointer, retrieve pointer to all cells
+-  (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
+-  T *tree = (*block_iterator_)->get_tree();
+-  assert(tree != nullptr);
+-  if(use_internal_cells_)
+-    cells_=tree->all_cells();
+-  else
+-    cells_ = tree->leaf_cells();
+-  cells_iterator_ = cells_.begin();
+-
+-  std::cout << "Cell iterator: # of cells: " << cells_.size() << std::endl;
+-
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_cell_iterator<T>::end()
+-{
+-  bool end = false;
+-
+-  end = cells_.empty() || (block_iterator_.end() && (cells_iterator_ == cells_.end()));
+-
+-  if (end)
+-    block_iterator_.scene_->unload_active_blocks();
+-
+-  return end;
+-}
+-
+-template <class T>
+-boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator=(const boxm_cell_iterator<T>& /*that*/)
+-{
+-  std::cerr << "assignment operator not yet implemented\n";
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_cell_iterator<T>::operator==(const boxm_cell_iterator<T>& that)
+-{
+-  return (this->block_iterator_ == that.block_iterator_) && (this->cells_iterator_ == that.cells_iterator_);
+-}
+-
+-template <class T>
+-bool boxm_cell_iterator<T>::operator!=(const boxm_cell_iterator<T>& that)
+-{
+-  return (this->block_iterator_ != that.block_iterator_) && (this->cells_iterator_ != that.cells_iterator_);
+-}
+-
+-//: Prefix operator.
+-//  When the end of the block is reached, it writes the block to disk and loads the next one, unless the read_only flag was set
+-template <class T>
+-boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator++()
+-{
+-  if (++cells_iterator_ == cells_.end())
+-  {
+-    if (!read_only_)
+-      block_iterator_.scene_->write_active_block(false);
+-
+-    ++block_iterator_;
+-
+-    if (!block_iterator_.end())
+-    {
+-      // load active block using function pointer, retrieve pointer to all cells
+-      (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
+-      T *tree = (*block_iterator_)->get_tree();
+-      assert(tree != nullptr);
+-
+-      if(use_internal_cells_)
+-        cells_=tree->all_cells();
+-      else
+-        cells_ = tree->leaf_cells();
+-
+-      cells_iterator_ = cells_.begin();
+-    }
+-  }
+-  return *this;
+-}
+-
+-template <class T>
+-boxm_cell_iterator<T> boxm_cell_iterator<T>::operator+=(unsigned const &rhs)
+-{
+-  // is there a more efficient way to do this whitout messing all the iterator up?
+-  for (unsigned i =0; i<rhs; ++i)
+-    ++(*this);
+-
+-  return *this;
+-}
+-
+-
+-template <class T>
+-boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>* boxm_cell_iterator<T>::operator*()
+-{
+-  return *cells_iterator_;
+-}
+-
+-template <class T>
+-boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>*  boxm_cell_iterator<T>::operator->()
+-{
+-  return *cells_iterator_;
+-}
+-
+-template<class T>
+-vgl_point_3d<double> boxm_cell_iterator<T>::global_origin()
+-{
+-  return (*block_iterator_)->get_tree()->global_origin(*cells_iterator_);
+-}
+-
+-template<class T>
+-vgl_point_3d<double> boxm_cell_iterator<T>::global_centroid()
+-{
+-  return (*block_iterator_)->get_tree()->global_centroid(*cells_iterator_);
+-}
+-
+-//: Return the global length of this cell
+-template<class T>
+-double boxm_cell_iterator<T>::length()
+-{
+-  return (*block_iterator_)->get_tree()->cell_length(*cells_iterator_)*(*block_iterator_)->bounding_box().width();
+-}
+-
+-/******************************************* I/ O *******************************************************/
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene)
+-{
+-  scene.b_write(os);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene)
+-{
+-  scene->b_write(os);
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene)
+-{
+-  scene.b_read(is);
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene)
+-{
+-  scene->b_read(is);
+-}
+-
+-#define BOXM_SCENE_INSTANTIATE(T) \
+-template class boxm_scene<T >; \
+-template void x_write(std::ostream&, boxm_scene<T >&, std::string); \
+-template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const &scene); \
+-template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const * &scene); \
+-template void vsl_b_read(vsl_b_istream & is, boxm_scene<T >  &scene); \
+-template void vsl_b_read(vsl_b_istream & is, boxm_scene<T > * &scene)
+-
+-#define BOXM_BLOCK_ITERATOR_INSTANTIATE(T) \
+-template class boxm_block_iterator<T >; \
+-template class boxm_cell_iterator<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_scene_base.cxx
+deleted file mode 100644
+index 11fb0faf88..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_base.cxx
++++ /dev/null
+@@ -1,35 +0,0 @@
+-#include <iostream>
+-#include <cstdio>
+-#include "boxm_scene_base.h"
+-#include "boxm_scene_parser.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bool boxm_scene_base::load_scene(const std::string& filename, boxm_scene_parser& parser)
+-{
+-
+-  if (filename.size() > 0) {
+-    std::FILE* xmlFile = std::fopen(filename.c_str(), "r");
+-    if (!xmlFile){
+-    std::cerr << filename.c_str() << " error on opening" << std::endl;
+-    return false;
+-    }
+-    if (!parser.parseFile(xmlFile)) {
+-      std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
+-               << parser.XML_GetCurrentLineNumber() << '\n';
+-      std::fclose(xmlFile);
+-      return false;
+-    }
+-    std::fclose(xmlFile);
+-  }
+-  else
+-    std::cerr << " Filename is empty" << std::endl;
+-
+-  parser.paths(scene_path_, block_pref_);
+-  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
+-  multi_bin_ = parser.multi_bin();
+-  parser.levels(max_tree_level_, init_tree_level_);
+-  filename_ = filename;
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.h b/contrib/brl/bseg/boxm/boxm_scene_base.h
+deleted file mode 100644
+index 5e52195ac3..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_base.h
++++ /dev/null
+@@ -1,85 +0,0 @@
+-#ifndef boxm_scene_base_h_
+-#define boxm_scene_base_h_
+-//:
+-// \file
+-// \brief  The main class to keep the 3D world data and pieces
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vbl/vbl_ref_count.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <vbl/vbl_smart_ptr.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-
+-class boxm_scene_parser;
+-
+-class boxm_scene_base : public vbl_ref_count
+-{
+- public:
+-  boxm_scene_base()
+-  : app_model_(BOXM_APM_UNKNOWN), multi_bin_(false), tree_level_set_(false),
+-    scene_path_(""), filename_(""), block_pref_(""), max_tree_level_(0), init_tree_level_(0) {}
+-
+-  ~boxm_scene_base() override = default;
+-
+-  bool load_scene(const std::string& filename, boxm_scene_parser& parser);
+-
+-  boxm_apm_type appearence_model() { return app_model_; }
+-
+-  void set_appearance_model(boxm_apm_type model) { app_model_ = model; }
+-
+-  void set_bin_option(bool multi_bin) { multi_bin_ = multi_bin; }
+-
+-  void set_octree_levels(unsigned max, unsigned init, bool tree_level_set=true)
+-  {
+-    max_tree_level_=max;
+-    init_tree_level_=init;
+-    tree_level_set_=tree_level_set;
+-  }
+-
+-  void set_paths(std::string scene_path, std::string block_prefix)
+-  {
+-    scene_path_ = scene_path;
+-    block_pref_=block_prefix;
+-  }
+-
+-  bool multi_bin() const { return multi_bin_; }
+-
+-  bool parse_config(std::string xml, boxm_scene_parser& parser, bool filename);
+-
+-  unsigned max_level() const { return max_tree_level_; }
+-  unsigned init_level() const { return init_tree_level_; }
+-  std::string filename() const { return filename_; }
+-
+-  virtual vgl_box_3d<double> get_world_bbox() const { return {}; }
+-  virtual vgl_vector_3d<unsigned> world_dim() const { return {}; }
+-
+- protected:
+-  boxm_apm_type app_model_;
+-
+-  bool multi_bin_;
+-
+-  //: it is set to true when max and init tree levels are given
+-  bool tree_level_set_;
+-
+-  std::string scene_path_;
+-  std::string filename_;
+-  std::string block_pref_;
+-
+-  //: maximum octree levels allowed
+-  unsigned max_tree_level_;
+-
+-  //: number of initial octree levels created at the tree creation step
+-  unsigned init_tree_level_;
+-};
+-
+-typedef vbl_smart_ptr<boxm_scene_base> boxm_scene_base_sptr;
+-
+-#endif // boxm_scene_base_h_
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx b/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
+deleted file mode 100644
+index be04cb28ed..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
++++ /dev/null
+@@ -1,277 +0,0 @@
+-//:
+-// \file
+-// \brief Parses the configuration file for bwm tool.
+-//
+-#include <sstream>
+-#include <cstring>
+-#include <iostream>
+-#include <cstdio>
+-#include "boxm_scene_parser.h"
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-// --------------
+-// --- PARSER ---
+-// --------------
+-template <typename T>
+-void convert(const char* t, T& d)
+-{
+-  std::stringstream strm(t);
+-  strm >> d;
+-}
+-
+-boxm_scene_parser::boxm_scene_parser()
+-{
+-  init_params();
+-}
+-
+-bool boxm_scene_parser::lvcs(vpgl_lvcs& lvcs) {
+-  vpgl_lvcs::cs_names cs_name = vpgl_lvcs::str_to_enum(lvcs_cs_name_.data());
+-  vpgl_lvcs::LenUnits len_unit;
+-  vpgl_lvcs::AngUnits geo_unit;
+-   if (std::strcmp(lvcs_XYZ_unit_.data(), "feet")==0) {
+-     len_unit = vpgl_lvcs::FEET;
+-   }
+-   else if (std::strcmp(lvcs_XYZ_unit_.data(), "meters")==0) {
+-     len_unit = vpgl_lvcs::METERS;
+-   }
+-   else {
+-     std::cout << "LVCS Length Unit " << lvcs_XYZ_unit_ << " is not valid\n";
+-     return false;
+-   }
+-
+-   if (std::strcmp(lvcs_geo_angle_unit_.data(), "radians")==0) {
+-     geo_unit = vpgl_lvcs::RADIANS;
+-   }
+-   else if (std::strcmp(lvcs_geo_angle_unit_.data(), "degrees")==0) {
+-     geo_unit = vpgl_lvcs::DEG;
+-   }
+-   else {
+-     std::cout << "LVCS Geo Angle Unit " << lvcs_geo_angle_unit_ << " is not valid\n";
+-     return false;
+-   }
+-
+-   lvcs = vpgl_lvcs(lvcs_origin_lat_,lvcs_origin_lon_,lvcs_origin_elev_, cs_name,
+-                  lvcs_lat_scale_, lvcs_lon_scale_, geo_unit, len_unit,
+-                  lvcs_local_origin_x_, lvcs_local_origin_y_, lvcs_theta_);
+-  return true;
+-}
+-
+-void boxm_scene_parser::init_params()
+-{
+-  lvcs_cs_name_="";
+-  lvcs_origin_lon_=0;
+-  lvcs_origin_lat_=0;
+-  lvcs_origin_elev_=0;
+-  lvcs_lon_scale_=0;
+-  lvcs_lat_scale_=0;
+-  lvcs_XYZ_unit_="";
+-  lvcs_geo_angle_unit_="";
+-  lvcs_local_origin_x_=0;
+-  lvcs_local_origin_y_=0;
+-  lvcs_theta_=0;
+-
+-  // world origin
+-  local_orig_x_=0;
+-  local_orig_y_=0;
+-  local_orig_z_=0;
+-
+-  // block dimensions
+-  block_dim_x_=0;
+-  block_dim_y_=0;
+-  block_dim_z_=0;
+-
+-  // block numbers
+-  block_num_x_=0;
+-  block_num_y_=0;
+-  block_num_z_=0;
+-
+-  path_="";
+-  block_pref_="";
+-  save_internal_nodes_ = false;
+-  save_platform_independent_ = true;
+-  load_all_blocks_=false;
+-  p_init_=0.01f;
+-  num_buffers_init_ = 0;
+-  size_buffer_init_ = 0;
+-}
+-
+-void
+-boxm_scene_parser::startElement(const char* name, const char** atts)
+-{
+-#if 0
+-  std::cout<< "element=" << name << std::endl;
+-#endif
+-  if (std::strcmp(name, LVCS_TAG) == 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-        if (std::strcmp(atts[i], "cs_name") == 0)
+-        convert(atts[i+1], lvcs_cs_name_);
+-      else if (std::strcmp(atts[i], "origin_lon") == 0)
+-        convert(atts[i+1], lvcs_origin_lon_);
+-      else if (std::strcmp(atts[i], "origin_lat") == 0)
+-        convert(atts[i+1], lvcs_origin_lat_);
+-      else if (std::strcmp(atts[i], "origin_elev") == 0)
+-        convert(atts[i+1], lvcs_origin_elev_);
+-      else if (std::strcmp(atts[i], "lon_scale") == 0)
+-        convert(atts[i+1], lvcs_lon_scale_);
+-      else if (std::strcmp(atts[i], "lat_scale") == 0)
+-        convert(atts[i+1], lvcs_lat_scale_);
+-      else if (std::strcmp(atts[i], "local_XYZ_unit") == 0)
+-        convert(atts[i+1], lvcs_XYZ_unit_);
+-      else if (std::strcmp(atts[i], "geo_angle_unit") == 0)
+-        convert(atts[i+1], lvcs_geo_angle_unit_);
+-      else if (std::strcmp(atts[i], "local_origin_x") == 0)
+-        convert(atts[i+1], lvcs_local_origin_x_);
+-      else if (std::strcmp(atts[i], "local_origin_y") == 0)
+-        convert(atts[i+1], lvcs_local_origin_y_);
+-      else if (std::strcmp(atts[i], "theta_") == 0)
+-        convert(atts[i+1], lvcs_theta_);
+-    }
+-  }
+-  else if (std::strcmp(name,LOCAL_ORIGIN_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-        if (std::strcmp(atts[i], "x") == 0)
+-        convert(atts[i+1], local_orig_x_);
+-      else if (std::strcmp(atts[i], "y") == 0)
+-        convert(atts[i+1], local_orig_y_);
+-      else if (std::strcmp(atts[i], "z") == 0)
+-        convert(atts[i+1], local_orig_z_);
+-    }
+-  }
+-  else if (std::strcmp(name,BLOCK_DIMENSIONS_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-        if (std::strcmp(atts[i], "x") == 0)
+-        convert(atts[i+1], block_dim_x_);
+-      else if (std::strcmp(atts[i], "y") == 0)
+-        convert(atts[i+1], block_dim_y_);
+-      else if (std::strcmp(atts[i], "z") == 0)
+-        convert(atts[i+1], block_dim_z_);
+-    }
+-  }
+-  else if (std::strcmp(name,BLOCK_NUM_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "x_dimension") == 0)
+-        convert(atts[i+1], block_num_x_);
+-      else if (std::strcmp(atts[i], "y_dimension") == 0)
+-        convert(atts[i+1], block_num_y_);
+-      else if (std::strcmp(atts[i], "z_dimension") == 0)
+-        convert(atts[i+1], block_num_z_);
+-    }
+-  }
+-  else if (std::strcmp(name,SCENE_PATHS_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "path") == 0)
+-        convert(atts[i+1], path_);
+-      else if (std::strcmp(atts[i], "block_prefix") == 0)
+-        convert(atts[i+1], block_pref_);
+-    }
+-  }
+-  else if (std::strcmp(name,APP_MODEL_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "type") == 0)
+-        convert(atts[i+1], app_model_);
+-    }
+-  }
+-  else if (std::strcmp(name,MULTI_BIN_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], multi_bin_);
+-    }
+-  }
+-  else if (std::strcmp(name,SAVE_INTERNAL_NODES_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], save_internal_nodes_);
+-    }
+-  }
+-  else if (std::strcmp(name,SAVE_PLATFORM_INDEPENDENT_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], save_platform_independent_);
+-    }
+-    //std::cout << "parser: save_platform_independent_ = " << save_platform_independent_ << std::endl;
+-  }
+-  else if (std::strcmp(name,LOAD_ALL_BLOCKS_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], load_all_blocks_);
+-    }
+-    //std::cout << "parser: load_all_blocks_ = " << load_all_blocks_ << std::endl;
+-  }
+-
+-  else if (std::strcmp(name, "octree_level")==0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "max") == 0)
+-        convert(atts[i+1], max_tree_level_);
+-      else if (std::strcmp(atts[i], "init") == 0)
+-        convert(atts[i+1], init_tree_level_);
+-    }
+-  }
+-  else if (std::strcmp(name, "p_init")==0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-    if (std::strcmp(atts[i], "val") == 0)
+-        convert(atts[i+1], p_init_);
+-    }
+-  }
+-
+-  else if (std::strcmp(name, "tree_init") == 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "num_buffers")==0)
+-        convert(atts[i+1], num_buffers_init_);
+-      if (std::strcmp(atts[i], "buff_size")==0)
+-        convert(atts[i+1], size_buffer_init_);
+-    }
+-  }
+-
+-  else if (std::strcmp(name, "max_mb") == 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "mb") == 0)
+-        convert(atts[i+1], max_mb_);
+-    }
+-  }
+-
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.h b/contrib/brl/bseg/boxm/boxm_scene_parser.h
+deleted file mode 100644
+index cbda358d2d..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_parser.h
++++ /dev/null
+@@ -1,108 +0,0 @@
+-#ifndef boxm_scene_parser_h_
+-#define boxm_scene_parser_h_
+-
+-#include <iostream>
+-#include <string>
+-#include <boxm/boxm_scene.h>
+-
+-#ifdef WIN32
+- #define _LIB
+-#endif
+-#include <expatpp.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-
+-#define LVCS_TAG "lvcs"
+-#define LOCAL_ORIGIN_TAG "local_origin"
+-#define BLOCK_DIMENSIONS_TAG "block_dimensions"
+-#define BLOCK_NUM_TAG "blocks"
+-#define SCENE_PATHS_TAG "scene_paths"
+-#define APP_MODEL_TAG "appearence_model"
+-#define MULTI_BIN_TAG "multi_bin"
+-#define SAVE_INTERNAL_NODES_TAG "save_internal_nodes"
+-#define SAVE_PLATFORM_INDEPENDENT_TAG "save_platform_independent"
+-#define LOAD_ALL_BLOCKS_TAG "load_all_blocks"
+-#define OCTREE_LEVELS_TAG "octree_level"
+-#define P_INIT_TAG "p_init"
+-#define TREE_INIT_TAG "tree_init"
+-#define MAX_MB_TAG "max_mb"
+-
+-class boxm_scene_parser : public expatpp
+-{
+- public:
+-  boxm_scene_parser();
+-
+-  ~boxm_scene_parser(void) override = default;
+-
+-   bool lvcs(vpgl_lvcs& lvcs);
+-   vgl_point_3d<double> origin() const { return {local_orig_x_,local_orig_y_,local_orig_z_}; }
+-   vgl_vector_3d<double> block_dim() const { return {block_dim_x_,block_dim_y_,block_dim_z_}; }
+-   vgl_vector_3d<unsigned> block_nums() const { return {block_num_x_,block_num_y_,block_num_z_}; }
+-   void paths(std::string& scene_path, std::string& block_pref) { scene_path=path_; block_pref=block_pref_; }
+-   std::string app_model() const { return app_model_; }
+-   bool multi_bin() const { return multi_bin_; }
+-   void levels(unsigned& max, unsigned& init) { max = max_tree_level_; init=init_tree_level_; }
+-   bool save_internal_nodes() const { return save_internal_nodes_; }
+-   bool save_platform_independent() const { return save_platform_independent_; }
+-   bool load_all_blocks() const { return load_all_blocks_; }
+-   void tree_buffer_shape(int &num_buffers, int &buff_size) { num_buffers = num_buffers_init_; buff_size = size_buffer_init_; }
+-   int max_mb() const { return max_mb_; }
+-
+-   float p_init() const { return p_init_; }
+-
+- private:
+-  void startElement(const XML_Char* name, const XML_Char** atts) override;
+-  void endElement(const XML_Char* /*name*/) override {}
+-  void charData(const XML_Char* /*s*/, int /*len*/) override {}
+-
+-  void init_params();
+-
+-  // temporary values
+-  //lvcs
+-  std::string lvcs_cs_name_;
+-  double lvcs_origin_lon_;
+-  double lvcs_origin_lat_;
+-  double lvcs_origin_elev_;
+-  double lvcs_lon_scale_;
+-  double lvcs_lat_scale_;
+-  std::string lvcs_XYZ_unit_;
+-  std::string lvcs_geo_angle_unit_;
+-  double lvcs_local_origin_x_;
+-  double lvcs_local_origin_y_;
+-  double lvcs_theta_;
+-
+-  // world origin
+-  double local_orig_x_;
+-  double local_orig_y_;
+-  double local_orig_z_;
+-
+-  // block dimensions
+-  double block_dim_x_;
+-  double block_dim_y_;
+-  double block_dim_z_;
+-
+-  // block numbers
+-  unsigned block_num_x_;
+-  unsigned block_num_y_;
+-  unsigned block_num_z_;
+-
+-  std::string path_;
+-  std::string block_pref_;
+-  std::string app_model_;
+-  bool multi_bin_;
+-  unsigned max_tree_level_;
+-  unsigned init_tree_level_;
+-  bool save_internal_nodes_;
+-  bool save_platform_independent_;
+-  bool load_all_blocks_;
+-  float p_init_;
+-  int num_buffers_init_, size_buffer_init_;
+-  int max_mb_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
+deleted file mode 100644
+index 4c0cd29038..0000000000
+--- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and bvxm_prodepends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-  set(boxm_pro_sources
+-      boxm_processes.h
+-      boxm_register.h   boxm_register.cxx
+-     )
+-
+-  aux_source_directory(Templates boxm_pro_sources)
+-  aux_source_directory(processes boxm_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_pro LIBRARY_SOURCES ${boxm_pro_sources})
+-
+-  target_link_libraries(boxm_pro boxm boxm_util boxm_sample_algo boxm_sample vpgl_pro imesh bprb brdb brip vsol bsta bsta_pro ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+deleted file mode 100644
+index fb055c2df5..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<float,3> vector;
+-
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+deleted file mode 100644
+index ac40b5ec2d..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+deleted file mode 100644
+index 24334a0ce4..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-typedef boct_tree<short,vnl_vector_fixed<float,3> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+deleted file mode 100644
+index 5de38b0662..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx b/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
+deleted file mode 100644
+index d1cce77af7..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.h>
+-#include <boct/boct_tree.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-typedef boct_tree<short,vnl_vector_fixed<float,3> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/pro/boxm_processes.h b/contrib/brl/bseg/boxm/pro/boxm_processes.h
+deleted file mode 100644
+index 4466447bb1..0000000000
+--- a/contrib/brl/bseg/boxm/pro/boxm_processes.h
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#ifndef boxm_processes_h_
+-#define boxm_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_load_scene_process);
+-DECLARE_FUNC_CONS(boxm_create_scene_process);
+-DECLARE_FUNC_CONS(boxm_construct_scene_from_image_process);
+-DECLARE_FUNC_CONS(boxm_proj_local_cam_process);
+-DECLARE_FUNC_CONS(boxm_camera_viewing_scene_process);
+-DECLARE_FUNC_CONS(boxm_upload_mesh_process);
+-DECLARE_FUNC_CONS(boxm_clean_scene_process);
+-DECLARE_FUNC_CONS(boxm_force_write_blocks_process);
+-#endif
+diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.cxx b/contrib/brl/bseg/boxm/pro/boxm_register.cxx
+deleted file mode 100644
+index 631b5beadc..0000000000
+--- a/contrib/brl/bseg/boxm/pro/boxm_register.cxx
++++ /dev/null
+@@ -1,27 +0,0 @@
+-#include "boxm_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-
+-#include "boxm_processes.h"
+-
+-void boxm_register::register_datatype()
+-{
+-  REGISTER_DATATYPE( boxm_scene_base_sptr );
+-}
+-
+-void boxm_register::register_process()
+-{
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_load_scene_process, "boxmLoadSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_create_scene_process, "boxmCreateSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_proj_local_cam_process,"boxmProjLocalCamProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_camera_viewing_scene_process,"boxmCameraViewingSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_construct_scene_from_image_process, "boxmConstructSceneFromImageProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_upload_mesh_process,"boxmUploadMeshProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_clean_scene_process,"boxmCleanSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_force_write_blocks_process,"boxmForceWriteBlocksProcess");
+-
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.h b/contrib/brl/bseg/boxm/pro/boxm_register.h
+deleted file mode 100644
+index 784df08bde..0000000000
+--- a/contrib/brl/bseg/boxm/pro/boxm_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_register_h_
+-#define boxm_register_h_
+-
+-class boxm_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_register_h_
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
+deleted file mode 100644
+index 799958429f..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
++++ /dev/null
+@@ -1,131 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <cmath>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for generating cameras that view a scene
+-//
+-// \author J.L. Mundy
+-// \date January 23, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <bpgl/algo/bpgl_project.h>
+-#include <vnl/vnl_math.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-//:global variables
+-namespace boxm_camera_viewing_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//:sets input and output types
+-bool boxm_camera_viewing_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_camera_viewing_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";// the scene
+-  input_types_[1] = "vcl_string";//the camera type, e.g. perspective
+-  input_types_[2] = "double";//camera elevation degrees
+-  input_types_[3] = "double";//camera azimuth degrees
+-  input_types_[4] = "double";//radius
+-
+-  input_types_[5] = "unsigned";//image ni
+-  input_types_[6] = "unsigned";//image nj
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "vpgl_camera_double_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:creates a scene from parameters
+-bool boxm_camera_viewing_scene_process(bprb_func_process& pro)
+-{
+-  if ( !pro.verify_inputs()) {
+-    std::cout << pro.name() << "boxm_camera_viewing_scene_process: invalid inputs" << std::endl;
+-    return false;
+-  }
+-  using namespace boxm_camera_viewing_scene_process_globals;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::cout<<"h";
+-  if (!scene_ptr) return false;
+-  std::cout<<"hi";
+-  vgl_box_3d<double> bb =  scene_ptr->get_world_bbox();
+-
+-  std::string cam_type = pro.get_input<std::string>(1);
+-  if (cam_type!="vpgl_perspective_camera")
+-    return false; //later other camera types
+-  auto elevation = pro.get_input<double>(2);
+-  auto azimuth = pro.get_input<double>(3);
+-  auto radius = pro.get_input<double>(4);
+-
+-  auto ni = pro.get_input<unsigned>(5);
+-  auto nj = pro.get_input<unsigned>(6);
+-  auto dni = static_cast<double>(ni), dnj = static_cast<double>(nj);
+-  //
+-  //find a camera that will project the scene bounding box
+-  //entirely inside the image
+-  //
+-  // 1) determine the stare point (center of bounding box)
+-  vgl_point_3d<double> cn = bb.centroid();
+-  vgl_homg_point_3d<double> stpt(cn.x(), cn.y(), cn.z());
+-
+-  // 2) determine camera center
+-  // the viewsphere radius is set to 10x the bounding box diameter
+-  //double w = bb.width(), h = bb.height(), d = bb.depth();
+-  double r = radius;//std::sqrt(w*w + h*h + d*d);
+-  //r *=10;
+-  double deg_to_rad = vnl_math::pi_over_180;
+-  double el = elevation*deg_to_rad, az = azimuth*deg_to_rad;
+-  double cx = r*std::sin(el)*std::cos(az);
+-  double cy = r*std::sin(el)*std::sin(az);
+-  double cz = r*std::cos(el);
+-  vgl_point_3d<double> cent(cx+cn.x(), cy+cn.y(), cz);
+-
+-  // 3) start with a unit focal length and position the camera
+-  vpgl_calibration_matrix<double> K(1.0, vgl_point_2d<double>(ni/2, nj/2));
+-  vgl_rotation_3d<double> R;
+-  auto* cam =
+-    new vpgl_perspective_camera<double>(K, cent, R);
+-
+-  //stare at the center of the scene
+-  vgl_vector_3d<double> up(0.0, 1.0, 0.0);
+-  if (std::fabs(el)<1.0e-3)
+-    cam->look_at(stpt, up);
+-  else
+-    cam->look_at(stpt);
+-
+-  //4) Adjust the focal length so that the box projects into the image
+-  // project the bounding box
+-  vgl_box_2d<double> image_bb = bpgl_project::project_bounding_box(*cam, bb);
+-  // get 2-d box diameter and image diameter
+-  double bw = image_bb.width(), bh = image_bb.height();
+-  double bd = std::sqrt(bw*bw + bh*bh);
+-  double id = std::sqrt(dni*dni + dnj*dnj);
+-  //find the adjusted focal length
+-  double f = id/bd;
+-  K.set_focal_length(f);
+-  cam->set_calibration(K);
+-
+-  std::cout<<"Camera  :" <<*cam<<std::endl;
+-  pro.set_output_val<vpgl_camera_double_sptr>(0, cam);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
+deleted file mode 100644
+index 82051affab..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for removing any previously created scene data from disk
+-//
+-// \author Daniel Crispell
+-// \date Feb 18, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-//:global variables
+-namespace boxm_clean_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned int n_inputs_ = 1;
+-  constexpr unsigned int n_outputs_ = 0;
+-}
+-
+-//:sets input and output types
+-bool boxm_clean_scene_process_cons(bprb_func_process& pro)
+-{
+-  //set output types
+-  using namespace boxm_clean_scene_process_globals;
+-  //process takes 1 input
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: removes data previously associated with scene
+-bool boxm_clean_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_clean_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_clean_scene_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_clean_scene_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->clean_scene();
+-      break;
+-    }
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->clean_scene();
+-      break;
+-    }
+-   case BOXM_APM_MOB_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->clean_scene();
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_clean_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
+deleted file mode 100644
+index 0129877c53..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
++++ /dev/null
+@@ -1,219 +0,0 @@
+-// This is brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to construct an ideal scene for testing
+-//
+-// \author J.L. Mundy
+-// \date January 23, 2010
+-// \verbatim
+-//  Modifications
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-namespace boxm_construct_scene_from_image_process_globals
+-{
+-  // The image area should be a multiple of area unit, e.g. 64.
+-  // This granularity is useful for parallel implementation
+-  template <class T>
+-  void tree_from_image(vil_image_view<float> const& image,
+-                       unsigned area_unit,
+-                       unsigned& base_ni, unsigned& base_nj,
+-                       boct_tree<short, T >*& tree)
+-  {
+-    tree = nullptr;
+-    unsigned ni = image.ni(), nj = image.nj();
+-    // find a square arrangement consistent with area unit
+-    auto gsize = static_cast<double>(area_unit);
+-    auto gwidth = static_cast<unsigned>(std::sqrt(gsize));
+-    unsigned gheight = area_unit/gwidth;
+-    if (gwidth*gheight!=gsize)
+-      return;//maybe fixup later to handle all situations
+-    unsigned mni = (ni/gwidth)*gwidth, mnj = (nj/gheight)*gheight;
+-    double min_dim = mni;
+-    if (mnj<min_dim)
+-      min_dim = mnj;
+-    double dlev = std::log(min_dim)/std::log(2.0);
+-    auto n_levels = static_cast<unsigned>(dlev+1.0);
+-
+-    //note that tree is being constructed in local coordinates
+-    float rni = 1.0f/static_cast<float>(mni), rnj =1.0f/static_cast<float>(mnj);
+-    base_ni = mni; base_nj = mnj;
+-    std::vector<boct_loc_code<short> > leaf_codes;
+-    std::vector<float> image_int;
+-    float upper_v=float(mnj-1)*rnj;
+-    for (unsigned j=0; j<mnj; ++j)
+-      for (unsigned i=0; i<mni; ++i)
+-      {
+-        float u = static_cast<float>(i)*rni;
+-        float v = upper_v-static_cast<float>(j)*rnj;
+-        vgl_point_3d<double> p(u, v, 0.0f);
+-        boct_loc_code<short> loc(p, n_levels-1);
+-        leaf_codes.push_back(loc);
+-        image_int.push_back(image(i,j));
+-      }
+-    //construct leaves
+-    std::vector<boct_tree_cell<short, T > > leaves;
+-    for (auto & leaf_code : leaf_codes) {
+-      boct_tree_cell<short, T > leaf(leaf_code);
+-      leaves.push_back(leaf);
+-    }
+-
+-    //construct tree from leaves
+-    auto *init_tree =
+-      new boct_tree<short, T >(n_levels, 0);
+-    boct_tree_cell<short, T > *root =
+-      init_tree->construct_tree(leaves, init_tree->number_levels());
+-
+-    // construct full tree with leaves and root
+-    //set the global bounding box, assuming a box with depth ni
+-    vgl_box_3d<double> box;
+-    vgl_point_3d<double> p0(0,0,0);
+-    vgl_point_3d<double> p1(mni, mnj, mni);
+-    box.add(p0); box.add(p1);
+-    tree = new boct_tree<short, T >(root, init_tree->number_levels());
+-    tree->set_bbox(box);
+-    delete init_tree;
+-
+-    // fill the leaves with data
+-    std::vector<boct_tree_cell<short, T >* > tleaves;
+-    tleaves = tree->leaf_cells();
+-    std::size_t i = 0;
+-    auto lit =
+-      tleaves.begin();
+-    for (; lit!= tleaves.end(); ++lit, ++i)
+-    {
+-      boct_loc_code<short> code = (*lit)->get_code();
+-      bool found = false;
+-      unsigned found_k = 0;
+-      for (unsigned k = 0; k<leaf_codes.size()&&!found; ++k)
+-        if (code == leaf_codes[k]) {
+-          found = true;
+-          found_k = k;
+-        }
+-      if (auto * cell_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >* >(*lit))
+-      {
+-        if (found) {
+-          boxm_sample<BOXM_APM_SIMPLE_GREY> data(1.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(image_int[found_k],0.0008f));
+-          cell_grey_ptr->set_data(data);
+-        }
+-        else {
+-          boxm_sample<BOXM_APM_SIMPLE_GREY> data(0.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.0f,0.0008f));
+-          cell_grey_ptr->set_data(data);
+-        }
+-      }
+-      else if (auto * cell_mog_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> >* >(*lit))
+-      {
+-        if (found) {
+-          boxm_sample<BOXM_APM_MOG_GREY> data(1.0f);
+-          typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_processor aproc;
+-          aproc::update(data.appearance(),image_int[found_k],1.0);
+-          cell_mog_grey_ptr->set_data(data);
+-        }
+-        else {
+-          boxm_sample<BOXM_APM_MOG_GREY> data(0.0f);
+-          cell_mog_grey_ptr->set_data(data);
+-        }
+-      }
+-      else if (auto * cell_float_ptr
+-               =reinterpret_cast<boct_tree_cell<short, float >* >(*lit))
+-      {
+-        if (found) {
+-          float data(1.0f);
+-          cell_float_ptr->set_data(data);
+-        }
+-      }
+-    }
+-  }
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_construct_scene_from_image_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_construct_scene_from_image_process_globals;
+-
+-  //input[0]: The image view
+-  //input[1]: appearance model type
+-  //input[2]: scene directory
+-  //input[3]: scene xml path
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-
+-  //output[0]: The scene
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0]=  "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_construct_scene_from_image_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_construct_scene_from_image_process_globals;
+-
+-  if ( !pro.verify_inputs()){
+-    std::cerr << pro.name() << "boxm_construct_scene_from_image_process: invalid inputs\n";
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  std::string app_type =  pro.get_input<std::string>(i++);
+-  std::string scene_dir =  pro.get_input<std::string>(i++);
+-  std::string xml_path =  pro.get_input<std::string>(i++);
+-  if (image == nullptr) {
+-    std::cerr << "boxm_construct_scene_from_image_process: null image value, cannot run\n";
+-    return false;
+-  }
+-
+-  vil_image_view<float> img = *vil_convert_cast(float(), image);
+-  if (image->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
+-    vil_math_scale_values(img,1.0/255.0);
+-
+-  unsigned base_ni =0, base_nj=0;
+-  std::string block_prefix = "ideal";
+-  boxm_scene_base_sptr scene_base = nullptr;
+-  if (app_type == "simple_grey")
+-  {
+-    typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
+-    boct_tree<short, data_type>* tree = nullptr;
+-    tree_from_image<data_type>(img, 16, base_ni, base_nj,tree);
+-    if (tree == nullptr) return false;
+-    boxm_block<boct_tree<short, data_type> >* blk =
+-      new boxm_block<boct_tree<short, data_type> >(tree->bounding_box(), tree);
+-    vgl_box_3d<double> bb = blk->bounding_box();
+-    vgl_point_3d<double> origin(0,0,0);
+-    vgl_vector_3d<double> block_dim(bb.width(),bb.height(),bb.depth());
+-    vgl_vector_3d<unsigned> world_dim(1,1,1);
+-    auto* scene
+- = new boxm_scene<boct_tree<short, data_type> >(origin, block_dim, world_dim);
+-    scene->set_appearance_model(BOXM_APM_SIMPLE_GREY);
+-    scene->set_block(vgl_point_3d<int>(0,0,0), blk);
+-    scene->set_path(scene_dir, block_prefix);
+-    scene->write_scene(xml_path);
+-    scene->write_active_block();
+-    scene_base = scene;
+-  }
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene_base);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
+deleted file mode 100644
+index d2abb94b67..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
++++ /dev/null
+@@ -1,218 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for creating a new boxm_scene when there is not a saved one.
+-//        It receives the parameters from a parameter file in XML
+-//
+-// \author Gamze Tunali
+-// \date Apr 21, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_parser.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-//:global variables
+-namespace boxm_create_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//:sets input and output types
+-bool boxm_create_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:creates a scene from parameters
+-bool boxm_create_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_process_globals;
+-  std::string fname = pro.get_input<std::string>(0);
+-
+-  boxm_scene_parser parser;
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-  scene_ptr->load_scene(fname, parser);
+-  std::cout << "Scene path: " << scene_ptr->filename()<< '\n'
+-           << "Scene appearance: " <<scene_ptr->appearence_model()<< std::endl;
+-
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-    else {
+-      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      std::cout<<"Multi Bin set"<<std::endl;
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-    else {
+-      std::cout<<"Multi Bin for BOXM_APM_MOB_GREY is not defined yet"<<std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-#if 0
+-    else {
+-      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      boxm_scene<tree_type>* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      std::cout<<"Multi Bin set"<<std::endl;
+-      scene_ptr = scene;
+-    }
+-#endif
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_FLOAT) {
+-      if (!scene_ptr->multi_bin())
+-      {
+-        typedef boct_tree<short,float> tree_type;
+-        auto* scene = new boxm_scene<tree_type>();
+-        scene->load_scene(fname);
+-        scene_ptr = scene;
+-        std::cout << "Scene path: " << scene->filename()<< std::endl;
+-      }
+-  }
+-  else if (scene_ptr->appearence_model() == VNL_FLOAT_3) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,vnl_vector_fixed<float, 3> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      scene_ptr = scene;
+-      std::cout << "Loading scene of type vnl_float_3" << '\n'
+-               << "Scene path: " << scene->filename()<< std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == VNL_FLOAT_10) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,vnl_vector_fixed<float, 10> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      scene_ptr = scene;
+-      std::cout << "Loading scene of type vnl_float_10" << '\n'
+-               << "Scene path: " << scene->filename()<< std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_BOOL) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bool> tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      scene_ptr = scene;
+-      std::cout << "Scene path: " << scene->filename()<< std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BSTA_MOG_F1) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BSTA_GAUSS_F1) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bsta_num_obs<bsta_gauss_sf1> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
+-    typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
+-    auto* scene = new boxm_scene<tree_type>();
+-    scene->load_scene(parser);
+-    scene_ptr = scene;
+-  }
+-  else {
+-    std::cerr << "boxm_create_scene_process: undefined APM type\n";
+-    return false;
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
+deleted file mode 100644
+index dba8e9687e..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for removing any previously created scene data from disk
+-//
+-// \author Daniel Crispell
+-// \date Feb 18, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-//:global variables
+-namespace boxm_force_write_blocks_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned int n_inputs_ = 1;
+-  constexpr unsigned int n_outputs_ = 0;
+-}
+-
+-//:sets input and output types
+-bool boxm_force_write_blocks_process_cons(bprb_func_process& pro)
+-{
+-  //set output types
+-  using namespace boxm_force_write_blocks_process_globals;
+-  //process takes 1 input
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: removes data previously associated with scene
+-bool boxm_force_write_blocks_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_force_write_blocks_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_force_write_blocks_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_force_write_blocks_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->force_write_blocks();
+-      break;
+-    }
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->force_write_blocks();
+-      break;
+-    }
+-   case BOXM_APM_MOB_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->force_write_blocks();
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_force_write_blocks_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
+deleted file mode 100644
+index 59808debc7..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
++++ /dev/null
+@@ -1,73 +0,0 @@
+-// This is brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date April 14, 2009
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-namespace boxm_load_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_load_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_load_scene_process_globals;
+-
+-  //process takes 1 input
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  // process has 1 output:
+-  // output[0]: scene sptr
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_load_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_load_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  std::string scene_file = pro.get_input<std::string>(i++);
+-
+-  boxm_scene_base_sptr scene= new boxm_scene_base();
+-  boxm_scene_parser parser;
+-  scene->load_scene(scene_file, parser);
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-    auto *s = new boxm_scene<tree_type>();
+-    s->load_scene(parser);
+-   // scene.unref(scene);
+-    scene = s;
+-  } else {
+-    std::cout << "boxm_load_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  // store scene smaprt pointer
+-  pro.set_output_val<boxm_scene_base_sptr>(j++, scene);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
+deleted file mode 100644
+index b250a33a61..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
++++ /dev/null
+@@ -1,103 +0,0 @@
+-// This is brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for clipping and image based on a 3D bounding box.
+-//        -  Input:
+-//             - Image path (string)
+-//             - boxm_voxel_world_sptr
+-//
+-//        -  Output:
+-//             - modified rational camera "vpgl_camera_double_sptr"
+-//             - clipped image area (NITF) "vil_image_view_base_sptr"
+-//
+-//        -  Params:
+-//             -geographic uncertainty (error) in meters
+-//
+-// \author  Gamze D. Tunali
+-// \date    Feb 19, 2008
+-// \verbatim
+-//  Modifications
+-//   Brandon Mayer - Jan 28, 2009 - converted process-class to function to conform with new boxm_process architecture.
+-// \endverbatim
+-
+-
+-#include <brip/brip_roi.h>
+-
+-//#include <vil/file_formats/vil_nitf2_image.h> // unused?
+-//#include <vil/vil_image_view_base.h> // unused?
+-#include <vpgl/vpgl_local_rational_camera.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-//: globals variables and functions
+-namespace boxm_proj_local_cam_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-//: set input and output types
+-// this process takes 4 inputs:
+-// the camera and the (x,y,z) input coordinates
+-// this process takes 2 outputs:
+-// the (u,v) output coordinates
+-bool boxm_proj_local_cam_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_proj_local_cam_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned  i=0;
+-  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
+-  input_types_[i++] = "float";   // x
+-  input_types_[i++] = "float";   // y
+-  input_types_[i++] = "float";   // z
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j=0;
+-  output_types_[j++] = "float"; // u
+-  output_types_[j++] = "float"; // v
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-bool boxm_proj_local_cam_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_proj_local_cam_process_globals;
+-  //static const parameters
+-  static const std::string error = "error";
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs:
+-  unsigned i = 0;
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  float X=0.0,Y=0.0,Z=0.0;
+-  //voxel_world
+-  X = pro.get_input<float>(i++);
+-  Y = pro.get_input<float>(i++);
+-  Z = pro.get_input<float>(i++);
+-
+-  auto* rat_camera =
+-    dynamic_cast<vpgl_local_rational_camera<double>*> (camera.as_pointer());
+-  if (!rat_camera) {
+-    std::cerr << "The camera input is not a rational camera\n";
+-    return false;
+-  }
+-
+-  double u=0,v=0;
+-  rat_camera->project((double)X,(double)Y,(double)Z,u,v);
+-  //Store outputs
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<float>(j++, float(u));
+-  pro.set_output_val<float>(j++, float(v));
+-
+-  std::cout<<"(u,v):"<<u<<','<<v<<std::endl;
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
+deleted file mode 100644
+index 0488a2cbdb..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
++++ /dev/null
+@@ -1,148 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <sstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for populating the octree with meshes.
+-//         Meshes are in ply format and the grid will be filled with 0's at the faces
+-//         of the meshes.
+-// \author Gamze D. Tunali
+-// \date   July 14, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/algo/boxm_upload_mesh.h>
+-#include <boxm/algo/boxm_fill_in_mesh.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vul/vul_file.h>
+-#include <vul/vul_string.h>
+-
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_fileio.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-namespace boxm_upload_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//: set input and output types
+-bool boxm_upload_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_upload_mesh_process_globals;
+-
+-  // process takes 4 inputs and no output
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i=0;
+-  input_types_[i++]="vcl_string";           //the directory for ply files
+-  input_types_[i++]="boxm_scene_base_sptr"; //scene to be uploaded
+-  input_types_[i++]="bool";                 //true, if mesh vertices are in geo coordinates
+-  input_types_[i++]="vcl_string";                 //true, if mesh vertices are in geo coordinates
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: Execute the process
+-bool boxm_upload_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_upload_mesh_process_globals;
+-  // check number of inputs
+-  if (pro.input_types().size() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  unsigned i=0;
+-  std::string input_path = pro.get_input<std::string>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bool use_lvcs = pro.get_input<bool>(i++);
+-  std::string draw_or_fill = pro.get_input<std::string>(i++);
+-
+-  if (!vul_file::is_directory(input_path)) {
+-    std::cerr << "In boxm_upload_mesh_process -- input path " << input_path<< "is not valid!\n";
+-    return false;
+-  }
+-
+-  // get all the files in the directory
+-  std::stringstream glob;
+-  glob << input_path << "/*.ply*";
+-
+-  std::vector<imesh_mesh> meshes;
+-  for (vul_file_iterator file_it = glob.str().c_str(); file_it; ++file_it)
+-  {
+-    std::string file(file_it());
+-    std::string file_format = vul_file::extension(file);
+-    vul_string_upcase(file_format);
+-
+-
+-    std::cout << "format = " << file_format << '\n'
+-             << "file = " << file << '\n';
+-    // call appropriate load functions to load the M
+-    imesh_mesh mesh;
+-    if (file_format == ".PLY")
+-      imesh_read(file, mesh);
+-    else if (file_format == ".PLY2")
+-      imesh_read_ply2(file, mesh);
+-
+-    meshes.push_back(mesh);
+-  }
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-
+-      boxm_sample<BOXM_APM_MOG_GREY> val(0,boxm_utils::obtain_mog_grey_unit_mode());
+-      if (draw_or_fill=="draw")
+-        std::cout<<"Not yet";
+-        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
+-      else if (draw_or_fill=="fill")
+-        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, meshes, use_lvcs, val);
+-    }
+-    else
+-      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
+-  }
+-  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_simple_grey simplegrey(1.0f,0.1f,1.0f);
+-      boxm_sample<BOXM_APM_SIMPLE_GREY> val(1,simplegrey);
+-      if (draw_or_fill=="draw")
+-        std::cout<<"Not yet";
+-        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
+-      else if (draw_or_fill=="fill")
+-        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, meshes, use_lvcs, val);
+-    }
+-    else
+-      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
+-  }
+-  else {
+-    std::cout << "boxm_upload_mesh_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index f37ad237ce..0000000000
+--- a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_pro_test_include boxm_pro)
+diff --git a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
+deleted file mode 100644
+index 7a3d47df60..0000000000
+--- a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/pro/boxm_processes.h>
+-#include <boxm/pro/boxm_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/sample/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/CMakeLists.txt
+deleted file mode 100644
+index 42618cc7ca..0000000000
+--- a/contrib/brl/bseg/boxm/sample/CMakeLists.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# brl/bseg/boxm/sample/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_sample_sources
+-    boxm_edge_sample.h                        boxm_edge_sample.hxx
+-    boxm_edge_tangent_sample.h                boxm_edge_tangent_sample.hxx
+-    boxm_inf_line_sample.h                    boxm_inf_line_sample.hxx
+-    boxm_opt2_sample.h                        boxm_opt2_sample.hxx
+-    boxm_opt3_sample.h                        boxm_opt3_sample.hxx
+-    boxm_plane_obs.h                          boxm_plane_obs.hxx
+-    boxm_rt_sample.h                          boxm_rt_sample.hxx
+-    boxm_sample.h                             boxm_sample.hxx
+-    boxm_sample_multi_bin.h                   boxm_sample_multi_bin.hxx
+-    boxm_scalar_sample.h                      boxm_scalar_sample.hxx
+-    boxm_vis_implicit_sample.h
+-    boxm_update_sample.h
+-    dummy.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_sample_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_sample LIBRARY_SOURCES ${boxm_sample_sources})
+-target_link_libraries(boxm_sample boxm ${VXL_LIB_PREFIX}vgl_io bsta ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-#processors for the samples
+-add_subdirectory(algo)
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index a08cc93e31..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_edge_sample<float>);
+-BOCT_TREE_INSTANTIATE(short,boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index 130866a26d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
+-BOCT_TREE_INSTANTIATE(short,boxm_inf_line_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 8d3ee3d65a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index ca506845c1..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index c1d7480b1c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOB_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 5eaa3da056..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-// tree with alpha and appearance combined
+-BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOG_GREY>);
+-
+-// tree with appearance
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_INSTANTIATE(short, apm_datatype);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+deleted file mode 100644
+index ef07d67c7a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_SIMPLE_GREY>);
+-
+-// tree with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_INSTANTIATE(short, apm_datatype);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index b45fc2a401..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-BOCT_TREE_INSTANTIATE(short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 7c93436b6a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_scalar_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index 8c4d0a0f82..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_sample<float>);
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index 55b487a7aa..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_inf_line_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 39216280e0..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 3d0b6e71a5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index 9a5432b934..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mob_grey );
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 58cc1cfacf..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_CELL_INSTANTIATE(short,apm_datatype );
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+deleted file mode 100644
+index 28198f869f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_SIMPLE_GREY> boxm_sample_simple_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_simple_grey );
+-
+-// tree with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_CELL_INSTANTIATE(short, apm_datatype);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 1b9ee1e0de..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample_multi_bin.h"
+-
+-typedef boxm_sample_multi_bin<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 78c61bf35e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_scalar_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index 13ae4934e9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boxm_edge_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+-
+-typedef boxm_aux_edge_sample<float> aux_sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index 3744b8ee6f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-
+-typedef boxm_edge_tangent_sample<float> aux_sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
+deleted file mode 100644
+index 08ad36f2ea..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boxm_inf_line_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 18262443a5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-typedef boxm_opt2_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 1784facefe..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-typedef boxm_rt_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index 83cf840aa8..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mob_grey);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 68c063579f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mog_grey);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 81c19507f9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-typedef boxm_scalar_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
+deleted file mode 100644
+index 5e771c97e2..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_edge_sample<float>,boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index a73d09d6f5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_inf_line_sample<float>,boxm_edge_tangent_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index c134345620..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index b8aa7777ee..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 918a3be765..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
+deleted file mode 100644
+index 70bf413567..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 6a0f7d745c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 03014e67ab..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 1b75036c3b..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_scalar_sample<float>);
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_scalar_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
+deleted file mode 100644
+index a27805ad73..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index dc6a48e38b..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,float,boxm_edge_tangent_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index c814f6a8fe..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
+-BOXM_BLOCK_INSTANTIATE(aux_tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index 802a8ca615..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
+deleted file mode 100644
+index 9ef6e210dd..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
+deleted file mode 100644
+index dc6e57af68..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-typedef boct_tree<short,boxm_opt2_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
+deleted file mode 100644
+index ef11cd85a7..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-typedef boct_tree<short,boxm_rt_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index 647e553d5e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index b5e4f8cce0..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index 5a2482adbc..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-
+-// block with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_BLOCK_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 6e13f9977a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
+deleted file mode 100644
+index 0348b21996..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-typedef boct_tree<short,boxm_scalar_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index 0b79668c5f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_edge_sample<float> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short,boxm_aux_edge_sample<float> >  aux_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index ea335e591d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_edge_tangent_sample<float> >  aux_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
+-
+-typedef boct_tree<short,boxm_inf_line_sample<float> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index 7c96bfeeee..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 052fa82c04..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index a9d55be913..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-// block iterator with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 25f9ca6e61..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
+deleted file mode 100644
+index d68f374c40..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/sample/boxm_edge_sample.hxx>
+-
+-BOXM_EDGE_SAMPLE_INSTANTIATE(float);
+-BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
+deleted file mode 100644
+index a00d2268b5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_edge_tangent_sample.hxx>
+-
+-BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
+deleted file mode 100644
+index f957308804..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_inf_line_sample.hxx>
+-
+-BOXM_INF_LINE_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
+deleted file mode 100644
+index 66ceeacd2d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/sample/boxm_opt2_sample.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT2_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
+deleted file mode 100644
+index c6e45bdcca..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_plane_obs.hxx>
+-
+-BOXM_PLANE_OBS_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
+deleted file mode 100644
+index 1fc6db3c56..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_rt_sample.hxx>
+-
+-BOXM_RT_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
+deleted file mode 100644
+index 4ee2f52816..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_beta.h>
+-
+-BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOB_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index d1054422d9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <bsta/io/bsta_io_mixture.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-
+-BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
+deleted file mode 100644
+index e3c225ae4d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.hxx>
+-
+-BOXM_SAMPLE_INSTANTIATE(BOXM_APM_SIMPLE_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index 4e2b56c696..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.hxx>
+-
+-BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
+deleted file mode 100644
+index a9552e4b00..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/sample/boxm_scalar_sample.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_SCALAR_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index 4fd83d2d66..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+-
+-typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
+-BOXM_SCENE_INSTANTIATE(aux_tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index 882f421e87..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_tangent_sample<float> > aux_tree;
+-BOXM_SCENE_INSTANTIATE(aux_tree);
+-
+-typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
+deleted file mode 100644
+index dfec334150..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-typedef boct_tree<short,boxm_opt2_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
+deleted file mode 100644
+index cd3c475545..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-typedef boct_tree<short,boxm_rt_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index db72e7c8ea..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 6d21678187..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_SCENE_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index 52e5afb01c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-
+-// scene with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_SCENE_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 262d6e4f89..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
+deleted file mode 100644
+index 4a2c0c7437..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-typedef boct_tree<short,boxm_scalar_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
+deleted file mode 100644
+index b727cb7d12..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,int > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
+deleted file mode 100644
+index fc06a01419..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-typedef boct_tree<short, boxm_aux_edge_sample<float> > aux_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
+deleted file mode 100644
+index 0b4f55a413..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_edge_tangent_sample<float> > aux_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
+-
+-typedef boct_tree<short, boxm_inf_line_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
+deleted file mode 100644
+index 1372664c8c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_opt2_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
+deleted file mode 100644
+index 5409ed1d26..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_rt_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
+deleted file mode 100644
+index 3508b23e74..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
+deleted file mode 100644
+index 9676fc11a4..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
+deleted file mode 100644
+index e8c9902c7e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-// scene with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
+deleted file mode 100644
+index 4cadf24760..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
+deleted file mode 100644
+index f013383f50..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
+deleted file mode 100644
+index 116b748109..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <vil/vil_image_view.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boxm_inf_line_sample<float> sample;
+-VIL_IMAGE_VIEW_INSTANTIATE(sample);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
+deleted file mode 100644
+index c758e9f2a4..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
++++ /dev/null
+@@ -1,18 +0,0 @@
+-# brl/bseg/boxm/util/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_sample_algo_sources
+-    boxm_mob_grey_processor.h        boxm_mob_grey_processor.cxx
+-    boxm_mog_grey_processor.h        boxm_mog_grey_processor.cxx
+-    boxm_simple_grey_processor.h     boxm_simple_grey_processor.cxx
+-    boxm_sigma_normalizer.h          boxm_sigma_normalizer.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_sample_algo_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_sample_algo LIBRARY_SOURCES ${boxm_sample_algo_sources})
+-
+-target_link_libraries(boxm_sample_algo boxm_sample boxm boxm_util bsta bsta_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vbl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 994d8628d9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 10fc203f38..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index b5be45d2b1..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boxm_opt3_sample<BOXM_APM_MOG_GREY> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 0772000b0d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 00af986d6d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index b4aef87f19..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index c67fd5c479..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_opt3_sample.hxx>
+-
+-BOXM_OPT3_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index e0c8931986..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
+deleted file mode 100644
+index 0bf4864b81..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boct_tree<short, boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
+deleted file mode 100644
+index e93ea9b17a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-#include "boxm_mob_grey_processor.h"
+-//:
+-// \file
+-#include <bsta/algo/bsta_beta_updater.h>
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_beta.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_beta_f1.h>
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: Expected value
+-boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype
+-boxm_mob_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype const& appear)
+-{
+-  float total_weight= 0;
+-  obs_datatype c = 0;
+-  obs_datatype expected = 0;
+-
+-  //should be components used
+-  for (unsigned i = 0; i< appear.num_components(); ++i)
+-  {
+-    total_weight += appear.weight(i);
+-    c += appear.distribution(i).mean() * appear.weight(i);
+-  }
+-  if (total_weight > 0.0f) {
+-    expected = c/total_weight;
+-  }
+-
+-  return expected;
+-}
+-//: Return probability density of observing pixel values
+-float boxm_mob_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
+-{
+-  if (appear.num_components() ==0) {
+-    return 1.00f;
+-  }
+-  else {
+-    return appear.prob_density(obs);
+-  }
+-}
+-
+-//: Update with a new sample image
+-bool boxm_mob_grey_processor::update( apm_datatype &appear,
+-                                      obs_datatype const& obs,
+-                                      float const& weight)
+-{
+-  // the model
+-  float init_variance = 0.008f;
+-  float g_thresh = 0.025f; // number of std devs from mean sample must be
+-
+-  //float t_l_u = float(std::sqrt(1-4*init_variance)*0.5);
+-  //float lower = 0.5f-t_l_u;
+-  //float upper = 0.5f+t_l_u;
+-
+-  obs_datatype val = obs;
+-  //if (obs < lower)
+-  //  val = lower+0.000001f;
+-  //else if (obs > upper)
+-  //  val = upper-0.000001f;
+-
+-  float alpha, beta;
+-  bsta_beta<float>::bsta_beta_from_moments(val, init_variance,alpha,beta);
+-  bsta_beta_f1 this_beta(alpha,beta);
+-
+-  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOB_GREY>::n_beta_modes_;
+-
+-  typedef bsta_num_obs<bsta_beta_f1> beta_type;
+-  typedef bsta_mixture_fixed<beta_type, nmodes> mix_beta;
+-
+-  // the updater
+-  bsta_mix_beta_updater<mix_beta> updater(this_beta, g_thresh, init_variance, nmodes );
+-
+-  if (weight > 0) {
+-    updater(appear, obs);
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
+deleted file mode 100644
+index 8c6c4b46d8..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
++++ /dev/null
+@@ -1,35 +0,0 @@
+-// This is brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
+-#ifndef boxm_mob_grey_processor_h_
+-#define boxm_mob_grey_processor_h_
+-//:
+-// \file
+-// \brief A class for a grey-scale-mixture-of-beta processor
+-//
+-// \author Gamze Tunali
+-// \date   Nov 24, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-
+-class  boxm_mob_grey_processor
+-{
+- protected:
+-  // convenience typedefs
+-  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype apm_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype obs_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_mathtype obs_mathtype;
+-
+- public:
+-  static obs_datatype expected_color(apm_datatype const& appear);
+-  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
+-  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
+-};
+-
+-#endif // boxm_mob_grey_processor_h_
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
+deleted file mode 100644
+index 7c7e011b07..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
++++ /dev/null
+@@ -1,286 +0,0 @@
+-#include "boxm_mog_grey_processor.h"
+-//:
+-// \file
+-#include <bsta/algo/bsta_adaptive_updater.h>
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gaussian_indep.h>
+-#include <bsta/algo/bsta_fit_gaussian.h>
+-
+-#include <vnl/vnl_random.h>
+-
+-#include "boxm_sigma_normalizer.h"
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: Expected value
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
+-boxm_mog_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear)
+-{
+-  float total_weight= 0;
+-  obs_datatype c = 0;
+-  obs_datatype expected = 0;
+-
+-  //should be components used
+-  for (unsigned i = 0; i< appear.num_components(); ++i)
+-  {
+-    total_weight += appear.weight(i);
+-    c += appear.distribution(i).mean() * appear.weight(i);
+-  }
+-  if (total_weight > 0.0f) {
+-    expected = c/total_weight;
+-  }
+-
+-  return expected;
+-}
+-
+-//: Return a random sample from the appearance distribution
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
+-boxm_mog_grey_processor::sample(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear, vnl_random &rand_gen)
+-{
+-  return appear.sample(rand_gen);
+-}
+-
+-
+-//: Return probability density of observing pixel values
+-float boxm_mog_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
+-{
+-  if (appear.num_components() ==0) {
+-    return 1.00f;
+-  }
+-  else {
+-    return appear.prob_density(obs);
+-  }
+-}
+-
+-//: Update with a new sample image
+-bool boxm_mog_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& weight)
+-{
+-  // the model
+-  float init_variance = 0.008f;
+-  float min_stddev = 0.030f; //TO UNDERSTAND: changed from 0.02 for dinoRing dataset -dec
+-  float g_thresh = 2.5; // number of std devs from mean sample must be
+-  bsta_gauss_sf1 this_gauss(0.0f, init_variance);
+-
+-  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef bsta_mixture_fixed<gauss_type, nmodes> mix_gauss;
+-
+-  // the updater
+-  bsta_mg_grimson_weighted_updater<mix_gauss> updater(this_gauss, nmodes ,g_thresh,min_stddev);
+-
+-  if (weight > 0) {
+-    updater(appear, obs, weight);
+-  }
+-
+-  return true;
+-}
+-
+-void boxm_mog_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  std::vector<float> pre(obs.size(),0.0f);
+-  compute_appearance(obs,pre,obs_weights,model,min_sigma);
+-  return;
+-}
+-
+-void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  std::vector<float> pre(obs.size(),0.0f);
+-  compute_appearance(obs,pre,obs_weights,model,min_sigma);
+-  return;
+-}
+-
+-void boxm_mog_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs,
+-                                                  std::vector<float> const&  /*obs_weights*/, // FIXME - unused
+-                                                  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model,
+-                                                  float min_sigma)
+-{
+-  static const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
+-  const auto nobs = (unsigned int)obs.size();
+-  const float min_var = min_sigma*min_sigma;
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-  const float big_var = big_sigma * big_sigma;
+-
+-  static boxm_sigma_normalizer sigma_norm(0.1f);
+-  for (unsigned int m=0; m<nmodes; ++m) {
+-    //float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
+-    float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
+-
+-    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
+-    float mode_var = model.distribution(m).var();
+-    mode_var *= (unbias_factor*unbias_factor);
+-
+-    // make sure variance does not get too big
+-    if (!(mode_var < big_var)) {
+-      mode_var = big_var;
+-    }
+-    // or too small
+-    if (!(mode_var > min_var)) {
+-      mode_var = min_var;
+-    }
+-    model.distribution(m).set_var(mode_var);
+-  }
+-  return;
+-}
+-
+-void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  static const unsigned int max_nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
+-  const float min_var = min_sigma*min_sigma;
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-  const float big_var = big_sigma * big_sigma;
+-
+-  auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  if (nobs == 1) {
+-    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
+-    bsta_gauss_sf1 mode(obs[0], big_sigma*big_sigma);
+-    model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), 1.0f);
+-    return;
+-  }
+-
+-  unsigned int nmodes = model.num_components();
+-
+-  if (nmodes == 0) {
+-    // if initial model is "blank", create an arbitrary starting point for the optimization with max number of modes
+-    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
+-    nmodes = max_nmodes;
+-    // no need for model to have more modes than observations
+-    if (nobs < nmodes) {
+-      nmodes = nobs;
+-    }
+-    // initialize parameters
+-    for (unsigned int m=0; m<nmodes; ++m) {
+-      float mean = (float(m) + 0.5f) / float(nmodes);
+-      float sigma = 0.3f;
+-      float mode_weight = 1.0f / float(nmodes);
+-      bsta_gauss_sf1 mode(mean, sigma*sigma);
+-      model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), mode_weight);
+-    }
+-  }
+-
+-  std::vector<std::vector<float> > mode_probs(nobs);
+-  for (unsigned int n=0; n<nobs; ++n) {
+-    for (unsigned int m=0; m<nmodes; ++m) {
+-      mode_probs[n].push_back(0.0f);
+-    }
+-  }
+-  std::vector<float> mode_weight_sum(nmodes,0.0f);
+-
+-  // run EM algorithm to maximize expected probability of observations
+-  constexpr unsigned int max_its = 50;
+-  const float max_converged_weight_change = 1e-3f;
+-
+-  for (unsigned int i=0; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION
+-    for (unsigned int n=0; n<nobs; ++n) {
+-      // for each observation, assign probabilities to each mode of appearance model (and to a "previous cell")
+-      float total_prob = 0.0f;
+-      std::vector<float> new_mode_probs(nmodes);
+-      for (unsigned int m=0; m<nmodes; ++m) {
+-        // compute probability that nth data point was produced by mth mode
+-        const float new_mode_prob = vis[n] * model.distribution(m).prob_density(obs[n]) * model.weight(m);
+-        new_mode_probs[m] = new_mode_prob;
+-        total_prob += new_mode_prob;
+-      }
+-      // compute the probability the observation came from an occluding cell
+-      const float prev_prob = pre[n];
+-      total_prob += prev_prob;
+-      if (total_prob > 1e-6) {
+-        for (unsigned int m=0; m<nmodes; ++m) {
+-          new_mode_probs[m] /= total_prob;
+-          const float weight_change = std::fabs(new_mode_probs[m] - mode_probs[n][m]);
+-          if (weight_change > max_weight_change) {
+-            max_weight_change = weight_change;
+-          }
+-          mode_probs[n][m] = new_mode_probs[m];
+-        }
+-      }
+-    }
+-    // check for convergence
+-    if (max_weight_change < max_converged_weight_change) {
+-      break;
+-    }
+-    // MAXIMIZATION
+-    // computed the weighted means and variances for each mode based on the probabilities
+-    float total_weight_sum = 0.0f;
+-
+-    // update the mode parameters
+-    for (unsigned int m=0; m<nmodes; ++m) {
+-      mode_weight_sum[m] = 0.0f;
+-      std::vector<float> obs_weights(nobs);
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        obs_weights[n] = mode_probs[n][m];
+-        mode_weight_sum[m] += obs_weights[n];
+-      }
+-      total_weight_sum += mode_weight_sum[m];
+-      float mode_mean(0.5f);
+-      float mode_var(1.0f);
+-      bsta_gauss_sf1 single_gauss(mode_mean,mode_var);
+-      bsta_fit_gaussian(obs, obs_weights, single_gauss);
+-      mode_mean = single_gauss.mean();
+-      mode_var = single_gauss.var();
+-
+-      // unbias variance based on number of observations
+-      //float unbias_factor = sigma_norm_factor(mode_weight_sum[m]);
+-      // mode_var *= (unbias_factor*unbias_factor);
+-
+-      // make sure variance does not get too big
+-      if (!(mode_var < big_var)) {
+-        mode_var = big_var;
+-      }
+-      // or too small
+-      if (!(mode_var > min_var)) {
+-        mode_var = min_var;
+-      }
+-
+-      // update mode parameters
+-      model.distribution(m).set_mean(mode_mean);
+-      model.distribution(m).set_var(mode_var);
+-    }
+-    // update mode probabilities
+-    if (total_weight_sum > 1e-6) {
+-      for (unsigned int m=0; m<nmodes; ++m) {
+-        const float mode_weight = mode_weight_sum[m] / total_weight_sum;
+-        // update mode weight
+-        model.set_weight(m, mode_weight);
+-      }
+-    }
+-  }
+-
+-  // unbias variance based on number of observations
+-  static const boxm_sigma_normalizer sigma_norm(0.20f);
+-  for (unsigned int m=0; m<nmodes; ++m) {
+-    float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
+-    //float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
+-    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
+-
+-    float mode_var = model.distribution(m).var();
+-    mode_var *= (unbias_factor*unbias_factor);
+-
+-    // make sure variance does not get too big
+-    if (!(mode_var < big_var)) {
+-      mode_var = big_var;
+-    }
+-    // or too small
+-    if (!(mode_var > min_var)) {
+-      mode_var = min_var;
+-    }
+-    model.distribution(m).set_var(mode_var);
+-  }
+-
+-  // sort the modes based on weight
+-  model.sort();
+-
+-  return;
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
+deleted file mode 100644
+index b4d64bc6ad..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
++++ /dev/null
+@@ -1,50 +0,0 @@
+-// This is brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
+-#ifndef boxm_mog_grey_processor_h_
+-#define boxm_mog_grey_processor_h_
+-//:
+-// \file
+-// \brief A class for a grey-scale-mixture-of-gaussian processor
+-//
+-// \author Gamze Tunali
+-// \date   Apr 03, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bsta/algo/bsta_adaptive_updater.h>
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gaussian_indep.h>
+-
+-#include <vnl/vnl_random.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-
+-
+-class  boxm_mog_grey_processor
+-{
+- protected:
+-  // convienance typedefs
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype obs_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype obs_mathtype;
+-
+- public:
+-  static obs_datatype expected_color(apm_datatype const& appear);
+-
+-  static obs_datatype sample(apm_datatype const& appear, vnl_random &rand_gen);
+-
+-  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
+-
+-  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
+-
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-};
+-
+-#endif // boxm_mog_grey_processor_h_
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
+deleted file mode 100644
+index b88fd5c03d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
++++ /dev/null
+@@ -1,104 +0,0 @@
+-#include <iostream>
+-#include "boxm_sigma_normalizer.h"
+-//:
+-// \file
+-// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_gamma.h>
+-#include <vnl/vnl_least_squares_function.h>
+-#include <vnl/algo/vnl_levenberg_marquardt.h>
+-
+-boxm_sigma_normalizer::boxm_sigma_normalizer(float under_estimation_probability) : unbias_const_(N_PRECOMPUTED_+1, 0.0f)
+-{
+-  class gammainc_error_fn : public vnl_least_squares_function
+-  {
+-   public:
+-    gammainc_error_fn(unsigned int ndof, float under_estimation_prob) : vnl_least_squares_function(1,1,no_gradient), ndof_(ndof), p_(under_estimation_prob) {}
+-
+-    void f(vnl_vector<double> const& x, vnl_vector<double>& fx) override
+-    {
+-      // don't allow x to become negative
+-      if (x[0] < 0.0f) {
+-        fx[0] = x[0] - p_; // so error function is c0 continuous at x=0
+-        return;
+-      }
+-      double cdf_prob = vnl_cum_prob_chi2(ndof_, x[0]);
+-      fx[0] = cdf_prob - p_;
+-      return;
+-    }
+-   private:
+-    unsigned int ndof_;
+-    float p_;
+-  };
+-
+-  // sanity check on probability
+-  if (under_estimation_probability < 1e-4) {
+-    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too low" << std::endl;
+-    return;
+-  }
+-  if (under_estimation_probability > (1 - 1e-4)) {
+-    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too high" << std::endl;
+-    return;
+-  }
+-
+-  // populate array of normalization factors for easy lookup
+-  vnl_vector_fixed<double,1> x(1.0);
+-
+-  for (unsigned int n=2; n<= N_PRECOMPUTED_; ++n) {
+-    gammainc_error_fn f(n-1, under_estimation_probability);
+-    vnl_levenberg_marquardt minimizer(f);
+-    minimizer.set_f_tolerance(1e-8);
+-    minimizer.set_x_tolerance(1e-8);
+-
+-    minimizer.minimize(x);
+-    //minimizer.diagnose_outcome();
+-    double end_error = minimizer.get_end_error();
+-    if (end_error > 1e-3) {
+-      std::cerr << "error: boxm_sigma_normalizer: levenberg_marquardt final error = " << end_error << '\n';
+-    }
+-    auto unbias_constant = (float)std::sqrt((float)(n-1) / x[0]);
+-
+-    unbias_const_[n] = unbias_constant;
+-  }
+-  // sigma is undefined for samples sizes of 0 and 1, but we can linearly interpolate to get values anyway
+-  unbias_const_[1] = unbias_const_[2] - (unbias_const_[3] - unbias_const_[2]);
+-  unbias_const_[0] = unbias_const_[1] - (unbias_const_[2] - unbias_const_[1]);
+-}
+-
+-
+-float boxm_sigma_normalizer::normalization_factor(float number_of_observations) const
+-{
+-  if (number_of_observations <= 1.0f) {
+-    return normalization_factor_int((unsigned int)1);
+-  }
+-
+-  // linearly interpolate between integer values
+-  float nobs_floor = std::floor(number_of_observations);
+-  float nobs_ceil = std::ceil(number_of_observations);
+-  float floor_weight = nobs_ceil - number_of_observations;
+-  float norm_factor = (normalization_factor_int((unsigned int)nobs_floor) * floor_weight) + (normalization_factor_int((unsigned int)nobs_ceil) * (1.0f - floor_weight));
+-
+-  return norm_factor;
+-}
+-
+-
+-float boxm_sigma_normalizer::normalization_factor_int(unsigned int number_of_observations) const
+-{
+-  if (number_of_observations < 2) {
+-    return unbias_const_[1];
+-  }
+-
+-  if (number_of_observations <= N_PRECOMPUTED_) {
+-    return unbias_const_[number_of_observations];
+-  }
+-  // else nobs >= N_PRECOMPUTED_
+-  // approximate for big n with function a = m /nobs + b
+-  static const float m = (unbias_const_[N_PRECOMPUTED_] - unbias_const_[N_PRECOMPUTED_ - 5])/(1.0f/N_PRECOMPUTED_ - 1.0f/(N_PRECOMPUTED_ - 5));
+-  static const float b = unbias_const_[N_PRECOMPUTED_]  - m*(1.0f/N_PRECOMPUTED_);
+-  return m/number_of_observations + b;
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
+deleted file mode 100644
+index aafb71a2c2..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// this is brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
+-#ifndef boxm_sigma_normalizer_h_
+-#define boxm_sigma_normalizer_h_
+-//:
+-// \file
+-// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
+-//
+-// \author Daniel Crispell
+-// \date   Feb. 18, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class boxm_sigma_normalizer
+-{
+- public:
+-  //: create a sigma_normalizer object.
+-  boxm_sigma_normalizer(float under_estimation_probability);
+-
+-  //: compute the normalization factor for a sample distribution computing with N observations
+-  // \a sigma_norm = sample_sigma * normalization_factor(N);
+-  float normalization_factor(float number_of_observations) const;
+-
+-  //: compute the normalization factor for a sample distribution computed with N observations
+-  // \a sigma_norm = sample_sigma * normalization_factor(N);
+-  float normalization_factor_int(unsigned int number_of_observations) const;
+-
+- private:
+-  // do not allow default constructor - under-estimation param is necessary
+-  boxm_sigma_normalizer()= default;
+-
+-  static const unsigned int N_PRECOMPUTED_ = 40;
+-  std::vector<float> unbias_const_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
+deleted file mode 100644
+index b1d9e4639b..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
++++ /dev/null
+@@ -1,437 +0,0 @@
+-#include "boxm_simple_grey_processor.h"
+-//:
+-// \file
+-
+-#include <vnl/vnl_erf.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/algo/bsta_fit_gaussian.h>
+-
+-#include "boxm_sigma_normalizer.h"
+-
+-//const float boxm_simple_grey_processor::one_over_sigma_ = 25.0f;
+-const static bool USE_UNIFORM_COMPONENT = false;
+-
+-//: Return probability density of observing pixel values
+-float boxm_simple_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
+-{
+-  const auto norm =  float(appear.one_over_sigma() * vnl_math::one_over_sqrt2pi);
+-  const float diff = obs - appear.color();
+-  const float p = norm * std::exp(-(diff*diff)*appear.one_over_sigma()*appear.one_over_sigma()*0.5f);
+-  // normalize by area of distribution between 0 and 1
+-  //return p / total_prob(appear);
+-  return p * appear.gauss_weight() + (1.0f - appear.gauss_weight());
+-}
+-
+-//: Return probabilities that pixels are in range [min,max]
+-float boxm_simple_grey_processor::prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max)
+-{
+-  // make sure obs_min and obs_max are within bounds
+-  const float obs_min_n = obs_min >= 0 ? obs_min : 0.0f;
+-  const float obs_max_n = obs_max <= 1.0? obs_max : 1.0f;
+-
+-  const float diff_low = obs_min_n - appear.color();
+-  const float diff_high = obs_max_n - appear.color();
+-  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
+-
+-  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
+-  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
+-  const float P = (0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1));
+-  //return P / total_prob(appear);
+-  return P * appear.gauss_weight() + (1.0f - appear.gauss_weight())*(obs_max - obs_min);
+-}
+-
+-//: Return probabilities that pixels are in range [0,1] - used for normalizing
+-float boxm_simple_grey_processor::total_prob(apm_datatype const& appear)
+-{
+-  const float diff_low =  -appear.color();
+-  const float diff_high = 1.0f - appear.color();
+-  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
+-  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
+-  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
+-  return 0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1);
+-}
+-
+-
+-//: Update with a new sample image
+-bool boxm_simple_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& /*weight*/)
+-{
+-  appear = boxm_simple_grey(vnl_vector_fixed<float,3>(obs, appear.sigma(), appear.gauss_weight()));
+-  return true;
+-}
+-
+-
+-//: Expected value
+-boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype boxm_simple_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear)
+-{
+-  return appear.color() * appear.gauss_weight() + 0.5f * (1.0f - appear.gauss_weight());
+-}
+-
+-//: color of the most probable mode in the mixtures in the slab
+-boxm_simple_grey_processor::obs_datatype boxm_simple_grey_processor::most_probable_color(apm_datatype const& appear)
+-{
+-  return appear.color();
+-}
+-
+-void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  bsta_gauss_sf1 model_bsta(model.color(),model.sigma()*model.sigma());
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-  auto nobs = (unsigned int)obs.size();
+-  // check for some simple cases first
+-  if (nobs == 0) {
+-    // zero observations. nothing to do here.
+-    model = boxm_simple_grey(0.5f, big_sigma);
+-    return;
+-  }
+-  if (nobs == 1) {
+-    // one observation: Just return the value as the mean, and a big sigma.
+-    model = boxm_simple_grey(obs[0], big_sigma);
+-    return;
+-  }
+-  //std::cout << "nobs = " << obs.size() << std::endl;
+-  //for (unsigned int i=0; i<obs.size(); ++i) {
+-  //  std::cout << "obs=" << obs[i] << " vis=" << vis[i] << "pre=" << pre[i] << std::endl;
+-  //}
+-  const float min_var_EM = 1.5e-5f; // to prevent degenerate solution (corresponds roughly to sigma = 1/255)
+-  bsta_fit_gaussian(obs,vis,pre,model_bsta,min_var_EM);
+-  // compute expected number of observations
+-  float expected_nobs = 0.0f;
+-  for (float vi : vis) {
+-    expected_nobs += vi;
+-  }
+-  // normalize sigma
+-  static const boxm_sigma_normalizer sigma_norm(0.20f);
+-  const float norm_factor = sigma_norm.normalization_factor(expected_nobs);
+-  //const float norm_factor = 1.0f;
+-  float sigma = std::sqrt(model_bsta.var()) * norm_factor;
+-
+-  // bounds check on std. deviation value
+-  if (sigma < min_sigma) {
+-    sigma = min_sigma;
+-  }
+-  if (sigma > big_sigma) {
+-    sigma = big_sigma;
+-  }
+-  if (!(sigma < big_sigma) && !(sigma > min_sigma)) {
+-    std::cerr << "error: sigma = " << sigma << " model_bsta.var() = " << model_bsta.var() << std::endl;
+-    sigma = big_sigma;
+-  }
+-  // convert back to a boxm_simple_grey model
+-  model = boxm_simple_grey(model_bsta.mean(),sigma);
+-  return;
+-}
+-
+-void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-
+-  const auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // zero observations. nothing to do here.
+-    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.5f, 1.0f, 0.0f);
+-    return;
+-  }
+-  if (nobs == 1) {
+-    // one observation: Just return the value as the mean, and a big sigma.
+-    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma, weights[0]);
+-    return;
+-  }
+-  else {
+-    // compute estimate of gaussian parameters
+-    // Initialize the estimates
+-    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
+-    float sigma_est = 0.0f;
+-
+-    compute_gaussian_params(obs, weights, mean_est, sigma_est);
+-    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype gauss_model(mean_est, sigma_est, 1.0f);
+-
+-    sigma_est *= sigma_norm_factor(nobs);
+-
+-    // make sure standard deviation is not too small
+-    if (sigma_est < min_sigma) {
+-      sigma_est = min_sigma;
+-    }
+-    // or too big
+-    if (sigma_est > big_sigma) {
+-      sigma_est = big_sigma;
+-    }
+-
+-    // compute estimate of gaussian weight by summing probabilities
+-    float gauss_weight = 0.0f;
+-    if (USE_UNIFORM_COMPONENT) {
+-      float weight_sum = 0.0f;
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        const float p_gauss = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(gauss_model,obs[n]);
+-        const float p_uniform = 1.0f;
+-        gauss_weight += weights[n] * p_gauss / (p_gauss + p_uniform);
+-        weight_sum += weights[n];
+-      }
+-      if (weight_sum > 0.0f) {
+-        gauss_weight /= weight_sum;
+-      }
+-    }
+-    else {
+-      gauss_weight = 1.0f;
+-    }
+-
+-    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
+-  }
+-}
+-
+-
+-void boxm_simple_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-
+-  const auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // zero observations. nothing to do here.
+-    return;
+-  }
+-  if (nobs == 1) {
+-    // one observation: Just return the value as the mean, and a big sigma.
+-    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma);
+-    return;
+-  }
+-  else {
+-    // compute estimate of gaussian weight by summing probabilities
+-    std::vector<float> obs_gauss_weights = weights;
+-    float gauss_weight = 0.0f;
+-    float expected_nobs = 0.0f;
+-    if (USE_UNIFORM_COMPONENT) {
+-      float weight_sum = 0.0f;
+-
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        const float p_total = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(model,obs[n]);
+-        const float p_uniform = 1.0f - model.gauss_weight();
+-        const float p_gauss = p_total - p_uniform;
+-        if (p_total > 0.0f) {
+-          obs_gauss_weights[n] = weights[n] * p_gauss / p_total;
+-        }
+-        else {
+-          obs_gauss_weights[n] = 0.0f;
+-        }
+-        gauss_weight += obs_gauss_weights[n];
+-        weight_sum += weights[n];
+-      }
+-      if (weight_sum > 0.0f) {
+-        gauss_weight /= weight_sum;
+-      }
+-      expected_nobs = weight_sum;
+-    }
+-    else {
+-      auto wit = weights.begin();
+-      for (; wit != weights.end(); ++wit) {
+-        expected_nobs += *wit;
+-      }
+-      gauss_weight = 1.0f;
+-    }
+-    // Initialize the estimates
+-    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
+-    float sigma_est = 0.0f;
+-
+-    compute_gaussian_params(obs, obs_gauss_weights, mean_est, sigma_est);
+-
+-    //sigma_est *= sigma_norm_factor(nobs);
+-
+-    // make sure standard deviation is not too small
+-    if (sigma_est < min_sigma) {
+-      sigma_est = min_sigma;
+-    }
+-    // or too big
+-    if (sigma_est > big_sigma) {
+-      sigma_est = big_sigma;
+-    }
+-
+-    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
+-  }
+-  return;
+-}
+-
+-void boxm_simple_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
+-                                                     std::vector<float> const& weights,
+-                                                     boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model)
+-{
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-
+-  float expected_nobs = 0.0f;
+-    const auto nobs = (unsigned int)obs.size();
+-
+-  auto wit = weights.begin();
+-  for (; wit != weights.end(); ++wit) {
+-    expected_nobs += *wit;
+-  }
+-
+-  //float unbiased_sigma = model.sigma() * sigma_norm_factor(expected_nobs);
+-  float unbiased_sigma = model.sigma() * sigma_norm_factor(nobs);
+-  if (unbiased_sigma > big_sigma) {
+-    unbiased_sigma = big_sigma;
+-  }
+-
+-
+-  model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(model.color(), unbiased_sigma, model.gauss_weight());
+-}
+-
+-
+-void boxm_simple_grey_processor::compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma)
+-{
+-  const auto nobs = (unsigned int)obs.size();
+-  double w_sum = 0.0;
+-  double w2_sum = 0.0;
+-  double obs_sum = 0.0;
+-
+-  for (unsigned int i=0; i<nobs; ++i) {
+-    w_sum += weights[i];
+-    w2_sum += weights[i]*weights[i];
+-    obs_sum += obs[i] * weights[i];
+-  }
+-  double mean_obs = 0.5f;
+-  if (w_sum > 0) {
+-    mean_obs = obs_sum / w_sum;
+-  }
+-
+-  double var_sum = 0.0;
+-  for (unsigned int i=0; i<nobs; ++i) {
+-    const double diff = obs[i] - mean_obs;
+-    var_sum += diff*diff*weights[i];
+-  }
+-  double var = 1.0f;
+-  if (w_sum > 0) {
+-    var = var_sum / (w_sum - (w2_sum/w_sum));
+-  }
+-
+-  mean = (float)mean_obs;
+-  sigma = (float)std::sqrt(var);
+-}
+-
+-float boxm_simple_grey_processor::sigma_norm_factor(float nobs)
+-{
+-  if (nobs <= 1.0f) {
+-    return sigma_norm_factor((unsigned int)1);
+-  }
+-
+-  // linearly interpolate between integer values
+-  float nobs_floor = std::floor(nobs);
+-  float nobs_ceil = std::ceil(nobs);
+-  float floor_weight = nobs_ceil - nobs;
+-  float norm_factor = (sigma_norm_factor((unsigned int)nobs_floor) * floor_weight) + (sigma_norm_factor((unsigned int)nobs_ceil) * (1.0f - floor_weight));
+-
+-  return norm_factor;
+-}
+-
+-float boxm_simple_grey_processor::sigma_norm_factor(unsigned int nobs)
+-{
+-  static const float unbias_const[] = {0, 1e3f, 7.9057f, 3.0787f, 2.2646f, 1.9389f, 1.7617f, 1.6496f, 1.5716f, 1.5140f, 1.4693f, 1.4336f, 1.4043f, 1.3797f, 1.3587f, 1.3406f, 1.3248f, 1.3107f, 1.2983f, 1.2871f, 1.2770f, 1.2678f, 1.2594f, 1.2517f, 1.2446f, 1.2380f, 1.2319f, 1.2262f, 1.2209f, 1.2159f, 1.2112f, 1.2068f, 1.2026f, 1.1987f, 1.1949f, 1.1914f };
+-
+-  if (nobs < 2) {
+-    return unbias_const[1];
+-  }
+-
+-  if (nobs < 36) {
+-    return unbias_const[nobs];
+-  }
+-  // else nobs >= 36
+-  // approximate for big n with function a = m /nobs + b
+-  static const float m = (unbias_const[35] - unbias_const[30])/(1.0f/35.0f - 1.0f/30.0f);
+-  static const float b = unbias_const[35]  - m*(1.0f/35.0f);
+-  return m/nobs + b;
+-}
+-
+-void boxm_simple_grey_processor::
+-boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
+-                               std::vector<float> const& pre,
+-                               std::vector<float> const& vis,
+-                               boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
+-                               float min_app_sigma,
+-                               float shadow_prior,
+-                               float shadow_mean,
+-                               float shadow_sigma,
+-                               bool verbose )
+-{
+-  std::vector<float> obs_weights(vis.size(), 0.0f);
+-  std::vector<float> sh_density(vis.size(), 0.0f);
+-  //assume that the initial appearance distribution is uniform on [0 1]
+-  //thus a reasonable initialization for weights is
+-  //
+-  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
+-  //
+-  //, where Psh is shadow_prior and psh(x) is the shadow density function,
+-  // sh_density. vis is the visibilty probability
+-  //
+-  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
+-  for (unsigned n = 0; n<obs.size(); ++n)
+-  {
+-    //2.0 x density since centered on zero
+-    sh_density[n] =
+-      2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
+-    float neu = vis[n]*(1-shadow_prior);
+-    float weight =
+-      neu/(neu + sh_density[n]*shadow_prior);
+-    obs_weights[n]=weight;
+-  }
+-  std::vector<float> initial_weights = obs_weights;
+-  // initial estimate for the illuminated appearance model
+-  boxm_simple_grey_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
+-  double initial_mean = model.color();
+-  double initial_sigma = model.sigma();
+-
+-  // use EM to refine estimate until convergence.
+-  auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  const float epsilon = 1e-4f;
+-  constexpr unsigned int max_its = 100;
+-  const float min_weight_change = 1e-5f;
+-  unsigned int i=0;
+-  for (; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION - determine the weights
+-    for (unsigned int n=0; n<nobs; ++n) {
+-      float PI = vis[n] * boxm_simple_grey_processor::prob_density(model,obs[n]);
+-      float neu = PI*(1-shadow_prior);
+-      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
+-      float new_obs_weight = 0;
+-      if (den > epsilon) {
+-        new_obs_weight = neu / den;
+-      }
+-      // compute delta weight for convergence check
+-      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
+-      if (weight_delta > max_weight_change) {
+-        max_weight_change = weight_delta;
+-      }
+-      obs_weights[n] = new_obs_weight;
+-    }
+-    // check for convergence
+-    if (max_weight_change < min_weight_change)
+-      break;
+-    // MAXIMIZATION - determine the parameters of the appearance distribution
+-    boxm_simple_grey_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
+-  }
+-  if (verbose) {
+-    bool print = false;
+-    for (unsigned n = 0; n<obs.size(); ++n) {
+-      if (obs[n]>0) print = true;
+-      if (i<max_its&&print) {
+-        std::cout << "converged after " << i << " iterations.\n"
+-                 << " initial mean = " << initial_mean << " final mean = "
+-                 << model.color() << '\n'
+-                 << " initial sigma = " << initial_sigma << " final sigma = "
+-                 << model.sigma() << '\n';
+-      }
+-      else { std::cout << "failed to converge\n"; }
+-
+-      std::cout << "Initial (Observations, Weights):\n";
+-      for (unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
+-      std::cout << "\nFinal (Observations, Weights):\n";
+-      for (unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
+-      std::cout << '\n';
+-    }
+-  }
+-
+-  // adjust model to account for small sample sizes.
+-  boxm_simple_grey_processor::finalize_appearance(obs,obs_weights,model);
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
+deleted file mode 100644
+index 076213bd46..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
++++ /dev/null
+@@ -1,86 +0,0 @@
+-// This is brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
+-#ifndef boxm_simple_grey_processor_h_
+-#define boxm_simple_grey_processor_h_
+-//:
+-// \file
+-// \brief A class for processing simple, single valued grey-scale appearance models.
+-//  The represented distribution can be thought of as a delta function centered on the value.
+-//
+-// \author Daniel Crispell
+-// \date Sept 29, 2008
+-// \verbatim
+-//  Modifications
+-//  <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <iosfwd>
+-#include <boxm/boxm_apm_traits.h>
+-#if 0 // operator<< in commented-out section
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-class  boxm_simple_grey_processor
+-{
+- protected:
+-  // convienance typedefs
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype obs_mathtype;
+-
+-  // all methods are static - no constructor needed
+- private:
+-  boxm_simple_grey_processor() = default;
+-
+-#if 0  // one_over_sigma is now a member of apm_datatype
+-  static const float one_over_sigma_;
+-#endif
+-
+- public:
+-
+-  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
+-
+-  static float prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max);
+-
+-  static float total_prob(apm_datatype const& appear);
+-
+-  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
+-
+-  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
+-
+-  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype most_probable_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
+-
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma=0.01f);
+-
+-  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-
+-  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model);
+-
+-  //: includes a shadow density component to the single gaussian scalar appearance model, defined by a fixed shadow mean and sigma.
+-  // The shadow prior defines the probability that an observation is in shadow.
+-  // The function updates the "model" mean and sigma.
+-  static void boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
+-                                             std::vector<float> const& pre,
+-                                             std::vector<float> const& vis,
+-                                             boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
+-                                             float min_app_sigma,
+-                                             float shadow_prior,
+-                                             float shadow_mean,
+-                                             float shadow_sigma,
+-                                             bool verbose = false);
+- private:
+-  static void compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma);
+-
+-  static float sigma_norm_factor(unsigned int nobs);
+-
+-  static float sigma_norm_factor(float nobs);
+-};
+-
+-#if 0
+-std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm);
+-#endif
+-
+-#endif // boxm_simple_grey_processor_h_
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
+deleted file mode 100644
+index 4390b597bc..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,11 +0,0 @@
+-add_executable( boxm_sample_algo_test_all
+-  test_driver.cxx
+-  test_sigma_normalizer.cxx
+- )
+-
+-target_link_libraries( boxm_sample_algo_test_all boxm_sample_algo boxm_sample boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vbl bsta bsta_algo)
+-
+-add_test( NAME boxm_sample_test_sigma_normalizer COMMAND $<TARGET_FILE:boxm_sample_algo_test_all> test_sigma_normalizer  )
+-
+-add_executable( boxm_sample_algo_test_include test_include.cxx )
+-target_link_libraries( boxm_sample_algo_test_include boxm_sample_algo)
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
+deleted file mode 100644
+index 1258c5dc63..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_sigma_normalizer );
+-
+-void register_tests()
+-{
+-  REGISTER( test_sigma_normalizer );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
+deleted file mode 100644
+index 3c7fc60db6..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_sigma_normalizer.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
+deleted file mode 100644
+index 7231ca0b24..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
++++ /dev/null
+@@ -1,59 +0,0 @@
+-
+-#include <testlib/testlib_test.h>
+-#include <vnl/vnl_random.h>
+-#include <boxm/sample/algo/boxm_sigma_normalizer.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/algo/bsta_fit_gaussian.h>
+-
+-
+-static void test_sigma_normalizer()
+-{
+-  START("boxm_sigma_normalizer test");
+-
+-  // generate random sets of samples from a normal distribution and compare sigma estimate to true value
+-  {
+-    vnl_random rand_gen;
+-    unsigned int n_trials = 5000;
+-
+-    unsigned int n_observations = 6;
+-    float true_sigma = 0.5f;
+-    float true_mean = 2.5f;
+-    float under_estimation_prob = 0.4f;
+-    unsigned int under_estimates = 0;
+-
+-    boxm_sigma_normalizer normalizer(under_estimation_prob);
+-
+-    for (unsigned int t=0; t<n_trials; ++t) {
+-      std::vector<float> samples;
+-      std::vector<float> weights;
+-      for (unsigned int n=0; n<n_observations; ++n) {
+-        float sample = true_mean + true_sigma*(float)rand_gen.normal();
+-        samples.push_back(sample);
+-        weights.push_back(1.0f);
+-      }
+-      // compute the sample mean and variance
+-      bsta_gauss_sf1 gauss_model;
+-      bsta_fit_gaussian(samples, weights, gauss_model);
+-      float normalized_sigma = std::sqrt(gauss_model.var()) * normalizer.normalization_factor_int(n_observations);
+-      if (normalized_sigma < true_sigma) {
+-        ++under_estimates;
+-      }
+-    }
+-    float under_estimate_ratio = (float)under_estimates / n_trials;
+-
+-    TEST_NEAR("correct ratio of sigma under-estimates", under_estimate_ratio, under_estimation_prob, 0.05);
+-  }
+-
+-  // make sure normalization factor approaches 1 for large sample sizes
+-  {
+-    boxm_sigma_normalizer sigma_norm(0.10f);
+-    float norm_factor_f = sigma_norm.normalization_factor(10000.0f);
+-    float norm_factor_i = sigma_norm.normalization_factor_int(10000);
+-
+-    TEST_NEAR("normalization factor (float) approaches 1 for large N",norm_factor_f, 1.0, 0.1);
+-    TEST_NEAR("normalization factor (int) approaches 1 for large N",norm_factor_i, 1.0, 0.1);
+-  }
+-  return;
+-}
+-
+-TESTMAIN(test_sigma_normalizer);
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
+deleted file mode 100644
+index ae46c03fd6..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
++++ /dev/null
+@@ -1,97 +0,0 @@
+-#ifndef boxm_edge_sample_h_
+-#define boxm_edge_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-template<class OBS_T>
+-class boxm_edge_sample
+-{
+- public:
+-  boxm_edge_sample(): edge_prob_(0), num_obs_(0.0f) {}
+-  ~boxm_edge_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val() const { return edge_prob_; }
+-  OBS_T edge_prob_;
+-  float num_obs_;
+-};
+-
+-template<class OBS_T>
+-class boxm_aux_edge_sample
+-{
+- public:
+-  boxm_aux_edge_sample(): obs_(0), seg_len_(0.0f) { }
+-  ~boxm_aux_edge_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  OBS_T obs_;
+-  float seg_len_;
+-};
+-
+-#if 0 // two classes commented out
+-
+-//: traits for a grey optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
+-{
+- public:
+-  typedef boxm_edge_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_grey_work"; }
+-};
+-
+-//: traits for an rgb optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
+-{
+- public:
+-  typedef boxm_edge_sample<vil_rgb<float> > sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
+-};
+-
+-#endif // 0
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample);
+-
+-
+-#endif // boxm_edge_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
+deleted file mode 100644
+index d2e60dc175..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
++++ /dev/null
+@@ -1,137 +0,0 @@
+-#ifndef boxm_edge_sample_hxx_
+-#define boxm_edge_sample_hxx_
+-
+-#include "boxm_edge_sample.h"
+-
+-
+-// Edge Sample Methods
+-template <class OBS_T>
+-void boxm_edge_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(edge_prob=" << edge_prob_ << " num_obs=" << num_obs_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.edge_prob_);
+-  vsl_b_write(os, sample.num_obs_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.edge_prob_);
+-      vsl_b_read(is, sample.num_obs_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-// Auxiliary Edge Sample Methods
+-template <class OBS_T>
+-void boxm_aux_edge_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(obs=" << obs_ << " seg_len=" << seg_len_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.obs_);
+-  vsl_b_write(os, sample.seg_len_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.obs_);
+-      vsl_b_read(is, sample.seg_len_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_aux_edge_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_EDGE_SAMPLE_INSTANTIATE(T) \
+-template class boxm_edge_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_edge_sample<T >&)
+-
+-#define BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(T) \
+-template class boxm_aux_edge_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_aux_edge_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
+deleted file mode 100644
+index a92ae0e38e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
++++ /dev/null
+@@ -1,69 +0,0 @@
+-#ifndef boxm_edge_tangent_sample_h_
+-#define boxm_edge_tangent_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include "boxm_plane_obs.h"
+-#include <boxm/boxm_aux_traits.h>
+-
+-
+-template <class T>
+-class boxm_edge_tangent_sample
+-{
+- public:
+-  boxm_edge_tangent_sample() = default;
+-  ~boxm_edge_tangent_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  //: adds observations
+-  void insert(boxm_plane_obs<T> const& obs) { obs_.push_back(obs); }
+-
+-  //: insert a lis of observations
+-  void insert(std::vector<boxm_plane_obs<T> > const& obs) {obs_.insert(obs_.end(),obs.begin(),obs.end()); }
+-
+-  //: returns the number of observations
+-  unsigned num_obs() const { return obs_.size(); }
+-
+-  boxm_plane_obs<T> obs(unsigned int i) const {
+-    if (i < obs_.size()) return obs_[i];
+-    std::cerr << "boxm_edge_tangent_sample: " << i << " is out of index - size is " << obs_.size() << std::endl;
+-    return boxm_plane_obs<T>();
+-  }
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val(unsigned int i) {
+-    if (i < obs_.size()) return obs_[i].seg_len_;
+-    std::cerr << "boxm_edge_tangent_sample: " << i << "is out of index - size is " << obs_.size() << std::endl;
+-    return -1.0f;
+-  }
+-
+-  std::vector<boxm_plane_obs<T> > obs_list() { return obs_; }
+-
+- private:
+-  std::vector<boxm_plane_obs<T> > obs_;
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream&operator << (std::ostream& os, boxm_edge_tangent_sample<T>& sample);
+-
+-
+-#endif // boxm_edge_tangent_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
+deleted file mode 100644
+index bb96baa1e0..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
++++ /dev/null
+@@ -1,79 +0,0 @@
+-#ifndef boxm_edge_tangent_sample_hxx_
+-#define boxm_edge_tangent_sample_hxx_
+-
+-#include "boxm_edge_tangent_sample.h"
+-#include "boxm_plane_obs.h"
+-
+-template <class OBS_T>
+-void boxm_edge_tangent_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << " num_obs=" << this->num_obs() << std::endl;
+-  for (unsigned i=0; i<obs_.size(); i++)
+-    os << "    " << i << "- (obs=" << this->obs(i) << ")\n" ;
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const & sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.num_obs());
+-  for (unsigned i=0; i<sample.num_obs(); i++)
+-    vsl_b_write(os, sample.obs(i));
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-     { unsigned num;
+-      vsl_b_read(is, num);
+-      boxm_plane_obs<T> o;
+-      for (unsigned i=0; i<num; i++) {
+-        vsl_b_read(is, o);
+-        sample.insert(o);
+-      }}
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, boxm_edge_tangent_sample<T> &sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(T) \
+-template class boxm_edge_tangent_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, boxm_edge_tangent_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
+deleted file mode 100644
+index 953c9f286f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
++++ /dev/null
+@@ -1,55 +0,0 @@
+-#ifndef boxm_inf_line_sample_h_
+-#define boxm_inf_line_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vgl/vgl_line_3d_2_points.h>
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <bsta/bsta_kent.h>
+-
+-template<class T>
+-class boxm_inf_line_sample
+-{
+- public:
+-  //: initially the residual is very big, it means the solution to this inf line is not found yet
+-  boxm_inf_line_sample() :
+-       residual_(1e6), line_(vgl_infinite_line_3d<T>(vgl_vector_2d<T>(0,0),
+-       vgl_vector_3d<T>(10,10,10))), num_obs_(0){}
+-
+-  boxm_inf_line_sample(vgl_infinite_line_3d<T> line,unsigned num_obs=0) : residual_(1e6),line_(line),num_obs_(num_obs) {}
+-  ~boxm_inf_line_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) { os << "(line=" << line_ << ')';  }
+-  bool operator==(const boxm_inf_line_sample &rhs) const;
+-  typedef boxm_inf_line_sample<T> value_type;
+-  // public members
+-  T residual_;
+-  vgl_infinite_line_3d<T> line_;
+-  vgl_line_3d_2_points<T> line_clipped_;
+-  unsigned num_obs_;
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample);
+-
+-
+-#endif // boxm_inf_line_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
+deleted file mode 100644
+index 1206b4a5f3..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
++++ /dev/null
+@@ -1,79 +0,0 @@
+-#ifndef boxm_inf_line_sample_hxx_
+-#define boxm_inf_line_sample_hxx_
+-
+-#include "boxm_inf_line_sample.h"
+-#include <vgl/io/vgl_io_infinite_line_3d.h> // for vsl_b_write(os, sample.line_);
+-#include <vgl/io/vgl_io_line_3d_2_points.h> // for vsl_b_write(os, sample.line_clipped_);
+-
+-template <class T>
+-bool boxm_inf_line_sample<T>::operator==(const boxm_inf_line_sample<T> &rhs) const
+-{
+-  if ((this==&rhs) || (line_==rhs.line_ && line_clipped_==rhs.line_clipped_ && num_obs_==rhs.num_obs_))
+-    return true;
+-  else
+-    return false;
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.num_obs_);
+-  vsl_b_write(os, sample.residual_);
+-  vsl_b_write(os, sample.line_);
+-  vsl_b_write(os, sample.line_clipped_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.num_obs_);
+-      vsl_b_read(is, sample.residual_);
+-      vsl_b_read(is, sample.line_);
+-      vsl_b_read(is, sample.line_clipped_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_inf_line_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_INF_LINE_SAMPLE_INSTANTIATE(T) \
+-template class boxm_inf_line_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > *&);\
+-template std::ostream& operator << (std::ostream&, boxm_inf_line_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
+deleted file mode 100644
+index 56ac1825d9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#ifndef boxm_opt2_sample_h_
+-#define boxm_opt2_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-
+-template <class OBS_T>
+-class boxm_opt2_sample
+-{
+- public:
+-  boxm_opt2_sample()
+-  : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), log_pass_prob_sum_(0.0f), weighted_seg_len_sum_(0.0f)
+-  {}
+-
+-  ~boxm_opt2_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  OBS_T obs_;
+-  float pre_;
+-  float vis_;
+-  float PI_;
+-  float seg_len_;
+-
+-  float log_pass_prob_sum_;
+-  float weighted_seg_len_sum_;
+-};
+-
+-//:traits for a grey optimization sample
+-template <>
+-class boxm_aux_traits<BOXM_AUX_OPT2_GREY>
+-{
+- public:
+-  typedef boxm_opt2_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt2_grey_work"; }
+-};
+-
+-//:traits for an rgb optimization sample
+-template <>
+-class boxm_aux_traits<BOXM_AUX_OPT2_RGB>
+-{
+- public:
+-  typedef boxm_opt2_sample<vil_rgb<float> > sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt2_rgb_work"; }
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator<< (std::ostream& os, const boxm_opt2_sample<T>& sample);
+-
+-#endif // boxm_opt2_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
+deleted file mode 100644
+index 44300e3bf7..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-#ifndef boxm_opt2_sample_hxx_
+-#define boxm_opt2_sample_hxx_
+-
+-#include "boxm_opt2_sample.h"
+-
+-
+-template <class OBS_T>
+-void boxm_opt2_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_
+-     << " seg_len=" << seg_len_ << " log_pass_prob_sum=" << log_pass_prob_sum_
+-     << " weighted_seg_len_sum=" << weighted_seg_len_sum_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.obs_);
+-  vsl_b_write(os, sample.pre_);
+-  vsl_b_write(os, sample.vis_);
+-  vsl_b_write(os, sample.PI_);
+-  vsl_b_write(os, sample.seg_len_);
+-  vsl_b_write(os, sample.log_pass_prob_sum_);
+-  vsl_b_write(os, sample.weighted_seg_len_sum_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.obs_);
+-    vsl_b_read(is, sample.pre_);
+-    vsl_b_read(is, sample.vis_);
+-    vsl_b_read(is, sample.PI_);
+-    vsl_b_read(is, sample.seg_len_);
+-    vsl_b_read(is, sample.log_pass_prob_sum_);
+-    vsl_b_read(is, sample.weighted_seg_len_sum_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt2_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template<class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_opt2_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_OPT2_SAMPLE_INSTANTIATE(T) \
+-template class boxm_opt2_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_opt2_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
+deleted file mode 100644
+index 3b8d162774..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
++++ /dev/null
+@@ -1,76 +0,0 @@
+-#ifndef boxm_opt3_sample_h_
+-#define boxm_opt3_sample_h_
+-//:
+-// \file
+-
+-#include <vector>
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-//: class for holding auxiliary information for opt3 process.
+-// Note that APM is not necessarily appearance model type of world,
+-// but observation types of the two models should be the same.
+-template<boxm_apm_type APM>
+-class boxm_opt3_sample
+-{
+- public:
+-  typedef typename boxm_apm_traits<APM>::obs_datatype obs_datatype;
+-  typedef typename boxm_apm_traits<APM>::apm_datatype apm_datatype;
+-
+-  boxm_opt3_sample()
+-    : weighted_vis_sum_(0.0f), seg_len_sum_(0.0f), log_pass_prob_sum_(0.0f) { }
+-  ~boxm_opt3_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  void update_obs_dist(obs_datatype obs, float obs_prob);
+-
+-  apm_datatype obs_dist_; // distribution of samples from this observation
+-  float weighted_vis_sum_; // sum of visibility probabilities * corresponding seg_lens
+-  float seg_len_sum_; // sum of sample segment lengths
+-  float log_pass_prob_sum_; // sum of log of updated (1 - PQ)
+-};
+-
+-//: traits for a grey optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT3_MOG_GREY>
+-{
+- public:
+-   typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype sample_datatype;
+-   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_GREY;
+-
+-  static std::string storage_subdir() { return "opt3_mog_grey"; }
+-};
+-
+-//: traits for an rgb optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT3_MOG_RGB>
+-{
+- public:
+-   typedef boxm_apm_traits<BOXM_APM_MOG_RGB>::obs_datatype sample_datatype;
+-   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_RGB;
+-
+-  static std::string storage_subdir() { return "opt3_mog_rgb"; }
+-};
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample);
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample);
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample);
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample);
+-
+-template <boxm_apm_type APM>
+-std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample);
+-
+-#endif // boxm_opt3_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
+deleted file mode 100644
+index 85f2e954dc..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
++++ /dev/null
+@@ -1,92 +0,0 @@
+-#ifndef boxm_opt3_sample_hxx_
+-#define boxm_opt3_sample_hxx_
+-
+-#include "boxm_opt3_sample.h"
+-
+-#include <vsl/vsl_vector_io.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_mixture_fixed.h> // for binary io functions
+-#include <bsta/io/bsta_io_gaussian_indep.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-//#include <boxm/boxm_mog_rgb_processor.h>
+-
+-template <boxm_apm_type APM>
+-void boxm_opt3_sample<APM>::print(std::ostream& os) const
+-{
+-  os << "(log_pass_prob_sum=" << log_pass_prob_sum_ << " seg_len_sum_=" << seg_len_sum_
+-     << "weighted_vis_sum_=" << weighted_vis_sum_ << " obs_dist=" << obs_dist_ << ')';
+-}
+-
+-template <boxm_apm_type APM>
+-void boxm_opt3_sample<APM>::update_obs_dist(typename boxm_opt3_sample<APM>::obs_datatype obs, float obs_prob)
+-{
+-  boxm_apm_traits<APM>::apm_processor::update(obs_dist_, obs, obs_prob);
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.log_pass_prob_sum_);
+-  vsl_b_write(os, sample.seg_len_sum_);
+-  vsl_b_write(os, sample.weighted_vis_sum_);
+-  vsl_b_write(os, sample.obs_dist_);
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.log_pass_prob_sum_);
+-    vsl_b_read(is, sample.seg_len_sum_);
+-    vsl_b_read(is, sample.weighted_vis_sum_);
+-    vsl_b_read(is, sample.obs_dist_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt3_sample<APM>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <boxm_apm_type APM>
+-std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_OPT3_SAMPLE_INSTANTIATE(T) \
+-template class boxm_opt3_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_opt3_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
+deleted file mode 100644
+index 417c0ccc98..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
++++ /dev/null
+@@ -1,45 +0,0 @@
+-#ifndef boxm_plane_obs_h_
+-#define boxm_plane_obs_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <vgl/vgl_homg_plane_3d.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-template<class T>
+-class boxm_plane_obs
+-{
+- public:
+-  boxm_plane_obs() : seg_len_(0.0f), plane_(vgl_homg_plane_3d<T>()) {}
+-  boxm_plane_obs(vgl_homg_plane_3d<T> plane, float seg_len) : seg_len_(seg_len), plane_(plane) {}
+-  ~boxm_plane_obs() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const { os << "(plane=" << plane_ << " seg_len=" << seg_len_ << ')'; }
+-
+-  // public members
+-  float seg_len_;
+-  vgl_homg_plane_3d<T> plane_;
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_plane_obs<T>& sample);
+-
+-
+-#endif // boxm_plane_obs_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
+deleted file mode 100644
+index 5d2d8b4535..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
++++ /dev/null
+@@ -1,69 +0,0 @@
+-#ifndef boxm_plane_obs_hxx_
+-#define boxm_plane_obs_hxx_
+-
+-#include "boxm_plane_obs.h"
+-
+-#include "boxm_edge_tangent_sample.h"
+-#include "boxm_inf_line_sample.h"
+-
+-#include <vgl/io/vgl_io_homg_plane_3d.h> // for vsl_b_write(os, sample.plane_);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.seg_len_);
+-  vsl_b_write(os, sample.plane_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.seg_len_);
+-      vsl_b_read(is, sample.plane_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator<< (std::ostream& os, boxm_plane_obs<T> const& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_PLANE_OBS_INSTANTIATE(T) \
+-template class boxm_plane_obs<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > *&);\
+-template std::ostream& operator << (std::ostream&, boxm_plane_obs<T > const&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
+deleted file mode 100644
+index e51d415ce8..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
++++ /dev/null
+@@ -1,70 +0,0 @@
+-#ifndef boxm_rt_sample_h_
+-#define boxm_rt_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-template<class OBS_T>
+-class boxm_rt_sample
+-{
+- public:
+-  boxm_rt_sample()
+-    : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), Beta_(0.0f),
+-    updatefactor_(0.0f), log_sum_(0.0f) {}
+-  ~boxm_rt_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  OBS_T obs_;
+-  float pre_;
+-  float vis_;
+-  float PI_;
+-  float seg_len_;
+-  float Beta_;
+-  float updatefactor_;
+-  float log_sum_;
+-};
+-
+-
+-//: traits for a grey optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
+-{
+- public:
+-  typedef boxm_rt_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_grey_work"; }
+-};
+-
+-//: traits for an rgb optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
+-{
+- public:
+-  typedef boxm_rt_sample<vil_rgb<float> > sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
+-};
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_rt_sample<T>& sample);
+-
+-#endif // boxm_rt_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
+deleted file mode 100644
+index 4202653363..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
++++ /dev/null
+@@ -1,81 +0,0 @@
+-#ifndef boxm_rt_sample_hxx_
+-#define boxm_rt_sample_hxx_
+-
+-#include "boxm_rt_sample.h"
+-
+-
+-template <class OBS_T>
+-void boxm_rt_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_ << " seg_len=" << seg_len_ << " Beta=" << Beta_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.obs_);
+-  vsl_b_write(os, sample.pre_);
+-  vsl_b_write(os, sample.vis_);
+-  vsl_b_write(os, sample.PI_);
+-  vsl_b_write(os, sample.seg_len_);
+-  vsl_b_write(os, sample.updatefactor_);
+-  vsl_b_write(os, sample.Beta_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.obs_);
+-    vsl_b_read(is, sample.pre_);
+-    vsl_b_read(is, sample.vis_);
+-    vsl_b_read(is, sample.PI_);
+-    vsl_b_read(is, sample.seg_len_);
+-    vsl_b_read(is, sample.updatefactor_);
+-    vsl_b_read(is, sample.Beta_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_rt_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream &operator << (std::ostream& os, const boxm_rt_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_RT_SAMPLE_INSTANTIATE(T) \
+-template class boxm_rt_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_rt_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.h b/contrib/brl/bseg/boxm/sample/boxm_sample.h
+deleted file mode 100644
+index 4d2312ae98..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample.h
++++ /dev/null
+@@ -1,68 +0,0 @@
+-#ifndef boxm_sample_h_
+-#define boxm_sample_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <utility>
+-#include <boxm/boxm_apm_traits.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-class boxm_sample
+-{
+- public:
+-  static const boxm_apm_type apm_type = APM_MODEL;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
+-  static const unsigned int obs_dim = boxm_apm_traits<APM_MODEL>::obs_dim;
+-
+-  //: default constructor: alpha is set to 0.0015.
+-  boxm_sample() : alpha(0.0015f), appearance_() {}
+-
+-  boxm_sample(float alpha_val): alpha(alpha_val), appearance_() {}
+-  //: constructor
+-  boxm_sample(float alpha_val, apm_datatype apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
+-
+-  virtual ~boxm_sample() = default;
+-
+-  static short version_no() { return 1; }
+-
+-  //: bin is to imitate the bin number of multiple_bin case
+-  apm_datatype & appearance(int /*bin*/=-1) { return appearance_; }
+-
+-  void set_appearance(apm_datatype  app,int /*bin*/=-1) { appearance_=app; }
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val() const { return alpha; }
+-
+-  //: the occlusion density at the sample point
+-  float alpha;
+-
+-  //: the appearance model at the sample point
+-  typename boxm_apm_traits<APM_MODEL>::apm_datatype appearance_;
+-
+-  void  print(std::ostream& os) const;
+-};
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
+deleted file mode 100644
+index e644739f43..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#ifndef boxm_sample_hxx_
+-#define boxm_sample_hxx_
+-
+-#include "boxm_sample.h"
+-#include <bsta/bsta_mixture_fixed.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-void boxm_sample<APM_MODEL>::print(std::ostream& os) const
+-{
+-  os << "(alpha=" << alpha << " appearence=" << appearance_ << ')';
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.alpha);
+-  vsl_b_write(os, sample.appearance_);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.alpha);
+-      vsl_b_read(is, sample.appearance_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_SAMPLE_INSTANTIATE(T) \
+-template class boxm_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
+deleted file mode 100644
+index 838637e49f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
++++ /dev/null
+@@ -1,63 +0,0 @@
+-#ifndef boxm_sample_multi_bin_h_
+-#define boxm_sample_multi_bin_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <utility>
+-#include <boxm/boxm_apm_traits.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <bsta/bsta_attributes.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-class boxm_sample_multi_bin
+-{
+- public:
+-  static const boxm_apm_type apm_type = APM_MODEL;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
+-
+-  //: default constructor
+-  boxm_sample_multi_bin() : alpha(0.001f) {}
+-  //: constructor
+-  boxm_sample_multi_bin(float alpha_val,std::map<int,apm_datatype> apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
+-
+-  static short version_no() { return 1; }
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val() const { return alpha; }
+-
+-  //: the occlusion density at the sample point
+-  float alpha;
+-  apm_datatype & appearance(int bin=0);
+-
+-  void set_appearance(apm_datatype  app,int bin=0);
+-
+-  std::map<int,apm_datatype> appearance_;
+-
+-  void  print(std::ostream& os) const;
+- private:
+-  //: the appearance model at the sample point
+-};
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
+deleted file mode 100644
+index 714b493eec..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#ifndef boxm_sample_multi_bin_hxx_
+-#define boxm_sample_multi_bin_hxx_
+-
+-#include "boxm_sample_multi_bin.h"
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <vsl/vsl_map_io.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <bsta/io/bsta_io_mixture.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_indep.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-typename boxm_sample_multi_bin<APM_MODEL>::apm_datatype & boxm_sample_multi_bin<APM_MODEL>::appearance(int bin)
+-{
+-  if (appearance_.find(bin)==appearance_.end())
+-  {
+-    appearance_[bin]=apm_datatype();
+-    return appearance_[bin];
+-  }
+-  else
+-    return appearance_[bin];
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void boxm_sample_multi_bin<APM_MODEL>::set_appearance(apm_datatype  app,int bin)
+-{
+-  appearance_[bin]=app;
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void boxm_sample_multi_bin<APM_MODEL>::print(std::ostream& os) const
+-{
+-  os << "(alpha=" << alpha << " appearence=" ;
+-  for (typename std::map<int,apm_datatype>::const_iterator iter=appearance_.begin();
+-       iter!=appearance_.end(); ++iter)
+-    os << "bin#= " << iter->first << ' ' << iter->second;
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.alpha);
+-  vsl_b_write(os, sample.appearance_);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.alpha);
+-      vsl_b_read(is, sample.appearance_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample_multi_bin<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(T) \
+-template class boxm_sample_multi_bin<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_sample_multi_bin<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
+deleted file mode 100644
+index ba4cd770ad..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
++++ /dev/null
+@@ -1,55 +0,0 @@
+-#ifndef boxm_scalar_sample_h_
+-#define boxm_scalar_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-
+-template <class T>
+-class boxm_scalar_sample
+-{
+- public:
+-  boxm_scalar_sample() : scalar_sum_(0), seg_len_(0.0f) { }
+-
+-  ~boxm_scalar_sample() = default;
+-  T basic_val() { if (seg_len_>0) return scalar_sum_/seg_len_; else return (T)0; }
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  T scalar_sum_;
+-  float seg_len_;
+-};
+-
+-//: traits for a scalar sample
+-template <>
+-class boxm_apm_traits<BOXM_SCALAR_FLOAT>
+-{
+- public:
+-  typedef boxm_scalar_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "scalar_subdir"; }
+-};
+-
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const* &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T>* &sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample);
+-
+-#endif // boxm_scalar_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
+deleted file mode 100644
+index 6eb0d37aef..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
++++ /dev/null
+@@ -1,70 +0,0 @@
+-#ifndef boxm_scalar_sample_hxx_
+-#define boxm_scalar_sample_hxx_
+-
+-#include "boxm_scalar_sample.h"
+-
+-template <class OBS_T>
+-void boxm_scalar_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(scalar=" << scalar_sum_ << " seg_len=" << seg_len_ << ")\n";
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.scalar_sum_);
+-  vsl_b_write(os, sample.seg_len_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.scalar_sum_);
+-    vsl_b_read(is, sample.seg_len_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scalar_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_SCALAR_SAMPLE_INSTANTIATE(T) \
+-  template class boxm_scalar_sample<T >; \
+-  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const &); \
+-  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const *&); \
+-  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > &); \
+-  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > *&); \
+-  template std::ostream& operator << (std::ostream&, const boxm_scalar_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h b/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
+deleted file mode 100644
+index 666c4a3ac5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#ifndef boxm_update_sample_h_
+-#define boxm_update_sample_h_
+-//:
+-// \file
+-
+-class boxm_update_sample
+-{
+- public:
+-  //: default constructor
+-  boxm_update_sample() : update_multiplier(0.0f), do_update(false) {}
+-
+-  //: the (unnormalized) update multiplier
+-  float update_multiplier;
+-  bool do_update;
+-};
+-
+-#endif // boxm_update_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h b/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
+deleted file mode 100644
+index 3ff4ed3ad5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#ifndef boxm_vis_implicit_sample_h_
+-#define boxm_vis_implicit_sample_h_
+-//:
+-// \file
+-
+-class boxm_vis_implicit_sample
+-{
+- public:
+-  //: default constructor
+-  boxm_vis_implicit_sample() : max_vis(0.0f), n_obs(0) {}
+-
+-  float max_vis;
+-  unsigned int n_obs;
+-};
+-
+-#endif // boxm_vis_implicit_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/dummy.cxx b/contrib/brl/bseg/boxm/sample/dummy.cxx
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
+deleted file mode 100644
+index ed11dfb489..0000000000
+--- a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,4 +0,0 @@
+-add_executable( boxm_sample_test_include test_include.cxx )
+-target_link_libraries( boxm_sample_test_include boxm_sample)
+-add_executable( boxm_sample_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_sample_test_template_include boxm_sample)
+diff --git a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
+deleted file mode 100644
+index 17e8b789dd..0000000000
+--- a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#include <boxm/sample/boxm_update_sample.h>
+-#include <boxm/sample/boxm_vis_implicit_sample.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
+deleted file mode 100644
+index d1f741b32f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/sample/boxm_edge_sample.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.hxx>
+-#include <boxm/sample/boxm_opt2_sample.hxx>
+-#include <boxm/sample/boxm_opt3_sample.hxx>
+-#include <boxm/sample/boxm_plane_obs.hxx>
+-#include <boxm/sample/boxm_rt_sample.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.hxx>
+-#include <boxm/sample/boxm_scalar_sample.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/tests/CMakeLists.txt
+deleted file mode 100644
+index eb0d974b9f..0000000000
+--- a/contrib/brl/bseg/boxm/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,32 +0,0 @@
+-add_executable( boxm_test_all
+-  test_driver.cxx
+-  test_binary_io.cxx
+-  test_block_iter.cxx
+-# FAILS on DASHBOARD FIX_ME
+-#  test_region_finder.cxx
+-  test_cell_iterator.cxx
+-  test_load_neighboring_blocks.cxx
+- )
+-
+-set(boxm_test_all_sources
+-    test_utils.h    test_utils.cxx
+-    )
+-
+-vxl_add_library(LIBRARY_NAME boxm_tests LIBRARY_SOURCES  ${boxm_test_all_sources})
+-target_link_libraries(boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-target_link_libraries( boxm_test_all boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
+-
+-add_test( NAME boxm_test_binary_io COMMAND $<TARGET_FILE:boxm_test_all>    test_binary_io  )
+-add_test( NAME boxm_test_block_iter COMMAND $<TARGET_FILE:boxm_test_all>    test_block_iter  )
+-#add_test( NAME boxm_test_region_finder COMMAND $<TARGET_FILE:boxm_test_all>    test_region_finder )
+-if( VXL_RUN_FAILING_TESTS ) ## SEGFAULT when testing with ctest -j16 (perhaps files are shared between tests)
+-add_test( NAME boxm_test_cell_iterator COMMAND $<TARGET_FILE:boxm_test_all>    test_cell_iterator )
+-endif()
+-add_test( NAME boxm_test_load_neighboring_blocks COMMAND $<TARGET_FILE:boxm_test_all>    test_load_neighboring_blocks )
+-
+-add_executable( boxm_test_include test_include.cxx )
+-target_link_libraries( boxm_test_include boxm)
+-add_executable( boxm_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_test_template_include boxm)
+diff --git a/contrib/brl/bseg/boxm/tests/camera0.txt b/contrib/brl/bseg/boxm/tests/camera0.txt
+deleted file mode 100644
+index cf11c57707..0000000000
+--- a/contrib/brl/bseg/boxm/tests/camera0.txt
++++ /dev/null
+@@ -1,104 +0,0 @@
+-satId = "????";
+-bandId = "RGB";
+-SpecId = "RPC00B";
+-BEGIN_GROUP = IMAGE
+-
+-
+-  lineOffset = 0.0
+-  sampOffset = 0.0
+-  latOffset = 0.0
+-  longOffset = 0.0
+-  heightOffset = 0.0
+-  lineScale = 1.0
+-  sampScale = 1.0
+-  latScale = 1.0
+-  longScale = 1.0
+-  heightScale = 1.0
+-  lineNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  lineDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-END_GROUP = IMAGE
+-END;
+-lvcs
+-47.550493 35.395931 664.186757
+diff --git a/contrib/brl/bseg/boxm/tests/frame_00000.txt b/contrib/brl/bseg/boxm/tests/frame_00000.txt
+deleted file mode 100644
+index a66e2014bd..0000000000
+--- a/contrib/brl/bseg/boxm/tests/frame_00000.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-1 0 0
+-0 1 0
+-0 0 1
+-1 0 0
+-0 1 0
+-0 0 1
+-0 0 0
+diff --git a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx b/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
+deleted file mode 100644
+index 7dc2da196e..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
++++ /dev/null
+@@ -1,75 +0,0 @@
+-
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_binary_io()
+-{
+-#ifdef DEBUG
+-  short nlevels=5;
+-  typedef vgl_point_3d<double> point_type;
+-  boct_tree<short,point_type > * block = new boct_tree<short,point_type >(nlevels);
+-  TEST("No of Max levels of tree",nlevels, block->num_levels());
+-
+-  block->split(); //block->print();
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<double> world_dim(30,30,30);
+-  boxm_scene<boct_tree<short,point_type > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_paths("./boxm_scene", "block");
+-  x_write(std::cout, scene, "scene");
+-
+-  vsl_b_ofstream os("scene.bin");
+-  scene.b_write(os);
+-  os.close();
+-  vul_file::make_directory("./boxm_scene");
+-
+-  boxm_scene<boct_tree<short,vgl_point_3d<double> > > scene_out;
+-  vsl_b_ifstream is("scene.bin", std::ios::binary);
+-  scene_out.b_read(is);
+-  vpl_rmdir("./boxm_scene");
+-  vpl_unlink("./scene.bin");
+-
+-  // writing the binary file for a scene with grey MOG
+-  vgl_point_3d<double>  mog_origin(0,0,0);
+-  vgl_vector_3d<double> mog_block_dim(1,1,1);
+-  vgl_vector_3d<double> mog_world_dim(3,3,1);
+-
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > mog_scene( mog_origin, mog_block_dim, mog_world_dim);
+-  mog_scene.set_paths("./boxm_scene", "block");
+-  vul_file::make_directory("./boxm_scene");
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&mog_scene);
+-
+-  while (!iter.end())
+-  {
+-    mog_scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=mog_scene.get_active_block();
+-    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(10,6);
+-    block->init_tree(tree);
+-    mog_scene.write_active_block();
+-    iter++;
+-  }
+-  mog_scene.write_scene();
+-  // writing the binary file for a scene with grey MOG
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_mog_scene;
+-  read_mog_scene.load_scene("./boxm_scene/scene.xml");
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_iter(&read_mog_scene);
+-  while (!read_iter.end())
+-  {
+-    read_mog_scene.load_block(read_iter.index().x(),read_iter.index().y(),read_iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=read_mog_scene.get_active_block();
+-    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
+-    read_iter++;
+-  }
+-  vpl_rmdir("./boxm_scene");
+-  vpl_unlink("./scene.bin");
+-#endif // DEBUG
+-}
+-
+-TESTMAIN(test_binary_io);
+diff --git a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx b/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
+deleted file mode 100644
+index 376ee2d9b4..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
++++ /dev/null
+@@ -1,47 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree.h>
+-
+-#include "test_utils.h"
+-
+-typedef boct_tree<short,vgl_point_3d<double> > tree_type;
+-
+-static void test_block_iter()
+-{
+-  clean_up();
+-  short nlevels=5;
+-  auto * block = new tree_type(nlevels);
+-  TEST("No of Max levels of tree",nlevels, block->number_levels());
+-
+-  block->split();
+-  block->print();
+-  delete block;
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(3,3,3);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_paths("./boxm_scene", "block");
+-
+-  boxm_block_iterator<tree_type> iter = scene.iterator();
+-  int num_blocks=0;
+-  for (; !iter.end(); ++iter) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type> *block = scene.get_active_block();
+-    block->set_tree(new tree_type(5,3));
+-    std::cout << block->bounding_box() << std::endl;
+-    ++num_blocks;
+-    scene.write_active_block();
+-  }
+-  int x,y,z;
+-  scene.block_num(x,y,z);
+-  TEST("Number of blocks iterator visits", num_blocks, x*y*z);
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks in test_block_iter: " << boct_tree_cell<short,vgl_point_3d<double> >::nleaks() << '\n';
+-#endif
+-  clean_up();
+-}
+-
+-TESTMAIN(test_block_iter);
+diff --git a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx b/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
+deleted file mode 100644
+index f65529a973..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
++++ /dev/null
+@@ -1,51 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <testlib/testlib_test.h>
+-#include "test_utils.h"
+-
+-void test_cell_iterator()
+-{
+-
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene();
+-
+-  //get the iterator
+-  boxm_cell_iterator<boct_tree<short, float > > iterator = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  boct_tree_cell<short,float> *cell = *iterator;
+-  unsigned num_cells = 0;
+-  bool result = true;
+-
+-  while (!iterator.end()) {
+-
+-    if( (std::abs(cell->data() - 0.8) > 1e-7) && (std::abs(cell->data() - 0.5) > 1e-7) ){
+-      result = false;
+-      std::cerr << " Wrong data: " << cell->data() << std::endl;
+-    }
+-    ++iterator;
+-    num_cells ++;
+-        if(!iterator.end()){
+-    cell = *iterator;
+-        }
+-  }
+-
+-  if(num_cells!=120){
+-    result = false;
+-    std::cerr << "Wrong number of cells: " << num_cells << std::endl;
+-  }
+-
+-  TEST("Valid Test", result, true);
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_cell_iterator " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-  clean_up();
+-
+-}
+-
+-
+-TESTMAIN(test_cell_iterator);
+diff --git a/contrib/brl/bseg/boxm/tests/test_driver.cxx b/contrib/brl/bseg/boxm/tests/test_driver.cxx
+deleted file mode 100644
+index 3e55d5a0ea..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_driver.cxx
++++ /dev/null
+@@ -1,21 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_binary_io );
+-DECLARE( test_block_iter );
+-//FAILS ON DASHBOARD FIX_ME
+-//DECLARE( test_region_finder );
+-DECLARE( test_cell_iterator );
+-DECLARE( test_load_neighboring_blocks );
+-
+-void register_tests()
+-{
+-  REGISTER( test_binary_io );
+-  REGISTER( test_block_iter );
+-//FAILS ON DASHBOARD FIX_ME
+-// REGISTER( test_region_finder );
+-  REGISTER( test_cell_iterator );
+-  REGISTER( test_load_neighboring_blocks );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/tests/test_include.cxx b/contrib/brl/bseg/boxm/tests/test_include.cxx
+deleted file mode 100644
+index ae4ae05a88..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_include.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_io_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx b/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
+deleted file mode 100644
+index 1f8fe346ca..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
++++ /dev/null
+@@ -1,89 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 17-Aug-2010
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-void test_load_neighboring_blocks()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
+-  std::cout << "Scene Created" << std::endl;
+-
+-  //iterate through blocks, loading blocks and eighbors
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  bool result = true;
+-  while (!iter.end()) {
+-    if (scene->load_block_and_neighbors(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      //std::cout << "Center blocks : "  << iter.index()<< std::endl;
+-      std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > active_blocks = scene->active_blocks();
+-
+-      //iterate through the active blocks and check that their trees are in memory
+-      auto it = active_blocks.begin();
+-
+-      for (; it!=active_blocks.end(); it++){
+-        boxm_block<boct_tree<short, float> > *block = scene->get_block(*it);
+-        if(!block)
+-          result = false;
+-        boct_tree<short, float> *tree = block->get_tree();
+-        if(!tree)
+-          result =false;
+-      }
+-
+-
+-      unsigned sum =0;
+-      if (iter.index().x()>0 && iter.index().x()<3) sum++;
+-      if (iter.index().y()>0 && iter.index().y()<3) sum++;
+-      if (iter.index().z()>0 && iter.index().z()<3) sum++;
+-      if(sum == 0)
+-        if(active_blocks.size()!=8){
+-          result = false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-      if(sum == 1)
+-        if(active_blocks.size()!=12){
+-          result = false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-      if(sum == 2)
+-        if(active_blocks.size()!=18){
+-          result = false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-      if(sum == 3)
+-        if(active_blocks.size()!=27){
+-          result=false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-#if 0
+-      std::cout << "Active blocks : " << std::endl;
+-      std::set<vgl_point_3d<int> >::iterator it = active_blocks.begin();
+-      for (; it!=active_blocks.end(); it++)
+-        std::cout << *it << std::endl;
+-#endif
+-    }
+-    iter++;
+-
+-  }
+-
+-  scene->unload_active_blocks();
+-  if(scene->active_blocks().size()!=0){
+-    result = false;
+-    std::cout << "Failed to unload active blocks" << std::endl;
+-  }
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks test_load_neighboring_blocks: " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  TEST("Valid Test", result, true);
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_load_neighboring_blocks);
+diff --git a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx b/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
+deleted file mode 100644
+index 47d5fd903b..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-//:
+-// \file
+-// \brief  A test to verify that findind cells within a region is correct
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-void test_region_finder()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene();
+-
+-  bool result = true;
+-
+-  if(!scene) result=false;
+-
+-  //find a region
+-
+-  {
+-    vgl_point_3d<double> max_point(14.0, 14.0, 14.0);
+-    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
+-    vgl_box_3d<double> roi(min_point, max_point);
+-
+-    std::vector<boct_tree_cell<short, float>* > cells;
+-    scene->leaves_in_region(roi,cells);
+-
+-
+-    if(cells.size()!=64){
+-      result=false;
+-      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
+-    }
+-
+-    for(unsigned i =0; i<cells.size(); i++)
+-      if(std::abs(cells[i]->data()- 0.8f)>1.0e-7)
+-      {
+-        result = false;
+-        std::cerr << cells[i]->data()<<std::endl;
+-      }
+-
+-    cells.clear();
+-    scene->unload_active_blocks();
+-
+-  }
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Region1: " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  //find another region
+-  {
+-    vgl_point_3d<double> max_point(19.0, 19.0, 19.0);
+-    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
+-    vgl_box_3d<double> roi(min_point, max_point);
+-
+-    std::vector<boct_tree_cell<short, float>* > cells;
+-    scene->leaves_in_region(roi,cells);
+-
+-    if(cells.size()!=83){
+-      result=false;
+-      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
+-    }
+-
+-    cells.clear();
+-    scene->unload_active_blocks();
+-  }
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Region2: " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  if(!scene) result=false;
+-
+-  TEST("Correct region found", result, true);
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_region_finder);
+diff --git a/contrib/brl/bseg/boxm/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/tests/test_template_include.cxx
+deleted file mode 100644
+index edd7156927..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_aux_scene.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/tests/test_utils.cxx b/contrib/brl/bseg/boxm/tests/test_utils.cxx
+deleted file mode 100644
+index 58b40215a5..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_utils.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#include "test_utils.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Aug-2010
+-
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i)
+-{
+-  tree-> split(); //now we have 8 cells
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  leaves[i]->set_data(0.8f);
+-  leaves[i]->split();
+-}
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz)
+-{
+-  //crete the input scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-
+-  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
+-
+-    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
+-
+-  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path("./");
+-  scene->set_paths(scene_path, "test_scene");
+- #ifdef DEBUG
+-  std::cerr << "Leaks Created - scene constructor: " << boct_tree_cell<short,float>::nleaks() << '\n';
+-#endif
+-  unsigned cell_index = 7;
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    //std::cout << "Loading block " << iter.index() << std::endl;
+-    scene->load_block(iter.index());
+-    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
+-    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
+-    auto *tree = new boct_tree<short,float>(0.5f, 3, 1);
+-    //tree->print();
+-    init_tree(tree, cell_index);
+-    //tree->print();
+-    block->init_tree(tree);
+-    scene->write_active_block();
+-    if (cell_index == 0) cell_index = 7;
+-    cell_index--;
+-    ++iter;
+-  }
+-  //scene->unload_active_blocks();
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << '\n';
+-#endif
+-
+-  return scene;
+-}
+-
+-void clean_up()
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());
+-    //vul_file::delete_file_glob(file_it());// already deleted ?? FIX_ME
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/tests/test_utils.h b/contrib/brl/bseg/boxm/tests/test_utils.h
+deleted file mode 100644
+index 43f864a0da..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_utils.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#ifndef boxm_test_utils_h_
+-#define boxm_test_utils_h_
+-//:
+-// \file
+-// \brief  A file containing utility functions for other tests
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <boxm/boxm_scene.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i);
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2);
+-
+-void clean_up();
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/CMakeLists.txt b/contrib/brl/bseg/boxm/util/CMakeLists.txt
+deleted file mode 100644
+index 10f3b5fd49..0000000000
+--- a/contrib/brl/bseg/boxm/util/CMakeLists.txt
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# brl/bseg/boxm/util/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_util_sources
+-    boxm_cell_data_traits.h                 boxm_cell_data_traits.cxx
+-    boxm_plane_ransac.h
+-    boxm_quad_scan_iterator.h               boxm_quad_scan_iterator.cxx
+-    boxm_rational_camera_utils.h            boxm_rational_camera_utils.cxx
+-    boxm_raytrace_operations.h              boxm_raytrace_operations.cxx
+-    boxm_triangle_interpolation_iterator.h  boxm_triangle_interpolation_iterator.hxx
+-    boxm_triangle_scan_iterator.h           boxm_triangle_scan_iterator.cxx
+-    boxm_utils.h                            boxm_utils.cxx
+-    boxm_vrml_util.h
+-    boxm_test_util.h                        boxm_test_util.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_util_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_util LIBRARY_SOURCES ${boxm_util_sources})
+-target_link_libraries(boxm_util boxm boxm_sample bvrml boct bsta ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx b/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
+deleted file mode 100644
+index 3a276cc3b2..0000000000
+--- a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
+-
+-BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
+deleted file mode 100644
+index b4bf234941..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
++++ /dev/null
+@@ -1,25 +0,0 @@
+-#include "boxm_cell_data_traits.h"
+-//:
+-// \file
+-
+-
+-//: Template specialization of zero_val for floating point case
+-template <>
+-float boxm_zero_val<short, float>()
+-{
+-  return 0.0f;
+-}
+-
+-
+-//: Template specialization of zero_val for unimodal gaussian
+-template <>
+-bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >()
+-{
+-  return {};
+-}
+-
+-template <>
+-mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>()
+-{
+-  return {};
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
+deleted file mode 100644
+index c96599e730..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
++++ /dev/null
+@@ -1,89 +0,0 @@
+-// This is brl/bseg/boxm/util/boxm_cell_data_traits.h
+-#ifndef boxm_cell_data_traits_h_
+-#define boxm_cell_data_traits_h_
+-//:
+-// \file
+-// \brief  Set of accessors of cell's data, taking care of different datatypes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date   December 9, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree_cell.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-//: Float to float
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, float >* cell,  double /*step_len*/)
+-{
+-  //return 1.0 - std::exp(-cell->data()*step_len);
+-  return cell->data();
+-}
+-
+-//: Float to float
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, short >* cell,  double /*step_len*/)
+-{
+-  return (float)cell->data();
+-}
+-
+-//: bool to float
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, bool >* cell,  double /*step_len*/)
+-{
+-  return (float)cell->data();
+-}
+-
+-//: Mixture of gaussians to float; return the mean
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, bsta_num_obs<bsta_gauss_sf1> >* cell, double /*step_len*/)
+-{
+-  return cell->data().mean();
+-}
+-
+-//: Mixture of gaussians to float; return the mean
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >* cell, double /*step_len*/)
+-{
+-  return cell->data().expected_value();
+-}
+-
+-//: boxm_sample to float. Return the probability values
+-template <class T_loc, class T_data>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, T_data >* cell, double step_len)
+-{
+-  return 1.f - float(std::exp(-cell->data().basic_val()*step_len));
+-}
+-
+-
+-template <class T_loc, class T_data>
+-T_data boxm_zero_val()
+-{
+-  return T_data(0);
+-}
+-
+-static const unsigned int n_gaussian_modes_ = 3;
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
+-typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
+-template <>
+-mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>();
+-
+-template <>
+-bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >();
+-
+-template <>
+-float boxm_zero_val<short, float >();
+-
+-//: boxm_scalar_sample to float. Return the normalized scalar value
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_scalar_sample<float>  >* cell, double /*step_len*/)
+-{
+-  return cell->data().basic_val();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h b/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
+deleted file mode 100644
+index 07d10348a6..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
++++ /dev/null
+@@ -1,126 +0,0 @@
+-#ifndef boxm_plane_ransac_h_
+-#define boxm_plane_ransac_h_
+-//:
+-// \file
+-// \brief class to find the optimal intersecting 3D line of a set of 3D planes.
+-//
+-// \author G. Tunali
+-//
+-// \verbatim
+-//  Modifications
+-//   Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
+-// \endverbatim
+-
+-#include <iostream>
+-#include <cstdlib>
+-#include <list>
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_distance.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_closest_point.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#define ITER_MAX 100
+-
+-template <class T>
+-bool boxm_plane_ransac(std::vector<boxm_edge_tangent_sample<T> > aux_samples,
+-                       std::vector<T> /*weights*/,
+-                       vgl_infinite_line_3d<T>& line,
+-                       T &min_res, vgl_box_3d<double> cell_global_box,
+-                       unsigned int threshold, float ortho_thres = 0.01f, float volume_ratio = 128.0f)
+-{
+-  unsigned int num_imgs = aux_samples.size();
+-
+-  vgl_point_3d<T> local_origin((T)cell_global_box.centroid_x(),(T)cell_global_box.centroid_y(),(T)cell_global_box.centroid_z());
+-  std::list<vgl_plane_3d<T> > fit_planes;
+-  min_res=T(1e10);
+-  line=vgl_infinite_line_3d<T>(vgl_vector_2d<T>(-10000,-10000),vgl_vector_3d<T>(0,0,1));
+-  std::vector<T> ws;
+-  bool set=false;
+-  // this threshold is to check participation from number of images
+-  if (num_imgs<=threshold)
+-    return set;
+-
+-  for (unsigned iter=0; iter<ITER_MAX; iter++)
+-  {
+-    fit_planes.clear();
+-    ws.clear();
+-    // select two imgs randomly
+-    int index1 = std::rand() % num_imgs;
+-    int index2 = index1;
+-    while (index2==index1)
+-      index2=std::rand() % num_imgs;
+-
+-    int index1_1 =std::rand() % aux_samples[index1].num_obs();
+-    int index2_1 =std::rand() % aux_samples[index2].num_obs();
+-
+-    vgl_plane_3d<T> plane1 = aux_samples[index1].obs(index1_1).plane_;
+-    vgl_plane_3d<T> plane2 = aux_samples[index2].obs(index2_1).plane_;
+-
+-    vgl_infinite_line_3d<T> inters_line;
+-    // form a hypothesis
+-    if (vgl_intersection(plane1, plane2, inters_line))
+-    {
+-      vgl_vector_3d<T> line_dir = inters_line.direction();
+-      vgl_point_3d<T> p=vgl_closest_point<T>(inters_line,local_origin);
+-      int cnt_imgs=0;
+-      // only if the hypothesis is close to the cell in consideration
+-      // can be made more tighter.
+-      if (vgl_distance<T>(p,local_origin)<0.67*cell_global_box.width())
+-      {
+-        for (unsigned i=0; i<aux_samples.size(); ++i) {
+-          bool flag=false;
+-          for (unsigned j=0;j<aux_samples[i].num_obs();j++)
+-          {
+-            vgl_plane_3d<T> plane = aux_samples[i].obs(j).plane_;
+-            vgl_vector_3d<T> normal = plane.normal();
+-            // see if the line direction and plane normal is perpendicular
+-            T res = dot_product(normal,line_dir);
+-            if (std::fabs(res) < T(ortho_thres))  {  // ortho_thres, used to be hard-coded to 0.05, then made a param with default 0.01 (stricter)
+-              // check to see if the line is close to the plane
+-              if (plane.contains(p,T(cell_global_box.width())/T(volume_ratio)))  // volume_ratio, used to be hard-coded to 8, then made a param with default 128 (stricter)
+-              {
+-                fit_planes.push_back(plane);
+-                //ws.push_back(weights[i]);
+-                ws.push_back(aux_samples[i].obs(j).seg_len_);
+-                flag=true;
+-              }
+-            }
+-          }
+-          if (flag)
+-            cnt_imgs++;
+-        }
+-      }
+-
+-      // intersect the selected planes
+-      if (cnt_imgs > (int)threshold ) {
+-        T res=0;
+-        vgl_infinite_line_3d<T> l;
+-        bool good = vgl_intersection(fit_planes, ws, l, res);
+-        vgl_point_3d<double> p0,p1;
+-        vgl_vector_2d<double> x0(l.x0().x(), l.x0().y());
+-        vgl_vector_3d<double> dir(l.direction().x(), l.direction().y(), l.direction().z());
+-
+-        if (good&&vgl_intersection<double>(cell_global_box, vgl_infinite_line_3d<double>(x0,dir), p0, p1)) {
+-          if (res<min_res) {
+-            min_res=res;
+-            line=l;
+-            set=true;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  return set;
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
+deleted file mode 100644
+index c1e220a294..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
++++ /dev/null
+@@ -1,188 +0,0 @@
+-#include <vector>
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_quad_scan_iterator.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: constructor
+-boxm_quad_scan_iterator::boxm_quad_scan_iterator(double *verts_x, double *verts_y,
+-                                                 unsigned int v0, unsigned int v1,
+-                                                 unsigned int v2, unsigned int v3):poly_()
+-{
+-  poly_.new_sheet();
+-
+-  poly_.push_back(verts_x[v0] * supersample_ratio_ - 0.5,
+-                  verts_y[v0] * supersample_ratio_ - 0.5);
+-  poly_.push_back(verts_x[v1] * supersample_ratio_ - 0.5,
+-                  verts_y[v1] * supersample_ratio_ - 0.5);
+-  poly_.push_back(verts_x[v2] * supersample_ratio_ - 0.5,
+-                  verts_y[v2] * supersample_ratio_ - 0.5);
+-  poly_.push_back(verts_x[v3] * supersample_ratio_ - 0.5,
+-                  verts_y[v3] * supersample_ratio_ - 0.5);
+-
+-  super_it_= new vgl_polygon_scan_iterator<double>(poly_,false);
+-
+-  poly_bb_.update(verts_x[v0], verts_y[v0]);
+-  poly_bb_.update(verts_x[v1], verts_y[v1]);
+-  poly_bb_.update(verts_x[v2], verts_y[v2]);
+-  poly_bb_.update(verts_x[v3], verts_y[v3]);
+-
+-  int poly_xmin = (int)std::floor(poly_bb_.xmin());
+-  int poly_xmax = (int)std::floor(poly_bb_.xmax()) + 1;
+-  poly_diameter_x_ = (poly_xmax - poly_xmin) + 1;
+-  aa_vals_ = new float[poly_diameter_x_];
+-  aa_vals_offset_ = -poly_xmin;
+-  next_return_ = false;
+-}
+-
+-
+-//: Resets the scan iterator to before the first scan line
+-//  After calling this function, next() needs to be called before
+-//  startx() and endx() form a valid scan line.
+-void boxm_quad_scan_iterator::reset()
+-{
+-  super_it_->reset();
+-  next_return_ = super_it_->next();
+-  while (next_return_ && super_it_->scany() < 0) {
+-    next_return_ = super_it_->next();
+-  }
+-}
+-
+-//: Tries to move to the next scan line.
+-//  Returns false if there are no more scan lines.
+-bool boxm_quad_scan_iterator::next()
+-{
+-  if (!next_return_) {
+-    return false;
+-  }
+-  int super_scany = super_it_->scany();
+-  scany_ = super_scany / supersample_ratio_; // super_scany should always be >= 0
+-
+-  // initialize startx_ and endx_
+-  startx_ = int(poly_bb_.xmax()) + 1;
+-  endx_ =  int(poly_bb_.xmin()) - 1;
+-
+-  // compute antialiasing values for each pixel in scanline
+-  //std::fill(aa_vals_.begin(), aa_vals_.end(), 0.0f);
+-  for (unsigned int i=0; i<poly_diameter_x_; i++)
+-    aa_vals_[i] = 0.0f;
+-
+-  int super_scany_end = (scany_ + 1)*supersample_ratio_;
+-  static const float increment = 1.0f / (supersample_ratio_*supersample_ratio_);
+-  static const float full_increment = 1.0f / (supersample_ratio_);
+-
+-  while ( (super_scany < super_scany_end) && next_return_ ) {
+-    int super_startx = super_it_->startx();
+-    int super_endx = super_it_->endx() + 1;
+-
+-    super_startx = std::max(0, super_startx);
+-    super_endx = std::max(0, super_endx);
+-    // make sure super_startx < super_endx
+-    if (super_endx > super_startx) {
+-      int scanline_startx = super_startx / supersample_ratio_;
+-      int scanline_endx = ((super_endx - 1)/ supersample_ratio_) + 1;
+-      // update startx and endx
+-      if (scanline_startx < startx_) {
+-        startx_ = scanline_startx;
+-      }
+-      if (scanline_endx > endx_) {
+-        endx_ = scanline_endx;
+-      }
+-      // case 1: run covers 1 superpixel only
+-      if (scanline_startx + 1 == scanline_endx) {
+-        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(super_endx - super_startx);
+-      }
+-      // case 2: startx is less than endx by more than 1
+-      else {
+-        // partial coverage at the beginning of scanline
+-        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(supersample_ratio_ - (super_startx % supersample_ratio_));
+-
+-        // full coverage in middle of scanline
+-        for (int x = scanline_startx + 1; x < scanline_endx-1; ++x) {
+-          aa_vals_[aa_vals_offset_ + x] += full_increment;
+-        }
+-        // partial coverage at end of scanline
+-        aa_vals_[aa_vals_offset_ + scanline_endx - 1] += increment*((super_endx - 1)% supersample_ratio_ + 1);
+-      }
+-    }
+-    next_return_ = super_it_->next();
+-    super_scany = super_it_->scany();
+-  }
+-  return true;
+-}
+-
+-//: y-coordinate of the current scan line.
+-int boxm_quad_scan_iterator::scany() const
+-{
+-  return scany_;
+-}
+-
+-//: Returns starting x-value of the current scan line.
+-//  startx() should be smaller than endx(), unless the scan line is empty
+-int boxm_quad_scan_iterator::startx() const
+-{
+-  return startx_;
+-}
+-
+-//: Returns ending x-value of the current scan line.
+-//  endx() should be larger than startx(), unless the scan line is empty
+-int  boxm_quad_scan_iterator::endx() const
+-{
+-  return endx_;
+-}
+-
+-//: returns the amount of pixel at location x in the current scanline covered by the triangle
+-float boxm_quad_scan_iterator::pix_coverage(int x)
+-{
+-  return aa_vals_[aa_vals_offset_ + x];
+-}
+-
+-bool
+-boxm_quad_scan_iterator:: x_start_end_val(const double * vals,double & start_val,double & end_val)
+-{
+-  int * chainnum=nullptr;
+-  int * vertnum=nullptr;
+-  int numcrossedges=0;
+-  super_it_->get_crossedge_vertices(chainnum,vertnum,numcrossedges);
+-  if (numcrossedges==2)
+-  {
+-    for (int i=0;i<numcrossedges;++i)
+-    {
+-      vgl_point_2d<double> p1=poly_[chainnum[i]][vertnum[i]];
+-      double val1=vals[vertnum[i]];
+-      double val2=0;
+-      vgl_point_2d<double> p2;
+-      if (vertnum[i]==3)
+-      {
+-        val2=vals[0];
+-        p2=poly_[chainnum[i]][0];
+-      }
+-      else
+-      {
+-        val2=vals[vertnum[i]+1];
+-        p2=poly_[chainnum[i]][vertnum[i]+1];
+-      }
+-      if (i==0)
+-        start_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
+-      else
+-        end_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
+-    }
+-    delete [] vertnum;
+-    delete [] chainnum;
+-    return true;
+-  }
+-  else
+-    return false;
+-}
+-
+-
+-boxm_quad_scan_iterator::~boxm_quad_scan_iterator()
+-{
+-  delete super_it_;
+-  delete[] aa_vals_;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
+deleted file mode 100644
+index 86c7bd0565..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
++++ /dev/null
+@@ -1,66 +0,0 @@
+-#ifndef boxm_quad_scan_iterator_h_
+-#define boxm_quad_scan_iterator_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vgl/vgl_region_scan_iterator.h>
+-#include <vgl/vgl_polygon_scan_iterator.h>
+-
+-#include <vbl/vbl_bounding_box.h>
+-
+-class boxm_quad_scan_iterator : public vgl_region_scan_iterator
+-{
+- public:
+-  //: constructor
+-  boxm_quad_scan_iterator(double *verts_x, double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2, unsigned int v3 = 3);
+-  ~boxm_quad_scan_iterator() override;
+-
+-  //: Resets the scan iterator to before the first scan line
+-  //  After calling this function, next() needs to be called before
+-  //  startx() and endx() form a valid scan line.
+-  void reset() override;
+-
+-  //: Tries to move to the next scan line.
+-  //  Returns false if there are no more scan lines.
+-  bool next() override;
+-
+-  //: y-coordinate of the current scan line.
+-  int  scany() const override;
+-
+-  //: Returns starting x-value of the current scan line.
+-  //  startx() should be smaller than endx(), unless the scan line is empty
+-  int  startx() const override;
+-
+-  //: Returns ending x-value of the current scan line.
+-  //  endx() should be larger than startx(), unless the scan line is empty
+-  int  endx() const override;
+-
+-  //: returns the amount of pixel at location x in the current scanline covered by the triangle
+-  float pix_coverage(int x);
+-
+-  bool x_start_end_val(const double * vals,double & start_val,double & end_val);
+-
+-
+- protected:
+-  static const unsigned int supersample_ratio_ = 1;
+-  vgl_polygon_scan_iterator<double> * super_it_;
+-  vgl_polygon<double>  poly_;
+-
+-  int startx_;
+-  int endx_;
+-  int scany_;
+-  bool next_return_;
+-
+-  unsigned int poly_diameter_x_;
+-  float* aa_vals_;
+-  int aa_vals_offset_;
+-
+-  vbl_bounding_box<double,2> poly_bb_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
+deleted file mode 100644
+index 4ffdd47b22..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
++++ /dev/null
+@@ -1,36 +0,0 @@
+-#include "boxm_rational_camera_utils.h"
+-#include <vgl/vgl_point_2d.h>
+-
+-vgl_plane_3d<double>
+-boxm_rational_camera_utils::boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
+-                                                           vgl_plane_3d<double> top,
+-                                                           vgl_plane_3d<double> bottom,
+-                                                           unsigned ni, unsigned nj)
+-{
+-   vgl_point_3d<double> top_guess(0,0,-top.d()/top.c());
+-   vgl_point_3d<double> bottom_guess(0,0,-bottom.d()/bottom.c());
+-   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),top,top_guess,top_guess);
+-   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),bottom,bottom_guess,bottom_guess);
+-
+-   vgl_plane_3d<double> parallelplane(bottom_guess-top_guess,top_guess);
+-
+-   return parallelplane;
+-}
+-
+-void
+-boxm_rational_camera_utils::project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
+-                                                            vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
+-                                                            double* xverts, double* yverts,
+-                                                            float* vertdist)
+-{
+-  double a=plane.a();
+-  double b=plane.b();
+-  double c=plane.c();
+-  double d=plane.d();
+-  double denom=std::sqrt(a*a+b*b+c*c);
+-  for (unsigned i=0; i<corners.size(); ++i)
+-  {
+-    rcam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
+-    vertdist[i]=float((corners[i].x()*a+corners[i].y()*b+corners[i].z()*c+d)/denom);
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
+deleted file mode 100644
+index 61c9252276..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#ifndef boxm_rational_camera_utils_h
+-#define boxm_rational_camera_utils_h
+-
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/algo/vpgl_backproject.h>
+-
+-class boxm_rational_camera_utils
+-{
+- public:
+-  static vgl_plane_3d<double>  boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
+-                                                              vgl_plane_3d<double> top,
+-                                                              vgl_plane_3d<double> bottom,
+-                                                              unsigned ni, unsigned nj);
+-  static void project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
+-                                              vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
+-                                              double* xverts, double* yverts,
+-                                              float* vertdist);
+-};
+-
+-class abs_functor
+-{
+- public:
+-  abs_functor()= default;
+-
+-  float operator()(float x) const { return std::fabs(x); }
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
+deleted file mode 100644
+index 1b1a95623b..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
++++ /dev/null
+@@ -1,232 +0,0 @@
+-#include "boxm_raytrace_operations.h"
+-
+-bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance)
+-{
+-  // multiply each vertex distance by alpha
+-  float vert_alpha_distances[8];
+-  float *vert_dist_ptr = vert_distances;
+-  float *vert_alpha_dist_ptr = vert_alpha_distances;
+-  for (unsigned int i=0; i<8; ++i) {
+-    *vert_alpha_dist_ptr++ = *vert_dist_ptr++ * alpha;
+-  }
+-
+-  // for each face, create two triangle iterators and fill in pixel data
+-  // X_LOW
+-  // tri 0
+-  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_alpha_distances, 0, 4, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-
+-  // X_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 1, 2, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 2, 6, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-
+-  // Y_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 5, 4);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // Y_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 2, 6);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 6, 7);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // Z_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 2);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 2, 3);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // Z_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 5, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  return true;
+-}
+-
+-
+-bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
+-                     float* vert_distances, boct_face_idx visible_faces,
+-                     vil_image_view<float> &depth_image)
+-{
+-  // for each face, create two triangle iterators and fill in pixel data
+-  // X_LOW
+-  // tri 0
+-  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_distances, 0, 4, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-
+-  // X_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 1, 2, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 2, 6, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-
+-  // Y_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 5, 4);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // Y_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 2, 6);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 6, 7);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // Z_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 2);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 2, 3);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // Z_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 5, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  return true;
+-}
+-
+-
+-bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val)
+-{
+-  // for each face, create two triangle iterators and fill in pixel data
+-  boxm_triangle_scan_iterator tri_it(xverts_2d, yverts_2d, 0,4,3);
+-  if (visible_faces & X_LOW) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 4, 3);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 3);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & X_HIGH) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 1, 2, 5);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 2, 6, 5);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Y_LOW) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 5);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 5, 4);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Y_HIGH) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 2, 6);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 6, 7);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Z_LOW) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 2);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 2, 3);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Z_HIGH) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 5, 6);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 6);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
+deleted file mode 100644
+index ee6147127b..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
++++ /dev/null
+@@ -1,452 +0,0 @@
+-#ifndef boxm_raytrace_operations_h_
+-#define boxm_raytrace_operations_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include "boxm_triangle_interpolation_iterator.h"
+-#include "boxm_triangle_scan_iterator.h"
+-#include <boxm/boxm_apm_traits.h>
+-
+-#include <vnl/algo/vnl_determinant.h>
+-#include <vgl/vgl_triangle_scan_iterator.h>
+-#include <boct/boct_tree.h>
+-#include <vil/vil_image_view.h>
+-
+-#if 0
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val);
+-
+-bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance);
+-bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
+-                     float* vert_distances, boct_face_idx visible_faces,
+-                     vil_image_view<float> &depth_image);
+-template<class T, class tri_int_it_t>
+-bool tri_interpolated_weighted_sum(tri_int_it_t &tri_it, vil_image_view<T> const& values, T &val_sum, float &weight_sum, bool subtract)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= values.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
+-
+-    if (subtract) {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        float point_dist = tri_it.value_at(x);
+-        val_sum -= values(x,yu) * point_dist;
+-        weight_sum -= point_dist;
+-      }
+-    }
+-    else {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        float point_dist = tri_it.value_at(x);
+-        val_sum += values(x,yu) * point_dist;
+-        weight_sum += point_dist;
+-      }
+-    }
+-  }
+-  return true;
+-}
+-
+-//: returns the sum of the weights
+-template<class T1, class T2, class tri_it_t>
+-bool tri_interpolated_weighted_sum(tri_it_t &tri_it, vil_image_view<T1> const& weights, vil_image_view<T2> const& values, T2 &val_sum, T1 &weight_sum, bool subtract=false)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= values.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
+-
+-    if (subtract) {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        T1 weight = tri_it.value_at(x)*weights(x,yu);
+-        val_sum -= weight * values(x,yu);
+-        weight_sum -= weight;
+-      }
+-    }
+-    else {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        T1 weight = tri_it.value_at(x)*weights(x,yu);
+-        val_sum += weight * values(x,yu);
+-        weight_sum += weight;
+-      }
+-    }
+-  }
+-  return true;
+-}
+-
+-
+-template<class T, class tri_it_t>
+-void tri_interpolate_values(tri_it_t &tri_it, vil_image_view<T> &img, bool subtract = false)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    if (subtract) {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        img(x,yu) -= tri_it.value_at(x);
+-      }
+-    }
+-    else {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        img(x,yu) += tri_it.value_at(x);
+-      }
+-    }
+-  }
+-  return;
+-}
+-
+-
+-#if 0
+-template<class T, class tri_it_T>
+-void tri_interpolate_values(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &img, vil_image_view<float> &pix_coverage, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
+-{
+-  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  // (no need to compute barycentric coordinates at each step)
+-  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
+-  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
+-  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
+-  double Acol2[] = {1.0, 1.0, 1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2);
+-  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
+-  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
+-  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
+-
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu > img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      T interp_val = (T)(s0*x + s1*y + s2);
+-      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
+-        min_img(x,yu) = interp_val;
+-      }
+-      if (max_img(x,yu) < interp_val) {
+-        max_img(x,yu) = interp_val;
+-      }
+-    }
+-  }
+-  return;
+-}
+-#endif
+-
+-template<class T, class tri_it_T>
+-void tri_interpolate_min_max(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &min_img, vil_image_view<T> &max_img, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
+-{
+-  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  // (no need to compute barycentric coordinates at each step)
+-  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
+-  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
+-  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
+-  double Acol2[] = {1.0, 1.0, 1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2);
+-  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
+-  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
+-  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
+-
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= max_img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)max_img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)max_img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      T interp_val = (T)(s0*x + s1*y + s2);
+-      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
+-        min_img(x,yu) = interp_val;
+-      }
+-      if (max_img(x,yu) < interp_val) {
+-        max_img(x,yu) = interp_val;
+-      }
+-    }
+-  }
+-  return;
+-}
+-
+-template<class T1, class T2>
+-void tri_weighted_sum(vgl_triangle_scan_iterator<double> &tri_it, vil_image_view<T1> &img, vil_image_view<T2> &weights, T1 &val_sum, T2 &weight_sum)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      val_sum += img(x,yu)*weights(x,yu);
+-      weight_sum += weights(x,yu);
+-    }
+-  }
+-  return;
+-}
+-
+-template<class T, class tri_it_T>
+-void tri_fill_value(tri_it_T &tri_it, vil_image_view<T> &img, T val)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      img(x,yu) = val;
+-    }
+-  }
+-  return;
+-}
+-
+-#if 0 // this function commented out
+-template <class T>
+-void tri_fill_value_aa(boxm_triangle_scan_iterator_aa &tri_it, vil_image_view<T> &img, vil_image_view<float> &aa_weights, T val)
+-{
+-  tri_it.reset();
+-  while (tri_it.next())
+-  {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      float pix_cov = tri_it.pix_coverage(x);
+-      if ((pix_cov < 0.0f) || (pix_cov > 1.0f)) {
+-        std::cerr << " error: pix_cov = " << pix_cov << std::endl;
+-      }
+-      aa_weights(x,yu) += tri_it.pix_coverage(x);
+-      img(x,yu) += val * pix_cov;
+-    }
+-  }
+-  return;
+-}
+-#endif // 0
+-
+-template<class T>
+-bool cube_mean(double* xverts_2d, double* yverts_2d, float* vert_dists, boct_face_idx visible_faces, vil_image_view<T> const& values, T &mean)
+-{
+-  // for each face, create two triangle iterators to interpolate distances
+-  T value_sum(0);
+-  float weight_sum(0);
+-  // X_LOW
+-  // tri 0
+-  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_dists, 0, 3, 4);
+-  if (visible_faces & X_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 3, 4, 7);
+-  if (visible_faces & X_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // X_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 1, 2, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 5, 6);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Y_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 1, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 0, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Y_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 7, 3, 2);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 6, 7);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Z_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 1);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 3);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Z_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 5, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 7, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  if (std::fabs(weight_sum) > 1e-6)  {
+-    mean = value_sum / weight_sum;
+-  }
+-  else {
+-    mean = T(0);
+-    return false;
+-  }
+-  return true;
+-}
+-
+-inline void init_triangle_scan_iterator(vgl_triangle_scan_iterator<double> &tri_it, const double* xverts, const double* yverts, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
+-{
+-  // subtract 0.5 to follow convention that the center of pixel i,j is located at coordinates i+0.5, j+0.5
+-  tri_it.a.x = xverts[v0] - 0.5; tri_it.a.y = yverts[v0] - 0.5;
+-  tri_it.b.x = xverts[v1] - 0.5; tri_it.b.y = yverts[v1] - 0.5;
+-  tri_it.c.x = xverts[v2] - 0.5; tri_it.c.y = yverts[v2] - 0.5;
+-}
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx b/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
+deleted file mode 100644
+index 1586ba9fcd..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
++++ /dev/null
+@@ -1,141 +0,0 @@
+-#include "boxm_test_util.h"
+-#include <vgl/vgl_line_3d_2_points.h>
+-#include <vnl/io/vnl_io_matrix_fixed.h>
+-#include <vgl/algo/vgl_rotation_3d.h>
+-
+-void generate_persp_camera(double focal_length,
+-                           vgl_point_2d<double>& pp,  //principal point
+-                           double x_scale, double y_scale,
+-                           vgl_point_3d<double>& camera_center,
+-                           vpgl_perspective_camera<double>& cam)
+-{
+-  vpgl_calibration_matrix<double> K(focal_length,pp, x_scale, y_scale);
+-  cam.set_calibration(K);
+-  cam.set_camera_center(camera_center);
+-}
+-
+-vpgl_rational_camera<double>
+-perspective_to_rational(vpgl_perspective_camera<double>& cam_pers)
+-{
+-  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
+-  std::vector<double> neu_u,den_u,neu_v,den_v;
+-  double x_scale = 1.0, x_off = 0.0,
+-         y_scale = 1.0, y_off = 0.0,
+-         z_scale = 1.0, z_off = 0.0,
+-         u_scale = 1.0, u_off = 0.0,
+-         v_scale = 1.0, v_off = 0.0;
+-
+-  for (int i=0; i<20; i++) {
+-    neu_u.push_back(0.0);
+-    neu_v.push_back(0.0);
+-    den_u.push_back(0.0);
+-    den_v.push_back(0.0);
+-  }
+-
+-  int vector_map[] = {9,15,18,19};
+-
+-  for (int i=0; i<4; i++) {
+-    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
+-    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
+-    den_u[vector_map[i]] = cam_pers_matrix(2,i);
+-    den_v[vector_map[i]] = cam_pers_matrix(2,i);
+-  }
+-
+-  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
+-                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
+-                                       u_scale,u_off,v_scale,v_off);
+-  return cam_rat;
+-}
+-
+-vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
+-
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-
+-  vpgl_perspective_camera<double> persp_cam;
+-  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-        double r[] = { 1, 0, 0,
+-              0, -1, 0,
+-              0, 0, -1 };
+-
+-  vnl_matrix_fixed<double,3,3> R(r);
+-  persp_cam.set_rotation(vgl_rotation_3d<double>(R));
+-
+-  //persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
+-  vpgl_rational_camera<double>* rat_cam = new vpgl_rational_camera<double>(perspective_to_rational(persp_cam));
+-  return rat_cam;
+-}
+-
+-vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
+-
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-
+-  auto * persp_cam= new vpgl_perspective_camera<double>();
+-  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, *persp_cam);
+-  persp_cam->look_at(vgl_homg_point_3d<double>(centroid));
+-  return persp_cam;
+-}
+-
+-std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
+-
+-  std::vector<vgl_point_3d<double> > centers;
+-  unsigned i=0;
+-  for (double t=0; t<=1.0; t+=0.1) {
+-    vgl_point_3d<double> centroid = diag.point_t(1-t);
+-    centers.push_back(centroid);
+-    std::cout << centers[i++] << std::endl;
+-  }
+-
+-  std::vector<vpgl_camera_double_sptr> cameras;
+-  for (auto camera_center : centers)
+-  {
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
+-    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-  }
+-  return cameras;
+-}
+-
+-std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
+-
+-  std::vector<vgl_point_3d<double> > centers;
+-  vgl_point_3d<double> centroid(0,0,0);
+-  double x,y;
+-  double alpha = 0;
+-  double delta_alpha = vnl_math::pi/9.;
+-  for (unsigned i=0; i<11; i++) {
+-    x = boxm_camera_dist*std::cos(alpha);
+-    y = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(centroid.x()+x, centroid.y()+y, centroid.z());
+-    std::cout << centers[i] << std::endl;
+-    alpha += delta_alpha;
+-  }
+-
+-  std::vector<vpgl_camera_double_sptr> cameras;
+-  for (auto camera_center : centers)
+-  {
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
+-    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-  }
+-  return cameras;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.h b/contrib/brl/bseg/boxm/util/boxm_test_util.h
+deleted file mode 100644
+index b960b6d3c7..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_test_util.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#ifndef boxm_test_util_h
+-#define boxm_test_util_h
+-//:
+-// \file
+-#include <boct/boct_tree.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> > tree_type;
+-
+-constexpr int IMAGE_U = 800;
+-constexpr int IMAGE_V = 500;
+-constexpr int boxm_x_scale = 500;
+-constexpr int boxm_y_scale = 500;
+-constexpr double boxm_focal_length = 1.0;
+-constexpr double boxm_camera_dist = 300;
+-constexpr unsigned num_train_images = 20;
+-constexpr bool verbose = true;
+-
+-void generate_persp_camera(double focal_length,
+-                           vgl_point_2d<double>& pp,  //principal point
+-                           double x_scale, double y_scale,
+-                           vgl_point_3d<double>& camera_center,
+-                           vpgl_perspective_camera<double>& cam);
+-
+-vpgl_rational_camera<double>
+-perspective_to_rational(vpgl_perspective_camera<double>& cam_pers);
+-
+-vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world);
+-
+-vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world);
+-
+-//: create a trajectory of perspective cameras at the diagonal of world (inside)
+-std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world);
+-
+-std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world);
+-#endif // boxm_test_util_h
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
+deleted file mode 100644
+index e3561eb3b5..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#ifndef boxm_triangle_interpolation_iterator_h_
+-#define boxm_triangle_interpolation_iterator_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vgl/vgl_region_scan_iterator.h>
+-#include <vgl/vgl_triangle_scan_iterator.h>
+-
+-template<class T>
+-class boxm_triangle_interpolation_iterator : public vgl_region_scan_iterator
+-{
+- public:
+-  //: constructor
+-  boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *values, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
+-
+-  //: Resets the scan iterator to before the first scan line
+-  //  After calling this function, next() needs to be called before
+-  //  startx() and endx() form a valid scan line.
+-  void reset() override;
+-
+-  //: Tries to move to the next scan line.
+-  //  Returns false if there are no more scan lines.
+-  bool next() override;
+-
+-  //: y-coordinate of the current scan line.
+-  int  scany() const override;
+-
+-  //: Returns starting x-value of the current scan line.
+-  //  startx() should be smaller than endx(), unless the scan line is empty
+-  int  startx() const override;
+-
+-  //: Returns ending x-value of the current scan line.
+-  //  endx() should be larger than startx(), unless the scan line is empty
+-  int  endx() const override;
+-
+-  //: returns the interpolated value at location x in the current scanline
+-  T value_at(int x);
+-
+- protected:
+-
+-  vgl_triangle_scan_iterator<double> tri_it_;
+-
+-  double s0_;
+-  double s1_;
+-  double s2_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
+deleted file mode 100644
+index 8ea38cb6c3..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_triangle_interpolation_iterator_hxx_
+-#define boxm_triangle_interpolation_iterator_hxx_
+-//:
+-// \file
+-
+-#include <vector>
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_triangle_interpolation_iterator.h"
+-
+-#include <vnl/algo/vnl_determinant.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: constructor
+-template<class T>
+-boxm_triangle_interpolation_iterator<T>::boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *vals, unsigned int v0, unsigned int v1, unsigned int v2)
+-: tri_it_()
+-{
+-  tri_it_.a.x = verts_x[v0]  - 0.5;
+-  tri_it_.a.y = verts_y[v0]  - 0.5;
+-  tri_it_.b.x = verts_x[v1]  - 0.5;
+-  tri_it_.b.y = verts_y[v1]  - 0.5;
+-  tri_it_.c.x = verts_x[v2]  - 0.5;
+-  tri_it_.c.y = verts_y[v2]  - 0.5;
+-
+-
+-  // compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  double Acol0[] = {tri_it_.a.x + 0.5, tri_it_.b.x + 0.5, tri_it_.c.x + 0.5};
+-  double Acol1[] = {tri_it_.a.y + 0.5, tri_it_.b.y + 0.5, tri_it_.c.y + 0.5};
+-  double Acol2[] = {1.0, 1.0, 1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2);
+-  s0_ = vnl_determinant(Z, Acol1, Acol2) / detA;
+-  s1_ = vnl_determinant(Acol0, Z, Acol2) / detA;
+-  s2_ = vnl_determinant(Acol0, Acol1, Z) / detA;
+-
+-  //std::cout << "s0 = " << s0_ <<"  s1 = " << s1_ << " s2 = " << s2_ << std::endl;
+-}
+-
+-
+-//: Resets the scan iterator to before the first scan line
+-//  After calling this function, next() needs to be called before
+-//  startx() and endx() form a valid scan line.
+-template<class T>
+-void boxm_triangle_interpolation_iterator<T>::reset()
+-{
+-  tri_it_.reset();
+-}
+-
+-//: Tries to move to the next scan line.
+-//  Returns false if there are no more scan lines.
+-template<class T>
+-bool boxm_triangle_interpolation_iterator<T>::next()
+-{
+-  return tri_it_.next();
+-}
+-
+-//: y-coordinate of the current scan line.
+-template<class T>
+-int boxm_triangle_interpolation_iterator<T>::scany() const
+-{
+-  return tri_it_.scany();
+-}
+-
+-//: Returns starting x-value of the current scan line.
+-//  startx() should be smaller than endx(), unless the scan line is empty
+-template<class T>
+-int boxm_triangle_interpolation_iterator<T>::startx() const
+-{
+-  return tri_it_.startx();
+-}
+-
+-//: Returns ending x-value of the current scan line.
+-//  endx() should be larger than startx(), unless the scan line is empty
+-template<class T>
+-int  boxm_triangle_interpolation_iterator<T>::endx() const
+-{
+-  return tri_it_.endx() + 1;
+-}
+-
+-
+-//: returns the interpolated value at location x in the current scanline
+-template<class T>
+-T boxm_triangle_interpolation_iterator<T>::value_at(int x)
+-{
+-  return (T)((s0_*(x+0.5) + s1_*(tri_it_.scany()+0.5) + s2_));
+-}
+-
+-
+-#define BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(T) \
+-  template class boxm_triangle_interpolation_iterator<T >
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
+deleted file mode 100644
+index c268ecca30..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
++++ /dev/null
+@@ -1,59 +0,0 @@
+-#include <vector>
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_triangle_scan_iterator.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: constructor
+-boxm_triangle_scan_iterator::boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0, unsigned int v1, unsigned int v2)
+-: tri_it_()
+-{
+-  tri_it_.a.x = verts_x[v0] - 0.5;
+-  tri_it_.a.y = verts_y[v0] - 0.5;
+-  tri_it_.b.x = verts_x[v1] - 0.5;
+-  tri_it_.b.y = verts_y[v1] - 0.5;
+-  tri_it_.c.x = verts_x[v2] - 0.5;
+-  tri_it_.c.y = verts_y[v2] - 0.5;
+-}
+-
+-
+-//: Resets the scan iterator to before the first scan line
+-//  After calling this function, next() needs to be called before
+-//  startx() and endx() form a valid scan line.
+-void boxm_triangle_scan_iterator::reset()
+-{
+-  tri_it_.reset();
+-}
+-
+-//: Tries to move to the next scan line.
+-//  Returns false if there are no more scan lines.
+-bool boxm_triangle_scan_iterator::next()
+-{
+-  return tri_it_.next();
+-}
+-
+-//: y-coordinate of the current scan line.
+-int boxm_triangle_scan_iterator::scany() const
+-{
+-  return tri_it_.scany();
+-}
+-
+-//: Returns starting x-value of the current scan line.
+-//  startx() should be smaller than endx(), unless the scan line is empty
+-int boxm_triangle_scan_iterator::startx() const
+-{
+-  return tri_it_.startx();
+-}
+-
+-//: Returns ending x-value of the current scan line.
+-//  endx() should be larger than startx(), unless the scan line is empty
+-int  boxm_triangle_scan_iterator::endx() const
+-{
+-  return tri_it_.endx() + 1;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
+deleted file mode 100644
+index 47b52ebc26..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
++++ /dev/null
+@@ -1,46 +0,0 @@
+-#ifndef boxm_triangle_scan_iterator_h_
+-#define boxm_triangle_scan_iterator_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vgl/vgl_region_scan_iterator.h>
+-#include <vgl/vgl_triangle_scan_iterator.h>
+-
+-class boxm_triangle_scan_iterator : public vgl_region_scan_iterator
+-{
+- public:
+-  //: constructor
+-  boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
+-
+-  //: Resets the scan iterator to before the first scan line
+-  //  After calling this function, next() needs to be called before
+-  //  startx() and endx() form a valid scan line.
+-  void reset() override;
+-
+-  //: Tries to move to the next scan line.
+-  //  Returns false if there are no more scan lines.
+-  bool next() override;
+-
+-  //: y-coordinate of the current scan line.
+-  int  scany() const override;
+-
+-  //: Returns starting x-value of the current scan line.
+-  //  startx() should be smaller than endx(), unless the scan line is empty
+-  int  startx() const override;
+-
+-  //: Returns ending x-value of the current scan line.
+-  //  endx() should be larger than startx(), unless the scan line is empty
+-  int  endx() const override;
+-
+- protected:
+-
+-  vgl_triangle_scan_iterator<double> tri_it_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_utils.cxx
+deleted file mode 100644
+index 2464b5c4a8..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_utils.cxx
++++ /dev/null
+@@ -1,1469 +0,0 @@
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_utils.h"
+-//:
+-// \file
+-#include "boxm_quad_scan_iterator.h"
+-#include <boct/boct_tree_cell.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_vector_2d.h>
+-#include <vgl/vgl_polygon.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vnl/algo/vnl_determinant.h>
+-#include <vnl/algo/vnl_matrix_inverse.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bool boxm_utils::is_visible(vgl_box_3d<double> const& bbox,
+-                            vpgl_camera_double_sptr const& camera,
+-                            unsigned int img_ni, unsigned int img_nj,
+-                            bool do_front_test)
+-{
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    // make a test for vertices for behind-front case
+-    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-    if (do_front_test) {
+-      if (cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.max_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.max_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.max_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.max_z())))
+-        return false;
+-    }
+-  }
+-
+-  // make sure corners project into image bounds
+-  vgl_box_2d<double> cube_proj_bb;
+-  vgl_box_2d<double> img_bb;
+-  img_bb.add(vgl_point_2d<double>(0.0, 0.0));
+-  img_bb.add(vgl_point_2d<double>(img_ni, img_nj));
+-  // project corners of block into image
+-  double u,v;
+-  camera->project(bbox.min_x(),bbox.min_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.min_x(),bbox.min_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.min_x(),bbox.max_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.min_x(),bbox.max_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.min_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.min_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.max_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.max_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  // check for intersection
+-  vgl_box_2d<double> intersection =  vgl_intersection(cube_proj_bb, img_bb);
+-  return ! intersection.is_empty();
+-}
+-
+-//:
+-// \verbatim
+-//                                 MaxPosition
+-//
+-//                       7-----------6
+-//                      /           /|
+-//                     /           / |
+-//                    4-----------5  |
+-//                    |           |  |
+-//                    |           |  |
+-//                    |    3      |  2
+-//     Z              |           | /
+-//     |   Y          |           |/
+-//     |  /           0-----------1
+-//     | /         MinPosition
+-//     O-----X
+-//
+-// \endverbatim
+-std::vector<vgl_point_3d<double> >
+-boxm_utils::corners_of_box_3d(vgl_box_3d<double> const& box)
+-{
+-  std::vector<vgl_point_3d<double> > corners;
+-
+-  corners.push_back(box.min_point());
+-  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.min_z());
+-  corners.emplace_back(box.min_x()+box.width(), box.min_y()+box.height(), box.min_z());
+-  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.min_z());
+-  corners.emplace_back(box.min_x(), box.min_y(), box.max_z());
+-  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.max_z());
+-  corners.push_back(box.max_point());
+-  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.max_z());
+-  return corners;
+-}
+-
+-void
+-boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
+-                            const vpgl_camera_double_sptr& camera,
+-                            double* xverts, double* yverts)
+-{
+-  for (unsigned i=0; i<corners.size(); ++i)
+-    camera->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
+-}
+-
+-void
+-boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
+-                            const vpgl_camera_double_sptr& camera,
+-                            double* xverts, double* yverts,
+-                            float* vertdist)
+-{
+-    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
+-        for (unsigned i=0; i<corners.size(); ++i)
+-        {
+-            cam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
+-            vertdist[i]=(float)(cam_center-corners[i]).length();
+-        }
+-    }
+-}
+-
+-void
+-boxm_utils::project_point3d(vgl_point_3d<double> const& point,
+-                            const vpgl_camera_double_sptr& camera,
+-                            double & xvert, double &yvert,
+-                            double & vertdist)
+-{
+-    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
+-        cam->project(point.x(), point.y(), point.z(), xvert,yvert);
+-        vertdist=(float)(cam_center-point).length();
+-    }
+-}
+-
+-//: corners of the input face: visible?
+-bool boxm_utils::is_face_visible(const double * xverts, const double *yverts,
+-                                 unsigned id1,unsigned id2,unsigned id3,unsigned  /*id4*/) // id4 unused?!? - FIXME
+-{
+-  double normal=(xverts[id2]-xverts[id1])*(yverts[id3]-yverts[id2])-(yverts[id2]-yverts[id1])*(xverts[id3]-xverts[id2]);
+-  return normal < 0;
+-}
+-
+-//: corners of the input face: visible?
+-bool boxm_utils::is_face_visible(std::vector<vgl_point_3d<double> > &face,
+-                                 vpgl_camera_double_sptr const& camera)
+-{
+-  assert(face.size() >= 3);
+-  std::vector<vgl_point_2d<double> > vs;
+-
+-  for (auto & i : face) {
+-    double u,v;
+-    camera->project(i.x(), i.y(), i.z(), u, v);
+-    vs.emplace_back(u,v);
+-  }
+-
+-  vgl_vector_2d<double> v0 = vs[1] - vs[0];
+-  vgl_vector_2d<double> v1 = vs[2] - vs[1];
+-  auto normal = cross_product<double>(v0,v1);
+-  //if (normal>-1e-4 && normal<0.0)
+-  //    std::cout<<"+";
+-  return normal < -1e-5;
+-}
+-
+-std::vector<vgl_point_2d<double> >
+-boxm_utils::project_face(std::vector<vgl_point_3d<double> > &face,
+-                         vpgl_camera_double_sptr const& camera)
+-{
+-  std::vector<vgl_point_2d<double> > vs;
+-
+-  for (auto & i : face) {
+-    double u,v;
+-    camera->project(i.x(), i.y(), i.z(), u, v);
+-    vs.emplace_back(u,v);
+-  }
+-
+-  return vs;
+-}
+-
+-boct_face_idx
+-boxm_utils::visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera)
+-{
+-  boct_face_idx face_idx = NONE;
+-  //if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-  //  vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-  //  vgl_point_3d<double> const& cam_center = cam->camera_center();
+-
+-  //  if (cam_center.x() > bbox.max_x()) {
+-  //    face_idx |= X_HIGH;
+-  //  }
+-  //  else if (cam_center.x() < bbox.min_x()) {
+-  //    face_idx |= X_LOW;
+-  //  }
+-  //  if (cam_center.y() > bbox.max_y()) {
+-  //    face_idx |= Y_HIGH;
+-  //  }
+-  //  else if (cam_center.y() < bbox.min_y()) {
+-  //    face_idx |= Y_LOW;
+-  //  }
+-  //  if (cam_center.z() > bbox.max_x()) {
+-  //    face_idx |= Z_HIGH;
+-  //  }
+-  //  else if (cam_center.z() < bbox.min_z()) {
+-  //    face_idx |= Z_LOW;
+-  //  }
+-  //}
+-  //// for other cameras, use projection and normals
+-  //else
+-  {
+-    // fix the face normals so that the vertices are in counter-clockwise order
+-    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
+-    faces_of_box_3d(bbox, faces);
+-
+-    if (is_face_visible(faces.find(Z_LOW)->second, camera)) {
+-      face_idx |= Z_LOW;
+-#ifdef DEBUG
+-      std::cout << "Z_LOW " ;
+-#endif
+-    }
+-    if (is_face_visible(faces.find(Z_HIGH)->second, camera)) {
+-      face_idx |= Z_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Z_HIGH " ;
+-#endif
+-    }
+-    if (is_face_visible(faces.find(X_LOW)->second, camera)) {
+-      face_idx |= X_LOW;
+-#ifdef DEBUG
+-      std::cout << "X_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(faces.find(X_HIGH)->second, camera)) {
+-      face_idx |= X_HIGH;
+-#ifdef DEBUG
+-      std::cout << "X_HIGH " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(faces.find(Y_LOW)->second, camera)) {
+-      face_idx |= Y_LOW;
+-#ifdef DEBUG
+-      std::cout << "Y_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(faces.find(Y_HIGH)->second, camera)) {
+-      face_idx |= Y_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Y_HIGH " ;
+-#endif
+-    }
+-  }
+-#ifdef DEBUG
+-  std::cout << std::endl;
+-#endif
+-
+-  return face_idx;
+-}
+-
+-boct_face_idx
+-boxm_utils::visible_faces(vgl_box_3d<double> const& /*bbox*/, // FIXME: currently unused -- see commented out code
+-                          const vpgl_camera_double_sptr& /*camera*/, // idem
+-                          double *xverts, double *yverts)
+-{
+-  boct_face_idx face_idx = NONE;
+-#if 0
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-    vgl_point_3d<double> const& cam_center = cam->camera_center();
+-
+-    if (cam_center.x() > bbox.max_x()) {
+-      face_idx |= X_HIGH;
+-    }
+-    else if (cam_center.x() < bbox.min_x()) {
+-      face_idx |= X_LOW;
+-    }
+-    if (cam_center.y() > bbox.max_y()) {
+-      face_idx |= Y_HIGH;
+-    }
+-    else if (cam_center.y() < bbox.min_y()) {
+-      face_idx |= Y_LOW;
+-    }
+-    if (cam_center.z() > bbox.max_x()) {
+-      face_idx |= Z_HIGH;
+-    }
+-    else if (cam_center.z() < bbox.min_z()) {
+-      face_idx |= Z_LOW;
+-    }
+-  }
+-  // for other cameras, use projection and normals
+-  else
+-#endif // 0
+-  {
+-    // fix the face normals so that the vertices are the counter clockwise order
+-#if 0
+-    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
+-    faces_of_box_3d(bbox, faces);
+-    project_corners(bbox,camera,xverts,yverts);
+-#endif // 0
+-    if (is_face_visible(xverts,yverts,1,0,3,2)) {
+-      face_idx |= Z_LOW;
+-#ifdef DEBUG
+-      std::cout << "Z_LOW " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,4,5,6,7)) {
+-      face_idx |= Z_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Z_HIGH " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,7,3,0,4)) {
+-      face_idx |= X_LOW;
+-#ifdef DEBUG
+-      std::cout << "X_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,1,2,6,5)) {
+-      face_idx |= X_HIGH;
+-#ifdef DEBUG
+-      std::cout << "X_HIGH " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,0,1,5,4)) {
+-      face_idx |= Y_LOW;
+-#ifdef DEBUG
+-      std::cout << "Y_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,2,3,7,6)) {
+-      face_idx |= Y_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Y_HIGH " ;
+-#endif
+-    }
+-  }
+-#ifdef DEBUG
+-  std::cout << std::endl;
+-#endif
+-
+-  return face_idx;
+-}
+-
+-boct_face_idx
+-boxm_utils::visible_faces_cell(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera,
+-                               double *xverts, double *yverts)
+-{
+-  boct_face_idx face_idx = NONE;
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-    vgl_point_3d<double> const& cam_center = cam->camera_center();
+-
+-    if (cam_center.x() > bbox.max_x()) {
+-      face_idx |= X_HIGH;
+-    }
+-    else if (cam_center.x() < bbox.min_x()) {
+-      face_idx |= X_LOW;
+-    }
+-    if (cam_center.y() > bbox.max_y()) {
+-      face_idx |= Y_HIGH;
+-    }
+-    else if (cam_center.y() < bbox.min_y()) {
+-      face_idx |= Y_LOW;
+-    }
+-    if (cam_center.z() > bbox.max_x()) {
+-      face_idx |= Z_HIGH;
+-    }
+-    else if (cam_center.z() < bbox.min_z()) {
+-      face_idx |= Z_LOW;
+-    }
+-  }
+-  // for other cameras, use projection and normals
+-  else
+-  {
+-    // fix the face normals so that the vertices are the counter clockwise order
+-#if 0
+-    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
+-    faces_of_box_3d(bbox, faces);
+-    double * xverts; double *yverts;
+-    project_corners(bbox,camera,xverts,yverts);
+-#endif // 0
+-    if (is_face_visible(xverts,yverts,1,0,3,2)) {
+-      face_idx |= Z_LOW;
+-#ifdef DEBUG
+-      std::cout << "Z_LOW " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,4,5,6,7)) {
+-      face_idx |= Z_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Z_HIGH " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,7,3,0,4)) {
+-      face_idx |= X_LOW;
+-#ifdef DEBUG
+-      std::cout << "X_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,1,2,6,5)) {
+-      face_idx |= X_HIGH;
+-#ifdef DEBUG
+-      std::cout << "X_HIGH " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,0,1,5,4)) {
+-      face_idx |= Y_LOW;
+-#ifdef DEBUG
+-      std::cout << "Y_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,2,3,7,6)) {
+-      face_idx |= Y_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Y_HIGH " ;
+-#endif
+-    }
+-  }
+-#ifdef DEBUG
+-  std::cout << std::endl;
+-#endif
+-
+-  return face_idx;
+-}
+-
+-//: returns the faces of a box, the vertices are ordered in the normal direction
+-void boxm_utils::faces_of_box_3d(vgl_box_3d<double> const& bbox,
+-                                 std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >& faces)
+-{
+-  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(bbox);
+-
+-  // face bottom [1,0,3,2]
+-  std::vector<vgl_point_3d<double> > face_corners;
+-  face_corners.push_back(corners[1]);
+-  face_corners.push_back(corners[0]);
+-  face_corners.push_back(corners[3]);
+-  face_corners.push_back(corners[2]);
+-  faces[Z_LOW] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[4]);
+-  face_corners.push_back(corners[5]);
+-  face_corners.push_back(corners[6]);
+-  face_corners.push_back(corners[7]);
+-  faces[Z_HIGH] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[7]);
+-  face_corners.push_back(corners[3]);
+-  face_corners.push_back(corners[0]);
+-  face_corners.push_back(corners[4]);
+-  faces[X_LOW] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[1]);
+-  face_corners.push_back(corners[2]);
+-  face_corners.push_back(corners[6]);
+-  face_corners.push_back(corners[5]);
+-  faces[X_HIGH] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[0]);
+-  face_corners.push_back(corners[1]);
+-  face_corners.push_back(corners[5]);
+-  face_corners.push_back(corners[4]);
+-  faces[Y_LOW] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[2]);
+-  face_corners.push_back(corners[3]);
+-  face_corners.push_back(corners[7]);
+-  face_corners.push_back(corners[6]);
+-  faces[Y_HIGH] = face_corners;
+-}
+-
+-//: returns the union of the projected faces of a polygon
+-void boxm_utils::project_cube(vgl_box_3d<double> &bbox,
+-                              const vpgl_camera_double_sptr& camera,
+-                              std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
+-                              boct_face_idx & vis_face_ids)
+-{
+-  faces_of_box_3d(bbox, faces);
+-  vis_face_ids=boxm_utils::visible_faces(bbox,camera);
+-}
+-
+-
+-void boxm_utils::quad_interpolate(boxm_quad_scan_iterator &poly_it,
+-                                  double* xvals, double* yvals, double* vals,
+-                                  vil_image_view<float> &img,unsigned img_plane_num,
+-                                  unsigned int v0, unsigned int v1,
+-                                  unsigned int v2,unsigned int v3 )
+-{
+-  // first compute s0, s1, s2, s3 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  // (no need to compute barycentric coordinates of a quadrilateral at each step)
+-  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
+-
+-  double Acol0[] = {(xvals[v0]-0.5)*(yvals[v0]-0.5),
+-            (xvals[v1]-0.5)*(yvals[v1]-0.5),
+-            (xvals[v2]-0.5)*(yvals[v2]-0.5),
+-            (xvals[v3]-0.5)*(yvals[v3]-0.5)};
+-  double Acol1[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5,xvals[v3]-0.5};
+-  double Acol2[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5,yvals[v3]-0.5};
+-  double Acol3[] = {1.0, 1.0, 1.0,1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2],vals[v3]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2,Acol3);
+-  double s0 = vnl_determinant(Z, Acol1, Acol2,Acol3) / detA;
+-  double s1 = vnl_determinant(Acol0, Z, Acol2,Acol3) / detA;
+-  double s2 = vnl_determinant(Acol0, Acol1, Z,Acol3) / detA;
+-  double s3 = vnl_determinant(Acol0, Acol1, Acol2,Z) / detA;
+-
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      auto interp_val = (float)(s0*x*y + s1*x + s2*y+s3);
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
+-    }
+-  }
+-  return;
+-#if 0 // commented out
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    double start_val=0;
+-    double end_val=0;
+-
+-    if (poly_it.x_start_end_val(vals,start_val,end_val))
+-    {
+-      float rx=endx-startx;
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        float interp_val = start_val+(x-startx)/rx*(end_val-start_val);
+-        img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
+-        //img(x,yu,img_plane_num) =interp_val;
+-      }
+-    }
+-  }
+-  return;
+-#endif // 0
+-}
+-
+-void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
+-                           vil_image_view<float> &img, float val,
+-                           unsigned img_plane_num)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      img(x,yu,img_plane_num) = val;
+-#if 0 // was:
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      if (poly_it.pix_coverage(x)>1)
+-        std::cout<<"ERROR ALERT "<<poly_it.pix_coverage(x)<<std::endl;
+-      assert(poly_it.pix_coverage(x)>1);
+-#endif // 0
+-    }
+-  }
+-  return;
+-}
+-
+-
+-void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
+-                           vil_image_view<float> &img,
+-                           vil_image_view<float> &weights_img,
+-                           float val,
+-                           unsigned img_plane_num)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      //img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      weights_img(x,yu)+=poly_it.pix_coverage(x);
+-    }
+-  }
+-  return;
+-}
+-
+-
+-void boxm_utils::quad_mean(boxm_quad_scan_iterator &poly_it,
+-                           vil_image_view<float> &img, float &val,  float & count)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      val+=poly_it.pix_coverage(x)*img(x,yu) ;
+-      count+=poly_it.pix_coverage(x);
+-    }
+-  }
+-  return;
+-}
+-
+-void boxm_utils::quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
+-                                    vil_image_view<float> &img,
+-                                    vil_image_view<float> &weighted_img,
+-                                    float &numerator,  float & denominator)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      numerator+=poly_it.pix_coverage(x)*img(x,yu)*weighted_img(x,yu);
+-      denominator+=poly_it.pix_coverage(x)*weighted_img(x,yu);
+-      //numerator+=img(x,yu)*weighted_img(x,yu);
+-      //denominator+=weighted_img(x,yu);
+-    }
+-  }
+-  return;
+-}
+-
+-void boxm_utils::quad_sum(boxm_quad_scan_iterator &poly_it,
+-                          vil_image_view<float> &img, float &val)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      val+=(poly_it.pix_coverage(x)*img(x,yu)) ;
+-    }
+-  }
+-  return;
+-}
+-
+-bool boxm_utils::project_cube_xyz( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                                   boct_face_idx & vis_face_ids,
+-                                   vil_image_view<float> &front_xyz,
+-                                   vil_image_view<float> &back_xyz,
+-                                   const vpgl_camera_double_sptr& cam)
+-{
+-  auto face_it=faces.begin();
+-  for (; face_it!=faces.end(); ++face_it)
+-  {
+-    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
+-    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
+-
+-    double xs[]={face_projected[0].x(),face_projected[1].x(),face_projected[2].x(),face_projected[3].x()};
+-    double ys[]={face_projected[0].y(),face_projected[1].y(),face_projected[2].y(),face_projected[3].y()};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    double Xs[]={face_corners[0].x(),face_corners[1].x(),face_corners[2].x(),face_corners[3].x()};
+-    double Ys[]={face_corners[0].y(),face_corners[1].y(),face_corners[2].y(),face_corners[3].y()};
+-    double Zs[]={face_corners[0].z(),face_corners[1].z(),face_corners[2].z(),face_corners[3].z()};
+-
+-    if (vis_face_ids & face_it->first){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-
+-bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
+-                                  boct_face_idx & vis_face_ids,
+-                                  vil_image_view<float> &front_xyz,
+-                                  vil_image_view<float> &back_xyz,
+-                                  double *xverts,double * yverts)
+-{
+-  // open extra scope, to allow redeclaration of xs[], ys[]
+-  {
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-#if 0
+-    std::vector<vgl_point_2d<double> > face_polygon(4);
+-    for (unsigned i=0;i<4;++i)
+-      face_polygon.push_back(vgl_point_2d<double>(xs[i],ys[i]));
+-#endif // 0
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[1].x(),corners[0].x(),corners[3].x(),corners[2].x()};
+-    double Ys[]={corners[1].y(),corners[0].y(),corners[3].y(),corners[2].y()};
+-    double Zs[]={corners[1].z(),corners[0].z(),corners[3].z(),corners[2].z()};
+-    if (vis_face_ids & Z_LOW){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[4].x(),corners[5].x(),corners[6].x(),corners[7].x()};
+-    double Ys[]={corners[4].y(),corners[5].y(),corners[6].y(),corners[7].y()};
+-    double Zs[]={corners[4].z(),corners[5].z(),corners[6].z(),corners[7].z()};
+-    if (vis_face_ids & Z_HIGH){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    double Xs[]={corners[7].x(),corners[3].x(),corners[0].x(),corners[4].x()};
+-    double Ys[]={corners[7].y(),corners[3].y(),corners[0].y(),corners[4].y()};
+-    double Zs[]={corners[7].z(),corners[3].z(),corners[0].z(),corners[4].z()};
+-    if (vis_face_ids & X_LOW){
+-      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    double Xs[]={corners[1].x(),corners[2].x(),corners[6].x(),corners[5].x()};
+-    double Ys[]={corners[1].y(),corners[2].y(),corners[6].y(),corners[5].y()};
+-    double Zs[]={corners[1].z(),corners[2].z(),corners[6].z(),corners[5].z()};
+-    if (vis_face_ids & X_HIGH){
+-      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-        vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[0].x(),corners[1].x(),corners[5].x(),corners[4].x()};
+-    double Ys[]={corners[0].y(),corners[1].y(),corners[5].y(),corners[4].y()};
+-    double Zs[]={corners[0].z(),corners[1].z(),corners[5].z(),corners[4].z()};
+-    if (vis_face_ids & Y_LOW){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-
+-      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[2].x(),corners[3].x(),corners[7].x(),corners[6].x()};
+-    double Ys[]={corners[2].y(),corners[3].y(),corners[7].y(),corners[6].y()};
+-    double Zs[]={corners[2].z(),corners[3].z(),corners[7].z(),corners[6].z()};
+-    if (vis_face_ids & Y_HIGH){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-
+-bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & /*corners*/,
+-                                  boct_face_idx & vis_face_ids,
+-                                  vil_image_view<float> &front_xyz,
+-                                  vil_image_view<float> &back_xyz,
+-                                  double *xverts,double * yverts,float * vertdist)
+-{
+-  // Use extra {} so that destructors will do their work
+-  {
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    double ds[]={vertdist[1],vertdist[0],vertdist[3],vertdist[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Z_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    double ds[]={vertdist[4],vertdist[5],vertdist[6],vertdist[7]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Z_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    double ds[]={vertdist[7],vertdist[3],vertdist[0],vertdist[4]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    if (vis_face_ids & X_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    double ds[]={vertdist[1],vertdist[2],vertdist[6],vertdist[5]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    if (vis_face_ids & X_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    double ds[]={vertdist[0],vertdist[1],vertdist[5],vertdist[4]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Y_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    double ds[]={vertdist[2],vertdist[3],vertdist[7],vertdist[6]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Y_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-
+-  return true;
+-}
+-
+-
+-#if 0
+-bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                                        boct_face_idx & vis_face_ids,
+-                                        vil_image_view<float> &fill_img,
+-                                        float val, vpgl_camera_double_sptr cam)
+-{
+-  for (std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >::iterator face_it=faces.begin();
+-       face_it!=faces.end(); ++face_it)
+-  {
+-    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
+-    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
+-    vgl_polygon<double> face_polygon(face_projected);
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    if (vis_face_ids & face_it->first){
+-      quad_fill(poly_it,fill_img,val,0);
+-    }
+-  }
+-}
+-#else
+-bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > &,
+-                                        boct_face_idx &, vil_image_view<float> &, float, const vpgl_camera_double_sptr&)
+-{ return false; }
+-#endif // 0
+-
+-bool boxm_utils::project_cube_fill_val(boct_face_idx & vis_face_ids,
+-                                       vil_image_view<float> &fill_img,
+-                                       float val, double *xverts,double * yverts)
+-{
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  return true;
+-}
+-
+-
+-bool boxm_utils::project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
+-                                          vil_image_view<float> &fill_img,
+-                                          vil_image_view<float> &weight_img,
+-                                          float val, double *xverts,double * yverts)
+-{
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  return true;
+-}
+-
+-bool boxm_utils::cube_sum(boct_face_idx & vis_face_ids,
+-                          vil_image_view<float> &img,
+-                          float & val, double *xverts,double * yverts)
+-{
+-  val=0;
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-
+-  return true;
+-}
+-
+-
+-bool boxm_utils::cube_uniform_mean(boct_face_idx & vis_face_ids,
+-                                   vil_image_view<float> &img,
+-                                   float & val, double *xverts,double * yverts)
+-{
+-  val=0;
+-  float count=0;
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-
+-  if (count > 0) {
+-    val/=(float)count;
+-    return true;
+-  }
+-  else {
+-    val = 0;
+-    return true;
+-  }
+-}
+-
+-
+-bool boxm_utils::cube_weighted_mean(boct_face_idx & vis_face_ids,
+-                                    vil_image_view<float> &img,
+-                                    vil_image_view<float> &weight_img,
+-                                    float & val, double *xverts,double * yverts)
+-{
+-  val=0;
+-  float count=0;
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-
+-  if (count > 0) {
+-    val/=(float)count;
+-    return true;
+-  }
+-  else {
+-    val = 0;
+-    return true;
+-  }
+-}
+-
+-
+-bool
+-boxm_utils::cube_entry_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
+-                             vgl_vector_3d<double> direction,
+-                             vgl_point_3d<double> & entry_point,
+-                             double & lambda,boct_face_idx & face_id)
+-{
+-  // check each face
+-  if (direction.x() > 0 && pt.x()<=cube.min_x()) {
+-    // intersect with low x plane
+-    lambda = (cube.min_x() - pt.x()) / direction.x();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=X_LOW;
+-        return true;
+-    }
+-  }
+-  else if (direction.x() < 0 && pt.x()>=cube.max_x()){
+-    // intersect with high x plane
+-    lambda = (cube.max_x() - pt.x()) / direction.x();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=X_HIGH;
+-        return true;
+-    }
+-  }
+-  if (direction.y() > 0&& pt.y()<=cube.min_y()) {
+-    // intersect with low y plane
+-    lambda = (cube.min_y() - pt.y()) / direction.y();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=Y_LOW;
+-        return true;
+-    }
+-  }
+-  else if (direction.y() < 0 && pt.y()>=cube.max_y()){
+-    // intersect with high y plane
+-    lambda = (cube.max_y() - pt.y()) / direction.y();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=Y_HIGH;
+-        return true;
+-    }
+-  }
+-  if (direction.z() > 0&& pt.z()<=cube.min_z()) {
+-    // intersect with low z plane
+-    lambda = (cube.min_z() - pt.z()) / direction.z();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
+-        face_id=Z_LOW;
+-        return true;
+-    }
+-  }
+-  else if (direction.z() < 0 && pt.z()>=cube.max_z()){
+-    // intersect with high z plane
+-    lambda = (cube.max_z() - pt.z()) / direction.z();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
+-        face_id=Z_HIGH;
+-        return true;
+-    }
+-  }
+-  return false;
+-}
+-
+-
+-bool boxm_utils::cube_exit_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
+-                                 vgl_vector_3d<double> direction,
+-                                 vgl_point_3d<double> & exit_pt,
+-                                 double & lambda,boct_face_idx & face_id)
+-{
+-  // check each face
+-  if (direction.x() < 0 ) {
+-    // intersect with low x plane
+-    lambda = (cube.min_x() - pt.x()) / direction.x();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=X_LOW;
+-      return true;
+-    }
+-  }
+-  else if (direction.x() > 0 ) {
+-    // intersect with high x plane
+-    lambda = (cube.max_x() - pt.x()) / direction.x();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=X_HIGH;
+-      return true;
+-    }
+-  }
+-  if (direction.y() < 0 ) {
+-    // intersect with low y plane
+-    lambda = (cube.min_y() - pt.y()) / direction.y();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=Y_LOW;
+-      return true;
+-    }
+-  }
+-  else if (direction.y() > 0 ) {
+-    // intersect with high y plane
+-    lambda = (cube.max_y() - pt.y()) / direction.y();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=Y_HIGH;
+-      return true;
+-    }
+-  }
+-  if (direction.z() < 0 ) {
+-    // intersect with low z plane
+-    lambda = (cube.min_z() - pt.z()) / direction.z();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
+-      face_id=Z_LOW;
+-      return true;
+-    }
+-  }
+-  else if (direction.z() > 0 ) {
+-    // intersect with high z plane
+-    lambda = (cube.max_z() - pt.z()) / direction.z();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
+-      face_id=Z_HIGH;
+-      return true;
+-    }
+-  }
+-  return false;
+-}
+-
+-
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
+-boxm_utils::obtain_mog_grey_unit_mode()
+-{
+-  bsta_gauss_sf1 simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-  return simple_obs_mix_gauss_val_sf1;
+-}
+-
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
+-boxm_utils::obtain_mog_grey_zero_mode()
+-{
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-  return simple_obs_mix_gauss_val_sf1;
+-}
+-
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
+-boxm_utils::obtain_mog_grey_single_mode(float  mean)
+-{
+-  bsta_gauss_sf1 simple_gauss_sf1(mean,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-  return simple_obs_mix_gauss_val_sf1;
+-}
+-
+-double boxm_utils::max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt)
+-{
+-  double dist_max=0;
+-
+-  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(box);
+-  for (const auto & corner : corners)
+-  {
+-    if (dist_max<(corner-pt).length())
+-      dist_max=(corner-pt).length();
+-  }
+-  return dist_max;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.h b/contrib/brl/bseg/boxm/util/boxm_utils.h
+deleted file mode 100644
+index 86f74b3945..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_utils.h
++++ /dev/null
+@@ -1,168 +0,0 @@
+-#ifndef boxm_utils_h_
+-#define boxm_utils_h_
+-//:
+-// \file
+-// \brief  The utility methods for the boxm project
+-//
+-// \author Gamze Tunali
+-// \date Apr 07, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include "boxm_quad_scan_iterator.h"
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <vil/vil_image_view.h>
+-
+-class safe_inverse_functor
+-{
+- public:
+-  safe_inverse_functor(float tol = 0.0f) : tol_(tol) {}
+-
+-  float operator()(float x) const { return (x > tol_)? 1.0f/x : 0.0f; }
+-
+-  float tol_;
+-};
+-
+-class boxm_utils
+-{
+- public:
+-
+-  //: returns true if a given box is visible from the camera and the image plane
+-  static bool is_visible(vgl_box_3d<double> const& bbox,
+-                         vpgl_camera_double_sptr const& camera,
+-                         unsigned int img_ni, unsigned int img_nj,
+-                         bool do_front_test = true);
+-
+-  // returns the 8 corner points of a box
+-  static std::vector<vgl_point_3d<double> > corners_of_box_3d(vgl_box_3d<double> const& box);
+-
+-  //: returns the indices of the faces visible from the camera
+-  static bool is_face_visible(std::vector<vgl_point_3d<double> > &face,
+-                              vpgl_camera_double_sptr const& camera);
+-
+-  //:
+-  static bool is_face_visible(const double * xverts, const double *yerts,
+-                              unsigned id1,unsigned id2,unsigned id3,unsigned id4);
+-
+-  //: returns the visible faces of a box given a camera.
+-  // It puts a bit 1 for each face visible based on the boct_cell_face values.
+-  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox,
+-                                     const vpgl_camera_double_sptr& camera,
+-                                     double *xverts, double *yerts);
+-  static boct_face_idx visible_faces_cell(vgl_box_3d<double> const& bbox,
+-                                          const vpgl_camera_double_sptr& camera,
+-                                          double *xverts, double *yverts);
+-
+-  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera);
+-
+-  static void faces_of_box_3d(vgl_box_3d<double> const& bbox,
+-                              std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > & faces);
+-
+-  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,const vpgl_camera_double_sptr& camera,
+-                              double * xverts, double *yerts);
+-  static void project_point3d(vgl_point_3d<double> const& point,
+-                              const vpgl_camera_double_sptr& camera,
+-                              double & xvert, double &yert, double & vertdist);
+-
+-  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,
+-                              const vpgl_camera_double_sptr& camera,
+-                              double* xverts, double* yverts,
+-                              float* vertdist);
+-  static void project_cube(vgl_box_3d<double> &bbox,
+-                           const vpgl_camera_double_sptr& camera,
+-                           std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
+-                           boct_face_idx & vis_face_ids);
+-
+-  static std::vector<vgl_point_2d<double> >  project_face(std::vector<vgl_point_3d<double> > &face,
+-                                                         vpgl_camera_double_sptr const& camera);
+-
+-  static void quad_interpolate(boxm_quad_scan_iterator &poly_it,
+-                               double* xvals, double* yvals, double* vals,
+-                               vil_image_view<float> &img,unsigned img_plane_num=0,
+-                               unsigned int v0=0, unsigned int v1=1,
+-                               unsigned int v2=2,unsigned int v3=3);
+-
+-  static void quad_fill(boxm_quad_scan_iterator &poly_it,
+-                        vil_image_view<float> &img, float val,
+-                        unsigned img_plane_num=0);
+-  static void quad_fill(boxm_quad_scan_iterator &poly_it,
+-                        vil_image_view<float> &img,
+-                        vil_image_view<float> &weights_img,
+-                        float val,
+-                        unsigned img_plane_num=0);
+-
+-  static bool project_cube_xyz(std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                               boct_face_idx & vis_face_ids,
+-                               vil_image_view<float> &front_xyz,
+-                               vil_image_view<float> &back_xyz,
+-                               const vpgl_camera_double_sptr& camera);
+-
+- static bool project_cube_xyz(std::vector< vgl_point_3d<double> >  & corners,
+-                              boct_face_idx & vis_face_ids,
+-                              vil_image_view<float> &front_xyz,
+-                              vil_image_view<float> &back_xyz,
+-                              double *xverts,double * yerts);
+- //: only for perspective camera
+- static bool project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
+-                              boct_face_idx & vis_face_ids,
+-                              vil_image_view<float> &front_xyz,
+-                              vil_image_view<float> &back_xyz,
+-                              double *xverts,double * yverts,float * vertdist);
+-
+-  static bool project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                                     boct_face_idx & vis_face_ids,
+-                                     vil_image_view<float> &fill_img,
+-                                     float val, const vpgl_camera_double_sptr& cam);
+-
+-  static bool project_cube_fill_val(boct_face_idx & vis_face_ids,
+-                                    vil_image_view<float> &fill_img,
+-                                    float val, double *xverts,double * yverts);
+-  static bool project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
+-                                       vil_image_view<float> &fill_img,
+-                                       vil_image_view<float> &weights_img,
+-                                       float val, double *xverts,double * yverts);
+-
+-  static bool cube_uniform_mean(boct_face_idx & vis_face_ids,
+-                                vil_image_view<float> &img,
+-                                float & val, double *xverts,double * yverts);
+-  static bool cube_weighted_mean(boct_face_idx & vis_face_ids,
+-                                 vil_image_view<float> &img,
+-                                 vil_image_view<float> &weight_img,
+-                                 float & val, double *xverts,double * yverts);
+-
+-  static bool cube_sum(boct_face_idx & vis_face_ids,
+-                       vil_image_view<float> &img,
+-                       float & val, double *xverts,double * yverts);
+-
+-  static void quad_mean(boxm_quad_scan_iterator &poly_it,
+-                        vil_image_view<float> &img, float &val,  float & count);
+-  static void quad_sum(boxm_quad_scan_iterator &poly_it,
+-                       vil_image_view<float> &img, float &val);
+-  static void quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
+-                                 vil_image_view<float> &img,
+-                                 vil_image_view<float> &weighted_img,
+-                                 float &numerator,  float & denominator);
+-  static bool cube_entry_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
+-                               vgl_vector_3d<double> dir,
+-                               vgl_point_3d<double> & entry_point,
+-                               double & lambda, boct_face_idx & face_id);
+-  static bool cube_exit_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
+-                              vgl_vector_3d<double> dir, vgl_point_3d<double> & exit_point,
+-                              double & lambda,boct_face_idx & face_id);
+-
+-  static double max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt);
+-
+-  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_unit_mode();
+-
+-  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_zero_mode();
+-
+-  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_single_mode(float  mean);
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h b/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
+deleted file mode 100644
+index 3e7bcdc580..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
++++ /dev/null
+@@ -1,214 +0,0 @@
+-// This is brl/bseg/boxm/util/boxm_vrml_util.h
+-#ifndef boxm_vrml_util_h
+-#define boxm_vrml_util_h
+-//:
+-// \file
+-// \brief  Set of utilities to save a boxm_scene as vrml files
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Dec 9, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene.h>
+-#include "boxm_cell_data_traits.h"
+-#include <bvrml/bvrml_write.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class boxm_vrml_util
+-{
+- public:
+-
+-  // Writes the values in the scene above the threshold as vrml dots
+-  template <class T_data>
+-  static void write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene,
+-                               const float threshold= 0.0f);
+-#if 0 // not yet working?
+-  static void write_vrml_scene(std::ofstream& str, bvxm_voxel_scene<bsta_num_obs<bsta_gauss_sf1> > *scene,
+-                               const float threshold);
+-  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<float> *scene, float threshold);
+-  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
+-  static void write_vrml_scene_as_pointers(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
+-#endif // 0
+-};
+-
+-
+-template <class T_data>
+-void boxm_vrml_util::write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene, float /*threshold*/)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short, T_data> cell_type;
+-  std::ofstream temp_stream("temp.txt");
+-
+-  bvrml_write::write_vrml_header(str);
+-
+-  str << "Shape {\n"
+-      << "  appearance NULL\n"
+-      << "    geometry PointSet {\n"
+-      << "      color Color{\n"
+-      << "        color[\n";
+-  // write the colors
+-  // iterate through the scene
+-  boxm_block_iterator<tree_type > iter= scene->iterator();
+-  iter.begin();
+-
+-  for (; !iter.end(); iter++) {
+-    scene->load_block(iter.index());
+-    tree_type  *tree = (*iter)->get_tree();
+-
+-    // iterate through the tree
+-    std::vector<cell_type*> cells = tree->leaf_cells();
+-
+-    for (unsigned i = 0; i < cells.size(); i++)
+-    {
+-      str <<"        0.5 0.2 0.8\n";
+-      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
+-      temp_stream <<"        " << (int)coord.x() << ' ' <<(int)coord.y() << ' ' << (int)coord.z() <<  '\n';
+-    }
+-  }
+-  temp_stream.close();
+-
+-  str << "        ]\n     }\n"
+-      << "      coord Coordinate{\n"
+-      << "        point[\n";
+-
+-  // write the coordinates.
+-  std::ifstream fin;  // file in
+-  std::filebuf *fb;   // file buffer
+-  fb = fin.rdbuf();
+-  fb->open ("temp.txt",std::ios::in);
+-  if (fb->is_open() )
+-  {
+-    while (fb->sgetc()!=EOF)
+-    {
+-      std::string temp_str;
+-      std::istream isbf(fb);
+-      std::getline(isbf, temp_str);
+-      str << temp_str << '\n';
+-    }
+-  }
+-  else
+-    std::cerr << "file is not open.\n";
+-
+-  fin.close();
+-  str << "        ]\n     }\n   }\n}\n";
+-}
+-
+-#if 0 // not yet working?
+-void bvxm_vrml_voxel_grid::write_vrml_grid(std::ofstream& str, bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid, float threshold)
+-{
+-  bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> >::iterator grid_it = grid->begin();
+-
+-  str << "Shape {\n"
+-      << "  appearance NULL\n"
+-      << "    geometry PointSet {\n"
+-      << "      color Color{\n"
+-      << "        color[\n";
+-  // write the colors
+-  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
+-    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
+-      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
+-        if ((((*grid_it)(i,j)).mean() > threshold))
+-          str <<"        " << ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << '\n';
+-      }
+-    }
+-  }
+-  str << "        ]\n     }\n"
+-      << "      coord Coordinate{\n"
+-      << "        point[\n";
+-
+-  // write the coordinates
+-  grid_it = grid->begin();
+-  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
+-    std::cout << '.';
+-    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
+-      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
+-        if (((*grid_it)(i,j)).mean() > threshold)
+-          str<<"        " << i << ' ' <<j << ' ' << k <<  '\n';
+-      }
+-    }
+-  }
+-  str << "        ]\n     }\n   }\n}\n";
+-}
+-
+-
+-void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<float> *grid, float threshold)
+-{
+-  bvxm_voxel_grid<float>::iterator grid_it = grid->begin();
+-  vgl_vector_3d<unsigned> dim=grid->grid_size();
+-  unsigned s=3;
+-  // write the colors
+-  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
+-    if (k%1==0)
+-    {
+-      for (unsigned i=0; i<(*grid_it).nx(); i+=s) {
+-        for (unsigned j=0; j < (*grid_it).ny(); j+=s) {
+-          if (((*grid_it)(i,j) > threshold)) {
+-#ifdef DEBUG
+-            vgl_sphere_3d<float> sphere((float)i,(float)j,(float)k,0.5f);
+-            write_vrml_sphere(str, sphere, (*grid_it)(i,j),(*grid_it)(i,j),(*grid_it)(i,j),1-(*grid_it)(i,j));
+-#endif // DEBUG
+-            vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.4f);
+-            bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
+-{
+-  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
+-  // write the colors
+-  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
+-    for (unsigned i=0; i<(*grid_it).nx(); ) {
+-      for (unsigned j=0; j < (*grid_it).ny(); ) {
+-        if ((*grid_it)(i,j)[3]/255.0f > threshold) {
+-          vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.5f);
+-          bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-
+-void bvxm_vrml_voxel_grid::write_vrml_grid_as_pointers(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
+-{
+-  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-  vgl_vector_3d<double> dirx(1,0,0);
+-  vgl_vector_3d<double> diry(0,1,0);
+-  vgl_vector_3d<double> dirz(0,0,1);
+-  bvrml_write::write_vrml_line(str,origin,dirx,1,1,0,0);
+-  bvrml_write::write_vrml_line(str,origin,diry,1,0,1,0);
+-  bvrml_write::write_vrml_line(str,origin,dirz,1,0,0,1);
+-
+-  vgl_vector_3d<unsigned> dim=grid->grid_size();
+-  // write the colors
+-  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
+-    if (k%s==0)
+-    {
+-      for (unsigned i=0; i<(*grid_it).nx(); i=i+s) {
+-        for (unsigned j=0; j < (*grid_it).ny(); j=j+s) {
+-          if (((*grid_it)(i,j)[3] > threshold)) {
+-            vgl_vector_3d<double> dir((*grid_it)(i,j)[0],(*grid_it)(i,j)[1],(*grid_it)(i,j)[2]);
+-            vgl_point_3d<double> pt((double)i/s,(double)j/s,(double)k/s);
+-            bvrml_write::write_vrml_line(str, pt,dir,4*((*grid_it)(i,j)[3]-0.5f),1,0,0);
+-            bvrml_write::write_vrml_disk(str, pt,dir,2*((*grid_it)(i,j)[3]-0.5f),0,0.5f,0.0f);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-#endif // 0
+-
+-#endif // boxm_vrml_util_h
+diff --git a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
+deleted file mode 100644
+index 91cc0db455..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,18 +0,0 @@
+-add_executable( boxm_util_test_all
+-  test_driver.cxx
+-  test_boxm_plane_ransac.cxx
+-  test_boxm_rational_camera_utils.cxx
+-  test_quad_interpolate.cxx
+- )
+-
+-target_link_libraries( boxm_util_test_all boxm_util boxm boxm_sample ${VXL_LIB_PREFIX}testlib boct bsta ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil bvrml)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
+-
+-add_test( NAME boxm_util_test_plane_ransac COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_plane_ransac  )
+-add_test( NAME boxm_util_test_rational_camera_utils COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_rational_camera_utils  ${CMAKE_CURRENT_SOURCE_DIR})
+-add_test( NAME boxm_util_test_quad_interpolate COMMAND $<TARGET_FILE:boxm_util_test_all> test_quad_interpolate  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+-
+-add_executable( boxm_util_test_include test_include.cxx )
+-target_link_libraries( boxm_util_test_include boxm_util)
+-add_executable( boxm_util_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_util_test_template_include boxm_util)
+diff --git a/contrib/brl/bseg/boxm/util/tests/camera0.txt b/contrib/brl/bseg/boxm/util/tests/camera0.txt
+deleted file mode 100644
+index cf11c57707..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/camera0.txt
++++ /dev/null
+@@ -1,104 +0,0 @@
+-satId = "????";
+-bandId = "RGB";
+-SpecId = "RPC00B";
+-BEGIN_GROUP = IMAGE
+-
+-
+-  lineOffset = 0.0
+-  sampOffset = 0.0
+-  latOffset = 0.0
+-  longOffset = 0.0
+-  heightOffset = 0.0
+-  lineScale = 1.0
+-  sampScale = 1.0
+-  latScale = 1.0
+-  longScale = 1.0
+-  heightScale = 1.0
+-  lineNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  lineDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-END_GROUP = IMAGE
+-END;
+-lvcs
+-47.550493 35.395931 664.186757
+diff --git a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt b/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
+deleted file mode 100644
+index a66e2014bd..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-1 0 0
+-0 1 0
+-0 0 1
+-1 0 0
+-0 1 0
+-0 0 1
+-0 0 0
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
+deleted file mode 100644
+index 6664f28f37..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
++++ /dev/null
+@@ -1,79 +0,0 @@
+-//:
+-// \file
+-// \author Gamze Tunali
+-// \brief  this code tests the function boxm_plane_ransac.
+-//  Creates 10 planes that the same line goes through and 10 random planes
+-//  which do not contain the plane. It makes sure it returns only the
+-//  first 10 planes as the fittest ones.
+-//
+-// \date   March 25, 2010
+-
+-#include <iostream>
+-#include <vector>
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_plane_ransac.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vnl/vnl_random.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static const unsigned int test_num=10;
+-static const unsigned int test_set=10;
+-
+-static void test_boxm_plane_ransac()
+-{
+-  // create 10 planes that the line go through and 10 random planes
+-  vgl_point_3d<float> p1(20,20,10);
+-  vgl_point_3d<float> p2(30,20,10);
+-  vgl_infinite_line_3d<float> line(p1,p2);
+-
+-  std::vector<boxm_edge_tangent_sample<float> > planes;
+-  vnl_random rand;
+-  // get two points from the line, and create a random 3rd point to define a plane
+-
+-  for (unsigned i=0; i<test_num; ++i) {
+-    auto x=float(rand.drand32()*100);
+-    auto y=float(rand.drand32()*100);
+-    auto z=float(rand.drand32()*100);
+-    vgl_point_3d<float> p3(x,y,z);
+-    vgl_plane_3d<float> plane(p1,p2,p3);
+-    boxm_plane_obs<float> obs(plane,1);
+-    boxm_edge_tangent_sample<float> sample;
+-    sample.insert(obs);
+-    planes.push_back(sample);
+-  }
+-
+-  // add the random planes
+-  for (unsigned i=0; i<test_set; ++i) {
+-    auto a=float(rand.drand32()*100);
+-    auto b=float(rand.drand32()*100);
+-    auto c=float(rand.drand32()*100);
+-    auto d=float(rand.drand32()*100);
+-    vgl_plane_3d<float> plane(a,b,c,d);
+-    boxm_plane_obs<float> obs(plane,1);
+-    boxm_edge_tangent_sample<float> sample;
+-    sample.insert(obs);
+-    planes.push_back(sample);
+-  }
+-
+-  std::cout << " planes size: " << planes.size() << std::endl;
+-
+-  std::vector<float> weights(test_set,1);
+-  int threshold=2;
+-  float residual;
+-  vgl_infinite_line_3d<float> l;
+-  vgl_box_3d<double> cell_global_box(18,15,5,32,25,15);
+-  float ortho_thres = 0.01f;
+-  float volume_ratio = 128;
+-  boxm_plane_ransac<float>(planes, weights, l, residual, cell_global_box, threshold, ortho_thres, volume_ratio);
+-
+-  TEST_NEAR("test_boxm_plane_ransac: found the right plane set",
+-            (l.point()-line.point()).sqr_length() + (l.direction()-line.direction()).sqr_length(),
+-            0.0f, 0.01f);
+-}
+-
+-TESTMAIN(test_boxm_plane_ransac);
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
+deleted file mode 100644
+index bbee3d575d..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-
+-
+-static void test_boxm_rational_camera_utils()
+-{
+-  std::string filename="camera0.txt";
+-
+-  vpgl_local_rational_camera<double>* rcam=read_local_rational_camera<double>( "./" + filename);
+-  vgl_plane_3d<double> top(0,0,1,-200);
+-  vgl_plane_3d<double> bottom(0,0,1,0);
+-
+-  unsigned ni=800,
+-           nj=800;
+-  double u, v;
+-
+-  rcam->project(495,431,200,u,v);
+-  vgl_plane_3d<double>  plane_parallel=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam,top,bottom,ni,nj);
+-  // TODO: do something with plane_parallel !
+-}
+-
+-TESTMAIN(test_boxm_rational_camera_utils);
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx b/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
+deleted file mode 100644
+index 3bc9c909f2..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_boxm_plane_ransac );
+-DECLARE( test_boxm_rational_camera_utils );
+-DECLARE( test_quad_interpolate );
+-
+-void register_tests()
+-{
+-  REGISTER( test_boxm_plane_ransac );
+-  REGISTER( test_boxm_rational_camera_utils );
+-  REGISTER( test_quad_interpolate );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_include.cxx
+deleted file mode 100644
+index fec661974c..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_include.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/util/boxm_cell_data_traits.h>
+-#include <boxm/util/boxm_plane_ransac.h>
+-#include <boxm/util/boxm_quad_scan_iterator.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_triangle_interpolation_iterator.h>
+-#include <boxm/util/boxm_triangle_scan_iterator.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/util/boxm_vrml_util.h>
+-#include <boxm/util/boxm_test_util.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx b/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
+deleted file mode 100644
+index 2c8c986813..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
++++ /dev/null
+@@ -1,117 +0,0 @@
+-#include <iostream>
+-#include <fstream>
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_polygon.h>
+-#include <boxm/util/boxm_quad_scan_iterator.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <vil/vil_save.h>
+-#include <vil/vil_plane.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/algo/vgl_rotation_3d.h>
+-
+-
+-static void test_quad_interpolate(int argc, char* argv[])
+-{
+-  std::vector<vgl_point_2d<double> > points;
+-  points.emplace_back(10,10);
+-  points.emplace_back(10,12);
+-  points.emplace_back(12,12);
+-  points.emplace_back(12,10);
+-
+-  double xvals[]={10,10,12,12};
+-  double yvals[]={10,12,12,10};
+-  double vals[]={10,10,12,12};
+-  //vgl_polygon<double> poly(points);
+-  boxm_quad_scan_iterator poly_it(xvals,yvals);
+-  vil_image_view<float> img_min(40,40);
+-  vil_image_view<float> img_max(40,40);
+-  vil_image_view<float> g_img_max(40,40);
+-
+-  img_max.fill(0.0f);
+-  g_img_max.fill(0.0f);
+-  // creating ground truth
+-  g_img_max(10,10)=10.5f; g_img_max(10,11)=10.5f;
+-  g_img_max(11,10)=11.5f; g_img_max(11,11)=11.5f;
+-
+-  boxm_utils::quad_interpolate(poly_it, xvals, yvals, vals,img_max,0);
+-  for (unsigned i=10;i<=12;i++)
+-  {
+-    for (unsigned j=10;j<=12;j++)
+-    {
+-      std::cout << img_max(j,i) << ' ';
+-    }
+-    std::cout << '\n';
+-  }
+-  bool flag=true;
+-  for (unsigned i=0; i<g_img_max.ni() && flag; ++i)
+-  for (unsigned j=0; j<g_img_max.nj() && flag; ++j)
+-    if (g_img_max(i,j)!=img_max(i,j))
+-      flag=false;
+-
+-  TEST("Interpolated image", true, flag);
+-
+-  std::vector<vgl_point_2d<double> > points1;
+-  points.emplace_back(10.25,10.25);
+-  points.emplace_back(10.25,12.25);
+-  points.emplace_back(12.25,12.25);
+-  points.emplace_back(12.25,10.25);
+-
+-  double xvals1[]={10.3,10.3,11.4,11.4};
+-  double yvals1[]={10.3,11.4,11.4,10.3};
+-  //double vals1[]={10,10,12,12};
+-  ////vgl_polygon<double> poly(points);
+-  boxm_quad_scan_iterator poly_it_1(xvals1,yvals1);
+-  //vil_image_view<float> img_min(40,40);
+-  //vil_image_view<float> img_max(40,40);
+-
+-  g_img_max.fill(0.0f);
+-  // creating ground truth
+-  g_img_max(10,10)=10;g_img_max(10,11)=10;
+-  g_img_max(11,10)=10;g_img_max(11,11)=10;
+-
+-  float val=0;
+-  float count=0;
+-  boxm_utils::quad_mean(poly_it_1,g_img_max,val,count);
+-
+-  // code to test the projection of a cube .
+-  vgl_box_3d<double> cell_bb(-0.8,19.2,-18.75,0.7625, 20.7625,-17.1875);
+-  std::string camera_input_path = (argc < 2) ? "." : argv[1];
+-  std::ifstream ifs((camera_input_path + "/frame_00000.txt").c_str());
+-  if (!ifs.is_open()) {
+-    std::cerr << "Failed to open file " << camera_input_path << "/frame_00000.txt\n";
+-    TEST("Opening camera file", true, false);
+-    return;
+-  }
+-  auto* cam = new vpgl_perspective_camera<double>();
+-  ifs >> *cam;
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdist[8];
+-  unsigned int ni=1280;
+-  unsigned int nj=720;
+-
+-  vpgl_camera_double_sptr cam_d(cam);
+-  vil_image_view<float> front_xyz(ni,nj,1);front_xyz.fill(0.0f);
+-  vil_image_view<float> back_xyz(ni,nj,1) ;back_xyz.fill(0.0f);
+-
+-  std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-  boxm_utils::project_corners(corners,cam_d,xverts,yverts,vertdist);
+-  boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam_d,xverts,yverts);
+-  boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdist);
+-
+-  std::string image_output_path = (argc < 3) ? "." : argv[2];
+-  std::cout << "Saving two TIFF files to directory " << image_output_path << '\n';
+-  vil_save(vil_plane(front_xyz,0),(image_output_path + "/front.tiff").c_str());
+-  vil_save(vil_plane(back_xyz,0), (image_output_path + "/back.tiff").c_str());
+-}
+-
+-TESTMAIN_ARGS(test_quad_interpolate);
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
+deleted file mode 100644
+index a3fbe3c4ae..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+deleted file mode 100644
+index 643a441654..0000000000
+--- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
++++ /dev/null
+@@ -1,59 +0,0 @@
+-# contrib/brl/bseg/boxm_batch/CMakeLists.txt
+-
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+-
+-if( PYTHON_FOUND )
+-  FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-  if( EXPAT_FOUND )
+-    include_directories( ${PYTHON_INCLUDE_DIRS} )
+-    include_directories( ${BRL_INCLUDE_DIR} )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+-
+-    include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-    include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-    include_directories( ${MUL_INCLUDE_DIR} )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm/algo )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
+-    include_directories( ${BRL_INCLUDE_DIR}/bbas/bsta )
+-
+-     set(boxm_batch_sources
+-         reg_boxm.h   reg_boxm.cxx
+-        )
+-    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
+-      vxl_add_library(LIBRARY_NAME boxm_batch LIBRARY_SOURCES SHARED ${boxm_batch_sources})
+-
+-      #library has to have different name depending on debug or release version.
+-      if(WIN32)
+-        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch DEBUG_POSTFIX _d SUFFIX .pyd)
+-      endif()
+-      if(APPLE)
+-        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch SUFFIX .so)
+-      endif()
+-      set_target_properties(boxm_batch PROPERTIES PREFIX "")
+-
+-      target_link_libraries(boxm_batch bpro_batch boxm_pro boxm_sample_algo boxm_algo_rt_pro boxm_algo_sp_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro sdet_pro bsta_pro icam_pro bapl_pro )
+-
+-      if(PYTHON_DEBUG_LIBRARIES)
+-        target_link_libraries( boxm_batch debug ${PYTHON_DEBUG_LIBRARY})
+-      endif()
+-
+-      if(PYTHON_LIBRARIES)
+-        target_link_libraries( boxm_batch optimized ${PYTHON_LIBRARY})
+-      endif()
+-
+-      if( BUILD_TESTING )
+-        add_subdirectory(tests)
+-      endif()
+-
+-    endif()
+-  endif()
+-endif()
+-
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindDirectShow.cmake )
+-if(DIRECTSHOW_FOUND)
+-  add_definitions(-DHAS_DIRECTSHOW)
+-endif()
+diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx b/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
+deleted file mode 100644
+index baa2f55b02..0000000000
+--- a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
++++ /dev/null
+@@ -1,135 +0,0 @@
+-#include "reg_boxm.h"
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <brdb/brdb_selection.h>
+-
+-// processes
+-#include <vil_pro/vil_register.h>
+-#include <vpgl_pro/vpgl_register.h>
+-#include <sdet_pro/sdet_register.h>
+-//#include <icam_pro/icam_register.h>
+-#include <boxm/pro/boxm_register.h>
+-#include <boxm/algo/pro/boxm_algo_register.h>
+-#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
+-#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
+-
+-#include <bsta/pro/bsta_register.h>
+-#include <bapl/pro/bapl_register.h>
+-
+-#include <bbas_pro/bbas_register.h>
+-
+-#include <boxm/basic/boxm_util_data_types.h>
+-PyObject *
+-register_processes(PyObject *self, PyObject *args)
+-{
+-  vil_register::register_process();
+-  vpgl_register::register_process();
+-  boxm_register::register_process();
+-  boxm_algo_register::register_process();
+-
+-  boxm_algo_rt_register::register_process();
+-  boxm_algo_sp_register::register_process();
+-  sdet_register::register_process();
+-  //icam_register::register_process();
+-  bapl_register::register_process();
+-  bbas_register::register_process();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-PyObject *
+-register_datatypes(PyObject *self, PyObject *args)
+-{
+-  register_basic_datatypes();
+-  vil_register::register_datatype();
+-  vpgl_register::register_datatype();
+-  boxm_register::register_datatype();
+-  boxm_algo_register::register_process();
+-
+-  boxm_algo_rt_register::register_datatype();
+-  boxm_algo_sp_register::register_datatype();
+-
+-  bsta_register::register_datatype();
+-  //icam_register::register_datatype();
+-  bapl_register::register_datatype();
+-  bbas_register::register_datatype();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-
+-PyObject *get_boxm_array_1d_float(PyObject * /*self*/, PyObject *args)
+-{
+-  unsigned id;
+-  boxm_array_1d_float_sptr value;
+-  if (!PyArg_ParseTuple(args, "i:get_boxm_array_1d_float", &id))
+-    return NULL;
+-
+-  std::string relation_name = "boxm_array_1d_float_sptr_data";
+-
+-  // query to get the data
+-  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
+-  brdb_selection_sptr selec = DATABASE->select(relation_name, std::move(Q));
+-  PyObject *array_1d=0;
+-  if (selec->size()!=1) {
+-    std::cout << "in get_boxm_array_1d_float() - no relation with type" << relation_name << " id: " << id << std::endl;
+-
+-    return array_1d;
+-  }
+-
+-  brdb_value_sptr brdb_value;
+-  if (!selec->get_value(std::string("value"), brdb_value)) {
+-    std::cout << "in get_boxm_array_1d_float() didn't get value\n";
+-    return array_1d;
+-  }
+-
+-  if (!brdb_value) {
+-    std::cout << "in get_boxm_array_1d_float() - null value\n";
+-    return array_1d;
+-  }
+-
+-  brdb_value_t<boxm_array_1d_float_sptr>* result_out = static_cast<brdb_value_t<boxm_array_1d_float_sptr>* >(brdb_value.ptr());
+-  value = result_out->value();
+-
+-  array_1d = PyList_New(value->data_array.size());
+-  PyObject *x;
+-  for(unsigned i=0;i<value->data_array.size();i++)
+-  {
+-    x=PyFloat_FromDouble((double)value->data_array[i]);
+-    PyList_SetItem(array_1d, i,x);//Py_DECREF(x);
+-  }
+-  Py_INCREF(array_1d);
+-  return array_1d;
+-}
+-PyMODINIT_FUNC
+-initboxm_batch(void)
+-{
+-  PyMethodDef reg_pro;
+-  reg_pro.ml_name = "register_processes";
+-  reg_pro.ml_meth = register_processes;
+-  reg_pro.ml_doc = "register_processes() create instances of each defined process";
+-  reg_pro.ml_flags = METH_VARARGS;
+-
+-
+-  PyMethodDef reg_data;
+-  reg_data.ml_name = "register_datatypes";
+-  reg_data.ml_meth = register_datatypes;
+-  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
+-  reg_data.ml_flags = METH_VARARGS;
+-
+-  PyMethodDef get_boxm_array_1d_float_func;
+-  get_boxm_array_1d_float_func.ml_name = "get_boxm_array_1d_float";
+-  get_boxm_array_1d_float_func.ml_meth = get_boxm_array_1d_float;
+-  get_boxm_array_1d_float_func.ml_doc = "get_boxm_array_1d_float() Get 1-d array in python";
+-  get_boxm_array_1d_float_func.ml_flags = METH_VARARGS;
+-
+-  boxm_batch_methods[0]=reg_pro;
+-  boxm_batch_methods[1]=reg_data;
+-  boxm_batch_methods[2]=get_boxm_array_1d_float_func;
+-
+-  for (int i=0; i<METHOD_NUM; ++i) {
+-    boxm_batch_methods[i+3]=batch_methods[i];
+-  }
+-
+-  Py_InitModule("boxm_batch", boxm_batch_methods);
+-}
+diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.h b/contrib/brl/bseg/boxm_batch/reg_boxm.h
+deleted file mode 100644
+index fa2ddfee33..0000000000
+--- a/contrib/brl/bseg/boxm_batch/reg_boxm.h
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#ifndef reg_boxm_h_
+-#define reg_boxm_h_
+-
+-#include <bpro/bpro_batch/bpro_batch.h>
+-
+-static PyObject *register_processes(PyObject *self, PyObject *args);
+-static PyObject *register_datatypes(PyObject *self, PyObject *args);
+-static PyObject *get_boxm_array_1d_float(PyObject * self, PyObject *args);
+-
+-static PyMethodDef boxm_batch_methods[METHOD_NUM+3];
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
+deleted file mode 100644
+index 8b72db0d89..0000000000
+--- a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_batch_test_include test_include.cxx )
+-target_link_libraries( boxm_batch_test_include boxm_batch)
+diff --git a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx b/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
+deleted file mode 100644
+index f962b339e8..0000000000
+--- a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm_batch/reg_boxm.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
+deleted file mode 100644
+index 7186a42583..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
++++ /dev/null
+@@ -1,25 +0,0 @@
+-if (HAS_GEOTIFF)
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+-if(OPENCL_FOUND)
+-
+-  add_definitions(-DHAS_OPENCL=1)
+-  include_directories( ${OPENCL_INCLUDE_PATH} )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-  include_directories( ${MUL_INCLUDE_DIR} )
+-
+-  add_executable( boxm2_to_boxm_exe boxm2_to_boxm.cxx  boxm2_to_boxm.h)
+-  target_link_libraries( boxm2_to_boxm_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-  # executable to convert a bit scene to a boxm2_scene
+-  add_executable( boxm_to_boxm2_exe boxm_to_boxm2.cxx  boxm_to_boxm2.h)
+-  target_link_libraries( boxm_to_boxm2_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-  #tests
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+-else()
+-  message(STATUS "Skipping contrib/brl/bseg/boxm_bridge: requires geotiff")
+-endif()
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
+deleted file mode 100644
+index a9a7c43ba6..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
++++ /dev/null
+@@ -1,233 +0,0 @@
+-//:
+-// \file
+-#include <iostream>
+-#include <queue>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree2.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-#define BOXM2_SCENE_HAS_DIMENSIONS
+-
+-//: computes the log2 of a number and returns it.
+-// power_of_2 is set to true if \p x is an exact power of two.
+-// returns -1 when \p x is zero.
+-int mylog2(unsigned x, bool& power_of_2)
+-{
+-  unsigned orig_x = x;
+-  int l = -1; // mylog2(0) will return -1
+-  while (x != 0u) {
+-    x >>= 1u;
+-    ++l;
+-  }
+-  if (orig_x > std::pow(2.0,l)) {
+-    power_of_2 = false;
+-    ++l;
+-  }
+-  else
+-    power_of_2 = true;
+-  return l;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
+-{
+-  // find the leaf node in the tree to insert subtree
+-  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
+-  if (!node)
+-    std::cerr << "The node could NOT be FOUND\n";
+-  if (node->children()) {
+-    std::cerr << "The node is not a leaf node! Cannot insert here\n";
+-    return;   // it should have been a leaf node
+-  }
+-
+-  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
+-  node->insert_subtree(sub_root);
+-}
+-
+-// converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_tree(boct_bit_tree2 const& bit_tree, boct_tree<T_loc,T_data>*& tree,
+-                  boxm2_data<BOXM2_NORMAL>* normal_data)
+-{
+-  // check if root has any child, if not return the empty tree
+-  tree = new boct_tree<T_loc,T_data>(4, 1);
+-
+-  // if root has no child return a root node filled with data
+-  if (!bit_tree.bit_at(0)) {
+-    int data_idx = bit_tree.get_data_index(0,false);
+-    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
+-    tree->root()->set_data(vnl_vector_fixed<float, 3> (data[0], data[1], data[2]));
+-    return;
+-  }
+-
+-  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-  boct_tree_cell<T_loc,T_data>* root = tree->root();
+-  Q.push(root);
+-
+-  // go through the bits and create cells
+-  int data_idx=bit_tree.get_data_index(0,false);
+-  for (unsigned i=0; i<73; i++) {
+-    int parent_idx = (i-1)/8;
+-    if (i==0 || bit_tree.bit_at(parent_idx)) {
+-      if (!Q.empty()) {
+-        boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
+-        vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
+-        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-        ptr->set_data(normal);
+-        Q.pop();
+-        if (bit_tree.bit_at(i)) {
+-          ptr->split();
+-          boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-          for (unsigned j=0; j<8; j++) {
+-            Q.push(&children[j]);
+-          }
+-        }
+-        data_idx++;
+-      }
+-    }
+-  }
+-
+-  // some of the leaf nodes are still in the queue, fill them with data
+-  while (!Q.empty()) {
+-    if (data_idx > bit_tree.get_data_index(0,false)+585)
+-      std::cerr << "ERROR! exceeded!\n";
+-    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
+-    vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
+-    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-    ptr->set_data(normal);
+-    Q.pop();
+-    data_idx++;
+-  }
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
+-  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
+-  vul_arg<std::string> boxm_dir("-out", "output directory", "");
+-  vul_arg_parse(argc, argv);
+-
+-  boxm2_scene scene2(boxm2_file());
+-
+-  //initialize a block and data cache
+-  boxm2_lru_cache::create(&scene2);
+-  boxm2_cache_sptr cache = boxm2_cache::instance();
+-
+-  bgeo_lvcs lvcs = scene2.lvcs();
+-  //vgl_point_3d<double> origin = scene2.local_origin();
+-  vgl_box_3d<double> world = scene2.bounding_box();
+-  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2.blocks();
+-  std::map<boxm2_block_id, boxm2_block_metadata>::iterator iter = blocks.begin();
+-
+-  typedef boct_tree<short, vnl_vector_fixed<float, 3> > tree_type;
+-  vgl_vector_3d<unsigned int> block_nums = scene2.scene_dimensions();
+-  vgl_point_3d<int> min_block_index;
+-  vgl_point_3d<double> origin;
+-  scene2.min_block_index(min_block_index, origin);
+-  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
+-
+-
+-  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
+-  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
+-  scene.set_paths(scene_path,"block");
+-  scene.set_appearance_model(VNL_FLOAT_3);
+-
+-  int x_dim;
+-  while (iter != blocks.end()) {
+-    boxm2_block_metadata metadata = iter ->second;
+-    boxm2_block_id id = iter->first;
+-    boxm2_block *     block     = cache->get_block(iter->first);
+-    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
+-
+-    boxm2_data_base * data_base  = cache->get_data_base(iter->first,boxm2_data_traits<BOXM2_NORMAL>::prefix());
+-    boxm2_data<BOXM2_NORMAL> *data =new boxm2_data<BOXM2_NORMAL>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
+-
+-    // compute the block bounding box etc
+-    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
+-    vgl_vector_3d<double> subdim=block->sub_block_dim();
+-
+-    // block dimensions should be equal
+-    bool equal = (dim.x()==dim.y());
+-    equal = equal && (dim.x()==dim.z());
+-    assert(equal);
+-
+-    // the block dimensions should be the power of 2 for octree creation
+-    bool pow_of_2;
+-    x_dim = mylog2((double)dim.x(),pow_of_2);
+-    assert(pow_of_2);
+-
+-    double p[3];
+-    p[0] = metadata.local_origin_.x();
+-    p[1] = metadata.local_origin_.y();
+-    p[2] = metadata.local_origin_.z();
+-    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
+-    tree_type* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
+-    block_tree->set_bbox(block_bb);
+-    block_tree->init_cells(0);
+-
+-    int block_i = id.i() - min_block_index.x();
+-    int block_j = id.j() - min_block_index.y();
+-    int block_k = id.k() - min_block_index.z();
+-
+-    scene.load_block(block_i, block_j, block_k);
+-    // go over the subtrees
+-    for (unsigned z=0; z<dim.z(); z++) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        for (unsigned x=0; x<dim.x(); x++) {
+-          boxm2_block::uchar16 tree = block->trees()[x][y][z];
+-          boct_bit_tree2 bit_tree((unsigned char*)tree.data_block());
+-          if (bit_tree.num_cells() >= 1) {
+-            tree_type* octree;
+-            convert_tree(bit_tree,octree,data);
+-            int n1=bit_tree.num_cells();
+-            int n2=octree->all_cells().size();
+-            if (n1 != n2) {
+-              std::cerr << x << ',' << y << ',' << z << '\n'
+-              << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
+-            }
+-
+-            // all three dimensions should be same now, so we can use the one value
+-            double cell_dim=1./dim.x();
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            insert(block_tree,octree, cell_bb);
+-
+-            // since the subtree is added to the main tree, we can delete the root node now
+-            delete octree;
+-          }
+-        }
+-      }
+-    }
+-    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
+-    block_new->init_tree(block_tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  scene.set_octree_levels(x_dim+4, x_dim+1);
+-  scene.write_scene("boxm_scene.xml");
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
+deleted file mode 100644
+index a9d5135776..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
++++ /dev/null
+@@ -1,292 +0,0 @@
+-#include <iostream>
+-#include <queue>
+-#include "boxm2_to_boxm.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-#define BOXM2_SCENE_HAS_DIMENSIONS
+-
+-//: computes the log2 of a number and returns it.
+-// power_of_2 is set to true if \p x is an exact power of two.
+-// returns -1 when \p x is zero.
+-int mylog2(unsigned x, bool& power_of_2)
+-{
+-  unsigned orig_x = x;
+-  int l = -1; // mylog2(0) will return -1
+-  while (x != 0u) {
+-    x >>= 1u;
+-    ++l;
+-  }
+-  if (orig_x > std::pow(2.0,l)) {
+-    power_of_2 = false;
+-    ++l;
+-  }
+-  else
+-    power_of_2 = true;
+-  return l;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
+-{
+-  // find the leaf node in the tree to insert subtree
+-  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
+-  if (!node)
+-    std::cerr << "The node could NOT be FOUND\n";
+-  if (node->children()) {
+-    std::cerr << "The node is not a leaf node! Cannot insert here\n";
+-    return;   // it should have been a leaf node
+-  }
+-
+-  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
+-  node->insert_subtree(sub_root);
+-}
+-
+-//: combine the data values to create a sample
+-boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
+-                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
+-                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs)
+-{
+-  float m0=data[0]/255.0f;
+-  float v0=data[1]/255.0f;
+-  float w0=data[2]/255.0f;
+-  float m1=data[3]/255.0f;
+-  float v1=data[4]/255.0f;
+-  float w1=data[5]/255.0f;
+-  float m2=data[6]/255.0f;
+-  float v2=data[7]/255.0f;
+-  float w2=0;
+-  if (w0>0 && w1>0)
+-    w2=1.0-w0-w1;
+-
+-  unsigned short n0=num_obs[0];
+-  unsigned short n1=num_obs[1];
+-  unsigned short n2=num_obs[2];
+-  unsigned short nmix=num_obs[3];
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::mix_gauss_sf1_type mix_gauss_sf1_type;
+-
+-
+-  bsta_gauss_sf1 dist0((float)m0, (float)v0);
+-  bsta_num_obs<bsta_gauss_sf1> num_obs_dist0(dist0, n0);
+-  bsta_gauss_sf1 dist1((float)m1, (float)v1);
+-  bsta_num_obs<bsta_gauss_sf1> num_obs_dist1(dist1, n1);
+-  bsta_gauss_sf1 dist2((float)m2, (float)v2);
+-  bsta_num_obs<bsta_gauss_sf1> num_obs_dist2(dist2, n2);
+-
+-  bsta_mixture_fixed<gauss_type_sf1, 3>  mf;
+-  mf.insert(num_obs_dist0,w0);
+-  mf.insert(num_obs_dist1,w1);
+-  mf.insert(num_obs_dist2,w2);
+-
+-  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs(mf,nmix/100.0f);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> sample(alpha, obs);
+-  return sample;
+-}
+-
+-// converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
+-                  boxm2_data<BOXM2_ALPHA>* alpha_data,
+-                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
+-                  boxm2_data<BOXM2_NUM_OBS>* num_obs)
+-{
+-  // check if root has any child, if not return the empty tree
+-  tree = new boct_tree<T_loc,T_data>(4, 1);
+-
+-  // if root has no child return a root node filled with data
+-  if (!bit_tree.bit_at(0)) {
+-    int data_idx = bit_tree.get_data_index(0,false);
+-    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
+-    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
+-    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
+-    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
+-    tree->root()->set_data(sample);
+-    return;
+-  }
+-
+-  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-  boct_tree_cell<T_loc,T_data>* root = tree->root();
+-  Q.push(root);
+-
+-  // go through the bits and create cells
+-  int data_idx=bit_tree.get_data_index(0,false);
+-  for (unsigned i=0; i<73; i++) {
+-    int parent_idx = (i-1)/8;
+-    if (i==0 || bit_tree.bit_at(parent_idx)) {
+-      if (!Q.empty()) {
+-        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
+-        boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
+-        boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
+-        boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
+-
+-        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-        ptr->set_data(sample);
+-        Q.pop();
+-        if (bit_tree.bit_at(i)) {
+-          ptr->split();
+-          boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-          for (unsigned j=0; j<8; j++) {
+-            Q.push(&children[j]);
+-          }
+-        }
+-        data_idx++;
+-      }
+-    }
+-  }
+-
+-  // some of the leaf nodes are still in the queue, fill them with data
+-  while (!Q.empty()) {
+-    if (data_idx > bit_tree.get_data_index(0,false)+585)
+-      std::cerr << "ERROR! exceeded!\n";
+-    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
+-    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
+-    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
+-    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
+-    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-    ptr->set_data(sample);
+-    Q.pop();
+-   data_idx++;
+-  }
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
+-  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
+-  vul_arg<std::string> boxm_dir("-out", "output directory", "");
+-  vul_arg_parse(argc, argv);
+-
+-  boxm2_scene_sptr scene2 = new boxm2_scene(boxm2_file());
+-
+-  //initialize a block and data cache
+-  boxm2_lru_cache::create(scene2);
+-  boxm2_cache_sptr cache = boxm2_cache::instance();
+-
+-  vpgl_lvcs lvcs = scene2->lvcs();
+-  //vgl_point_3d<double> origin = scene2->local_origin();
+-  vgl_box_3d<double> world = scene2->bounding_box();
+-  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2->blocks();
+-  auto iter = blocks.begin();
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  vgl_vector_3d<unsigned int> block_nums = scene2->scene_dimensions();
+-  vgl_point_3d<int> min_block_index;
+-  vgl_point_3d<double> origin;
+-  scene2->min_block_index(min_block_index, origin);
+-  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
+-
+-
+-  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
+-  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
+-  scene.set_paths(scene_path,"block");
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-
+-  int x_dim;
+-  while (iter != blocks.end()) {
+-    boxm2_block_metadata metadata = iter ->second;
+-    boxm2_block_id id = iter->first;
+-    boxm2_block *     block     = cache->get_block(scene2, iter->first);
+-    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
+-    boxm2_data_base * data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_NUM_OBS>::prefix());
+-    boxm2_data<BOXM2_NUM_OBS> *num_obs=new boxm2_data<BOXM2_NUM_OBS>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
+-
+-    boxm2_data_base * mog3_data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_MOG3_GREY>::prefix());
+-    boxm2_data<BOXM2_MOG3_GREY> *mog3_data=new boxm2_data<BOXM2_MOG3_GREY>(mog3_data_base->data_buffer(),mog3_data_base->buffer_length(),mog3_data_base->block_id());
+-    boxm2_data_base * alpha_data_base  = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_ALPHA>::prefix());
+-    boxm2_data<BOXM2_ALPHA> *alpha_data =new boxm2_data<BOXM2_ALPHA>(alpha_data_base->data_buffer(),alpha_data_base->buffer_length(),alpha_data_base->block_id());
+-
+-    // compute the block bounding box etc
+-    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
+-    vgl_vector_3d<double> subdim=block->sub_block_dim();
+-
+-    // block dimensions should be equal
+-    bool equal = (dim.x()==dim.y());
+-    equal = equal && (dim.x()==dim.z());
+-    assert(equal);
+-
+-    // the block dimensions should be the power of 2 for octree creation
+-    bool pow_of_2;
+-    x_dim = mylog2((double)dim.x(),pow_of_2);
+-    assert(pow_of_2);
+-
+-    double p[3];
+-    p[0] = metadata.local_origin_.x();
+-    p[1] = metadata.local_origin_.y();
+-    p[2] = metadata.local_origin_.z();
+-    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
+-    auto* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
+-    block_tree->set_bbox(block_bb);
+-    block_tree->init_cells(0);
+-
+-    int block_i = id.i() - min_block_index.x();
+-    int block_j = id.j() - min_block_index.y();
+-    int block_k = id.k() - min_block_index.z();
+-
+-    scene.load_block(block_i, block_j, block_k);
+-    // go over the subtrees
+-    for (unsigned z=0; z<dim.z(); z++) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        for (unsigned x=0; x<dim.x(); x++) {
+-          boxm2_block::uchar16 tree = block->trees()[x][y][z];
+-          boct_bit_tree bit_tree((unsigned char*)tree.data_block());
+-          if (bit_tree.num_cells() >= 1) {
+-            tree_type* octree;
+-            convert_tree(bit_tree,octree,alpha_data,mog3_data,num_obs);
+-            int n1=bit_tree.num_cells();
+-            int n2=octree->all_cells().size();
+-            if (n1 != n2) {
+-              std::cerr << x << ',' << y << ',' << z << '\n'
+-                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
+-            }
+-
+-            // all three dimensions should be same now, so we can use the one value
+-            double cell_dim=1./dim.x();
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            insert(block_tree,octree, cell_bb);
+-
+-            // since the subtree is added to the main tree, we can delete the root node now
+-            delete octree;
+-          }
+-        }
+-      }
+-    }
+-    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
+-    block_new->init_tree(block_tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  scene.set_octree_levels(x_dim+4, x_dim+1);
+-  scene.write_scene("boxm_scene.xml");
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
+deleted file mode 100644
+index a4dec11806..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#ifndef boxm2_to_boxm_h_
+-#define boxm2_to_boxm_h_
+-//:
+-// \file
+-
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-#include <boxm2/boxm2_data.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-//: combine the data values to create a sample
+-boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
+-                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
+-                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs);
+-
+-//: converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
+-                  boxm2_data<BOXM2_ALPHA>* alpha_data,
+-                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
+-                  boxm2_data<BOXM2_NUM_OBS>* num_obs);
+-
+-#endif // boxm2_to_boxm_h_
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
+deleted file mode 100644
+index 54dc134841..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
++++ /dev/null
+@@ -1,326 +0,0 @@
+-#include <queue>
+-#include <iostream>
+-#include "boxm_to_boxm2.h"
+-//:
+-// \file
+-//
+-//  boxm_normals_to_boxm2.cxx
+-//
+-// \author
+-//  Created by David Borton on 11/28/11.
+-//  Copyright (c) 2011 Brown University. All rights reserved.
+-//
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree2.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-
+-//: extracts the tree cell's data into an array format for boxm2 representation
+-template <class T_loc, class T_data>
+-void convert_data(boct_tree<T_loc,T_data>* tree,
+-                  boct_tree_cell<T_loc,T_data>* tree_cell,
+-                  boct_tree_cell<T_loc, bool>* valid_cell,
+-                  boct_tree_cell<T_loc, float>* alpha_cell,
+-                  boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr,
+-                  boxm2_data_traits<BOXM2_POINT>::datatype* points_arr,
+-                  boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr,
+-                  int& data_idx)
+-{
+-  // go through the tree, in depth first order to collect data
+-  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-  std::queue<boct_tree_cell<T_loc,float>*> alpha_Q;
+-  std::queue<boct_tree_cell<T_loc,bool>*> valid_Q;
+-
+-  Q.push(tree_cell);
+-  alpha_Q.push(alpha_cell);
+-  valid_Q.push(valid_cell);
+-
+-  while (!Q.empty()) {
+-    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-    boct_tree_cell<T_loc, bool>* valid_ptr = valid_Q.front();
+-    boct_tree_cell<T_loc, float> alpha_ptr = alpha_Q.front();
+-    vgl_point_3d<double> point = tree->global_centroid(tree_cell);
+-
+-    if (ptr && valid_ptr && alpha_ptr)
+-    {
+-      if (valid_ptr->data()) {
+-        T_data normal = tree_cell->data();
+-
+-        normals_arr[data_idx][0] = normal[0];
+-        normals_arr[data_idx][1] = normal[2];
+-        normals_arr[data_idx][2] = normal[3];
+-        normals_arr[data_idx][3] = 0.0f;
+-
+-        points_arr[data_idx][0] = point.x();
+-        points_arr[data_idx][1] = point.y();
+-        points_arr[data_idx][2] = point.z();
+-        points_arr[data_idx][3] = 0.0f;
+-
+-        alpha_arr[data_idx]=alpha_cell->data();
+-      }
+-      else {
+-        normals_arr[data_idx][0] = 0.0f;
+-        normals_arr[data_idx][1] = 0.0f;
+-        normals_arr[data_idx][2] = 0.0f;
+-        normals_arr[data_idx][3] = 0.0f;
+-
+-        points_arr[data_idx][0] = point.x();
+-        points_arr[data_idx][1] = point.y();
+-        points_arr[data_idx][2] = point.z();
+-        points_arr[data_idx][3] = 0.0f;
+-
+-        alpha_arr[data_idx]=alpha_cell->data();
+-      }
+-
+-      data_idx++;
+-
+-      if (!ptr->is_leaf()) {
+-        boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-        boct_tree_cell<T_loc, bool>* valid_children = valid_ptr->children();
+-        boct_tree_cell<T_loc, float>* alpha_chidren = alpha_ptr->children();
+-        for (unsigned j=0; j<8; j++) {
+-          Q.push(&children[j]);
+-          alpha_Q.push(&alpha_chidren[j]);
+-          valid_Q.push(&valid_children[j]);
+-        }
+-      }
+-    }
+-    Q.pop();
+-    alpha_Q.pop();
+-    valid_Q.pop();
+-  }
+-}
+-
+-//: recursively sets the bits based on the octree structure
+-template <class T_loc, class T_data>
+-void set_bits(boct_bit_tree2*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
+-{
+-  if (cell.code_.level == 0)
+-    return;
+-
+-  if (!cell.is_leaf()) {
+-    int bit_idx=idx*8+1+child_idx;
+-    bit_tree->set_bit_at(bit_idx,true);
+-    for (unsigned i=0; i<8; i++)
+-      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
+-  }
+-}
+-
+-//: converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree2*& bit_tree)
+-{
+-  bit_tree = new boct_bit_tree2();
+-  // first set all the bits to 0
+-  for (unsigned i=0; i<73; i++)
+-    bit_tree->set_bit_at(i,false);
+-
+-  // empty tree
+-  if (!tree_cell)
+-    return;
+-
+-  // only root node
+-  if (tree_cell->is_leaf())
+-    return;
+-
+-  int idx=0;
+-  bit_tree->set_bit_at(idx,true); // root
+-  for (unsigned i=0; i<8; i++) {  // level root-1
+-    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void convert_scene( boxm_scene<boct_octree<T_loc, T_data> > &scene,
+-                    boxm_scene<boct_octree<T_loc, bool> > &valid_scene,
+-                    boxm_scene<boct_octree<T_loc, float> > &alpha_scene,
+-                    boxm2_scene &new_scene)
+-{
+-  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
+-  unsigned int dim=sub_block_dim();
+-  typedef boct_octree<T_loc, T_data> tree_type;
+-  boxm_block_iterator<tree_type > iter(&scene);
+-  boxm_block_iterator<tree_type > validd_iter(&valid_scene);
+-  boxm_block_iterator<tree_type > alpha_iter(&alpha_scene);
+-
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type >* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    std::cout<<block_bb<<std::endl;
+-    tree_type * tree = block->get_tree();
+-
+-    valid_scene.load_block(idx);
+-    boxm_block<boct_tree<short, bool> >* valid_block = valid_scene.get_block(idx);
+-    boct_tree<short, bool> * valid_tree = valid_block->get_tree();
+-
+-    alpha_scene.load_block(idx);
+-    boxm_block<boct_tree<short, float> >* alpha_block = alpha_scene.get_block(idx);
+-    boct_tree<short, float> * alpha_tree = alpha_block->get_tree();
+-
+-    // create metadata for the block
+-    boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
+-    vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
+-    vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
+-    vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
+-                                         sub_block_dim.y()*scene.block_dim().y(),
+-                                         sub_block_dim.z()*scene.block_dim().z());
+-    boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
+-                                  real_block_dim,sub_block_num,1,4,650.0,0.001);
+-    boxm2_block new_block(metadata);
+-    new_blocks[block_id]=metadata;
+-
+-    // find the total number of cells to figure out data array sizes, as the first step
+-    int data_size=0;
+-    for (unsigned z=0; z<dim; z++) {
+-      for (unsigned y=0; y<dim; y++) {
+-        for (unsigned x=0; x<dim; x++) {
+-          double cell_dim=1./dim;
+-          double p[3];
+-          p[0] = x*cell_dim;
+-          p[1] = y*cell_dim;
+-          p[2] = z*cell_dim;
+-          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-          boct_tree_cell<T_loc,T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-          if (!node)
+-            std::cout << "The node COULD not be FOUND" << std::endl;
+-          else {
+-            std::vector<boct_tree_cell<T_loc,T_data> > *> children;
+-            node->all_children(children);
+-            int n2= children.size()+1;
+-            data_size += n2;
+-          }
+-        }
+-      }
+-    }
+-
+-    // allocate data array
+-    boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr=new  boxm2_data_traits<BOXM2_NORMAL>::datatype[data_size];
+-    boxm2_data_traits<BOXM2_POINT>::datatype* points_arr=new  boxm2_data_traits<BOXM2_POINT>::datatype[data_size];
+-    boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr = new boxm2_data_traits<BOXM2_ALPHA>::datatype[data_size];
+-
+-    // divide the blocks
+-    int data_idx=0;
+-    boxm2_array_3d<boxm2_block::uchar16>& trees = new_block.trees();
+-    for (unsigned z=0; z<dim; z++) {
+-      for (unsigned y=0; y<dim; y++) {
+-        for (unsigned x=0; x<dim; x++) {
+-          double cell_dim=1./dim;
+-          double p[3];
+-          p[0] = x*cell_dim;
+-          p[1] = y*cell_dim;
+-          p[2] = z*cell_dim;
+-          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-          boct_tree_cell<T_loc, T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-          boct_tree_cell<T_loc, bool>* valid_node = valid_tree->locate_point_at_level(cell_bb.centroid(), 3);
+-          boct_tree_cell<T_loc, float> *alpha_node = alpha_tree->locate_point_at_level(cell_bb.centroid(), 3);
+-
+-          if (!(node && valid_node && alpha_node) )
+-            std::cout << "One of the nodes COULD not be FOUND" << std::endl;
+-          else {
+-            std::vector<boct_tree_cell<T_loc, T_data > *> children;
+-            node->all_children(children);
+-            int n2= children.size()+1;
+-
+-            boct_bit_tree2* bit_tree;
+-            convert_to_bittree(node, bit_tree);
+-            int n1=bit_tree->num_cells();
+-            int start=data_idx;
+-            convert_data(tree, node, valid_node, alpha_node, normals_arr, points_arr, alpha_arr,  data_idx);
+-            // set the data index at the tree
+-            bit_tree->set_data_ptr(start, false);
+-            // set the tree at the block
+-            boxm2_block::uchar16& t=trees[x][y][z];
+-            t.set(bit_tree->get_bits());
+-            if (n1 != n2) {
+-              std::cout << x << ',' << y << ',' << z << '\n'
+-                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
+-            }
+-          }
+-        }
+-      }
+-    }
+-    char* b1 = reinterpret_cast<char *>(normals_arr);
+-    boxm2_data<BOXM2_NORMAL> *normals_data=new boxm2_data<BOXM2_NORMAL>(b1,data_size*sizeof(boxm2_data_traits<BOXM2_NORMAL>::datatype),block_id);
+-    char* b2 = reinterpret_cast<char *>(pointa_arr);
+-    boxm2_data<BOXM2_POINT> *points_data=new boxm2_data<BOXM2_POINT>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_POINT>::datatype),block_id);
+-    char* b3 = reinterpret_cast<char *>(alpha_arr);
+-    boxm2_data<BOXM2_ALPHA> *alpha_data = new boxm2_data<BOXM2_ALPHA>(b3, data_size*sizeof(boxm2_data_traits<BOXM2_ALPHA>::datatype),block_id);
+-
+-    boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
+-    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, normals_data);
+-    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, points_data);
+-    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
+-
+-    delete [] normals_arr;
+-    delete [] points_arr;
+-    delete [] alpha_arr;
+-    iter++;
+-  }
+-  new_scene.set_blocks(new_blocks);
+-  new_scene.save_scene();
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout << "Converting boxm scene with normals to boxm2 normals and points" << std::endl;
+-  vul_arg<std::string> scene_path("-normals_scene", "scene filename", "");
+-  vul_arg<std::string> scene_path("-valid_scene", "scene filename", "");
+-  vul_arg<std::string> scene_path("-alpha_scene", "scene filename", "");
+-  vul_arg<std::string> out_dir("-out", "output directory", "");
+-  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
+-  vul_arg_parse(argc, argv);
+-
+-  boxm_scene_parser parser;
+-  boxm_scene_base_sptr n_scene_ptr=new boxm_scene_base();
+-  n_scene_ptr->load_scene(normals_scene(), parser);
+-
+-  if (n_scene_ptr->appearence_model() == VNL_FLOAT_3)
+-  {
+-    typedef boct_tree<short, VNL_FLOAT_3 > tree_type;
+-    boxm_scene<tree_type > scene;
+-    scene.load_scene(normals_scene());
+-
+-    boxm_scene<boct_tree<short, bool> > valid_scene;
+-    valid_scene.load_scene(valid_scene());
+-
+-    boxm_scene<boct_tree<short, float> > alpha_scene;
+-    alpha_scene.load_scene(alpha_scene());
+-
+-    // create a boxm2 scene
+-    boxm2_scene new_scene;
+-    new_scene.set_data_path(out_dir());
+-    new_scene.set_local_origin(scene.origin());
+-    new_scene.set_lvcs(scene.lvcs());
+-    new_scene.set_xml_path(out_dir()+"/scene.xml");
+-
+-    //initialize a block
+-    boxm2_lru_cache::create(&new_scene);
+-
+-    convert_scene(scene, valid_scene, alpha_scene, new_scene);
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
+deleted file mode 100644
+index 5a3d2d6e83..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
++++ /dev/null
+@@ -1,262 +0,0 @@
+-#include <iostream>
+-#include <queue>
+-#include "boxm_to_boxm2.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-
+-//: extracts the parameters of a boxm_sample for boxm2 representation
+-void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
+-                        float &alpha,
+-                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
+-                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs)
+-{
+-  alpha=sample.alpha;
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
+-
+-  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs = sample.appearance();
+-  unsigned int nmix = obs.num_observations*100.0;
+-  num_obs[3] = nmix;
+-
+-  for (unsigned i=0; i<obs.num_components(); i++) {
+-    gauss_type_sf1  mf=obs.distribution(i);
+-    auto w = (unsigned char)std::floor(obs.weight(i)*255.0);
+-    unsigned int  n = (unsigned char)mf.num_observations;
+-    auto m = (unsigned char)std::floor(mf.mean()*255.0);
+-    auto v = (unsigned char)std::floor(mf.var()*255.0);
+-    num_obs[i]=n;
+-    data[i*3]=m;
+-    data[i*3+1]=v;
+-    if (i<2)
+-      data[i*3+2]=w;
+-  }
+-}
+-
+-//: extracts the tree cell's data into an array format for boxm2 representation
+-template <class T_loc, class T_data>
+-void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
+-                  float* alpha,
+-                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
+-                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
+-                  int& data_idx)
+-{
+-    // go through the tree, in depth first order to collect data
+-    std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-    Q.push(tree_cell);
+-    while (!Q.empty()) {
+-        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-        {
+-            deconstruct_sample(ptr->data(),alpha[data_idx],data[data_idx],num_obs[data_idx]);
+-            data_idx++;
+-            if (!ptr->is_leaf()) {
+-                boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-                for (unsigned j=0; j<8; j++) {
+-                    Q.push(&children[j]);
+-                }
+-            }
+-        }
+-        Q.pop();
+-    }
+-}
+-
+-//: recursively sets the bits based on the octree structure
+-template <class T_loc, class T_data>
+-void set_bits(boct_bit_tree*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
+-{
+-  if (cell.code_.level == 0)
+-    return;
+-
+-  if (!cell.is_leaf()) {
+-    int bit_idx=idx*8+1+child_idx;
+-    bit_tree->set_bit_at(bit_idx,true);
+-    for (unsigned i=0; i<8; i++)
+-      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
+-  }
+-}
+-
+-//: converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree)
+-{
+-  bit_tree = new boct_bit_tree();
+-  // first set all the bits to 0
+-  for (unsigned i=0; i<73; i++)
+-    bit_tree->set_bit_at(i,false);
+-
+-  // empty tree
+-  if (!tree_cell)
+-    return;
+-
+-  // only root node
+-  if (tree_cell->is_leaf()) {
+-    return;
+-  }
+-
+-  int idx=0;
+-  bit_tree->set_bit_at(idx,true); // root
+-  for (unsigned i=0; i<8; i++) {  // level root-1
+-    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
+-  }
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout << "Converting boxm scene to boxm2 Scene" << std::endl;
+-  vul_arg<std::string> scene_path("-scene", "scene filename", "");
+-  vul_arg<std::string> out_dir("-out", "output directory", "");
+-  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
+-  vul_arg_parse(argc, argv);
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  boxm_scene<tree_type > scene;
+-  scene.load_scene(scene_path());
+-
+-  // create a boxm2 scene
+-  boxm2_scene new_scene;
+-  new_scene.set_data_path(out_dir());
+-  new_scene.set_local_origin(scene.origin());
+-  new_scene.set_lvcs(scene.lvcs());
+-  new_scene.set_xml_path(out_dir()+"/scene.xml");
+-
+-  //initialize a block
+-  boxm2_lru_cache::create(&new_scene);
+-
+-  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
+-  unsigned int dim=sub_block_dim();
+-  if (scene.appearence_model() == BOXM_APM_MOG_GREY) {
+-    boxm_block_iterator<tree_type > iter(&scene);
+-    while (!iter.end()) {
+-      vgl_point_3d<int> idx = iter.index();
+-      scene.load_block(idx);
+-      boxm_block<tree_type >* block = scene.get_block(idx);
+-      vgl_box_3d<double> block_bb = block->bounding_box();
+-      std::cout<<block_bb<<std::endl;
+-      tree_type * tree = block->get_tree();
+-
+-      // create metadata for the block
+-      boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
+-      vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
+-      vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
+-      vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
+-                                           sub_block_dim.y()*scene.block_dim().y(),
+-                                           sub_block_dim.z()*scene.block_dim().z());
+-      boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
+-                                    real_block_dim,sub_block_num,1,4,650.0,0.001);
+-      boxm2_block new_block(metadata);
+-      new_blocks[block_id]=metadata;
+-
+-      // find the total number of cells to figure out data array sizes, as the first step
+-      int data_size=0;
+-      for (unsigned z=0; z<dim; z++) {
+-        for (unsigned y=0; y<dim; y++) {
+-          for (unsigned x=0; x<dim; x++) {
+-            double cell_dim=1./dim;
+-            double p[3];
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-            if (!node)
+-              std::cout << "The node COULD not be FOUND" << std::endl;
+-            else {
+-              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
+-              node->all_children(children);
+-              int n2= children.size()+1;
+-              data_size += n2;
+-            }
+-          }
+-        }
+-      }
+-
+-      // allocate data array
+-      auto* data_arr=new  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype[data_size];
+-      auto* num_obs_arr=new  boxm2_data_traits<BOXM2_NUM_OBS>::datatype[data_size];
+-      auto* alpha_arr = new float[data_size];
+-
+-      // divide the blocks
+-      int data_idx=0;
+-      boxm2_array_3d<boxm2_block::uchar16> trees = new_block.trees_copy();
+-      for (unsigned z=0; z<dim; z++) {
+-        for (unsigned y=0; y<dim; y++) {
+-          for (unsigned x=0; x<dim; x++) {
+-            double cell_dim=1./dim;
+-            double p[3];
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-            if (!node)
+-              std::cout << "The node COULD not be FOUND" << std::endl;
+-            else {
+-              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
+-              node->all_children(children);
+-              int n2= children.size()+1;
+-
+-              boct_bit_tree* bit_tree;
+-              convert_to_bittree(node, bit_tree);
+-              int n1=bit_tree->num_cells();
+-              int start=data_idx;
+-              convert_data(node, alpha_arr, data_arr, num_obs_arr, data_idx);
+-              // set the data index at the tree
+-              bit_tree->set_data_ptr(start, false);
+-              // set the tree at the block
+-              boxm2_block::uchar16& t=trees[x][y][z];
+-              t.set(bit_tree->get_bits());
+-              if (n1 != n2) {
+-                std::cout << x << ',' << y << ',' << z << '\n'
+-                         << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
+-              }
+-            }
+-          }
+-        }
+-      }
+-      new_block.set_trees(trees);
+-      char* b1 = reinterpret_cast<char *>(alpha_arr);
+-      boxm2_data<BOXM2_ALPHA> *alpha_data=new boxm2_data<BOXM2_ALPHA>(b1,data_size*sizeof(float),block_id);
+-      char* b2 = reinterpret_cast<char *>(data_arr);
+-      boxm2_data<BOXM2_MOG3_GREY> *mog_data=new boxm2_data<BOXM2_MOG3_GREY>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_MOG3_GREY>::datatype),block_id);
+-      char* b3 = reinterpret_cast<char *>(num_obs_arr);
+-      boxm2_data<BOXM2_NUM_OBS> *num_data=new boxm2_data<BOXM2_NUM_OBS>(b3,data_size*sizeof(boxm2_data_traits<BOXM2_NUM_OBS>::datatype),block_id);
+-
+-      boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
+-      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
+-      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, mog_data);
+-      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, num_data);
+-
+-      delete [] alpha_arr;
+-      delete [] data_arr;
+-      delete [] num_obs_arr;
+-      iter++;
+-    }
+-    new_scene.set_blocks(new_blocks);
+-    new_scene.save_scene();
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
+deleted file mode 100644
+index 6f15345854..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#ifndef boxm_to_boxm2_h_
+-#define boxm_to_boxm2_h_
+-//:
+-// \file
+-
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-#include <boxm2/boxm2_data.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-//: extracts the parameters of a boxm_sample for boxm2 representation
+-void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
+-                        float &alpha,
+-                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
+-                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs);
+-
+-//: extracts the tree cell's data into an array format for boxm2 representation
+-template <class T_loc, class T_data>
+-void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
+-                  float* alpha,
+-                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
+-                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
+-                  int& data_idx);
+-
+-//: converts the boct_octree to bit tree representation
+-template <class T_loc, class T_data>
+-void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree);
+-
+-#endif // boxm_to_boxm2_h_
+diff --git a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
+deleted file mode 100644
+index 62cccc7c6f..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_bridge_test_include test_include.cxx )
+-target_link_libraries( boxm_bridge_test_include boxm)
+diff --git a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx b/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
+deleted file mode 100644
+index ee10496c92..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm_bridge/boxm2_to_boxm.h>
+-#include <boxm_bridge/boxm_to_boxm2.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/CMakeLists.txt b/contrib/brl/bseg/bvpl/CMakeLists.txt
+index 424ed5bf50..2593480038 100644
+--- a/contrib/brl/bseg/bvpl/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/CMakeLists.txt
+@@ -24,7 +24,6 @@ target_link_libraries(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta ${VXL_
+ 
+ add_subdirectory(pro)
+ add_subdirectory(util)
+-add_subdirectory(bvpl_octree)
+ add_subdirectory(kernels)
+ add_subdirectory(functors)
+ 
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+deleted file mode 100644
+index 1f390f966c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
++++ /dev/null
+@@ -1,71 +0,0 @@
+-# This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+-# Brown Voxel Processing library for octrees
+-
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-
+-#option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
+-#mark_as_advanced( VXL_FORCE_V3P_RPLY )
+-
+-if(EXPAT_FOUND)
+-
+-find_package( Threads )
+-
+-#vxl_configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/bvpl_octree_config.h.in
+-#                ${CMAKE_CURRENT_BINARY_DIR}/bvpl_octree_config.h include/vxl/contrib/brl/bseg/bvpl/bvpl_octree)
+-
+-include_directories( ${EXPAT_INCLUDE_DIR} )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/boct )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl )
+-include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+-
+-set(bvpl_octree_sources
+-    bvpl_octree_kernel_operator.h
+-    bvpl_octree_vector_operator.h
+-    bvpl_scene_kernel_operator.h
+-    bvpl_scene_vector_operator.h
+-    bvpl_block_kernel_operator.h
+-    bvpl_block_vector_operator.h
+-    bvpl_octree_vrml_util.h
+-    bvpl_cell_data_traits.h
+-    bvpl_octree_neighbors.h
+-    bvpl_scene_neighborhood_operator.h    bvpl_scene_neighborhood_operator.cxx
+-    bvpl_scene_statistics.h               bvpl_scene_statistics.cxx
+-    bvpl_discover_pca_kernels.h           bvpl_discover_pca_kernels.cxx
+-    bvpl_pca_error_scenes.h               bvpl_pca_error_scenes.cxx
+-    bvpl_global_pca.h                     bvpl_global_pca.hxx
+-    bvpl_taylor_scenes_map.h              bvpl_taylor_scenes_map.cxx
+-    bvpl_taylor_basis.h                   bvpl_taylor_basis.cxx
+-    bvpl_global_taylor.h                  bvpl_global_taylor.hxx          bvpl_global_taylor.cxx
+-    bvpl_global_corners.h                 bvpl_global_corners.cxx
+-    bvpl_corner_detector.h
+-    bvpl_corner_functors.h
+-    bvpl_gauss3D_steerable_filters.h      bvpl_gauss3D_steerable_filters.cxx
+-   )
+-
+-aux_source_directory(Templates bvpl_octree_sources)
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree LIBRARY_SOURCES ${bvpl_octree_sources})
+-target_link_libraries(bvpl_octree bvpl_kernels bvpl_functors bvpl_octree_sample bvrml boxm boct ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+-
+-#Binary io
+-add_subdirectory(io)
+-
+-#Directory with python/c++ processes
+-add_subdirectory(pro)
+-
+-# Octree samples needed by bvpl
+-add_subdirectory(sample)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-if( CMAKE_USE_PTHREADS_INIT )
+-  add_definitions(-DBVPL_OCTREE_HAS_PTHREADS=1)
+-  set_target_properties(bvpl_octree PROPERTIES COMPILE_FLAGS -pthread)
+-  target_link_libraries(bvpl_octree pthread)
+-endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index 067773b3d9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
+deleted file mode 100644
+index a5900cfb6b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<float>);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<float>);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
+deleted file mode 100644
+index 7c2f63355a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
+deleted file mode 100644
+index 81366222a6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_taylor_basis2_sample);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_taylor_basis2_sample);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
+deleted file mode 100644
+index 7cad8969f8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short, bvpl_octree_sample< gauss_type> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
+deleted file mode 100644
+index 8a135d4e05..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, bvpl_octree_sample<float> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
+deleted file mode 100644
+index fcc60090f2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-
+-typedef boct_tree<short, bvpl_pca_basis_sample<10> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
+deleted file mode 100644
+index d4d340f12d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-#include <vbl/vbl_array_3d.hxx>
+-
+-typedef boct_tree<short, bvpl_taylor_basis2_sample> tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
+deleted file mode 100644
+index cafd0cfaf7..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
++++ /dev/null
+@@ -1,2 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
+-BVPL_GLOBAL_PCA(125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
+deleted file mode 100644
+index 9e815605e3..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl_octree/bvpl_global_taylor.hxx>
+-
+-BVPL_GLOBAL_TAYLOR_INSTANTIATE(double, 10);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
+deleted file mode 100644
+index b8312f8e7e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl_octree/bvpl_global_taylor.hxx>
+-
+-BVPL_GLOBAL_TAYLOR_INSTANTIATE(float, 3);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
+deleted file mode 100644
+index e32ee1303b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
+deleted file mode 100644
+index 1bf245a9f9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_global_corners);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
+deleted file mode 100644
+index ff5175103e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-typedef bvpl_global_pca<125> bvpl_global_pca_125;
+-VBL_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
+deleted file mode 100644
+index 254b91e81f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-typedef bvpl_global_taylor<double,10> gt;
+-VBL_SMART_PTR_INSTANTIATE(gt);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
+deleted file mode 100644
+index a13ebae610..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
+deleted file mode 100644
+index 07c500d5bb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
+deleted file mode 100644
+index e15416cdba..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
++++ /dev/null
+@@ -1,2 +0,0 @@
+-#include <vnl/vnl_matrix_fixed.hxx>
+-VNL_MATRIX_FIXED_INSTANTIATE(double,125,125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
+deleted file mode 100644
+index ec59fe4893..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
++++ /dev/null
+@@ -1,134 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
+-#ifndef bvpl_block_kernel_operator_h
+-#define bvpl_block_kernel_operator_h
+-
+-//:
+-// \file
+-// \brief A class operates a kernel on a boxm_block
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  1-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boxm/boxm_scene.h>
+-#include "bvpl_octree_kernel_operator.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: A class which operates a kernel on a boxm_block.
+-// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
+-// This class is useful to run multithreading processes
+-class bvpl_block_kernel_operator
+-{
+- public:
+-  //: "Convolves" kernel with an input octree, storing the output in an output octree.
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-               F functor,
+-               bvpl_kernel_sptr kernel,
+-               unsigned i, unsigned j, unsigned k,
+-               boxm_scene<boct_tree<short, T_data > > &scene_out,
+-               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
+-};
+-
+-//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data, class F>
+-void bvpl_block_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_sptr kernel,
+-                                         unsigned block_i, unsigned block_j, unsigned block_k,
+-                                         boxm_scene<boct_tree<short, T_data > > &scene_out,
+-                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  //scene_in.clone_blocks(scene_out, T_data());
+-
+-  // Load input and output blocks
+-  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
+-  scene_out.load_block(block_i,block_j,block_k);
+-  valid_scene.load_block(block_i,block_j,block_k);
+-
+-
+-  tree_type *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
+-  tree_type *tree_out = tree_in->clone();
+-  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<cell_type* > cells_out = tree_out->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  typename std::vector<cell_type* >::iterator it_out = cells_out.begin();
+-  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end())&& (valid_it!=valid_cells.end()); it_in++, it_out++, valid_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short,T_data> *out_center_cell = *it_out;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    bool valid = true;
+-
+-#ifdef DEBUG
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
+-
+-      if (this_cell) {
+-        bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val, d);
+-      }
+-      else {
+-        valid = false;
+-        break;
+-      }
+-
+-      ++kernel_iter;
+-    }
+-
+-    out_center_cell->set_data(functor.result());
+-    valid_center_cell->set_data(valid);
+-  }
+-
+-  //write the output block
+-  std::cout << "Writing scenes\n";
+-  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
+-  scene_out.write_active_block();
+-  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene.write_active_block();
+-}
+-
+-#endif // bvpl_block_kernel_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
+deleted file mode 100644
+index 7c772dbd2f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
++++ /dev/null
+@@ -1,146 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
+-#ifndef bvpl_block_vector_operator_h
+-#define bvpl_block_vector_operator_h
+-
+-//:
+-// \file
+-// \brief A class operates a kernel on a boxm_block
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  1-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boxm/boxm_scene.h>
+-#include "bvpl_octree_kernel_operator.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//:A class operates a kernel on a boxm_block.
+-// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
+-// This class is useful to run multathreding processes
+-class bvpl_block_vector_operator
+-{
+- public:
+-  //: "Convolves" kernel with an input octree, storing the output in an output octree.
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data_in, class T_data_out,class F, unsigned dim >
+-  void operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
+-               F functor,
+-               bvpl_kernel_vector_sptr kernel_vector,
+-               unsigned block_i, unsigned block_j, unsigned block_k,
+-               boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
+-               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
+-};
+-
+-//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data_in, class T_data_out,class F, unsigned dim >
+-void bvpl_block_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_vector_sptr kernel_vector,
+-                                         unsigned block_i, unsigned block_j, unsigned block_k,
+-                                         boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
+-                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
+-{
+-  if (kernel_vector->size()!=dim) {
+-    std::cout << "Error in bvpl_block_vector_operator::operate ---> size missmatch\n";
+-    return;
+-  }
+-
+-  typedef boct_tree<short, T_data_in> tree_type_in;
+-  typedef boct_tree_cell<short,T_data_in> cell_type_in;
+-
+-  typedef boct_tree<short, vnl_vector_fixed<T_data_out, dim> > tree_type_out;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<T_data_out, dim> > cell_type_out;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  // Load input and output blocks
+-  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
+-  scene_out.load_block(block_i,block_j,block_k);
+-  valid_scene.load_block(block_i,block_j,block_k);
+-
+-
+-  tree_type_in *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
+-  tree_type_out *tree_out = tree_in->template clone_to_type<vnl_vector_fixed<T_data_out, dim> >();
+-  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
+-
+-  std::vector<cell_type_in* > cells_in = tree_in->leaf_cells();
+-  std::vector<cell_type_out* > cells_out = tree_out->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type_in* >::iterator it_in = cells_in.begin();
+-  typename std::vector<cell_type_out* >::iterator it_out = cells_out.begin();
+-  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-
+-  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end() && (valid_it!=valid_cells.end())); ++it_in, ++it_out, ++valid_it)
+-  {
+-    cell_type_in *center_cell = *it_in;
+-    cell_type_out *out_center_cell = *it_out;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    bool valid = true;
+-
+-#ifdef DEBUG
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    vnl_vector_fixed<T_data_out, dim> responses;
+-
+-    for (unsigned k=0; k< kernel_vector->kernels_.size(); ++k)
+-    {
+-      bvpl_kernel_sptr kernel = kernel_vector->kernels_[k];
+-      bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-      kernel_iter.begin(); // reset the kernel iterator
+-      while (!kernel_iter.isDone())
+-      {
+-        vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
+-
+-        if (this_cell) {
+-          bvpl_kernel_dispatch d = *kernel_iter;
+-          T_data_in val =(T_data_in)this_cell->data();
+-          functor.apply(val, d);
+-        }
+-        else {
+-          valid = false;
+-          break;
+-        }
+-
+-        ++kernel_iter;
+-      }
+-      responses[k] = (T_data_out)(functor.result());
+-    }
+-
+-    out_center_cell->set_data(responses);
+-    valid_center_cell->set_data(valid);
+-  }
+-
+-  //write the output block
+-  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
+-  scene_out.write_active_block();
+-  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene.write_active_block();
+-}
+-
+-#endif // bvpl_block_vector_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
+deleted file mode 100644
+index 7f28fa9bef..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
++++ /dev/null
+@@ -1,34 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
+-#ifndef bvpl_cell_data_traits_h
+-#define bvpl_cell_data_traits_h
+-//:
+-// \file
+-// \brief  Set of accessors of cell's data, taking care of different datatypes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Dec 16, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree_cell.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-
+-//: Float to float
+-template <class T_loc>
+-float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<float> >* cell)
+-{
+-  return cell->data().response_;
+-}
+-
+-//: Mixture of gaussians to float; return the mean
+-template <class T_loc>
+-float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > >* cell)
+-{
+-  return cell->data().response_.mean();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
+deleted file mode 100644
+index e3988f369f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
++++ /dev/null
+@@ -1,299 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
+-#ifndef bvpl_corner_detector_h
+-#define bvpl_corner_detector_h
+-//:
+-// \file
+-// \brief A class to detect 3d Harris corners, based on the 2nd moment matrix
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  20-Jul-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vnl/vnl_double_3x3.h>
+-#include <vnl/algo/vnl_determinant.h>
+-
+-class bvpl_corner_detector
+-{
+- public:
+-  //: Detects Harris features  kernel with an input octree
+-  //  However, features below the Harris threshold are set as invalid in the valid_scene (in place)
+-  //  The type of measure used, depends on the functor.
+-  template<class T_data, class F>
+-  void detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                             F harris_functor,
+-                             vgl_point_3d<int> min_neigborhood_idx,
+-                             vgl_point_3d<int> max_neigborhood_idx,
+-                             unsigned block_i, unsigned block_j, unsigned block_k,
+-                             boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                             boxm_scene<boct_tree<short, float> > *corner_scene,
+-                             double cell_length);
+-
+-  //: Computes the corner measure and stores it in "corner_scene"
+-  //  Input scene and auxiliary valid scene are not modified
+-  template<class T_data, class F>
+-  void compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                  F harris_functor,
+-                  vgl_point_3d<int> min_neigborhood_idx,
+-                  vgl_point_3d<int> max_neigborhood_idx,
+-                  unsigned block_i, unsigned block_j, unsigned block_k,
+-                  boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                  boxm_scene<boct_tree<short, float> > *corner_scene,
+-                  double cell_length);
+-
+-  //: Compute the determinant of the hessian
+-  template<class T_data>
+-  void compute_det_H(boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                     unsigned block_i, unsigned block_j, unsigned block_k,
+-                     boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                     boxm_scene<boct_tree<short, float> > *corner_scene);
+-};
+-
+-
+-template<class T_data, class F>
+-void bvpl_corner_detector::detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                                                 F harris_functor,
+-                                                 vgl_point_3d<int> min_neigborhood_idx,
+-                                                 vgl_point_3d<int> max_neigborhood_idx,
+-                                                 unsigned block_i, unsigned block_j, unsigned block_k,
+-                                                 boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                                                 boxm_scene<boct_tree<short, float> > *corner_scene,
+-                                                 double cell_length)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  // Load input and output blocks
+-  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-  corner_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
+-  corner_tree->init_cells(0.0f);
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
+-
+-  unsigned long n_fail = 0;
+-
+-  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
+-
+-    if (!valid_center_cell->data()) {
+-      continue;
+-    }
+-#if 0
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
+-      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
+-        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
+-        {
+-          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
+-
+-          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
+-                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
+-                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
+-
+-          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
+-
+-          if (this_cell) {
+-            harris_functor.apply(this_cell->data());
+-          }
+-          else
+-            break;
+-        }
+-
+-    double C = 0;
+-    if (!harris_functor.result(C)) {
+-      valid_center_cell->set_data(false);
+-      ++n_fail;
+-    }
+-    corner_center_cell->set_data(float(C));
+-  }
+-
+-  std::cout << "Number of Harris fails: " << n_fail << std::endl;
+-  //write the output block
+-  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene->write_active_block();
+-  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
+-  corner_scene->write_active_block();
+-}
+-
+-template<class T_data, class F>
+-void bvpl_corner_detector::compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                                      F harris_functor,
+-                                      vgl_point_3d<int> min_neigborhood_idx,
+-                                      vgl_point_3d<int> max_neigborhood_idx,
+-                                      unsigned block_i, unsigned block_j, unsigned block_k,
+-                                      boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                                      boxm_scene<boct_tree<short, float> > *corner_scene,
+-                                      double cell_length)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  // Load input and output blocks
+-  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-  corner_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
+-  corner_tree->init_cells(0.0f);
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
+-
+-  unsigned long n_fail = 0;
+-
+-  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
+-
+-    if (!valid_center_cell->data()) {
+-      continue;
+-    }
+-#if 0
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
+-      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
+-        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
+-        {
+-          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
+-
+-          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
+-                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
+-                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
+-
+-          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
+-
+-          if (this_cell) {
+-            harris_functor.apply(this_cell->data());
+-          }
+-          else
+-            break;
+-        }
+-
+-    double C = 0;
+-    harris_functor.result(C);
+-    corner_center_cell->set_data(float(C));
+-  }
+-
+-  std::cout << "Number of Harris fails: " << n_fail << std::endl;
+-  //write the output block
+-  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
+-  corner_scene->write_active_block();
+-}
+-
+-
+-template<class T_data>
+-void bvpl_corner_detector::compute_det_H( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                                          unsigned block_i, unsigned block_j, unsigned block_k,
+-                                          boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                                          boxm_scene<boct_tree<short, float> > *corner_scene)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  // Load input and output blocks
+-  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-  corner_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
+-  corner_tree->init_cells(0.0f);
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
+-
+-  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
+-
+-    if (!valid_center_cell->data()) {
+-      continue;
+-    }
+-
+-    vnl_vector_fixed<double,10> mean_coeff = center_cell->data();
+-
+-    vnl_double_3x3 H;
+-    H.put(0,0,mean_coeff[4]);
+-    H.put(0,1,mean_coeff[7]);
+-    H.put(0,2,mean_coeff[8]);
+-    H.put(1,0,mean_coeff[7]);
+-    H.put(1,1,mean_coeff[5]);
+-    H.put(1,2,mean_coeff[9]);
+-    H.put(2,0,mean_coeff[8]);
+-    H.put(2,1,mean_coeff[9]);
+-    H.put(2,2,mean_coeff[6]);
+-
+-    corner_center_cell->set_data(float(vnl_determinant(H)));
+-  }
+-
+-  //write the output block
+-  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
+-  corner_scene->write_active_block();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
+deleted file mode 100644
+index 85231de3e0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
++++ /dev/null
+@@ -1,68 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
+-#ifndef bvpl_corner_functors_h
+-#define bvpl_corner_functors_h
+-//:
+-// \file
+-// \brief Set of functors based on Harris measures
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  20-Jul-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vnl/vnl_double_3x3.h>
+-#include <vnl/algo/vnl_determinant.h>
+-
+-//  Functor to threshold on Harris corner measure proposed in:
+-//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107-123, 2005
+-class bvpl_harris_laptev_functor
+-{
+- public:
+-  bvpl_harris_laptev_functor(double k)
+-  {
+-    H_ = vnl_double_3x3(0.0);
+-    count_ = 0;
+-    k_ = k;
+-  }
+-
+-  //: Apply a given operation to value \p val, depending on the dispatch character
+-  void apply(vnl_vector_fixed<double,10> taylor_coeff)
+-  {
+-    vnl_double_3x3 temp_H;
+-    for (unsigned mi = 0; mi <3; mi++)
+-      for (unsigned mj = 0; mj <3; mj++)
+-        temp_H.put(mi,mj, taylor_coeff[mi+1] * taylor_coeff[mj+1]);
+-
+-    H_ = H_ + temp_H;
+-    count_++;
+-  }
+-
+-  //: Returns true if the harris threshold is passed, returns by reference the value of the harris ration
+-  bool result( double &C)
+-  {
+-    H_ /= (double)count_;
+-
+-    double trace_H = H_[0][0] + H_[1][1] + H_[2][2];
+-    bool pass = false;
+-
+-    C = vnl_determinant(H_) - k_*(trace_H * trace_H * trace_H);
+-
+-    if (C >= 1e-7)
+-      pass = true;
+-
+-    count_ = 0;
+-    H_.fill(0.0);
+-
+-    return pass;
+-  }
+-
+- protected:
+-
+-  vnl_double_3x3 H_;
+-  unsigned count_;
+-  double k_;
+-};
+-
+-#endif // bvpl_corner_functors_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
+deleted file mode 100644
+index a2aa13a8c6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
++++ /dev/null
+@@ -1,1028 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 8-Nov-2010
+-
+-#include "bvpl_discover_pca_kernels.h"
+-#include <vnl/algo/vnl_symmetric_eigensystem.h>
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-#include <boxm/boxm_scene_parser.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bvpl_discover_pca_kernels::bvpl_discover_pca_kernels(const std::string &path)
+-{
+-  std::cout << "Loading pca info from xml-file" << std::endl;
+-
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-
+-  if (!xml_ifs)
+-    return;
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("pca_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cout << "bvpl_discover_pca_kernels - could not parse xml root\n";
+-  }
+-
+-  //Parse neighborhood bounding box - units are number of voxels
+-  bxml_element nbbox_query("neighborhood");
+-  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
+-  auto* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
+-  int min_x=0, min_y=0, min_z=0, max_x=0, max_y=0, max_z =0;
+-  nbbox_elm->get_attribute("min_x", min_x);
+-  nbbox_elm->get_attribute("min_y", min_y);
+-  nbbox_elm->get_attribute("min_z", min_z);
+-  nbbox_elm->get_attribute("max_x", max_x);
+-  nbbox_elm->get_attribute("max_y", max_y);
+-  nbbox_elm->get_attribute("max_z", max_z);
+-
+-  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
+-  std::cout << "Neighborhood: " << nbbox_ << std::endl;
+-
+-  //Parse Number of samples
+-  bxml_element nsamples_query("samples");
+-  bxml_data_sptr nsamples_data = bxml_find_by_name(root, nsamples_query);
+-  auto* nsamples_elm = dynamic_cast<bxml_element*>(nsamples_data.ptr());
+-  nsamples_elm->get_attribute("nsamples", nsamples_);
+-  std::cout << "Number of samples: " << nsamples_ << std::endl;
+-
+-  //Parse dimension
+-  bxml_element dim_query("dimension");
+-  bxml_data_sptr dim_data = bxml_find_by_name(root, dim_query);
+-  auto* dim_elm = dynamic_cast<bxml_element*>(dim_data.ptr());
+-  dim_elm->get_attribute("feature_dim", feature_dim_);
+-  std::cout << "Feature dimension: " << feature_dim_ << std::endl;
+-
+-  //Parse paths and set matrices
+-  bxml_element paths_query("paths");
+-  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
+-  auto* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
+-
+-  int valid = 0;
+-  std::string ifs_path;
+-
+-  path_elm->get_attribute("pc_path", ifs_path);
+-  if (ifs_path != pc_path())
+-    valid = -1;
+-  else{
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> pc_;
+-    if (pc_.size()!=feature_dim_*feature_dim_)
+-      valid = -2;
+-  }
+-
+-  path_elm->get_attribute("weights_path", ifs_path);
+-  if (ifs_path != weights_path())
+-    valid = -3;
+-  else{
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> weights_;
+-    if (weights_.size()!=feature_dim_)
+-      valid = -4;
+-  }
+-
+-  path_elm->get_attribute("sample_mean_path", ifs_path);
+-  if (ifs_path != sample_mean_path())
+-    valid = -5;
+-  else
+-  {
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> sample_mean_feature_ ;
+-    if (sample_mean_feature_.size()!=feature_dim_)
+-      valid = -6;
+-  }
+-
+-  path_elm->get_attribute("data_path", ifs_path);
+-  if (ifs_path != data_path())
+-    valid = -7;
+-
+-  path_elm->get_attribute("positions_path", ifs_path);
+-  if (ifs_path != pos_path())
+-    valid = -8;
+-
+-  path_elm->get_attribute("scene_path", scene_path_);
+-
+-  //load scene
+-  boxm_scene_parser parser;
+-  data_scene_base_=new boxm_scene_base();
+-  data_scene_base_->load_scene(scene_path_, parser);
+-
+-  //cast scene
+-  auto *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (data_scene_base_->appearence_model() == BOXM_FLOAT){
+-    scene->load_scene(parser);
+-    data_scene_base_ = scene;
+-  }
+-
+-  path_elm->get_attribute("data_mean_path", ifs_path);
+-  if (ifs_path != data_mean_path()){
+-    compute_mean_feature(scene);
+-    valid = -9;
+-    std::cout << "bvpl_discover_pca_kernels - errors parsing data_mean_feature.xml\n";
+-  }
+-  else
+-  {
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> data_mean_feature_ ;
+-    if (data_mean_feature_.size()!=feature_dim_)
+-      valid = -10;
+-  }
+-
+-  //Parse dimension
+-  bxml_element cell_length_query("finest_cell_length");
+-  bxml_data_sptr cell_length_data = bxml_find_by_name(root, cell_length_query);
+-  auto* cell_length_elm = dynamic_cast<bxml_element*>(cell_length_data.ptr());
+-  bool has_length = cell_length_elm->get_attribute("length", finest_cell_length_);
+-  if (!has_length || finest_cell_length_ < 0.0){
+-     std::cout << "Error: Finest cell length read from file: " << finest_cell_length_ << " has length " << has_length << std::endl;
+-     finest_cell_length_ = scene->finest_cell_length();
+-     valid = -11;
+-  }
+-  std::cout << "Finest cell length: " << finest_cell_length_ << std::endl;
+-
+-  if (valid<0){
+-    std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
+-    xml_write();
+-  }
+-}
+-
+-
+-//: Set Up the PCA matrix for the given scene
+-void bvpl_discover_pca_kernels::set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene)
+-{
+-  //zero-mean feature matrix
+-  vnl_matrix<double> M = this->compute_deviation_matrix(scene);
+-
+-  vnl_svd<double> A(M);
+-
+-  //columns of U contain principal components.
+-  pc_.set_size(feature_dim_, feature_dim_);
+-  A.U().extract(pc_);
+-  weights_.set_size(feature_dim_);
+-  weights_ = A.W().diagonal().extract(feature_dim_);
+-
+-  weights_ = element_product(weights_, weights_);
+-
+-#ifdef DEBUG
+-  std::cerr << "Scatter Matix svd" << M*M.transpose() << '\n'
+-           << "PC Matix SVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
+-           << "Evals SVD:\nSize: " << weights_.size() << '\n' << weights_ << '\n';
+-  bvpl_write_pca(path_out_ + "/pca_matrices", M, weights_, pc_);
+-#endif
+-}
+-
+-
+-//: Set Up the PCA matrix for the given scene
+-//  This method performs eigen value decomposition on the scatter matrix
+-//  Use this method when number of samples >> number of dimensions
+-void bvpl_discover_pca_kernels::set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene)
+-{
+-  //zero-mean feature matrix
+-  vnl_matrix<double> S = this->compute_scatter_matrix(scene);
+-
+-  // Compute eigenvectors(principal components) and values of S
+-  pc_.set_size(feature_dim_,feature_dim_);
+-  weights_.set_size(feature_dim_);
+-
+-  vnl_symmetric_eigensystem_compute(S, pc_, weights_);
+-
+-  pc_.fliplr();
+-  weights_.flip();
+-
+-#ifdef DEBUG
+-  std::cerr << "Scatter Matix" << S << '\n'
+-           << "PC Matix EVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
+-           << "EVals EVD:\n Size: " << weights_.size() << '\n' <<weights_ << '\n';
+-  bvpl_write_pca(path_out_ + "/pca_evd", S, weights_, pc_);
+-#endif
+-}
+-
+-
+-//: Ramndom samples according to octree structure.
+-//  Sampling is achieved by generating uniform random cell samples.
+-//  Since there are more cells where the resolution is finer, then these regions get sampled more often
+-vnl_matrix<double> bvpl_discover_pca_kernels::compute_scatter_matrix( boxm_scene<boct_tree<short, float> > *scene)
+-{
+-  //init variables
+-  double scene_ncells = scene->size();
+-  scene->unload_active_blocks();
+-  sample_mean_feature_.fill(0.0f);
+-  vnl_matrix<double> S(feature_dim_, feature_dim_, 0.0f);
+-  vnl_random rng;
+-  std::ofstream pos_ofs(pos_path().c_str());
+-  std::ofstream data_ofs(data_path().c_str());
+-  data_ofs.precision(15);
+-
+-  // 1. Traverse through the blocks/trees
+-  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
+-  unsigned long long nfeature = 1;
+-  for (it.begin(); !it.end(); ++it)
+-  {
+-    scene->load_block_and_neighbors(it.index());
+-    boct_tree<short, float>   *tree = (*it)->get_tree();
+-    assert(tree != nullptr);
+-
+-    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
+-    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
+-    int tree_ncells = leaf_cells.size();
+-    auto tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
+-#ifdef DEBUG
+-    std::cout <<"Tree nsamples is: " << tree_nsamples << '\n'
+-             <<" nsamples is: " << nsamples_ <<std::endl;
+-#endif
+-    for (unsigned i=0; i<tree_nsamples; ++i)
+-    {
+-      unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
+-      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-      //convert neighborhood box to scene coordinates
+-      vgl_point_3d<int> nmin = nbbox_.min_point();
+-      vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
+-                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
+-      roi.set_centroid(center_cell_centroid);
+-
+-      //if neighborhood is not inclusive we would have missing features
+-      if (!((scene->get_world_bbox()).contains(roi))){
+-        --i;
+-        continue;
+-      }
+-
+-      //3. Assemble neighborhood as a feature-vector
+-      vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-      unsigned curr_dim = 0;
+-      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-          {
+-            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
+-                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
+-                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
+-
+-            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-            assert(neighbor_cell !=nullptr);
+-            this_feature[curr_dim] = (double)neighbor_cell->data();
+-            ++curr_dim;
+-          }
+-
+-      assert(curr_dim == feature_dim_);
+-
+-      pos_ofs << center_cell_centroid <<'\n' ;
+-      data_ofs << this_feature << '\n';
+-
+-      //increment weights
+-      double rho = 1.0/(double)nfeature;
+-      double rho_comp = 1.0 - rho;
+-
+-      // the difference vector between the sample and the mean
+-      vnl_vector<double> diff = this_feature - sample_mean_feature_;
+-
+-      //update the covariance
+-      S += rho_comp*outer_product(diff,diff);
+-
+-      //update the mean
+-      sample_mean_feature_ += (rho*diff);
+-
+-      ++nfeature;
+-#ifdef DEBUG
+-      std::cerr << "Feature EVD: " <<this_feature << '\n'
+-               << "Mean Feature EVD: " <<mean_feature << '\n';
+-#endif
+-    }
+-  } //end of block-loop
+-
+-  pos_ofs.close();
+-  data_ofs.close();
+-  std::ofstream mean_ofs(sample_mean_path().c_str());
+-  mean_ofs.precision(15);
+-  mean_ofs << sample_mean_feature_;
+-  mean_ofs.close();
+-
+-  nsamples_ = nfeature-1;
+-
+-  return S;
+-}
+-
+-
+-//: Samples according to octree structure.
+-//  Sampling is achieved by generating uniform random cell samples.
+-//  Since there are more cells where the resolution is finer, then these regions get sampled more often
+-vnl_matrix<double> bvpl_discover_pca_kernels::compute_deviation_matrix( boxm_scene<boct_tree<short, float> > *scene)
+-{
+-  //init variables
+-  unsigned long scene_ncells = scene->size();
+-  sample_mean_feature_.fill(0.0f);
+-  vnl_matrix<double> M(feature_dim_, (unsigned int)nsamples_);
+-  vnl_random rng(9667566ul);
+-  std::ofstream pos_ofs(pos_path().c_str());
+-
+-  // 1. Traverse through the blocks/trees
+-  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
+-  unsigned long feature_col = 0;
+-  for (it.begin(); !it.end(); ++it)
+-  {
+-    scene->load_block_and_neighbors(it.index());
+-    boct_tree<short, float>   *tree = (*it)->get_tree();
+-    assert(tree != nullptr);
+-
+-    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
+-    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
+-    int tree_ncells = leaf_cells.size();
+-    auto tree_nsamples = (unsigned long)(tree_ncells*nsamples_/scene_ncells); // possible overflow ...
+-
+-    for (unsigned int i=0; i<tree_nsamples; ++i)
+-    {
+-      unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
+-      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-      //convert neighborhood box to scene coordinates
+-      vgl_point_3d<int> nmin = nbbox_.min_point();
+-      vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
+-                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
+-      roi.set_centroid(center_cell_centroid);
+-
+-      //if neighborhood is not inclusive we would have missing features
+-      if (!((scene->get_world_bbox()).contains(roi))){
+-        --i;
+-        continue;
+-      }
+-
+-      //3. Assemble neighborhood as a feature-vector
+-      vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-      unsigned curr_dim = 0;
+-      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-          {
+-            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
+-                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
+-                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
+-
+-            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-            assert(neighbor_cell !=nullptr);
+-            this_feature[curr_dim] = (double)neighbor_cell->data();
+-            ++curr_dim;
+-          }
+-
+-      assert(curr_dim == feature_dim_);
+-
+-      pos_ofs << center_cell_centroid <<'\n' ;
+-
+-      M.set_column(feature_col,this_feature);
+-      sample_mean_feature_+=this_feature;
+-      ++feature_col;
+-#ifdef DEBUG
+-      std::cerr << "Feature SVD: " <<this_feature << '\n'
+-               << "Mean Feature SVD: " <<mean_feature/(double)feature_col << '\n';
+-#endif
+-    }
+-  } //end of block-loop
+-
+-  //the actual number of samples is different from desired number of smaples because only integer samples are drawn from each tree
+-  vnl_matrix<double> F(feature_dim_, feature_col);
+-
+-  M.extract(F);
+-
+-  //4. Normalize feature vector
+-  sample_mean_feature_/=feature_col;
+-#ifdef DEBUG
+-  std::cerr << "Mean Feature SVD: " <<mean_feature << '\n';
+-#endif
+-  std::ofstream mean_ofs(sample_mean_path().c_str());
+-  mean_ofs.precision(15);
+-  mean_ofs << sample_mean_feature_;
+-  mean_ofs.close();
+-
+-  for (unsigned int j=0; j<feature_col; ++j)
+-    F.set_column(j,F.get_column(j) - sample_mean_feature_);
+-
+-  return F;
+-}
+-
+-
+-//: Project training samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::compute_training_error(vnl_vector<double> &proj_error)
+-{
+-  std::ifstream data_ifs(data_path().c_str());
+-  std::cerr << data_path() << '\n';
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond elemend, to error when projecting on frist 2 components and so on
+-  proj_error.set_size(feature_dim_);
+-  proj_error.fill(0.0);
+-
+-  //For all samples
+-  for (unsigned long i = 0; i < nsamples_; ++i)
+-  {
+-    if (data_ifs.eof())
+-      continue;
+-
+-    //retrieve the data from file
+-    vnl_vector<double> norm_feature(feature_dim_, 0.0);
+-    data_ifs >> norm_feature;
+-#ifdef DEBUG
+-    std::cerr << "Feature: " <<norm_feature << '\n';
+-#endif
+-    norm_feature-=sample_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (norm_feature);
+-
+-    //project as a function of number of components
+-    for (unsigned c = 0; c < feature_dim_; ++c)
+-    {
+-      //reconstruct
+-      vnl_vector<double> norm_feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
+-      vnl_vector<double> rec_feature = pc_*a;
+-      //compute error
+-      proj_error[c]+= (norm_feature - norm_feature_approx).squared_magnitude();
+-    }
+-  }
+-}
+-
+-
+-//: Project training samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::compute_normalized_training_error(vnl_vector<double> &proj_error)
+-{
+-  theoretical_training_error(proj_error);
+-  proj_error /= (double)nsamples_;
+-}
+-
+-//: Project training samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::theoretical_training_error(vnl_vector<double> &proj_error)
+-{
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond elemend, to error when projecting on frist 2 components and so on
+-  proj_error.set_size(feature_dim_);
+-  proj_error.fill(0.0);
+-
+-  for (unsigned i=0; i<weights_.size(); ++i)
+-  {
+-    double error = weights_.extract(weights_.size() - (i+1), i+1).sum(); // * 0.5
+-    proj_error[i] = error;
+-  }
+-}
+-
+-
+-//: Project test samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::compute_testing_error(vnl_vector<double> &proj_error)
+-{
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond element, to error when projecting on frist 2 components and so on
+-  proj_error.set_size(feature_dim_);
+-  proj_error.fill(0.0);
+-
+-  //cast scene
+-  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > > *> (data_scene_base_.as_pointer());
+-
+-  compute_mean_feature(scene);
+-
+-  //iterate through leaves and arrage as vectors.
+-  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
+-  cell_it.begin();
+-
+-  while (!(cell_it.end()))
+-  {
+-    //boct_tree_cell<short, float> *center_cell = *cell_it;
+-    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-    //convert neighborhood box to scene coordinates
+-    vgl_point_3d<int> nmin = nbbox_.min_point();
+-    vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-    vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
+-                           finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
+-    roi.set_centroid(center_cell_centroid);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if (!((scene->get_world_bbox()).contains(roi))){
+-      ++cell_it;
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
+-                                                 center_cell_centroid.y() + (double)y*finest_cell_length_,
+-                                                 center_cell_centroid.z() + (double)z*finest_cell_length_);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-          assert(neighbor_cell !=nullptr);
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    assert(curr_dim == feature_dim_);
+-
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-#ifdef DEBUG
+-    std::cout <<"This feature is " << this_feature <<std::endl;
+-#endif
+-
+-    //project as a function of number of components
+-    for (unsigned c = 0; c < feature_dim_; ++c)
+-    {
+-      //reconstruct
+-      vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
+-      vnl_vector<double> rec_feature = pc_*a;
+-#ifdef DEBUG
+-      std::cout <<"Feature approx at c = " << c << " is " <<  feature_approx <<std::endl;
+-#endif
+-      //compute error
+-      proj_error[c]+= (this_feature - feature_approx).squared_magnitude();
+-    }
+-
+-    ++cell_it;
+-  }
+-#if 0
+-  vnl_vector<double> training_error;
+-  this->theoretical_training_error(training_error);
+-  proj_error-=training_error;
+-#endif
+-}
+-
+-
+-//: Reconstructions error on testing samples. By block. Error is given as average error per sample
+-void bvpl_discover_pca_kernels::compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
+-                                                      int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  //cast the scenes
+-  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
+-  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  if (!(data_scene &&error_scene)){
+-    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
+-    return;
+-  }
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))){
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-  data_scene->unload_active_blocks();
+-  error_scene->unload_active_blocks();
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  error_tree->init_cells(-1.0f);
+-
+-  //get the leaves
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> min_point = nbbox_.min_point();
+-  vgl_point_3d<int> max_point = nbbox_.max_point();
+-
+-  for (unsigned i=0; i<data_leaves.size(); ++i)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
+-      continue;
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
+-                                                 centroid.y() + (double)y*finest_cell_length_,
+-                                                 centroid.z() + (double)z*finest_cell_length_);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell){
+-            std::cerr << "Error in compute_testing_error\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    if (curr_dim != feature_dim_){
+-      std::cerr << "Error in compute_testing_error\n";
+-      return;
+-    }
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-    //project as a function of number of components
+-    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
+-
+-    //compute error
+-    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
+-  error_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-  error_scene->unload_active_blocks();
+-}
+-
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-void bvpl_discover_pca_kernels::compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene,
+-                                                                  unsigned ncomponents,
+-                                                                  int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  //cast the scenes
+-  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
+-
+-  if (!(data_scene &&error_scene)){
+-    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
+-    return;
+-  }
+-
+-  if (!(data_scene->load_all_blocks() && error_scene->load_all_blocks())){
+-    std::cerr << "Must load all blocks into memory before using threads\n";
+-    return;
+-  }
+-  //get the cells for this block
+-  if (!error_scene->valid_index(block_i, block_j, block_k)){
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  //error_scene->load_block_thread_safe(block_i, block_j, block_k);
+-
+-  //get the trees
+-  boxm_block<float_tree_type> *data_block = data_scene->get_block(block_i, block_j, block_k);
+-  if (!data_block)
+-    return;
+-
+-  float_tree_type* data_tree = data_block->get_tree();
+-  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  // error_tree->init_cells(-1.0f);
+-
+-  //get the leaves
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  //std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> min_point = nbbox_.min_point();
+-  vgl_point_3d<int> max_point = nbbox_.max_point();
+-
+-  for (auto data_cell : data_leaves)
+-  {
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
+-      continue;
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
+-                                                 centroid.y() + (double)y*finest_cell_length_,
+-                                                 centroid.z() + (double)z*finest_cell_length_);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell){
+-            std::cerr << "Error in compute_testing_error\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    if (curr_dim != feature_dim_){
+-      std::cerr << "Error in compute_testing_error\n";
+-      return;
+-    }
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-    //project as a function of number of components
+-    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
+-
+-    //compute error
+-    //error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
+-  error_scene->write_block_thread_safe(block_i, block_j, block_k);
+-}
+-#endif // BVPL_OCTREE_HAS_PTHREADS
+-
+-
+-//: Compute mean feature of all "leaf-features" in a scene
+-void bvpl_discover_pca_kernels::compute_mean_feature(boxm_scene<boct_tree<short, float> > *scene)
+-{
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond element, to error when projecting on frist 2 components and so on
+-  data_mean_feature_.set_size(feature_dim_);
+-  data_mean_feature_.fill(0.0);
+-  unsigned long nfeatures = 0;
+-
+-  //iterate through leaves and arrage as vectors.
+-  double cell_length = scene->finest_cell_length();
+-
+-  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
+-  cell_it.begin();
+-
+-  while (!(cell_it.end()))
+-  {
+-    //boct_tree_cell<short, float> *center_cell = *cell_it;
+-    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-    //convert neighborhood box to scene coordinates
+-    vgl_point_3d<int> nmin = nbbox_.min_point();
+-    vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
+-                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
+-    roi.set_centroid(center_cell_centroid);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if (!((scene->get_world_bbox()).contains(roi))){
+-      ++cell_it;
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
+-                                                 center_cell_centroid.y() + (double)y*cell_length,
+-                                                 center_cell_centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-          assert(neighbor_cell !=nullptr);
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    assert(curr_dim == feature_dim_);
+-
+-    data_mean_feature_+=this_feature;
+-    ++nfeatures;
+-    ++cell_it;
+-  }
+-  data_mean_feature_ = data_mean_feature_/(double)nfeatures;
+-
+-  std::ofstream mean_ofs(data_mean_path().c_str());
+-  mean_ofs.precision(15);
+-  mean_ofs << data_mean_feature_;
+-  mean_ofs.close();
+-}
+-
+-
+-#if 0 //too_slow
+-      //: Compute deviations i.e. zero-mean feature matrix
+-vnl_matrix<float>& bvpl_discover_pca_kernels::compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene)
+-{
+-  unsigned long max_nsamples = scene->size();
+-
+-  //iterate through leaves, keep random samples in memory and arrage as vectors.
+-  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
+-  cell_it.begin();
+-
+-  vnl_random rng(9667566ul);
+-  unsigned long pos_pre = 0;  //previous position on random samples array
+-
+-  for (unsigned i=1; i<nsamples_; ++i)
+-  {
+-    unsigned long sample = rng.lrand32(max_nsamples);
+-    vgl_box_3d<double> roi = nbbox_;
+-    for (unsigned u = 0; u + pos_pre < sample; ++u)
+-      ++cell_it;
+-    pos_pre = sample;
+-    roi.set_centroid(cell_it.global_centroid());
+-    if (!((scene->get_world_bbox()).contains(roi))){
+-      --i;
+-      continue;
+-    }
+-
+-    positions_.push_back(sample);
+-  }
+-
+-  //sort random numbers for easy access
+-  positions_.sort();
+-  if (nsamples_ != positions_.size())
+-  {
+-    std::cerr << "Error computing PCA features: Wrong number of random samples generated\n";
+-    return false;
+-  }
+-
+-  cell_it.begin();
+-
+-  //init cells array to first random element
+-  std::list<unsigned long>::const_iterator rand_it = positions_.begin();
+-  cell_it+=(*rand_it - pos_pre);
+-  pos_pre = *rand_it;
+-
+-  //init quantities for mean
+-  unsigned feature_dim = nbbox_.width()*nbbox_.height()* nbbox_.depth();
+-  vnl_vector<float> mean(feature_dim);
+-  M.set_size(feature_dim, nsamples_);
+-  unsigned i=0;
+-
+-  double cell_length = scene->finest_cell_length();
+-  while (!(cell_it.end()))
+-  {
+-    boct_tree_cell<short, float> *center_cell = *cell_it;
+-    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-    if (!center_cell){
+-      std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
+-      return false;
+-    }
+-
+-    //assemble neighborhood as a feature-vector
+-    vnl_vector<float> this_feature(feature_dim);
+-
+-    unsigned curr_dims = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_origin(center_cell_centroid.x() + (double)x*cell_length,
+-                                               center_cell_centroid.y() + (double)y*cell_length,
+-                                               center_cell_centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_origin);
+-
+-          if (!neighbor_cell){
+-            std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
+-            return false;
+-          }
+-
+-          this_feature[x + nbbox_.width()*y + nbbox_.width()*nbbox_.height()*z] = neighbor_cell->data();
+-          ++curr_dims;
+-        }
+-
+-    M.set_column(i,this_feature);
+-    mean+=this_feature;
+-
+-    //increment iterators
+-    cell_it+=(*rand_it - pos_pre);
+-    pos_pre = *rand_it;
+-    ++rand_it;
+-    ++i;
+-  }
+-
+-  mean/=nsamples_;
+-
+-  for (unsigned int j=0; j<nsamples_; ++j)
+-    M.set_column(j,M.get_column(j) - mean);
+-
+-  return true;
+-}
+-#endif
+-
+-void bvpl_discover_pca_kernels::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("pca_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  bxml_element* paths = new bxml_element("paths");
+-  paths->append_text("\n");
+-  paths->set_attribute("pc_path", pc_path() );
+-  paths->set_attribute("data_path", data_path() );
+-  paths->set_attribute("weights_path", weights_path() );
+-  paths->set_attribute("positions_path", pos_path()) ;
+-  paths->set_attribute("sample_mean_path", sample_mean_path());
+-  paths->set_attribute("data_mean_path", data_mean_path());
+-  paths->set_attribute("scene_path", scene_path_);
+-  root->append_data(paths);
+-  root->append_text("\n");
+-
+-  bxml_element* neighborhood = new bxml_element("neighborhood");
+-  neighborhood->append_text("\n");
+-  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
+-  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
+-  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
+-  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
+-  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
+-  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
+-  root->append_data(neighborhood);
+-  root->append_text("\n");
+-
+-  bxml_element* nsamples = new bxml_element("samples");
+-  nsamples->append_text("\n");
+-  nsamples->set_attribute("nsamples", nsamples_);
+-  root->append_data(nsamples);
+-  root->append_text("\n");
+-
+-  bxml_element* dim = new bxml_element("dimension");
+-  dim->append_text("\n");
+-  dim->set_attribute("feature_dim", feature_dim_);
+-  root->append_data(dim);
+-  root->append_text("\n");
+-
+-  bxml_element* cell_length = new bxml_element("finest_cell_length");
+-  cell_length->append_text("\n");
+-  cell_length->set_attribute("length", finest_cell_length_);
+-  root->append_data(cell_length);
+-  root->append_text("\n");
+-
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-
+-  //: Write pca main matrices -other matrices aren't class variables and should have been written during computation time
+-
+-  write_pca_matrices();
+-}
+-
+-
+-//: Write a PCA file
+-bool bvpl_discover_pca_kernels::write_pca_matrices()
+-{
+-  std::ofstream pc_ofs(pc_path().c_str());
+-  pc_ofs.precision(15);
+-  std::ofstream weights_ofs(weights_path().c_str());
+-  weights_ofs.precision(15);
+-
+-  pc_ofs << pc_;
+-  pc_ofs.close();
+-  weights_ofs << weights_;
+-  weights_ofs.close();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
+deleted file mode 100644
+index 875504affa..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
++++ /dev/null
+@@ -1,309 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
+-#ifndef bvpl_discover_pca_kernels_h
+-#define bvpl_discover_pca_kernels_h
+-//:
+-// \file
+-// \brief A class to discover those features that represent the data the best in a least square sense using PCA
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  8-Nov-2010.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <list>
+-#include <iostream>
+-#include <utility>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bxml/bxml_document.h>
+-
+-#include <vnl/vnl_matrix.h>
+-#include <vnl/vnl_vector.h>
+-#include <vnl/algo/vnl_svd.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-#include <pthread.h>
+-#endif
+-
+-class bvpl_discover_pca_kernels;
+-
+-typedef vbl_smart_ptr<bvpl_discover_pca_kernels> bvpl_discover_pca_kernels_sptr;
+-
+-class bvpl_discover_pca_kernels: public vbl_ref_count
+-{
+- public:
+-  //: Constructor from neighborhood bounding boxm, number of samples to be drawn, scene and flag to indicate whether to use evd or svd
+-  bvpl_discover_pca_kernels(vgl_box_3d<int> nbbox, unsigned long long nsamples, boxm_scene<boct_tree<short,float> > *scene, std::string  path_out=".", bool use_evd = true):
+-  nbbox_(nbbox), nsamples_(nsamples), path_out_(std::move(path_out))
+-  {
+-    scene_path_ = scene->filename();
+-    std::cout << "Scene path: " << scene->filename()<< std::endl;;
+-    data_scene_base_=scene;
+-
+-    finest_cell_length_ = scene->finest_cell_length();
+-
+-    feature_dim_ = (nbbox_.width()+1)*(nbbox_.height()+1)* (nbbox_.depth()+1);
+-    compute_mean_feature(scene);
+-
+-    sample_mean_feature_.set_size(feature_dim_);
+-
+-    if (use_evd)
+-      set_up_pca_evd(scene);
+-    else
+-      set_up_pca_svd(scene);
+-
+-    scene->unload_active_blocks();
+-  }
+-
+-  //: Construct from xml file
+-  bvpl_discover_pca_kernels(const std::string &path);
+-
+-  //: Constructor from zero-mean matrix
+-  bvpl_discover_pca_kernels(const vnl_matrix<double>& M)
+-  {
+-    vnl_svd<double> A(M, -1e-8);
+-
+-    //columns of U contain principal components.
+-    pc_.set_size(A.rank(), M.rows());
+-    A.U().extract(pc_);
+-  }
+-
+-  //: Access the principal components
+-  const vnl_matrix<double>& principal_comps() { return pc_; }
+-
+-  //: Access the coefficients
+-  const vnl_vector<double>& weights() { return weights_; }
+-
+-  //: Access the mean of samples
+-  const vnl_vector<double>& mean()  { return sample_mean_feature_; }
+-
+-  //: Project training samples onto pca space and return error as a function of number of components used
+-  void compute_training_error(vnl_vector<double> &proj_error);
+-
+-  //: Project training samples onto pca space and return error as a function of number of components used
+-  void compute_normalized_training_error(vnl_vector<double> &proj_error);
+-
+-  //: Reconstrcution error on training samples. Same as above but it is not computed from samples.
+-  void theoretical_training_error(vnl_vector<double> &proj_error);
+-
+-  //: Reconstructions error on testing samples. All training samples are excuded!
+-  void compute_testing_error(vnl_vector<double> &proj_error);
+-
+-  //: Reconstructions error on testing samples. By block. Error is given as average error per sample
+-  void compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
+-                             int block_i, int block_j, int block_k);
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-
+-  void compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene, unsigned ncomponents,
+-                                         int block_i, int block_j, int block_k);
+-
+-//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
+-//  bool compute_testing_error_thread_safe(boxm_scene_base_sptr error_scene_base, unsigned ncomponents);
+-//
+-//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
+-//  friend void *compute_testing_error_thread( void *ptr);
+-
+-#endif
+-
+-  //: Computes pca projection at each voxel on the block and it save the specified number of dimensions (dim)
+-  template <unsigned DIM>
+-  void project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
+-               int block_i, int block_j, int block_k);
+-
+-  //: Compute the mean feature of all "leaf" samples in the data scene associated with this class
+-  void compute_mean_feature(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Return the number of samples used
+-  unsigned long long nsamples() const { return nsamples_; }
+-
+-  //: Return dimension of the features
+-  unsigned feature_dim() const { return feature_dim_; }
+-
+-  //: Return scene path
+-  std::string scene_path() const { return scene_path_; }
+-
+-  //: Return number of blocks in the data scene
+-  vgl_vector_3d<unsigned> data_scene_dim() const { return data_scene_base_->world_dim(); }
+-
+-  bool load_all_scene_blocks()
+-  {
+-    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
+-    return scene->read_all_blocks();
+-  }
+-
+-  void unload_all_scene_blocks()
+-  {
+-    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
+-    scene->unload_active_blocks();
+-  }
+-
+-  //: Compute deviations i.e. zero-mean feature matrix
+-  vnl_matrix<double> compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Compute the scatter matrix.
+-  vnl_matrix<double> compute_scatter_matrix(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  void xml_write();
+-
+- protected:
+-
+-  //: Set Up the PCA matrix for the given scene.
+-  //  This method computes the deviation matrix and performs SVD to find the principal components
+-  //  If the number of samples is very large use set_up_pca_evd
+-  void set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Set Up the PCA matrix for the given scene
+-  //  This method performs eigen value decomposition on the covariance matrix
+-  //  Use this method when number of samples >> number of dimensions
+-  void set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Write a PCA file
+-  bool write_pca_matrices();
+-
+-  //: The size around the central feature to include in PCA vectors
+-  vgl_box_3d<int> nbbox_;
+-  //: Number of total samples(leaves) to be drawn
+-  unsigned long long nsamples_;
+-  //: Number of dimension of feature vector
+-  unsigned feature_dim_;
+-  //: Principal components - eigen vectors of the scatter matrix
+-  vnl_matrix<double> pc_;
+-  //: Weights - eigen values of the scatter matrix
+-  vnl_vector<double> weights_;
+-  //: The mean of sample data
+-  vnl_vector<double> sample_mean_feature_;
+-  //: The mean of all features in the scene data
+-  vnl_vector<double> data_mean_feature_;
+-  //: Pointer to data scene
+-  boxm_scene_base_sptr data_scene_base_;
+-  //: Finest cell length of data scene
+-  double finest_cell_length_;
+-
+-  //: Paths for i/o of matrices and vectors
+-  std::string path_out_;
+-  std::string scene_path_;
+-  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
+-  std::string data_path() const { return path_out_ + "/data.txt"; }
+-  std::string weights_path() const { return path_out_ + "/weights.txt"; }
+-  std::string pos_path() const { return path_out_ + "/positions.txt"; }
+-  std::string sample_mean_path() const { return  path_out_ + "/sample_mean.txt"; }
+-  std::string data_mean_path() const { return  path_out_ + "/data_mean.txt"; }
+-  std::string xml_path() const { return path_out_ + "/pca_info.xml"; }
+-
+-  //: Tolerance, retain eigenvalues above max(eigenVals)*tol
+-  double tol_;
+-};
+-
+-
+-//: Computes pca projection at each voxel on the block and it saves the specified number of coefficientes
+-template <unsigned DIM>
+-void bvpl_discover_pca_kernels::project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
+-                                        int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree<short,bvpl_pca_basis_sample<DIM> > pca_tree_type;
+-  typedef boct_tree_cell<short,bvpl_pca_basis_sample<DIM> > pca_cell_type;
+-
+-  //cast the scenes
+-  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
+-
+-  if (!(data_scene &&proj_scene)) {
+-    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
+-    return;
+-  }
+-
+-  double cell_length = data_scene->finest_cell_length();
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  proj_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  pca_tree_type* proj_tree = data_tree->template clone_to_type<bvpl_pca_basis_sample<DIM> >();
+-
+-  //get the leaves
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<pca_cell_type*> proj_leaves = proj_tree->leaf_cells();
+-
+-  //CAUTION: the neighborhood box was supposed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> min_point = nbbox_.min_point();
+-  vgl_point_3d<int> max_point = nbbox_.max_point();
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
+-      proj_leaves[i]->set_data(bvpl_pca_basis_sample<DIM>());
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
+-                                                 centroid.y() + (double)y*cell_length,
+-                                                 centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell) {
+-            std::cerr << "Error in compute_testing_error\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    if (curr_dim != feature_dim_) {
+-      std::cerr << "Error in compute_testing_error\n";
+-      return;
+-    }
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-    //compute error
+-    bvpl_pca_basis_sample<DIM> sample(a.extract(DIM), 0);
+-    proj_leaves[i]->set_data(sample);
+-  }
+-
+-  // write and release memory
+-  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
+-  proj_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
+deleted file mode 100644
+index 978a9443de..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
++++ /dev/null
+@@ -1,512 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 12-Aug-2011
+-
+-#include "bvpl_gauss3D_steerable_filters.h"
+-#include <vgl/vgl_vector_3d.h>
+-
+-//: Constructor
+-//  Initializes the order separable filter tabs should be applied for eac bases
+-bvpl_gauss3D_steerable_filters::bvpl_gauss3D_steerable_filters()
+-{
+-  axis_.clear();
+-  axis_.emplace_back(1,0,0);
+-  axis_.emplace_back(0,1,0);
+-  axis_.emplace_back(0,0,1);
+-
+-  //Initialize from lists - waiting for VXL to support TR1!
+-  basis_.clear();
+-  basis_names_.clear();
+-
+-  //zerth order - that is gaussian functio
+-  std::string G0a[3] = {"f01", "f02", "f02"};
+-  basis_.emplace_back(&G0a[0], &G0a[3]);
+-  basis_names_.emplace_back("G0a");
+-
+-  //first order derivatives
+-  std::string G1a[3] = {"f11", "f12", "f12"};
+-  std::string G1b[3] = {"f12", "f11", "f12"};
+-  std::string G1c[3] = {"f12", "f12", "f11"};
+-  basis_.emplace_back(&G1a[0], &G1a[3]);
+-  basis_.emplace_back(&G1b[0], &G1b[3]);
+-  basis_.emplace_back(&G1c[0], &G1c[3]);
+-  basis_names_.emplace_back("G1a");
+-  basis_names_.emplace_back("G1b");
+-  basis_names_.emplace_back("G1c");
+-
+-  //second order derivatives
+-  std::string G2a[3] = {"f21", "f22", "f22"};
+-  std::string G2b[3] = {"f23", "f24", "f22"};
+-  std::string G2c[3] = {"f22", "f21", "f22"};
+-  std::string G2d[3] = {"f23", "f22", "f24"};
+-  std::string G2e[3] = {"f22", "f23", "f24"};
+-  std::string G2f[3] = {"f22", "f22", "f21"};
+-  basis_.emplace_back(&G2a[0], &G2a[3]);
+-  basis_.emplace_back(&G2b[0], &G2b[3]);
+-  basis_.emplace_back(&G2c[0], &G2c[3]);
+-  basis_.emplace_back(&G2d[0], &G2d[3]);
+-  basis_.emplace_back(&G2e[0], &G2e[3]);
+-  basis_.emplace_back(&G2f[0], &G2f[3]);
+-  basis_names_.emplace_back("G2a");
+-  basis_names_.emplace_back("G2b");
+-  basis_names_.emplace_back("G2c");
+-  basis_names_.emplace_back("G2d");
+-  basis_names_.emplace_back("G2e");
+-  basis_names_.emplace_back("G2f");
+-}
+-
+-//: Computes  the responses to separable filter taps.
+-//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
+-//  Each basis is made up of 3 1-d filter taps (x, y, z)
+-//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
+-//  the taps have size 5, this could be changed later on
+-bool bvpl_gauss3D_steerable_filters::basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                              boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
+-{
+-  this->assemble_basis_size_5();
+-
+-  bvpl_algebraic_functor  functor;
+-
+-  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
+-  unsigned max_ntaps = 3;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  // Load input and output blocks
+-  scene->clone_blocks_to_type(*valid_scene, true);
+-
+-  //create and init a temporary scene to hold the intermediate 1-d output.
+-  boxm_scene<tree_type> *temp_scene =
+-  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  temp_scene->set_paths(".", "temp_gsf_scene");
+-  temp_scene->set_appearance_model(VNL_FLOAT_10);
+-  temp_scene->write_scene("temp_gsf_scene.xml");
+-  scene->clone_blocks(*temp_scene);
+-
+-  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
+-  {
+-    //Assemple tabs into a map
+-    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
+-
+-    for (unsigned dim=0; dim< DIM_; dim++){
+-      std::string tap_name = basis_[dim][tap_i];
+-      one_d_taps.push_back(separable_taps_[tap_name]);
+-    }
+-
+-    //Traverse applying the appropriate 1-d taps
+-    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
+-    cell_it.begin();
+-
+-    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
+-    temp_cell_it.begin();
+-
+-    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
+-    valid_cell_it.begin();
+-
+-    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
+-    {
+-      cell_type *temp_center_cell = *temp_cell_it;
+-      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
+-
+-      if (!valid_center_cell->data())
+-      {
+-        ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-        continue;
+-      }
+-
+-      bool valid = true;
+-
+-      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-      vnl_vector_fixed<float, DIM_> responses(0.0);
+-
+-      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
+-      {
+-        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
+-
+-        for (int i =-2; i<=2; i++)
+-        {
+-          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
+-
+-          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
+-
+-          if (this_cell) {
+-            bvpl_kernel_dispatch d(this_tap[i+2]);
+-            float val =(float)(this_cell->data()[response_dim]);
+-            functor.apply(val, d);
+-          }
+-          else {
+-            valid = false;
+-            break;
+-          }
+-        }
+-
+-        if (!valid)
+-          break;
+-
+-        responses[response_dim] = (float)(functor.result());
+-      }
+-
+-      temp_center_cell->set_data(responses);
+-      valid_center_cell->set_data(valid);
+-      ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-    }
+-
+-    //copy temp cells into cells
+-    cell_it.begin();
+-    temp_cell_it.begin();
+-
+-    while ( !(cell_it.end() || temp_cell_it.end()) )
+-    {
+-      (*cell_it)->set_data((*temp_cell_it)->data());
+-      ++cell_it; ++temp_cell_it;
+-    }
+- }
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  temp_scene->unload_active_blocks();
+-  delete temp_scene;
+-  return true;
+-}
+-
+-
+-//: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
+-bool bvpl_gauss3D_steerable_filters::multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                               boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level)
+-{
+-  this->assemble_basis_size_5();
+-
+-  bvpl_algebraic_functor  functor;
+-
+-  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
+-  unsigned max_ntaps = 3;
+-
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  // Load input and output blocks
+-  scene->clone_blocks_to_type(*valid_scene, true);
+-
+-  //create and init a temporary scene to hold the intermediate 1-d output.
+-  boxm_scene<tree_type> *temp_scene =
+-  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  temp_scene->set_paths(".", "temp_gsf_scene");
+-  temp_scene->set_appearance_model(VNL_FLOAT_10);
+-  temp_scene->write_scene("temp_gsf_scene.xml");
+-  scene->clone_blocks(*temp_scene);
+-
+-  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
+-  {
+-    //Assemple tabs into a map
+-    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
+-
+-    for (unsigned dim=0; dim< DIM_; dim++){
+-      std::string tap_name = basis_[dim][tap_i];
+-      one_d_taps.push_back(separable_taps_[tap_name]);
+-    }
+-
+-    //Traverse applying the appropriate 1-d taps
+-    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
+-    cell_it.begin(true);
+-
+-    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
+-    temp_cell_it.begin(true);
+-
+-    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
+-    valid_cell_it.begin(true);
+-
+-    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
+-    {
+-      cell_type *temp_center_cell = *temp_cell_it;
+-      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
+-
+-      if (!valid_center_cell->data())
+-      {
+-        ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-        continue;
+-      }
+-
+-      bool valid = true;
+-
+-      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-      double cell_length = cell_it.length();
+-
+-      vnl_vector_fixed<float, DIM_> responses(0.0);
+-
+-      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
+-      {
+-        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
+-
+-        for (int i =-2; i<=2; i++)
+-        {
+-          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
+-
+-          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid, resolution_level);
+-
+-          if (this_cell) {
+-            bvpl_kernel_dispatch d(this_tap[i+2]);
+-            float val =(float)(this_cell->data()[response_dim]);
+-            functor.apply(val, d);
+-          }
+-          else {
+-            valid = false;
+-            break;
+-          }
+-        }
+-
+-        if (!valid)
+-          break;
+-
+-        responses[response_dim] = (float)(functor.result());
+-      }
+-
+-      temp_center_cell->set_data(responses);
+-      valid_center_cell->set_data(valid);
+-      ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-    }
+-
+-    //copy temp cells into cells
+-    cell_it.begin();
+-    temp_cell_it.begin();
+-
+-    while ( !(cell_it.end() || temp_cell_it.end()) )
+-    {
+-      (*cell_it)->set_data((*temp_cell_it)->data());
+-      ++cell_it; ++temp_cell_it;
+-    }
+-  }
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  temp_scene->unload_active_blocks();
+-  delete temp_scene;
+-  return true;
+-}
+-
+-#if 0
+-//: Computes  the responses to separable filter taps.
+-//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
+-//  Each basis is made up of 3 1-d filter taps (x, y, z)
+-//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
+-//  the taps have size 5, this could be changed later on
+-bool bvpl_gauss3D_steerable_filters::basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                    int block_i, int block_j, int block_k,
+-                                                    boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
+-{
+-  this->assemble_basis_size_5();
+-
+-  bvpl_algebraic_functor  functor;
+-
+-  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
+-  unsigned max_ntaps = 3;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  // Load input and output blocks
+-  scene->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree = scene->get_block(block_i, block_j, block_k)->get_tree();
+-  tree_type *temp_tree = tree->clone(); //a temporary tree to store partial results
+-  boct_tree<short, bool> *valid_tree = tree->clone_to_type<bool>();
+-  valid_tree->init_cells(true);
+-
+-  std::vector<cell_type* > cells = tree->leaf_cells();
+-  std::vector<cell_type* > temp_cells = temp_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-
+-  std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;
+-
+-  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
+-  {
+-    //Assemple tabs into a map
+-    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
+-
+-    for (unsigned dim=0; dim< DIM_; dim++){
+-      std::string tap_name = basis_[dim][tap_i];
+-      one_d_taps.push_back(separable_taps_[tap_name]);
+-    }
+-
+-    //Traverse applying the appropriate 1-d taps
+-    std::vector<cell_type* >::iterator cells_it = cells.begin();
+-    std::vector<cell_type* >::iterator temp_it = temp_cells.begin();
+-    std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end())&&(valid_it!=valid_cells.end()); cells_it++, valid_it++, temp_it++)
+-    {
+-      cell_type *center_cell = *cells_it;
+-      cell_type *temp_center_cell = *temp_it;
+-      boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-
+-      if (!valid_center_cell->data())
+-        continue;
+-
+-      bool valid = true;
+-
+-      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-      vnl_vector_fixed<float, DIM_> responses(0.0);
+-
+-      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
+-      {
+-        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
+-
+-        for (int i =-2; i<=2; i++)
+-        {
+-          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
+-
+-          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
+-
+-          if (this_cell) {
+-            bvpl_kernel_dispatch d(this_tap[i+2]);
+-            float val =(float)(this_cell->data()[response_dim]);
+-            functor.apply(val, d);
+-          }
+-          else {
+-            valid = false;
+-            break;
+-          }
+-        }
+-
+-        if (!valid)
+-          break;
+-
+-        responses[response_dim] = (float)(functor.result());
+-      }
+-
+-      temp_center_cell->set_data(responses);
+-      valid_center_cell->set_data(valid);
+-    }
+-
+-    //copy temp cells into cells
+-    cells_it = cells.begin();
+-    temp_it = temp_cells.begin();
+-    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end()); cells_it++, temp_it++)
+-      (*cells_it)->set_data((*temp_it)->data());
+-
+-    std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;;
+-  }
+-
+-  //write the output block
+-  scene->get_block(block_i, block_j, block_k)->init_tree(tree);
+-  scene->write_active_block();
+-  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene->write_active_block();
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  delete temp_tree;
+-  return true;
+-}
+-#endif
+-
+-
+-bool bvpl_gauss3D_steerable_filters::rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                                      boxm_scene<boct_tree<short, bool> > *valid_scene)
+-{
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  //Traverse all cells
+-  boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block);
+-  cell_it.begin();
+-  boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block, true);
+-  valid_cell_it.begin();
+-
+-  while ( !(cell_it.end() || valid_cell_it.end()) )
+-  {
+-    cell_type *center_cell = *cell_it;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
+-
+-    if (!valid_center_cell->data()){
+-      ++cell_it; ++valid_cell_it;
+-      continue;
+-    }
+-
+-    vnl_vector_fixed<float, DIM_> responses=center_cell->data();
+-
+-    vgl_vector_3d<float> grad(responses[1], responses[2],responses[3]);
+-    normalize(grad); //after normalizing the gradient the direction cosines are the cartesian coordinates of grad
+-
+-    //rotate the responses according to the gradient
+-    vnl_vector_fixed<float, DIM_> rotation_weigths(1.0f);
+-    rotation_weigths[0] = 1;
+-    rotation_weigths[1] = grad.x(); rotation_weigths[2] = grad.y();     rotation_weigths[3] = grad.z();
+-    rotation_weigths[4] = grad.x()* grad.x(); rotation_weigths[5] = 2.0f* grad.x()*grad.y();
+-    rotation_weigths[6] = grad.y()* grad.y(); rotation_weigths[7] = 2.0f* grad.x()*grad.z();
+-    rotation_weigths[8] = 2.0f * grad.y()* grad.z(); rotation_weigths[9] = grad.z()*grad.z();
+-
+-    responses = element_product(responses, rotation_weigths);
+-
+-    center_cell->set_data(responses);
+-    ++cell_it; ++valid_cell_it;
+-  }
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  return true;
+-}
+-
+-
+-void bvpl_gauss3D_steerable_filters::assemble_basis_size_5()
+-{
+-  separable_taps_.clear();
+-
+-  //Zeroth Derivative G0
+-  //Separable basis taps: f01, f02
+-  float f01_data[5] = {0.000402093f, 0.162216f, 1.19862f, 0.162216f, 0.000402093f};
+-  vnl_vector_fixed<float, 5> f01(f01_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f01", f01));
+-
+-  float f02_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
+-  vnl_vector_fixed<float,5> f02(f02_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f02", f02));
+-
+-  //First Derivative Basis: G1 = alpha*G1a + beta*G1b
+-  //Separable basis functions: f11, f12
+-  float f11_data[5] = {0.00227458f, 0.458816f, 0.0f, -0.458816f, -0.00227458f};
+-  vnl_vector_fixed<float,5> f11(f11_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f11", f11));
+-  float f12_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
+-  vnl_vector_fixed<float,5> f12(f12_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f12", f12));
+-
+-  //Second derivative basis G2 = alpha^2*G2a + 2*alpha*beta*G2b + beta^2*G2c + 2*alpha*gamma*G2d + 2*beta*gamma*G2e + gamma^2*G2f
+-  //Separable basis taps = f21, f22, f23, f24
+-  float f21_data[5] = {0.00696448f, 0.561934f, -1.38405f, 0.561934f, 0.00696448f};
+-  vnl_vector_fixed<float,5> f21(f21_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f21", f21));
+-
+-  float f22_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
+-  vnl_vector_fixed<float,5> f22(f22_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f22", f22));
+-
+-  float f23_data[5] = {-0.00643349f, -1.29773f, 0.0f, 1.29773f, 0.00643349f};
+-  vnl_vector_fixed<float,5> f23(f23_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f23", f23));
+-
+-  float f24_data[5] = {-0.000670925f, -0.135335f, 0.0f, 0.135335f, 0.000670925f};
+-  vnl_vector_fixed<float,5> f24(f24_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f24", f24));
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
+deleted file mode 100644
+index bda8905d49..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
++++ /dev/null
+@@ -1,61 +0,0 @@
+-// This is bvpl_gauss3D_steerable_filters.h
+-#ifndef bvpl_gauss3D_steerable_filters_h
+-#define bvpl_gauss3D_steerable_filters_h
+-
+-//:
+-// \file
+-// \brief 3-d Streerable filters implemented theough separable basis
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  12-Aug-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vnl/vnl_vector_fixed.h>
+-#include <boxm/boxm_scene.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-
+-
+-class bvpl_gauss3D_steerable_filters{
+-
+-public:
+-  bvpl_gauss3D_steerable_filters();
+-
+-  //: The dimension of the filter response e.i. number of steerable filters
+-  enum { DIM_ = 10 };
+-
+-  //: Compute basis response at all leaf cells
+-  bool basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length);
+-
+-  //: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
+-  bool multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                 boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level);
+-
+-  //: Assemble basis for: -2 -1 0 1 2
+-  void assemble_basis_size_5();
+-
+-  std::vector<std::vector<std::string> > basis() {return basis_;}
+-  std::vector<std::string> basis_names() {return basis_names_;}
+-  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps(){return separable_taps_;}
+-
+-  bool rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                        boxm_scene<boct_tree<short, bool> > *valid_scene);
+-
+-protected:
+-
+-  //: lists of 1-d filter tap names needed for each basis
+-  std::vector<std::vector<std::string> > basis_;
+-
+-  //: list of basis identifying strings
+-  std::vector<std::string> basis_names_;
+-
+-  //: map containing the 1-d filter taps (actual values) and their identifying string
+-  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps_;
+-
+-  std::vector<vgl_vector_3d<int> > axis_;
+-};
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
+deleted file mode 100644
+index 391c7f157e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
++++ /dev/null
+@@ -1,475 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include <iostream>
+-#include <fstream>
+-#include "bvpl_global_corners.h"
+-
+-#include <bsta/bsta_histogram.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-#include <bvpl_octree/bvpl_corner_detector.h>
+-#include <bvpl_octree/bvpl_corner_functors.h>
+-
+-#include <vul/vul_file.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: Constructor  from xml file
+-bvpl_global_corners::bvpl_global_corners(const std::string &path)
+-{
+-  std::cout << "Loading corners info from xml-file" << std::endl;
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-  if (!xml_ifs.is_open()){
+-    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
+-    throw;
+-  }
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("global_corners_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
+-    throw;
+-  }
+-
+-  //Parse scenes
+-  bxml_element scenes_query("scene");
+-  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
+-
+-  unsigned nscenes=scenes_data.size();
+-  std::cout << "Number of scenes: " << nscenes << std::endl;
+-
+-  aux_dirs_.clear();
+-  aux_dirs_.resize(nscenes);
+-
+-  finest_cell_length_.clear();
+-  finest_cell_length_.resize(nscenes);
+-
+-  for (unsigned si = 0; si < nscenes; si++)
+-  {
+-    auto* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
+-    int id = -1;
+-    scenes_elm->get_attribute("id", id);
+-    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
+-    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
+-
+-    if (!(vul_file::exists(aux_dirs_[id]) && vul_file::is_directory(aux_dirs_[id]))){
+-      vul_file::make_directory(aux_dirs_[id]);
+-    }
+-  }
+-
+-  //Parse kernels
+-  bxml_element params_query("parameters");
+-  bxml_data_sptr params_data = bxml_find_by_name(root, params_query);
+-  if (params_data)
+-  {
+-    auto* params_elm = dynamic_cast<bxml_element*>(params_data.ptr());
+-
+-    params_elm->get_attribute("harris_k", harris_k_);
+-    std::cout << "Harris_k is " << harris_k_ << '\n';
+-  }
+-  else {
+-    std::cerr << " In Gobal Corners: no parameters element\n";
+-  }
+-}
+-
+-
+-//: Compute Harris' measure extension to 3-d as proposed by:
+-//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
+-void bvpl_global_corners::compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-
+-  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, float> >* corner_scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  corner_scene->set_appearance_model(BOXM_FLOAT);
+-  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
+-  corner_scene->write_scene("harris_scene.xml");
+-
+-  if (!( proj_scene && valid_scene && corner_scene ))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_corner_detector corner_detector;
+-  bvpl_harris_laptev_functor harris_functor(harris_k_);
+-
+-  vgl_point_3d<int> max_neighborhood_idx = global_taylor->kernel_vector_->max();
+-  vgl_point_3d<int> min_neighborhood_idx = global_taylor->kernel_vector_->min();
+-
+-  std::cout << "Neighborhood for Harris threshold: " << min_neighborhood_idx << " , " << max_neighborhood_idx << std::endl;
+-
+-  corner_detector.compute_C(proj_scene, harris_functor, min_neighborhood_idx, max_neighborhood_idx, block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
+-
+-  //clean memory
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-
+-//: Compute corner measure extension to 3-d as proposed by:
+-// P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
+-void bvpl_global_corners::compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-
+-  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, float> >* corner_scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  corner_scene->set_appearance_model(BOXM_FLOAT);
+-  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
+-  corner_scene->write_scene("harris_scene.xml");
+-
+-  if (!( proj_scene && valid_scene && corner_scene ))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_corner_detector corner_detector;
+-
+-  corner_detector.compute_det_H(proj_scene, block_i, block_j, block_k, valid_scene, corner_scene);
+-
+-  //clean memory
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-
+-//: Threshold a percentage of corners, based of the Harris' measure extension to 3-d proposed by:
+-//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
+-void bvpl_global_corners::threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float harris_thresh, const std::string& output_path)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
+-
+-  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-
+-  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
+-
+-  if (!(vul_file::exists(output_path) && vul_file::is_directory(output_path)))
+-    vul_file::make_directory(output_path);
+-
+-  boxm_scene<boct_tree<short, bool> >* valid_corner_scene =
+-  new boxm_scene<boct_tree<short, bool> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  valid_corner_scene->set_appearance_model(BOXM_BOOL);
+-
+-  std::stringstream valid_ss;
+-  valid_ss << "valid_scene_" << scene_id ;
+-
+-  valid_corner_scene->set_paths(output_path, valid_ss.str());
+-  valid_corner_scene->write_scene(valid_ss.str() + ".xml");
+-  valid_scene->clone_blocks(*valid_corner_scene);
+-
+-  std::stringstream proj_ss;
+-  proj_ss << "proj_taylor_scene_" << scene_id ;
+-
+-  boxm_scene<taylor_tree_type >* copy_proj_scene =
+-  new boxm_scene<taylor_tree_type >(proj_scene->lvcs(), proj_scene->origin(), proj_scene->block_dim(), proj_scene->world_dim(), proj_scene->max_level(), proj_scene->init_level());
+-  copy_proj_scene->set_appearance_model(VNL_DOUBLE_10);
+-  copy_proj_scene->set_paths(proj_scene->path(), proj_scene->block_prefix());
+-  copy_proj_scene->write_scene(output_path, proj_ss.str() + ".xml");
+-
+-  delete copy_proj_scene;
+-
+-  if (!( valid_scene && corner_scene && valid_corner_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
+-  valid_it.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
+-  corners_it.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, bool > > valid_corners_it = valid_corner_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block);
+-  valid_corners_it.begin();
+-
+-  while ( !(valid_it.end() || corners_it.end() || valid_corners_it.end()) )
+-  {
+-    boct_tree_cell<short,bool> *valid_cell = *valid_it;
+-    boct_tree_cell<short,float> *corner_cell = *corners_it;
+-    boct_tree_cell<short,bool> *valid_corner_cell = *valid_corners_it;
+-
+-    boct_loc_code<short> valid_code = valid_cell->get_code();
+-    boct_loc_code<short> corner_code = corner_cell->get_code();
+-    boct_loc_code<short> valid_corner_code = valid_corner_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((valid_cell->level() != corner_cell->level()) || (valid_cell->level() != valid_corner_cell->level()) || !(valid_code.isequal(&corner_code)) || !(valid_code.isequal(&valid_corner_code))){
+-      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
+-      return;
+-    }
+-
+-    /*****CAUTION: Only looking at cells at level 0*/
+-    if (valid_cell->level()!=0) {
+-      ++valid_it;
+-      ++corners_it;
+-      valid_corner_cell->set_data(false);
+-      ++valid_corners_it;
+-      continue;
+-    }
+-
+-    if (corner_cell->data() < harris_thresh)
+-      valid_corner_cell->set_data(false);
+-    else
+-      valid_corner_cell->set_data(true);
+-
+-    ++valid_it;
+-    ++corners_it;
+-    ++valid_corners_it;
+-  }
+-
+-  //clean memory
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-  valid_corner_scene->unload_active_blocks();
+-
+-  delete valid_corner_scene;
+-}
+-
+-//: Take a histogram of corners and get different values for percentage of thresholds
+-void bvpl_global_corners::explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
+-
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-
+-  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
+-
+-  if (!( valid_scene && corner_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::explore_corner_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-
+-  //compute scene statistics at valid cells only
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
+-  valid_it.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
+-  corners_it.begin();
+-
+-  float cell_count = 0;
+-  auto max = (float)(*corners_it)->data();
+-  float min = max;
+-  float this_val = max;
+-  while ( !(valid_it.end() || corners_it.end()) )
+-  {
+-    boct_tree_cell<short,bool> *valid_cell = *valid_it;
+-    boct_tree_cell<short,float> *corner_cell = *corners_it;
+-
+-    boct_loc_code<short> valid_code = valid_cell->get_code();
+-    boct_loc_code<short> corner_code = corner_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
+-      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
+-      return;
+-    }
+-
+-    /*****CAUTION: Only looking at cells at level 0*/
+-    if (valid_cell->level()!=0) {
+-      ++valid_it;
+-      ++corners_it;
+-      continue;
+-    }
+-
+-    cell_count++;
+-    this_val = (float)(*corners_it)->data();
+-    if ( this_val > max)  max = this_val;
+-    if ( this_val < min)  min = this_val;
+-
+-    ++valid_it;
+-    ++corners_it;
+-  }
+-
+-  auto nbins = (unsigned int)std::floor(std::sqrt(cell_count));
+-  bsta_histogram<float>  corner_hist(min, max, nbins);
+-  valid_it.begin();
+-  corners_it.begin();
+-  while ( !(valid_it.end() || corners_it.end()) )
+-  {
+-    boct_tree_cell<short,bool> *valid_cell = *valid_it;
+-    boct_tree_cell<short,float> *corner_cell = *corners_it;
+-
+-    boct_loc_code<short> valid_code = valid_cell->get_code();
+-    boct_loc_code<short> corner_code = corner_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
+-      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
+-      return;
+-    }
+-
+-    /*****CAUTION: Only looking at cells at level 0*/
+-    if (valid_cell->level()!=0) {
+-      ++valid_it;
+-      ++corners_it;
+-      continue;
+-    }
+-
+-    corner_hist.upcount((float)(*corners_it)->data(), 1.0f);
+-
+-    ++valid_it;
+-    ++corners_it;
+-  }
+-
+-  std::string file = aux_dirs_[scene_id] + "/corner_threshold_values.txt";
+-  float threshold[] = {0.01f, 0.02f, 0.05f, 0.1f, 0.2f, 0.5f, 0.8f};
+-  std::ofstream ofs(file.c_str());
+-  ofs.precision(7);
+-  for (float i : threshold) {
+-    ofs << i << ' ' << corner_hist.value_with_area_above(i) << '\n';
+-  }
+-
+-  //clean memory
+-  ofs.close();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-//: Load scene info
+-boxm_scene_base_sptr bvpl_global_corners::load_corner_scene(int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr scene_base = new boxm_scene_base();
+-  boxm_scene_parser scene_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/harris_scene.xml";
+-  scene_base->load_scene(aux_scene_ss.str(), scene_parser);
+-
+-  //cast scene
+-  auto *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (scene_base->appearence_model() == BOXM_FLOAT){
+-    scene->load_scene(scene_parser);
+-    scene_base = scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
+-boxm_scene_base_sptr bvpl_global_corners::load_valid_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  auto *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL){
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_corners::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-//: Write this class to xml file
+-void bvpl_global_corners::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("global_corners_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  //write the scene elements
+-  for (unsigned i =0; i<aux_dirs_.size(); i++)
+-  {
+-    bxml_element* scenes_elm = new bxml_element("scene");
+-    scenes_elm->append_text("\n");
+-    scenes_elm->set_attribute("id", i);
+-    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
+-    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
+-    root->append_data(scenes_elm);
+-    root->append_text("\n");
+-  }
+-
+-  //write parameters for corner detection
+-  bxml_element* param_elm = new bxml_element("parameters");
+-  param_elm->append_text("\n");
+-  param_elm->set_attribute("harris_k", harris_k_);
+-  root->append_data(param_elm);
+-  root->append_text("\n");
+-
+-  //write to disk
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
+deleted file mode 100644
+index 0e7924fe1b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
++++ /dev/null
+@@ -1,71 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
+-#ifndef bvpl_global_corners_h
+-#define bvpl_global_corners_h
+-//:
+-// \file
+-// \brief A class to compute corner features across different boxm_scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  21-Jul-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-#include <bvpl_octree/bvpl_global_taylor.h>
+-
+-class bvpl_global_corners : public vbl_ref_count
+-{
+-
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  public:
+-
+-  //: Constructor  from xml file
+-  bvpl_global_corners(const std::string &path);
+-
+-  //: Compute Harris' measure extension to 3-d as proposed by:
+-  //  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
+-  void compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor, int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Compute corner measure extension to 3-d as proposed by:
+-  // P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
+-  void compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Threshold corners below a threshold
+-  void threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float thresh, const std::string& output_path);
+-
+-  //: Take a histogram of corners and get different values for percentage of thresholds
+-  void explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id);
+-
+-  //: Write to global_corners_info.xml
+-  void xml_write();
+-
+-  // Accessors
+-  std::string path_out() {return path_out_;}
+-  std::vector<std::string> aux_dirs() { return aux_dirs_; }
+-  std::string aux_dirs( unsigned i ) { return aux_dirs_[i]; }
+-  std::vector<double> cell_lengths() { return finest_cell_length_; }
+-
+-  boxm_scene_base_sptr load_corner_scene (int scene_id);
+-  boxm_scene_base_sptr load_valid_scene (int scene_id);
+-
+-  std::string xml_path() { return path_out_ + "/global_corners_info.xml"; }
+-
+- protected:
+-
+-  //: A vector to hold paths to keep taylor coefficient scenes and valid scenes
+-  std::vector<std::string> aux_dirs_;
+-  //: A vector to hold the finest cell length of the corresponding scene scene
+-  std::vector<double> finest_cell_length_;
+-  //: Path to xml info file
+-  std::string path_out_;
+-  //: The value of the parameter k for harris corners
+-  float harris_k_;
+-};
+-
+-typedef vbl_smart_ptr<bvpl_global_corners > bvpl_global_corners_sptr;
+-
+-
+-#endif // bvpl_global_corners_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
+deleted file mode 100644
+index 7b33da89da..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include "bvpl_global_pca.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Mar-2011
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
+deleted file mode 100644
+index 39ff106c20..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
++++ /dev/null
+@@ -1,153 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
+-#ifndef bvpl_global_pca_h
+-#define bvpl_global_pca_h
+-//:
+-// \file
+-// \brief A class to compute and learn pca features across different boxm_scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  14-Mar-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <utility>
+-#include <vnl/vnl_matrix_fixed.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-
+-template <unsigned feature_dim>
+-class bvpl_global_pca: public vbl_ref_count
+-{
+- public:
+-  //: Constructor
+-  bvpl_global_pca(std::vector<std::string> scenes, std::vector<std::string> aux_dirs, std::vector<double> finest_cell_length,
+-                  vgl_box_3d<int> nbbox,  double training_fraction = 0.1, std::string path_out = "./"):
+-  scenes_(std::move(scenes)), aux_dirs_(std::move(aux_dirs)), finest_cell_length_(std::move(finest_cell_length)), nbbox_(nbbox), training_fraction_(training_fraction),path_out_(std::move(path_out))
+-  {
+-    training_scenes_ = std::vector<bool>(scenes_.size(), true);
+-    nleaves_ =  std::vector<unsigned long>(scenes_.size(), 0);
+-    nsamples_ = 0;
+-    training_mean_.fill(0.0);
+-    pc_.fill(0.0);
+-    weights_.fill(0.0);
+-    scatter_.fill(0.0);
+-    this->xml_write();
+-  }
+-
+-  //:Create from xml file
+-  bvpl_global_pca(const std::string &path);
+-
+-  //: Init auxiliary scenes and smallest cell length values
+-  void init(unsigned scene_id);
+-
+-  //: Computes the scatter matrix and mean vector of a portion of random samples from a block
+-  bool sample_statistics( int scene_id, int block_i, int block_j, int block_k,
+-                          vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                          vnl_vector_fixed<double, feature_dim> &mean,
+-                          unsigned long &nfeature);
+-
+-  //: Update mean and scatter, given the mean and scatter of two sets.
+-  //  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
+-   static void combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim>  &mean1,
+-                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter1,
+-                                            double const n1,
+-                                            const vnl_vector_fixed<double,feature_dim>  &mean2,
+-                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter2,
+-                                            double const n2,
+-                                            vnl_vector_fixed<double,feature_dim> & mean_out,
+-                                            vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
+-                                            double &n_out );
+-
+-  //: Set total scatter matrix, mean, sample, principal components and weights for this class
+-  void set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                      const vnl_vector_fixed<double, feature_dim> &mean,
+-                      const double total_nsamples);
+-
+-  //: Access the principal components
+-  const vnl_matrix_fixed<double, feature_dim, feature_dim>& principal_comps() { return pc_; }
+-
+-  //: Access the coefficients
+-  const vnl_vector_fixed<double, feature_dim>& weights() { return weights_; }
+-
+-  //: Access the mean of samples
+-  const vnl_vector_fixed<double, feature_dim>& mean()  { return training_mean_; }
+-
+-  bool register_scene(std::string scene_path, std::string aux_path)
+-  {
+-    if (scenes_.size()!=aux_dirs_.size())
+-      return false;
+-    scenes_.push_back(scene_path);
+-    aux_dirs_.push_back(aux_path);
+-    return true;
+-  }
+-
+-  void xml_write();
+-
+-  //: Computes 10-dimensional pca projection at each voxel on the block and saves it
+-  void project(int scene_id, int block_i, int block_j, int block_k);
+-
+-  void projection_error(int scene_id, int block_i, int block_j, int block_k);
+-
+-
+-  std::string path_out() const { return path_out_; }
+-
+-  inline std::vector<std::string> scenes() const { return scenes_; }
+-  inline std::vector<std::string> aux_dirs() const { return aux_dirs_; }
+-  inline std::vector<double> cell_lengths() const { return finest_cell_length_; }
+-  inline std::vector<bool> training_scenes() const { return training_scenes_; }
+-  inline vgl_box_3d<int> nbbox() const { return nbbox_; }
+-  inline unsigned nscenes() const { return scenes_.size(); }
+- protected:
+-
+-  //: A vector to hold scene paths
+-  std::vector<std::string> scenes_;
+-  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
+-  std::vector<std::string> aux_dirs_;
+-  //: A vector to hold the finest cell length of the corresponding scene scene
+-  std::vector<double> finest_cell_length_;
+-  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
+-  std::vector<bool> training_scenes_;
+-  //: A vector to keep the size of each scene
+-  std::vector<unsigned long> nleaves_;
+-
+-  //: The size around the central feature to include in PCA vectors
+-  vgl_box_3d<int> nbbox_;
+-  //: Number of total samples(leaves) to be drawn
+-  unsigned long long nsamples_;
+-
+-  //: Principal components - eigen vectors of the scatter matrix
+-  vnl_matrix_fixed<double, feature_dim, feature_dim> pc_;
+-  //: Weights - eigen values of the scatter matrix
+-  vnl_vector_fixed<double, feature_dim> weights_;
+-  //: The mean of sample data
+-  vnl_vector_fixed<double, feature_dim> training_mean_;
+-  //: Scatter matrix used to compute pca
+-  vnl_matrix_fixed<double, feature_dim, feature_dim> scatter_;
+-  //: Fraction of cells used for learning
+-  double training_fraction_;
+-
+-  //: Paths for i/o of matrices and vectors
+-  std::string path_out_;
+-  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
+-  std::string weights_path() const { return path_out_ + "/weights.txt"; }
+-  std::string mean_path() const { return  path_out_ + "/mean.txt"; }
+-  std::string scatter_path() const { return  path_out_ + "/scatter.txt"; }
+-  std::string xml_path() const { return path_out_ + "/pca_global_info.xml"; }
+-
+-  void write_pca_matrices();
+-
+- public:
+-  boxm_scene_base_sptr load_scene (int scene_id);
+-  boxm_scene_base_sptr load_train_scene (int scene_id);
+-  boxm_scene_base_sptr load_valid_scene (int scene_id);
+-  boxm_scene_base_sptr load_projection_scene (int scene_id);
+-  boxm_scene_base_sptr load_error_scene (int scene_id);
+-};
+-
+-typedef vbl_smart_ptr<bvpl_global_pca<125> > bvpl_global_pca_125_sptr;
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
+deleted file mode 100644
+index 6877b12a34..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
++++ /dev/null
+@@ -1,1018 +0,0 @@
+-#ifndef bvpl_global_pca_hxx_
+-#define bvpl_global_pca_hxx_
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 14-Mar-2011
+-
+-#include "bvpl_global_pca.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-
+-
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <vnl/vnl_random.h>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_matrix_fixed.h>
+-#include <vnl/algo/vnl_symmetric_eigensystem.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//#define DEBUG_PROJ
+-
+-//: Create from xml_file
+-template <unsigned feature_dim>
+-bvpl_global_pca<feature_dim>::bvpl_global_pca(const std::string &path)
+-{
+-  std::cout << "Loading pca info from xml-file" << std::endl;
+-  int valid = 0;
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-  if (!xml_ifs.is_open()) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not open xml info file: " << xml_path() << '\n';
+-    throw;
+-  }
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("pca_global_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
+-    throw;
+-  }
+-
+-  //Parse neighborhood bounding box - units are number of voxels
+-  bxml_element nbbox_query("neighborhood");
+-  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
+-  bxml_element* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
+-  int min_x, min_y, min_z, max_x, max_y, max_z =0;
+-  nbbox_elm->get_attribute("min_x", min_x);
+-  nbbox_elm->get_attribute("min_y", min_y);
+-  nbbox_elm->get_attribute("min_z", min_z);
+-  nbbox_elm->get_attribute("max_x", max_x);
+-  nbbox_elm->get_attribute("max_y", max_y);
+-  nbbox_elm->get_attribute("max_z", max_z);
+-
+-  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
+-  std::cout << "Neighborhood: " << nbbox_ << std::endl;
+-
+-  //Parse Number of samples
+-  bxml_element properties_query("properties");
+-  bxml_data_sptr properties_data = bxml_find_by_name(root, properties_query);
+-  bxml_element* properties_elm = dynamic_cast<bxml_element*>(properties_data.ptr());
+-  properties_elm->get_attribute("nsamples", nsamples_);
+-  unsigned temp_dim;
+-  properties_elm->get_attribute("feature_dim", temp_dim);
+-  if (temp_dim!=feature_dim) {
+-    valid = -10;
+-  }
+-  properties_elm->get_attribute("training_fraction", training_fraction_);
+-
+-  unsigned nscenes = 0;
+-  properties_elm->get_attribute("nscenes", nscenes);
+-
+-  std::cout << "Number of samples: " << nsamples_ << '\n'
+-           << "Feature dimension: " << temp_dim << '\n'
+-           << "Number of scenes: " << nscenes <<std::endl;
+-
+-  //Parse scenes
+-  bxml_element scenes_query("scene");
+-  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
+-
+-  if (nscenes !=scenes_data.size()) {
+-    std::cerr<<"Wrong number of scenes\n";
+-    throw;
+-  }
+-
+-  scenes_.clear();
+-  scenes_.resize(nscenes);
+-
+-  aux_dirs_.clear();
+-  aux_dirs_.resize(nscenes);
+-
+-  finest_cell_length_.clear();
+-  finest_cell_length_.resize(nscenes);
+-
+-  nleaves_.clear();
+-  nleaves_.resize(nscenes);
+-
+-  for (unsigned si = 0; si < nscenes; si++)
+-  {
+-    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
+-    int id = -1;
+-    scenes_elm->get_attribute("id", id);
+-    scenes_elm->get_attribute("path", scenes_[id]);
+-    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
+-    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
+-    scenes_elm->get_attribute("nleaves", nleaves_[id]);
+-
+-    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
+-  }
+-
+-  //Parse training scenes
+-  bxml_element train_query("training_scenes");
+-  bxml_element* train_elm = dynamic_cast<bxml_element*>(bxml_find_by_name(root, train_query).ptr());
+-  unsigned n_train_scenes = 0;
+-  train_elm->get_attribute("nscenes", n_train_scenes);
+-  training_scenes_.clear();
+-  training_scenes_.resize(nscenes, false);
+-
+-  //read out the scenes
+-  for (bxml_element::const_data_iterator s_it = train_elm->data_begin(); s_it != train_elm->data_end(); s_it++) {
+-    if ((*s_it)->type() == bxml_data::TEXT) {
+-      bxml_text* t = dynamic_cast<bxml_text*>((*s_it).ptr());
+-      std::stringstream text_d(t->data()); std::string buf;
+-      std::vector<std::string> tokens;
+-      while (text_d >> buf) {
+-        tokens.push_back(buf);
+-      }
+-      if (tokens.size() != n_train_scenes)
+-        continue;
+-      for (unsigned i = 0; i < n_train_scenes; i++) {
+-        std::stringstream ss2(tokens[i]); int s_type_id;
+-        ss2 >> s_type_id;
+-        std::cout << "Scene: " << s_type_id << " is used for training\n";
+-        training_scenes_[s_type_id]=true;
+-      }
+-      break;
+-    }
+-  }
+-
+-  //Parse paths and set matrices
+-  bxml_element paths_query("paths");
+-  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
+-  if (paths_data)
+-  {
+-    bxml_element* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
+-
+-    std::string ifs_path;
+-
+-    path_elm->get_attribute("pc_path", ifs_path);
+-    if (ifs_path != pc_path())
+-      valid = -1;
+-    else{
+-      std::ifstream ifs(ifs_path.c_str());
+-      ifs >> pc_;
+-      ifs.close();
+-      if (pc_.size()!=feature_dim*feature_dim)
+-        valid = -2;
+-    }
+-
+-    path_elm->get_attribute("weights_path", ifs_path);
+-    if (ifs_path != weights_path())
+-      valid = -3;
+-    else{
+-      std::ifstream ifs(ifs_path.c_str());
+-      ifs >> weights_;
+-      ifs.close();
+-      if (weights_.size()!=feature_dim)
+-        valid = -4;
+-    }
+-
+-    path_elm->get_attribute("mean_path", ifs_path);
+-    if (ifs_path != mean_path())
+-      valid = -5;
+-    else
+-    {
+-      if ( vul_file::exists(ifs_path))
+-      {
+-        std::ifstream ifs(ifs_path.c_str());
+-        ifs >> training_mean_;
+-        ifs.close();
+-      }
+-      else{
+-        std::cerr << " Warning: Mean file is empty\n";
+-        training_mean_.fill(0.0);
+-      }
+-
+-      path_elm->get_attribute("scatter_path", ifs_path);
+-      if (ifs_path != scatter_path())
+-        valid = -6;
+-      else if (vul_file::exists(ifs_path)) {
+-        std::ifstream(ifs_path);
+-        ifs_path >> scatter_;
+-        ifs_path.close();
+-      }
+-      else{
+-        std::cerr << " Warning: Scatter file is empty\n";
+-        scatter_.fill(0.0);
+-      }
+-
+-      if (valid<0) {
+-        std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
+-        xml_write();
+-      }
+-    }
+-  }
+-
+-  xml_ifs.close();
+-}
+-
+-//: Init auxiliary scenes and smallest cell length values
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::init(unsigned scene_id)
+-{
+-  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  if (!data_scene) {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
+-    return;
+-  }
+-  double finest_cell_length = data_scene->finest_cell_length();
+-  finest_cell_length_[scene_id] = finest_cell_length;
+-  nleaves_[scene_id] = data_scene->size();
+-
+-  if (!(vul_file::exists(aux_dirs_[scene_id]) && vul_file::is_directory(aux_dirs_[scene_id]))) {
+-    vul_file::make_directory(aux_dirs_[scene_id]);
+-  }
+-
+-  {
+-    std::stringstream aux_scene_ss;
+-    aux_scene_ss << "train_scene_" << scene_id ;
+-    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-    if (!vul_file::exists(aux_scene_path)) {
+-      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-      boxm_scene<boct_tree<short, bool> > *aux_scene =
+-      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-      aux_scene->set_appearance_model(BOXM_BOOL);
+-      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-    }
+-  }
+-  {
+-    std::stringstream aux_scene_ss;
+-    aux_scene_ss << "valid_scene_" << scene_id ;
+-    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-    if (!vul_file::exists(aux_scene_path)) {
+-      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-      boxm_scene<boct_tree<short, bool> > *aux_scene =
+-      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-      aux_scene->set_appearance_model(BOXM_BOOL);
+-      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-    }
+-  }
+-
+-  {
+-    std::stringstream proj_scene_ss;
+-    proj_scene_ss << "proj_pca_scene_" << scene_id ;
+-    std::string proj_scene_path = aux_dirs_[scene_id] + "/" + proj_scene_ss.str() + ".xml";
+-    if (!vul_file::exists(proj_scene_path)) {
+-      std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
+-      typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-      boxm_scene<pca_tree_type > *proj_scene =
+-      new boxm_scene<pca_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-      proj_scene->set_appearance_model(VNL_DOUBLE_10);
+-      proj_scene->set_paths(aux_dirs_[scene_id], proj_scene_ss.str());
+-      proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
+-    }
+-  }
+-
+-  xml_write();
+-}
+-
+-//: Compute the scatter matrix of the specified block. A random number of cells are drawn for the calculation
+-//  The mask block indicates, whether a cell was used for learning the scatter matrix and mean
+-//  Ramndom samples according to octree structure.
+-//  Sampling is achieved by generating uniform random cell samples.
+-//  Since there are more cells where the resolution is finer, then these regions get sampled more often
+-template <unsigned feature_dim>
+-bool bvpl_global_pca<feature_dim>::sample_statistics( int scene_id, int block_i, int block_j, int block_k,
+-                                                      vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                                                      vnl_vector_fixed<double, feature_dim> &mean,
+-                                                      unsigned long &nfeature)
+-{
+-  if (!training_scenes_[scene_id]) {
+-    std::cout << "Skiping scene: " << scene_id <<", labeled for testing\n";
+-    return false;
+-  }
+-
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,bool> bool_tree_type;
+-  typedef boct_tree_cell<short,bool> bool_cell_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr mask_scene_base =load_train_scene(scene_id);
+-
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* mask_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*>(mask_scene_base.as_pointer());
+-
+-  if (!(data_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast data scenes\n";
+-    return false;
+-  }
+-  if (!(mask_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast mask scenes\n";
+-    return false;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  mask_scene->unload_active_blocks();
+-
+-  mean.fill(0.0);
+-  S.fill(0.0);
+-
+-  vnl_random rng;
+-  //vnl_random rng(9667566ul);
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && mask_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return false;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  mask_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  bool_tree_type* mask_tree = data_tree->template clone_to_type<bool>();
+-  mask_tree->init_cells(false);
+-
+-  nfeature = 1;
+-
+-  //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
+-  std::vector<float_cell_type *> leaf_cells = data_tree->leaf_cells();
+-  std::vector<bool_cell_type*> mask_leaves = mask_tree->leaf_cells();
+-
+-  int tree_ncells = leaf_cells.size();
+-  unsigned long tree_nsamples = (unsigned long)(tree_ncells*training_fraction_);
+-  double cell_length = finest_cell_length_[scene_id];
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> nmin = nbbox_.min_point();
+-  vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-  std::cout <<" In block (" << block_i <<", " << block_j << ", " << block_k << "), number of nsamples is: " << tree_nsamples << ", cell length is: " << cell_length << std::endl;
+-
+-  for (unsigned long i=0; i<tree_nsamples; i++)
+-  {
+-    unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-    boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
+-    vgl_point_3d<double> center_cell_centroid = data_tree->global_centroid(center_cell);
+-
+-    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
+-                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
+-    roi.set_centroid(center_cell_centroid);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if (!((data_scene->get_world_bbox()).contains(roi))) {
+-      i--;
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector_fixed<double, feature_dim> this_feature(0.0);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
+-                                                 center_cell_centroid.y() + (double)y*cell_length,
+-                                                 center_cell_centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          assert(neighbor_cell !=nullptr);
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    assert(curr_dim == feature_dim);
+-
+-    mask_leaves[sample]->set_data(true);
+-
+-    //increment weights
+-    double rho = 1.0/(double)nfeature;
+-    double rho_comp = 1.0 - rho;
+-
+-    // the difference vector between the sample and the mean
+-    vnl_vector_fixed<double, feature_dim> diff = this_feature - mean;
+-
+-    //update the covariance
+-    S += rho_comp*outer_product(diff,diff);
+-
+-    //update the mean
+-    mean += (rho*diff);
+-
+-    ++nfeature;
+-#if 0
+-    std::cerr << "Feature EVD: " <<this_feature << '\n'
+-             << "Mean Feature EVD: " <<mean_feature << '\n';
+-#endif
+-  }
+-
+-  --nfeature;
+-  // write and release memory
+-  mask_scene->get_block(block_i, block_j, block_k)->init_tree(mask_tree);
+-  mask_scene->write_active_block();
+-
+-  data_scene->unload_active_blocks();
+-  mask_scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-//: Update mean and scatter, given the mean and scatter of two sets.
+-//  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim> &mean1,
+-                                                                const vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter1,
+-                                                                double const n1,
+-                                                                const vnl_vector_fixed<double,feature_dim>  &mean2,
+-                                                                const  vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter2,
+-                                                                double const n2,
+-                                                                vnl_vector_fixed<double,feature_dim> & mean_out,
+-                                                                vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
+-                                                                double &n_out )
+-{
+-  n_out = n1+n2;
+-  mean_out = (n1*mean1 + n2*mean2)* (1.0/n_out);
+-  vnl_vector_fixed<double, feature_dim> d = mean2 - mean1;
+-  scatter_out = scatter1 + scatter2 + (n1*n2/n_out)*outer_product(d,d);
+-}
+-
+-//: Set total scatter matrix, mean, sample, principal components and weights for this class
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                                                  const vnl_vector_fixed<double, feature_dim> &mean,
+-                                                  const double total_nsamples)
+-{
+-  scatter_ = S;
+-  training_mean_ = mean;
+-  nsamples_ = (long unsigned int)total_nsamples;
+-
+-  // Compute eigenvectors(principal components) and values of S
+-
+-  vnl_matrix<double> pc_temp;
+-  vnl_vector<double> w_temp;
+-
+-  vnl_symmetric_eigensystem_compute(scatter_.as_ref(), pc_temp, w_temp);
+-  pc_ = pc_temp.fliplr();
+-  weights_=w_temp.flip();
+-
+-  //save the newly set vaeiables
+-  this->xml_write();
+-}
+-
+-//: Computes 10-dimensional pca projection at each voxel on the block and saves it
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::project(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
+-  boxm_scene_base_sptr aux_scene_base = load_valid_scene(scene_id);
+-
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
+-  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* aux_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (aux_scene_base.as_pointer());
+-  if (!(data_scene && proj_scene && aux_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  aux_scene->unload_active_blocks();
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && aux_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  proj_scene->load_block(block_i, block_j, block_k);
+-  aux_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  pca_tree_type* proj_tree = data_tree->template clone_to_type<vnl_vector_fixed<double,10> >();
+-  boct_tree<short, bool>* aux_tree = data_tree->template clone_to_type<bool>();
+-  aux_tree->init_cells(true);
+-
+-  //get leaf cells
+-  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
+-  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> *> aux_leaves = aux_tree->leaf_cells();
+-
+-  double cell_length = finest_cell_length_[scene_id];
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> nmin = nbbox_.min_point();
+-  vgl_point_3d<int> nmax = nbbox_.max_point();
+-#ifdef DEBUG_PROJ
+-  double error = 0.0;
+-  unsigned long n_valid_cells= 0;
+-#endif
+-
+-  for (unsigned long i =0; i<data_leaves.size(); i++)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
+-      proj_leaves[i]->set_data(vnl_vector_fixed<double,10>(0.0));
+-      aux_leaves[i]->set_data(false);
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
+-                                                 centroid.y() + (double)y*cell_length,
+-                                                 centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell) {
+-            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    if (curr_dim != feature_dim) {
+-      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-      return;
+-    }
+-    this_feature-=training_mean_;
+-
+-    //solve for the coefficients
+-    vnl_vector_fixed<double, feature_dim> a(0.0);
+-    a = pc_.transpose() * (this_feature);
+-    vnl_vector_fixed<double,10> sample(a.extract(10));
+-    proj_leaves[i]->set_data(sample);
+-
+-#ifdef DEBUG_PROJ
+-    //project as a function of number of components
+-    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * sample;
+-
+-    //compute error
+-    error+=(float)((this_feature - feature_approx).squared_magnitude());
+-    n_valid_cells++;
+-#endif
+-  }
+-
+-  // write and release memory
+-  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
+-  proj_scene->write_active_block();
+-  proj_scene->unload_active_blocks();
+-  aux_scene->get_block(block_i, block_j, block_k)->init_tree(aux_tree);
+-  aux_scene->write_active_block();
+-  aux_scene->unload_active_blocks();
+-  data_scene->unload_active_blocks();
+-
+-#ifdef DEBUG_PROJ
+-  std::cout << "Total error in this block: " << error/(double)n_valid_cells << std::endl;
+-#endif
+-}
+-
+-//: Computes the projection error (as square magniture) given 10-dimensional pca projection at each voxel on the block
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::projection_error(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  if (training_scenes_[scene_id]) {
+-    std::cout << "Skipping training scene: " <<scene_id << std::endl;
+-    return;
+-  }
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
+-  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-
+-  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>*>(data_scene_base.as_pointer());
+-  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<float_tree_type >* error_scene = dynamic_cast<boxm_scene<float_tree_type >*>(error_scene_base.as_pointer());
+-
+-  if (!(data_scene && error_scene && proj_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  error_scene->unload_active_blocks();
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  proj_scene->load_block(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  pca_tree_type* proj_tree = proj_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-  error_tree->init_cells(-1.0f);
+-
+-  //get leaf cells
+-  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
+-  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
+-  std::vector<float_cell_type *> error_leaves = error_tree->leaf_cells();
+-
+-  double cell_length = finest_cell_length_[scene_id];
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> nmin = nbbox_.min_point();
+-  vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates aad test if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
+-      error_leaves[i]->set_data(-1.0f);
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
+-                                                 centroid.y() + (double)y*cell_length,
+-                                                 centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell) {
+-            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    if (curr_dim != feature_dim) {
+-      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-      return;
+-    }
+-    this_feature-=training_mean_;
+-
+-    //get the coefficients
+-    vnl_vector_fixed<double, 10> a = proj_leaves[i]->data();
+-
+-    //project
+-    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * a;
+-
+-    //compute error
+-    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
+-  error_scene->write_active_block();
+-  error_scene->unload_active_blocks();
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-}
+-
+-
+-//: Load scene info
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr scene_base = new boxm_scene_base();
+-  boxm_scene_parser scene_parser;
+-  scene_base->load_scene(scenes_[scene_id], scene_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (scene_base->appearence_model() == BOXM_FLOAT) {
+-    scene->load_scene(scene_parser);
+-    scene_base = scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_valid_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is should be used for training
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_train_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-
+-//: Load auxiliary scene info
+-template <unsigned feature_dim>
+-
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_projection_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_projection_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
+-  boxm_scene_parser proj_parser;
+-  std::stringstream proj_scene_ss;
+-  proj_scene_ss << aux_dirs_[scene_id] << "/proj_pca_scene_" << scene_id << ".xml";
+-  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
+-
+-  //cast scene
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-  boxm_scene<pca_tree_type > *proj_scene= new boxm_scene<pca_tree_type >();
+-  if (proj_scene_base->appearence_model() == VNL_DOUBLE_10) {
+-    proj_scene->load_scene(proj_parser);
+-    proj_scene_base = proj_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_proj_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return proj_scene_base;
+-}
+-
+-
+-//: Load auxiliary scene info
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_error_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-
+-  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  if (!data_scene) {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
+-    return nullptr;
+-  }
+-
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << "error_pca_scene_" << scene_id ;
+-  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-  if (!vul_file::exists(aux_scene_path)) {
+-    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-    boxm_scene<boct_tree<short, float> > *aux_scene =
+-    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-    aux_scene->set_appearance_model(BOXM_FLOAT);
+-    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-  }
+-
+-  //load scene
+-  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
+-  boxm_scene_parser error_parser;
+-  std::stringstream error_scene_ss;
+-  error_scene_ss << aux_dirs_[scene_id] << "/error_pca_scene_" << scene_id << ".xml";
+-  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
+-  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
+-    error_scene->load_scene(error_parser);
+-    error_scene_base = error_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return error_scene_base;
+-}
+-
+-
+-//: Write this class to xml file
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("pca_global_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  bxml_element* paths = new bxml_element("paths");
+-  paths->append_text("\n");
+-  paths->set_attribute("pc_path", pc_path() );
+-  paths->set_attribute("weights_path", weights_path() );
+-  paths->set_attribute("mean_path", mean_path());
+-  paths->set_attribute("scatter_path", scatter_path());
+-  root->append_data(paths);
+-  root->append_text("\n");
+-
+-  bxml_element* neighborhood = new bxml_element("neighborhood");
+-  neighborhood->append_text("\n");
+-  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
+-  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
+-  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
+-  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
+-  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
+-  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
+-  root->append_data(neighborhood);
+-  root->append_text("\n");
+-
+-  bxml_element* properties = new bxml_element("properties");
+-  properties->append_text("\n");
+-  properties->set_attribute("nsamples", nsamples_);
+-  properties->set_attribute("feature_dim", feature_dim);
+-  //properties->set_attribute("finest_cell_length", finest_cell_length_);
+-  properties->set_attribute("nscenes", scenes_.size());
+-  properties->set_attribute("training_fraction", training_fraction_);
+-
+-  root->append_data(properties);
+-  root->append_text("\n");
+-
+-  //write the scenes
+-  for (unsigned i =0; i<scenes_.size(); i++)
+-  {
+-    bxml_element* scenes_elm = new bxml_element("scene");
+-    scenes_elm->append_text("\n");
+-    scenes_elm->set_attribute("id", i);
+-    scenes_elm->set_attribute("path", scenes_[i]);
+-    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
+-    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
+-    scenes_elm->set_attribute("nleaves", nleaves_[i]);
+-    root->append_data(scenes_elm);
+-    root->append_text("\n");
+-  }
+-
+-  //write training scenes
+-  bxml_element* train_elm = new bxml_element("training_scenes");
+-  train_elm->append_text("\n");
+-
+-  std::stringstream ss;
+-  unsigned ts = 0;
+-
+-  for (unsigned i = 0; i< training_scenes_.size(); i++) {
+-    if (training_scenes_[i]) {
+-      ss << i << ' ';
+-      ts++;
+-    }
+-  }
+-
+-  train_elm->set_attribute("nscenes", ts);
+-  train_elm->append_text(ss.str());
+-  train_elm->append_text("\n");
+-  root->append_data(train_elm);
+-  root->append_text("\n");
+-
+-  //write to disk
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-
+-  // Write pca main matrices -other matrices aren't class variables and should have been written during computation time
+-  write_pca_matrices();
+-}
+-
+-//: Write a PCA file
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::write_pca_matrices()
+-{
+-  std::ofstream pc_ofs(pc_path().c_str());
+-  pc_ofs.precision(15);
+-  std::ofstream weights_ofs(weights_path().c_str());
+-  weights_ofs.precision(15);
+-  std::ofstream mean_ofs(mean_path().c_str());
+-  mean_ofs.precision(15);
+-  std::ofstream scatter_ofs(scatter_path().c_str());
+-  scatter_ofs.precision(15);
+-
+-  pc_ofs << pc_;
+-  pc_ofs.close();
+-  weights_ofs << weights_;
+-  weights_ofs.close();
+-  mean_ofs << training_mean_;
+-  mean_ofs.close();
+-  scatter_ofs << scatter_;
+-  scatter_ofs.close();
+-}
+-
+-
+-#define BVPL_GLOBAL_PCA(feature_dim) \
+-template class bvpl_global_pca<feature_dim>;
+-
+-
+-#endif // bvpl_global_pca_hxx_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
+deleted file mode 100644
+index 40ca062045..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 11-Apr-2011
+-
+-#include "bvpl_global_taylor.h"
+-
+-template <>
+-boxm_apm_type bvpl_taylor_apm<double, 10>(){return VNL_DOUBLE_10;}
+-
+-template <>
+-boxm_apm_type bvpl_taylor_apm<float, 3>(){return VNL_FLOAT_3;}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
+deleted file mode 100644
+index 38c05600fb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
+-#ifndef bvpl_global_taylor_h
+-#define bvpl_global_taylor_h
+-//:
+-// \file
+-// \brief A class to compute taylor features across different boxm_scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  11-Apr-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <vbl/vbl_ref_count.h>
+-
+-//Forward declaration
+-class bvpl_global_corners;
+-
+-template <class T_data, unsigned DIM>
+-boxm_apm_type bvpl_taylor_apm();
+-
+-namespace bvpl_global_tylor_defaults
+-{
+-  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-;
+-}
+-
+-template<class T_data, unsigned DIM>
+-class bvpl_global_taylor : public vbl_ref_count
+-{
+- public:
+-
+-  //: Constructor  from xml file
+-  bvpl_global_taylor(const std::string &path, const std::string kernel_names[]);
+-
+-  //: Init auxiliary scenes and smallest cell length values
+-  void init();
+-
+-  //: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
+-  void compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Compute reconstruction error
+-  bool compute_approximation_error(int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Extract a particular coefficient scene
+-  void extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *coeff_scene);
+-
+-  //: Threshold non-salient features according to Harris' measure
+-  void threshold_corners(int scene_id, int block_i, int block_j, int block_k, double k);
+-
+-  //: Write to taylor_global_info.xml
+-  void xml_write();
+-
+-  // Accessors
+-  std::string path_out() const { return path_out_; }
+-  std::vector<std::string> scenes() const { return scenes_; }
+-  std::vector<std::string> aux_dirs() const { return aux_dirs_; }
+-  std::string aux_dirs( unsigned i ) const { return aux_dirs_[i]; }
+-  std::vector<double> cell_lengths() const { return finest_cell_length_; }
+-  //std::vector<bool> training_scenes() const { return training_scenes_; }
+-
+-  boxm_scene_base_sptr load_scene (int scene_id);
+-  boxm_scene_base_sptr load_error_scene (int scene_id);
+-  boxm_scene_base_sptr load_valid_scene (int scene_id);
+-  boxm_scene_base_sptr load_projection_scene (int scene_id);
+-
+-  std::string xml_path() { return path_out_ + "/taylor_global_info.xml"; }
+-
+-  friend class bvpl_global_corners;
+-
+- protected:
+-
+-  //: A vector to hold scene paths
+-  std::vector<std::string> scenes_;
+-  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
+-  std::vector<std::string> aux_dirs_;
+-  //: A vector to hold the finest cell length of the corresponding scene scene
+-  std::vector<double> finest_cell_length_;
+-  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
+-  //std::vector<bool> training_scenes_;
+-
+-  //: A vector to 2-degree taylor approximation kernels
+-  //  The order is I0, Ix, Iy, Iz, Ixx, Iyy, Izz, Ixy, Ixz, Iyz (therefore this class works for dimensions 1-10)
+-  bvpl_kernel_vector_sptr kernel_vector_;
+-
+-  //: Path to kernel files
+-  std::string kernels_path_;
+-  //: Path to xml info file
+-  std::string path_out_;
+-};
+-
+-#include <vbl/vbl_smart_ptr.h>
+-// This does not really seem like a good idea to me ... - PVr.
+-typedef vbl_smart_ptr<bvpl_global_taylor<double,10> > bvpl_global_taylor_sptr;
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
+deleted file mode 100644
+index d8bdd3f0e4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
++++ /dev/null
+@@ -1,645 +0,0 @@
+-#ifndef bvpl_global_taylor_hxx_
+-#define bvpl_global_taylor_hxx_
+-//:
+-// \file
+-#include "bvpl_global_taylor.h"
+-// \author Isabel Restrepo
+-// \date 11-Apr-2011
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <bvpl_octree/bvpl_corner_detector.h>
+-#include <bvpl_octree/bvpl_corner_functors.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <vnl/algo/vnl_matrix_inverse.h>
+-#include <vnl/vnl_double_3.h>
+-#include <vnl/vnl_double_3x3.h>
+-
+-//: Constructor  from xml file
+-template<class T_data, unsigned DIM>
+-bvpl_global_taylor<T_data, DIM>::bvpl_global_taylor(const std::string &path, const std::string kernel_names[])
+-{
+-  std::cout << "Loading taylor info from xml-file" << std::endl;
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-  if (!xml_ifs.is_open()) {
+-    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
+-    throw;
+-  }
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("taylor_global_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
+-    throw;
+-  }
+-
+-  //Parse scenes
+-  bxml_element scenes_query("scene");
+-  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
+-
+-  unsigned nscenes=scenes_data.size();
+-  std::cout << "Number of scenes: " << nscenes <<std::endl;
+-
+-  scenes_.clear();
+-  scenes_.resize(nscenes);
+-
+-  aux_dirs_.clear();
+-  aux_dirs_.resize(nscenes);
+-
+-  finest_cell_length_.clear();
+-  finest_cell_length_.resize(nscenes);
+-
+-  for (unsigned si = 0; si < nscenes; si++)
+-  {
+-    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
+-    int id = -1;
+-    scenes_elm->get_attribute("id", id);
+-    scenes_elm->get_attribute("path", scenes_[id]);
+-    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
+-    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
+-
+-    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
+-  }
+-
+-  //Parse kernels
+-  bxml_element kernels_query("kernels");
+-  bxml_data_sptr kernels_data = bxml_find_by_name(root, kernels_query);
+-  if (kernels_data)
+-  {
+-    bxml_element* kernels_elm = dynamic_cast<bxml_element*>(kernels_data.ptr());
+-
+-    kernels_elm->get_attribute("path", kernels_path_);
+-
+-    std::cout << "Kernels path is " << kernels_path_ << '\n';
+-    kernel_vector_ = new bvpl_kernel_vector;
+-
+-    if (vul_file::exists(kernels_path_) && vul_file::is_directory(kernels_path_)) {
+-      //read the kernels
+-
+-      kernel_vector_->kernels_.clear();
+-
+-      kernel_vector_->kernels_.resize(DIM, nullptr);
+-      //std::string kernel_names[]={"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz"};
+-      for (unsigned ki = 0; ki<DIM; ki++) {
+-        std::string filename = kernels_path_ + "/" + kernel_names[ki] + ".txt";
+-        std::cout << "Reading kernel file : " << filename << std::endl;
+-        bvpl_taylor_basis_factory factory(filename);
+-        bvpl_kernel_sptr kernel = new bvpl_kernel(factory.create());
+-        kernel_vector_->kernels_[ki] = kernel;
+-      }
+-    }
+-  }
+-  else {
+-    std::cerr << " In Gobal Taylor, path to kernels does not exist\n";
+-  }
+-}
+-
+-//: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
+-
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
+-  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  if (!(data_scene && proj_scene && valid_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::sample_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_block_vector_operator block_oper;
+-  bvpl_algebraic_functor functor;
+-  block_oper.operate(*data_scene, functor, kernel_vector_, block_i, block_j, block_k, *proj_scene, *valid_scene, finest_cell_length_[scene_id]);
+-
+-  //clean memory
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-}
+-
+-template<class T_data, unsigned DIM>
+-bool bvpl_global_taylor<T_data, DIM>::compute_approximation_error(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
+-  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-
+-  //cast the scenes
+-  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
+-  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (proj_scene_base.as_pointer());
+-  boxm_scene<float_tree_type> * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  if (!data_scene || !basis_scene || !error_scene) {
+-    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
+-    return false;
+-  }
+-
+-  //load blocks of interest
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  basis_scene->load_block(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  error_tree->init_cells(-1.0f);
+-  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
+-
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
+-
+-  vgl_point_3d<int> min_point = kernel_vector_->min();
+-  vgl_point_3d<int> max_point = kernel_vector_->max();
+-  double cell_length = this->finest_cell_length_[scene_id];
+-  std::cout << "In computing taylor error, limits are: " <<min_point << " and " <<max_point <<std::endl;
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++)
+-  {
+-    //current cell is the center
+-    float_cell_type* data_cell = data_leaves[i];
+-    taylor_cell_type* basis_cell = basis_leaves[i];
+-
+-    boct_loc_code<short> data_code = data_cell->get_code();
+-    boct_loc_code<short> basis_code = basis_cell->get_code();
+-
+-    //check cells are at the same location
+-    if (! data_code.isequal(basis_code)) {
+-      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
+-               << "Data Code: " << data_code << '\n'
+-               << "Basis Code: " << basis_code << '\n';
+-
+-      return false;
+-    }
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length,
+-                                          centroid.y() + (double)min_point.y()*cell_length,
+-                                          centroid.z() + (double)min_point.z()*cell_length);
+-    if (! data_scene->locate_point_in_memory(min_point_global))
+-      continue;
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length,
+-                                          centroid.y() + (double)max_point.y()*cell_length,
+-                                          centroid.z() + (double)max_point.z()*cell_length);
+-    if (! data_scene->locate_point_in_memory(max_point_global))
+-      continue;
+-
+-    //assemble basis
+-//    double I0 = basis_cell->data().I0;
+-//    vnl_double_3 G= basis_cell->data().G;
+-//    vnl_double_3x3 H = basis_cell->data().H;
+-    vnl_vector_fixed<double,10> taylor_coeff = basis_cell->data();
+-
+-    //form basis
+-    double I0 = taylor_coeff[0];
+-    vnl_double_3 G(taylor_coeff[1], taylor_coeff[2], taylor_coeff[3]);
+-    vnl_double_3x3 H;
+-    H.put(0,0,taylor_coeff[4]);
+-    H.put(0,1,taylor_coeff[7]);
+-    H.put(0,2,taylor_coeff[8]);
+-    H.put(1,0,taylor_coeff[7]);
+-    H.put(1,1,taylor_coeff[5]);
+-    H.put(1,2,taylor_coeff[9]);
+-    H.put(2,0,taylor_coeff[8]);
+-    H.put(2,1,taylor_coeff[9]);
+-    H.put(2,2,taylor_coeff[6]);
+-
+-    double error = 0.0;
+-    for (int x = min_point.x(); x<= max_point.x(); x++) {
+-      for (int y = min_point.y(); y<=max_point.y(); y++) {
+-        for (int z = min_point.z(); z<=max_point.z(); z++) {
+-          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
+-          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
+-          if (this_cell) {
+-            vnl_double_3 X((double)x,(double)y, (double)z);
+-            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
+-            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
+-            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
+-            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
+-          }
+-        }
+-      }
+-    }
+-
+-    error_leaves[i]->set_data((float)error);
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
+-  error_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-  basis_scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-//: Threshold non-salient features according to Harris' measure
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::threshold_corners(int scene_id, int block_i, int block_j, int block_k, double harris_k)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
+-
+-  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, float> >* corner_scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  corner_scene->set_appearance_model(BOXM_FLOAT);
+-  corner_scene->set_paths(valid_scene->path(), "harris_scene");
+-  corner_scene->write_scene("/harris_scene.xml");
+-
+-  if (!( proj_scene && valid_scene && corner_scene ))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_corner_detector corner_detector;
+-  bvpl_harris_laptev_functor harris_functor(harris_k);
+-
+-  vgl_point_3d<int> max_neigborhood_idx = kernel_vector_->max();
+-  vgl_point_3d<int> min_neigborhood_idx = kernel_vector_->min();
+-
+-  std::cout << "Neighborhood for harris threshhold: " << min_neigborhood_idx << " , " << max_neigborhood_idx << std::endl;
+-
+-  corner_detector.detect_and_threshold(proj_scene, harris_functor, min_neigborhood_idx, max_neigborhood_idx,
+-                                       block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
+-
+-  //clean memory
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-//: Init auxiliary scenes and smallest cell length values
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::init()
+-{
+-  for (unsigned i = 0; i < aux_dirs_.size(); i++)
+-  {
+-    boxm_scene_base_sptr data_scene_base = load_scene(i);
+-    boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-    if (!data_scene) {
+-      std::cerr << "Error in bvpl_global_taylor::init(): Could not cast data scene\n";
+-      return;
+-    }
+-    double finest_cell_length = data_scene->finest_cell_length();
+-    finest_cell_length_[i] = finest_cell_length;
+-
+-    if (!(vul_file::exists(aux_dirs_[i]) && vul_file::is_directory(aux_dirs_[i]))) {
+-      vul_file::make_directory(aux_dirs_[i]);
+-    }
+-
+-    {
+-      std::stringstream aux_scene_ss;
+-      aux_scene_ss << "valid_scene_" << i ;
+-      std::string aux_scene_path = aux_dirs_[i] + "/" + aux_scene_ss.str() + ".xml";
+-      if (!vul_file::exists(aux_scene_path)) {
+-        std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-        boxm_scene<boct_tree<short, bool> > *aux_scene =
+-        new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-        aux_scene->set_appearance_model(BOXM_BOOL);
+-        aux_scene->set_paths(aux_dirs_[i], aux_scene_ss.str());
+-        aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-      }
+-    }
+-
+-    {
+-      std::stringstream proj_scene_ss;
+-      proj_scene_ss << "proj_taylor_scene_" << i ;
+-      std::string proj_scene_path = aux_dirs_[i] + "/" + proj_scene_ss.str() + ".xml";
+-      if (!vul_file::exists(proj_scene_path)) {
+-        std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
+-        typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
+-        boxm_scene<taylor_tree_type > *proj_scene =
+-        new boxm_scene<taylor_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-        proj_scene->set_appearance_model(bvpl_taylor_apm<T_data,DIM>());
+-        proj_scene->set_paths(aux_dirs_[i], proj_scene_ss.str());
+-        proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
+-      }
+-    }
+-  }
+-
+-  xml_write();
+-}
+-
+-
+-//: Load scene info
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr scene_base = new boxm_scene_base();
+-  boxm_scene_parser scene_parser;
+-  scene_base->load_scene(scenes_[scene_id], scene_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (scene_base->appearence_model() == BOXM_FLOAT) {
+-    scene->load_scene(scene_parser);
+-    scene_base = scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_valid_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-
+-//: Load auxiliary scene info
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_error_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>=(int)scenes_.size())
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-
+-  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  if (!data_scene) {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
+-    return nullptr;
+-  }
+-
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << "error_taylor_scene_" << scene_id ;
+-  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-  if (!vul_file::exists(aux_scene_path)) {
+-    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-    boxm_scene<boct_tree<short, float> > *aux_scene =
+-    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-    aux_scene->set_appearance_model(BOXM_FLOAT);
+-    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-  }
+-
+-  //load scene
+-  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
+-  boxm_scene_parser error_parser;
+-  std::stringstream error_scene_ss;
+-  error_scene_ss << aux_dirs_[scene_id] << "/error_taylor_scene_" << scene_id << ".xml";
+-  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
+-  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
+-    error_scene->load_scene(error_parser);
+-    error_scene_base = error_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return error_scene_base;
+-}
+-
+-
+-#if 0
+-//: Load auxiliary scene indicating if a cell is should be used for training
+-boxm_scene_base_sptr bvpl_global_taylor::load_train_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
+-    return NULL;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
+-    return NULL;
+-  }
+-
+-  return aux_scene_base;
+-}
+-#endif
+-
+-
+-//: Load auxiliary scene info
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_projection_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_projection_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
+-  boxm_scene_parser proj_parser;
+-  std::stringstream proj_scene_ss;
+-  proj_scene_ss << aux_dirs_[scene_id] << "/proj_taylor_scene_" << scene_id << ".xml";
+-  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
+-
+-  //cast scene
+-  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
+-  boxm_scene<taylor_tree_type > *proj_scene= new boxm_scene<taylor_tree_type >();
+-  if (proj_scene_base->appearence_model() == bvpl_taylor_apm<T_data,DIM>()) {
+-    proj_scene->load_scene(proj_parser);
+-    proj_scene_base = proj_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_proj_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return proj_scene_base;
+-}
+-
+-//: Write this class to xml file
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("taylor_global_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  //write the scenes
+-  for (unsigned i =0; i<scenes_.size(); i++)
+-  {
+-    bxml_element* scenes_elm = new bxml_element("scene");
+-    scenes_elm->append_text("\n");
+-    scenes_elm->set_attribute("id", i);
+-    scenes_elm->set_attribute("path", scenes_[i]);
+-    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
+-    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
+-    root->append_data(scenes_elm);
+-    root->append_text("\n");
+-  }
+-
+-  //write path to kernels
+-  bxml_element* kernel_elm = new bxml_element("kernels");
+-  kernel_elm->append_text("\n");
+-  kernel_elm->set_attribute("path", kernels_path_);
+-  root->append_data(kernel_elm);
+-  root->append_text("\n");
+-
+-  //write to disk
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-}
+-
+-
+-//: Extract a particular coefficient scene
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *float_scene)
+-{
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree_cell<short, float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > projection_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > projection_cell_type;
+-  std::vector<vnl_vector_fixed<double,10> > projections;
+-
+-  boxm_scene_base_sptr projection_scene_base = load_projection_scene(scene_id);
+-
+-  boxm_scene<projection_tree_type>* projection_scene = dynamic_cast<boxm_scene<projection_tree_type>* >(projection_scene_base.as_pointer());
+-
+-  if (!(projection_scene && float_scene))
+-  {
+-    std::cerr << "Error in bof_util::random_label_for_training: Could not cast scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  projection_scene->unload_active_blocks();
+-  float_scene->unload_active_blocks();
+-
+-  //get the cells for these blocks
+-  boxm_block_iterator<projection_tree_type> it = projection_scene->iterator();
+-  for (it.begin(); !it.end(); ++it)
+-  {
+-    if (!(projection_scene->valid_index(it.index()) && float_scene->valid_index(it.index()))) {
+-      std::cerr << "In bof_util::random_label_for_training: invalid block\n";
+-      return;
+-    }
+-
+-    projection_scene->load_block(it.index());
+-    float_scene->load_block(it.index());
+-
+-    //get the trees
+-    projection_tree_type* projection_tree = projection_scene->get_block(it.index())->get_tree();
+-    float_tree_type* float_tree = projection_tree->clone_to_type<float>();
+-
+-    //get leaf cells
+-    std::vector<projection_cell_type *> projection_leaves = projection_tree->leaf_cells();
+-    std::vector<float_cell_type *> float_leaves = float_tree->leaf_cells();
+-
+-    unsigned int tree_ncells = projection_leaves.size();
+-
+-    for (unsigned int i =0; i<tree_ncells; ++i)
+-    {
+-      float_leaves[i]->set_data(float(projection_leaves[i]->data()[coefficient_id]));
+-    }
+-    float_scene->get_block(it.index())->init_tree(float_tree);
+-    float_scene->write_active_block();
+-  }
+-
+-  //release memory
+-  projection_scene->unload_active_blocks();
+-  float_scene->unload_active_blocks();
+-}
+-
+-
+-#define BVPL_GLOBAL_TAYLOR_INSTANTIATE(T1,T2) \
+-template class bvpl_global_taylor<T1,T2 >
+-
+-#endif // bvpl_global_taylor_hxx_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
+deleted file mode 100644
+index 6d3206a9c5..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
++++ /dev/null
+@@ -1,142 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
+-#ifndef bvpl_octree_kernel_operator_h
+-#define bvpl_octree_kernel_operator_h
+-//:
+-// \file
+-// \brief A class that operates a bvpl_kernel on an octree or boxm scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 13, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<class T_data>
+-class bvpl_octree_kernel_operator
+-{
+- public:
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  //Constructor from a bvpl functor
+-  bvpl_octree_kernel_operator(tree_type* tree_in): tree_in_(tree_in){}
+-
+-  // "Convolves" kernel with class tree, storing the output in an output octree.
+-  template<class F>
+-  void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
+-  {
+-    // get all (leaf) cells at given scale
+-    std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
+-    std::vector<cell_type* > out_cells = out_tree->leaf_cells_at_level(level);
+-
+-    bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-    // iterate, through all cells
+-    for (unsigned i = 0; i <  cells.size();i++)
+-    {
+-      // iterate through vector and compute result
+-      cell_type* center_cell = cells[i];
+-
+-      if (center_cell->level()!=level)
+-        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
+-
+-      if (!center_cell->is_leaf())
+-        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a leaf\n";
+-
+-      vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
+-
+-      // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
+-
+-      kernel_iter.begin(); // reset the kernel iterator
+-      while (!kernel_iter.isDone())
+-      {
+-        vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-        vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
+-                                           this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
+-                                           this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
+-
+-        cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
+-
+-        if (this_cell) {
+-          bvpl_kernel_dispatch d = *kernel_iter;
+-          T_data val = this_cell->data();
+-          functor.apply(val, d);
+-        }
+-        else
+-          break;
+-        ++kernel_iter;
+-      }
+-
+-      out_cells[i]->set_data(functor.result());
+-    }
+-  }
+-
+-  // "Convolves" kernel with class tree, storing the output in an output octree.
+-  template<class F>
+-  void operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length);
+-
+- private:
+-  tree_type * tree_in_;
+-};
+-
+-template <class T_data> template <class F>
+-void bvpl_octree_kernel_operator<T_data>::operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length)
+-{
+-  // get all (leaf) cells at given scale/tree level
+-  std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
+-
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  // iterate, through all cells
+-  for (unsigned i = 0; i <  cells.size();i++)
+-  {
+-    // iterate through vector and compute result
+-    cell_type* center_cell = cells[i];
+-
+-    if (center_cell->level()!=level)
+-      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
+-
+-    if (!center_cell->is_leaf())
+-      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a not a leaf\n";
+-
+-    vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
+-
+-    // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
+-                                         this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
+-                                         this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
+-
+-      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
+-
+-      if (this_cell) {
+-        bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val, d);
+-      }
+-      else
+-        break;
+-      ++kernel_iter;
+-    }
+-
+-    center_cell->set_data(functor.result());
+-  }
+-
+-}
+-
+-#endif // bvpl_octree_kernel_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
+deleted file mode 100644
+index be5efb6238..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
++++ /dev/null
+@@ -1,78 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
+-#ifndef bvpl_octree_neighbors_h
+-#define bvpl_octree_neighbors_h
+-//:
+-// \file
+-// \brief  A class that operates a bvpl_kernel on an octree or boxm scene to find all the neighbor cells that correspond to that kernel, and returns a list of pointers to those neighbors
+-// \author Gamze Tunali Gamze_Tunali@brown.edu
+-// \date   March 18, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<class T_data>
+-class bvpl_octree_neighbors
+-{
+- public:
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  //Constructor from a bvpl functor
+-  bvpl_octree_neighbors(tree_type* tree_in): tree_in_(tree_in){}
+-
+-  // "Convolves" kernel with class tree, storing the output in an output octree.
+-  void neighbors(bvpl_kernel_sptr kernel, cell_type* cell,
+-                 std::vector<cell_type *>& neighb_cells)
+-  {
+-    bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-    short level = cell->level();
+-    double cell_length = tree_in_->cell_length(cell);
+-    // iterate through vector and find the neighbors
+-    vgl_point_3d<double> cell_origin = tree_in_->local_origin(cell);
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-      vgl_point_3d<double> this_cell_idx(cell_origin.x() + (double)kernel_idx.x()*cell_length,
+-                                         cell_origin.y() + (double)kernel_idx.y()*cell_length,
+-                                         cell_origin.z() + (double)kernel_idx.z()*cell_length);
+-
+-      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
+-      if (this_cell) {
+-        // check if this cell is an internal node, if so get the children
+-        if (!this_cell->is_leaf()) {
+-          std::vector<cell_type *> children;
+-          this_cell->leaf_children(children);
+-          neighb_cells.insert(neighb_cells.end(), children.begin(), children.end());
+-        }
+-        else {
+-          // make sure that the same cell is not added more than once
+-          bool found=false;
+-          for (unsigned i=0; i<neighb_cells.size(); i++) {
+-            if (neighb_cells[i] == this_cell)
+-              found=true;
+-          }
+-          if (!found)
+-            neighb_cells.push_back(this_cell);
+-        }
+-      }
+-      ++kernel_iter;
+-    }
+-  }
+-
+- private:
+-  tree_type * tree_in_;
+-};
+-
+-#endif // bvpl_octree_neighbors_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
+deleted file mode 100644
+index c5067b597e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
++++ /dev/null
+@@ -1,84 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
+-#ifndef bvpl_octree_vector_operator_h
+-#define bvpl_octree_vector_operator_h
+-//:
+-// \file
+-// \brief An abstract class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 17, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include "bvpl_octree_kernel_operator.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/functors/bvpl_local_max_functor.h>
+-#include <boct/boct_tree.h>
+-
+-
+-//: A class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
+-//  The class also contains abstract methods to be specialized in the subclasses
+-template <class T_data>
+-class bvpl_octree_vector_operator
+-{
+- public:
+-
+-  //: Applies a vector of kernels and functor to a grid. Returns a grid that combines the responses of the kernels as specified in the subclass
+-  template <class F>
+-  bool operate(boct_tree<short ,T_data>* tree_in,
+-               F functor,
+-               bvpl_kernel_vector_sptr kernel_vector,
+-               boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
+-               short level, double cell_length)
+-  {
+-    bvpl_local_max_functor<T_data> func_max;
+-    boct_tree<short ,T_data>* temp_tree = tree_in->clone();
+-    bvpl_octree_kernel_operator<T_data> oper(tree_in);
+-    for (unsigned int id = 0; id < kernel_vector->kernels_.size(); ++id)
+-    {
+-      temp_tree->init_cells(func_max.min_response());
+-      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
+-      oper.operate(functor, kernel, temp_tree,level, cell_length);
+-      combine_kernel_responses(tree_out, temp_tree, id);
+-    }
+-
+-    return true;
+-  }
+-
+- protected:
+-  //: Abstract function to be implemented on children on how to combine current kernel response with output response
+-
+-  virtual void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
+-                                        int id_curr)=0;
+-
+-  //: Compares response grids and stores in out, the maximum responses. This function gets called in subclasses when implementing combine_kernel_responses
+-
+-  void keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* new_tree,
+-                              int new_id);
+-};
+-
+-
+-//: Compares response grids and stores in grid1, the wining responses.
+-template<class T_data>
+-void bvpl_octree_vector_operator<T_data>::keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
+-                                                                 boct_tree<short ,T_data>* new_tree,
+-                                                                 int new_id)
+-{
+-  bvpl_local_max_functor<T_data> func_max;
+-
+-  std::vector<boct_tree_cell<short,T_data>*> new_leaves = new_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short,bvpl_octree_sample<T_data> >*> leaves_out = tree_out->leaf_cells();
+-
+-  for (unsigned i=0; i< new_leaves.size(); i++)
+-  {
+-    T_data val1 = new_leaves[i]->data();
+-    T_data val2 = leaves_out[i]->data().response_;
+-    if (func_max.greater_than(val1, val2))
+-      leaves_out[i]->set_data(bvpl_octree_sample<T_data>(new_leaves[i]->data(), new_id));
+-  }
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
+deleted file mode 100644
+index e01a23ca65..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
+-#ifndef bvpl_octree_vector_operator_impl_h
+-#define bvpl_octree_vector_operator_impl_h
+-//:
+-// \file
+-// \brief Subclasses that implement the abstract interface of bvpl_octree_vector_operator. They can be used to queue operations
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 30, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include "bvpl_octree_vector_operator.h"
+-
+-
+-//: Class to apply a vector of kernels and functor to a grid, returning a grid containing at each voxel the max response
+-template <class T_data>
+-class bvpl_max_vector_operator: public bvpl_octree_vector_operator<T_data>
+-{
+- public:
+-  void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample <T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
+-                                        int id_curr) override
+-  {
+-    this->keep_max_response_tree(tree_out, tree_curr, id_curr);
+-  }
+-};
+-
+-#endif // bvpl_octree_vector_operator_impl_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
+deleted file mode 100644
+index ec024dfe41..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
++++ /dev/null
+@@ -1,84 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
+-#ifndef bvpl_octree_vrml_util_h
+-#define bvpl_octree_vrml_util_h
+-//:
+-// \file
+-// \brief VRML utilities for scenes with bvpl_octree samples
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  December 10,  2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bvrml/bvrml_write.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class bvpl_octree_vrml_util
+-{
+- public:
+-   //: Writes direction of kernel and magnitude of the response as disks of different sizes
+-  template<class T_data>
+-  static void write_scene_as_disks(std::ofstream &vrml_os,
+-                                   boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > >  *scene,
+-                                   bvpl_kernel_vector_sptr kernel_vector);
+-};
+-
+-template<class T_data>
+-void bvpl_octree_vrml_util::write_scene_as_disks(std::ofstream &vrml_os,
+-                                                 boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > > *scene,
+-                                                 bvpl_kernel_vector_sptr kernel_vector)
+-{
+-  typedef boct_tree<short, bvpl_octree_sample<T_data> > tree_type;
+-  typedef boct_tree_cell<short, bvpl_octree_sample<T_data> > cell_type;
+-
+-  bvrml_write::write_vrml_header(vrml_os);
+-
+-  // iterate through the scene
+-  boxm_block_iterator<tree_type > iter= scene->iterator();
+-  iter.begin();
+-
+-  for (; !iter.end(); iter++)
+-  {
+-    scene->load_block(iter.index());
+-    tree_type  *tree = (*iter)->get_tree();
+-
+-    // iterate through the tree
+-    std::vector<cell_type*> cells = tree->leaf_cells();
+-    unsigned lines = 0;
+-    float max_response =bvpl_cell_to_float(cells[0]);
+-    for (unsigned i = 0; i < cells.size(); i+=10)
+-    {
+-      int id = cells[i]->data().id_;
+-      if (id < 0)
+-        continue;
+-      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
+-      float response = bvpl_cell_to_float(cells[i]);
+-      if (response > max_response) {
+-        max_response = response;
+-      }
+-      std::cout << "response " << response << std::endl;
+-      vgl_vector_3d<double> dir((kernel->axis())[0],(kernel->axis())[1],(kernel->axis())[2]);
+-      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
+-      if (response > 3.5f) {
+-        bvrml_write::write_vrml_line(vrml_os, coord, dir, .1f*response, 1, 0, 0);
+-        lines++;
+-      }
+-#ifdef DEBUG
+-      bvrml_write::write_vrml_disk(vrml_os, coord, dir, 2*response-.5f, 0, .5f, 0);
+-#endif
+-    }
+-    std::cout << "max response " << max_response << std::endl
+-             << "number of lines: " << lines << std::endl;
+-  }
+-}
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
+deleted file mode 100644
+index 1d72f41d58..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 18-Feb-2011
+-
+-#include <iostream>
+-#include <sstream>
+-#include "bvpl_pca_error_scenes.h"
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <vul/vul_file.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bvpl_pca_error_scenes::bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& pca_path, unsigned dim)
+-{
+-  typedef boct_tree<short,float> tree_type;
+-  for (unsigned i =0; i<dim+1; i++)
+-    scenes_.push_back(new boxm_scene_base());
+-
+-  auto* data_scene= dynamic_cast<boxm_scene<tree_type>* > (data_scene_base.as_pointer());
+-  if (!data_scene)
+-    std::cerr << "In bvpl_pca_error_scenes: Null Scene\n";
+-
+-  for (unsigned i = 0; i<dim+1; i++)
+-  {
+-    //path to error scenes
+-    std::stringstream error_path_ss;
+-    error_path_ss << pca_path << "/error_" << i;
+-    std::string error_path = error_path_ss.str();
+-    if (!vul_file::is_directory(error_path))
+-      vul_file::make_directory(error_path);
+-
+-    boxm_scene<tree_type> *error_scene =
+-    new boxm_scene<tree_type>(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-    error_scene->set_appearance_model(BOXM_FLOAT);
+-
+-    std::string scene_name = "error_scene";
+-    error_scene->set_paths(error_path, scene_name);
+-
+-    if (!vul_file::exists(error_path + "/" + scene_name +  ".xml"))
+-      error_scene->write_scene("/" +scene_name +  ".xml");
+-
+-    //data_scene->clone_blocks(*error_scene, -1.0);
+-
+-    scenes_[i] = error_scene;
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
+deleted file mode 100644
+index a50c851c2f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
++++ /dev/null
+@@ -1,39 +0,0 @@
+-// This is bvpl_pca_error_scenes.h
+-#ifndef bvpl_pca_error_scenes_h
+-#define bvpl_pca_error_scenes_h
+-
+-//:
+-// \file
+-// \brief A class to hold the smartpointers to pca error scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-// Forward declarations
+-class bvpl_pca_error_scenes;
+-
+-typedef vbl_smart_ptr<bvpl_pca_error_scenes> bvpl_pca_error_scenes_sptr;
+-
+-//: A class to hold the smartpointers to response scenes and their corresponding names
+-class bvpl_pca_error_scenes : public vbl_ref_count
+-{
+-public:
+-
+-  bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& taylor_path, unsigned dim);
+-
+-  //: Return the error scene associated with a number of components used for reconstruction
+-  boxm_scene_base_sptr get_scene(unsigned ncomponent) {return scenes_[ncomponent];}
+-
+-private:
+-  std::vector<boxm_scene_base_sptr> scenes_;
+-
+-};
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
+deleted file mode 100644
+index 2217b22966..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
++++ /dev/null
+@@ -1,213 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
+-#ifndef bvpl_scene_kernel_operator_h
+-#define bvpl_scene_kernel_operator_h
+-//:
+-// \file
+-// \brief A class that operates a bvpl_kernel on a boxm_scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 18, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boxm/boxm_scene.h>
+-#include "bvpl_octree_kernel_operator.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class bvpl_scene_kernel_operator
+-{
+- public:
+-  //: "Convolves" kernel with an input octree, storing the output in an output octree.
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-               F functor,
+-               bvpl_kernel_sptr kernel,
+-               boxm_scene<boct_tree<short, T_data > > &scene_out);
+-
+-  //: Performs in-situ non-maxima suppression over the area occupied by the kernel
+-  template<class T_data, class F>
+-  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                    F functor,
+-                                    bvpl_kernel_sptr kernel);
+-
+-#if 0 //Depracated
+-  // "Convolves" kernel with an input octree, storing the output in an output octree.
+-  template<class T_data, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-               F functor,
+-               bvpl_kernel_sptr kernel,
+-               boxm_scene<boct_tree<short, T_data > > &scene_out,
+-               short level)
+-  {
+-    typedef boct_tree<short, T_data > tree_type;
+-    boxm_block_iterator<tree_type> iter_in = scene_in.iterator();
+-    boxm_block_iterator<tree_type> iter_out = scene_out.iterator();
+-    iter_in.begin();
+-    iter_out.begin();
+-    for (; !iter_in.end(); iter_in++, iter_out++) {
+-      //Isa: change to load block and neighbors
+-      scene_in.load_block(iter_in.index());
+-      scene_out.load_block(iter_out.index());
+-      tree_type *tree_in= (*iter_in)->get_tree();
+-      tree_type *tree_out = tree_in->clone();
+-
+-      // output tree has the same shape but is initialized to have response zero
+-      T_data zero_val = T_data();
+-      std::cout << "Response tree is initialized to: " << zero_val << std::endl;
+-      tree_out->init_cells(zero_val);
+-
+-      bvpl_octree_kernel_operator<T_data> oper(tree_in);
+-      double cell_length = 1.0/(double)(1<<(tree_in->root_level() -level));
+-      oper.operate(functor, kernel, tree_out, level, cell_length);
+-      (*iter_out)->init_tree(tree_out);
+-      scene_out.write_active_block();
+-    }
+-  }
+-#endif
+-};
+-
+-//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data, class F>
+-void bvpl_scene_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_sptr kernel,
+-                                         boxm_scene<boct_tree<short, T_data > > &scene_out)
+-{
+-  double cell_length = kernel->voxel_length();
+-  short finest_level = scene_in.finest_level();
+-  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
+-
+-  scene_in.clone_blocks(scene_out, T_data());
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, T_data > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block);
+-  out_iter.begin();
+-
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  while ( !(iterator.end() || out_iter.end()) )
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *iterator;
+-    boct_tree_cell<short,T_data> *out_center_cell = *out_iter;
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    //we are only interested in finest resolution
+-    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()){
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    vgl_point_3d<double> center_cell_origin = iterator.global_origin();
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> kernel_cell_origin(center_cell_origin.x() + (double)kernel_idx.x()*cell_length + 1.0e-7,
+-                                              center_cell_origin.y() + (double)kernel_idx.y()*cell_length + 1.0e-7,
+-                                              center_cell_origin.z() + (double)kernel_idx.z()*cell_length + 1.0e-7);
+-
+-      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_origin);
+-
+-      if (this_cell) {
+-        bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val, d);
+-      }
+-      else {
+-        break;
+-      }
+-
+-      ++kernel_iter;
+-    }
+-
+-    out_center_cell->set_data(functor.result());
+-    ++iterator;
+-    ++out_iter;
+-  }
+-}
+-
+-//: Applies non-maxima suppression on the region occupied by the kernel. The output is stored in situ.
+-//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data, class F>
+-void bvpl_scene_kernel_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                                              F functor,
+-                                                              bvpl_kernel_sptr kernel)
+-{
+-  short finest_level = scene_in.finest_level();
+-  double cell_length = kernel->voxel_length();
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  while ( !(iterator.end()) )
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *iterator;
+-
+-    //we are only interested in finest resolution
+-    if (!center_cell->level() == finest_level || !center_cell->is_leaf()){
+-      ++iterator;
+-      continue;
+-    }
+-    T_data this_data = center_cell->data();
+-
+-    //vgl_point_3d<double> center_cell_origin = iterator.global_origin();
+-    vgl_point_3d<double> center_cell_center = this_data.location();
+-    if (!functor.init(this_data)){
+-      ++iterator;
+-      continue;
+-    }
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> kernel_cell_center(center_cell_center.x() + (double)kernel_idx.x()*cell_length,
+-                                              center_cell_center.y() + (double)kernel_idx.y()*cell_length,
+-                                              center_cell_center.z() + (double)kernel_idx.z()*cell_length);
+-
+-      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_center);
+-
+-      if (this_cell) {
+-        //bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val);
+-      }
+-      else {
+-        break;
+-      }
+-
+-      ++kernel_iter;
+-    }
+-
+-    center_cell->set_data(functor.result());
+-    ++iterator;
+-  }
+-}
+-
+-#endif // bvpl_scene_kernel_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
+deleted file mode 100644
+index c6fabe14e2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include "bvpl_scene_neighborhood_operator.h"
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
+deleted file mode 100644
+index 5f8e43f92f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
++++ /dev/null
+@@ -1,97 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
+-#ifndef bvpl_scene_neighborhood_operator_h
+-#define bvpl_scene_neighborhood_operator_h
+-//:
+-// \file
+-// \brief A class to perform neighborhood operations on a boxm_scene.
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  13-Aug-2010.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <vgl/vgl_box_3d.h>
+-
+-//: A class to perform neighborhood operations on a bvxm_scene.
+-// This class operates on all leaf cells within a region
+-class bvpl_scene_neighborhood_operator
+-{
+- public:
+-  bvpl_scene_neighborhood_operator()= default;
+-
+-  //: Applies the region-based functor on every leaf cell of the scene. The output is stored on a separate scene
+-  template <class T_data_in, class T_data_out, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data_in > > *scene_in,
+-               F functor,
+-               vgl_box_3d<double> roi,
+-               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
+-
+-  //: Applies the region-based functor on every leaf cell of the scene. The region is obtained from scen2.
+-  //  The output is stored on a separate scene
+-  template <class T_data_in1, class T_data_in2, class T_data_out, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data_in1 > > *scene_in1,
+-               boxm_scene<boct_tree<short, T_data_in2 > > *scene_in2,
+-               F functor,
+-               vgl_box_3d<double> roi,
+-               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
+-
+-  //: Applies a non-maxima suppression functor on every leaf cell of the scene. The output is stored in situ
+-  template <class T_data, class F>
+-  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                    F functor,
+-                                    vgl_box_3d<double> &roi);
+-};
+-
+-
+-//: Applies the region-based functor on every leaf cell of the scene. The output is stored in situ. The ROI must be in scene-coordinates
+-//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template <class T_data, class F>
+-void bvpl_scene_neighborhood_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                                                    F functor,vgl_box_3d<double> &roi)
+-{
+-  short finest_level = scene_in.finest_level();
+-
+-  //(1) Traverse the scene
+-  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block_and_neighbors);
+-
+-  iterator.begin();
+-
+-  while (!iterator.end())
+-  {
+-    boct_tree_cell<short,T_data> *cell = *iterator;
+-    if ((!(cell->level() == finest_level)) || !cell->is_leaf()){
+-      ++iterator;
+-      continue;
+-    }
+-    // the region is located with subvoxel accuracy so datastructure should contain subvoxel localization
+-    roi.set_centroid((cell->data()).location());
+-
+-    T_data this_data= cell->data();
+-    functor.init(this_data, roi);
+-
+-    // get all cells that intersect a region
+-    std::vector<boct_tree_cell<short, T_data>* > cells_in_roi;
+-
+-    //Return all cells that intersec the region
+-    scene_in.leaves_in_region(roi,cells_in_roi);
+-
+-    for (unsigned i = 0; i<cells_in_roi.size(); i++)
+-    {
+-      boct_tree_cell<short, T_data> *this_cell = cells_in_roi[i];
+-      if (!this_cell)
+-        continue;
+-      T_data val = this_cell->data();
+-      functor.apply(val);
+-    }
+-
+-    cell->set_data(functor.result());
+-    ++iterator;
+-  }
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
+deleted file mode 100644
+index 5f43040cc0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 22-Sep-2010
+-
+-#include "bvpl_scene_statistics.h"
+-
+-
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
+-
+-  scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
+-  std::vector<float_cell_type*> leaves = tree->leaf_cells();
+-
+-  int tree_ncells = leaves.size();
+-  //unsigned long tree_nsamples = (tree_ncells/scene_ncells)*(float)nsamples_;
+-
+-  double avg_val = 0.0;
+-  vnl_random rng(9667566ul);
+-  for (unsigned i=0; i<tree_nsamples; i++)
+-  {
+-    unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-    boct_tree_cell<short, float> *center_cell = leaves[sample];
+-    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if ((double)center_cell->data()< -0.5) {
+-      i--;
+-      continue;
+-    }
+-    else {
+-      avg_val+=(double)center_cell->data();
+-    }
+-  }
+-
+-  return avg_val/tree_nsamples;
+-}
+-
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
+-  if (!scene) {
+-    std::cerr << "Error in bvpl_average_value: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
+-  std::vector<float_cell_type*> leaves = tree->leaf_cells();
+-
+-  double actual_samples = 0.0;
+-  double avg_val = 0.0;
+-  for (auto center_cell : leaves)
+-  {
+-    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if ((double)center_cell->data()< -0.5) {
+-      continue;
+-    }
+-    else {
+-      avg_val+=(double)center_cell->data();
+-      actual_samples = actual_samples +1.0;
+-    }
+-  }
+-
+-  std::cout << "Adding errors of : " << actual_samples << " samples" << std::endl;
+-
+-  return avg_val/actual_samples;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
+deleted file mode 100644
+index f14813bc74..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
++++ /dev/null
+@@ -1,102 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
+-#ifndef bvpl_scene_statistics_h
+-#define bvpl_scene_statistics_h
+-//:
+-// \file
+-// \brief A set of functions to provide statistics about response scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  22-Sep-2010.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bsta/bsta_histogram.h>
+-#include <boxm/boxm_scene.h>
+-
+-template <unsigned DIM>
+-bool bvpl_compute_scene_statistics(boxm_scene< boct_tree<short, vnl_vector_fixed<float,DIM> > > *scene, bsta_histogram<float> &response_hist )
+-{
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM> > tree_type;
+-
+-  //(1) Traverse the leaves of the scene
+-  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
+-
+-  iterator.begin();
+-  float cell_count = 0;
+-  float max = (*iterator)->data().magnitude();
+-  float min = max;
+-  float mag = max;
+-  while (!iterator.end()) {
+-    cell_count++;
+-    mag = (*iterator)->data().magnitude();
+-    if ( mag > max)  max = mag;
+-    if ( mag < min)  min = mag;
+-    ++iterator;
+-  }
+-
+-  unsigned int nbins = (unsigned int)std::floor(std::sqrt(cell_count));
+-  response_hist = bsta_histogram<float>(min, max, nbins);
+-
+-  iterator.begin();
+-
+-  while (!iterator.end()) {
+-    response_hist.upcount(static_cast<float>((*iterator)->data().magnitude()), 1.0f);
+-    ++iterator;
+-  }
+-
+-  scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-bool bvpl_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist, unsigned int nbins = 0 )
+-                                   //, bsta_histogram<float>& level_hist, unsigned& n_leaves)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc,T_data> cell_type;
+-
+-  //(1) Traverse the leaves of the scene
+-  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
+-
+-  iterator.begin();
+-  float cell_count = 0;
+-  T_data max = (*iterator)->data();
+-  T_data min = max;
+-  T_data this_val = max;
+-  while (!iterator.end()) {
+-    cell_count++;
+-    this_val = (*iterator)->data();
+-    if ( this_val > max)  max = this_val;
+-    if ( this_val < min)  min = this_val;
+-    ++iterator;
+-  }
+-
+-  if (nbins == 0)
+-    nbins = (unsigned int)std::floor(std::sqrt(cell_count));
+-  response_hist = bsta_histogram<float>(min, max, nbins);
+-  scene->unload_active_blocks();
+-  iterator.begin();
+-  while (!iterator.end()) {
+-    response_hist.upcount(static_cast<T_data>((*iterator)->data()), 1.0f);
+-    ++iterator;
+-  }
+-
+-  scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-//: Function that compute average value of a fraction of samples in the specified block.
+-//  Datatype is assumed to be float, but if could be templated to expand to other types
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples);
+-
+-//: Function that compute average value of all positive samples in the specified block.
+-//  Datatype is assumed to be float, but if could be templated to expand to other types
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k);
+-
+-
+-#endif // bvpl_scene_statistics_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
+deleted file mode 100644
+index 49e7066a5c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
++++ /dev/null
+@@ -1,178 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
+-#ifndef bvpl_scene_vector_operator_h
+-#define bvpl_scene_vector_operator_h
+-//:
+-// \file
+-// \brief  A class that applies a vector of bvpl_kernels on a boxm_scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 30, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/functors/bvpl_local_max_functor.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <vnl/vnl_vector_fixed.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class bvpl_scene_vector_operator
+-{
+- public:
+-
+-  //: "Convolves" a vector of kernel with an input octree, storing the output in an output octree.
+-  //  The shape of the output is determined by a templated function
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data_in, class T_data_out, class F >
+-  void operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
+-               F functor,
+-               bvpl_kernel_vector_sptr kernel_vector,
+-               boxm_scene<boct_tree<short, T_data_out > > &scene_out);
+-
+- protected:
+-
+-  //:Function incharged of combining results
+-  template<class T_data>
+-  void combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out);
+-
+-  //:Function incharged of combining results
+-  template<class T_data>
+-  void combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out);
+-};
+-
+-
+-//: Operates a vector of kernels on a scene by : (1)Traversing input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data_in, class T_data_out,class F >
+-void bvpl_scene_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_vector_sptr kernel_vector,
+-                                         boxm_scene<boct_tree<short, T_data_out > > &scene_out)
+-{
+-  short finest_level = scene_in.finest_level();
+-  // CAUTION: kernel is run at finest resolution, but this may not always be desired
+-  double cell_length = scene_in.finest_cell_length();
+-
+-  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
+-
+-  T_data_out zero;
+-  scene_in.template clone_blocks_to_type<boct_tree<short, T_data_out > >(scene_out, zero);
+-  std::cout << "The initial zero-value for all cells is : " << zero << std::endl;
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, T_data_in > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data_in > >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, T_data_out > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data_out > >::load_block);
+-  out_iter.begin();
+-
+-  while ( !(iterator.end() || out_iter.end()) )
+-  {
+-    boct_tree_cell<short,T_data_in> *center_cell = *iterator;
+-    boct_tree_cell<short,T_data_out> *out_center_cell = *out_iter;
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure " << std::endl;
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    //we are only interested in finest resolution
+-    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()) {
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    vgl_point_3d<double> center_cell_centroid = iterator.global_centroid();
+-
+-    //(2) Run vector of kernels
+-
+-    std::vector<T_data_in> responses;
+-    for (auto kernel : kernel_vector->kernels_)
+-    {
+-      bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-      kernel_iter.begin(); // reset the kernel iterator
+-      while (!kernel_iter.isDone())
+-      {
+-        vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
+-
+-        if (this_cell) {
+-          bvpl_kernel_dispatch d = *kernel_iter;
+-          T_data_in val = this_cell->data();
+-          functor.apply(val, d);
+-        }
+-
+-        ++kernel_iter;
+-      }
+-
+-      responses.push_back(functor.result());
+-    }
+-
+-    T_data_out data_out;
+-    combine_kernel_responses(responses, data_out);
+-    out_center_cell->set_data(data_out);
+-    ++iterator;
+-    ++out_iter;
+-  }
+-  return;
+-}
+-
+-template <class T_data>
+-void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out)
+-{
+-  if (responses.size() != 3) {
+-    std::cerr << "Wrong number of responses" << std::endl;
+-    return;
+-  }
+-
+-  for (unsigned i = 0 ; i < 3; i++)
+-  {
+-    response_out[i] = responses[i];
+-  }
+-  return;
+-}
+-
+-template <class T_data>
+-void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out)
+-{
+-  if (responses.size() != 3) {
+-    std::cerr << "Wrong number of responses" << std::endl;
+-    return;
+-  }
+-
+-  bvpl_local_max_functor<T_data> func_max;
+-
+-  T_data max= responses[0];
+-  int max_id =0;
+-  for (unsigned i = 1 ; i < responses.size(); i++)
+-  {
+-    if (func_max.greater_than(max, responses[i])){
+-      max = responses[i];
+-      max_id = i;
+-    }
+-  }
+-  response_out.response_=max;
+-  response_out.id_ = max_id;
+-  return;
+-}
+-
+-#endif // bvpl_scene_vector_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
+deleted file mode 100644
+index e8cac33615..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
++++ /dev/null
+@@ -1,258 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 31-Jan-2011
+-
+-#include "bvpl_taylor_basis.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-bool bvpl_taylor_basis::compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
+-                                                    const boxm_scene_base_sptr& basis_scene_base,
+-                                                    const boxm_scene_base_sptr& error_scene_base,
+-                                                    const bvpl_taylor_basis_loader& loader,
+-                                                    int block_i, int block_j, int block_k, double cell_length)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
+-  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
+-  //cast the scenes
+-  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
+-  auto* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (basis_scene_base.as_pointer());
+-  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  if (!(data_scene && basis_scene &&error_scene)){
+-    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
+-    return false;
+-  }
+-
+-  //load blocks of interest
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  basis_scene->load_block(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  error_tree->init_cells(-1.0f);
+-  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
+-
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
+-
+-  vgl_point_3d<int> min_point =  loader.min_point();
+-  vgl_point_3d<int> max_point =  loader.max_point();
+-
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++) {
+-    //current cell is the center
+-    float_cell_type* data_cell = data_leaves[i];
+-    taylor_cell_type* basis_cell = basis_leaves[i];
+-
+-    boct_loc_code<short> data_code = data_cell->get_code();
+-    boct_loc_code<short> basis_code = basis_cell->get_code();
+-
+-    //check cells are at the same location
+-    if (! data_code.isequal(basis_code)){
+-      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
+-               << "Data Code: " << data_code << '\n'
+-               << "Basis Code: " << basis_code << '\n';
+-
+-      return false;
+-    }
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
+-      continue;
+-
+-    //retrieve basis
+-    double I0 = basis_cell->data().I0;
+-    vnl_double_3 G= basis_cell->data().G;
+-    vnl_double_3x3 H = basis_cell->data().H;
+-    double error = 0.0;
+-    for (int x = min_point.x(); x<= max_point.x(); x++) {
+-      for (int y = min_point.y(); y<=max_point.y(); y++) {
+-        for (int z = min_point.z(); z<=max_point.z(); z++) {
+-          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
+-          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
+-          if (this_cell) {
+-            vnl_double_3 X((double)x,(double)y, (double)z);
+-            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
+-            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
+-            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
+-            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
+-          }
+-        }
+-      }
+-    }
+-
+-    error_leaves[i]->set_data((float)error);
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
+-  error_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-  basis_scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-double bvpl_taylor_basis::sum_errors(const boxm_scene_base_sptr& error_scene_base,
+-                                     int block_i, int block_j, int block_k, unsigned long tree_nsamples)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-
+-  int tree_ncells = error_leaves.size();
+-  //unsigned long tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
+-
+-  double error = 0.0;
+-  vnl_random rng(9667566ul);
+-  for (unsigned i=0; i<tree_nsamples; i++)
+-  {
+-    unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-    boct_tree_cell<short, float> *center_cell = error_leaves[sample];
+-    // vgl_point_3d<double> center_cell_centroid = error_tree->global_centroid(center_cell);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if ((double)center_cell->data()< -0.5){
+-      i--;
+-      continue;
+-    }
+-    else {
+-      error+=(double)center_cell->data();
+-    }
+-  }
+-
+-  return error/tree_nsamples;
+-}
+-
+-//: Reads the values of basis responses and assembles them into matrices and vectors
+-bool bvpl_taylor_basis::assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
+-
+-  std::cerr << "Caution: Using hardcoded size for taylor reconstruction\n";
+-
+-  //load output scene
+-  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (taylor_scenes->get_scene("basis").as_pointer());
+-  if (!basis_scene)
+-  {
+-    std::cerr << "Error in reconstruct: Faild to cast output scene\n";
+-    return false;
+-  }
+-
+-  //retieve basis scenes
+-  //zeroth derivative scene
+-  boxm_scene<float_tree_type>* I0_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("I0").as_pointer());
+-  boxm_scene<float_tree_type>* Ix_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ix").as_pointer());
+-  boxm_scene<float_tree_type>* Iy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iy").as_pointer());
+-  boxm_scene<float_tree_type>* Iz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iz").as_pointer());
+-  boxm_scene<float_tree_type>* Ixx_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixx").as_pointer());
+-  boxm_scene<float_tree_type>* Ixy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixy").as_pointer());
+-  boxm_scene<float_tree_type>* Ixz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixz").as_pointer());
+-  boxm_scene<float_tree_type>* Iyy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyy").as_pointer());
+-  boxm_scene<float_tree_type>* Iyz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyz").as_pointer());
+-  boxm_scene<float_tree_type>* Izz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Izz").as_pointer());
+-
+-
+-  if (!(I0_scene && Ix_scene && Iy_scene && Iz_scene && Ixx_scene && Iyy_scene && Izz_scene && Ixy_scene && Ixz_scene && Iyz_scene))
+-  {
+-    std::cerr << "Error in assemble_basis: Faild to load taylor scenes\n";
+-    return false;
+-  }
+-
+-  //load the blocks
+-  basis_scene->load_block(block_i, block_j,block_k);
+-  I0_scene->load_block(block_i, block_j,block_k);
+-  Ix_scene->load_block(block_i, block_j,block_k);
+-  Iy_scene->load_block(block_i, block_j,block_k);
+-  Iz_scene->load_block(block_i, block_j,block_k);
+-  Ixx_scene->load_block(block_i, block_j,block_k);
+-  Ixy_scene->load_block(block_i, block_j,block_k);
+-  Ixz_scene->load_block(block_i, block_j,block_k);
+-  Iyy_scene->load_block(block_i, block_j,block_k);
+-  Iyz_scene->load_block(block_i, block_j,block_k);
+-  Izz_scene->load_block(block_i, block_j,block_k);
+-
+-
+-  float_tree_type *treeI0 = I0_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  taylor_tree_type *basis_tree = treeI0->clone_to_type<bvpl_taylor_basis2_sample>();
+-  basis_tree->init_cells(bvpl_taylor_basis2_sample());
+-  std::vector<taylor_cell_type*> leaves_basis = basis_tree->leaf_cells();
+-  std::vector<float_cell_type* > leaves_I0 = treeI0->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ix = Ix_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iy = Iy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iz = Iz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ixx =Ixx_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ixy =Ixy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ixz =Ixz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iyy =Iyy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iyz =Iyz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Izz =Izz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-
+-
+-  //iterate gathering and assembling the data
+-  for (unsigned i=0; i<leaves_basis.size(); i++)
+-  {
+-    auto I0 = (double)leaves_I0[i]->data();
+-    vnl_double_3 G((double)leaves_Ix[i]->data(),(double)leaves_Iy[i]->data(),(double)leaves_Iz[i]->data());
+-
+-    vnl_double_3x3 H;
+-    H.put(0,0,(double)leaves_Ixx[i]->data());
+-    H.put(0,1,(double)leaves_Ixy[i]->data());
+-    H.put(0,2,(double)leaves_Ixz[i]->data());
+-    H.put(1,0,(double)leaves_Ixy[i]->data());
+-    H.put(1,1,(double)leaves_Iyy[i]->data());
+-    H.put(1,2,(double)leaves_Iyz[i]->data());
+-    H.put(2,0,(double)leaves_Ixz[i]->data());
+-    H.put(2,1,(double)leaves_Iyz[i]->data());
+-    H.put(2,2,(double)leaves_Izz[i]->data());
+-
+-    bvpl_taylor_basis2_sample sample(I0, G, H);
+-
+-    leaves_basis[i]->set_data(sample);
+-  }
+-
+-  //write basis block
+-  basis_scene->get_block(block_i, block_j, block_k)->set_tree(basis_tree);
+-  basis_scene->write_active_block();
+-
+-  //free up memory
+-  basis_scene->unload_active_blocks();
+-  I0_scene->unload_active_blocks();
+-  Ix_scene->unload_active_blocks();
+-  Iy_scene->unload_active_blocks();
+-  Iz_scene->unload_active_blocks();
+-  Ixx_scene->unload_active_blocks();
+-  Ixy_scene->unload_active_blocks();
+-  Ixz_scene->unload_active_blocks();
+-  Iyy_scene->unload_active_blocks();
+-  Iyz_scene->unload_active_blocks();
+-  Izz_scene->unload_active_blocks();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
+deleted file mode 100644
+index 6d35064025..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
++++ /dev/null
+@@ -1,50 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
+-#ifndef bvpl_taylor_basis_h
+-#define bvpl_taylor_basis_h
+-
+-//:
+-// \file
+-// \brief A class with utilities to apply taylor kernels to a scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  31-Jan-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include "bvpl_taylor_scenes_map.h"
+-#include <boxm/boxm_scene_base.h>
+-
+-
+-class bvpl_taylor_basis
+-{
+-
+-public:
+-  //  bvpl_taylor_basis(boxm_scene_base_sptr scene_base, bvpl_taylor_basis_loader loader, std::string path_out):
+-  //  kernel_loader_(loader), scene_base_(scene_base), path_out_(path_out){}
+-  //
+-  static bool assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k);
+-
+-  //: Computes the square errors between the scene and the taylor approximation at every voxel
+-  // This function operates on a block specified by an index
+-  static bool compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
+-                                          const boxm_scene_base_sptr& basis_scene_base,
+-                                          const boxm_scene_base_sptr& error_scene_base,
+-                                          const bvpl_taylor_basis_loader& loader,
+-                                          int block_i, int block_j, int block_k, double cell_length);
+-
+-  //: Sums the square errors for a percenatge of random samples
+-  static double sum_errors(const boxm_scene_base_sptr& error_scene_base,
+-                           int block_i, int block_j, int block_k, unsigned long tree_nsamples);
+-
+-protected:
+-
+-  //
+-  //  bvpl_taylor_basis_loader kernel_loader_;
+-  //  boxm_scene_base_sptr scene_base_;
+-  //  std::string path_out_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
+deleted file mode 100644
+index 92128f59d6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_taylor_scenes_map.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <vul/vul_file.h>
+-
+-bvpl_taylor_scenes_map::bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader)
+-{
+-  loader_ = loader;
+-  typedef boct_tree<short,float> tree_type;
+-
+-  std::vector<std::string> kernel_names;
+-  loader.files(kernel_names);
+-
+-  //Load scenes one-by-one an insert them in the map
+-  for (auto & kernel_name : kernel_names)
+-  {
+-    std::string scene_in_file = loader.path() + '/' + kernel_name + "/float_response_scene.xml";
+-    boxm_scene_parser parser;
+-    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-    scene_ptr->load_scene(scene_in_file, parser);
+-
+-    if (scene_ptr->appearence_model() != BOXM_FLOAT) {
+-      std::cerr << " bvpl_taylor_scenes, scenes must be of type float\n";
+-    }
+-
+-    auto* scene = new boxm_scene<tree_type>();
+-    scene->load_scene(parser);
+-    scene_ptr = scene;
+-
+-    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( kernel_name, scene_ptr));
+-  }
+-
+-  // Create a scene to later save the taylor reconstruction (parameters of the  scene are the same as those of the input scene)
+-  auto* scene_in = static_cast<boxm_scene<tree_type>* > (scenes_[kernel_names[0]].as_pointer());
+-  {
+-    boxm_scene<tree_type> *scene_out =
+-    new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(loader.path(), "error");
+-    scene_out->set_appearance_model(BOXM_FLOAT);
+-    if (!vul_file::exists(loader.path() + "/error_scene.xml"))
+-      scene_out->write_scene("error_scene.xml");
+-    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "error", scene_out));
+-  }
+-
+-  {
+-    boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> > *scene_out =
+-    new boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(loader.path(), "basis");
+-    scene_out->set_appearance_model(BOXM_FLOAT);
+-    if (!vul_file::exists(loader.path() + "/basis_scene.xml"))
+-      scene_out->write_scene("basis_scene.xml");
+-    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "basis", scene_out));
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
+deleted file mode 100644
+index 51f783da43..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
++++ /dev/null
+@@ -1,41 +0,0 @@
+-// This is bvpl_taylor_scenes_map.h
+-#ifndef bvpl_taylor_scenes_map_h
+-#define bvpl_taylor_scenes_map_h
+-
+-//:
+-// \file
+-// \brief A class to hold the smartpointers to response scenes and their corresponding names
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-// Forward declarations
+-class bvpl_taylor_scenes_map;
+-
+-typedef vbl_smart_ptr<bvpl_taylor_scenes_map> bvpl_taylor_scenes_map_sptr;
+-
+-//: A class to hold the smartpointers to response scenes and their corresponding names
+-class bvpl_taylor_scenes_map : public vbl_ref_count
+-{
+-public:
+-
+-  bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader);
+-
+-  boxm_scene_base_sptr get_scene(std::string basis) {return scenes_[basis];}
+-
+-  const bvpl_taylor_basis_loader& loader() {return loader_ ;}
+-
+-private:
+-  std::map<std::string, boxm_scene_base_sptr> scenes_;
+-  bvpl_taylor_basis_loader loader_;
+-
+-};
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
+deleted file mode 100644
+index e1264a0f5c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
++++ /dev/null
+@@ -1,20 +0,0 @@
+-# contrib/brl/bseg/bvpl/io/CMakeLists.txt
+-
+-set(bvpl_octree_io_sources
+-    bvpl_io_taylor_scenes_map.h       bvpl_io_taylor_scenes_map.cxx
+-    bvpl_io_pca_error_scenes.h        bvpl_io_pca_error_scenes.cxx
+-    bvpl_io_discover_pca_kernels.h    bvpl_io_discover_pca_kernels.cxx
+-    bvpl_io_global_pca.h              bvpl_io_global_pca.cxx
+-    bvpl_io_global_taylor.h
+-    bvpl_io_global_corners.h          bvpl_io_global_corners.cxx
+-
+-)
+-
+-aux_source_directory(Templates bvpl_octree_io_sources)
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_io LIBRARY_SOURCES ${bvpl_octree_io_sources})
+-target_link_libraries(bvpl_octree_io bvpl_octree ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vsl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
+deleted file mode 100644
+index 45954e1337..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
+deleted file mode 100644
+index ed29b40a54..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <bvpl_octree/io/bvpl_io_global_corners.h>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_corners);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
+deleted file mode 100644
+index fc4656672f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <bvpl_octree/io/bvpl_io_global_pca.h>
+-
+-typedef bvpl_global_pca<125> bvpl_global_pca_125;
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
+deleted file mode 100644
+index ff9d7dc465..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <bvpl_octree/io/bvpl_io_global_taylor.h>
+-
+-typedef bvpl_global_taylor<double, 10> bvpl_global_taylor_double_10;
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_taylor_double_10);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
+deleted file mode 100644
+index 427e3937d4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+deleted file mode 100644
+index 25a60ca12c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
+deleted file mode 100644
+index 05fe44152d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_discover_pca_kernels.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_discover_pca_kernels const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_discover_pca_kernels & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_discover_pca_kernels & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_discover_pca_kernels*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_discover_pca_kernels* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
+deleted file mode 100644
+index b52e2355b2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// This is bvpl_io_discover_pca_kernels.h
+-#ifndef bvpl_io_discover_pca_kernels_h
+-#define bvpl_io_discover_pca_kernels_h
+-
+-//:
+-// \file
+-// \brief Binary IO for bvpl_discover_pca_kernels. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_discover_pca_kernels const &);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_discover_pca_kernels &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_discover_pca_kernels &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_discover_pca_kernels* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_discover_pca_kernels* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
+deleted file mode 100644
+index ef10f3ad61..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include "bvpl_io_global_corners.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_corners const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_corners & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_corners & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_corners*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_corners* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
+deleted file mode 100644
+index ac64d773d4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
++++ /dev/null
+@@ -1,44 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
+-#ifndef bvpl_io_global_cornerss_h
+-#define bvpl_io_global_cornerss_h
+-//:
+-// \file
+-// \brief Binary IO for bvpl_global_corners_125. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-typedef bvpl_global_corners bvpl_global_corners;
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_global_corners const &);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_global_corners &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_global_corners &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_global_corners* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_global_corners* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
+deleted file mode 100644
+index cac12cb25b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_global_pca.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_pca_125 const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_pca_125 & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_pca_125 & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_pca_125*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_pca_125* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
+deleted file mode 100644
+index 2858d03895..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
++++ /dev/null
+@@ -1,44 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
+-#ifndef bvpl_io_global_pca_h
+-#define bvpl_io_global_pca_h
+-//:
+-// \file
+-// \brief Binary IO for bvpl_global_pca_125. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-typedef bvpl_global_pca<125> bvpl_global_pca_125;
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_global_pca_125 const &);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_global_pca_125 &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_global_pca_125 &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_global_pca_125* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_global_pca_125* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
+deleted file mode 100644
+index 8c57308415..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
++++ /dev/null
+@@ -1,75 +0,0 @@
+-// This is bvpl_io_global_taylor.h
+-#ifndef bvpl_io_global_taylor_h
+-#define bvpl_io_global_taylor_h
+-
+-//:
+-// \file
+-// \brief Binary IO for bvpl_global_taylor. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-
+-//: Binary save parameters to stream.
+-template <class T, unsigned N>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_global_taylor<T,N> const &)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-//: Binary load parameters from stream.
+-template <class T, unsigned N>
+-void vsl_b_read(vsl_b_istream & is, bvpl_global_taylor<T,N> &p)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-template <class T, unsigned N>
+-void vsl_print_summary(std::ostream &os, const bvpl_global_taylor<T,N> &p)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-template <class T, unsigned N>
+-void vsl_b_read(vsl_b_istream& is, bvpl_global_taylor<T,N>* p)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-template <class T, unsigned N>
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_global_taylor<T,N>* &mp)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-template <class T, unsigned N>
+-void vsl_print_summary(std::ostream& os, const bvpl_global_taylor<T,N>* &p)
+-{
+-  if (p==0)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
+deleted file mode 100644
+index ff1de28596..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_pca_error_scenes.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_pca_error_scenes const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_pca_error_scenes & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_pca_error_scenes & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_pca_error_scenes*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_pca_error_scenes* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
+deleted file mode 100644
+index b0e98d6299..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// This is bvpl_io_pca_error_scenes.h
+-#ifndef bvpl_io_pca_error_scenes_h
+-#define bvpl_io_pca_error_scenes_h
+-
+-//:
+-// \file
+-// \brief Binary IO for bvpl_pca_error_scenes. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_pca_error_scenes);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_error_scenes &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_pca_error_scenes &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_pca_error_scenes* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_pca_error_scenes* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
+deleted file mode 100644
+index ba4155da13..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_taylor_scenes_map.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_taylor_scenes_map const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_taylor_scenes_map & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_taylor_scenes_map & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_taylor_scenes_map*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_taylor_scenes_map* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
+deleted file mode 100644
+index 3900318cd2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
++++ /dev/null
+@@ -1,38 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
+-#ifndef bvpl_io_taylor_scenes_map_h
+-#define bvpl_io_taylor_scenes_map_h
+-//:
+-// \file
+-// \brief Binary IO for bvpl_taylor_scenes_map.
+-//        Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_taylor_scenes_map);
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_scenes_map &m);
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_taylor_scenes_map &m);
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_taylor_scenes_map* m);
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_taylor_scenes_map* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &m);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
+deleted file mode 100644
+index 8c8f573ab9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( bvpl_octree_io_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_io_test_include bvpl_octree_io)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
+deleted file mode 100644
+index 4ddefe5f48..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_global_corners.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_global_pca.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_global_taylor.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+deleted file mode 100644
+index bbc90f7cea..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,31 +0,0 @@
+-# This is contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+-# bvxm's Process Library
+-
+-# bprb depends on expat and bvxm_pro depends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-
+-set(bvpl_octree_pro_sources
+-    bvpl_octree_processes.h
+-    bvpl_octree_register.h    bvpl_octree_register.cxx
+-   )
+-
+-aux_source_directory(Templates bvpl_octree_pro_sources)
+-aux_source_directory(processes bvpl_octree_pro_sources)
+-aux_source_directory(processes/pca bvpl_octree_pro_sources)
+-aux_source_directory(processes/taylor bvpl_octree_pro_sources)
+-aux_source_directory(processes/corners bvpl_octree_pro_sources)
+-aux_source_directory(processes/steerable_filters bvpl_octree_pro_sources)
+-
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_pro LIBRARY_SOURCES ${bvpl_octree_pro_sources})
+-target_link_libraries(bvpl_octree_pro bvpl_octree_io bvpl_octree bvpl_kernels_io boxm boct boxm_algo_pro boxm_sample boxm_util bprb brdb ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+deleted file mode 100644
+index 5de38b0662..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
+deleted file mode 100644
+index 9cf83eebc4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_discover_pca_kernels_sptr, "bvpl_discover_pca_kernels_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
+deleted file mode 100644
+index b2e7fa3fed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_global_corners_sptr, "bvpl_global_corners_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
+deleted file mode 100644
+index f911ce4589..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_global_pca_125_sptr, "bvpl_global_pca_125_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
+deleted file mode 100644
+index 1a079ac413..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_pca_error_scenes_sptr, "bvpl_pca_error_scenes_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+deleted file mode 100644
+index ee1188aea5..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
+deleted file mode 100644
+index 600668ef3f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_global_taylor_sptr, "bvpl_global_taylor_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
+deleted file mode 100644
+index 89d5581af3..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
++++ /dev/null
+@@ -1,61 +0,0 @@
+-#ifndef bvpl_octree_processes_h_
+-#define bvpl_octree_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-DECLARE_FUNC_CONS(bvpl_scene_vector_operator_process);
+-DECLARE_FUNC_CONS(bvpl_scene_kernel_operator_process);
+-DECLARE_FUNC_CONS(bvpl_block_kernel_operator_process);
+-DECLARE_FUNC_CONS(bvpl_save_vrml_process);
+-DECLARE_FUNC_CONS(bvpl_create_scene_process);
+-DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
+-DECLARE_FUNC_CONS(bvpl_nonmax_supp_process);
+-DECLARE_FUNC_CONS(bvpl_compute_gauss_gradients);
+-DECLARE_FUNC_CONS(bvpl_scene_histogram_process);
+-DECLARE_FUNC_CONS(bvpl_block_avg_value_process);
+-DECLARE_FUNC_CONS(bvpl_grad_scene_to_bin_process);
+-
+-
+-//PCA related
+-DECLARE_FUNC_CONS(bvpl_discover_pca_features_process);
+-DECLARE_FUNC_CONS(bvpl_compute_pca_test_error_process);
+-DECLARE_FUNC_CONS(bvpl_compute_pca_error_scene_process);
+-DECLARE_FUNC_CONS(bvpl_compute_pca_error_block_process);
+-DECLARE_FUNC_CONS(bvpl_load_pca_error_scenes_process);
+-DECLARE_FUNC_CONS(bvpl_add_pca_errors_process);
+-DECLARE_FUNC_CONS(bvpl_load_pca_info_process);
+-DECLARE_FUNC_CONS(bvpl_pca_project_process);
+-DECLARE_FUNC_CONS(bvpl_normalize_pca_training_error_process);
+-DECLARE_FUNC_CONS(bvpl_pca_global_statistics_process);
+-DECLARE_FUNC_CONS(bvpl_combine_pairwise_statistics_process);
+-DECLARE_FUNC_CONS(bvpl_global_pca_process);
+-DECLARE_FUNC_CONS(bvpl_init_global_pca_process);
+-DECLARE_FUNC_CONS(bvpl_load_global_pca_125_process);
+-DECLARE_FUNC_CONS(bvpl_pca_global_proj_error_process);
+-DECLARE_FUNC_CONS(bvpl_pca_global_add_error_process);
+-
+-//Taylor related
+-DECLARE_FUNC_CONS(bvpl_load_taylor_scenes_process);
+-DECLARE_FUNC_CONS(bvpl_compute_taylor_error_process);
+-DECLARE_FUNC_CONS(bvpl_add_taylor_errors_process);
+-DECLARE_FUNC_CONS(bvpl_init_global_taylor_process);
+-DECLARE_FUNC_CONS(bvpl_compute_taylor_coefficients_process);
+-DECLARE_FUNC_CONS(bvpl_explore_coefficient_scene_process);
+-DECLARE_FUNC_CONS(bvpl_load_global_taylor_process);
+-DECLARE_FUNC_CONS(bvpl_taylor_global_proj_error_process);
+-DECLARE_FUNC_CONS(bvpl_taylor_global_add_error_process);
+-
+-//Corner related
+-DECLARE_FUNC_CONS(bvpl_compute_harris_measure_process);
+-DECLARE_FUNC_CONS(bvpl_load_global_corners_process);
+-DECLARE_FUNC_CONS(bvpl_corner_statistics_process);
+-DECLARE_FUNC_CONS(bvpl_threshold_corners_process);
+-DECLARE_FUNC_CONS(bvpl_compute_beaudet_measure_process);
+-
+-//Steerable filters
+-DECLARE_FUNC_CONS(bvpl_init_sf_response_scene_process);
+-DECLARE_FUNC_CONS(bvpl_compute_sf_raw_response_process);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
+deleted file mode 100644
+index 189cb04ae3..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
++++ /dev/null
+@@ -1,81 +0,0 @@
+-#include "bvpl_octree_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "bvpl_octree_processes.h"
+-#include <bvpl_octree/bvpl_taylor_scenes_map.h>
+-#include <bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl_octree/bvpl_global_pca.h>
+-#include <bvpl_octree/bvpl_global_taylor.h>
+-#include <bvpl_octree/bvpl_global_corners.h>
+-
+-void bvpl_octree_register::register_datatype()
+-{
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  REGISTER_DATATYPE(bvpl_taylor_scenes_map_sptr);
+-  REGISTER_DATATYPE(bvpl_pca_error_scenes_sptr);
+-  REGISTER_DATATYPE(bvpl_discover_pca_kernels_sptr);
+-  REGISTER_DATATYPE(bvpl_global_pca_125_sptr);
+-  REGISTER_DATATYPE(bvpl_global_taylor_sptr);
+-  REGISTER_DATATYPE(bvpl_global_corners_sptr);
+-
+-}
+-
+-void bvpl_octree_register::register_process()
+-{
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_vector_operator_process, "bvplSceneVectorOperatorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_kernel_operator_process, "bvplSceneKernelOperatorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_kernel_operator_process, "bvplBlockKernelOperatorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_save_vrml_process, "bvplSaveVrmlProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_scene_process, "bvplCreateSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_nonmax_supp_process, "bvplNonmaxSuppProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_gauss_gradients, "bvplComputeGaussGradients");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_test_error_process, "bvplComputeTestErrorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_histogram_process, "bvplSceneHistorgramProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_grad_scene_to_bin_process, "bvplGradSceneToBinProcess");
+-
+-  //PCA related
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_discover_pca_features_process, "bvplDiscoverPCAFeaturesProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_scene_process, "bvplComputePCAErrorSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_block_process, "bvplComputePCAErrorBlockProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_error_scenes_process, "bvplLoadPCAErrorSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_avg_value_process, "bvplBlockAvgValueProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_pca_errors_process, "bvplAddPCAErrorsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_info_process, "bvplLoadPCAInfoProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_project_process, "bvplPCAProjectProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_normalize_pca_training_error_process, "bvplNormalizePCATrainingErrorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_global_statistics_process, "bvplPCAGlobalStatisticsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_combine_pairwise_statistics_process, "bvplCombinePairwiseStatisticsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_global_pca_process, "bvplGlobalPCAProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_pca_process, "bvplInitGlobalPCAProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_pca_125_process, "bvplLoadGlobalPCA125Process");
+-  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_proj_error_process);
+-  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_add_error_process);
+-
+-  //Taylor related
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_scenes_process, "bvplLoadTaylorScenesProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_error_process, "bvplComputeTaylorErrorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_taylor_errors_process, "bvplAddTaylorErrorsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_taylor_process, "bvplInitGlobalTaylorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_coefficients_process, "bvplComputeTaylorCoefficients");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_explore_coefficient_scene_process, "bvplExploreCoefficientSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_taylor_process, "bvplLoadGlobalTaylorProcess");
+-  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_proj_error_process);
+-  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_add_error_process);
+-
+-  //Corner related
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_threshold_corners_process, "bvplThresholdCornersProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_harris_measure_process, "bvplComputeHarrisMeasureProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_corners_process, "bvplLoadGlobalCornersProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_corner_statistics_process, "bvplCornerStatisticsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_beaudet_measure_process, "bvplComputeBeaudetMeasureProcess");
+-
+-  //Steerable filters
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_sf_response_scene_process, "bvplInitSFResponseSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_sf_raw_response_process, "bvplComputeSFRawResponseProcess");
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
+deleted file mode 100644
+index a72acdd9a2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef bvpl_octree_register_h_
+-#define bvpl_octree_register_h_
+-
+-class bvpl_octree_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // bvpl_octree_register_h_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
+deleted file mode 100644
+index 5a37180f2d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
++++ /dev/null
+@@ -1,81 +0,0 @@
+-//:
+-// \file
+-// \brief A process to add taylor error at a percentage of voxels in a block
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_block_avg_value_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_block_avg_value_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_avg_value_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_block_avg_value_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_avg_value_process_globals;
+-
+-  //get inputs
+-  unsigned i =0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto fraction_nsamples = pro.get_input<double>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!scene_base){
+-    std::cerr << "Error in bvpl_block_avg_value_process: Null error scene\n";
+-    return false;
+-  }
+-  auto* scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (scene_base.as_pointer());
+-  if (!scene){
+-    std::cerr << "Error in bvpl_block_avg_value_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  //sum errors within block
+-  auto scene_ncells = (double)scene->size();
+-  scene->load_block(block_i,block_j,block_k);
+-  auto tree_ncells = (double)scene->get_block(block_i,block_j,block_k)->get_tree()->size();
+-  double nsamples = scene_ncells * fraction_nsamples;
+-
+-  //number of samples - 10% of total number of leaf-cells
+-  auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
+-  std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
+-           << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
+-  double avg_value = bvpl_average_value(scene,block_i, block_j, block_k, tree_nsamples);
+-
+-  //store output
+-  pro.set_output_val<double>(0, avg_value);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
+deleted file mode 100644
+index 0602d6d2ed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
++++ /dev/null
+@@ -1,208 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 1-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
+-#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
+-#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-
+-#include <vul/vul_file.h>
+-
+-namespace bvpl_block_kernel_operator_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 8;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: process takes 6 inputs and has 1 output.
+-// * input[0]: The boxm_scene
+-// * input[1]: The kernels; bvpl_kernel_vector_sptr
+-// * input[2,3,4]: block index (i,j,k);
+-// * input[5]: String identifying functor type
+-// * input[6]: Output path to a dir where to store response blocks
+-
+-
+-bool bvpl_block_kernel_operator_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_kernel_operator_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i=0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "bvpl_kernel_sptr";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "vcl_string";
+-  input_types_[i++] = "vcl_string";
+-  input_types_[i++] = "double";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_block_kernel_operator_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_kernel_operator_process_globals;
+-
+-  if (pro.n_inputs() < n_inputs_)
+-  {
+-    std::cerr << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << '\n';
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  std::string functor_name = pro.get_input<std::string>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-  auto cell_length = pro.get_input<double>(i++);
+-  //short level = 0;
+-
+-  //print inputs
+-  std::cout << "In bvpl_block_kernel_operator:\n"
+-           << "Index(i,j,k) : (" << block_i << ',' << block_j << ',' << block_k << ")\n"
+-           << "Functor Name: " << functor_name << '\n'
+-           << "Output path: " << output_path  << '\n'
+-           << "Cell length" << cell_length << std::endl;
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cerr <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if (!kernel) {
+-    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
+-    return false;
+-  }
+-
+-
+-  switch (scene_base->appearence_model())
+-  {
+-    case BSTA_GAUSS_F1:
+-    {
+-      typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-      typedef boct_tree<short, gauss_type > tree_type;
+-      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-
+-      //parameters of the output scene are the same as those of the input scene
+-      boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      scene_out->set_paths(output_path, "gauss_response_scene");
+-      scene_out->set_appearance_model(BSTA_GAUSS_F1);
+-      if (!vul_file::exists(output_path + "/gauss_response_scene.xml"))
+-        scene_out->write_scene("/gauss_response_scene.xml");
+-
+-      //parameters of the output scene are the same as those of the input scene
+-      boxm_scene<boct_tree<short,bool> > *valid_scene =
+-      new boxm_scene<boct_tree<short,bool > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      valid_scene->set_paths(output_path, "valid_scene");
+-      valid_scene->set_appearance_model(BOXM_BOOL);
+-      if (!vul_file::exists(output_path + "/valid_scene.xml"))
+-        valid_scene->write_scene("/valid_scene.xml");
+-
+-      if (functor_name == "gauss_convolution") {
+-        bvpl_gauss_convolution_functor functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-
+-        return true;
+-      }
+-      else if (functor_name == "positive_gauss_convolution") {
+-        bvpl_positive_gauss_conv_functor functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-
+-        return true;
+-      }
+-      else
+-        return false;
+-
+-      break;
+-    }
+-    case BOXM_FLOAT:
+-    {
+-      typedef boct_tree<short, float > tree_type;
+-      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-      //parameters of the output scene are the same as those of the input scene
+-      boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      scene_out->set_paths(output_path, "response_scene");
+-      scene_out->set_appearance_model(BOXM_FLOAT);
+-      if (!vul_file::exists(output_path + "/float_response_scene.xml"))
+-        scene_out->write_scene("/float_response_scene.xml");
+-
+-      boxm_scene<boct_tree<short,bool> > *valid_scene =
+-      new boxm_scene<boct_tree<short,bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      valid_scene->set_paths(output_path, "valid_scene");
+-      valid_scene->set_appearance_model(BOXM_BOOL);
+-      if (!vul_file::exists(output_path + "/valid_scene.xml"))
+-        valid_scene->write_scene("/valid_scene.xml");
+-
+-      if (functor_name == "edge_algebraic_mean")
+-      {
+-        bvpl_edge_algebraic_mean_functor<float> functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-        return true;
+-      }
+-      else if (functor_name == "algebraic")
+-      {
+-        bvpl_algebraic_functor functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-        return true;
+-      }
+-      else
+-        return false;
+-
+-      break;
+-    }
+-    default:
+-      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
+-      return false;
+-  }
+-  return false;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
+deleted file mode 100644
+index 126deb3ac8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
++++ /dev/null
+@@ -1,86 +0,0 @@
+-//:
+-// \file
+-// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
+-// \author Isabel Restrepo
+-// \date 13-Oct-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-#include <boxm/boxm_scene.h>
+-
+-//: global variables
+-namespace bvpl_compute_gauss_gradients_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_compute_gauss_gradients_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_gauss_gradients_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";  //input scene
+-  input_types_[1] = "vcl_string";            //output path
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";  //output scene
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_compute_gauss_gradients(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_gauss_gradients_globals;
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  //Create the factory and get the vector of kernels
+-  bvpl_gauss3d_x_kernel_factory factory(1.0f,1.0f,1.0f);
+-  bvpl_create_directions_xyz dir;
+-  bvpl_kernel_vector_sptr kernels = factory.create_kernel_vector(dir);
+-
+-  //get scene
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
+-  {
+-    boxm_scene<grad_tree_type> *scene_out =
+-    new boxm_scene<grad_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "float_gradient_scene");
+-    scene_out->set_appearance_model(VNL_FLOAT_3);
+-    scene_out->write_scene("float_gradient_scene.xml");
+-
+-    bvpl_algebraic_functor functor;
+-    bvpl_scene_vector_operator vector_oper;
+-    vector_oper.operate(*scene_in, functor, kernels, *scene_out);
+-    //store output
+-    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-    scene_ptr = scene_out;
+-    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-    bsta_histogram<float> magnitude_hist;
+-    bvpl_compute_scene_statistics(scene_out, magnitude_hist);
+-    std::cout << "Histogram:\n" << magnitude_hist << std::endl;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
+deleted file mode 100644
+index e175191e55..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
++++ /dev/null
+@@ -1,88 +0,0 @@
+-//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
+-#include <iostream>
+-#include <string>
+-#include <boxm/boxm_scene_base.h>
+-//:
+-// \file
+-// \brief A process loading xml parameters of a boxm_scene of types specific to bvpl_octree
+-//
+-// \author Isabel Restrepo
+-// \date Nov 15, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-//:global variables
+-namespace bvpl_create_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//:sets input and output types
+-bool bvpl_create_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_create_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:creates a scene from parameters
+-bool bvpl_create_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_create_scene_process_globals;
+-  std::string fname = pro.get_input<std::string>(0);
+-
+-  boxm_scene_parser parser;
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-  scene_ptr->load_scene(fname, parser);
+-  if (scene_ptr->appearence_model() == BVPL_SAMPLE_FLOAT) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bvpl_octree_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BVPL_SAMPLE_BSTA_GAUSS_F1) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else {
+-    std::cerr << "bvpl_create_scene_process: undefined datatype\n";
+-    return false;
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
+deleted file mode 100644
+index 39195ec048..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
++++ /dev/null
+@@ -1,136 +0,0 @@
+-//:
+-// \file
+-// \brief A process to save a gradient scene to a flat binary file
+-// \author Isabel Restrepo
+-// \date 3-Aug-2011
+-
+-#include <iostream>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//:global variables
+-namespace bvpl_grad_scene_to_bin_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_grad_scene_to_bin_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_grad_scene_to_bin_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "boxm_scene_base_sptr";  //alpha scene
+-  input_types_[i++] = "boxm_scene_base_sptr";  //gradient scene
+-  input_types_[i++] = "vcl_string";            //output binary file
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_grad_scene_to_bin_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_grad_scene_to_bin_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr alpha_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr grad_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string output_file = pro.get_input<std::string>(i++);
+-
+-  //get scene
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
+-
+-  std::ofstream os(output_file.c_str(), std::ios::out);
+-
+-  if (auto *alpha_scene = dynamic_cast<boxm_scene< float_tree_type >* >(alpha_scene_base.as_pointer()))
+-  {
+-    if (auto *grad_scene = dynamic_cast<boxm_scene< grad_tree_type >* >(grad_scene_base.as_pointer()))
+-    {
+-      double cell_length = alpha_scene->finest_cell_length();
+-      short finest_level = alpha_scene->finest_level();
+-
+-      bool read_only = true;
+-
+-      boxm_cell_iterator<float_tree_type > alpha_iter = alpha_scene->cell_iterator(&boxm_scene<float_tree_type >::load_block_and_neighbors, read_only);
+-      alpha_iter.begin();
+-
+-      boxm_cell_iterator<grad_tree_type > grad_iter = grad_scene->cell_iterator(&boxm_scene<grad_tree_type >::load_block, read_only);
+-      grad_iter.begin();
+-
+-      long unsigned n_grads = 0;
+-
+-      while ( !(alpha_iter.end() || grad_iter.end()) )
+-      {
+-        boct_tree_cell<short, float> *alpha_cell = *alpha_iter;
+-        boct_tree_cell<short, vnl_vector_fixed< float,3 > > *grad_cell = *grad_iter;
+-
+-        boct_loc_code<short> grad_code = grad_cell->get_code();
+-        boct_loc_code<short> alpha_code = alpha_cell->get_code();
+-
+-        //if level and location code of cells isn't the same then continue
+-        if ((alpha_cell->level() != grad_cell->level()) || !(alpha_code.isequal(&grad_code))) {
+-          std::cerr << " Input and output cells don't have the same structure\n";
+-          ++alpha_iter;
+-          ++grad_iter;
+-          continue;
+-        }
+-
+-        //we are only interested in finest resolution
+-        if ((!(alpha_cell->level() == finest_level)) || !alpha_cell->is_leaf()) {
+-          ++alpha_iter;
+-          ++grad_iter;
+-          continue;
+-        }
+-
+-        vgl_point_3d<double> centroid = alpha_iter.global_centroid();
+-        vnl_vector_fixed< float,3 > grad = grad_cell->data();
+-        float p_x = 1.0f - (float)std::exp(- (alpha_cell->data() * cell_length ));
+-#if 0
+-        vsl_b_write(os, (float)centroid.x());
+-        vsl_b_write(os, (float)centroid.y());
+-        vsl_b_write(os, (float)centroid.z());
+-        vsl_b_write(os, grad[0]);
+-        vsl_b_write(os, grad[1]);
+-        vsl_b_write(os, grad[2]);
+-        vsl_b_write(os, p_x);
+-#endif
+-
+-        os << (float)centroid.x() << ' '
+-           << (float)centroid.y() << ' '
+-           << (float)centroid.z() << ' '
+-           << grad[0] << ' '
+-           << grad[1] << ' '
+-           << grad[2] << ' '
+-           << p_x << '\n';
+-
+-        ++alpha_iter;
+-        ++grad_iter;
+-        n_grads++;
+-      }
+-
+-      grad_scene->unload_active_blocks();
+-      alpha_scene->unload_active_blocks();
+-      os.close();
+-      std::cout << "Wrote " << n_grads << " gradients\n";
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
+deleted file mode 100644
+index b53398692b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
++++ /dev/null
+@@ -1,178 +0,0 @@
+-//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for spreading the plane information of the cell to the neighbors
+-// \author Gamze Tunali
+-// \date   Mar 19, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-#include <bvpl/bvpl_neighb_operator.h>
+-#include <bvpl/kernels/bvpl_kernel_iterator.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
+-
+-namespace bvpl_nonmax_supp_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 4;
+-  constexpr unsigned int n_outputs_ = 1;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool bvpl_nonmax_supp_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_nonmax_supp_process_globals;
+-
+-  // process takes 4 inputs:
+-  //input[0]: The scene
+-  //input[1]: the scene path for the output scene
+-  //input[2]: block prefix for the output scene
+-  //input[3]: the filename for the new scene xml file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-
+-  // process has 1 output:
+-  // output[0]: the new scene with updated cell information
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool bvpl_nonmax_supp_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_nonmax_supp_process_globals;
+-
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string scene_path = pro.get_input<std::string>(1);
+-  std::string block_prefix = pro.get_input<std::string>(2);
+-  std::string scene_filename = pro.get_input<std::string>(3);
+-  boxm_scene_base_sptr output_scene_sptr;
+-
+-  // only applies to the edge_line type of scenes
+-  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
+-    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-    typedef boct_tree_cell<short,boxm_inf_line_sample<float> > cell_type;
+-    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-       return false;
+-    }
+-
+-    auto *output_scene=new boxm_scene<tree_type>(*scene);
+-    output_scene->set_paths(scene_path, block_prefix);
+-    output_scene_sptr = output_scene;
+-
+-    // create a kernel for 3x3 neighborhood
+-    bvpl_kernel_iterator k_iter;
+-    vgl_point_3d<int> min_pt(-1,-1,-1);
+-    vgl_point_3d<int> max_pt(1,1,1);
+-    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
+-      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
+-        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
+-          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
+-        }
+-      }
+-    }
+-    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
+-
+-    boxm_block_iterator<tree_type> iter(scene);
+-    boxm_block_iterator<tree_type> output_iter(output_scene);
+-    iter.begin();
+-    output_iter.begin();
+-
+-    while (!iter.end())
+-    {
+-      scene->load_block(iter.index());
+-      output_scene->load_block(iter.index());
+-      boxm_block<tree_type>* block = *iter;
+-      boxm_block<tree_type>* output_block = *output_iter;
+-
+-      tree_type* tree = block->get_tree();
+-      std::vector<cell_type *> cells = tree->leaf_cells();
+-
+-      tree_type* output_tree=tree->clone();
+-      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
+-
+-      bvpl_octree_neighbors<boxm_inf_line_sample<float> > oper(tree);
+-      for (unsigned i=0; i<cells.size(); i++) {
+-        cell_type *cell=cells[i];
+-        cell_type *output_cell=output_cells[i];
+-        std::vector<cell_type *> neighb_cells;
+-        oper.neighbors(kernel, cells[i], neighb_cells);
+-
+-        float residual = cell->data().residual_;
+-
+-        bool min=true;
+-        for (unsigned n=0; n<neighb_cells.size()&& min; n++) {
+-          cell_type *neighbor = neighb_cells[n];
+-          boct_loc_code<short> cell_code=cell->code_;
+-          boct_loc_code<short> n_code = neighbor->code_;
+-          bool itself = n_code.isequal(&cell_code);
+-          // do not include itself in the list
+-          if (!itself) {
+-            float r = neighbor->data().residual_;
+-            if ( r < residual)
+-              min=false;
+-          }
+-
+-          if (min) {
+-            boxm_inf_line_sample<float> data = cell->data();
+-            output_cell->set_data(data);
+-          }
+-        }
+-      }
+-      output_block->delete_tree();
+-      output_block->set_tree(output_tree);
+-      output_scene->write_active_block();
+-      iter++;
+-    }
+-    output_scene->write_scene(scene_filename);
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
+deleted file mode 100644
+index 2c503cdbf2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
++++ /dev/null
+@@ -1,209 +0,0 @@
+-//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <set>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for spreading the plane information of the cell to the neighbors
+-// \author Gamze Tunali
+-// \date   Mar 19, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-
+-#include <bvpl/bvpl_neighb_operator.h>
+-#include <bvpl/kernels/bvpl_kernel_iterator.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
+-
+-struct ltstr
+-{
+-  bool operator()(const boxm_plane_obs<float> & p1, const boxm_plane_obs<float> & p2) const
+-  {
+-      if(p1.plane_.a()<p2.plane_.a())
+-          return true;
+-      else if(p1.plane_.a()>p2.plane_.a())
+-          return false;
+-      else
+-      {
+-          if(p1.plane_.b()<p2.plane_.b())
+-              return true;
+-          else if(p1.plane_.b()>p2.plane_.b())
+-              return false;
+-          else
+-          {
+-              if(p1.plane_.c()<p2.plane_.c())
+-                  return true;
+-              else if(p1.plane_.c()>p2.plane_.c())
+-                  return false;
+-              else
+-              {
+-                  if(p1.plane_.d()<p2.plane_.d())
+-                      return true;
+-                  else
+-                      return false;
+-              }
+-          }
+-      }
+-  }
+-};
+-
+-namespace bvpl_plane_propagate_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 4;
+-  constexpr unsigned int n_outputs_ = 1;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool bvpl_plane_propagate_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_plane_propagate_process_globals;
+-
+-  // process takes 4 inputs:
+-  //input[0]: The scene
+-  //input[1]: the scene path for the output scene
+-  //input[2]: block prefix for the output scene
+-  //input[3]: the filename for the new scene xml file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-
+-  // process has 1 output:
+-  // output[0]: the new scene with updated cell information
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool bvpl_plane_propagate_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_plane_propagate_process_globals;
+-
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string scene_path = pro.get_input<std::string>(1);
+-  std::string block_prefix = pro.get_input<std::string>(2);
+-  std::string scene_filename = pro.get_input<std::string>(3);
+-  boxm_scene_base_sptr output_scene_sptr;
+-  // only applies to the edge_line type of scenes
+-  if (scene_base->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
+-    typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
+-    typedef boct_tree_cell<short,boxm_edge_tangent_sample<float> > cell_type;
+-    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-       return false;
+-    }
+-
+-    auto *output_scene=new boxm_scene<tree_type>(*scene);
+-    output_scene->set_paths(scene_path, block_prefix);
+-    output_scene_sptr = output_scene;
+-    // create a kernel for 3x3 neighborhood
+-    bvpl_kernel_iterator k_iter;
+-    vgl_point_3d<int> min_pt(-1,-1,-1);
+-    vgl_point_3d<int> max_pt(1,1,1);
+-    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
+-      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
+-        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
+-          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
+-        }
+-      }
+-    }
+-    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
+-
+-    boxm_block_iterator<tree_type> iter(scene);
+-    boxm_block_iterator<tree_type> output_iter(output_scene);
+-    iter.begin();
+-    output_iter.begin();
+-
+-    while (!iter.end())
+-    {
+-      scene->load_block(iter.index());
+-      output_scene->load_block(iter.index());
+-      boxm_block<tree_type>* block = *iter;
+-      boxm_block<tree_type>* output_block = *output_iter;
+-
+-      tree_type* tree = block->get_tree();
+-      std::vector<cell_type *> cells = tree->leaf_cells();
+-
+-      tree_type* output_tree=tree->clone();
+-      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
+-
+-      bvpl_octree_neighbors<boxm_edge_tangent_sample<float> > oper(tree);
+-      for (unsigned i=0; i<cells.size(); i++) {
+-        cell_type *cell=cells[i];
+-        cell_type *output_cell=output_cells[i];
+-        std::vector<cell_type *> neighb_cells;
+-        oper.neighbors(kernel, cells[i], neighb_cells);
+-        std::set<boxm_plane_obs<float>,ltstr> planes;
+-
+-        for (auto neighbor : neighb_cells) {
+-          boct_loc_code<short> cell_code=cell->code_;
+-          boct_loc_code<short> n_code = neighbor->code_;
+-          bool itself = n_code.isequal(&cell_code);
+-         if (!itself) {
+-             std::vector<boxm_plane_obs<float> > observations = neighbor->data().obs_list();
+-             boxm_edge_tangent_sample<float> data=output_cell->data();
+-             data.insert(observations);
+-             output_cell->set_data(data);
+-            }
+-        }
+-      }
+-      //  std::set<boxm_plane_obs<float>,ltstr >::iterator iter1=planes.begin();
+-      //  boxm_edge_tangent_sample<float> data;
+-      //  for(;iter1!=planes.end();iter1++)
+-      //  {
+-      //      data.insert(*iter1);
+-      //  }
+-      //  output_cell->set_data(data);
+-      //}
+-      output_block->delete_tree();
+-      output_block->set_tree(output_tree);
+-      output_scene->write_active_block();
+-      iter++;
+-    }
+-    output_scene->write_scene(scene_filename);
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
+deleted file mode 100644
+index 5adb8cc4ec..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
++++ /dev/null
+@@ -1,89 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief process saves a boxm_scene of kernel responses to a vrml file
+-//
+-// \author Isabel Restrepo
+-// \date December 10, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace bvpl_save_vrml_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: process takes 3 inputs and has no outputs.
+-// input[0]: The scene
+-// input[1]: The vector of kernels
+-// input[2]: Path to output vrml file
+-// No outputs
+-
+-bool bvpl_save_vrml_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_save_vrml_process_globals;
+-
+-  //process takes 3 inputs but has no outputs
+-  std::vector<std::string> output_types_(n_outputs_);
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "bvpl_kernel_vector_sptr";
+-  input_types_[2] = "vcl_string";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_save_vrml_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_save_vrml_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  bvpl_kernel_vector_sptr kernel_vector = pro.get_input<bvpl_kernel_vector_sptr>(1);
+-  std::string vrml_path = pro.get_input<std::string>(2);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  std::ofstream ofs(vrml_path.c_str());
+-
+-  if (auto *scene_in =
+-      dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >* > (scene_base.as_pointer()))
+-  {
+-    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
+-  }
+-  else if (auto *scene_in =
+-           dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > >* >(scene_base.as_pointer()))
+-  {
+-    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
+-  }
+-  else {
+-    std::cerr << "In bvpl_save_vrml_process: Unsupported scene type\n";
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
+deleted file mode 100644
+index f3d93180ba..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
++++ /dev/null
+@@ -1,66 +0,0 @@
+-//:
+-// \file
+-// \brief Process to explore the histogram of a scene
+-// \author Isabel Restrepo
+-// \date 18-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-//:global variables
+-namespace bvpl_scene_histogram_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_scene_histogram_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_histogram_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_scene_histogram_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_histogram_process_globals;
+-
+-  //get inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  if (!scene_base){
+-    std::cerr << "Null scene\n";
+-    return false;
+-  }
+-
+-  switch (scene_base->appearence_model())
+-  {
+-    case BOXM_FLOAT:
+-    {
+-      typedef boct_tree<short, float > tree_type;
+-      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-      bsta_histogram<float> hist;
+-      bvpl_compute_scene_statistics(scene_in, hist);
+-      hist.pretty_print();
+-      break;
+-    }
+-    default:
+-      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
+-      return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
+deleted file mode 100644
+index 9d7c20ba2c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
++++ /dev/null
+@@ -1,179 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for running a kernel to a boxm_scene
+-// \author Isabel Restrepo
+-// \date January 29, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
+-#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
+-#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-
+-namespace bvpl_scene_kernel_operator_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 5 inputs and has 1 output.
+-// * input[0]: The boxm_scene
+-// * input[1]: The kernel
+-// * input[2]: The grid type:
+-//           - float
+-//           - opinion
+-//           - ...
+-// * input[3]: String identifying functor type
+-// * input[4]: Output path to a dir where to store, id octree and response octree
+-//
+-// * output[0]: Output scene with response and kernel id
+-
+-bool bvpl_scene_kernel_operator_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_kernel_operator_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "bvpl_kernel_sptr";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_scene_kernel_operator_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_kernel_operator_process_globals;
+-
+-  if (pro.n_inputs() < n_inputs_)
+-  {
+-    std::cerr << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << '\n';
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
+-  std::string datatype = pro.get_input<std::string>(i++);
+-  std::string functor_name = pro.get_input<std::string>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-  //short level = 0;
+-
+-  //print inputs
+-  std::cout << "In bvpl_scene_kernel_operator:\n"
+-           << "Datatype:     " << datatype << std::endl
+-           << "Functor Name: " << functor_name << std::endl;
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cerr <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if ( !kernel ) {
+-    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-
+-  if (datatype == "bsta_gauss_f1")
+-  {
+-    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-    typedef boct_tree<short, gauss_type > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-    double finest_cell_length = scene_in->finest_cell_length();
+-    kernel->set_voxel_length(finest_cell_length);
+-
+-    //parameters of the output scene are the same as those of the input scene
+-    boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "gauss_response_scene");
+-    scene_out->set_appearance_model(BSTA_GAUSS_F1);
+-    scene_out->write_scene("/gauss_response_scene.xml");
+-
+-    if (functor_name == "gauss_convolution") {
+-      bvpl_gauss_convolution_functor functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-      return true;
+-    }
+-    else if (functor_name == "positive_gauss_convolution") {
+-      bvpl_positive_gauss_conv_functor functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-      //clean memory
+-      scene_in->unload_active_blocks();
+-      scene_out->unload_active_blocks();
+-
+-      return true;
+-    }
+-      return false;
+-  }
+-  else if (datatype == "float")
+-  {
+-    typedef boct_tree<short, float > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-    double finest_cell_length = scene_in->finest_cell_length();
+-    kernel->set_voxel_length(finest_cell_length);
+-    //parameters of the output scene are the same as those of the input scene
+-    boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "response_scene");
+-    scene_out->set_appearance_model(BOXM_FLOAT);
+-    scene_out->write_scene("/float_response_scene.xml");
+-
+-    if (functor_name == "edge_algebraic_mean") {
+-      bvpl_edge_algebraic_mean_functor<float> functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-      return true;
+-    }
+-    else if (functor_name == "algebraic") {
+-      bvpl_algebraic_functor functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-      return true;
+-    }
+-    else
+-      return false;
+-  }
+-  else
+-    return false;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
+deleted file mode 100644
+index 74762468c1..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
++++ /dev/null
+@@ -1,151 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for successively running a kernel(of a vector), applying non-max suppression and combining with previous result
+-// \author Isabel Restrepo
+-// \date December 2, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel_factory.h>
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-
+-namespace bvpl_scene_vector_operator_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 6 inputs and has 1 output.
+-// * input[0]: The boxm_scene
+-// * input[1]: The kernels; bvpl_kernel_vector_sptr
+-// * input[2]: The grid type:
+-//           - float
+-//           - opinion
+-//           - ...
+-// * input[3]: String identifying octree_vector_operator (e.g. max)
+-// * input[4]: String identifying functor type
+-// * input[5]: Output path to a dir where to store, id octree and response octree
+-//
+-// * output[0]: Output scene with response and kernel id
+-
+-
+-bool bvpl_scene_vector_operator_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_vector_operator_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "bvpl_kernel_vector_sptr";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "vcl_string";
+-  input_types_[5] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_scene_vector_operator_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_vector_operator_process_globals;
+-
+-  if (pro.n_inputs() < n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_kernel_vector_sptr kernel_vec = pro.get_input<bvpl_kernel_vector_sptr>(i++);
+-  std::string datatype = pro.get_input<std::string>(i++);
+-  std::string operator_name = pro.get_input<std::string>(i++);
+-  std::string functor_name = pro.get_input<std::string>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if ( !kernel_vec ) {
+-    std::cout << pro.name() << " :-- Kernel is not valid!\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-
+-  if (datatype == "float")
+-  {
+-    typedef boct_tree<short, float > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-    //parameters of the output scene are the same as thos of the input scene
+-    boxm_scene<boct_tree<short, bvpl_octree_sample<float> > > *scene_out =
+-    new boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
+-    scene_out->set_paths(output_path, "response_scene");
+-    scene_out->set_appearance_model(BVPL_SAMPLE_FLOAT);
+-    scene_out->write_scene("/response_scene.xml");
+-    if (operator_name == "max_vector_operator")
+-    {
+-      bvpl_max_vector_operator<float> max_oper;
+-
+-      if (functor_name == "edge_geometric_mean") {
+-        bvpl_edge_geometric_mean_functor<float> functor;
+-        bvpl_scene_vector_operator scene_oper;
+-        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
+-        scene_ptr = scene_out;
+-        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-        return true;
+-      }
+-    }
+-  }
+-  if (datatype == "bsta_gauss_f1")
+-  {
+-    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-    typedef boct_tree<short, gauss_type > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-    //parameters of the output scene are the same as thos of the input scene
+-    boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > > *scene_out =
+-    new boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
+-    scene_out->set_paths(output_path, "response_scene");
+-    scene_out->set_appearance_model(BVPL_SAMPLE_BSTA_GAUSS_F1);
+-    scene_out->write_scene("/response_scene.xml");
+-    if (operator_name == "max_vector_operator")
+-    {
+-      bvpl_max_vector_operator<gauss_type> max_oper;
+-
+-      if (functor_name == "gauss_convolution") {
+-        bvpl_gauss_convolution_functor functor;
+-        bvpl_scene_vector_operator scene_oper;
+-        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
+-        scene_ptr = scene_out;
+-        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-        return true;
+-      }
+-    }
+-    return false;
+-  }
+-  else
+-    return false;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
+deleted file mode 100644
+index 93af3679c8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
++++ /dev/null
+@@ -1,64 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (beaudet)
+-// \author Isabel Restrepo
+-// \date 27-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_compute_beaudet_measure_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_beaudet_measure_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_beaudet_measure_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_beaudet_measure_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_beaudet_measure_process_globals;
+-
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->compute_beaudet_corners(global_taylor, scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
+deleted file mode 100644
+index 94d872196d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
++++ /dev/null
+@@ -1,65 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (Harris)
+-// \author Isabel Restrepo
+-// \date 20-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_compute_harris_measure_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_harris_measure_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_harris_measure_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_harris_measure_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_harris_measure_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->compute_laptev_corners(global_taylor, scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
+deleted file mode 100644
+index 16f6bd1cd0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
++++ /dev/null
+@@ -1,57 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (Harris)
+-// \author Isabel Restrepo
+-// \date 20-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_corner_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_corner_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_corner_statistics_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_corner_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_corner_statistics_process_globals;
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->explore_corner_statistics(global_taylor, scene_id);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
+deleted file mode 100644
+index 9c003728ca..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl_octree/bvpl_global_corners.h>
+-
+-//: global variables
+-namespace bvpl_load_global_corners_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_load_global_corners_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_corners_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_global_corners_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_load_global_corners_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_corners_process_globals;
+-
+-  // get inputs
+-  std::string corners_file = pro.get_input<std::string>(0);
+-  auto *global_corners = new bvpl_global_corners(corners_file);
+-
+-  // store output
+-  pro.set_output_val<bvpl_global_corners_sptr>(0, global_corners);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
+deleted file mode 100644
+index af283e13ec..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (Harris)
+-// \author Isabel Restrepo
+-// \date 20-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_threshold_corners_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_threshold_corners_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_threshold_corners_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-  input_types_[i++] = "float"; //threshold
+-  input_types_[i++] = "vcl_string"; //output path for thresholded scenes
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_threshold_corners_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_threshold_corners_process_globals;
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  auto corner_thresh = pro.get_input<float>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->threshold_laptev_corners(global_taylor, scene_id, corner_thresh, output_path);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
+deleted file mode 100644
+index c4eebb2560..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
++++ /dev/null
+@@ -1,94 +0,0 @@
+-//:
+-// \file
+-// \brief A process to add Taylor error at a percentage of voxels in a block
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_add_pca_errors_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_add_pca_errors_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_pca_errors_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
+-  input_types_[i++] = "unsigned"; //dimension
+-  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_add_pca_errors_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_pca_errors_process_globals;
+-
+-  //get inputs
+-  unsigned i =0;
+-  bvpl_pca_error_scenes_sptr error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
+-  auto dim = pro.get_input<unsigned>(i++);
+-  auto fraction_nsamples = pro.get_input<double>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!error_scenes) {
+-    std::cerr << "Error in bvpl_add_pca_errors_process: Null error scene\n";
+-    return false;
+-  }
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scenes->get_scene(dim).as_pointer());
+-  if (!error_scene) {
+-    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  //sum errors within block
+-  double error = 0;
+-  if (fraction_nsamples < 0.95)
+-  {
+-    auto scene_ncells = (double)error_scene->size();
+-    error_scene->load_block(block_i,block_j,block_k);
+-    auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
+-    double nsamples = scene_ncells * fraction_nsamples;
+-
+-    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
+-    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
+-             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << '\n';
+-    error = bvpl_average_value(error_scene,block_i, block_j, block_k, tree_nsamples);
+-    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
+-  }
+-  else
+-  {
+-    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
+-    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
+-  }
+-
+-  //store output
+-  pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
+deleted file mode 100644
+index f6fb2f5d0a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
++++ /dev/null
+@@ -1,95 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 17-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_matrix_fixed.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_combine_pairwise_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_combine_pairwise_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_combine_pairwise_statistics_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i=0;
+-  input_types_[i++] = "vcl_string" ; //stats_file1
+-  input_types_[i++] = "vcl_string" ; //stats_file2
+-  input_types_[i++] = "vcl_string" ; //stats_file_out
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_combine_pairwise_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_combine_pairwise_statistics_process_globals;
+-
+-  //get inputs
+-  unsigned i= 0;
+-  std::string stats_file1 = pro.get_input<std::string>(i++);
+-  std::string stats_file2 = pro.get_input<std::string>(i++);
+-  std::string stats_file_out = pro.get_input<std::string>(i++);
+-
+-  //load files
+-  vnl_matrix_fixed<double, 125, 125> S1(0.0);
+-  vnl_vector_fixed<double, 125> mean1(0.0);
+-  unsigned long nfeatures1 =0;
+-  {
+-    std::ifstream stats_ifs(stats_file1.c_str());
+-    if (!stats_ifs.is_open()) {
+-      std::cerr << "Error: Failed to open file1\n";
+-      return false;
+-    }
+-    stats_ifs >> nfeatures1 >> mean1 >> S1;
+-    stats_ifs.close();
+-
+-  }
+-
+-  vnl_matrix_fixed<double, 125, 125> S2(0.0);
+-  vnl_vector_fixed<double, 125> mean2(0.0);
+-  unsigned long nfeatures2 =0;
+-
+-  {
+-    std::ifstream stats_ifs(stats_file2.c_str());
+-    if (!stats_ifs.is_open()) {
+-      std::cerr << "Warning: Failed to open file2 - output file will be identical to file1\n";
+-      std::ofstream stats_ofs(stats_file_out.c_str());
+-      stats_ofs.precision(15);
+-      stats_ofs << nfeatures1 << '\n' << mean1 << '\n' << S1;
+-      return true;
+-    }
+-    stats_ifs >> nfeatures2 >> mean2 >> S2;
+-    stats_ifs.close();
+-  }
+-
+-  vnl_matrix_fixed<double, 125, 125> S_out(0.0);
+-  vnl_vector_fixed<double, 125> mean_out(0.0);
+-  double nfeatures_out =0.0;
+-  bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
+-
+-  std::ofstream stats_ofs(stats_file_out.c_str());
+-  stats_ofs.precision(15);
+-  stats_ofs << nfeatures_out << '\n' << mean_out << '\n' << S_out;
+-  stats_ofs.close();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
+deleted file mode 100644
+index e6acd1accd..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
++++ /dev/null
+@@ -1,69 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute reconstruction error over all samples in a scene (test + train)
+-// \author Isabel Restrepo
+-// \date 13-Jan-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-//:global variables
+-namespace bvpl_compute_pca_error_block_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;        //directory path, where pca_info.xml is
+-  constexpr unsigned n_outputs_ = 0;       //error file
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_pca_error_block_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_block_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_discover_pca_kernels_sptr" ;  //directory path
+-  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
+-  input_types_[i++] = "int";   //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "unsigned";  //num_components
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_pca_error_block_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_block_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_discover_pca_kernels_sptr pca_extractor = pro.get_input<bvpl_discover_pca_kernels_sptr>(i++);
+-  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  auto num_components = pro.get_input<unsigned>(i++);
+-
+-  if (!pca_extractor)
+-    return false;
+-
+-  if (!pca_error_scenes)
+-    return false;
+-
+-  //bvpl_discover_pca_kernels pca_extractor(pca_dir);
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
+-  pca_extractor->compute_testing_error(error_scene, num_components, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
+deleted file mode 100644
+index 70d9cf1a4b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
++++ /dev/null
+@@ -1,132 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute reconstruction error over all samples in a scene (test + train)
+-// \author Isabel Restrepo
+-// \date 13-Jan-2011
+-
+-#include <iostream>
+-#include <cstdlib>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-#include <vul/vul_file.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-// global variables
+-namespace bvpl_compute_pca_error_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;        //directory path, where pca_info.xml is
+-  constexpr unsigned n_outputs_ = 0;       //error file
+-}
+-
+-
+-// sets input and output types
+-bool bvpl_compute_pca_error_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string" ;  //directory path
+-  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
+-  input_types_[i++] = "unsigned";  //num_components
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-// helper code to launch and manage pthreads
+-namespace {
+-  struct pthread_data
+-  {
+-    bvpl_discover_pca_kernels* pca_extractor;
+-    boxm_scene<boct_tree<short,float> > * error_scene;
+-    vgl_point_3d<int> block_idx;
+-    unsigned num_components;
+-  };
+-
+-  void* pthread_launcher(void *arg)
+-  {
+-    pthread_data *pd = reinterpret_cast<pthread_data*>(arg);
+-    vgl_point_3d<int> block_idx = pd->block_idx;
+-    pd->pca_extractor->compute_testing_error_thread_safe(pd->error_scene, pd->num_components, block_idx.x(), block_idx.y(), block_idx.z());
+-    //delete pd;
+-    return arg;
+-  }
+-}
+-#endif
+-
+-// the process
+-bool bvpl_compute_pca_error_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_scene_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  std::string pca_dir = pro.get_input<std::string>(i++);
+-  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
+-  auto num_components = pro.get_input<unsigned>(i++);
+-
+-  if (!vul_file::is_directory(pca_dir))
+-    return false;
+-
+-  if (!pca_error_scenes)
+-    return false;
+-
+-  auto *pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
+-  vgl_vector_3d<unsigned int> num_blocks = pca_extractor->data_scene_dim();
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-  pca_extractor->load_all_scene_blocks();
+-  error_scene->read_all_blocks();
+-  unsigned num_threads = 0;
+-  std::vector<vgl_point_3d<int> > block_indices;
+-  for (unsigned block_i = 0; block_i < num_blocks.x(); ++block_i) {
+-    for (unsigned block_j = 0; block_j < num_blocks.y(); ++block_j) {
+-      for (unsigned block_k = 0; block_k < num_blocks.z(); ++block_k) {
+-        block_indices.push_back(vgl_point_3d<int>(block_i,block_j,block_k));
+-        ++num_threads;
+-      }
+-    }
+-  }
+-
+-  pthread_t* thread_id = new pthread_t[num_threads]; // beware of memory leaks ...
+-
+-  for (unsigned i =0; i < num_threads; ++i)
+-  {
+-    pthread_data* pd = new pthread_data();
+-    pd->pca_extractor = pca_extractor;
+-    pd->error_scene = error_scene;
+-    pd->num_components = num_components;
+-    pd->block_idx= block_indices[i];
+-    int rc = pthread_create(&thread_id[i], NULL, pthread_launcher, (void*) pd );
+-    //pthread_detach(thread_id[i]);
+-    if (rc)
+-    {
+-      std::cerr << "Error creating pthread, return code: "<<rc<<'\n';
+-      std::exit(-1);
+-    }
+-  }
+-#if 0
+-  for (unsigned i =0; i < num_threads; ++i)
+-  {
+-    pca_extractor.compute_testing_error_thread_safe(error_scene, num_components, block_indices[i].x(), block_indices[i].y(), block_indices[i].z());
+-  }
+-  pca_extractor.unload_all_scene_blocks();
+-#endif
+-
+-#endif // PTHREADS
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
+deleted file mode 100644
+index 775dc4cb23..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
++++ /dev/null
+@@ -1,59 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute reconstruction error over all samples in a scene (test + train)
+-// \author Isabel Restrepo
+-// \date 13-Jan-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-
+-//:global variables
+-namespace bvpl_compute_pca_test_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;        //directory path, where pca_info.xml is
+-  constexpr unsigned n_outputs_ = 1;       //error file
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_pca_test_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_test_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string" ;
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "vcl_string";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_pca_test_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_test_error_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-
+-  bvpl_discover_pca_kernels pca_extractor(pca_dir);
+-
+-  vnl_vector<double> t_error;
+-  pca_extractor.compute_testing_error(t_error);
+-  std::ofstream error_ofs((pca_dir+ "/test_error.txt").c_str());
+-
+-  if (error_ofs)
+-    error_ofs << t_error;
+-
+-  //store output
+-  pro.set_output_val<std::string>(0, pca_dir+ "/test_error.txt");
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
+deleted file mode 100644
+index e76b7b5d98..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
++++ /dev/null
+@@ -1,98 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 17-Nov-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-//:global variables
+-namespace bvpl_discover_pca_features_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 9;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_discover_pca_features_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_discover_pca_features_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "vcl_string";   //directory to save PCA matrices
+-  input_types_[i++] = "double";   //fraction of the total number of leaves
+-  input_types_[i++] = "int";    // min and max of kernel
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-
+-  return pro.set_input_types(input_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_discover_pca_features_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_discover_pca_features_process_globals;
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs
+-  unsigned i =0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string pca_dir = pro.get_input<std::string>(i++);
+-  auto frac = pro.get_input<double>(i++);
+-  int min_x = pro.get_input<int>(i++);
+-  int min_y = pro.get_input<int>(i++);
+-  int min_z = pro.get_input<int>(i++);
+-  int max_x = pro.get_input<int>(i++);
+-  int max_y = pro.get_input<int>(i++);
+-  int max_z = pro.get_input<int>(i++);
+-
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Base Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  //neighborhood box for volume "patches" 5x5x5 for now - this could be an input to the process
+-  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
+-
+-  //cast scene
+-  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > >* > (scene_base.as_pointer());
+-  if (!scene) {
+-    std::cout <<  " :-- Input Scene is not of supported type\n";
+-    return false;
+-  }
+-  std::cout << "Scene path: " << scene->filename()<< std::endl;;
+-
+-
+-  //number of samples - 10% of total number of leaf-cells
+-  auto nsamples = (unsigned long)((double)scene->size() * frac);
+-  std::cout << "Number of samples: " << nsamples << std::endl;
+-
+-  //bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene);
+-  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, pca_dir);
+-
+-  //write matrices to disk
+-  pca_extractor.xml_write();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
+deleted file mode 100644
+index 365a0eb791..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
++++ /dev/null
+@@ -1,64 +0,0 @@
+-//:
+-// \file
+-// \brief A process that performs PCA analysis given the statistics collected from various scenes using bvpl_pca_global
+-// \author Isabel Restrepo
+-// \date 23-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_global_pca_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_global_pca_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_global_pca_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";   //path pca_global_info file
+-  input_types_[1] = "vcl_string";   //path to statistics file
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_global_pca_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_global_pca_process_globals;
+-
+-  //get inputs
+-  std::string pca_file = pro.get_input<std::string>(0);
+-  std::string stats_file = pro.get_input<std::string>(1);
+-
+-  //load file into matrices
+-  vnl_matrix_fixed<double, 125, 125> S(0.0);
+-  vnl_vector_fixed<double, 125> mean(0.0);
+-  unsigned long nfeatures =0;
+-  {
+-    std::ifstream stats_ifs(stats_file.c_str());
+-    if (!stats_ifs.is_open()) {
+-      std::cerr << "Error: Failed to open stats file\n";
+-      return false;
+-    }
+-    stats_ifs >> nfeatures >> mean >> S;
+-  }
+-
+-  bvpl_global_pca<125> global_pca(pca_file);
+-
+-  global_pca.set_up_pca_evd(S,mean,nfeatures);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
+deleted file mode 100644
+index 10e35faddb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \brief A process to init auxiliary scenes and other variables
+-// \author Isabel Restrepo
+-// \date 23-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_init_global_pca_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_init_global_pca_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_pca_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; // path to pca_global_info file
+-  input_types_[1] = "unsigned"; //id of the scene to initialize
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_init_global_pca_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_pca_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-  auto scene_id = pro.get_input<unsigned>(1);
+-
+-  bvpl_global_pca<125> global_pca(pca_dir);
+-  global_pca.init(scene_id);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
+deleted file mode 100644
+index 8b2070e215..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 15-May-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl_octree/bvpl_global_pca.h>
+-
+-//: global variables
+-namespace bvpl_load_global_pca_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_load_global_pca_125_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_pca_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_global_pca_125_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_load_global_pca_125_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_pca_process_globals;
+-
+-  // get inputs
+-  std::string pca_file = pro.get_input<std::string>(0);
+-  auto *global_pca = new bvpl_global_pca<125>(pca_file);
+-
+-  // store output
+-  pro.set_output_val<bvpl_global_pca_125_sptr>(0, global_pca);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
+deleted file mode 100644
+index 39161edf02..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
++++ /dev/null
+@@ -1,58 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 21-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-//:global variables
+-namespace bvpl_load_pca_error_scenes_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_pca_error_scenes_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_error_scenes_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "boxm_scene_base_sptr";  //data scene
+-  input_types_[i++] = "vcl_string";   //pca path
+-  input_types_[i++] = "unsigned";   //dimension pca feture
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_pca_error_scenes_sptr" ;
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_pca_error_scenes_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_error_scenes_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string pca_path = pro.get_input<std::string>(i++);
+-  auto feature_dim = pro.get_input<unsigned>(i++);
+-
+-  if (!data_scene_base)
+-    return false;
+-
+-  bvpl_pca_error_scenes *error_scenes = new bvpl_pca_error_scenes(data_scene_base, pca_path, feature_dim);
+-  //store output
+-  pro.set_output_val<bvpl_pca_error_scenes_sptr>(0, error_scenes);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
+deleted file mode 100644
+index 48082ecb75..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
++++ /dev/null
+@@ -1,55 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 3-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-//:global variables
+-namespace bvpl_load_pca_info_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_pca_info_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_info_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string" ;  //directory path
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_discover_pca_kernels_sptr";  //pca info
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_pca_info_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_info_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-
+-  if (!vul_file::is_directory(pca_dir))
+-    return false;
+-
+-  bvpl_discover_pca_kernels_sptr pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
+-
+-  //store output
+-  pro.set_output_val<bvpl_discover_pca_kernels_sptr>(0, pca_extractor);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
+deleted file mode 100644
+index fb29aeaa8c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 4-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-#include <vul/vul_file.h>
+-
+-//:global variables
+-namespace bvpl_normalize_pca_training_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;  //directory path
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_normalize_pca_training_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_normalize_pca_training_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_normalize_pca_training_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_normalize_pca_training_error_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-
+-  if (!vul_file::is_directory(pca_dir)){
+-    std::cerr << " Invalid pca directory\n";
+-    return false;
+-  }
+-
+-
+-  bvpl_discover_pca_kernels pca_extractor(pca_dir);
+-
+-  vnl_vector<double> error;
+-  pca_extractor.compute_normalized_training_error(error);
+-
+-  std::ofstream ofs((pca_dir + "/normalized_training_error.txt").c_str());
+-  ofs.precision(15);
+-  ofs << error;
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
+deleted file mode 100644
+index 40149c3411..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
++++ /dev/null
+@@ -1,77 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute pca projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-//:global variables
+-namespace bvpl_pca_global_add_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_global_add_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_add_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_global_add_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_add_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr error_scene_base = global_pca->load_error_scene(scene_id);
+-  if (!error_scene_base) {
+-    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-
+-  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
+-  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
+-
+-  //store output
+-    pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
+deleted file mode 100644
+index 0e127a6a1c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute pca projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_pca_global_proj_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_global_proj_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_proj_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_global_proj_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_proj_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL\n";
+-    return false;
+-  }
+-
+-  global_pca->projection_error(scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
+deleted file mode 100644
+index fc2e46ff3e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
++++ /dev/null
+@@ -1,75 +0,0 @@
+-//:
+-// \file
+-// \brief  A process that computes pca statistics (scatter matrix and mean) on a per block basis
+-// \author Isabel Restrepo
+-// \date 14-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_pca_global_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_global_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_statistics_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene_id (this can be confirmed in xml file pca_info.xml)
+-  input_types_[i++] = "int";   //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "vcl_string"; //path to file to hold statistics of this block
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_global_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_statistics_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  std::string stats_file = pro.get_input<std::string>(i++);
+-
+-  if(!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL \n";
+-    return false;
+-  }
+-  vnl_matrix_fixed<double, 125, 125> S(0.0);
+-  vnl_vector_fixed<double, 125> mean(0.0);
+-  unsigned long nfeatures = 0;
+-
+-
+-  if(global_pca->sample_statistics(scene_id, block_i, block_j, block_k, S, mean, nfeatures))
+-  {
+-    std::ofstream stats_ofs(stats_file.c_str());
+-    stats_ofs.precision(15);
+-    stats_ofs << nfeatures << '\n' << mean << '\n' << S;
+-    stats_ofs.close();
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
+deleted file mode 100644
+index 341a8e76ac..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute pca projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_pca_project_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_project_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_project_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_project_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_project_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL\n";
+-    return false;
+-  }
+-
+-  global_pca->project(scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
+deleted file mode 100644
+index 3f4d2adf17..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
++++ /dev/null
+@@ -1,70 +0,0 @@
+-//:
+-// \file
+-// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
+-// \author Isabel Restrepo
+-// \date 13-Oct-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
+-
+-
+-#include <boxm/boxm_scene.h>
+-
+-//: global variables
+-namespace bvpl_compute_sf_raw_response_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_compute_sf_raw_response_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_sf_raw_response_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";  //input/response scene
+-  input_types_[i++] = "boxm_scene_base_sptr";  //valid scene
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_compute_sf_raw_response_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_sf_raw_response_process_globals;
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr valid_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  //get scene
+-  typedef boct_tree<short, vnl_vector_fixed< float,10 > > response_tree_type;
+-  typedef boct_tree<short, bool > valid_tree_type;
+-
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene< response_tree_type >* >(scene_base.as_pointer()))
+-  {
+-    double cell_length = scene_in->finest_cell_length();
+-
+-    if (auto *valid_scene = dynamic_cast<boxm_scene< valid_tree_type >* >(valid_scene_base.as_pointer()))
+-    {
+-      bvpl_gauss3D_steerable_filters sf;
+-      sf.basis_response_at_leaves(scene_in,valid_scene, cell_length);
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
+deleted file mode 100644
+index 3ceffbbc47..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
++++ /dev/null
+@@ -1,87 +0,0 @@
+-//:
+-// \file
+-// \brief A process to initialize the response scene for steerable filter bank
+-// \author Isabel Restrepo
+-// \date 22-Aug-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-#include <boxm/boxm_scene.h>
+-
+-//: global variables
+-namespace bvpl_init_sf_response_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_init_sf_response_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_sf_response_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";  //input scene
+-  input_types_[1] = "vcl_string";            //output path
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";  //response scene
+-  output_types_[1] = "boxm_scene_base_sptr";  //valid scene
+-
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_init_sf_response_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_sf_response_scene_process_globals;
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  //get scene
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
+-  {
+-    boxm_scene<out_tree_type> *scene_out =
+-    new boxm_scene<out_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "steerable_gauss_3d_scene");
+-    scene_out->set_appearance_model(VNL_FLOAT_10);
+-    scene_out->write_scene("steerable_gauss_3d_scene.xml");
+-    scene_in->clone_blocks_to_vector<10>(*scene_out);
+-
+-    boxm_scene<boct_tree<short, bool> > *valid_scene =
+-    new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    valid_scene->set_paths(output_path, "valid_scene");
+-    valid_scene->set_appearance_model(BOXM_BOOL);
+-    valid_scene->write_scene("valid_scene.xml");
+-
+-
+-    //store output
+-    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-    scene_ptr = scene_out;
+-    boxm_scene_base_sptr valid_scene_ptr=new boxm_scene_base();
+-    valid_scene_ptr = valid_scene;
+-    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-    pro.set_output_val<boxm_scene_base_sptr>(1, valid_scene_ptr);
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
+deleted file mode 100644
+index c1b1c309c0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
++++ /dev/null
+@@ -1,90 +0,0 @@
+-//:
+-// \file
+-// \brief A process to add Taylor error at a percentage of voxels in a block
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_add_taylor_errors_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_add_taylor_errors_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_taylor_errors_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_add_taylor_errors_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_taylor_errors_process_globals;
+-
+-  //get inputs
+-  unsigned i =0;
+-  boxm_scene_base_sptr error_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto fraction_nsamples = pro.get_input<double>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!error_scene_base) {
+-    std::cerr << "Error in bvpl_add_taylor_errors_process: Null error scene\n";
+-    return false;
+-  }
+-  auto* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scene_base.as_pointer());
+-  if (!error_scene) {
+-    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  //sum errors within block
+-  auto scene_ncells = (double)error_scene->size();
+-  error_scene->load_block(block_i,block_j,block_k);
+-  auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
+-  double nsamples = scene_ncells * fraction_nsamples;
+-
+-  //number of samples - 10% of total number of leaf-cells
+-  double error = 0.0;
+-  if (fraction_nsamples < 0.95) {
+-    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
+-    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
+-             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
+-    error = bvpl_taylor_basis::sum_errors(error_scene,block_i, block_j, block_k, tree_nsamples);
+-  }
+-  else {
+-    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
+-    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << std::endl;
+-  }
+-
+-  //store output
+-  pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
+deleted file mode 100644
+index 50c28a393e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 12-Apr-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-#include <vul/vul_file.h>
+-
+-//:global variables
+-namespace bvpl_compute_taylor_coefficients_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_taylor_coefficients_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_coefficients_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string" ;  //path of taylor_global_info.xml
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_taylor_coefficients_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_coefficients_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  std::string taylor_dir = pro.get_input<std::string>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  int dim = pro.get_input<int>(i++);
+-
+-  if (!vul_file::is_directory(taylor_dir))
+-    return false;
+-
+-  switch (dim) {
+-    case 3:
+-    {
+-      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
+-      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
+-      break;
+-    }
+-    case 10:
+-    {
+-      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
+-      break;
+-    }
+-    default:
+-      break;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
+deleted file mode 100644
+index b992c1b5ae..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
++++ /dev/null
+@@ -1,78 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute the Taylor reconstruction error of a block (Assumes, basis has been applied)
+-// \author Isabel Restrepo
+-// \date 9-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_compute_taylor_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_taylor_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr"; //the original data scene
+-  input_types_[i++] = "bvpl_taylor_scenes_map_sptr" ; //scenes needed for Taylor operations
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  i=0;
+-  output_types_[i++] = "boxm_scene_base_sptr"; //the error for this block
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_taylor_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_taylor_scenes_map_sptr taylor_scenes = pro.get_input<bvpl_taylor_scenes_map_sptr>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  if (!data_scene_base) {
+-    std::cerr << "Error in bvpl_compute_taylor_error_process: Null data scene\n";
+-    return false;
+-  }
+-  if (!taylor_scenes) {
+-    std::cerr << "Error in bvpl_compute_taylor_error_process: Null scenes map\n";
+-    return false;
+-  }
+-
+-  //assemble the Taylor basis
+-  bvpl_taylor_basis::assemble_basis(taylor_scenes, block_i, block_j, block_k);
+-
+-  //compute the error block
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
+-  auto* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  double cell_length = data_scene->finest_cell_length();
+-  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),
+-                                                 error_scene,taylor_scenes->loader(),
+-                                                 block_i, block_j, block_k, cell_length);
+-
+-  pro.set_output_val<boxm_scene_base_sptr>(0, error_scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
+deleted file mode 100644
+index 0b57bb488d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
++++ /dev/null
+@@ -1,77 +0,0 @@
+-//:
+-// \file
+-// \brief A process to extract a Taylor coefficient from the 10-d vector
+-// \author Isabel Restrepo
+-// \date 12-Apr-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-//:global variables
+-namespace bvpl_explore_coefficient_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_explore_coefficient_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_explore_coefficient_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string"; //path to Taylor info file
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int"; //coefficient
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_explore_coefficient_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_explore_coefficient_scene_process_globals;
+-
+-  //get inputs
+-  std::string taylor_dir = pro.get_input<std::string>(0);
+-  int scene_id = pro.get_input<int>(1);
+-  int coeff_id = pro.get_input<int>(2);
+-
+-  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-  bvpl_global_taylor<double, 10> taylor(taylor_dir, kernel_names);
+-
+-  boxm_scene_base_sptr valid_scene_base = taylor.load_valid_scene(scene_id);
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  if (!valid_scene) {
+-    std::cerr << "Error in bvpl_explore_coefficient_scene_process: Could not cast valid scene\n";
+-    return false;
+-  }
+-
+-  std::stringstream scene_ss;
+-  scene_ss << "coefficient_" << coeff_id << "_scene_" << scene_id ;
+-  std::string scene_path = taylor.aux_dirs(scene_id) + "/" + scene_ss.str() + ".xml";
+-
+-  std::cout << "Initializing " << scene_path << '\n'
+-           << "Scene: " << scene_path << " does not exist, initializing xml" << std::endl;
+-  boxm_scene<boct_tree<short, float> > *scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->set_paths(taylor.aux_dirs(scene_id), scene_ss.str());
+-  scene->write_scene("/" + scene_ss.str() +  ".xml");
+-  taylor.extract_coefficient_scene(scene_id,  coeff_id, scene);
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
+deleted file mode 100644
+index c900aeef5d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
++++ /dev/null
+@@ -1,68 +0,0 @@
+-//:
+-// \file
+-// \brief A process to init auxiliary scenes and other variables
+-// \author Isabel Restrepo
+-// \date 12-Apr-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-//:global variables
+-namespace bvpl_init_global_taylor_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_init_global_taylor_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_taylor_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; // path to taylor_global_info file
+-  input_types_[1] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_init_global_taylor_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_taylor_process_globals;
+-
+-  //get inputs
+-  std::string taylor_dir = pro.get_input<std::string>(0);
+-  int dim = pro.get_input<int>(1);
+-
+-  switch (dim) {
+-    case 3:
+-    {
+-      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
+-      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.init();
+-      break;
+-    }
+-    case 10:
+-    {
+-      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.init();
+-      break;
+-    }
+-    default:
+-      break;
+-  }
+-
+-
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
+deleted file mode 100644
+index 0e5713c4dc..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
++++ /dev/null
+@@ -1,52 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl_octree/bvpl_global_taylor.h>
+-
+-//: global variables
+-namespace bvpl_load_global_taylor_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_load_global_taylor_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_taylor_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_global_taylor_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_load_global_taylor_process(bprb_func_process& pro)
+-{
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-  using namespace bvpl_load_global_taylor_process_globals;
+-
+-  // get inputs
+-  std::string taylor_file = pro.get_input<std::string>(0);
+-  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-  auto *global_taylor = new bvpl_global_taylor<double, 10>(taylor_file, kernel_names);
+-
+-  // store output
+-  pro.set_output_val<bvpl_global_taylor_sptr>(0, global_taylor);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
+deleted file mode 100644
+index 0b405689b0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-//:
+-// \file
+-// \brief A process to load to memory all smart pointers of scenes needed for Taylor reconstruction
+-// \author Isabel Restrepo
+-// \date 14-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-//:global variables
+-namespace bvpl_load_taylor_scenes_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_taylor_scenes_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_scenes_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string";  //dir to Taylor scenes
+-  input_types_[i++] = "int";         // min and max of Taylor kernel
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  std::vector<std::string> output_types_(n_outputs_);
+-  i = 0;
+-  output_types_[i++] = "bvpl_taylor_scenes_map_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_taylor_scenes_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_scenes_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  std::string taylor_dir = pro.get_input<std::string>(i++);
+-  int min_x = pro.get_input<int>(i++);
+-  int min_y = pro.get_input<int>(i++);
+-  int min_z = pro.get_input<int>(i++);
+-  int max_x = pro.get_input<int>(i++);
+-  int max_y = pro.get_input<int>(i++);
+-  int max_z = pro.get_input<int>(i++);
+-
+-  if (!vul_file::is_directory(taylor_dir)) {
+-    std::cerr<<"Error in bvpl_load_taylor_scenes_process_process: Taylor directory doesn't exist\n";
+-  }
+-
+-  bvpl_taylor_basis_loader loader(taylor_dir, vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
+-  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
+-
+-  //store output
+-  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
+deleted file mode 100644
+index 6fe31b4168..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
++++ /dev/null
+@@ -1,77 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute taylor projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-//:global variables
+-namespace bvpl_taylor_global_add_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_taylor_global_add_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_add_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_taylor_global_add_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_add_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_taylor)
+-  {
+-    std::cerr << "Global taylor is NULL\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr error_scene_base = global_taylor->load_error_scene(scene_id);
+-  if (!error_scene_base) {
+-    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-
+-  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
+-  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
+-
+-  //store output
+-    pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
+deleted file mode 100644
+index 3f3ca0a701..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute taylor projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-//:global variables
+-namespace bvpl_taylor_global_proj_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_taylor_global_proj_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_proj_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_taylor_global_proj_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_proj_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_taylor)
+-  {
+-    std::cerr << "Global taylor is NULL\n";
+-    return false;
+-  }
+-
+-  global_taylor->compute_approximation_error(scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index 320399fb72..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree/pro)
+-
+-add_executable( bvpl_octree_pro_test_all
+-  test_driver.cxx
+-  test_bvpl_plane_propagation_process.cxx
+-)
+-
+-target_link_libraries( bvpl_octree_pro_test_all ${VXL_LIB_PREFIX}testlib bvpl_octree_pro bvpl_octree boxm boxm_pro boxm_sample boxm_util boct bvpl bprb brdb sdet ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+-
+-if(SEGFAULT_FIXED)
+-add_test( NAME bvpl_octree_pro_plane_propagation_process COMMAND $<TARGET_FILE:bvpl_octree_pro_test_all> test_bvpl_plane_propagation_process)
+-endif()
+-
+-add_executable( bvpl_octree_pro_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_pro_test_include bvpl_octree_pro sdet )
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
+deleted file mode 100644
+index 1073b2e437..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
++++ /dev/null
+@@ -1,144 +0,0 @@
+-#include <iostream>
+-#include <vector>
+-#include <testlib/testlib_test.h>
+-//:
+-// \file
+-// \brief  This test creates a tree with 8 leaf cells and inserts only one plane to each
+-//         After the boxm_plane_propagation_process is applied, each cell will insert their
+-//         neighbors' observation planes and insert into itself. At the end each cell should
+-//         have 8 planes in the observation list since each cell has 7 neighbors (all the
+-//         other cells in the tree)
+-//
+-// \author Gamze Tunali
+-// \date   March 24, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <brdb/brdb_value.h>
+-#include <brdb/brdb_query.h>
+-#include <brdb/brdb_selection.h>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_parameters_sptr.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree_cell.h>
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
+-#include <vul/vul_file.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static void test_bvpl_plane_propagation_process()
+-{
+-  typedef boxm_edge_tangent_sample<float> data_type;
+-  typedef boct_tree<short,data_type > tree_type;
+-  typedef boxm_scene<boct_tree<short,data_type > > scene_type;
+-
+-  // create the main scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  scene_type scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_octree_levels(3,2);
+-  scene.set_paths("./boxm_scene", "block");
+-  scene.set_appearance_model(BOXM_EDGE_LINE);
+-  x_write(std::cout, scene, "scene");
+-  vul_file::make_directory("./boxm_scene");
+-  scene.write_scene();
+-
+-  boxm_block_iterator<boct_tree<short,data_type > > iter(&scene);
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,data_type > > * block=scene.get_active_block();
+-    boct_tree<short,data_type > * tree= block->get_tree();
+-
+-    // get the leaf nodes and insert one plane to each
+-    std::vector<boct_tree_cell<short,data_type >*> cells=tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++) {
+-      boxm_plane_obs<float> p(vgl_homg_plane_3d<float>(float(i+1),0.f,0.f,1.f), 1.0f);
+-      data_type data = cells[i]->data();
+-      data.insert(p);
+-      cells[i]->set_data(data);
+-    }
+-    block->init_tree(tree);
+-    block->get_tree()->print();
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
+-  REGISTER_DATATYPE(boxm_scene_base_sptr);
+-
+-  //: set the inputs
+-  brdb_value_sptr v0 = new brdb_value_t<boxm_scene_base_sptr>(new boxm_scene<boct_tree<short,data_type > >(scene));
+-  brdb_value_sptr v1 = new brdb_value_t<std::string>(scene.path());
+-  brdb_value_sptr v2 = new brdb_value_t<std::string>("new_scene");
+-  brdb_value_sptr v3 = new brdb_value_t<std::string>("new_scene.xml");
+-
+-  //: inits with the default params
+-  bool good = bprb_batch_process_manager::instance()->init_process("bvplPlanePropagateProcess");
+-  good = good && bprb_batch_process_manager::instance()->set_input(0, v0);
+-  good = good && bprb_batch_process_manager::instance()->set_input(1, v1);
+-  good = good && bprb_batch_process_manager::instance()->set_input(2, v2);
+-  good = good && bprb_batch_process_manager::instance()->set_input(3, v3);
+-  good = good && bprb_batch_process_manager::instance()->run_process();
+-
+-  unsigned id;
+-  good = good && bprb_batch_process_manager::instance()->commit_output(0, id);
+-  TEST("process commits output", good, true);
+-
+-  // check if the results are in DB
+-  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
+-  brdb_selection_sptr S = DATABASE->select("boxm_scene_base_sptr_data", std::move(Q));
+-  if (S->size()!=1){
+-    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
+-             << " no selections\n";
+-  }
+-  brdb_value_sptr value;
+-  if (!S->get_value(std::string("value"), value)) {
+-    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
+-             << " didn't get value\n";
+-  }
+-  bool non_null = (value != nullptr);
+-  TEST("the output scene non-null", non_null, true);
+-
+-  auto* result=static_cast<brdb_value_t<boxm_scene_base_sptr>* >(value.ptr());
+-  boxm_scene_base_sptr scene_sptr = result->value();
+-
+-  // get the new scene with updated cells
+-  auto *scene2 = static_cast<scene_type *>(scene_sptr.as_pointer());
+-  boxm_block_iterator<boct_tree<short,data_type > > iter2(scene2);
+-
+-  bool obs_num_ok=true;
+-  while (!iter2.end())
+-  {
+-    scene2->load_block(iter2.index().x(),iter2.index().y(),iter2.index().z());
+-    boxm_block<tree_type > * block=scene2->get_active_block();
+-    tree_type * tree= block->get_tree();
+-
+-    // get the leaf nodes and insert one plane to each
+-    std::vector<boct_tree_cell<short,data_type >*> nodes=tree->leaf_cells();
+-    for (auto & node : nodes) {
+-      unsigned num=node->data().num_obs();
+-      // each node has 8 neighbors in the 3x3 neighborhood including itself
+-      if (num != 8)
+-        obs_num_ok = false;
+-    }
+-    iter2++;
+-  }
+-  TEST("The number of expected observations at each cell", obs_num_ok, true);
+-}
+-
+-TESTMAIN(test_bvpl_plane_propagation_process);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
+deleted file mode 100644
+index 9fae26da90..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_bvpl_plane_propagation_process );
+-
+-void register_tests()
+-{
+-  REGISTER( test_bvpl_plane_propagation_process );
+-}
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
+deleted file mode 100644
+index 407d98e94a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
+deleted file mode 100644
+index 79b3a2bcb4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-Each of the subfolders contains scripts for different experiments:
+-
+-reconstruction error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed fraction of training samples and varying number of dimensions.
+-
+-training error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed dimension and varying number of training samples
+-
+-Note: *.sh calls the python scripts with appropriate inputs. You only need to adjust *.sh for your system
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
+deleted file mode 100644
+index 133a5822ed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
++++ /dev/null
+@@ -1,193 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 21, 2011
+-
+-@author:Isabel Restrepo
+-
+-Adds the error of a portion of voxels. Each block is processed in a separate thread.
+-This script assumes that the reconstruction error at each voxel has been computed
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class pca_error_job():
+-
+-    def __init__(self, pca_scenes, dim, fraction, block_i, block_j, block_k):
+-        self.pca_scenes = pca_scenes
+-        self.dim = dim
+-        self.fraction = fraction
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    # load up work queue
+-    work_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    # create a queue to pass to workers to store the results
+-    result_queue = multiprocessing.Queue()
+-
+-    # spawn workers
+-    for i in range(num_procs):
+-        worker = pca_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-       # collect the results off the queue
+-    # all_results=[];
+-#    results = []
+-#    while len(results) < len(jobs):
+-#        result = result_queue.get()
+-#        results.append(result)
+-#        all_results[job.dim].append(result);
+-#
+-#    return all_results;
+-
+-    # collect the results off the queue
+-    results = []
+-    while len(results) < len(jobs):
+-        result = result_queue.get()
+-        results.append(result)
+-
+-    return results
+-
+-
+-class pca_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Adding Errors")
+-            batch.init_process("bvplAddPCAErrorsProcess")
+-            batch.set_input_from_db(0, job.pca_scenes)
+-            batch.set_input_unsigned(1, job.dim)
+-            batch.set_input_double(2, job.fraction)
+-            batch.set_input_int(3, job.block_i)
+-            batch.set_input_int(4, job.block_j)
+-            batch.set_input_int(5, job.block_k)
+-            batch.run_process()
+-            (id, type) = batch.commit_output(0)
+-            error_val = dbvalue(id, type)
+-            error = batch.get_output_double(id)
+-
+-            self.result_queue.put(error)
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#***************** The Main Algorithm ************************#
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA Error Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--fraction', action="store",
+-                      dest="fraction", type="float", default=0.0)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-    parser.add_option('--dimension', action="store",
+-                      dest="dimension", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    fraction = options.fraction
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-    dimension = options.dimension
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        print "Invalid PCA Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Data Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    data_scene = dbvalue(scene_id, scene_type)
+-
+-    # Load PCA scenes
+-    pca_feature_dim = 125
+-    print("Loading PCA Error Scenes")
+-    batch.init_process("bvplLoadPCAErrorSceneProcess")
+-    batch.set_input_from_db(0, data_scene)
+-    batch.set_input_string(1, pca_dir)
+-    batch.set_input_unsigned(
+-        2, pca_feature_dim)  # dimension pca feature
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    pca_scenes = dbvalue(id, type)
+-
+-    # Begin multiprocessing
+-    # Enqueue jobs
+-    job_list = []
+-    # for dim in range(0, pca_feature_dim):
+-    for block_i in range(0, nblocks_x):
+-        for block_j in range(0, nblocks_y):
+-            for block_k in range(0, nblocks_z):
+-                current_job = pca_error_job(
+-                    pca_scenes, dimension, fraction, block_i, block_j, block_k)
+-                job_list.append(current_job)
+-
+-    # run
+-    results = execute_jobs(job_list, num_cores)
+-
+-    # dump results
+-    total_error = 0
+-    for r in results:
+-        total_error = total_error + r
+-
+-    int_frac = int(fraction * 100)
+-    error_file = pca_dir + "/error_" + str(dimension) + "/error.txt"
+-    fd = open(error_file, "w")
+-    print >>fd, total_error / len(results)
+-    print >>fd, results
+-    fd.close()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
+deleted file mode 100644
+index c8ede20327..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
++++ /dev/null
+@@ -1,164 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-Compuets PCA reconstruction error. Each block is processed in a separate thread.
+-This script assumes that the pca basis has been computed as gone by extract_pca_kernels.py
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-import sys
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class pca_error_job():
+-
+-    def __init__(self, pca_info, pca_error_scenes, block_i, block_j, block_k, dim):
+-        self.pca_info = pca_info
+-        self.pca_error_scenes = pca_error_scenes
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-        self.dim = dim
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = pca_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class pca_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Computing Error Scene")
+-            batch.init_process("bvplComputePCAErrorBlockProcess")
+-            batch.set_input_from_db(0, job.pca_info)
+-            batch.set_input_from_db(1, job.pca_error_scenes)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.set_input_unsigned(5, job.dim)
+-            batch.run_process()
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-#*******************The Main Algorithm ************************#
+-if __name__ == "__main__":
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA Error Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-    parser.add_option('--dimension', action="store",
+-                      dest="dimension", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-    dimension = options.dimension
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        print "Invalid PCA Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Data Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    data_scene = dbvalue(scene_id, scene_type)
+-
+-    # Load pca scenes
+-    pca_feature_dim = 125
+-    print("Loading PCA Error Scenes")
+-    batch.init_process("bvplLoadPCAErrorSceneProcess")
+-    batch.set_input_from_db(0, data_scene)
+-    batch.set_input_string(1, pca_dir)
+-    batch.set_input_unsigned(
+-        2, pca_feature_dim)  # dimension pca feature
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    pca_scenes = dbvalue(id, type)
+-
+-    print("Loading PCA Info")
+-    batch.init_process("bvplLoadPCAInfoProcess")
+-    batch.set_input_string(0, pca_dir)
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    pca_info = dbvalue(id, type)
+-
+-    # Begin multiprocessing
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-    all_indices = []
+-    for block_i in range(0, nblocks_x):
+-        for block_j in range(0, nblocks_y):
+-            for block_k in range(0, nblocks_z):
+-                idx = [block_i, block_j, block_k]
+-                all_indices.append(idx)
+-
+-    random.shuffle(all_indices)
+-
+-    for i in range(0, len(all_indices)):
+-        idx = all_indices[i]
+-        current_job = pca_error_job(pca_info, pca_scenes, idx[
+-            0], idx[1], idx[2], dimension)
+-        job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
+deleted file mode 100644
+index 5d8b2b7910..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
++++ /dev/null
+@@ -1,61 +0,0 @@
+-# Computes the gaussian gradients on a boxm_alpha_scene
+-
+-import os
+-import optparse
+-import time
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA basis')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--train_fraction', action="store",
+-                      dest="train_fraction", type="float", default=0.0)
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    train_fraction = options.train_fraction
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    print("Extracting Principal Components patches")
+-
+-    print("Creating a Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    scene = dbvalue(scene_id, scene_type)
+-
+-    start_time = time.time()
+-
+-    print("Extract PC")
+-    batch.init_process("bvplDiscoverPCAFeaturesProcess")
+-    batch.set_input_from_db(0, scene)
+-    batch.set_input_string(1,  pca_dir)
+-    batch.set_input_double(2,  train_fraction)
+-    batch.set_input_int(3, -2)  # min and max points of the kernel
+-    batch.set_input_int(4, -2)
+-    batch.set_input_int(5, -2)
+-    batch.set_input_int(6, 2)
+-    batch.set_input_int(7, 2)
+-    batch.set_input_int(8, 2)
+-    batch.run_process()
+-
+-    print("Runing time forbvplDiscoverPCAFeaturesProcess:")
+-    print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
+deleted file mode 100755
+index 61f3346338..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
++++ /dev/null
+@@ -1,68 +0,0 @@
+-#!/bin/bash
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-A script that encapsulates all steps needed to computer pca reconstruction error as a function of number of components used
+-"""
+-
+-if [ $1 = "-r" ] ; then
+-  export PYTHONPATH=/Projects/vxl/bin/release/lib
+-else
+-  if [ $1 = "-d" ] ; then
+-    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
+-  else
+-    echo "Need a flag, either -d or -r";
+-  fi
+-fi
+-
+-echo "PYTHONPATH=" $PYTHONPATH
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
+-#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall/10";
+-#nblocks_x=1;
+-#nblocks_y=1;
+-#nblocks_z=1;
+-
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
+-#model_name="capitol_scene";
+-#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXM_6_4_4/10";
+-#nblocks_x=6;
+-#nblocks_y=4;
+-#nblocks_z=4;
+-
+-
+-model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
+-model_name="downtown_scene";
+-pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1/10";
+-nblocks_x=3;
+-nblocks_y=3;
+-nblocks_z=1;
+-
+-train_fraction=0.1;
+-test_fraction=1.0;
+-num_cores=5;
+-
+-
+-##************Compute Expected Color Scene
+-#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
+-
+-#Compute PCA basis
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $train_fraction
+-
+-#Compute reconstruction at each voxel in the scene
+-for ((dim = 45; dim <125; dim++))
+-do
+-  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/compute_pca_error_scene.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --dimension $dim
+-
+-  #Add error of fraction of voxels
+-
+-  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/add_pca_error.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $test_fraction --dimension $dim
+-done
+-
+-# #Save all scenes to drishti raw file
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/save_pca_raw.py --pca_dir $pca_dir --num_cores $num_cores
+-
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/reconstruction_error/explore_histogram.py --pca_dir $pca_dir --num_cores $num_cores
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
+deleted file mode 100644
+index 15d23e5ebf..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
++++ /dev/null
+@@ -1,108 +0,0 @@
+-import multiprocessing
+-import Queue
+-import time
+-import os
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class save_scene_job():
+-
+-    def __init__(self, input_scene_path, output_scene_path):
+-        self.input_scene_path = input_scene_path
+-        self.output_scene_path = output_scene_path
+-
+-
+-def execute_jobs(jobs, num_procs=5):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = save_scene_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class save_scene_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating a Scene")
+-            batch.init_process("boxmCreateSceneProcess")
+-            batch.set_input_string(0, job.input_scene_path)
+-            batch.run_process()
+-            (scene_id, scene_type) = batch.commit_output(0)
+-            scene = dbvalue(scene_id, scene_type)
+-
+-            print("Save Scene")
+-            batch.init_process("boxmSaveSceneRawProcess")
+-            batch.set_input_from_db(0, scene)
+-            batch.set_input_string(1, job.output_scene_path)
+-            batch.set_input_unsigned(2, 0)
+-            batch.set_input_unsigned(3, 1)
+-            batch.run_process()
+-
+-            print ("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#*********************The Main Algorithm ****************************#
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    parser = optparse.OptionParser(
+-        description='Save taylor responses to raw file')
+-
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-
+-    options, args = parser.parse_args()
+-
+-    pca_dir = options.pca_dir
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-    pca_feature_dim = 125
+-    for dim in range(0, pca_feature_dim):
+-
+-        scene_in_path = pca_dir + "/error_" + str(dim) + "/error_scene.xml"
+-        scene_out_path = pca_dir + "/error_" + str(dim) + "/error_scene"
+-
+-        current_job = save_scene_job(scene_in_path, scene_out_path)
+-
+-        job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
+deleted file mode 100644
+index 1616b7850a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
++++ /dev/null
+@@ -1,66 +0,0 @@
+-# Computes the gaussian gradients on a boxm_alpha_scene
+-
+-import os
+-import optparse
+-import time
+-import sys
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA basis')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--train_fraction', action="store",
+-                      dest="train_fraction", type="float", default=0.0)
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    train_fraction = (options.train_fraction) / 10
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    print("Extracting Principal Components patches")
+-
+-    print("Creating a Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    scene = dbvalue(scene_id, scene_type)
+-
+-    start_time = time.time()
+-
+-    print("Extract PC")
+-    batch.init_process("bvplDiscoverPCAFeaturesProcess")
+-    batch.set_input_from_db(0, scene)
+-    batch.set_input_string(1,  pca_dir)
+-    batch.set_input_double(2,  train_fraction)
+-    batch.set_input_int(3, -2)  # min and max points of the kernel
+-    batch.set_input_int(4, -2)
+-    batch.set_input_int(5, -2)
+-    batch.set_input_int(6, 2)
+-    batch.set_input_int(7, 2)
+-    batch.set_input_int(8, 2)
+-    batch.run_process()
+-
+-    print ("Runing time for bvplDiscoverPCAFeaturesProcess:")
+-    print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
+deleted file mode 100644
+index e151f95144..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
++++ /dev/null
+@@ -1,42 +0,0 @@
+-# Computes normalized pca training error
+-
+-import os
+-import optparse
+-import time
+-import sys
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA basis')
+-
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--train_fraction', action="store",
+-                      dest="train_fraction", type="float", default=0.0)
+-    options, args = parser.parse_args()
+-
+-    pca_dir = options.pca_dir
+-    train_fraction = (options.train_fraction) / 10
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    start_time = time.time()
+-
+-    batch.init_process("bvplNormalizePCATrainingErrorProcess")
+-    batch.set_input_string(0,  pca_dir)
+-    batch.run_process()
+-
+-    print ("Runing time for bvplNormalizePCATrainingErrorProcess:")
+-    print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
+deleted file mode 100755
+index 82b0a516d8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#!/bin/bash
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-A script that encapsulates all steps needed to computer pca training error as a the number of training samples varies
+-"""
+-
+-if [ $1 = "-r" ] ; then
+-  export PYTHONPATH=/projects/vxl/bin/release/lib
+-else
+-  if [ $1 = "-d" ] ; then
+-     export PYTHONPATH=/projects/vxl/bin/Debug/lib
+-  else
+-    echo "Need a flag, either -d or -r";
+-  fi
+-fi
+-
+-echo "PYTHONPATH=" $PYTHONPATH
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
+-#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall";
+-
+-model_dir="/homelocal/isa/Experiments/CapitolBOXM_6_4_4";
+-pca_dir="/homelocal/isa/Experiments/PCA/CapitolBOXM_6_4_4";
+-
+-
+-#model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
+-#pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1";
+-
+-
+-##Compute Expected Color Scene
+-#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
+-
+-#Compute reconstruction at each voxel in the scene
+-for ((dim = 2; dim <11; dim++))
+-do
+-  #Compute PCA basis
+-  python extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $dim
+-done
+-
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
+deleted file mode 100644
+index 5030ca4508..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-This folder contains Python scripts that use the main processes of bvpl_octree
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
+deleted file mode 100644
+index a7084e3cbe..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
++++ /dev/null
+@@ -1,183 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-Adds the error of a portion of voxels. Each block is processed in a separate thread.
+-This script assumes that the reconstruction error at each voxel has been computed
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class taylor_error_job():
+-
+-    def __init__(self, error_scene, fraction, block_i, block_j, block_k):
+-        self.error_scene = error_scene
+-        self.fraction = fraction
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    # load up work queue
+-    work_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    # create a queue to pass to workers to store the results
+-    result_queue = multiprocessing.Queue()
+-
+-    # spawn workers
+-    for i in range(num_procs):
+-        worker = taylor_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-       # collect the results off the queue
+-    results = []
+-    while len(results) < len(jobs):
+-        result = result_queue.get()
+-        results.append(result)
+-
+-    return results
+-
+-
+-class taylor_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Adding Errors")
+-            batch.init_process("bvplAddTaylorErrorsProcess")
+-            batch.set_input_from_db(0, job.error_scene)
+-            batch.set_input_double(1, job.fraction)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.run_process()
+-            (id, type) = batch.commit_output(0)
+-            error_val = dbvalue(id, type)
+-            error = batch.get_output_double(id)
+-
+-            self.result_queue.put(error)
+-
+-            print("error")
+-            print(error)
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#***************** The Main Algorithm ************************#
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Add Taylor Errors in a Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--fraction', action="store",
+-                      dest="fraction", type="float", default=0.0)
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int", default=1)
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int", default=1)
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int", default=1)
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    taylor_dir = options.taylor_dir
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-    fraction = options.fraction
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Error Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  taylor_dir + "/error_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    error_scene = dbvalue(scene_id, scene_type)
+-
+-    # Begin multiprocessing
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    blocks_x = [i for i in range(0, nblocks_x)]
+-    blocks_y = [i for i in range(0, nblocks_y)]
+-    blocks_z = [i for i in range(0, nblocks_z)]
+-
+-    random.shuffle(blocks_x)
+-    random.shuffle(blocks_y)
+-    random.shuffle(blocks_y)
+-
+-    # Enqueue jobs
+-    for i in range(0, len(blocks_x)):
+-        for j in range(0, len(blocks_y)):
+-            for k in range(0, len(blocks_z)):
+-                block_i = blocks_x[i]
+-                block_j = blocks_y[j]
+-                block_k = blocks_z[k]
+-                current_job = taylor_error_job(
+-                    error_scene, fraction, block_i, block_j, block_k)
+-                job_list.append(current_job)
+-
+-    # run
+-    results = execute_jobs(job_list, num_cores)
+-
+-    # dump results
+-    total_error = 0
+-    for r in results:
+-        print(r)
+-        total_error = total_error + r
+-
+-    # write schedule file
+-    int_frac = int(fraction * 100)
+-    error_file = taylor_dir + "/error_" + str(int_frac) + ".txt"
+-    fd = open(error_file, "w")
+-    print >>fd, total_error / len(results)
+-    print >>fd, results
+-    fd.close()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
+deleted file mode 100644
+index 11386b774c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
++++ /dev/null
+@@ -1,156 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-Compuets Taylor reconstruction error. Each block is processed in a separate thread.
+-This script assumes that the taylor kernels have been run on the data scene as done in run_taylor_kernels.py
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class taylor_error_job():
+-
+-    def __init__(self, data_scene, taylor_scenes, block_i, block_j, block_k):
+-        self.data_scene = data_scene
+-        self.taylor_scenes = taylor_scenes
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = taylor_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class taylor_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Computing Error Scene")
+-            batch.init_process("bvplComputeTaylorErrorProcess")
+-            batch.set_input_from_db(0, job.data_scene)
+-            batch.set_input_from_db(1, job.taylor_scenes)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.run_process()
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-#*******************The Main Algorithm ************************#
+-if __name__ == "__main__":
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute Taylor Error Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    taylor_dir = options.taylor_dir
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Data Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    data_scene = dbvalue(scene_id, scene_type)
+-
+-    # Load taylor scenes
+-    print("Loading Taylor Scenes")
+-    batch.init_process("bvplLoadTaylorScenesProcess")
+-    batch.set_input_string(0, taylor_dir)
+-    batch.set_input_int(1, -2)  # min and max points of the kernel
+-    batch.set_input_int(2, -2)
+-    batch.set_input_int(3, -2)
+-    batch.set_input_int(4, 2)
+-    batch.set_input_int(5, 2)
+-    batch.set_input_int(6, 2)
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    taylor_scenes = dbvalue(id, type)
+-
+-    # Begin multiprocessing
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    blocks_x = [i for i in range(0, nblocks_x)]
+-    blocks_y = [i for i in range(0, nblocks_y)]
+-    blocks_z = [i for i in range(0, nblocks_z)]
+-
+-    random.shuffle(blocks_x)
+-    random.shuffle(blocks_y)
+-    random.shuffle(blocks_y)
+-
+-    # Enqueue jobs
+-    for i in range(0, len(blocks_x)):
+-        for j in range(0, len(blocks_y)):
+-            for k in range(0, len(blocks_z)):
+-                block_i = blocks_x[i]
+-                block_j = blocks_y[j]
+-                block_k = blocks_z[k]
+-                current_job = taylor_error_job(
+-                    data_scene, taylor_scenes, block_i, block_j, block_k)
+-                job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
+deleted file mode 100644
+index 40fcac4910..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
++++ /dev/null
+@@ -1,113 +0,0 @@
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class histogram_job():
+-
+-    def __init__(self, scene_path):
+-        self.scene_path = scene_path
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = histogram_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class histogram_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating a Scene")
+-            batch.init_process("boxmCreateSceneProcess")
+-            batch.set_input_string(0,  job.scene_path)
+-            batch.run_process()
+-            (scene_id, scene_type) = batch.commit_output(0)
+-            scene = dbvalue(scene_id, scene_type)
+-
+-            print("Explore Histogram")
+-            batch.init_process("bvplSceneHistorgramProcess")
+-            batch.set_input_from_db(0, scene)
+-            batch.run_process()
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-#*******************The Main Algorithm ************************#
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    parser = optparse.OptionParser(description='Run Taylor Kernels')
+-
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-
+-    options, args = parser.parse_args()
+-
+-    taylor_dir = options.taylor_dir
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    # Kernel names for 2-degree approximation
+-    kernel_list = []
+-    kernel_list.append("I0")
+-    kernel_list.append("Ix")
+-    kernel_list.append("Iy")
+-    kernel_list.append("Iz")
+-    kernel_list.append("Ixx")
+-    kernel_list.append("Iyy")
+-    kernel_list.append("Izz")
+-    kernel_list.append("Ixy")
+-    kernel_list.append("Ixz")
+-    kernel_list.append("Iyz")
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-    for curr_kernel in range(0, len(kernel_list)):
+-        scene_path = taylor_dir + "/" + \
+-            kernel_list[curr_kernel] + "/float_response_scene.xml"
+-        current_job = histogram_job(scene_path)
+-        job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
+deleted file mode 100644
+index 76a0beacab..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
++++ /dev/null
+@@ -1,98 +0,0 @@
+-import os
+-from multiprocessing import Queue
+-from taylor_kernel_threads import taylor_kernel_job, execute_jobs
+-import time
+-import optparse
+-import random
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-    parser = optparse.OptionParser(description='Run Taylor Kernels')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--kernel_path', action="store", dest="kernel_path")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    taylor_dir = options.taylor_dir
+-    kernel_path = options.kernel_path
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Kernel Path"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        os.mkdir(taylor_dir + "/")
+-
+-    # Kernel names for 2-degree approximation
+-    kernel_list = []
+-    kernel_list.append("I0")
+-    kernel_list.append("Ix")
+-    kernel_list.append("Iy")
+-    kernel_list.append("Iz")
+-    kernel_list.append("Ixx")
+-    kernel_list.append("Iyy")
+-    kernel_list.append("Izz")
+-    kernel_list.append("Ixy")
+-    kernel_list.append("Ixz")
+-    kernel_list.append("Iyz")
+-
+-    print("Creating a Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    scene = dbvalue(scene_id, scene_type)
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = Queue()
+-    job_list = []
+-
+-    blocks_x = [i for i in range(0, nblocks_x)]
+-    blocks_y = [i for i in range(0, nblocks_y)]
+-    blocks_z = [i for i in range(0, nblocks_z)]
+-
+-    random.shuffle(blocks_x)
+-    random.shuffle(blocks_y)
+-    random.shuffle(blocks_y)
+-
+-    # Enqueue jobs
+-    for curr_kernel in range(0, len(kernel_list)):
+-        for i in range(0, len(blocks_x)):
+-            for j in range(0, len(blocks_y)):
+-                for k in range(0, len(blocks_z)):
+-                    block_i = blocks_x[i]
+-                    block_j = blocks_y[j]
+-                    block_k = blocks_z[k]
+-                    curr_kernel_path = kernel_path + "/" + \
+-                        kernel_list[curr_kernel] + ".txt"
+-                    output_path = taylor_dir + "/" + kernel_list[curr_kernel]
+-                    if not os.path.isdir(output_path + "/"):
+-                        os.mkdir(output_path + "/")
+-                    current_job = taylor_kernel_job(
+-                        scene, curr_kernel_path, block_i, block_j, block_k, output_path)
+-                    job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
+deleted file mode 100644
+index 1694729229..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
++++ /dev/null
+@@ -1,146 +0,0 @@
+-import multiprocessing
+-import Queue
+-import time
+-import os
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class save_scene_job():
+-
+-    def __init__(self, input_scene_path, output_scene_path):
+-        self.input_scene_path = input_scene_path
+-        self.output_scene_path = output_scene_path
+-
+-
+-def execute_jobs(jobs, num_procs=5):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = save_scene_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class save_scene_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating a Scene")
+-            batch.init_process("boxmCreateSceneProcess")
+-            batch.set_input_string(0, job.input_scene_path)
+-            batch.run_process()
+-            (scene_id, scene_type) = batch.commit_output(0)
+-            scene = dbvalue(scene_id, scene_type)
+-
+-            print("Save Scene")
+-            batch.init_process("boxmSaveSceneRawProcess")
+-            batch.set_input_from_db(0, scene)
+-            batch.set_input_string(
+-                1, job.output_scene_path + "_float")
+-            batch.set_input_unsigned(2, 0)
+-            batch.set_input_unsigned(3, 1)
+-            batch.run_process()
+-
+-#            resolution = 0;
+-#            enforce_level = 1;
+-
+-#            print("Convert to regular grid");
+-#            batch.init_process("boxmSceneToBvxmGridProcess");
+-#            batch.set_input_from_db(0,scene);
+-#            batch.set_input_string(1, job.output_scene_path + ".vox");
+-#            batch.set_input_unsigned(2, resolution);
+-#            batch.set_input_bool(3, enforce_level);
+-#            batch.run_process();
+-#            (grid_id, grid_type) = batch.commit_output(0);
+-#            grid = dbvalue(grid_id, grid_type);
+-#
+-#            print("Save Grid");
+-#            batch.init_process("bvxmSaveGridRawProcess");
+-#            batch.set_input_from_db(0,grid);
+-#            batch.set_input_string(1,job.output_scene_path + ".raw");
+-#            batch.run_process();
+-
+-            print ("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#*********************The Main Algorithm ****************************#
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    parser = optparse.OptionParser(
+-        description='Save taylor responses to raw file')
+-
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-
+-    options, args = parser.parse_args()
+-
+-    taylor_dir = options.taylor_dir
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    kernel_list = []
+-
+-    kernel_list.append("I0")
+-    kernel_list.append("Ix")
+-    kernel_list.append("Iy")
+-    kernel_list.append("Iz")
+-    kernel_list.append("Ixx")
+-    kernel_list.append("Iyy")
+-    kernel_list.append("Izz")
+-    kernel_list.append("Ixy")
+-    kernel_list.append("Ixz")
+-    kernel_list.append("Iyz")
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-#  for i in range(0, len(kernel_list)):
+-#
+-#      scene_in_path = taylor_dir + "/" + kernel_list[i] + "/float_response_scene.xml";
+-#      scene_out_path = taylor_dir + "/" + kernel_list[i]+ "/float_response_scene";
+-#
+-#      current_job = save_scene_job(scene_in_path, scene_out_path);
+-#
+-#      job_list.append(current_job);
+-
+-    # append error scene
+-    scene_in_path = taylor_dir + "/error_scene.xml"
+-    scene_out_path = taylor_dir + "/error_scene"
+-    current_job = save_scene_job(scene_in_path, scene_out_path)
+-    job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
+deleted file mode 100755
+index db27ee1939..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
++++ /dev/null
+@@ -1,67 +0,0 @@
+-#!/bin/bash
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-A script that encapsulates all steps needed to computer taylor reconstruction error
+-"""
+-
+-if [ $1 = "-r" ] ; then
+-  export PYTHONPATH=/Projects/vxl/bin/Release/lib
+-else
+-  if [ $1 = "-d" ] ; then
+-    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
+-  else
+-    echo "Need a flag, either -d or -r";
+-  fi
+-fi
+-
+-echo "PYTHONPATH=" $PYTHONPATH
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
+-#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXMSmall_test";
+-#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
+-#nblocks_x=1;
+-#nblocks_y=1;
+-#nblocks_z=1;
+-
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
+-#model_name="capitol_scene";
+-#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXM_6_4_4";
+-#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
+-#nblocks_x=6;
+-#nblocks_y=4;
+-#nblocks_z=4;
+-
+-
+-model_dir="/Users/isa/Experiments/DowntownBOXM_12_12_4";
+-model_name="downtown_scene";
+-taylor_dir="/Users/isa/Experiments/Taylor/DowntownBOXM_12_12_4";
+-kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
+-nblocks_x=12;
+-nblocks_y=12;
+-nblocks_z=4;
+-
+-fraction=1.0;
+-num_cores=10;
+-
+-cd "/Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor"
+-
+-# #Compute Expected Color Scene
+-#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
+-#
+-# #Compute Responses to Taylor Kernels
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/run_taylor_kernels.py --model_dir $model_dir --taylor_dir $taylor_dir --kernel_path $kernel_path --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
+-#
+-# #Compute reconstruction at each voxel in the scene
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/compute_taylor_error_scene.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
+-#
+-# #Add error of fraction of voxels
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/add_taylor_error.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $fraction
+-#
+-# #Save all scenes to drishti raw file
+-python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/save_taylor_raw.py --taylor_dir $taylor_dir --num_cores $num_cores
+-
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/explore_histogram.py --taylor_dir $taylor_dir --num_cores $num_cores
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
+deleted file mode 100644
+index 029ce9315d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
++++ /dev/null
+@@ -1,72 +0,0 @@
+-import multiprocessing
+-import Queue
+-import time
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class taylor_kernel_job():
+-
+-    def __init__(self, scene, kernel_path, block_i, block_j, block_k, output_path):
+-        self.scene = scene
+-        self.kernel_path = kernel_path
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-        self.output_path = output_path
+-
+-
+-def execute_jobs(jobs, num_procs=5):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = taylor_kernel_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class taylor_kernel_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating taylor kernel")
+-            batch.init_process("bvplLoadTaylorKernelProcess")
+-            batch.set_input_string(0, job.kernel_path)
+-            batch.run_process()
+-            (kernel_id, kernel_type) = batch.commit_output(0)
+-            kernel = dbvalue(kernel_id, kernel_type)
+-
+-            print("Running Kernel")
+-            batch.init_process("bvplBlockKernelOperatorProcess")
+-            batch.set_input_from_db(0, job.scene)
+-            batch.set_input_from_db(1, kernel)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.set_input_string(5, "algebraic")
+-            batch.set_input_string(6, job.output_path)
+-            batch.run_process()
+-
+-            print ("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
+deleted file mode 100644
+index 0784ff8eea..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
+-
+-set(bvpl_octree_sample_sources
+-    bvpl_octree_sample.h           bvpl_octree_sample.hxx
+-    bvpl_taylor_basis_sample.h     bvpl_taylor_basis_sample.cxx
+-    bvpl_pca_basis_sample.h        bvpl_pca_basis_sample.hxx
+-   )
+-
+-aux_source_directory(Templates bvpl_octree_sample_sources)
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_sample LIBRARY_SOURCES ${bvpl_octree_sample_sources})
+-target_link_libraries(bvpl_octree_sample ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
+deleted file mode 100644
+index 8cdbd4476b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bsta/bsta_gaussian_sphere.hxx>
+-
+-BSTA_GAUSSIAN_SPHERE_INSTANTIATE(float, 1);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
+deleted file mode 100644
+index da403deee4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-BVPL_OCTREE_SAMPLE_INSTANTIATE(gauss_type);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
+deleted file mode 100644
+index f88db3342c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-
+-BVPL_OCTREE_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
+deleted file mode 100644
+index fcaa1db057..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
+-
+-BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(10);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
+deleted file mode 100644
+index 8f1cc33b1f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
++++ /dev/null
+@@ -1,57 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
+-#ifndef bvpl_octree_sample_h
+-#define bvpl_octree_sample_h
+-//:
+-// \file
+-// \brief  A data structure to contain bvpl_kernel response, and id corresponding to axis of rotations and rotation around axis
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  December 9, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-template<class T_data>
+-class bvpl_octree_sample
+-{
+- public:
+-  //: Default Constructor. Be careful when using default constructor, the value of response may be nonsense
+-  //  This is indicated by the negative id.
+-  bvpl_octree_sample():response_(),id_(-1){}
+-
+-  //: Constructor from response and id
+-  bvpl_octree_sample(const T_data& response, const int& id):
+-  response_(response),id_(id){}
+-
+-  short version_no() const{ return 1; }
+-
+-  void  print(std::ostream& os) const;
+-
+-  //Member variables
+-  T_data response_;
+-  int id_;
+-};
+-
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample);
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample);
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample);
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample);
+-
+-template<class T_data>
+-std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample);
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
+deleted file mode 100644
+index fdc4d34d4a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
++++ /dev/null
+@@ -1,70 +0,0 @@
+-#ifndef bvpl_octree_sample_hxx_
+-#define bvpl_octree_sample_hxx_
+-
+-#include "bvpl_octree_sample.h"
+-
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.response_);
+-}
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.response_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-
+-template<class T_data>
+-void bvpl_octree_sample<T_data>::print(std::ostream& os) const
+-{
+-  os << "(response=" << response_ << " id=" << id_ <<')';
+-}
+-
+-template<class T_data>
+-std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BVPL_OCTREE_SAMPLE_INSTANTIATE(T) \
+-template class bvpl_octree_sample<T >; \
+-template std::ostream& operator << (std::ostream&, const bvpl_octree_sample<T >&); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > *&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
+deleted file mode 100644
+index 64e29dd1fd..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
++++ /dev/null
+@@ -1,57 +0,0 @@
+-// This is bvpl_pca_basis_sample.h
+-#ifndef bvpl_pca_basis_sample_h
+-#define bvpl_pca_basis_sample_h
+-
+-//:
+-// \file
+-// \brief A data structure that contains the vector of projections on pca space
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  28-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vnl/vnl_vector_fixed.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-template <unsigned dim>
+-class bvpl_pca_basis_sample{
+-
+-public:
+-  bvpl_pca_basis_sample(){
+-    pca_projections_.fill(0);
+-  }
+-
+-  bvpl_pca_basis_sample(vnl_vector_fixed<double,dim> pp){
+-    pca_projections_ = pp;
+-  }
+-  inline short version_no() const{ return 1; }
+-
+-  //: Vector of projections on pca space
+-  vnl_vector_fixed<double,dim> pca_projections_;
+-
+-};
+-
+-
+-template <unsigned dim>
+-std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample);
+-
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample);
+-
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample);
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample);
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
+deleted file mode 100644
+index 93769db3f7..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#ifndef bvpl_pca_basis_sample_hxx_
+-#define bvpl_pca_basis_sample_hxx_
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include "bvpl_pca_basis_sample.h"
+-
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-
+-template <unsigned dim>
+-std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample)
+-{
+-  os << "PCA projection = " << sample.pca_projections_ << std::endl;
+-  return os;
+-}
+-
+-//I/O
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.pca_projections_);
+-}
+-
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.pca_projections_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-
+-#define BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(T) \
+-template class bvpl_pca_basis_sample<T >; \
+-template std::ostream& operator << (std::ostream&, const bvpl_pca_basis_sample<T >&); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > *&)
+-
+-#endif // bvpl_pca_basis_sample_hxx_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
+deleted file mode 100644
+index f2d0372181..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
++++ /dev/null
+@@ -1,58 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 10-Feb-2011
+-
+-#include "bvpl_taylor_basis_sample.h"
+-#include <vnl/io/vnl_io_matrix_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample)
+-{
+-  os << "I0 = " << sample.I0 << ", G= " <<sample.G<< ", H=" << sample.H << std::endl;
+-  return os;
+-}
+-
+-//I/O
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.I0);
+-  vsl_b_write(os, sample.G);
+-  vsl_b_write(os, sample.H);
+-
+-}
+-
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.I0);
+-      vsl_b_read(is, sample.G);
+-      vsl_b_read(is, sample.H);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-      << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
+deleted file mode 100644
+index a10ece861f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
++++ /dev/null
+@@ -1,59 +0,0 @@
+-// This is bvpl_taylor_basis_sample.h
+-#ifndef bvpl_taylor_basis_sample_h
+-#define bvpl_taylor_basis_sample_h
+-
+-//:
+-// \file
+-// \brief A data structure that contains vectors and matrices needed for taylor approximation
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  10-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vnl/vnl_double_3.h>
+-#include <vnl/vnl_double_3x3.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-
+-//: Data structure needed for 2-degree taylor approximation of 3-dimesional volumes
+-class bvpl_taylor_basis2_sample
+-{
+-public:
+-  bvpl_taylor_basis2_sample()
+-  {
+-    I0 = 0.0f;
+-    //empty - to save space
+-    G = vnl_double_3(0.0,0.0,0.0);
+-    H = vnl_double_3x3(0.0);
+-  }
+-
+-  bvpl_taylor_basis2_sample(double zeroth_dev, vnl_double_3 grad, vnl_double_3x3 hess): I0(zeroth_dev), G(grad), H(hess){}
+-
+-  short version_no() const{ return 1; }
+-  //: Approximation to zeroth derivative
+-  double I0;
+-  //: Approximation to the Gradient Vector
+-  vnl_double_3 G;
+-  //: Approximation to the Hessian
+-  vnl_double_3x3 H;
+-};
+-
+-std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample);
+-
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample);
+-
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample);
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample);
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
+deleted file mode 100644
+index a5ca7c7bdf..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,4 +0,0 @@
+-add_executable( bvpl_octree_sample_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_sample_test_include bvpl_octree_sample)
+-add_executable( bvpl_octree_sample_test_template_include test_template_include.cxx )
+-target_link_libraries( bvpl_octree_sample_test_template_include bvpl_octree_sample)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
+deleted file mode 100644
+index df8d03d364..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
+deleted file mode 100644
+index 075d4723fb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
+deleted file mode 100644
+index 5781fd45ca..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,35 +0,0 @@
+-include_directories( ${MUL_INCLUDE_DIR} )
+-
+-add_executable( bvpl_octree_test_all
+-  test_driver.cxx
+-  test_octree_kernel_operator.cxx
+-  test_octree_neighbors.cxx
+-#Test EXHIBITS PATH ERRORS --  FIX_ME
+-#  test_pca_kernels.cxx
+-#Test FAILS --  FIX_ME
+-#  test_taylor_basis.cxx
+-# Test FAILS FIX_ME
+-#  test_gauss3D_steerable_filters.cxx
+- )
+-
+-set(bvpl_octree_test_all_sources
+-    test_utils.h    test_utils.cxx
+-   )
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_tests_util LIBRARY_SOURCES  ${bvpl_octree_test_all_sources})
+-
+-target_link_libraries( bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
+-target_link_libraries( bvpl_octree_test_all bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME bvpl_octree_test_kernel_operator COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_kernel_operator  )
+-add_test( NAME bvpl_octree_test_neighbors COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_neighbors  )
+-#add_test( NAME bvpl_octree_test_pca COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_pca_kernels )
+-#add_test( NAME bvpl_octree_test_taylor_basis COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_taylor_basis )
+-#add_test( NAME test_gauss3D_steerable_filters COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_gauss3D_steerable_filters )
+-
+-add_executable( bvpl_octree_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_test_include bvpl_octree)
+-
+-add_executable( bvpl_octree_test_template_include test_template_include.cxx )
+-target_link_libraries( bvpl_octree_test_template_include bvpl_octree)
+-
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
+deleted file mode 100644
+index b1b39e0bed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_octree_kernel_operator );
+-DECLARE( test_octree_neighbors );
+-//DECLARE( test_pca_kernels );//TEST EXHIBITS PATH ERRORS
+-//DECLARE( test_taylor_basis );//TEST FAILS FIX_ME
+-//DECLARE( test_gauss3D_steerable_filters );//TEST FAILS FIX_ME
+-
+-void register_tests()
+-{
+-  REGISTER( test_octree_kernel_operator );
+-  REGISTER( test_octree_neighbors );
+-  //  REGISTER( test_pca_kernels );
+-  //  REGISTER( test_taylor_basis );
+-  //  REGISTER( test_gauss3D_steerable_filters );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
+deleted file mode 100644
+index 47ec04a8ef..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
++++ /dev/null
+@@ -1,127 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 24-Aug-2011
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-#include <bvpl_octree/bvpl_gauss3D_steerable_filters.h>
+-
+-void test_gauss3D_steerable_filters()
+-{
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
+-
+-  clean_up();
+-
+-  //create scene
+-  boxm_scene<boct_tree<short, float > > *mean_scene = create_scene(2,2,2);
+-
+-  //Explore mean scene
+-  std::cout << "Exploring mean scene \n";
+-  {
+-    boxm_cell_iterator<boct_tree<short,float > > iterator = mean_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short,float > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  //create the output scenes
+-  boxm_scene<out_tree_type> *scene_out =
+-  new boxm_scene<out_tree_type>(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
+-  scene_out->set_paths(".", "steerable_gauss_3d_scene");
+-  scene_out->set_appearance_model(VNL_FLOAT_10);
+-  scene_out->write_scene("steerable_gauss_3d_scene.xml");
+-  mean_scene->clone_blocks_to_vector<10>(*scene_out);
+-
+-  //Explore Initial Response scene
+-  std::cout << "Exploring initial response scene \n";
+-  {
+-    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  boxm_scene<boct_tree<short, bool> > *valid_scene =
+-  new boxm_scene<boct_tree<short, bool> >(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
+-  valid_scene->set_paths(".", "valid_scene");
+-  valid_scene->set_appearance_model(BOXM_BOOL);
+-  valid_scene->write_scene("valid_scene.xml");
+-
+-  //operate on scene
+-  double cell_length = scene_out->finest_cell_length();
+-  bvpl_gauss3D_steerable_filters sf;
+-
+-  sf.basis_response_at_leaves(scene_out, valid_scene, cell_length);
+-
+-
+-  //Explore Response scene
+-  std::cout << "Exploring response scene \n";
+-  {
+-    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  //rotate features according to gradient
+-  sf.rotation_invariant_interpolation(scene_out, valid_scene);
+-
+-  //Explore Invariant Response scene
+-  std::cout << "Exploring rotation invariant response scene \n";
+-  {
+-    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  bool result = true;
+-  TEST("Valid Test", result, true);
+-}
+-
+-
+-TESTMAIN(test_gauss3D_steerable_filters);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
+deleted file mode 100644
+index a3b8a060e7..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
+-#include <bvpl/bvpl_octree/bvpl_corner_detector.h>
+-#include <bvpl/bvpl_octree/bvpl_corner_functors.h>
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_kernel_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
+deleted file mode 100644
+index 73b0ddef0f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
++++ /dev/null
+@@ -1,352 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov. 16, 2009.
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "../bvpl_octree_kernel_operator.h"
+-#include "../bvpl_scene_kernel_operator.h"
+-#include "../bvpl_octree_vector_operator_impl.h"
+-#include "../bvpl_scene_vector_operator.h"
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-
+-#include <boct/boct_loc_code.h>
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-static bool debug = false;
+-typedef boct_tree<short, float> tree_type;
+-typedef boct_tree_cell<short, float> cell_type;
+-
+-
+-void fill_sample_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-    tree->split();
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5);
+-    if (debug)
+-      for (auto & leave : leaves) {
+-        std::cout<< leave->get_code().x_loc_ << ','
+-                << leave->get_code().y_loc_ << ','
+-                << leave->get_code().z_loc_ << ','
+-                << leave->data() << std::endl;
+-      }
+-
+-    leaves[1]->split();
+-    //leaves[1]->set_data(0.6);
+-  }
+-
+-#if 0
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      std::cout<< leaves[i]->get_code().x_loc_ << ','
+-              << leaves[i]->get_code().y_loc_ << ','
+-              << leaves[i]->get_code().z_loc_ << ','
+-              << tree->local_origin(leaves[i]) << ','
+-              << leaves[i]->get_code().level << ','
+-              << tree->cell_size(leaves[i]) << ','
+-              << leaves[i]->data() << std::endl;
+-    }
+-  }
+-#endif
+-}
+-
+-void fill_edge3d_tree(boct_tree<short,float>* tree)
+-{
+-  tree-> split();
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  for (unsigned i= 0; i<4; i++)
+-  {
+-    leaves[i]->set_data(0.2f);
+-    leaves[i]->split();
+-    {
+-      boct_tree_cell<short,float>* cc =leaves[i]->children();
+-      for (unsigned j1=0; j1<8; j1++)
+-        cc[j1].split();
+-    }
+-    leaves[i+4]->set_data(0.9f);
+-    leaves[i+4]->split();
+-    {
+-      boct_tree_cell<short,float>* cc =leaves[i+4]->children();
+-      for (unsigned j1=0; j1<8; j1++)
+-        cc[j1].split();
+-    }
+-    //split children
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  }
+-}
+-
+-void octree_kernel()
+-{
+-  //Create kernel
+-  bvpl_edge3d_kernel_factory edge_factory(-1,1,-1,0,-1,0);
+-  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
+-#ifdef DEBUG
+-  kernel->print();
+-#endif
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-  //Create the octree
+-  auto *tree = new boct_tree<short,float>(3);
+-  fill_sample_octree(tree);
+-
+-  //operate kernel on octree
+-  bvpl_octree_kernel_operator<float> oper(tree);
+-
+-  boct_tree<short,float> *tree_out = tree->clone();
+-#ifdef DEBUG
+-  tree_out->print();
+-#endif
+-  oper.operate(functor, kernel, tree_out, 1, 0.5);
+-#ifdef DEBUG
+-  tree_out->print();
+-#endif
+-
+-  TEST("Octree kernel", true, true);
+-  delete tree;
+-  delete tree_out;
+-}
+-
+-void scene_kernel_operator()
+-{
+-  //Create kernel
+-  bvpl_edge3d_kernel_factory edge_factory(-1,0,-1,0,-1,0);
+-  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
+-
+-  //kernel->print();
+-
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-
+-  /***********Part1 operate on tree*******************/
+-
+-  //Create tree
+-  typedef boct_tree<short,float > tree_type;
+-  auto *tree = new boct_tree<short,float>(3);
+-
+-  fill_sample_octree(tree);
+-
+-  //operate on octree
+-  bvpl_octree_kernel_operator<float> oper(tree);
+-
+-
+-  //Create output trees
+-  boct_tree<short,float > *tree_out = tree->clone();
+-  tree_out->init_cells(0.0f);
+-  short level = 0;
+-  double cell_length = 1.0/(double)(1<<(tree->root_level() -level));
+-
+-  // void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
+-  oper.operate(functor,kernel, tree_out, level, cell_length);
+-
+-
+-  /***********Part2 operate on scene*******************/
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(1,1,1);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path="./";
+-  scene.set_paths(scene_path, "in_block");
+-
+-  boxm_block_iterator<tree_type>  iter =scene.iterator();
+-  iter.begin();
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type> *block = scene.get_active_block();
+-    block->init_tree(tree->clone());
+-    scene.write_active_block();
+-  }
+-
+-  //Create the output scenes
+-  boxm_scene<boct_tree<short,float> > scene_out(lvcs, origin, block_dim, world_dim);
+-  scene_out.set_paths(scene_path, "response_scene");
+-
+-  //operate on scene
+-  bvpl_scene_kernel_operator scene_oper;
+-  scene_oper.operate(scene,functor, kernel, scene_out);
+-
+-  //compare blocks of scene with single tree, result should be the same
+-  std::vector<boct_tree_cell<short,float>* > leaves_out = tree_out->leaf_cells();
+-  boxm_block_iterator<tree_type>  iter2 =scene_out.iterator();
+-  bool eq=true;
+-  iter2.begin();
+-  for (; !iter2.end(); iter2++) {
+-    scene_out.load_block(iter2.index());
+-    boxm_block<tree_type> *block = scene_out.get_active_block();
+-    tree_type *temp_tree = block->get_tree();
+-    std::vector<boct_tree_cell<short,float>* > temp_leaves = temp_tree->leaf_cells();
+-    // compare tree values
+-    for (unsigned i=0; i<temp_leaves.size(); i++) {
+-      if (!((temp_leaves[i]->data() == leaves_out[i]->data())))
+-      {
+-        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
+-        eq = false;
+-      }
+-    }
+-  }
+-  TEST("tree operator == scene operator", eq, true);
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());//file_it() is deleted here
+-   // vul_file::delete_file_glob(file_it());
+-  }
+-}
+-
+-void octree_vector_operator()
+-{
+-  //Create the vector of kernels
+-  bvpl_edge3d_kernel_factory kernels_3d(-3,2, -3,2,-3,2);
+-  bvpl_create_directions_a dir;
+-  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
+-
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-  //Create tree. this tree is initialized with 4 leves as a regular grid
+-  auto *tree = new boct_tree<short,float>(4);
+-
+-  fill_edge3d_tree(tree);
+-
+-  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
+-  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
+-  short level = 0;
+-  double cell_length = 1.0/(double)(1<<(3 -level));
+-
+-  bvpl_max_vector_operator<float> vector_op;
+-
+-  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
+-
+-  //test response at the center is correct
+-  boct_loc_code<short> loc_code;
+-
+-  bool result = true;
+-  for (short x=3; x<5; x++)
+-    for (short y=3; y<5; y++)
+-      for (short z=3; z<5; z++)
+-      {
+-        loc_code.set_code(x,y,z);
+-        loc_code.set_level(0);
+-        result = result && tree_out->get_cell(loc_code)->data().id_ == 0;
+-      }
+-  TEST("Octree vector operator", result, true);
+-}
+-
+-void scene_vector_operator()
+-{
+-  //Create the vector of kernels
+-  bvpl_edge3d_kernel_factory kernels_3d(-3,2,-3,2,-3,2);
+-  bvpl_create_directions_a dir;
+-  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
+-
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-  /***********Part1 operate on tree*******************/
+-
+-  //Create tree. this tree is initialized with 4 leves as a regular grid
+-  auto *tree = new boct_tree<short,float>(4);
+-  fill_edge3d_tree(tree);
+-
+-  //Create output trees
+-  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
+-  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
+-  short level = 0;
+-  double cell_length = 1.0/(double)(1<<(3 -level));
+-
+-  //operate vector on tree
+-  bvpl_max_vector_operator<float> vector_op;
+-
+-  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
+-
+-  /***********Part2 operate on scene*******************/
+-
+-  //Crete the input scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-
+-  vgl_vector_3d<double> block_dim(1,1,1); //world coordinate dimensions of a block
+-  vgl_vector_3d<unsigned> world_dim(2,2,2); //number of blocks in a scene
+-
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path("./");
+-  scene.set_paths(scene_path, "scene_in");
+-
+-  boxm_block_iterator<tree_type>  iter =scene.iterator();
+-  iter.begin();
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type> *block = scene.get_active_block();
+-    block->init_tree(tree->clone());
+-    scene.write_active_block();
+-  }
+-
+-  //Create the output scenes
+-  boxm_scene<boct_tree<short,bvpl_octree_sample<float> > > scene_out(lvcs, origin, block_dim, world_dim);
+-  scene_out.set_paths(scene_path, "response_scene");
+-
+-  //operate on scene
+-  bvpl_scene_vector_operator scene_oper;
+-  scene_oper.operate(scene, functor, kernel_vec, scene_out);
+-
+-  //compare blocks of scene with single tree, result should be the same
+-  std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > leaves_out = tree_out->leaf_cells();
+-  boxm_block_iterator<boct_tree<short,bvpl_octree_sample<float> > >  iter2 =scene_out.iterator();
+-  bool eq = true;
+-  iter2.begin();
+-  for (; !iter2.end(); iter2++) {
+-    scene_out.load_block(iter2.index());
+-    boxm_block<boct_tree<short,bvpl_octree_sample<float> > > *block = scene_out.get_active_block();
+-    boct_tree<short,bvpl_octree_sample<float> > *temp_tree = block->get_tree();
+-    std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > temp_leaves = temp_tree->leaf_cells();
+-    // compare tree values
+-    for (unsigned i=0; i<temp_leaves.size(); i++)
+-      if (!((temp_leaves[i]->data().response_ == leaves_out[i]->data().response_)||
+-            (temp_leaves[i]->data().id_ == leaves_out[i]->data().id_)))
+-      {
+-        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
+-        eq = false;
+-      }
+-  }
+-
+-  TEST("tree operator == scene operator", eq, true);
+-
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());//Already deletes file_it()
+-  //  vul_file::delete_file_glob(file_it());
+-  }
+-}
+-
+-
+-static void test_octree_kernel_operator()
+-{
+-  octree_kernel();
+- // octree_vector_operator(); //TEST FAIL FIX_ME
+- // scene_kernel_operator();
+- // scene_vector_operator();
+- }
+-
+-TESTMAIN(test_octree_kernel_operator);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
+deleted file mode 100644
+index 20a062b9f9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
++++ /dev/null
+@@ -1,92 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov. 16, 2009.
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "../bvpl_octree_neighbors.h"
+-#include "../bvpl_scene_kernel_operator.h"
+-#include "../bvpl_octree_vector_operator_impl.h"
+-#include "../bvpl_scene_vector_operator.h"
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-
+-#include <boct/boct_loc_code.h>
+-
+-static bool debug = false;
+-typedef boct_tree<short, float> tree_type;
+-typedef boct_tree_cell<short, float> cell_type;
+-
+-
+-void fill_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-    //tree->split();
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5);
+-    if (debug)
+-      for (auto & leave : leaves) {
+-        std::cout<< leave->get_code().x_loc_ << ','
+-                << leave->get_code().y_loc_ << ','
+-                << leave->get_code().z_loc_ << ','
+-                << leave->data() << std::endl;
+-      }
+-
+-    leaves[0]->split();
+-    //leaves[1]->set_data(0.6);
+-  }
+-
+-#if 0
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      std::cout<< leaves[i]->get_code().x_loc_ << ','
+-              << leaves[i]->get_code().y_loc_ << ','
+-              << leaves[i]->get_code().z_loc_ << ','
+-              << tree->local_origin(leaves[i]) << ','
+-              << leaves[i]->get_code().level << ','
+-              << tree->cell_size(leaves[i]) << ','
+-              << leaves[i]->data() << std::endl;
+-    }
+-  }
+-#endif
+-}
+-
+-static void test_octree_neighbors()
+-{
+-  auto* tree = new boct_tree<short,float>(4,3);
+-  fill_octree(tree);
+-  bvpl_kernel_iterator iter;
+-  vgl_point_3d<int> min_pt(-1,-1,-1);
+-  vgl_point_3d<int> max_pt(1,1,1);
+-  for (int i=min_pt.x(); i<=max_pt.x(); i++) {
+-    for (int j=min_pt.y(); j<=max_pt.y(); j++) {
+-      for (int k=min_pt.z(); k<=max_pt.z(); k++) {
+-        iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
+-      }
+-    }
+-  }
+-  bvpl_kernel_sptr kernel= new bvpl_kernel(iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0),0.0f, vgl_vector_3d<int>(3,3,3), min_pt,max_pt);
+-
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  bvpl_octree_neighbors<float> neighb(tree);
+-  for (auto cell : leaves) {
+-    std::cout << cell->code_
+-             << "THIS   " << tree->local_origin(cell) << std::endl;
+-    std::vector<boct_tree_cell<short,float> *> neighb_cells;
+-    neighb.neighbors(kernel, cell, neighb_cells);
+-    std::cout << "Number of neighbors: " << neighb_cells.size() << std::endl;
+-    for (auto & neighb_cell : neighb_cells) {
+-      std::cout << "  " << tree->local_origin(neighb_cell) << std::endl;
+-    }
+-  }
+-}
+-
+-TESTMAIN(test_octree_neighbors);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
+deleted file mode 100644
+index 602b9b14c6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
++++ /dev/null
+@@ -1,304 +0,0 @@
+-//:
+-// \file
+-// \brief : Tests bvpl/PCA operations
+-// \author Isabel Restrepo
+-// \date 17-Nov-2010
+-
+-#include <testlib/testlib_test.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include "test_utils.h"
+-
+-#include <vnl/vnl_vector.h>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_matrix.h>
+-#include <vnl/vnl_matrix_fixed.h>
+-
+-#include <vul/vul_file.h>
+-#include <vpl/vpl.h>
+-
+-void test_kernel_set_up()
+-{
+-  bool result=true;;
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
+-  //neighborhood box for volume "patches" 3x3x3
+-   vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-1,-1,-1), vgl_point_3d<int>(1,1,1));
+-  //number of samples - 10% of total number of leaf-cells
+-  unsigned long nsamples = (unsigned long)((double)scene->size() * 0.1);
+-
+-  clean_up("./evd", "*.txt");
+-  vpl_mkdir("./evd",0777);
+-  clean_up("./svd", "*.txt");
+-  vpl_mkdir("./svd",0777);
+-
+-  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, "./evd");
+-  bvpl_discover_pca_kernels pca_extractor_svd(neighborhood, nsamples, scene, "./svd", false);
+-
+-
+-  //XML write
+-  pca_extractor.xml_write();
+-  pca_extractor_svd.xml_write();
+-
+-  //training errorr
+-  vnl_vector<double> verror;
+-  vnl_vector<double> t_verror;
+-  vnl_vector<double> testing_error;
+-  pca_extractor.compute_training_error(verror);
+-  pca_extractor.theoretical_training_error(t_verror);
+-  pca_extractor.compute_testing_error(testing_error);
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_pca_kernels - 1 " << boct_tree_cell<short, float >::nleaks() << '\n';
+-#endif
+-
+-  result = verror[verror.size()-1] < 1.0e-7;
+-  TEST("Test training error:", result, true);
+-
+-  bvpl_discover_pca_kernels pca_extractor2("./evd");
+-  vnl_vector<double> verror2;
+-  pca_extractor2.compute_training_error(verror2);
+-  vnl_vector<double> test_error2;
+-  pca_extractor2.compute_testing_error(test_error2);
+-
+-  //Load from XML file - and check that clases are the same
+-  result = pca_extractor.principal_comps().is_equal(pca_extractor2.principal_comps(), 1.0e-9);
+-  TEST("Test xml_write PC:", result, true);
+-
+-  result = pca_extractor.weights().is_equal(pca_extractor2.weights(), 1.0e-9);
+-  TEST("Test xml_write weights:", result, true);
+-
+-  result = pca_extractor.mean().is_equal(pca_extractor2.mean(), 1.0e-9);
+-  TEST("Test xml_write mean:", result, true);
+-
+-  result = pca_extractor.feature_dim()== pca_extractor2.feature_dim();
+-  TEST("Test xml_write feature dim:", result, true);
+-
+-  result = pca_extractor.nsamples()== pca_extractor2.nsamples();
+-  TEST("Test xml_write nsamples :", result, true);
+-
+-  result = verror.is_equal(t_verror, 1.0e-9);
+-  TEST("Test training errors agrees with theoretical value:", result, true);
+-
+-  result = testing_error.squared_magnitude() > t_verror.squared_magnitude();
+-  TEST("Test testing error > training error:", result, true);
+-
+-  result = testing_error.is_equal(test_error2, 1.0e-9);
+-  TEST("Testing errors are equal:", result, true);
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_pca_kernels - 2 " << boct_tree_cell<short, float >::nleaks() << '\n';
+-#endif
+-
+-#if 0
+-  std::cout<< "error : " << verror << '\n'
+-          << "t_error : " << t_verror << '\n'
+-          << "weights : " << pca_extractor.weights() << '\n'
+-
+-          << "error 1: " << verror << '\n'
+-          << "error 2: " << verror2 << '\n'
+-
+-          << "mean 1: " << pca_extractor.mean() << '\n'
+-          << "mean 2: " << pca_extractor2.mean() << '\n'
+-
+-          << "path 1: " << pca_extractor.scene_path() << '\n'
+-          << "path 2: " << pca_extractor2.scene_path() << std::endl;
+-#endif
+-}
+-
+-void test_global()
+-{
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene(3,3,3);
+-  //neighborhood box for volume "patches" 5x5x5
+-  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-2,-2,-2), vgl_point_3d<int>(2,2,2));
+-  //number of samples - 10% of total number of leaf-cells
+-  double training_fraction = 1.0;
+-  unsigned long nsamples = (unsigned long)((double)scene->size() * training_fraction);
+-  double finest_cell_length = scene->finest_cell_length();
+-
+-  clean_up("./pca_info", "*.txt");
+-  vpl_mkdir("./pca_info",0777);
+-  clean_up("./pca_global_info", "*.txt");
+-  vpl_mkdir("./pca_global_info",0777);
+-
+-  bvpl_discover_pca_kernels pca_info(neighborhood, nsamples, scene, "./pca_info");
+-  pca_info.xml_write();
+-
+-  std::vector<std::string> scenes;
+-  std::vector<std::string> aux_paths;
+-  std::vector<double> cell_lengths;
+-  scenes.push_back("./test_scene.xml");
+-  aux_paths.push_back(".");
+-  cell_lengths.push_back(finest_cell_length);
+-
+-  boxm_scene<boct_tree<short, int> > *aux_scene =
+-  new boxm_scene<boct_tree<short, int> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  aux_scene->set_appearance_model(BOXM_INT);
+-
+-  std::string scene_name = "test_aux_scene";
+-  std::string scene_path(vul_file::get_cwd());
+-  aux_scene->set_paths(scene_path, scene_name);
+-  aux_scene->write_scene("./test_aux_scene.xml");
+-
+-  bvpl_global_pca<125> pca_global_info(scenes, aux_paths,cell_lengths, neighborhood,training_fraction, "./pca_global_info");
+-  pca_global_info.xml_write();
+-
+-  vnl_matrix<double> s1 = pca_info.compute_scatter_matrix(scene);
+-
+-  unsigned file =0;
+-  for (unsigned i = 0; i < 3; i++)
+-    for (unsigned j = 0; j < 3; j++)
+-      for (unsigned k = 0; k < 3; k++) {
+-        vnl_matrix_fixed<double, 125, 125> S;
+-        vnl_vector_fixed<double, 125> mean;
+-        unsigned long nfeature =0L;
+-        pca_global_info.sample_statistics(0, i, j, k, S, mean, nfeature);
+-
+-        std::stringstream scatter_ss;
+-        scatter_ss << pca_global_info.path_out() << "/S_" << 0 << '_' <<file<< ".txt";
+-        std::ofstream scatter_ofs(scatter_ss.str().c_str());
+-        scatter_ofs.precision(15);
+-        scatter_ofs << S;
+-
+-        std::stringstream mean_ss;
+-        mean_ss <<  pca_global_info.path_out() << "/mean_" << 0 << '_'  <<file << ".txt";
+-        std::ofstream mean_ofs ( mean_ss.str().c_str() );
+-        mean_ofs.precision(15);
+-        mean_ofs << nfeature << '\n' << mean;
+-        file++;
+-      }
+-
+-  //read pairwise
+-
+-  unsigned nrepeat = 0; // will become ceil(log_2(file)) after this iteration
+-  unsigned orig_file = file;
+-  for (unsigned pow_of_2 = 1; pow_of_2 < orig_file; pow_of_2*=2,++nrepeat) // i.e.: ceil(log_2(file)) iterations
+-  {
+-    unsigned file_p = 0;
+-    unsigned nfiles = 0;
+-    for (; file_p < file; file_p+=2, ++nfiles)
+-    {
+-      vnl_matrix_fixed<double, 125, 125> S1(0.0);
+-      vnl_vector_fixed<double, 125> mean1(0.0);
+-      unsigned long nfeatures1 =0;
+-
+-      {
+-        std::stringstream scatter_ss;
+-        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p << ".txt";
+-        std::ifstream scatter_ifs(scatter_ss.str().c_str());
+-        scatter_ifs >> S1;
+-        std::stringstream mean_ss;
+-        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << file_p << ".txt";
+-        std::ifstream mean_ifs ( mean_ss.str().c_str() );
+-        mean_ifs >> nfeatures1;
+-        mean_ifs >> mean1;
+-#if 0
+-        vul_file::delete(scatter_ss.str());
+-        vul_file::delete(mean_ss.str());
+-#endif
+-      }
+-
+-      vnl_matrix_fixed<double, 125, 125> S2(0.0);
+-      vnl_vector_fixed<double, 125> mean2(0.0);
+-      unsigned long nfeatures2 =0;
+-
+-      {
+-        std::stringstream scatter_ss;
+-        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p + 1  << ".txt";
+-        std::ifstream scatter_ifs(scatter_ss.str().c_str());
+-        scatter_ifs >> S2;
+-        std::stringstream mean_ss;
+-        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_' << file_p + 1 << ".txt";
+-        std::ifstream mean_ifs ( mean_ss.str().c_str() );
+-        mean_ifs >> nfeatures2;
+-        mean_ifs >> mean2;
+-      }
+-
+-      vnl_matrix_fixed<double, 125, 125> S_out(0.0);
+-      vnl_vector_fixed<double, 125> mean_out(0.0);
+-      double nfeatures_out =0.0;
+-      bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
+-
+-      std::stringstream scatter_ss;
+-      scatter_ss <<pca_global_info.path_out()  << "/S_" << (nrepeat+1) << '_' << file_p/2  << ".txt";
+-      std::ofstream scatter_ofs(scatter_ss.str().c_str());
+-      scatter_ofs.precision(15);
+-      scatter_ofs << S_out;
+-
+-      std::stringstream mean_ss;
+-      mean_ss << pca_global_info.path_out() << "/mean_" <<  (nrepeat+1) << '_' << file_p/2<< ".txt";
+-      std::ofstream mean_ofs ( mean_ss.str().c_str() );
+-      mean_ofs.precision(15);
+-      mean_ofs << nfeatures_out << '\n' << mean_out;
+-    }
+-    file = nfiles;
+-  }
+-
+-  //load final mean and scatter
+-  vnl_matrix_fixed<double, 125, 125> S_total(0.0);
+-  vnl_vector_fixed<double, 125> mean_total(0.0);
+-  unsigned long nfeatures_total =0;
+-
+-
+-  std::stringstream scatter_ss;
+-  scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat<< '_' << 0 << ".txt";
+-  std::ifstream scatter_ifs(scatter_ss.str().c_str());
+-  scatter_ifs >> S_total;
+-  std::stringstream mean_ss;
+-  mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << 0 << ".txt";
+-  std::ifstream mean_ifs ( mean_ss.str().c_str() );
+-  mean_ifs >> nfeatures_total;
+-  mean_ifs >> mean_total;
+-
+-
+-  std::cout << "Scatter diff:\n " << ((s1  - S_total).array_two_norm()) << '\n'
+-           << "Mean diff:\n " << (pca_info.mean()  - mean_total).two_norm() << '\n';
+-
+-  clean_up("./pca_info", "*.txt");
+-  clean_up("./pca_global_info", "*.txt");
+-#if 0
+-  pca_global_info.compute_statistics();
+-#endif
+-  //compare results
+-}
+-
+-
+-void test_pca_kernels()
+-{
+-  clean_up();
+-
+-  //make up a matrix
+-  vnl_matrix<double> data(2, 10);
+-  unsigned i =0;
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.69f, 0.49f));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-1.31f, -1.21f));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.39, 0.99));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.09, 0.29));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(1.29, 1.09));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.49, 0.79));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.19, -0.31));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.81, -0.81));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.31, -0.31));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.71, -1.01));
+-
+-  bvpl_discover_pca_kernels pca_extractor(data);
+-
+-  vnl_matrix<double> pc = pca_extractor.principal_comps();
+-
+-  vnl_matrix<double> true_pc(2,2);
+-  i =0;
+-  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.677873, -0.735179));
+-  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.735179, 0.677873));
+-
+-  bool result = true_pc.is_equal(pc, 0.001);
+-  TEST("Test pc equals true_pc", result, true);
+-
+-  test_kernel_set_up();
+-  test_global();
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_pca_kernels);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
+deleted file mode 100644
+index 4e5a30d980..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
++++ /dev/null
+@@ -1,143 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 11-Feb-2011
+-
+-#include <iostream>
+-#include <map>
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-#include <vul/vul_file.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vnl/vnl_sym_matrix.h>
+-
+-void create_basis(std::string test_dir, std::map<std::string, float> &values)
+-{
+-  //generate basis paths
+-  if (!vul_file::is_directory(test_dir))
+-    vul_file::make_directory(test_dir);
+-
+-  vul_file::change_directory(test_dir);
+-
+-  bvpl_taylor_basis_loader loader(test_dir);
+-
+-  std::vector<std::string> basis_names;
+-  loader.files(basis_names);
+-
+-  //make the basis directories
+-  for (unsigned i= 0; i<basis_names.size(); i++)
+-  {
+-    std::string basis_dir = vul_file::get_cwd()+ "/" + basis_names[i];
+-    if (!vul_file::is_directory(basis_dir))
+-      vul_file::make_directory(basis_dir);
+-
+-    vul_file::change_directory(basis_dir);
+-
+-    create_scene(1,1,1, true, float(i), "float_response_scene");
+-
+-    vul_file::change_directory("..");
+-
+-    values.insert(std::pair<std::string, float>(basis_names[i], float(i)));
+-  }
+-}
+-
+-void test_assemble_basis(bvpl_taylor_scenes_map_sptr taylor_scenes, std::map<std::string, float> &values)
+-{
+-  bvpl_taylor_basis::assemble_basis(taylor_scenes, 0, 0, 0);
+-
+-  //retieve the basis seen and check vectors and matrices
+-  double I0 = values["I0"];
+-
+-  vnl_vector<double> G(3);
+-  G[0] = values["Ix"];
+-  G[1] = values["Iy"];
+-  G[2] = values["Iz"];
+-
+-  double H_as_vector[6];
+-  H_as_vector[0] = values["Ixx"];
+-  H_as_vector[1] = values["Ixy"];
+-  H_as_vector[2] = values["Iyy"];
+-  H_as_vector[3] = values["Ixz"];
+-  H_as_vector[4] = values["Iyz"];
+-  H_as_vector[5] = values["Izz"];
+-  vnl_sym_matrix<double> H(H_as_vector, 3);
+-
+-  std::cout << "IO: " << I0 << "\nG: " << G <<"\nH: " << H.as_matrix() << std::endl;
+-
+-  boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* basis_scene = dynamic_cast<boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* > (taylor_scenes->get_scene("basis").as_pointer());
+-  basis_scene->load_block(0, 0, 0);
+-
+-  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* > basis_leaves = basis_scene->get_block(0, 0, 0)->get_tree()->leaf_cells();
+-
+-  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* >::iterator it = basis_leaves.begin();
+-  bool result = true;
+-  for (; it!= basis_leaves.end(); it++)
+-  {
+-    bvpl_taylor_basis2_sample sample = (*it)->data();
+-    if (sample.I0!=I0){
+-      result = false;
+-      std::cout << sample << std::endl;
+-    }
+-
+-    if (!((sample.G.as_vector()).is_equal(G, 1e-7))){
+-      result = false;
+-      std::cout << sample << std::endl;
+-    }
+-
+-    if (!((sample.H.as_matrix()).is_equal(H.as_matrix(), 1e-7))){
+-      result = false;
+-      std::cout << sample << std::endl;
+-    }
+-  }
+-
+-  TEST("Test assemble basis", result, true);
+-}
+-
+-
+-void test_taylor_basis()
+-{
+-  //generate basis
+-  std::string basis_dir = "./taylor_basis";
+-  std::map<std::string, float> values;
+-  create_basis(basis_dir, values);
+-
+-  //load map of scenes into memory
+-  bvpl_taylor_basis_loader loader(vul_file::get_cwd());
+-  std::cout << vul_file::get_cwd() << std::endl;
+-  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
+-
+-
+-  //test assembling
+-  test_assemble_basis(taylor_scenes, values);
+-
+-  //test computing error
+-  boxm_scene<boct_tree<short, float> >* data_scene = create_scene(2,2,2, true, 1.0f, "data_scene");
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
+-  double cell_length = data_scene->finest_cell_length();
+-  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),error_scene,loader,0,0,0, cell_length);
+-
+-  error_scene->load_block(0,0,0);
+-  std::cout.precision(15);
+-  error_scene->get_block(0,0,0)->get_tree()->print();
+-
+-  unsigned long tree_ncells = error_scene->get_block(0,0,0)->get_tree()->size();
+-  unsigned long scene_ncells = error_scene->size();
+-  unsigned long nsamples = scene_ncells*100L;
+-
+-  //number of samples - 10% of total number of leaf cells
+-  unsigned long tree_nsamples = (unsigned long)(float(tree_ncells)/scene_ncells*nsamples);
+-  double error = bvpl_taylor_basis::sum_errors(error_scene,0,0,0, tree_nsamples);
+-
+-  TEST_NEAR("Test average error", error, 131737.5, 1e-7);
+-}
+-
+-
+-TESTMAIN(test_taylor_basis);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
+deleted file mode 100644
+index 2932c2a301..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
+deleted file mode 100644
+index 39bffed911..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
++++ /dev/null
+@@ -1,94 +0,0 @@
+-#include "test_utils.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Aug-2010
+-
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val)
+-{
+-  tree-> split(); //now we have 8 cells
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  leaves[i]->set_data(init_val);
+-  leaves[i]->split();
+-
+-  boct_loc_code<short> code = leaves[i]->get_code() ;
+-  std::cerr<< "Create Scene Code: " << code << std::endl;
+-}
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz,
+-                                                   bool uniform, float val, const std::string& scene_prefix)
+-{
+-  float init_val = 0.5f;
+-
+-  if (uniform)
+-    init_val = val;
+-
+-  //crete the input scene
+-  unsigned int max_tree_level = 3;
+-  unsigned int init_level = 1;
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-
+-  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
+-
+-  vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
+-
+-  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim, max_tree_level, init_level );
+-  std::string scene_path(vul_file::get_cwd());
+-  scene->set_paths(scene_path, scene_prefix);
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->write_scene(scene_prefix + ".xml");
+-  unsigned cell_index = 7;
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene->load_block(iter.index());
+-    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
+-    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
+-    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
+-    //tree->print();
+-    if (uniform)
+-      init_tree(tree, cell_index, init_val);
+-    else
+-      init_tree(tree, cell_index);
+-    //tree->print();
+-    block->init_tree(tree);
+-    scene->write_active_block();
+-    if (cell_index == 0) cell_index = 7;
+-    cell_index--;
+-    ++iter;
+-  }
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << std::endl;
+-#endif
+-  return scene;
+-}
+-
+-
+-void clean_up()
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());// this deletes the file at file_it()
+-    //    vul_file::delete_file_glob(file_it());
+-  }
+-}
+-
+-void clean_up(const std::string& dir, const std::string& ext)
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it(dir+"/"+ext);
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());
+-    vul_file::delete_file_glob(file_it());
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
+deleted file mode 100644
+index f2c915a5cb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#ifndef bvpl_octree_test_utils_h_
+-#define bvpl_octree_test_utils_h_
+-//:
+-// \file
+-// \brief  A file containing utility functions for other tests
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <boxm/boxm_scene.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val = 0.8);
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
+-                                                   bool uniform = false, float val = 0.5, const std::string& scene_prefix = "test_scene");
+-
+-void clean_up();
+-
+-void clean_up(const std::string& dir, const std::string& ext);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+index 4279f1e47d..3e7108103d 100644
+--- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+@@ -19,7 +19,7 @@ if(EXPAT_FOUND)
+ 
+   vxl_add_library(LIBRARY_NAME bvpl_kernels_pro LIBRARY_SOURCES ${bvpl_kernels_pro_sources})
+ 
+-  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io bvpl_octree bvpl_octree_io bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
++  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io  bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
+ 
+   if( BUILD_TESTING )
+     add_subdirectory(tests)
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+deleted file mode 100644
+index ee1188aea5..0000000000
+--- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+deleted file mode 100644
+index 25a60ca12c..0000000000
+--- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
+index 71a463d5d7..cb9febce0d 100644
+--- a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
++++ b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
+@@ -25,7 +25,6 @@ void bvpl_kernels_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_corner2d_kernel_process, "bvplCreateCorner2dKernelProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_gauss3d_xx_kernel_vector_process, "bvplCreateGauss3dXXKernelVectorProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_wc_kernel_vector_process, "bvplCreateWCKernelVectorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_kernel_process, "bvplLoadTaylorKernelProcess");
+   REG_PROCESS_FUNC_CONS2(bvpl_create_gauss3d_kernel_process);
+   REG_PROCESS_FUNC_CONS2(bvpl_create_generic_kernel_vector_process);
+   REG_PROCESS_FUNC_CONS2(bvpl_write_generic_kernel_vector_process);
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx b/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
+deleted file mode 100644
+index c56d9cdb15..0000000000
+--- a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
++++ /dev/null
+@@ -1,53 +0,0 @@
+-//:
+-// \file
+-// \brief A process to load taylor response scenes into memory
+-// \author Isabel Restrepo
+-// \date 9-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-//:global variables
+-namespace bvpl_load_taylor_responses_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_taylor_responses_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_responses_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; //parent dir of responses
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_taylor_scenes_map_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_taylor_responses_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_responses_process_globals;
+-
+-  //get inputs
+-  std::string parent_dir = pro.get_input<std::string>(0);
+-
+-  bvpl_taylor_basis_loader loader(parent_dir);
+-  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
+-
+-  //store output
+-  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+deleted file mode 100644
+index 3bf956ba6c..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
++++ /dev/null
+@@ -1,44 +0,0 @@
+-# contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+-if( PYTHON_FOUND )
+-  FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-  if( EXPAT_FOUND )
+-    include_directories( ${PYTHON_INCLUDE_DIRS} )
+-    include_directories( ${BRL_INCLUDE_DIR} )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree)
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
+-
+-     set(bvpl_octree_batch_sources
+-       reg_bvpl_octree.h   reg_bvpl_octree.cxx
+-     )
+-    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
+-      vxl_add_library(LIBRARY_NAME bvpl_octree_batch LIBRARY_SOURCES SHARED ${bvpl_octree_batch_sources})
+-
+-      #In windows, library has to have different name depending on debug or release version.
+-      if(WIN32)
+-        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch DEBUG_POSTFIX _d SUFFIX .pyd)
+-      endif()
+-      if(APPLE) #This is because python only looks for .so
+-        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch SUFFIX .so)
+-      endif()
+-      set_target_properties(bvpl_octree_batch PROPERTIES PREFIX "")
+-
+-      target_link_libraries(bvpl_octree_batch bvpl_octree_pro bvpl_kernels_pro bpro_batch boxm_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro)
+-
+-      if(PYTHON_DEBUG_LIBRARIES)
+-        target_link_libraries( bvpl_octree_batch debug ${PYTHON_DEBUG_LIBRARY})
+-      endif()
+-
+-      if(PYTHON_LIBRARIES)
+-        target_link_libraries( bvpl_octree_batch optimized ${PYTHON_LIBRARY})
+-      endif()
+-
+-      if( BUILD_TESTING )
+-        add_subdirectory(tests)
+-      endif()
+-    endif()
+-  endif()
+-endif()
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
+deleted file mode 100644
+index d2df8b6752..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-#include "reg_bvpl_octree.h"
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-
+-// processes
+-#include <bvpl/kernels/pro/bvpl_kernels_register.h>
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
+-#include <boxm/pro/boxm_register.h>
+-#include <boxm/algo/pro/boxm_algo_register.h>
+-#include <vpgl_pro/vpgl_register.h>
+-
+-PyObject *
+-register_processes(PyObject *self, PyObject *args)
+-{
+-  bvpl_kernels_register::register_process();
+-  bvpl_octree_register::register_process();
+-  boxm_register::register_process();
+-  boxm_algo_register::register_process();
+-  vpgl_register::register_process();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-PyObject *
+-register_datatypes(PyObject *self, PyObject *args)
+-{
+-  register_basic_datatypes();
+-  bvpl_kernels_register::register_datatype();
+-  bvpl_octree_register::register_datatype();
+-  boxm_register::register_datatype();
+-  boxm_algo_register::register_datatype();
+-  vpgl_register::register_datatype();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-PyMODINIT_FUNC
+-initbvpl_octree_batch(void)
+-{
+-  PyMethodDef reg_pro;
+-  reg_pro.ml_name = "register_processes";
+-  reg_pro.ml_meth = register_processes;
+-  reg_pro.ml_doc = "register_processes() create instances of each defined process";
+-  reg_pro.ml_flags = METH_VARARGS;
+-
+-
+-  PyMethodDef reg_data;
+-  reg_data.ml_name = "register_datatypes";
+-  reg_data.ml_meth = register_datatypes;
+-  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
+-  reg_data.ml_flags = METH_VARARGS;
+-
+-  bvpl_octree_batch_methods[0]=reg_pro;
+-  bvpl_octree_batch_methods[1]=reg_data;
+-
+-  for (int i=0; i<METHOD_NUM; ++i) {
+-    bvpl_octree_batch_methods[i+2]=batch_methods[i];
+-  }
+-
+-  Py_InitModule("bvpl_octree_batch", bvpl_octree_batch_methods);
+-}
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
+deleted file mode 100644
+index 4aad2e3dcb..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#ifndef reg_bvpl_octree_h_
+-#define reg_bvpl_octree_h_
+-
+-#include <bpro/bpro_batch/bpro_batch.h>
+-
+-static PyObject *register_processes(PyObject *self, PyObject *args);
+-static PyObject *register_datatypes(PyObject *self, PyObject *args);
+-static PyMethodDef bvpl_octree_batch_methods[METHOD_NUM+2];
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
+deleted file mode 100644
+index 1cc8664ce3..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( bvpl_octree_batch_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_batch_test_include bvpl_octree_batch)
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx b/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
+deleted file mode 100644
+index 292774691a..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl_octree_batch/reg_bvpl_octree.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+index a387778a0c..0505293103 100644
+--- a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+@@ -5,14 +5,13 @@ include_directories( ${BRL_INCLUDE_DIR}/bseg/bvxm )
+ set(bvxm_algo_sources
+     bvxm_merge_mog.h     bvxm_merge_mog.cxx
+     bvxm_mog_norm.h      bvxm_mog_norm.hxx
+-    bvxm_boxm_convert.h
+    )
+ 
+ aux_source_directory(Templates bvxm_algo_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bvxm_algo LIBRARY_SOURCES ${bvxm_algo_sources})
+ 
+-target_link_libraries( bvxm_algo bsta bvxm_grid_io boxm_util ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
++target_link_libraries( bvxm_algo bsta ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
+ 
+ add_subdirectory(pro)
+ 
+diff --git a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h b/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
+deleted file mode 100644
+index d2b4e815e6..0000000000
+--- a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
++++ /dev/null
+@@ -1,152 +0,0 @@
+-// This is brl/bseg/bvxm/algo/bvxm_boxm_convert.h
+-#ifndef bvxm_boxm_convert_h
+-#define bvxm_boxm_convert_h
+-//:
+-// \file
+-// \brief Set of functions that convert a boxm_scene to a bvxm grid
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Jan 15, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#include <bvxm/grid/bvxm_voxel_grid.h>
+-#include <bvxm/grid/bvxm_voxel_grid_basic_ops.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/util/boxm_cell_data_traits.h>
+-
+-template <class T_loc, class T_data>
+-bvxm_voxel_grid<T_data>* boxm_scene_to_bvxm_grid(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                                 std::string input_path,
+-                                                 unsigned int resolution_level,
+-                                                 bool enforce_level = false )
+-{
+-  //Print a little reminder that no inter/extra-polation happens in this function
+-  std::cout << "Convertion boxm_scene to bvxm_grid\n"
+-           << "Current resolution level: " << resolution_level << '\n'
+-           << "Enforcing only level cells ? " << enforce_level << '\n'
+-           << "Is grid saving internal nodes? " <<scene.save_internal_nodes() << std::endl;
+-
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  unsigned int finest_level=100000;
+-  // find the finest levels in the blocks
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    tree_type* tree = block->get_tree();
+-    if (tree->finest_level() < int(finest_level)) {
+-      finest_level = tree->finest_level();
+-    }
+-    ++iter;
+-  }
+-
+-  // do not make the resolution smaller than finest level
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-
+-  // make sure the resolution level for all trees is the same
+-  iter.begin();
+-  short root_level = 0;
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    tree_type* tree = block->get_tree();
+-    root_level = tree->root_level();
+-  }
+-
+-  // make sure root level is the same for all the trees
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    tree_type* tree = block->get_tree();
+-    if (tree->root_level() != root_level)
+-    {
+-      std::cerr << "Error converting boxm_scene to bvxm_grid: blocks have different root level\n";
+-    }
+-    iter++;
+-  }
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 1 << (root_level - (int)resolution_level);
+-
+-  std::cout << "Number of cells per grid side: " << ncells << '\n';
+-
+-  //create the regular grid
+-  vgl_vector_3d<unsigned> dim = scene.world_dim(); //number of blocks in the scene
+-  unsigned dimx = dim.x()*ncells; // total number of cells in the scene x-dim
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  bvxm_voxel_grid<T_data> *grid = new bvxm_voxel_grid<T_data>(input_path,vgl_vector_3d<unsigned>(dimx,dimy,dimz));
+-  T_data data_init(boxm_zero_val<T_loc, T_data>());
+-  grid->initialize_data(data_init);
+-
+-  std::cout << "Grid Size: " << vgl_vector_3d<unsigned>(dimx,dimy,dimz) << '\n'
+-           << "In boxm_scene_to_bxm_grid, default voxel value for the grid is: " << data_init << std::endl;
+-
+-  //iterate through grid, locate corresponding position in the octree
+-  typename bvxm_voxel_grid<T_data>::iterator grid_it=grid->begin();
+-
+-  //locate point in the tree, for now assume ONLY ONE BLOCK
+-  iter.begin();
+-  vgl_point_3d<int> idx = iter.index();
+-  scene.load_block(idx);
+-  boxm_block<tree_type>* block = scene.get_block(idx);
+-  tree_type* tree = block->get_tree();
+-#if 0
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  // assume that bounding box is a cube
+-  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-#endif
+-
+-  for (unsigned z=0; z<dimz; ++grid_it, ++z)
+-  {
+-    bvxm_voxel_slab<T_data> slab = (*grid_it);
+-    std::cout << '.' <<std::flush ;
+-    for (unsigned y=0; y<dimy;++y)
+-    {
+-      for (unsigned x=0; x<dimx; ++x)
+-      {
+-        vgl_point_3d<double> p(((double)x/(double)dimx), ((double)y/(double)dimy), (0.99 - (double)z/(double)dimz));
+-        //locate the cell containing the point closest to the specified level
+-        boct_tree_cell<T_loc,T_data>* this_cell = tree->locate_point_at_level(p, resolution_level,true);
+-
+-        if (!this_cell) {
+-          std::cerr << "In boxm_scene_to_bvxm_grid: cell out of bounds\n";
+-          continue;
+-        }
+-
+-        unsigned int level = this_cell->get_code().level;
+-        T_data cell_val = this_cell->data();
+-
+-        if (level < resolution_level)
+-          std::cerr << "In boxm_scene_to_bvxm_grid: current level smaller than target level\n";
+-
+-        //if enfoce level is true, there is no iter/extrapolation
+-        if ((enforce_level)&& (level != resolution_level))
+-          continue;
+-
+-        // just copy value to output grid
+-        slab(x,y) = cell_val;
+-      }
+-    }
+-  }
+-  std::cout << '\n';
+-  return grid;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+index 4917b6eb59..3a0824d257 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+@@ -18,7 +18,8 @@ FIND_PACKAGE(EXPATPP REQUIRED)
+   aux_source_directory(processes bvxm_algo_pro_sources)
+ 
+   vxl_add_library(LIBRARY_NAME bvxm_algo_pro LIBRARY_SOURCES ${bvxm_algo_pro_sources} )
+-  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
++  #target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
++  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+ 
+   if( BUILD_TESTING )
+     add_subdirectory(tests)
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
+index 69e97478e7..8b9ad6d7f6 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
++++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
+@@ -8,6 +8,6 @@
+ DECLARE_FUNC_CONS(bvxm_merge_mog_process);
+ DECLARE_FUNC_CONS(bvxm_mog_to_mpm_process);
+ DECLARE_FUNC_CONS(bvxm_mog_l2_distance);
+-DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
++//DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
+ 
+ #endif
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
+index a7b2141026..a4f1e49d9d 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
++++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
+@@ -19,5 +19,5 @@ void bvxm_algo_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_merge_mog_process, "bvxmMergeMogProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_to_mpm_process, "bvxmMogToMpmProcess");
+  // REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_l2_process, "bvxmMogL2Process");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
++  //  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
+ }
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx b/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
+deleted file mode 100644
+index cfc6175b03..0000000000
+--- a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
++++ /dev/null
+@@ -1,129 +0,0 @@
+-// This is brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
+-#include <bvxm/algo/bvxm_boxm_convert.h>
+-//:
+-// \file
+-// \brief  Process to convert a boxm_scene to a bvxm_voxel_grid
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Jan 19, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_gauss_if3.h>
+-
+-
+-namespace boxm_scene_to_bvxm_grid_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 4 inputs and 1 output.
+-// input[0]: The scene
+-// input[1]: Path to output grid
+-// input[2]: Resolution level
+-// input[3]: Bool: Enforce only cells at the resolution leve?
+-//           If true, there is no interpolation
+-// output[0]: The output grid
+-
+-bool boxm_scene_to_bvxm_grid_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_scene_to_bvxm_grid_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvxm_voxel_grid_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_scene_to_bvxm_grid_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_scene_to_bvxm_grid_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cerr << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string filepath = pro.get_input<std::string>(1);
+-  unsigned resolution_level = pro.get_input<short>(2);
+-  bool enforce_level = pro.get_input<bool>(3);
+-
+-  static const unsigned int n_gaussian_modes_ = 3;
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
+-  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
+-
+-  //check input's validity
+-  if (!scene_base.ptr())
+-  {
+-    std::cerr << pro.name() << ": -- Input scene is not valid!\n";
+-    return false;
+-  }
+-
+-  if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_base.as_pointer()))
+-  {
+-    bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level,enforce_level);
+-    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
+-    return true;
+-  }
+-  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_base.as_pointer()))
+-  {
+-    bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
+-    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
+-    return true;
+-  }
+-  else if ( auto *scene =
+-            dynamic_cast<boxm_scene< boct_tree<short, mix_gauss_sf1_type > > * >(scene_base.as_pointer()))
+-  {
+-    bvxm_voxel_grid<mix_gauss_sf1_type > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
+-    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
+-    return true;
+-  }
+-  else
+-  {
+-    std::cerr << "It's not possible to convert input scene to a bvxm grid\n";
+-    return false;
+-  }
+-}
+-
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef bsta_num_obs<bsta_mixture_fixed<gauss_type,3> > mixture_type;
+-typedef boct_tree<short,mixture_type> tree_type;
+-typedef boxm_block<tree_type> block_type;
+-
+-BOCT_TREE_INSTANTIATE(short,mixture_type);
+-BOCT_TREE_CELL_INSTANTIATE(short,mixture_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(block_type);
+-
+-void vsl_b_write(vsl_b_ostream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
+-void vsl_b_read(vsl_b_istream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
+-void vsl_b_read(vsl_b_istream&, bsta_gaussian_sphere<float,1>&) {}
+-//bool operator==(block_type const&, block_type const&) { return false; }
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
+index 1110054d05..d9d1c54305 100644
+--- a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
+@@ -2,15 +2,12 @@ add_executable( bvxm_algo_test_all
+   test_driver.cxx
+   test_merge_mog.cxx
+   test_mog_norm.cxx
+-# causes memory allocation errors (FIX_ME)
+-#  test_boxm_scene_to_bvxm_grid.cxx
+ )
+ 
+ target_link_libraries( bvxm_algo_test_all bvxm_algo bvxm_grid ${VXL_LIB_PREFIX}testlib bsta)
+ 
+ add_test( NAME bvxm_algo_test_merge_mog COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_merge_mog )
+ add_test( NAME bvxm_algo_test_mog_norm COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_mog_norm )
+-#add_test( NAME bvxm_algo_test_boxm_scene_to_bvxm_grid COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_boxm_scene_to_bvxm_grid)
+ 
+ add_executable( bvxm_algo_test_include test_include.cxx )
+ target_link_libraries( bvxm_algo_test_include bvxm_algo)
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
+deleted file mode 100644
+index cf5dfe2b40..0000000000
+--- a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
++++ /dev/null
+@@ -1,111 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Jan 19, 2010.
+-
+-#include <testlib/testlib_test.h>
+-#include <bvxm/algo/bvxm_boxm_convert.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-const bool debug = true;
+-
+-void fill_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-  tree->init_cells(0.1f);
+-  tree->split();
+-  std::cout << "Level 1" << std::endl;
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5f);
+-    if (debug)
+-      for (unsigned i=0; i<leaves.size(); i++) {
+-        std::cout << leaves[i]->get_code().x_loc_ << ','
+-                 << leaves[i]->get_code().y_loc_ << ','
+-                 << leaves[i]->get_code().z_loc_ << ','
+-                 << leaves[i]->data() << std::endl;
+-      }
+-
+-    leaves[1]->split();
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "Level 0" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      leaves[i]->set_data(0.9f);
+-      std::cout << leaves[i]->get_code().x_loc_ << ','
+-               << leaves[i]->get_code().y_loc_ << ','
+-               << leaves[i]->get_code().z_loc_ << ','
+-               << leaves[i]->get_code().level << ','
+-               << leaves[i]->data() << std::endl;
+-    }
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "All Levels" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      std::cout << leaves[i]->get_code().x_loc_ << ','
+-               << leaves[i]->get_code().y_loc_ << ','
+-               << leaves[i]->get_code().z_loc_ << ','
+-               << leaves[i]->get_code().level << ','
+-               << leaves[i]->data() << std::endl;
+-    }
+-  }
+-}
+-
+-static void test_boxm_scene_to_bvxm_grid()
+-{
+-  //Create a dummy scene
+-  typedef boct_tree<short,float > tree_type;
+-  boct_tree<short,float> *tree = new boct_tree<short,float>(3);
+-  fill_octree(tree);
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-
+-  boxm_scene<tree_type> *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
+-  std::string scene_path=".";
+-  scene->set_paths(scene_path, "in_block");
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->clean_scene();
+-
+-  boxm_block_iterator<tree_type >  iter =scene->iterator();
+-  iter.begin();
+-  scene->load_block(iter.index());
+-  boxm_block<tree_type> *block = scene->get_active_block();
+-  block->init_tree(tree);
+-  scene->write_active_block();
+-  std::string input_path("scene_to_grid.vox");
+-
+-  bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene,input_path, 0);
+-
+-  //Check the grid
+-  bvxm_voxel_grid<float>::iterator grid_it = grid->slab_iterator(0, grid->grid_size().z());
+-
+-  for (unsigned z = 0; z<grid->grid_size().z(); ++z)
+-    for (unsigned y = 0; y<grid->grid_size().y(); ++y)
+-      for (unsigned x= 0; x<grid->grid_size().x(); ++x)
+-      {
+-        std::cout << "Value at " << '(' << x << ',' << y <<',' <<z << ")= " << (*grid_it)(x,y,z) << std::endl;
+-      }
+-
+-  // TEST("Valid cropped tree", result, true);
+-
+-  scene->clean_scene();
+-}
+-
+-TESTMAIN(test_boxm_scene_to_bvxm_grid);
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
+index 73e5836b26..cdb72c7ec2 100644
+--- a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
++++ b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
+@@ -2,15 +2,13 @@
+ 
+ DECLARE( test_merge_mog );
+ DECLARE( test_mog_norm );
+-//DECLARE( test_boxm_scene_to_bvxm_grid);
++
+ 
+ 
+ void register_tests()
+ {
+   REGISTER( test_merge_mog );
+   REGISTER( test_mog_norm );
+-  // test causing memory allocation errors on dashboard build
+-  //REGISTER( test_boxm_scene_to_bvxm_grid );
+ 
+ }
+ 
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
+index b109456239..2c0b205311 100644
+--- a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
++++ b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
+@@ -1,4 +1,3 @@
+-#include <bvxm/algo/bvxm_boxm_convert.h>
+ #include <bvxm/algo/bvxm_merge_mog.h>
+ #include <bvxm/algo/bvxm_mog_norm.h>
+ 
+-- 
+2.21.0
+
diff --git a/vxl.spec b/vxl.spec
index 07c400b..55fffe7 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    2.0.2
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -28,6 +28,10 @@ Patch8:     0008-v2.0.2-Correct-rply-includedir.patch
 # Thanks jjames@fedoraproject.org for pointing it out
 Patch9:     0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
 
+# Remove obsolete boxm library that fails to build on ARM
+# https://github.com/vxl/vxl/commit/cdf414000606af4bad322f7ff4c1fcdeaaa286ad
+Patch10:    0001-removed-the-obsolete-octree-library-boxm.patch
+
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
 BuildRequires:  doxygen
@@ -333,8 +337,6 @@ ctest . || exit 0
 %{_libdir}/libbnl_algo.so.2.0.2
 %{_libdir}/libboct.so.2.0
 %{_libdir}/libboct.so.2.0.2
-%{_libdir}/libboxm.so.2.0
-%{_libdir}/libboxm.so.2.0.2
 %{_libdir}/libboxm2.so.2.0
 %{_libdir}/libboxm2.so.2.0.2
 %{_libdir}/libboxm2_basic.so.2.0
@@ -365,32 +367,6 @@ ctest . || exit 0
 %{_libdir}/libboxm2_volm_io.so.2.0.2
 %{_libdir}/libboxm2_volm_pro.so.2.0
 %{_libdir}/libboxm2_volm_pro.so.2.0.2
-%{_libdir}/libboxm_algo.so.2.0
-%{_libdir}/libboxm_algo.so.2.0.2
-%{_libdir}/libboxm_algo_pro.so.2.0
-%{_libdir}/libboxm_algo_pro.so.2.0.2
-%{_libdir}/libboxm_algo_rt.so.2.0
-%{_libdir}/libboxm_algo_rt.so.2.0.2
-%{_libdir}/libboxm_algo_rt_pro.so.2.0
-%{_libdir}/libboxm_algo_rt_pro.so.2.0.2
-%{_libdir}/libboxm_algo_sp.so.2.0
-%{_libdir}/libboxm_algo_sp.so.2.0.2
-%{_libdir}/libboxm_algo_sp_pro.so.2.0
-%{_libdir}/libboxm_algo_sp_pro.so.2.0.2
-%{_libdir}/libboxm_algo_tests.so.2.0
-%{_libdir}/libboxm_algo_tests.so.2.0.2
-%{_libdir}/libboxm_basic.so.2.0
-%{_libdir}/libboxm_basic.so.2.0.2
-%{_libdir}/libboxm_pro.so.2.0
-%{_libdir}/libboxm_pro.so.2.0.2
-%{_libdir}/libboxm_sample.so.2.0
-%{_libdir}/libboxm_sample.so.2.0.2
-%{_libdir}/libboxm_sample_algo.so.2.0
-%{_libdir}/libboxm_sample_algo.so.2.0.2
-%{_libdir}/libboxm_tests.so.2.0
-%{_libdir}/libboxm_tests.so.2.0.2
-%{_libdir}/libboxm_util.so.2.0
-%{_libdir}/libboxm_util.so.2.0.2
 %{_libdir}/libbpgl.so.2.0
 %{_libdir}/libbpgl.so.2.0.2
 %{_libdir}/libbpgl_algo.so.2.0
@@ -481,16 +457,6 @@ ctest . || exit 0
 %{_libdir}/libbvpl_kernels_io.so.2.0.2
 %{_libdir}/libbvpl_kernels_pro.so.2.0
 %{_libdir}/libbvpl_kernels_pro.so.2.0.2
-%{_libdir}/libbvpl_octree.so.2.0
-%{_libdir}/libbvpl_octree.so.2.0.2
-%{_libdir}/libbvpl_octree_io.so.2.0
-%{_libdir}/libbvpl_octree_io.so.2.0.2
-%{_libdir}/libbvpl_octree_pro.so.2.0
-%{_libdir}/libbvpl_octree_pro.so.2.0.2
-%{_libdir}/libbvpl_octree_sample.so.2.0
-%{_libdir}/libbvpl_octree_sample.so.2.0.2
-%{_libdir}/libbvpl_octree_tests_util.so.2.0
-%{_libdir}/libbvpl_octree_tests_util.so.2.0.2
 %{_libdir}/libbvpl_pro.so.2.0
 %{_libdir}/libbvpl_pro.so.2.0.2
 %{_libdir}/libbvpl_util.so.2.0
@@ -720,11 +686,6 @@ ctest . || exit 0
 %{_libdir}/libbvpl_util_io.so
 %{_libdir}/libbvpl_util.so
 %{_libdir}/libbvpl_pro.so
-%{_libdir}/libbvpl_octree_tests_util.so
-%{_libdir}/libbvpl_octree_sample.so
-%{_libdir}/libbvpl_octree_pro.so
-%{_libdir}/libbvpl_octree_io.so
-%{_libdir}/libbvpl_octree.so
 %{_libdir}/libbvpl_kernels_pro.so
 %{_libdir}/libbvpl_kernels_io.so
 %{_libdir}/libbvpl_kernels.so
@@ -771,19 +732,6 @@ ctest . || exit 0
 %{_libdir}/libbprb.so
 %{_libdir}/libbpgl_algo.so
 %{_libdir}/libbpgl.so
-%{_libdir}/libboxm_util.so
-%{_libdir}/libboxm_tests.so
-%{_libdir}/libboxm_sample_algo.so
-%{_libdir}/libboxm_sample.so
-%{_libdir}/libboxm_pro.so
-%{_libdir}/libboxm_basic.so
-%{_libdir}/libboxm_algo_tests.so
-%{_libdir}/libboxm_algo_sp_pro.so
-%{_libdir}/libboxm_algo_sp.so
-%{_libdir}/libboxm_algo_rt_pro.so
-%{_libdir}/libboxm_algo_rt.so
-%{_libdir}/libboxm_algo_pro.so
-%{_libdir}/libboxm_algo.so
 %{_libdir}/libboxm2_volm_pro.so
 %{_libdir}/libboxm2_volm_io.so
 %{_libdir}/libboxm2_volm_conf.so
@@ -798,7 +746,6 @@ ctest . || exit 0
 %{_libdir}/libboxm2_class.so
 %{_libdir}/libboxm2_basic.so
 %{_libdir}/libboxm2.so
-%{_libdir}/libboxm.so
 %{_libdir}/libboct.so
 %{_libdir}/libbnl_algo.so
 %{_libdir}/libbnl.so
@@ -878,6 +825,10 @@ ctest . || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-4
+- Remove obsolete boxm library (was also causing arm build to fail)
+- Remove obsolete octree library
+
 * Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-3
 - Fix 32 bit arch builds: https://github.com/vxl/vxl/issues/638
 - Remove invalid comments

From dd2846440b05e9a63c1b3727e20515a30ed81832 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 03:14:21 +0000
Subject: [PATCH 35/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 55fffe7..7c03fc0 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    2.0.2
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -825,6 +825,9 @@ ctest . || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-4
 - Remove obsolete boxm library (was also causing arm build to fail)
 - Remove obsolete octree library

From d8d9cbde1c4014cf066716556ae6083a1c6d98f1 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 16 Sep 2019 15:12:50 +0100
Subject: [PATCH 36/74] Fix build: update patch

---
 0001-v2.0.2-unbundle-rply.patch               |    34 +-
 ...-v2.0.2-Use-Fedora-expat-and-expatpp.patch |   128 +-
 0003-v2.0.2-Use-Fedora-minizip.patch          |    18 +-
 0004-v2.0.2-Version-shared-objects.patch      |     6 +-
 ...v2.0.2-Add-cmake-module-to-find-RPLY.patch |    16 +-
 ...-Update-function-arguments-in-declar.patch |     6 +-
 0007-v2.0.2-fix-bkml-test.patch               |     8 +-
 0008-v2.0.2-Correct-rply-includedir.patch     |    16 +-
 ...ved-the-obsolete-octree-library-boxm.patch | 53224 ++++++++++++++++
 vxl.spec                                      |    12 +-
 10 files changed, 53348 insertions(+), 120 deletions(-)
 create mode 100644 0009-removed-the-obsolete-octree-library-boxm.patch

diff --git a/0001-v2.0.2-unbundle-rply.patch b/0001-v2.0.2-unbundle-rply.patch
index 69f922c..76af26e 100644
--- a/0001-v2.0.2-unbundle-rply.patch
+++ b/0001-v2.0.2-unbundle-rply.patch
@@ -1,7 +1,7 @@
 From 03d46e9ecaae8e18c892aecded6f918f6407344d Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 1/8] v2.0.2: unbundle rply
+Subject: [PATCH 1/9] v2.0.2: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
@@ -36,7 +36,7 @@ Subject: [PATCH 1/8] v2.0.2: unbundle rply
  delete mode 100644 v3p/rply/rply.h
 
 diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab4561a7f3b8 100644
+index 5cf355e3fe..662ec284e9 100644
 --- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 +++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 @@ -1,8 +1,9 @@
@@ -60,7 +60,7 @@ index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab45
  if( BUILD_TESTING )
    add_subdirectory(tests)
 diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b8782402d18f64d 100644
+index cee22bd271..4714624fa3 100644
 --- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -73,7 +73,7 @@ index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b878240
      boxm_compute_scene_statistics.h
      boxm_crop_scene.h
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae8a69ffc0 100644
+index 92b959f740..fff9ae2d84 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 @@ -1,12 +1,14 @@
@@ -94,7 +94,7 @@ index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae
  # cpp process APIs.
  add_subdirectory(pro)
 diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb89539df76a93 100644
+index 1407ed9d31..c3ed4ed27d 100644
 --- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 @@ -1,6 +1,8 @@
@@ -117,7 +117,7 @@ index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb8953
  if(BUILD_TESTING)
    add_subdirectory(tests)
 diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f906345b98 100644
+index 251ef9a979..ae9baedaa4 100644
 --- a/v3p/CMakeLists.txt
 +++ b/v3p/CMakeLists.txt
 @@ -60,5 +60,4 @@ if(VXL_BUILD_CORE_IMAGING)
@@ -128,7 +128,7 @@ index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f9
  endif()
 diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
 deleted file mode 100644
-index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..0000000000000000000000000000000000000000
+index 9085a628a1..0000000000
 --- a/v3p/rply/CMakeLists.txt
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -143,7 +143,7 @@ index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..00000000000000000000000000000000
 -vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources})
 diff --git a/v3p/rply/LICENSE b/v3p/rply/LICENSE
 deleted file mode 100644
-index 02e7c5f385b5ca8c7e9df071455f3956122e9380..0000000000000000000000000000000000000000
+index 02e7c5f385..0000000000
 --- a/v3p/rply/LICENSE
 +++ /dev/null
 @@ -1,20 +0,0 @@
@@ -169,7 +169,7 @@ index 02e7c5f385b5ca8c7e9df071455f3956122e9380..00000000000000000000000000000000
 -DEALINGS IN THE SOFTWARE.
 diff --git a/v3p/rply/etc/convert.c b/v3p/rply/etc/convert.c
 deleted file mode 100644
-index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..0000000000000000000000000000000000000000
+index e90d4cd576..0000000000
 --- a/v3p/rply/etc/convert.c
 +++ /dev/null
 @@ -1,136 +0,0 @@
@@ -311,7 +311,7 @@ index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..00000000000000000000000000000000
 -}
 diff --git a/v3p/rply/etc/dump.c b/v3p/rply/etc/dump.c
 deleted file mode 100644
-index 7ae2341cf14962953aeefed659f560e1c486cf40..0000000000000000000000000000000000000000
+index 7ae2341cf1..0000000000
 --- a/v3p/rply/etc/dump.c
 +++ /dev/null
 @@ -1,44 +0,0 @@
@@ -361,7 +361,7 @@ index 7ae2341cf14962953aeefed659f560e1c486cf40..00000000000000000000000000000000
 -
 diff --git a/v3p/rply/etc/input.ply b/v3p/rply/etc/input.ply
 deleted file mode 100644
-index 87ba8546d03d8349b773d4a155429853c7591412..0000000000000000000000000000000000000000
+index 87ba8546d0..0000000000
 --- a/v3p/rply/etc/input.ply
 +++ /dev/null
 @@ -1,16 +0,0 @@
@@ -383,7 +383,7 @@ index 87ba8546d03d8349b773d4a155429853c7591412..00000000000000000000000000000000
 -3 1 0 2
 diff --git a/v3p/rply/etc/sconvert.c b/v3p/rply/etc/sconvert.c
 deleted file mode 100644
-index 97209e9b495bbea97c8043298460bce0d4c95197..0000000000000000000000000000000000000000
+index 97209e9b49..0000000000
 --- a/v3p/rply/etc/sconvert.c
 +++ /dev/null
 @@ -1,66 +0,0 @@
@@ -455,7 +455,7 @@ index 97209e9b495bbea97c8043298460bce0d4c95197..00000000000000000000000000000000
 -}
 diff --git a/v3p/rply/manual/manual.html b/v3p/rply/manual/manual.html
 deleted file mode 100644
-index 60b415341fa283d2d03c7e1dbdd913892196d407..0000000000000000000000000000000000000000
+index 60b415341f..0000000000
 --- a/v3p/rply/manual/manual.html
 +++ /dev/null
 @@ -1,993 +0,0 @@
@@ -1454,7 +1454,7 @@ index 60b415341fa283d2d03c7e1dbdd913892196d407..00000000000000000000000000000000
 -</html>
 diff --git a/v3p/rply/manual/reference.css b/v3p/rply/manual/reference.css
 deleted file mode 100644
-index 821215dc8279d81ff09c611166479df78fd2fd15..0000000000000000000000000000000000000000
+index 821215dc82..0000000000
 --- a/v3p/rply/manual/reference.css
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -1644,7 +1644,7 @@ CHXH8%
 
 diff --git a/v3p/rply/readme.txt b/v3p/rply/readme.txt
 deleted file mode 100644
-index 638124bc3f39c21a2fcbc453a950b026686d4a19..0000000000000000000000000000000000000000
+index 638124bc3f..0000000000
 --- a/v3p/rply/readme.txt
 +++ /dev/null
 @@ -1,24 +0,0 @@
@@ -1674,7 +1674,7 @@ index 638124bc3f39c21a2fcbc453a950b026686d4a19..00000000000000000000000000000000
 -
 diff --git a/v3p/rply/rply.c b/v3p/rply/rply.c
 deleted file mode 100644
-index bc99b135d21ccb835759ac6335b4e99c40e4decc..0000000000000000000000000000000000000000
+index bc99b135d2..0000000000
 --- a/v3p/rply/rply.c
 +++ /dev/null
 @@ -1,1570 +0,0 @@
@@ -3250,7 +3250,7 @@ index bc99b135d21ccb835759ac6335b4e99c40e4decc..00000000000000000000000000000000
 - * ---------------------------------------------------------------------- */
 diff --git a/v3p/rply/rply.h b/v3p/rply/rply.h
 deleted file mode 100644
-index 3c604fd88ee1667d404d7f0e80431f2d83eb9686..0000000000000000000000000000000000000000
+index 3c604fd88e..0000000000
 --- a/v3p/rply/rply.h
 +++ /dev/null
 @@ -1,367 +0,0 @@
diff --git a/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch b/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
index 46bf7f6..bb26680 100644
--- a/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
+++ b/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
@@ -1,7 +1,7 @@
 From 5b1f1b76bb9c71c46ba867ce2170cb43d7ba0e2e Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 2/8] v2.0.2 Use Fedora expat and expatpp
+Subject: [PATCH 2/9] v2.0.2 Use Fedora expat and expatpp
 
 ---
  CMakeLists.txt                                |  3 ++
@@ -71,7 +71,7 @@ Subject: [PATCH 2/8] v2.0.2 Use Fedora expat and expatpp
  create mode 100644 config/cmake/fedora-modules/FindEXPATPP.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..dfc509d8fcd380991655331445baca4bcae2d94d 100644
+index 230de81825..dfc509d8fc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -50,6 +50,9 @@ project(VXL #Project name must be all caps to have properly generated VXL_VERSIO
@@ -86,7 +86,7 @@ index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..dfc509d8fcd380991655331445baca4b
  
 diff --git a/config/cmake/fedora-modules/FindEXPATPP.cmake b/config/cmake/fedora-modules/FindEXPATPP.cmake
 new file mode 100644
-index 0000000000000000000000000000000000000000..88a29681aa67eb298662072c3817554bcf52dcf4
+index 0000000000..88a29681aa
 --- /dev/null
 +++ b/config/cmake/fedora-modules/FindEXPATPP.cmake
 @@ -0,0 +1,37 @@
@@ -128,7 +128,7 @@ index 0000000000000000000000000000000000000000..88a29681aa67eb298662072c3817554b
 +    EXPATPP_LIBRARY
 +)
 diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
-index 5b9d660530acd9310dfb554171d70cdc7417028f..1304b5f634c977f3c7e28182c18db3f5231d0d50 100644
+index 5b9d660530..1304b5f634 100644
 --- a/contrib/brl/b3p/expat/CMakeLists.txt
 +++ b/contrib/brl/b3p/expat/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -142,7 +142,7 @@ index 5b9d660530acd9310dfb554171d70cdc7417028f..1304b5f634c977f3c7e28182c18db3f5
  
    if(WIN32)
 diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
-index 4959c123c336ee7935b31dbeffc97f734c07d73a..f25323d0dec43ee770a8506ce7197b77e20135c1 100644
+index 4959c123c3..f25323d0de 100644
 --- a/contrib/brl/b3p/expatpp/CMakeLists.txt
 +++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
 @@ -1,22 +1,4 @@
@@ -171,7 +171,7 @@ index 4959c123c336ee7935b31dbeffc97f734c07d73a..f25323d0dec43ee770a8506ce7197b77
 +FIND_PACKAGE(EXPAT REQUIRED)
 +FIND_PACKAGE(EXPATPP REQUIRED)
 diff --git a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
-index 11e9d815c387e06aadfb64bf3903f6fdef4455a6..57979102732f2178d17132c98a76de6b1769a9ac 100644
+index 11e9d815c3..5797910273 100644
 --- a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -185,7 +185,7 @@ index 11e9d815c387e06aadfb64bf3903f6fdef4455a6..57979102732f2178d17132c98a76de6b
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d111d4713 100644
+index 6328cfd419..bb6a65f96d 100644
 --- a/contrib/brl/bbas/bkml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/CMakeLists.txt
 @@ -5,7 +5,7 @@ set(bkml_sources
@@ -198,7 +198,7 @@ index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bocl/pro/CMakeLists.txt b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
-index 96e947876d3b004a2fdc4f2a93f2a63f9d29fe92..ba6ba1deb888221c728ae09aecf499c5bee21564 100644
+index 96e947876d..ba6ba1deb8 100644
 --- a/contrib/brl/bbas/bocl/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
 @@ -1,5 +1,6 @@
@@ -210,7 +210,7 @@ index 96e947876d3b004a2fdc4f2a93f2a63f9d29fe92..ba6ba1deb888221c728ae09aecf499c5
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index c4da5b9d289cdbd64ca12e20a8941856f5d91342..260bcf1d88c948689647dd3acf0c9fd6a1ef0547 100644
+index c4da5b9d28..260bcf1d88 100644
 --- a/contrib/brl/bbas/bvgl/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
 @@ -37,7 +37,8 @@ aux_source_directory(Templates bvgl_sources)
@@ -224,7 +224,7 @@ index c4da5b9d289cdbd64ca12e20a8941856f5d91342..260bcf1d88c948689647dd3acf0c9fd6
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-index afa5d22968ddac11e7730e1a9f1d9ad17531848c..40327fb9ea912dacd877b0b2f8b02bdc2dbf7364 100644
+index afa5d22968..40327fb9ea 100644
 --- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
 +++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
 @@ -14,7 +14,7 @@
@@ -237,7 +237,7 @@ index afa5d22968ddac11e7730e1a9f1d9ad17531848c..40327fb9ea912dacd877b0b2f8b02bdc
  #  include <vcl_msvc_warnings.h>
  #endif
 diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-index 76995137ed8d81fb80c10bf6d9f810b9f4003210..1cb0736454e6ac45a95f519b4bd65c4fbab268d4 100644
+index 76995137ed..1cb0736454 100644
 --- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
 @@ -16,7 +16,8 @@ set(bvgl_test_sources
@@ -251,7 +251,7 @@ index 76995137ed8d81fb80c10bf6d9f810b9f4003210..1cb0736454e6ac45a95f519b4bd65c4f
  if(EXPAT_FOUND)
    set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
 diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
-index dace2292e7e09803845f90519be8fcb50fc2131a..a05c9d03660c04914676c92274b76c2f60c888a6 100644
+index dace2292e7..a05c9d0366 100644
 --- a/contrib/brl/bbas/bwm/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/CMakeLists.txt
 @@ -26,7 +26,8 @@ endif()
@@ -265,7 +265,7 @@ index dace2292e7e09803845f90519be8fcb50fc2131a..a05c9d03660c04914676c92274b76c2f
  # Set CMake options for using vgui
  include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
 diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-index dc2102047f46fffb68d2f1e92c5718dd656c09a8..ba8c13a7067af11b3dc2958d46191f1598b2c098 100644
+index dc2102047f..ba8c13a706 100644
 --- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
 @@ -7,7 +7,8 @@ set(bwm_io_sources
@@ -279,7 +279,7 @@ index dc2102047f46fffb68d2f1e92c5718dd656c09a8..ba8c13a7067af11b3dc2958d46191f15
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/pro/CMakeLists.txt b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
-index 920f31413c3c37e65df419dc0e35f7299c48c11c..21949a782cf5a94c7160f3f6ff11a73336b4b981 100644
+index 920f31413c..21949a782c 100644
 --- a/contrib/brl/bbas/bwm/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
 @@ -9,7 +9,8 @@ set(bwm_pro_sources
@@ -293,7 +293,7 @@ index 920f31413c3c37e65df419dc0e35f7299c48c11c..21949a782cf5a94c7160f3f6ff11a733
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
-index 5408fe77a72b842784b3c05aaf30379f08fcddc1..0787b9a74e2a2c4f33e9741b8cd68133f6842776 100644
+index 5408fe77a7..0787b9a74e 100644
 --- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
 @@ -11,7 +11,8 @@ set(bwm_video_sources
@@ -307,7 +307,7 @@ index 5408fe77a72b842784b3c05aaf30379f08fcddc1..0787b9a74e2a2c4f33e9741b8cd68133
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-index ca3c490d5e9674c465bd5a57f709882bad9c71ac..d232649ccb59bb8385ddfabe99586b65f9740db1 100644
+index ca3c490d5e..d232649ccb 100644
 --- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -321,7 +321,7 @@ index ca3c490d5e9674c465bd5a57f709882bad9c71ac..d232649ccb59bb8385ddfabe99586b65
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
-index c027dfaa286137f879e6b70043e0b291663039d4..72fed69f82a9e65a1850447fea9cd1d8e70a0168 100644
+index c027dfaa28..72fed69f82 100644
 --- a/contrib/brl/bbas/bxml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bxml/CMakeLists.txt
 @@ -12,7 +12,8 @@ set( bxml_sources
@@ -353,7 +353,7 @@ index c027dfaa286137f879e6b70043e0b291663039d4..72fed69f82a9e65a1850447fea9cd1d8
  
  if( BUILD_TESTING )
 diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
-index cf11103557090d878dd388f14f3b90e870695e2e..ebb93384f94c3fd40e8b30db85ca1d9a274d5996 100644
+index cf11103557..ebb93384f9 100644
 --- a/contrib/brl/bbas/volm/CMakeLists.txt
 +++ b/contrib/brl/bbas/volm/CMakeLists.txt
 @@ -6,7 +6,8 @@
@@ -367,7 +367,7 @@ index cf11103557090d878dd388f14f3b90e870695e2e..ebb93384f94c3fd40e8b30db85ca1d9a
    if(EXPATPP_FOUND)
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bbas/volm/volm_osm_parser.h b/contrib/brl/bbas/volm/volm_osm_parser.h
-index 82283250ddb5aef0de9e06f6346c2de276440851..289d5d5265f551f75e03a530cb79d30655e57201 100644
+index 82283250dd..289d5d5265 100644
 --- a/contrib/brl/bbas/volm/volm_osm_parser.h
 +++ b/contrib/brl/bbas/volm/volm_osm_parser.h
 @@ -20,7 +20,7 @@
@@ -380,7 +380,7 @@ index 82283250ddb5aef0de9e06f6346c2de276440851..289d5d5265f551f75e03a530cb79d306
  #  include <vcl_msvc_warnings.h>
  #endif
 diff --git a/contrib/brl/bmods/FindEXPAT.cmake b/contrib/brl/bmods/FindEXPAT.cmake
-index 2be7c9a96338d5d4d6187764c6b4dad06caa52aa..cefa9c0a0e5a8a2841133fc9aa27a8995b599397 100644
+index 2be7c9a963..cefa9c0a0e 100644
 --- a/contrib/brl/bmods/FindEXPAT.cmake
 +++ b/contrib/brl/bmods/FindEXPAT.cmake
 @@ -27,6 +27,10 @@ if(NOT EXPAT_FOUND)
@@ -436,7 +436,7 @@ index 2be7c9a96338d5d4d6187764c6b4dad06caa52aa..cefa9c0a0e5a8a2841133fc9aa27a899
 -mark_as_advanced(EXPATPP_SYSTEM_INCLUDE_DIR EXPATPP_SYSTEM_LIBRARY)
 -mark_as_advanced(EXPATPP_INCLUDE_DIR EXPATPP_LIBRARY)
 diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
-index 637c1ecfa8479088678c34f48ce022c7acd533a2..bb3562f59d7dbb62a6d29e40899528007ac76044 100644
+index 637c1ecfa8..bb3562f59d 100644
 --- a/contrib/brl/bpro/CMakeLists.txt
 +++ b/contrib/brl/bpro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -450,7 +450,7 @@ index 637c1ecfa8479088678c34f48ce022c7acd533a2..bb3562f59d7dbb62a6d29e4089952800
  
  # Basic process classes
 diff --git a/contrib/brl/bpro/bprb/tests/CMakeLists.txt b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
-index cfb865611a04d59d087f42bd0fda75860a187d6a..954315f1bdde7c70677a36f0403d59d47590e67f 100644
+index cfb865611a..954315f1bd 100644
 --- a/contrib/brl/bpro/bprb/tests/CMakeLists.txt
 +++ b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
 @@ -1,6 +1,10 @@
@@ -474,7 +474,7 @@ index cfb865611a04d59d087f42bd0fda75860a187d6a..954315f1bdde7c70677a36f0403d59d4
    add_test( NAME bprb_test_process COMMAND $<TARGET_FILE:bprb_test_all> test_process )
    add_test( NAME bprb_test_process_params COMMAND $<TARGET_FILE:bprb_test_all> test_process_params )
 diff --git a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
-index 013afc8146bbad91ed7599cd054dce44d9596d2b..365ef65b6706cb0c07acc35cfc74fb7df1e4065b 100644
+index 013afc8146..365ef65b67 100644
 --- a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -487,7 +487,7 @@ index 013afc8146bbad91ed7599cd054dce44d9596d2b..365ef65b6706cb0c07acc35cfc74fb7d
  
  include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..b9ed6f84597c389fad462ebcbba7883f0f8db24e 100644
+index cbd9222c7f..b9ed6f8459 100644
 --- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -501,7 +501,7 @@ index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..b9ed6f84597c389fad462ebcbba7883f
      if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
 diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-index 3c5d70e0c6569aa51761f99782b51b7920e17681..588c0df0c092e5b5b465d656c59cc3a2838bcf20 100644
+index 3c5d70e0c6..588c0df0c0 100644
 --- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
 @@ -4,7 +4,8 @@ project( betr_batch )
@@ -515,7 +515,7 @@ index 3c5d70e0c6569aa51761f99782b51b7920e17681..588c0df0c092e5b5b465d656c59cc3a2
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-index 76fe0891b77404b40bd3de7617c279376a59a248..7c73fe1bb06a7baca4b0dd42dfd41494f89a485b 100644
+index 76fe0891b7..7c73fe1bb0 100644
 --- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
 @@ -9,7 +9,8 @@ if(ZLIB_FOUND)
@@ -529,7 +529,7 @@ index 76fe0891b77404b40bd3de7617c279376a59a248..7c73fe1bb06a7baca4b0dd42dfd41494
    include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
    if(TIFF_FOUND)
 diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-index f341e59f07f614bf38bee3f41305bbbd46f63653..6e8186a875d8fb3e28a3dd50dea3c527940438a5 100644
+index f341e59f07..6e8186a875 100644
 --- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -543,7 +543,7 @@ index f341e59f07f614bf38bee3f41305bbbd46f63653..6e8186a875d8fb3e28a3dd50dea3c527
     if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
 diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
-index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..6a0e5159f4f3ccf9caf6837a87492804cca12da1 100644
+index 6c9da00de1..6a0e5159f4 100644
 --- a/contrib/brl/bseg/boxm/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/CMakeLists.txt
 @@ -1,5 +1,6 @@
@@ -555,7 +555,7 @@ index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..6a0e5159f4f3ccf9caf6837a87492804
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-index 7afa616e35e2cdbb97bb27645f48ec6ed322f091..c821d10a77d9aac7398fe65c2439aece73ca9f5b 100644
+index 7afa616e35..c821d10a77 100644
 --- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -569,7 +569,7 @@ index 7afa616e35e2cdbb97bb27645f48ec6ed322f091..c821d10a77d9aac7398fe65c2439aece
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-index 7bb150ce571cbb4b7fa520e15e2b81830dd4b496..112a19f789d109e34272f4134d94657cf29836f0 100644
+index 7bb150ce57..112a19f789 100644
 --- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -583,7 +583,7 @@ index 7bb150ce571cbb4b7fa520e15e2b81830dd4b496..112a19f789d109e34272f4134d94657c
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-index f9cf2251e609b78468224384a10206f9d69f6c40..41fe3f9dbdf4a379c5a9b53793a16bbeda07f264 100644
+index f9cf2251e6..41fe3f9dbd 100644
 --- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -597,7 +597,7 @@ index f9cf2251e609b78468224384a10206f9d69f6c40..41fe3f9dbdf4a379c5a9b53793a16bbe
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-index ff6552a58c32238428c1776f77e1189be4f725c8..4c0cd29038a6f396d9a44cb8e3dceed5a1e79c41 100644
+index ff6552a58c..4c0cd29038 100644
 --- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -611,7 +611,7 @@ index ff6552a58c32238428c1776f77e1189be4f725c8..4c0cd29038a6f396d9a44cb8e3dceed5
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
-index 4475e418be3d2475f24e6df71a18319efb242e38..476d43b151b8ea5b44de8573ccc09969664b62ad 100644
+index 4475e418be..476d43b151 100644
 --- a/contrib/brl/bseg/boxm2/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
 @@ -21,7 +21,8 @@ set(boxm2_sources
@@ -625,7 +625,7 @@ index 4475e418be3d2475f24e6df71a18319efb242e38..476d43b151b8ea5b44de8573ccc09969
  
    include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
-index d87dc359fe443d3ea435abbf720643bf85c11347..94f764c61dca61ec5f96c58735ff9d170a1ac4db 100644
+index d87dc359fe..94f764c61d 100644
 --- a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
 +++ b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
 @@ -4,7 +4,7 @@
@@ -638,7 +638,7 @@ index d87dc359fe443d3ea435abbf720643bf85c11347..94f764c61dca61ec5f96c58735ff9d17
  #include <boxm2/basic/boxm2_block_id.h>
  #include <boxm2/boxm2_block_metadata.h>
 diff --git a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
-index 963a8a803db514ef1271ae9ff2fce8ef93b8c8e9..b697652f3614d1bf9a757430e443434b16020c95 100644
+index 963a8a803d..b697652f36 100644
 --- a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
 +++ b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
 @@ -4,7 +4,7 @@
@@ -651,7 +651,7 @@ index 963a8a803db514ef1271ae9ff2fce8ef93b8c8e9..b697652f3614d1bf9a757430e443434b
  #include <boxm2/basic/boxm2_block_id.h>
  #include <boxm2/boxm2_block_metadata.h>
 diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-index ca91150930212f8265b9ad154f5356beeec7b600..7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a 100644
+index ca91150930..7c2ec1d9c3 100644
 --- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -665,7 +665,7 @@ index ca91150930212f8265b9ad154f5356beeec7b600..7c2ec1d9c3c3610bfcf575647d37ce5e
    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
-index 4a640a7120aa6875db5fb297104bc49a6913d086..43fd0d7817e8e193aed8877d0e0d24627d4b20ea 100644
+index 4a640a7120..43fd0d7817 100644
 --- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
 +++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
 @@ -32,7 +32,7 @@
@@ -678,7 +678,7 @@ index 4a640a7120aa6875db5fb297104bc49a6913d086..43fd0d7817e8e193aed8877d0e0d2462
  
  namespace boxm2_ingest_convex_mesh_process_globals
 diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-index 861b960f4d44c92fc900280581cda2b87fce5f0d..24bf5c6f37c5b183ec449df124db4a28d75a8065 100644
+index 861b960f4d..24bf5c6f37 100644
 --- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -691,7 +691,7 @@ index 861b960f4d44c92fc900280581cda2b87fce5f0d..24bf5c6f37c5b183ec449df124db4a28
    if(EXPATPP_FOUND)
      #depends on OPENCL being found...
 diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-index 6ade9339d001532e1db0e88ccb322d087c6fddf8..bea0c2c32de9a86b55542c642a58e7e34ba07d02 100644
+index 6ade9339d0..bea0c2c32d 100644
 --- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -705,7 +705,7 @@ index 6ade9339d001532e1db0e88ccb322d087c6fddf8..bea0c2c32de9a86b55542c642a58e7e3
    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-index 70e603743b280db75ea9bb006cbf63d867cdd16f..b2282b0c64684ad59b040c602453ce98d89748e1 100644
+index 70e603743b..b2282b0c64 100644
 --- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
 @@ -9,7 +9,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
@@ -719,7 +719,7 @@ index 70e603743b280db75ea9bb006cbf63d867cdd16f..b2282b0c64684ad59b040c602453ce98
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
-index c0330db1e2f55a4cf426171ebd6fa101514f2d8b..68ab30dffc882570f04f7c4c34a5066d3b50b04b 100644
+index c0330db1e2..68ab30dffc 100644
 --- a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -733,7 +733,7 @@ index c0330db1e2f55a4cf426171ebd6fa101514f2d8b..68ab30dffc882570f04f7c4c34a5066d
    include_directories( ${BRL_INCLUDE_DIR}/bseg )
    set(boxm2_multi_pro_sources
 diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-index 1d57861444e72e66e3ee04c96e496ee4b89b206f..643a44165489692f2ebb91c6c0de4a95f3e28e1c 100644
+index 1d57861444..643a441654 100644
 --- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
 @@ -4,7 +4,8 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
@@ -747,7 +747,7 @@ index 1d57861444e72e66e3ee04c96e496ee4b89b206f..643a44165489692f2ebb91c6c0de4a95
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-index b7e3039d7ee534d30de991a7e4aae3f940b7b360..a47356c7845562b5b01ac715b79404e1d4dd50c0 100644
+index b7e3039d7e..a47356c784 100644
 --- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -761,7 +761,7 @@ index b7e3039d7ee534d30de991a7e4aae3f940b7b360..a47356c7845562b5b01ac715b79404e1
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
-index 977d68fdab136cf193f7e712e63bbd607113066a..77205c2e6bb540191efbc2e57e8b53ac719a720a 100644
+index 977d68fdab..77205c2e6b 100644
 --- a/contrib/brl/bseg/bstm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm/CMakeLists.txt
 @@ -15,7 +15,8 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
@@ -775,7 +775,7 @@ index 977d68fdab136cf193f7e712e63bbd607113066a..77205c2e6bb540191efbc2e57e8b53ac
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bstm/bstm_scene_parser.h b/contrib/brl/bseg/bstm/bstm_scene_parser.h
-index 325aee9239e41f6fe9df5fb1a1252385de5e9e2b..f1b519d12f03da5cf1d2283f57bd96a3e9519456 100644
+index 325aee9239..f1b519d12f 100644
 --- a/contrib/brl/bseg/bstm/bstm_scene_parser.h
 +++ b/contrib/brl/bseg/bstm/bstm_scene_parser.h
 @@ -4,7 +4,7 @@
@@ -788,7 +788,7 @@ index 325aee9239e41f6fe9df5fb1a1252385de5e9e2b..f1b519d12f03da5cf1d2283f57bd96a3
  #include <bstm/basic/bstm_block_id.h>
  #include <bstm/bstm_block_metadata.h>
 diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-index c94ddbcc4c159b771d85bb6a81a0e38d77750023..18b5e9c5f8388baa8a6295f41db3353c3718be62 100644
+index c94ddbcc4c..18b5e9c5f8 100644
 --- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
 @@ -12,7 +12,8 @@ if(DIRECTSHOW_FOUND)
@@ -802,7 +802,7 @@ index c94ddbcc4c159b771d85bb6a81a0e38d77750023..18b5e9c5f8388baa8a6295f41db3353c
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-index ba8815fe6bef5982f655a3c6f13afefb64743344..1f57d0d9580309206776f921da24dbefeb5b103a 100644
+index ba8815fe6b..1f57d0d958 100644
 --- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
 @@ -15,7 +15,8 @@ set(bstm_multi_sources
@@ -816,7 +816,7 @@ index ba8815fe6bef5982f655a3c6f13afefb64743344..1f57d0d9580309206776f921da24dbef
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
-index 062a2eda8ffa7e9f514d8b801b89b0251bac52d0..c5108c101805a270b30ff359cda5bf1fe705b4f6 100644
+index 062a2eda8f..c5108c1018 100644
 --- a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
 +++ b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
 @@ -20,7 +20,7 @@
@@ -829,7 +829,7 @@ index 062a2eda8ffa7e9f514d8b801b89b0251bac52d0..c5108c101805a270b30ff359cda5bf1f
  #ifdef _MSC_VER
  #  include <vcl_msvc_warnings.h>
 diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..1f390f966cb5b7451f3598d8c5c474714b2ea76b 100644
+index a1fd1eb943..1f390f966c 100644
 --- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -843,7 +843,7 @@ index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..1f390f966cb5b7451f3598d8c5c47471
  #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
  #mark_as_advanced( VXL_FORCE_V3P_RPLY )
 diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-index 96064e507e6e51ffb27075737e54a8e96e3e8f95..bbc90f7cea4993002dfc553aae6130e152c8a849 100644
+index 96064e507e..bbc90f7cea 100644
 --- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -857,7 +857,7 @@ index 96064e507e6e51ffb27075737e54a8e96e3e8f95..bbc90f7cea4993002dfc553aae6130e1
  include_directories( ${BRL_INCLUDE_DIR}/bpro )
  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-index 25433e56f26dd49fb413480b1aa67a312f9999fb..f3659d539033b7a327e5cb935f54f4771f0a499d 100644
+index 25433e56f2..f3659d5390 100644
 --- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -871,7 +871,7 @@ index 25433e56f26dd49fb413480b1aa67a312f9999fb..f3659d539033b7a327e5cb935f54f477
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..615f02e3fa17b3b958a23e0ca9e0d78573265f59 100644
+index 0672b5d3d8..615f02e3fa 100644
 --- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -885,7 +885,7 @@ index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..615f02e3fa17b3b958a23e0ca9e0d785
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-index 67cdcf8e00f3541224d581d12ac52d51b07ef7a5..4279f1e47d7046d3dd05c27995a80c0214df7b6b 100644
+index 67cdcf8e00..4279f1e47d 100644
 --- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -899,7 +899,7 @@ index 67cdcf8e00f3541224d581d12ac52d51b07ef7a5..4279f1e47d7046d3dd05c27995a80c02
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
-index 3f4b2b26bc7893084f77f8e739d5bb7be0224e06..03b7df907e515055f44a100fe8393c4eda71f3bc 100644
+index 3f4b2b26bc..03b7df907e 100644
 --- a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -913,7 +913,7 @@ index 3f4b2b26bc7893084f77f8e739d5bb7be0224e06..03b7df907e515055f44a100fe8393c4e
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-index 90102867454d6308ab766a13d101567562920633..5583214c7bdd0b217693a894a2e84341289899c1 100644
+index 9010286745..5583214c7b 100644
 --- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -927,7 +927,7 @@ index 90102867454d6308ab766a13d101567562920633..5583214c7bdd0b217693a894a2e84341
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..3bf956ba6c1c10579869863d828399680ead74b3 100644
+index 052a160d9c..3bf956ba6c 100644
 --- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -941,7 +941,7 @@ index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..3bf956ba6c1c10579869863d82839968
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
-index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..6c7b6091a820f956b0d55c1edac7857b09f5b4ac 100644
+index fbda67337c..6c7b6091a8 100644
 --- a/contrib/brl/bseg/bvxm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
 @@ -38,7 +38,8 @@ set(bvxm_sources
@@ -955,7 +955,7 @@ index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..6c7b6091a820f956b0d55c1edac7857b
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-index 8a1789161dac46c4e0506c32b261527e9542458d..4917b6eb59db38f9e3b48c0a83c4d7cc7843807e 100644
+index 8a1789161d..4917b6eb59 100644
 --- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -969,7 +969,7 @@ index 8a1789161dac46c4e0506c32b261527e9542458d..4917b6eb59db38f9e3b48c0a83c4d7cc
   if(EXPATPP_FOUND)
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
-index e58cf620f556016a078aa677907da215c078b8e4..d707da04db8df2e4f27585d9c56e91e256ad9569 100644
+index e58cf620f5..d707da04db 100644
 --- a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
 +++ b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
 @@ -6,7 +6,7 @@
@@ -982,7 +982,7 @@ index e58cf620f556016a078aa677907da215c078b8e4..d707da04db8df2e4f27585d9c56e91e2
  #  include <vcl_msvc_warnings.h>
  #endif
 diff --git a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
-index c2901f9c9087900fb1007b12ed63734c33f401e9..a41c67e51444fea891f31c18367b9dc60ff1c643 100644
+index c2901f9c90..a41c67e514 100644
 --- a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -996,7 +996,7 @@ index c2901f9c9087900fb1007b12ed63734c33f401e9..a41c67e51444fea891f31c18367b9dc6
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
-index 5d107edbd15026bc64905da88ec723161a33cbf5..5c6cbc56e49033c280608810e737c214db39d66b 100644
+index 5d107edbd1..5c6cbc56e4 100644
 --- a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -1010,7 +1010,7 @@ index 5d107edbd15026bc64905da88ec723161a33cbf5..5c6cbc56e49033c280608810e737c214
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-index 58ece0b8d3852237d36db89e868463369dc4502c..ed25993cc7b20d1ae3d6c18bff8b8b05be1f408c 100644
+index 58ece0b8d3..ed25993cc7 100644
 --- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -1024,7 +1024,7 @@ index 58ece0b8d3852237d36db89e868463369dc4502c..ed25993cc7b20d1ae3d6c18bff8b8b05
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-index b7b0636f29e443a9e02a6354faf204f01c2617e9..efc4aa9b30b7fcfcb69bb4aadb46a988849936c5 100644
+index b7b0636f29..efc4aa9b30 100644
 --- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
 @@ -8,7 +8,8 @@ if(OPENCL_FOUND)
@@ -1038,7 +1038,7 @@ index b7b0636f29e443a9e02a6354faf204f01c2617e9..efc4aa9b30b7fcfcb69bb4aadb46a988
      include_directories( ${EXPAT_INCLUDE_DIR} )
      include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
-index 26504576be394f4351e7ef1521ab3fff38616003..ed189bccd7ff9a2ca0317b4aa6bd99c18cd5507e 100644
+index 26504576be..ed189bccd7 100644
 --- a/contrib/brl/bseg/vcon/CMakeLists.txt
 +++ b/contrib/brl/bseg/vcon/CMakeLists.txt
 @@ -4,7 +4,8 @@
diff --git a/0003-v2.0.2-Use-Fedora-minizip.patch b/0003-v2.0.2-Use-Fedora-minizip.patch
index db8230a..00dd52f 100644
--- a/0003-v2.0.2-Use-Fedora-minizip.patch
+++ b/0003-v2.0.2-Use-Fedora-minizip.patch
@@ -1,15 +1,15 @@
-From 28d2c2ca3c1ac934b026e733d613cb0c5556a5c3 Mon Sep 17 00:00:00 2001
+From 2a0cd34dbe8aec011713860321a569f9ec64b7d4 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 3/8] v2.0.2 Use Fedora minizip
+Subject: [PATCH 3/9] v2.0.2 Use Fedora minizip
 
 ---
  contrib/brl/b3p/CMakeLists.txt                                | 4 ----
- .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 3 ++-
- 2 files changed, 2 insertions(+), 5 deletions(-)
+ .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 1 +
+ 2 files changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..b2f4b5f6bdb4ed0cbbde6459cb201578a1823a5d 100644
+index 7fefd89f41..b2f4b5f6bd 100644
 --- a/contrib/brl/b3p/CMakeLists.txt
 +++ b/contrib/brl/b3p/CMakeLists.txt
 @@ -19,7 +19,3 @@ add_subdirectory(expatpp)
@@ -21,15 +21,13 @@ index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..b2f4b5f6bdb4ed0cbbde6459cb201578
 -
 -
 diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-index 7a907be4a4d50c58e8cc77495b03f031419b798d..6580049493239b513796127f225ece807e8f9a90 100644
+index 7a907be4a4..2cac32963a 100644
 --- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
 +++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-@@ -37,7 +37,8 @@
- #include <vul/vul_file.h>
+@@ -38,6 +38,7 @@
  
  #if HAS_ZLIB
--#include <minizip/zip.h>
-+#include <zip.h>
+ #include <minizip/zip.h>
 +#include <zlib.h>
  #endif
  
diff --git a/0004-v2.0.2-Version-shared-objects.patch b/0004-v2.0.2-Version-shared-objects.patch
index d6bd949..b53cc11 100644
--- a/0004-v2.0.2-Version-shared-objects.patch
+++ b/0004-v2.0.2-Version-shared-objects.patch
@@ -1,14 +1,14 @@
-From e1e1aab38d7328eb616facea21a3cfeb6b2c26c3 Mon Sep 17 00:00:00 2001
+From e1eb7b3fab1cec8dde0c09a20fa731f497be8630 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 18 Apr 2019 22:11:41 +0100
-Subject: [PATCH 4/8] v2.0.2 Version shared objects
+Subject: [PATCH 4/9] v2.0.2 Version shared objects
 
 ---
  CMakeLists.txt | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dfc509d8fcd380991655331445baca4bcae2d94d..0748a6c7371b1fb8ff390f7c465d47f383c0868f 100644
+index dfc509d8fc..0748a6c737 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -46,13 +46,19 @@ foreach(p
diff --git a/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch b/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
index 850d031..5ffb79a 100644
--- a/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
+++ b/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
@@ -1,7 +1,7 @@
-From aacd92f275ad6f78c8d13441e33baf36161318e6 Mon Sep 17 00:00:00 2001
+From 0ce6048e45379a0bdac240b3b3c655f752e289c0 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 14:11:31 +0100
-Subject: [PATCH 5/8] v2.0.2 Add cmake module to find RPLY
+Subject: [PATCH 5/9] v2.0.2 Add cmake module to find RPLY
 
 ---
  CMakeLists.txt                                |  3 +-
@@ -14,7 +14,7 @@ Subject: [PATCH 5/8] v2.0.2 Add cmake module to find RPLY
  create mode 100644 config/cmake/fedora-modules/FindRPLY.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0748a6c7371b1fb8ff390f7c465d47f383c0868f..dfd9187aa0dab595d943629ecb1fe49c6f25094b 100644
+index 0748a6c737..dfd9187aa0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -120,7 +120,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
@@ -29,7 +29,7 @@ index 0748a6c7371b1fb8ff390f7c465d47f383c0868f..dfd9187aa0dab595d943629ecb1fe49c
  #
 diff --git a/config/cmake/fedora-modules/FindRPLY.cmake b/config/cmake/fedora-modules/FindRPLY.cmake
 new file mode 100644
-index 0000000000000000000000000000000000000000..abe415bd9e1e392e242753df7053f8ae8a4b43ac
+index 0000000000..abe415bd9e
 --- /dev/null
 +++ b/config/cmake/fedora-modules/FindRPLY.cmake
 @@ -0,0 +1,39 @@
@@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..abe415bd9e1e392e242753df7053f8ae
 +    RPLY_LIBRARY
 +)
 diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 662ec284e92840ebbcc0b3fc53eeab4561a7f3b8..1c2e6a70890f7556e387a6446cbb2af764c8907a 100644
+index 662ec284e9..1c2e6a7089 100644
 --- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 +++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 @@ -1,6 +1,6 @@
@@ -85,7 +85,7 @@ index 662ec284e92840ebbcc0b3fc53eeab4561a7f3b8..1c2e6a70890f7556e387a6446cbb2af7
  include_directories( ${BRL_INCLUDE_DIR} )
  include_directories( ${RPLY_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-index 4714624fa3f1b30ecc5b99278b8782402d18f64d..16694fbbc4c2608c650a8f14d8d75e4da8de817e 100644
+index 4714624fa3..16694fbbc4 100644
 --- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
 @@ -1,5 +1,5 @@
@@ -96,7 +96,7 @@ index 4714624fa3f1b30ecc5b99278b8782402d18f64d..16694fbbc4c2608c650a8f14d8d75e4d
  include_directories( ${RPLY_INCLUDE_DIR} )
  set(boxm_algo_sources
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index fff9ae2d8404c5631564eddc30c48cae8a69ffc0..d7ef6ed5fa345edf70cc5d2074fba2aed5f2d23f 100644
+index fff9ae2d84..d7ef6ed5fa 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -106,7 +106,7 @@ index fff9ae2d8404c5631564eddc30c48cae8a69ffc0..d7ef6ed5fa345edf70cc5d2074fba2ae
  include_directories( ${BRL_INCLUDE_DIR}/bseg )
  include_directories( ${RPLY_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-index c3ed4ed27d4d08902f8b56d158bb89539df76a93..19763fbd71ca8ee9071483e8ad3a86db8450f852 100644
+index c3ed4ed27d..19763fbd71 100644
 --- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 @@ -1,4 +1,4 @@
diff --git a/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch b/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
index ed20699..e2a392e 100644
--- a/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
+++ b/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
@@ -1,14 +1,14 @@
-From a7c248224fed9685df171325ed39c7c3664a2158 Mon Sep 17 00:00:00 2001
+From 3297b7f7dc864aca4f0a1df822d6c657a7c67abd Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 16:16:56 +0100
-Subject: [PATCH 6/8] v2.0.2 bbas-baio Update function arguments in declaration
+Subject: [PATCH 6/9] v2.0.2 bbas-baio Update function arguments in declaration
 
 ---
  contrib/brl/bbas/baio/baio_unix.cxx | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/contrib/brl/bbas/baio/baio_unix.cxx b/contrib/brl/bbas/baio/baio_unix.cxx
-index e8af7199f23f25cf09b4c3359690999ca27fd1ed..98fc11027683356a1e57514aafbe63e269b5b9da 100644
+index e8af7199f2..98fc110276 100644
 --- a/contrib/brl/bbas/baio/baio_unix.cxx
 +++ b/contrib/brl/bbas/baio/baio_unix.cxx
 @@ -34,7 +34,7 @@ baio::~baio()
diff --git a/0007-v2.0.2-fix-bkml-test.patch b/0007-v2.0.2-fix-bkml-test.patch
index 8f6cdd6..8b6a2f2 100644
--- a/0007-v2.0.2-fix-bkml-test.patch
+++ b/0007-v2.0.2-fix-bkml-test.patch
@@ -1,7 +1,7 @@
-From bfe8cdb20353b83e3e231fa72e2199e4d716d4cf Mon Sep 17 00:00:00 2001
+From 220d1ca54a2cc737d921472c4fe554e0fd52e770 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 17:05:39 +0100
-Subject: [PATCH 7/8] v2.0.2 fix bkml test
+Subject: [PATCH 7/9] v2.0.2 fix bkml test
 
 ---
  contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
@@ -9,7 +9,7 @@ Subject: [PATCH 7/8] v2.0.2 fix bkml test
  2 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index bb6a65f96d9e2184fbd477d28ab24e6d111d4713..e34211b0f692353b23819618f38c3ef88544c1cc 100644
+index bb6a65f96d..e34211b0f6 100644
 --- a/contrib/brl/bbas/bkml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/CMakeLists.txt
 @@ -6,6 +6,7 @@ set(bkml_sources
@@ -21,7 +21,7 @@ index bb6a65f96d9e2184fbd477d28ab24e6d111d4713..e34211b0f692353b23819618f38c3ef8
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bkml/tests/CMakeLists.txt b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
-index 84c36469a492c95f87f3e766bcc95d7878b4f0aa..9eddec1f6657e6584883c5a7a6f885f1446ea4a9 100644
+index 84c36469a4..9eddec1f66 100644
 --- a/contrib/brl/bbas/bkml/tests/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
 @@ -1,12 +1,24 @@
diff --git a/0008-v2.0.2-Correct-rply-includedir.patch b/0008-v2.0.2-Correct-rply-includedir.patch
index 80c6ac4..588393f 100644
--- a/0008-v2.0.2-Correct-rply-includedir.patch
+++ b/0008-v2.0.2-Correct-rply-includedir.patch
@@ -1,7 +1,7 @@
-From 6a863547324024a17eca177eb73def5a7cd8aeb9 Mon Sep 17 00:00:00 2001
+From 074e01ca47a9c1379f293271ddc0470d8ddf5c9d Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 23:32:15 +0100
-Subject: [PATCH 8/8] v2.0.2 Correct rply includedir
+Subject: [PATCH 8/9] v2.0.2 Correct rply includedir
 
 ---
  contrib/brl/bbas/bvrml/pro/CMakeLists.txt      | 8 +++++++-
@@ -13,7 +13,7 @@ Subject: [PATCH 8/8] v2.0.2 Correct rply includedir
  6 files changed, 42 insertions(+), 3 deletions(-)
 
 diff --git a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
-index c1c82d0dd47a4e9f0a20f40d2d84bea93ab3fb15..3a82f2e0506f010264418129369366358da6f0c8 100644
+index c1c82d0dd4..3a82f2e050 100644
 --- a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
 @@ -4,7 +4,13 @@ if (HAS_GEOTIFF)
@@ -32,7 +32,7 @@ index c1c82d0dd47a4e9f0a20f40d2d84bea93ab3fb15..3a82f2e0506f01026441812936936635
  set(bvrml_pro_sources
      bvrml_processes.h
 diff --git a/contrib/brl/bbas/bwm/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
-index 4b642eb2324183d68fd5c7783c80d57974632a42..43de7db5df610855d3d2ce3b9630231a28c3e028 100644
+index 4b642eb232..43de7db5df 100644
 --- a/contrib/brl/bbas/bwm/exe/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
 @@ -1,7 +1,13 @@
@@ -51,7 +51,7 @@ index 4b642eb2324183d68fd5c7783c80d57974632a42..43de7db5df610855d3d2ce3b9630231a
  include_directories( ${OXL_INCLUDE_DIR} )
  
 diff --git a/contrib/brl/bbas/volm/pro/CMakeLists.txt b/contrib/brl/bbas/volm/pro/CMakeLists.txt
-index 76c1216a4f91c61a9354ca8dc6cb490c63306e9c..aa028ca71f081ea5db5ffd17f27ee67b3d228d29 100644
+index 76c1216a4f..aa028ca71f 100644
 --- a/contrib/brl/bbas/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/volm/pro/CMakeLists.txt
 @@ -4,7 +4,13 @@ if(VXL_BUILD_RPL)
@@ -70,7 +70,7 @@ index 76c1216a4f91c61a9354ca8dc6cb490c63306e9c..aa028ca71f081ea5db5ffd17f27ee67b
    # The N-dimensional bin structure implementations use rpl/rsdl
  
 diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-index c821d10a77d9aac7398fe65c2439aece73ca9f5b..2a41c2db1aefe27fe538a16db4be4b9bfdd58bdf 100644
+index c821d10a77..2a41c2db1a 100644
 --- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
 @@ -3,13 +3,20 @@
@@ -95,7 +95,7 @@ index c821d10a77d9aac7398fe65c2439aece73ca9f5b..2a41c2db1aefe27fe538a16db4be4b9b
    set(boxm_algo_pro_sources
        boxm_algo_processes.h
 diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-index 7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a..0536e327fdeb5ad650047ec038f77e1fcb3de1f0 100644
+index 7c2ec1d9c3..0536e327fd 100644
 --- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 @@ -11,7 +11,14 @@ if(EXPAT_FOUND)
@@ -114,7 +114,7 @@ index 7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a..0536e327fdeb5ad650047ec038f77e1f
    set(boxm2_pro_sources
        boxm2_processes.h
 diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-index bea0c2c32de9a86b55542c642a58e7e34ba07d02..f19374be806992b72f7bfe0b57967d567b8086b2 100644
+index bea0c2c32d..f19374be80 100644
 --- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 @@ -11,7 +11,14 @@ if(EXPAT_FOUND)
diff --git a/0009-removed-the-obsolete-octree-library-boxm.patch b/0009-removed-the-obsolete-octree-library-boxm.patch
new file mode 100644
index 0000000..75f635b
--- /dev/null
+++ b/0009-removed-the-obsolete-octree-library-boxm.patch
@@ -0,0 +1,53224 @@
+From 48437e3f454347c8348d4554d614cf2d27e545c3 Mon Sep 17 00:00:00 2001
+From: Joseph Mundy <jlm@visionsystemsinc.com>
+Date: Sat, 2 Feb 2019 10:43:26 -0500
+Subject: [PATCH 9/9] removed the obsolete octree library boxm
+
+---
+ contrib/brl/bseg/CMakeLists.txt               |   12 -
+ contrib/brl/bseg/boxm/CMakeLists.txt          |   52 -
+ ...ee+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
+ ...ree+short.vnl_vector_fixed+double.10--.cxx |    9 -
+ ...tree+short.vnl_vector_fixed+float.10--.cxx |    9 -
+ ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
+ ...ll+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
+ .../boxm_block+boct_tree+short.bool--.cxx     |    5 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    9 -
+ .../boxm_block+boct_tree+short.char--.cxx     |    5 -
+ .../boxm_block+boct_tree+short.float--.cxx    |    5 -
+ .../boxm_block+boct_tree+short.int--.cxx      |    8 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...ee+short.vnl_vector_fixed+double.10---.cxx |   17 -
+ ...ree+short.vnl_vector_fixed+float.10---.cxx |   17 -
+ ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
+ ..._block_iterator+boct_tree+short.bool--.cxx |    5 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
+ ..._block_iterator+boct_tree+short.char--.cxx |    5 -
+ ...block_iterator+boct_tree+short.float--.cxx |    5 -
+ ...m_block_iterator+boct_tree+short.int--.cxx |    8 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ .../boxm_scene+boct_tree+short.bool--.cxx     |    5 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
+ .../boxm_scene+boct_tree+short.char--.cxx     |    5 -
+ .../boxm_scene+boct_tree+short.float--.cxx    |    5 -
+ .../boxm_scene+boct_tree+short.int--.cxx      |    8 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
+ ...3d+boxm_block+boct_tree+short.bool--~-.cxx |   11 -
+ ...short.bsta_num_obs+bsta_gauss_sf1---~-.cxx |   10 -
+ ...3d+boxm_block+boct_tree+short.char--~-.cxx |   11 -
+ ...d+boxm_block+boct_tree+short.float--~-.cxx |   11 -
+ ..._3d+boxm_block+boct_tree+short.int--~-.cxx |   14 -
+ ...ct_tree+short.vgl_point_3d+double---~-.cxx |   12 -
+ .../vbl_array_3d+vsl_b_ifstream~-.cxx         |    9 -
+ .../vbl_io_smart_ptr+boxm_scene_base-.cxx     |    5 -
+ .../vbl_smart_ptr+boxm_scene_base-.cxx        |    4 -
+ contrib/brl/bseg/boxm/algo/CMakeLists.txt     |   38 -
+ .../boxm/algo/boxm_compute_scene_difference.h |   98 -
+ .../boxm/algo/boxm_compute_scene_statistics.h |  100 -
+ contrib/brl/bseg/boxm/algo/boxm_crop_scene.h  |   95 -
+ .../brl/bseg/boxm/algo/boxm_fill_in_mesh.h    |  316 ---
+ .../bseg/boxm/algo/boxm_fill_internal_cells.h |   80 -
+ contrib/brl/bseg/boxm/algo/boxm_init_scene.h  |   60 -
+ .../bseg/boxm/algo/boxm_linear_operations.h   |   60 -
+ contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx |  239 ---
+ contrib/brl/bseg/boxm/algo/boxm_merge_mog.h   |   65 -
+ contrib/brl/bseg/boxm/algo/boxm_refine.h      |  100 -
+ .../brl/bseg/boxm/algo/boxm_save_block_raw.h  |  155 --
+ .../brl/bseg/boxm/algo/boxm_save_scene_raw.h  |  277 ---
+ .../boxm/algo/boxm_save_scene_raw_general.h   |  824 --------
+ .../bseg/boxm/algo/boxm_scene_levels_utils.h  |   97 -
+ .../brl/bseg/boxm/algo/boxm_split_sample.h    |  105 -
+ contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h |  156 --
+ contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |   40 -
+ .../bseg/boxm/algo/pro/boxm_algo_processes.h  |   28 -
+ .../bseg/boxm/algo/pro/boxm_algo_register.cxx |   35 -
+ .../bseg/boxm/algo/pro/boxm_algo_register.h   |   11 -
+ .../boxm_compute_entropy_process.cxx          |   83 -
+ ...m_compute_expected_color_scene_process.cxx |   83 -
+ .../boxm_compute_scene_difference_process.cxx |   91 -
+ .../boxm_create_scene_from_ply_process.cxx    |  257 ---
+ .../processes/boxm_describe_scene_process.cxx |  106 -
+ .../boxm_explore_cells_at_level_process.cxx   |   61 -
+ .../boxm_fill_internal_cells_process.cxx      |   72 -
+ .../pro/processes/boxm_init_scene_process.cxx |  111 --
+ .../boxm_line_backproject_process.cxx         |  259 ---
+ .../boxm_linear_combination_process.cxx       |  102 -
+ .../processes/boxm_merge_mixtures_process.cxx |   90 -
+ .../processes/boxm_refine_scene_process.cxx   |  119 --
+ .../processes/boxm_remove_level0_process.cxx  |   87 -
+ ...boxm_render_expected_edge_vrml_process.cxx |  149 --
+ .../boxm_replace_const_app_process.cxx        |   95 -
+ .../pro/processes/boxm_roi_init_process.cxx   |  195 --
+ .../boxm_roi_init_rational_camera_process.cxx |  310 ---
+ .../boxm_save_occupancy_raw_process.cxx       |  229 ---
+ .../processes/boxm_save_scene_raw_process.cxx |  140 --
+ .../processes/boxm_split_scene_process.cxx    |   97 -
+ .../bseg/boxm/algo/pro/tests/CMakeLists.txt   |    2 -
+ .../bseg/boxm/algo/pro/tests/test_include.cxx |    4 -
+ contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt  |   46 -
+ ...dge_tangent_updater+short.float.float-.cxx |    4 -
+ .../boxm_edge_updater+short.float.float-.cxx  |    3 -
+ ....BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
+ ...XM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
+ ...t.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
+ ...OXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
+ ...OXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
+ ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
+ ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
+ ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
+ ...or+short.boxm_inf_line_sample+float---.cxx |    7 -
+ .../boxm/algo/rt/boxm_change_3d_functor.h     |  100 -
+ .../algo/rt/boxm_change_probability_functor.h |   83 -
+ .../rt/boxm_compute_num_rays_statistics.h     |   65 -
+ .../boxm/algo/rt/boxm_edge_tangent_updater.h  |   76 -
+ .../algo/rt/boxm_edge_tangent_updater.hxx     |  291 ---
+ .../brl/bseg/boxm/algo/rt/boxm_edge_updater.h |   34 -
+ .../bseg/boxm/algo/rt/boxm_edge_updater.hxx   |  110 -
+ .../boxm/algo/rt/boxm_expected_edge_functor.h |   53 -
+ .../rt/boxm_generate_edge_sample_functor.h    |   65 -
+ ...oxm_generate_edge_tangent_sample_functor.h |   78 -
+ .../rt/boxm_generate_opt2_sample_functor.h    |  197 --
+ .../rt/boxm_generate_opt3_sample_functor.h    |  219 --
+ .../rt/boxm_generate_opt_sample_functor.h     |  164 --
+ .../rt/boxm_generate_shadow_sample_functor.h  |  212 --
+ .../bseg/boxm/algo/rt/boxm_opt2_optimizer.h   |   37 -
+ .../bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx |  152 --
+ .../bseg/boxm/algo/rt/boxm_opt3_optimizer.h   |   37 -
+ .../bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx |  172 --
+ .../algo/rt/boxm_opt_appearance_estimator.h   |   85 -
+ .../algo/rt/boxm_opt_rt_bayesian_optimizer.h  |   36 -
+ .../rt/boxm_opt_rt_bayesian_optimizer.hxx     |  151 --
+ .../boxm/algo/rt/boxm_pre_infinity_functor.h  |   67 -
+ .../rt/boxm_render_expected_depth_functor.h   |  109 -
+ .../boxm_render_expected_edge_image_functor.h |  109 -
+ ...nder_expected_edge_tangent_image_functor.h |  126 --
+ .../rt/boxm_render_expected_image_functor.h   |  103 -
+ ...oxm_render_expected_shadow_image_functor.h |  120 --
+ .../bseg/boxm/algo/rt/boxm_rpc_registration.h |  447 -----
+ .../algo/rt/boxm_shadow_app_initializer.h     |   45 -
+ .../algo/rt/boxm_shadow_app_initializer.hxx   |  122 --
+ .../rt/boxm_shadow_appearance_estimator.h     |  114 --
+ .../algo/rt/boxm_shadow_bayes_optimizer.h     |   51 -
+ .../algo/rt/boxm_shadow_bayes_optimizer.hxx   |  195 --
+ .../boxm/algo/rt/boxm_sun_vis_prob_functor.h  |  103 -
+ .../boxm/algo/rt/boxm_update_image_functor.h  |  172 --
+ contrib/brl/bseg/boxm/algo/rt/dummy.cxx       |    0
+ .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |   29 -
+ .../boxm/algo/rt/pro/boxm_algo_rt_processes.h |   29 -
+ .../algo/rt/pro/boxm_algo_rt_register.cxx     |   33 -
+ .../boxm/algo/rt/pro/boxm_algo_rt_register.h  |   11 -
+ .../boxm_change_probabilty_process.cxx        |  120 --
+ .../processes/boxm_edge_update_process.cxx    |  280 ---
+ .../boxm_estimate_camera_process.cxx          |  199 --
+ .../boxm_generate_edge_samples_process.cxx    |  139 --
+ .../boxm_generate_opt2_samples_process.cxx    |  142 --
+ .../boxm_generate_opt3_samples_process.cxx    |  114 --
+ .../boxm_generate_opt_samples_process.cxx     |  102 -
+ .../processes/boxm_opt2_update_process.cxx    |  153 --
+ .../processes/boxm_opt3_update_process.cxx    |  153 --
+ .../boxm_opt_bayesian_update_process.cxx      |  145 --
+ .../processes/boxm_ray_statistics_process.cxx |  107 -
+ .../boxm_render_expected_depth_rt_process.cxx |  114 --
+ .../boxm_render_expected_edge_process.cxx     |  162 --
+ .../boxm_render_expected_rt_process.cxx       |  143 --
+ .../boxm_rpc_registration_process.cxx         |  119 --
+ .../pro/processes/boxm_update_rt_process.cxx  |  136 --
+ .../boxm/algo/rt/pro/tests/CMakeLists.txt     |    2 -
+ .../boxm/algo/rt/pro/tests/test_include.cxx   |    4 -
+ .../bseg/boxm/algo/rt/tests/CMakeLists.txt    |   16 -
+ .../algo/rt/tests/test_bayesian_optimizer.cxx |  102 -
+ .../bseg/boxm/algo/rt/tests/test_driver.cxx   |   15 -
+ .../bseg/boxm/algo/rt/tests/test_edges.cxx    |   26 -
+ .../bseg/boxm/algo/rt/tests/test_include.cxx  |   30 -
+ .../algo/rt/tests/test_shadow_appearance.cxx  |   72 -
+ .../algo/rt/tests/test_template_include.cxx   |    9 -
+ contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt  |   22 -
+ .../algo/sp/boxm_compute_volume_visibility.h  |  172 --
+ .../boxm/algo/sp/boxm_depth_image_triangle.h  |  127 --
+ .../brl/bseg/boxm/algo/sp/boxm_render_image.h |  166 --
+ .../boxm/algo/sp/boxm_render_image_triangle.h |  167 --
+ contrib/brl/bseg/boxm/algo/sp/boxm_update.h   |  374 ----
+ .../bseg/boxm/algo/sp/boxm_update_triangle.h  |  356 ----
+ contrib/brl/bseg/boxm/algo/sp/dummy.cxx       |    0
+ .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |   27 -
+ ...brdb_value_t+vil_image_view_base_sptr-.cxx |   10 -
+ .../boxm/algo/sp/pro/boxm_algo_sp_processes.h |   14 -
+ .../algo/sp/pro/boxm_algo_sp_register.cxx     |   18 -
+ .../boxm/algo/sp/pro/boxm_algo_sp_register.h  |   11 -
+ .../boxm_render_expected_process.cxx          |  117 --
+ .../sp/pro/processes/boxm_update_process.cxx  |  107 -
+ .../boxm_volume_visibility_process.cxx        |  129 --
+ .../boxm/algo/sp/pro/tests/CMakeLists.txt     |    2 -
+ .../boxm/algo/sp/pro/tests/test_include.cxx   |    4 -
+ .../bseg/boxm/algo/sp/tests/CMakeLists.txt    |   19 -
+ .../algo/sp/tests/test_compute_visibility.cxx |   90 -
+ .../bseg/boxm/algo/sp/tests/test_driver.cxx   |   17 -
+ .../bseg/boxm/algo/sp/tests/test_include.cxx  |    8 -
+ .../boxm/algo/sp/tests/test_render_image.cxx  |  103 -
+ .../bseg/boxm/algo/sp/tests/test_update.cxx   |  259 ---
+ .../algo/sp/tests/test_update_multi_bin.cxx   |  262 ---
+ .../brl/bseg/boxm/algo/tests/CMakeLists.txt   |   31 -
+ .../tests/test_boxm_fill_internal_cells.cxx   |  112 --
+ .../boxm/algo/tests/test_boxm_scene_crop.cxx  |  129 --
+ .../brl/bseg/boxm/algo/tests/test_driver.cxx  |   23 -
+ .../boxm/algo/tests/test_fill_in_mesh.cxx     |  121 --
+ .../brl/bseg/boxm/algo/tests/test_include.cxx |   17 -
+ .../algo/tests/test_linear_operations.cxx     |   82 -
+ .../boxm/algo/tests/test_remove_level0.cxx    |   54 -
+ .../boxm/algo/tests/test_save_scene_raw.cxx   |  122 --
+ .../bseg/boxm/algo/tests/test_upload_mesh.cxx |  127 --
+ .../brl/bseg/boxm/algo/tests/test_utils.cxx   |   71 -
+ contrib/brl/bseg/boxm/algo/tests/test_utils.h |   18 -
+ contrib/brl/bseg/boxm/basic/CMakeLists.txt    |   21 -
+ ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
+ ...block_iterator+boct_tree+short.float--.cxx |    5 -
+ ...m_block_iterator+boct_tree+short.int--.cxx |    5 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |    6 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |   13 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |    7 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
+ ...terator+short.boxm_edge_sample+float--.cxx |    7 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
+ ...tor+short.boxm_inf_line_sample+float--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    6 -
+ ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...h_iterator+short.vgl_point_3d+double--.cxx |    5 -
+ ...brdb_value_t+boxm_array_1d_float_sptr-.cxx |    4 -
+ .../vbl_io_smart_ptr+boxm_array_1d_float-.cxx |    4 -
+ .../vbl_smart_ptr+boxm_array_1d_float-.cxx    |    4 -
+ .../basic/boxm_block_vis_graph_iterator.h     |   53 -
+ .../basic/boxm_block_vis_graph_iterator.hxx   |  173 --
+ .../boxm/basic/boxm_block_vis_graph_node.h    |   52 -
+ .../boxm/basic/boxm_cell_vis_graph_iterator.h |   54 -
+ .../basic/boxm_cell_vis_graph_iterator.hxx    |  131 --
+ .../bseg/boxm/basic/boxm_num_rays_functor.h   |   44 -
+ .../bseg/boxm/basic/boxm_raytrace_function.h  |  618 ------
+ .../bseg/boxm/basic/boxm_seg_length_functor.h |   46 -
+ .../bseg/boxm/basic/boxm_util_data_types.cxx  |   17 -
+ .../bseg/boxm/basic/boxm_util_data_types.h    |   30 -
+ .../brl/bseg/boxm/basic/tests/CMakeLists.txt  |   15 -
+ .../boxm/basic/tests/test_block_vis_graph.cxx |   48 -
+ .../boxm/basic/tests/test_cell_vis_graph.cxx  |   54 -
+ .../brl/bseg/boxm/basic/tests/test_driver.cxx |   13 -
+ .../bseg/boxm/basic/tests/test_include.cxx    |    9 -
+ .../basic/tests/test_template_include.cxx     |    4 -
+ contrib/brl/bseg/boxm/boxm_apm_traits.cxx     |   86 -
+ contrib/brl/bseg/boxm/boxm_apm_traits.h       |  206 --
+ contrib/brl/bseg/boxm/boxm_aux_scene.h        |   54 -
+ contrib/brl/bseg/boxm/boxm_aux_scene.hxx      |  121 --
+ contrib/brl/bseg/boxm/boxm_aux_traits.h       |   74 -
+ contrib/brl/bseg/boxm/boxm_block.h            |   58 -
+ contrib/brl/bseg/boxm/boxm_block.hxx          |   80 -
+ contrib/brl/bseg/boxm/boxm_export.h           |   23 -
+ contrib/brl/bseg/boxm/boxm_io_scene_base.cxx  |   25 -
+ contrib/brl/bseg/boxm/boxm_io_scene_base.h    |   21 -
+ contrib/brl/bseg/boxm/boxm_scene.h            |  559 ------
+ contrib/brl/bseg/boxm/boxm_scene.hxx          | 1764 -----------------
+ contrib/brl/bseg/boxm/boxm_scene_base.cxx     |   35 -
+ contrib/brl/bseg/boxm/boxm_scene_base.h       |   85 -
+ contrib/brl/bseg/boxm/boxm_scene_parser.cxx   |  277 ---
+ contrib/brl/bseg/boxm/boxm_scene_parser.h     |  108 -
+ contrib/brl/bseg/boxm/pro/CMakeLists.txt      |   29 -
+ ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
+ ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
+ ...tree+short.vnl_vector_fixed+float.3---.cxx |    6 -
+ .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
+ ...ee+short.vnl_vector_fixed+float.3---~-.cxx |   12 -
+ contrib/brl/bseg/boxm/pro/boxm_processes.h    |   16 -
+ contrib/brl/bseg/boxm/pro/boxm_register.cxx   |   27 -
+ contrib/brl/bseg/boxm/pro/boxm_register.h     |   11 -
+ .../boxm_camera_viewing_scene_process.cxx     |  131 --
+ .../processes/boxm_clean_scene_process.cxx    |  102 -
+ ...oxm_construct_scene_from_image_process.cxx |  219 --
+ .../processes/boxm_create_scene_process.cxx   |  218 --
+ .../boxm_force_write_blocks_process.cxx       |  102 -
+ .../pro/processes/boxm_load_scene_process.cxx |   73 -
+ .../processes/boxm_proj_local_cam_process.cxx |  103 -
+ .../processes/boxm_upload_mesh_process.cxx    |  148 --
+ .../brl/bseg/boxm/pro/tests/CMakeLists.txt    |    2 -
+ .../brl/bseg/boxm/pro/tests/test_include.cxx  |    4 -
+ contrib/brl/bseg/boxm/sample/CMakeLists.txt   |   29 -
+ ...ct_tree+short.boxm_edge_sample+float--.cxx |    5 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
+ ...ct_tree+short.boxm_opt2_sample+float--.cxx |    4 -
+ ...boct_tree+short.boxm_rt_sample+float--.cxx |    4 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    5 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   12 -
+ ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    9 -
+ ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    5 -
+ ..._tree+short.boxm_scalar_sample+float--.cxx |    4 -
+ ...ee_cell+short.boxm_edge_sample+float--.cxx |    5 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
+ ...ee_cell+short.boxm_opt2_sample+float--.cxx |    4 -
+ ...tree_cell+short.boxm_rt_sample+float--.cxx |    4 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   11 -
+ ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |   10 -
+ ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ..._cell+short.boxm_scalar_sample+float--.cxx |    4 -
+ ..._reader+short.boxm_edge_sample+float--.cxx |    8 -
+ ...short.boxm_edge_tangent_sample+float--.cxx |    5 -
+ ...der+short.boxm_inf_line_sample+float--.cxx |    5 -
+ ..._reader+short.boxm_opt2_sample+float--.cxx |    5 -
+ ...ll_reader+short.boxm_rt_sample+float--.cxx |    5 -
+ ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
+ ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...eader+short.boxm_scalar_sample+float--.cxx |    5 -
+ ...le+float-.boxm_aux_edge_sample+float--.cxx |    5 -
+ ...loat-.boxm_edge_tangent_sample+float--.cxx |    7 -
+ ...M_APM_MOB_GREY-.boxm_rt_sample+float--.cxx |    7 -
+ ...APM_MOG_GREY-.boxm_opt2_sample+float--.cxx |    7 -
+ ...M_APM_MOG_GREY-.boxm_rt_sample+float--.cxx |    7 -
+ ....boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx |    7 -
+ ..._SIMPLE_GREY-.boxm_opt2_sample+float--.cxx |    7 -
+ ...PM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx |    7 -
+ ...IMPLE_GREY-.boxm_scalar_sample+float--.cxx |    8 -
+ ...xm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx |    7 -
+ ...float.boxm_edge_tangent_sample+float--.cxx |    7 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |   13 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |    6 -
+ ...ee+short.boxm_inf_line_sample+float---.cxx |    6 -
+ ...t_tree+short.boxm_opt2_sample+float---.cxx |    9 -
+ ...oct_tree+short.boxm_rt_sample+float---.cxx |    9 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   12 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...tree+short.boxm_scalar_sample+float---.cxx |    9 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   11 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
+ .../Templates/boxm_edge_sample+float-.cxx     |    4 -
+ .../boxm_edge_tangent_sample+float-.cxx       |    3 -
+ .../Templates/boxm_inf_line_sample+float-.cxx |    3 -
+ .../Templates/boxm_opt2_sample+float-.cxx     |    4 -
+ .../Templates/boxm_plane_obs+float-.cxx       |    3 -
+ .../Templates/boxm_rt_sample+float-.cxx       |    3 -
+ .../boxm_sample+BOXM_APM_MOB_GREY-.cxx        |    7 -
+ .../boxm_sample+BOXM_APM_MOG_GREY-.cxx        |    9 -
+ .../boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx     |    4 -
+ ...xm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx |    4 -
+ .../Templates/boxm_scalar_sample+float-.cxx   |    4 -
+ ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
+ ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
+ ...t_tree+short.boxm_opt2_sample+float---.cxx |    6 -
+ ...oct_tree+short.boxm_rt_sample+float---.cxx |    6 -
+ ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    6 -
+ ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
+ ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   11 -
+ ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    6 -
+ ...tree+short.boxm_scalar_sample+float---.cxx |    6 -
+ .../boxm_scene+boct_tree+short.int--.cxx      |    5 -
+ ...tree+short.boxm_edge_sample+float---~-.cxx |   16 -
+ ...rt.boxm_edge_tangent_sample+float---~-.cxx |   17 -
+ ...tree+short.boxm_opt2_sample+float---~-.cxx |   13 -
+ ...t_tree+short.boxm_rt_sample+float---~-.cxx |   13 -
+ ...ort.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx |   13 -
+ ...ort.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx |   17 -
+ ....boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx |   18 -
+ ...ample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx |   13 -
+ ...ee+short.boxm_scalar_sample+float---~-.cxx |   13 -
+ ...mage_view+boxm_inf_line_sample+float--.cxx |    5 -
+ .../brl/bseg/boxm/sample/algo/CMakeLists.txt  |   18 -
+ ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
+ ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
+ ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
+ ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
+ ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
+ ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
+ .../boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx   |    3 -
+ ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
+ ...oxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx |   14 -
+ .../sample/algo/boxm_mob_grey_processor.cxx   |   83 -
+ .../sample/algo/boxm_mob_grey_processor.h     |   35 -
+ .../sample/algo/boxm_mog_grey_processor.cxx   |  286 ---
+ .../sample/algo/boxm_mog_grey_processor.h     |   50 -
+ .../sample/algo/boxm_sigma_normalizer.cxx     |  104 -
+ .../boxm/sample/algo/boxm_sigma_normalizer.h  |   43 -
+ .../algo/boxm_simple_grey_processor.cxx       |  437 ----
+ .../sample/algo/boxm_simple_grey_processor.h  |   86 -
+ .../boxm/sample/algo/tests/CMakeLists.txt     |   11 -
+ .../boxm/sample/algo/tests/test_driver.cxx    |   11 -
+ .../boxm/sample/algo/tests/test_include.cxx   |    6 -
+ .../algo/tests/test_sigma_normalizer.cxx      |   59 -
+ .../brl/bseg/boxm/sample/boxm_edge_sample.h   |   97 -
+ .../brl/bseg/boxm/sample/boxm_edge_sample.hxx |  137 --
+ .../boxm/sample/boxm_edge_tangent_sample.h    |   69 -
+ .../boxm/sample/boxm_edge_tangent_sample.hxx  |   79 -
+ .../bseg/boxm/sample/boxm_inf_line_sample.h   |   55 -
+ .../bseg/boxm/sample/boxm_inf_line_sample.hxx |   79 -
+ .../brl/bseg/boxm/sample/boxm_opt2_sample.h   |   72 -
+ .../brl/bseg/boxm/sample/boxm_opt2_sample.hxx |   83 -
+ .../brl/bseg/boxm/sample/boxm_opt3_sample.h   |   76 -
+ .../brl/bseg/boxm/sample/boxm_opt3_sample.hxx |   92 -
+ contrib/brl/bseg/boxm/sample/boxm_plane_obs.h |   45 -
+ .../brl/bseg/boxm/sample/boxm_plane_obs.hxx   |   69 -
+ contrib/brl/bseg/boxm/sample/boxm_rt_sample.h |   70 -
+ .../brl/bseg/boxm/sample/boxm_rt_sample.hxx   |   81 -
+ contrib/brl/bseg/boxm/sample/boxm_sample.h    |   68 -
+ contrib/brl/bseg/boxm/sample/boxm_sample.hxx  |   71 -
+ .../bseg/boxm/sample/boxm_sample_multi_bin.h  |   63 -
+ .../boxm/sample/boxm_sample_multi_bin.hxx     |   98 -
+ .../brl/bseg/boxm/sample/boxm_scalar_sample.h |   55 -
+ .../bseg/boxm/sample/boxm_scalar_sample.hxx   |   70 -
+ .../brl/bseg/boxm/sample/boxm_update_sample.h |   17 -
+ .../boxm/sample/boxm_vis_implicit_sample.h    |   16 -
+ contrib/brl/bseg/boxm/sample/dummy.cxx        |    0
+ .../brl/bseg/boxm/sample/tests/CMakeLists.txt |    4 -
+ .../bseg/boxm/sample/tests/test_include.cxx   |   14 -
+ .../sample/tests/test_template_include.cxx    |   12 -
+ contrib/brl/bseg/boxm/tests/CMakeLists.txt    |   32 -
+ contrib/brl/bseg/boxm/tests/camera0.txt       |  104 -
+ contrib/brl/bseg/boxm/tests/frame_00000.txt   |    7 -
+ .../brl/bseg/boxm/tests/test_binary_io.cxx    |   75 -
+ .../brl/bseg/boxm/tests/test_block_iter.cxx   |   47 -
+ .../bseg/boxm/tests/test_cell_iterator.cxx    |   51 -
+ contrib/brl/bseg/boxm/tests/test_driver.cxx   |   21 -
+ contrib/brl/bseg/boxm/tests/test_include.cxx  |   10 -
+ .../tests/test_load_neighboring_blocks.cxx    |   89 -
+ .../bseg/boxm/tests/test_region_finder.cxx    |   80 -
+ .../bseg/boxm/tests/test_template_include.cxx |    5 -
+ contrib/brl/bseg/boxm/tests/test_utils.cxx    |   72 -
+ contrib/brl/bseg/boxm/tests/test_utils.h      |   17 -
+ contrib/brl/bseg/boxm/util/CMakeLists.txt     |   23 -
+ ...triangle_interpolation_iterator+float-.cxx |    3 -
+ .../bseg/boxm/util/boxm_cell_data_traits.cxx  |   25 -
+ .../bseg/boxm/util/boxm_cell_data_traits.h    |   89 -
+ .../brl/bseg/boxm/util/boxm_plane_ransac.h    |  126 --
+ .../boxm/util/boxm_quad_scan_iterator.cxx     |  188 --
+ .../bseg/boxm/util/boxm_quad_scan_iterator.h  |   66 -
+ .../boxm/util/boxm_rational_camera_utils.cxx  |   36 -
+ .../boxm/util/boxm_rational_camera_utils.h    |   30 -
+ .../boxm/util/boxm_raytrace_operations.cxx    |  232 ---
+ .../bseg/boxm/util/boxm_raytrace_operations.h |  452 -----
+ contrib/brl/bseg/boxm/util/boxm_test_util.cxx |  141 --
+ contrib/brl/bseg/boxm/util/boxm_test_util.h   |   37 -
+ .../boxm_triangle_interpolation_iterator.h    |   53 -
+ .../boxm_triangle_interpolation_iterator.hxx  |  100 -
+ .../boxm/util/boxm_triangle_scan_iterator.cxx |   59 -
+ .../boxm/util/boxm_triangle_scan_iterator.h   |   46 -
+ contrib/brl/bseg/boxm/util/boxm_utils.cxx     | 1469 --------------
+ contrib/brl/bseg/boxm/util/boxm_utils.h       |  168 --
+ contrib/brl/bseg/boxm/util/boxm_vrml_util.h   |  214 --
+ .../brl/bseg/boxm/util/tests/CMakeLists.txt   |   18 -
+ contrib/brl/bseg/boxm/util/tests/camera0.txt  |  104 -
+ .../brl/bseg/boxm/util/tests/frame_00000.txt  |    7 -
+ .../util/tests/test_boxm_plane_ransac.cxx     |   79 -
+ .../tests/test_boxm_rational_camera_utils.cxx |   24 -
+ .../brl/bseg/boxm/util/tests/test_driver.cxx  |   15 -
+ .../brl/bseg/boxm/util/tests/test_include.cxx |   12 -
+ .../boxm/util/tests/test_quad_interpolate.cxx |  117 --
+ .../boxm/util/tests/test_template_include.cxx |    3 -
+ contrib/brl/bseg/boxm_batch/CMakeLists.txt    |   59 -
+ contrib/brl/bseg/boxm_batch/reg_boxm.cxx      |  135 --
+ contrib/brl/bseg/boxm_batch/reg_boxm.h        |   12 -
+ .../brl/bseg/boxm_batch/tests/CMakeLists.txt  |    2 -
+ .../bseg/boxm_batch/tests/test_include.cxx    |    3 -
+ contrib/brl/bseg/boxm_bridge/CMakeLists.txt   |   25 -
+ .../boxm_bridge/boxm2_normails_to_boxm.cxx    |  233 ---
+ .../brl/bseg/boxm_bridge/boxm2_to_boxm.cxx    |  292 ---
+ contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h  |   24 -
+ .../boxm_bridge/boxm_normals_to_boxm2.cxx     |  326 ---
+ .../brl/bseg/boxm_bridge/boxm_to_boxm2.cxx    |  262 ---
+ contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h  |   30 -
+ .../brl/bseg/boxm_bridge/tests/CMakeLists.txt |    2 -
+ .../bseg/boxm_bridge/tests/test_include.cxx   |    4 -
+ contrib/brl/bseg/bvpl/CMakeLists.txt          |    1 -
+ .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |   71 -
+ ..._sample+bsta_num_obs+bsta_gauss_sf1---.cxx |   11 -
+ ..._tree+short.bvpl_octree_sample+float--.cxx |    6 -
+ ..._tree+short.bvpl_pca_basis_sample+10--.cxx |    6 -
+ ..._tree+short.bvpl_taylor_basis2_sample-.cxx |    6 -
+ ...sample+bsta_num_obs+bsta_gauss_sf1----.cxx |   20 -
+ ...tree+short.bvpl_octree_sample+float---.cxx |   17 -
+ ...tree+short.bvpl_pca_basis_sample+10---.cxx |   11 -
+ ...tree+short.bvpl_taylor_basis2_sample--.cxx |   12 -
+ .../Templates/bvpl_global_pca+125-.cxx        |    2 -
+ .../bvpl_global_taylor+double.10-.cxx         |    3 -
+ .../Templates/bvpl_global_taylor+float.3-.cxx |    3 -
+ ...l_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
+ .../vbl_smart_ptr+bvpl_global_corners-.cxx    |    4 -
+ .../vbl_smart_ptr+bvpl_global_pca+125--.cxx   |    5 -
+ ...art_ptr+bvpl_global_taylor+double.10--.cxx |    5 -
+ .../vbl_smart_ptr+bvpl_pca_error_scenes-.cxx  |    4 -
+ .../vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
+ .../vnl_matrix_fixed+double.125.125-.cxx      |    2 -
+ .../bvpl_octree/bvpl_block_kernel_operator.h  |  134 --
+ .../bvpl_octree/bvpl_block_vector_operator.h  |  146 --
+ .../bvpl/bvpl_octree/bvpl_cell_data_traits.h  |   34 -
+ .../bvpl/bvpl_octree/bvpl_corner_detector.h   |  299 ---
+ .../bvpl/bvpl_octree/bvpl_corner_functors.h   |   68 -
+ .../bvpl_octree/bvpl_discover_pca_kernels.cxx | 1028 ----------
+ .../bvpl_octree/bvpl_discover_pca_kernels.h   |  309 ---
+ .../bvpl_gauss3D_steerable_filters.cxx        |  512 -----
+ .../bvpl_gauss3D_steerable_filters.h          |   61 -
+ .../bvpl/bvpl_octree/bvpl_global_corners.cxx  |  475 -----
+ .../bvpl/bvpl_octree/bvpl_global_corners.h    |   71 -
+ .../bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx |    5 -
+ .../bseg/bvpl/bvpl_octree/bvpl_global_pca.h   |  153 --
+ .../bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx | 1018 ----------
+ .../bvpl/bvpl_octree/bvpl_global_taylor.cxx   |   12 -
+ .../bvpl/bvpl_octree/bvpl_global_taylor.h     |  100 -
+ .../bvpl/bvpl_octree/bvpl_global_taylor.hxx   |  645 ------
+ .../bvpl_octree/bvpl_octree_kernel_operator.h |  142 --
+ .../bvpl/bvpl_octree/bvpl_octree_neighbors.h  |   78 -
+ .../bvpl_octree/bvpl_octree_vector_operator.h |   84 -
+ .../bvpl_octree_vector_operator_impl.h        |   30 -
+ .../bvpl/bvpl_octree/bvpl_octree_vrml_util.h  |   84 -
+ .../bvpl_octree/bvpl_pca_error_scenes.cxx     |   50 -
+ .../bvpl/bvpl_octree/bvpl_pca_error_scenes.h  |   39 -
+ .../bvpl_octree/bvpl_scene_kernel_operator.h  |  213 --
+ .../bvpl_scene_neighborhood_operator.cxx      |    6 -
+ .../bvpl_scene_neighborhood_operator.h        |   97 -
+ .../bvpl_octree/bvpl_scene_statistics.cxx     |   80 -
+ .../bvpl/bvpl_octree/bvpl_scene_statistics.h  |  102 -
+ .../bvpl_octree/bvpl_scene_vector_operator.h  |  178 --
+ .../bvpl/bvpl_octree/bvpl_taylor_basis.cxx    |  258 ---
+ .../bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h |   50 -
+ .../bvpl_octree/bvpl_taylor_scenes_map.cxx    |   61 -
+ .../bvpl/bvpl_octree/bvpl_taylor_scenes_map.h |   41 -
+ .../bseg/bvpl/bvpl_octree/io/CMakeLists.txt   |   20 -
+ ...o_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
+ .../vbl_io_smart_ptr+bvpl_global_corners-.cxx |    4 -
+ ...vbl_io_smart_ptr+bvpl_global_pca+125--.cxx |    6 -
+ ...art_ptr+bvpl_global_taylor+double.10--.cxx |    6 -
+ ...bl_io_smart_ptr+bvpl_pca_error_scenes-.cxx |    4 -
+ ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
+ .../io/bvpl_io_discover_pca_kernels.cxx       |   50 -
+ .../io/bvpl_io_discover_pca_kernels.h         |   43 -
+ .../bvpl_octree/io/bvpl_io_global_corners.cxx |   50 -
+ .../bvpl_octree/io/bvpl_io_global_corners.h   |   44 -
+ .../bvpl_octree/io/bvpl_io_global_pca.cxx     |   50 -
+ .../bvpl/bvpl_octree/io/bvpl_io_global_pca.h  |   44 -
+ .../bvpl_octree/io/bvpl_io_global_taylor.h    |   75 -
+ .../io/bvpl_io_pca_error_scenes.cxx           |   50 -
+ .../bvpl_octree/io/bvpl_io_pca_error_scenes.h |   43 -
+ .../io/bvpl_io_taylor_scenes_map.cxx          |   50 -
+ .../io/bvpl_io_taylor_scenes_map.h            |   38 -
+ .../bvpl/bvpl_octree/io/tests/CMakeLists.txt  |    2 -
+ .../bvpl_octree/io/tests/test_include.cxx     |    8 -
+ .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |   31 -
+ .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
+ ...alue_t+bvpl_discover_pca_kernels_sptr-.cxx |    6 -
+ ...brdb_value_t+bvpl_global_corners_sptr-.cxx |    6 -
+ ...brdb_value_t+bvpl_global_pca_125_sptr-.cxx |    6 -
+ ...db_value_t+bvpl_pca_error_scenes_sptr-.cxx |    6 -
+ ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
+ ...rt_ptr+bvpl_global_taylor+double.10---.cxx |    8 -
+ .../bvpl_octree/pro/bvpl_octree_processes.h   |   61 -
+ .../bvpl_octree/pro/bvpl_octree_register.cxx  |   81 -
+ .../bvpl_octree/pro/bvpl_octree_register.h    |   11 -
+ .../bvpl_block_avg_value_process.cxx          |   81 -
+ .../bvpl_block_kernel_operator_process.cxx    |  208 --
+ .../bvpl_compute_gauss_gradients.cxx          |   86 -
+ .../processes/bvpl_create_scene_process.cxx   |   88 -
+ .../bvpl_grad_scene_to_bin_process.cxx        |  136 --
+ .../processes/bvpl_nonmax_supp_process.cxx    |  178 --
+ .../bvpl_plane_propagate_process.cxx          |  209 --
+ .../pro/processes/bvpl_save_vrml_process.cxx  |   89 -
+ .../bvpl_scene_histogram_process.cxx          |   66 -
+ .../bvpl_scene_kernel_operator_process.cxx    |  179 --
+ .../bvpl_scene_vector_operator_process.cxx    |  151 --
+ .../bvpl_compute_beaudet_measure_process.cxx  |   64 -
+ .../bvpl_compute_harris_measure_process.cxx   |   65 -
+ .../bvpl_corner_statistics_process.cxx        |   57 -
+ .../bvpl_load_global_corners_process.cxx      |   50 -
+ .../bvpl_threshold_corners_process.cxx        |   61 -
+ .../pca/bvpl_add_pca_errors_process.cxx       |   94 -
+ ...pl_combine_pairwise_statistics_process.cxx |   95 -
+ .../bvpl_compute_pca_error_block_process.cxx  |   69 -
+ .../bvpl_compute_pca_error_scene_process.cxx  |  132 --
+ .../bvpl_compute_pca_test_error_process.cxx   |   59 -
+ .../bvpl_discover_pca_features_process.cxx    |   98 -
+ .../processes/pca/bvpl_global_pca_process.cxx |   64 -
+ .../pca/bvpl_init_global_pca_process.cxx      |   50 -
+ .../pca/bvpl_load_global_pca_process.cxx      |   50 -
+ .../bvpl_load_pca_error_scenes_process.cxx    |   58 -
+ .../pca/bvpl_load_pca_info_process.cxx        |   55 -
+ ...l_normalize_pca_training_error_process.cxx |   61 -
+ .../pca/bvpl_pca_global_add_error_process.cxx |   77 -
+ .../bvpl_pca_global_proj_error_process.cxx    |   63 -
+ .../bvpl_pca_global_statistics_process.cxx    |   75 -
+ .../pca/bvpl_pca_project_process.cxx          |   63 -
+ .../bvpl_compute_sf_raw_response_process.cxx  |   70 -
+ .../bvpl_init_sf_response_scene_process.cxx   |   87 -
+ .../taylor/bvpl_add_taylor_errors_process.cxx |   90 -
+ ...pl_compute_taylor_coefficients_process.cxx |   80 -
+ .../bvpl_compute_taylor_error_process.cxx     |   78 -
+ ...bvpl_explore_coefficient_scene_process.cxx |   77 -
+ .../bvpl_init_global_taylor_process.cxx       |   68 -
+ .../bvpl_load_global_taylor_process.cxx       |   52 -
+ .../bvpl_load_taylor_scenes_process.cxx       |   72 -
+ .../bvpl_taylor_global_add_error_process.cxx  |   77 -
+ .../bvpl_taylor_global_proj_error_process.cxx |   63 -
+ .../bvpl/bvpl_octree/pro/tests/CMakeLists.txt |   16 -
+ .../test_bvpl_plane_propagation_process.cxx   |  144 --
+ .../bvpl_octree/pro/tests/test_driver.cxx     |   10 -
+ .../bvpl_octree/pro/tests/test_include.cxx    |    4 -
+ .../bvpl/bvpl_octree/python/pca/readme.txt    |    7 -
+ .../pca/reconstruction_error/add_pca_error.py |  193 --
+ .../compute_pca_error_scene.py                |  164 --
+ .../extract_pca_kernels.py                    |   61 -
+ .../python/pca/reconstruction_error/pca.sh    |   68 -
+ .../pca/reconstruction_error/save_pca_raw.py  |  108 -
+ .../pca/training_error/extract_pca_kernels.py |   66 -
+ .../normalized_training_error.py              |   42 -
+ .../python/pca/training_error/pca.sh          |   42 -
+ .../bseg/bvpl/bvpl_octree/python/readme.txt   |    1 -
+ .../reconstruction_error/add_taylor_error.py  |  183 --
+ .../compute_taylor_error_scene.py             |  156 --
+ .../reconstruction_error/explore_histogram.py |  113 --
+ .../run_taylor_kernels.py                     |   98 -
+ .../reconstruction_error/save_taylor_raw.py   |  146 --
+ .../taylor/reconstruction_error/taylor.sh     |   67 -
+ .../taylor_kernel_threads.py                  |   72 -
+ .../bvpl/bvpl_octree/sample/CMakeLists.txt    |   16 -
+ .../bsta_gaussian_sphere+float.1-.cxx         |    3 -
+ ...e_sample+bsta_num_obs+bsta_gauss_sf1--.cxx |    7 -
+ .../Templates/bvpl_octree_sample+float-.cxx   |    3 -
+ .../Templates/bvpl_pca_basis_sample+10-.cxx   |    3 -
+ .../bvpl_octree/sample/bvpl_octree_sample.h   |   57 -
+ .../bvpl_octree/sample/bvpl_octree_sample.hxx |   70 -
+ .../sample/bvpl_pca_basis_sample.h            |   57 -
+ .../sample/bvpl_pca_basis_sample.hxx          |   72 -
+ .../sample/bvpl_taylor_basis_sample.cxx       |   58 -
+ .../sample/bvpl_taylor_basis_sample.h         |   59 -
+ .../bvpl_octree/sample/tests/CMakeLists.txt   |    4 -
+ .../bvpl_octree/sample/tests/test_include.cxx |    5 -
+ .../sample/tests/test_template_include.cxx    |    4 -
+ .../bvpl/bvpl_octree/tests/CMakeLists.txt     |   35 -
+ .../bvpl/bvpl_octree/tests/test_driver.cxx    |   19 -
+ .../tests/test_gauss3D_steerable_filters.cxx  |  127 --
+ .../bvpl/bvpl_octree/tests/test_include.cxx   |   24 -
+ .../tests/test_octree_kernel_operator.cxx     |  352 ----
+ .../tests/test_octree_neighbors.cxx           |   92 -
+ .../bvpl_octree/tests/test_pca_kernels.cxx    |  304 ---
+ .../bvpl_octree/tests/test_taylor_basis.cxx   |  143 --
+ .../tests/test_template_include.cxx           |    4 -
+ .../bvpl/bvpl_octree/tests/test_utils.cxx     |   94 -
+ .../bseg/bvpl/bvpl_octree/tests/test_utils.h  |   20 -
+ .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |    2 +-
+ ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
+ ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
+ .../kernels/pro/bvpl_kernels_register.cxx     |    1 -
+ .../bvpl_load_taylor_responses_process.cxx    |   53 -
+ .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |   44 -
+ .../bvpl_octree_batch/reg_bvpl_octree.cxx     |   61 -
+ .../bseg/bvpl_octree_batch/reg_bvpl_octree.h  |   10 -
+ .../bvpl_octree_batch/tests/CMakeLists.txt    |    2 -
+ .../bvpl_octree_batch/tests/test_include.cxx  |    3 -
+ contrib/brl/bseg/bvxm/algo/CMakeLists.txt     |    3 +-
+ .../brl/bseg/bvxm/algo/bvxm_boxm_convert.h    |  152 --
+ contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |    3 +-
+ .../bseg/bvxm/algo/pro/bvxm_algo_processes.h  |    2 +-
+ .../bseg/bvxm/algo/pro/bvxm_algo_register.cxx |    2 +-
+ .../boxm_scene_to_bvxm_grid_process.cxx       |  129 --
+ .../brl/bseg/bvxm/algo/tests/CMakeLists.txt   |    3 -
+ .../tests/test_boxm_scene_to_bvxm_grid.cxx    |  111 --
+ .../brl/bseg/bvxm/algo/tests/test_driver.cxx  |    4 +-
+ .../brl/bseg/bvxm/algo/tests/test_include.cxx |    1 -
+ 653 files changed, 7 insertions(+), 47919 deletions(-)
+ delete mode 100644 contrib/brl/bseg/boxm/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_init_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_refine.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_split_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/dummy.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/dummy.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_traits.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_block.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_block.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_export.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.h
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.h
+ delete mode 100644 contrib/brl/bseg/boxm/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_processes.h
+ delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.h
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_update_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
+ delete mode 100644 contrib/brl/bseg/boxm/sample/dummy.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/tests/camera0.txt
+ delete mode 100644 contrib/brl/bseg/boxm/tests/frame_00000.txt
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_binary_io.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_block_iter.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_region_finder.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/boxm_vrml_util.h
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/camera0.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/frame_00000.txt
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
+ delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_batch/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.h
+ delete mode 100644 contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_batch/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
+ delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
+ delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
+ delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
+ delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
+ delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
+ delete mode 100644 contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
+ delete mode 100644 contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
+ delete mode 100644 contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
+
+diff --git a/contrib/brl/bseg/CMakeLists.txt b/contrib/brl/bseg/CMakeLists.txt
+index f2b53d63ae..0d20b12438 100644
+--- a/contrib/brl/bseg/CMakeLists.txt
++++ b/contrib/brl/bseg/CMakeLists.txt
+@@ -41,18 +41,12 @@ add_subdirectory(brec_batch)
+ # octree
+ add_subdirectory(boct)
+ 
+-# octree based modeling
+-add_subdirectory(boxm)
+-
+ # updated, gpu compatible octree based modeling
+ add_subdirectory(boxm2)
+ 
+ # updated, gpu compatible octree based modeling
+ add_subdirectory(boxm2_batch)
+ 
+-# octree based modeling python interface
+-add_subdirectory(boxm_batch)
+-
+ # semi-global matching
+ add_subdirectory(bsgm)
+ 
+@@ -62,15 +56,9 @@ add_subdirectory(bvpl)
+ # voxel processing library python interface
+ add_subdirectory(bvpl_batch)
+ 
+-# voxel processing library python interface for octrees
+-add_subdirectory(bvpl_octree_batch)
+-
+ # Brown affine patch library, SIFT keypoint & descriptor
+ add_subdirectory(bapl)
+ 
+-#the bridge lib to convert between boxm and boxm2 scenes
+-add_subdirectory(boxm_bridge)
+-
+ #multi gpu library
+ add_subdirectory(boxm2_multi)
+ 
+diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
+deleted file mode 100644
+index 6a0e5159f4..0000000000
+--- a/contrib/brl/bseg/boxm/CMakeLists.txt
++++ /dev/null
+@@ -1,52 +0,0 @@
+-# contrib/brl/bseg/boxm/CMakeLists.txt
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-
+-include_directories( ${EXPAT_INCLUDE_DIR} )
+-include_directories( ${GEL_INCLUDE_DIR} )
+-include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+-
+-set(boxm_sources
+-    boxm_export.h
+-    boxm_block.hxx                         boxm_block.h
+-    boxm_scene_base.cxx                    boxm_scene_base.h
+-    boxm_scene.hxx                         boxm_scene.h
+-    boxm_aux_scene.hxx                     boxm_aux_scene.h
+-    boxm_scene_parser.cxx                  boxm_scene_parser.h
+-    boxm_apm_traits.cxx                    boxm_apm_traits.h
+-    boxm_aux_traits.h
+-    boxm_io_scene_base.h                   boxm_io_scene_base.cxx
+-)
+-
+-aux_source_directory(Templates boxm_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm LIBRARY_SOURCES  ${boxm_sources})
+-
+-target_link_libraries(boxm boct bsta brdb ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl_algo vsol expatpp ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vcl)
+-
+-#processes
+-add_subdirectory(pro)
+-
+-#util
+-add_subdirectory(util)
+-
+-#samples
+-add_subdirectory(sample)
+-
+-#basic algorithms involving scenes
+-add_subdirectory(algo)
+-
+-#basic structures
+-add_subdirectory(basic)
+-
+-
+-#tests
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-endif()
+-
+-#install the .h .hxx and libs
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+deleted file mode 100644
+index 3c4f37b302..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boct/boct_tree.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-BOCT_TREE_INSTANTIATE(short, gauss_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
+deleted file mode 100644
+index 7612eb4071..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<double,10> vector;
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
+deleted file mode 100644
+index 63921f9183..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<float,10> vector;
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+deleted file mode 100644
+index fb055c2df5..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<float,3> vector;
+-
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
+deleted file mode 100644
+index 1a7c7d6247..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boct/boct_tree_cell.hxx>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-BOCT_TREE_CELL_INSTANTIATE(short, gauss_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
+deleted file mode 100644
+index c104d2eed5..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,bool>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index e629c522cb..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
+deleted file mode 100644
+index 562247092f..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,char>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
+deleted file mode 100644
+index 3c0bdbf155..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,float>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 247d59847c..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,int>  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short,short int>  short_tree_type;
+-BOXM_BLOCK_INSTANTIATE(short_tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 5bee916221..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
+deleted file mode 100644
+index 177fcfeeee..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<double,10> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
+deleted file mode 100644
+index 5f31529e08..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<float,10> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+deleted file mode 100644
+index ac40b5ec2d..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
+deleted file mode 100644
+index 5834cafab6..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,bool >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index b4bce045ed..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_scene.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
+deleted file mode 100644
+index 09f831722a..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,char >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+deleted file mode 100644
+index 4129f1a830..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,float >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 50ef71285a..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,int >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short,short int >  short_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(short_tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 2cd39a3534..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <vgl/vgl_point_3d.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
+deleted file mode 100644
+index 02bbdc01a7..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,bool > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index 88886e65c2..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_scene.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_SCENE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
+deleted file mode 100644
+index 273a95c2a6..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,char > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
+deleted file mode 100644
+index cf8ef6a19e..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,float > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 234256af7c..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,int > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+-
+-typedef boct_tree<short, short int > short_tree;
+-BOXM_SCENE_INSTANTIATE(short_tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 4f9dff9071..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+deleted file mode 100644
+index 5de38b0662..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
+deleted file mode 100644
+index 08145d2ca1..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, bool > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
+deleted file mode 100644
+index a84c7ef3e4..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_block.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
+deleted file mode 100644
+index 0464e1208e..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, char > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
+deleted file mode 100644
+index f3ea04b9df..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,float> tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
+deleted file mode 100644
+index 01b86c0776..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, int > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-typedef boct_tree<short, short > short_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<short_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
+deleted file mode 100644
+index ff3080df2c..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
+deleted file mode 100644
+index 912522b858..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vsl/vsl_binary_io.h>
+-
+-VBL_ARRAY_3D_INSTANTIATE(vsl_b_ifstream*);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
+deleted file mode 100644
+index 7158d38f30..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_io_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(boxm_scene_base);
+diff --git a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
+deleted file mode 100644
+index f9544ebe70..0000000000
+--- a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(boxm_scene_base);
+diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+deleted file mode 100644
+index 16694fbbc4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
++++ /dev/null
+@@ -1,38 +0,0 @@
+-# brl/bseg/boxm/algo/CMakeLists.txt
+-FIND_PACKAGE(RPLY REQUIRED)
+-include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${RPLY_INCLUDE_DIR} )
+-set(boxm_algo_sources
+-    boxm_compute_scene_statistics.h
+-    boxm_crop_scene.h
+-    boxm_fill_in_mesh.h
+-    boxm_fill_internal_cells.h
+-    boxm_init_scene.h
+-    boxm_refine.h
+-    boxm_save_block_raw.h
+-    boxm_save_scene_raw.h
+-    boxm_save_scene_raw_general.h
+-    boxm_upload_mesh.h
+-    boxm_merge_mog.h                        boxm_merge_mog.cxx
+-    boxm_split_sample.h
+-    boxm_compute_scene_difference.h
+-    boxm_linear_operations.h
+-    boxm_scene_levels_utils.h
+-   )
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo LIBRARY_SOURCES ${boxm_algo_sources})
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_algo boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-#raytracing algorithms
+-add_subdirectory(rt)
+-
+-#splatting algorithms
+-add_subdirectory(sp)
+-
+-#processes
+-add_subdirectory(pro)
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
+deleted file mode 100644
+index 5043e4a2a3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#ifndef boxm_compute_scene_difference_h_
+-#define boxm_compute_scene_difference_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_operations.h>
+-#include <vgl/vgl_point_3d.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-void boxm_compute_block_difference(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block1,
+-                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block2,
+-                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * blockout,
+-                                   float threshold)
+-{
+-  typedef boxm_sample<BOXM_APM_MOG_GREY> data_type;
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  typedef boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> > cell_type;
+-
+-  tree_type* tree1 = block1->get_tree();
+-  tree_type* tree2 = block2->get_tree();
+-  tree_type* treeout = blockout->get_tree();
+-
+-  std::vector<cell_type*> leaves=tree1->leaf_cells();
+-  std::vector<cell_type*> leavesout=treeout->leaf_cells();
+-
+-  for (unsigned i=0;i<leaves.size();i++)
+-  {
+-    cell_type *cell1=leaves[i];
+-    cell_type *cellout=leavesout[i];
+-    vgl_point_3d<double> p=cell1->local_bounding_box(tree1->root_level()).centroid();
+-    cell_type *cell2=tree2->locate_point(p);
+-    if (cell2)
+-    {
+-      data_type data1=cell1->data();
+-      double len1=tree1->cell_bounding_box(cell1).width();
+-
+-      data_type data2=cell2->data();
+-      double len2=tree2->cell_bounding_box(cell2).width();
+-
+-      data_type dataout=cellout->data();
+-
+-      double p1=1-std::exp(-data1.alpha*len1);
+-      double p2=1-std::exp(-data2.alpha*len2);
+-
+-      double p=p1+p2-2*p1*p2;
+-
+-      double alphaout=-std::log(1-p)/len1;
+-      if (p<threshold)
+-          alphaout=0.0;
+-      dataout.alpha=(float)alphaout;
+-      if (p1>p2)
+-        dataout.appearance_=data1.appearance_;
+-      else
+-        dataout.appearance_=data2.appearance_;
+-
+-      cellout->set_data(dataout);
+-    }
+-  }
+-}
+-
+-
+-void boxm_compute_scene_difference(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene1,
+-                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene2,
+-                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&sceneout,
+-                                   float threshold)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >tree_type;
+-  boxm_block_iterator<tree_type> iter1(&scene1);
+-  boxm_block_iterator<tree_type> iter2(&scene2);
+-
+-  // scene out is cloned as scene1.
+-  scene1.clone_blocks(sceneout);
+-  boxm_block_iterator<tree_type> iterout(&sceneout);
+-
+-  for (; !iter1.end(); iter1++,iter2++,iterout++) {
+-    std::cout<<'.';
+-    scene1.load_block(iter1.index());
+-    scene2.load_block(iter2.index());
+-    sceneout.load_block(iterout.index());
+-
+-    //boxm_block<tree_type>* block1 = *iter1;
+-    //boxm_block<tree_type>* block2 = *iter2;
+-    //boxm_block<tree_type>* blockout = *iterout;
+-
+-    boxm_compute_block_difference((*iter1),(*iter2),(*iterout), threshold);
+-    sceneout.write_active_block();
+-  }
+-}
+-
+-#endif // boxm_compute_scene_difference_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
+deleted file mode 100644
+index c697a4e6b4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_compute_scene_statistics_h
+-#define boxm_compute_scene_statistics_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_histogram.h>
+-
+-//: Compute histogram of a simple-type scenes. e.g. T_data = float, double
+-template <class T_loc, class T_data>
+-bool boxm_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist )//, bsta_histogram<float>& level_hist, unsigned& n_leaves)
+-{
+-  std::cout << " Using compute_scene_statistics\n";
+-
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-
+-  //(1) Traverse the leaves of the scene
+-  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
+-
+-  iterator.begin();
+-  float cell_count = 0;
+-  float max = (float)(*iterator)->data();
+-  float min = max;
+-  float this_val = max;
+-  while (!iterator.end()) {
+-    cell_count++;
+-    this_val = (float)(*iterator)->data();
+-    if ( this_val > max)  max = this_val;
+-    if ( this_val < min)  min = this_val;
+-    ++iterator;
+-  }
+-
+-  unsigned int nbins = (unsigned int)std::abs(max-min);// std::floor(std::sqrt(cell_count));
+-  response_hist = bsta_histogram<float>(min, max, nbins);
+-  scene->unload_active_blocks();
+-  iterator.begin();
+-  while (!iterator.end()) {
+-    response_hist.upcount((float)(*iterator)->data(), 1.0f);
+-    ++iterator;
+-  }
+-
+-  scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-//: Compute histogram for appearance model scene - where alpha, omega etc are relevant
+-template <class T_loc, class T_data>
+-bool compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene, bsta_histogram<float>& omega_hist, bsta_histogram<float>& sigma_hist, bsta_histogram<float>& level_hist, unsigned& n_leaves)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc,T_data> cell_type;
+-
+-  omega_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
+-  sigma_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
+-  level_hist = bsta_histogram<float>(0.0f, 10.0f, 10);
+-  boxm_block_iterator<tree_type> bit = scene.iterator();
+-  for (;!bit.end(); ++bit)
+-  {
+-    vgl_point_3d<int> block_index = bit.index();
+-    scene.load_block(block_index);
+-    boxm_block<tree_type> * block = scene.get_active_block();
+-    tree_type* tree=block->get_tree();
+-    if (!tree) return false;
+-    int n_levels = tree->number_levels();
+-    int fin_level = tree->finest_level();
+-    for (int level = n_levels-1; level>=fin_level; --level)
+-    {
+-      std::vector<cell_type *> cells_at_level =
+-        tree->leaf_cells_at_level(static_cast<unsigned>(level));
+-      level_hist.upcount(static_cast<float>(level),
+-                         static_cast<float>(cells_at_level.size()));
+-    }
+-    std::vector<cell_type *> leaves = tree->leaf_cells();
+-    n_leaves = leaves.size();
+-    for (typename std::vector<cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
+-    {
+-      T_data data = (*cit)->data();
+-      vgl_box_3d<double> bb = tree->cell_bounding_box(*cit);
+-      double dx = bb.width(), dy = bb.height(), dz = bb.depth();
+-      double diag = std::sqrt(dx*dx + dy*dy + dz*dz);
+-      double alpha = data.alpha;
+-      double omega = 1.0 - std::exp(-alpha*diag);
+-      omega_hist.upcount(static_cast<float>(omega), 1.0f);
+-
+-      if (scene.appearence_model() == BOXM_APM_SIMPLE_GREY)
+-      {
+-        float sigma = data.appearance_.sigma();
+-        sigma_hist.upcount(sigma, 1.0f);
+-      }
+-    }
+-  }
+-  return true;
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h b/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
+deleted file mode 100644
+index 63aa888efa..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
++++ /dev/null
+@@ -1,95 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_crop_scene.h
+-#ifndef boxm_crop_scene_h
+-#define boxm_crop_scene_h
+-
+-//:
+-// \file
+-// \brief  Template functions to create a new scene that is a cropped portion of another
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  January 11, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <class T_data>
+-boxm_scene<boct_tree<short, T_data> > *  boxm_crop_scene(boxm_scene<boct_tree<short,T_data> > *scene_in,vgl_box_3d<double> bbox)
+-{
+-  //only one-block scenes are supported for now
+-  if (!(scene_in->world_dim().x() == 1 && scene_in->world_dim().y()==1 && scene_in->world_dim().z()==1))
+-  {
+-    std::cerr << "In bvxm_crop_scene -- Input scene has more than one block, which is not supported\n";
+-    return nullptr;
+-  }
+-
+-  //get the tree inside the block and locate region
+-  boxm_block_iterator<boct_tree<short, T_data> > iter_in = scene_in->iterator();
+-  iter_in.begin();
+-
+-  //there is no need to increase iterator, since there should only be one block in the scene
+-  scene_in->load_block(iter_in.index());
+-  boct_tree<short, T_data>  *tree_in= (*iter_in)->get_tree();
+-
+-  boct_tree_cell<short,T_data>* root = tree_in->locate_region_global(bbox, true);
+-
+-  //most parameters of the output scene are the same as those of the input scene,
+-  //except the ROI which is determined by the root node
+-  double cell_length = 1.0/(double)(1<<(tree_in->root_level() - root->level()));
+-  double cell_origin_x = (double)(root->get_code().x_loc_)/(double)(1<<(tree_in->root_level()));
+-  double cell_origin_y = (double)(root->get_code().y_loc_)/(double)(1<<(tree_in->root_level()));
+-  double cell_origin_z = (double)(root->get_code().z_loc_)/(double)(1<<(tree_in->root_level()));
+-
+-  vgl_box_3d<double> global_bbox = tree_in->bounding_box();
+-
+-  vgl_point_3d<double> origin(cell_origin_x, cell_origin_y, cell_origin_z);
+-
+-  vgl_point_3d<double> min_point((global_bbox.min_x() + global_bbox.width()*origin.x()),
+-                                 (global_bbox.min_y() + global_bbox.height()*origin.y()),
+-                                 (global_bbox.min_z() + global_bbox.depth()*origin.z()));
+-
+-  vgl_vector_3d<double> block_dim(cell_length*global_bbox.width(),
+-                                  cell_length*global_bbox.height(),
+-                                  cell_length*global_bbox.depth());
+-
+-  boxm_scene<boct_tree<short, T_data> > *scene_out =
+-  new boxm_scene<boct_tree<short, T_data> >(scene_in->lvcs(),min_point,block_dim,scene_in->world_dim(), scene_in->save_internal_nodes());
+-
+-  scene_out->set_paths(scene_in->path(), "cropped");
+-  scene_out->set_appearance_model(scene_in->appearence_model());
+-  scene_out->clean_scene();
+-  boxm_block_iterator<boct_tree<short, T_data> > iter_out = scene_out->iterator();
+-  iter_out.begin();
+-  scene_out->load_block(iter_out.index());
+-
+-
+-  //Region of interest in [0,1)x[0,1)x[0,1) coordinates
+-  vgl_point_3d<double> norm_bbox_min((bbox.min_x()-global_bbox.min_x())/global_bbox.width(),
+-                                     (bbox.min_y()-global_bbox.min_y())/global_bbox.height(),
+-                                     (bbox.min_z()-global_bbox.min_z())/global_bbox.depth());
+-  vgl_point_3d<double> norm_bbox_max((bbox.max_x()-global_bbox.min_x())/global_bbox.width(),
+-                                     (bbox.max_y()-global_bbox.min_y())/global_bbox.height(),
+-                                     (bbox.max_z()-global_bbox.min_z())/global_bbox.depth());
+-
+-
+-  //output tree
+-  boct_tree<short, T_data >  *tree_out = tree_in->clone_and_intersect(root, tree_in->root_level(), vgl_box_3d<double>(norm_bbox_min,norm_bbox_max));
+-
+-  //write the output tree
+-  (*iter_out)->init_tree(tree_out);
+-  scene_out->write_active_block();
+-  scene_out->write_scene("/cropped_scene.xml");
+-
+-  return scene_out;
+-}
+-
+-
+-#endif // boxm_crop_scene_h
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
+deleted file mode 100644
+index f41af5bca8..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
++++ /dev/null
+@@ -1,316 +0,0 @@
+-#ifndef boxm_fill_in_mesh_h_
+-#define boxm_fill_in_mesh_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_operations.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bool is_mesh_in_block(imesh_mesh & mesh, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
+-{
+-  imesh_face_array_base& fs = mesh.faces();
+-  std::list<vgl_point_3d<double> > v_list;
+-  vgl_box_3d<double> bb_global;
+-
+-  for (unsigned i=0; i < fs.size(); ++i)
+-  {
+-    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
+-    for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-      unsigned int v_id = fs(i,j);
+-      vgl_point_3d<double> v;
+-      if (use_lvcs) {
+-        double lx, ly, lz;
+-        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                             vpgl_lvcs::wgs84,lx,ly,lz);
+-        v=vgl_point_3d<double>(lx,ly,lz);
+-      }
+-      else
+-        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-      bb_global.add(v);
+-      v_list.push_back(v);
+-    }
+-  }
+-
+-  vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
+-  if (inters.is_empty())
+-    return false;
+-
+-  return true;
+-}
+-
+-template <class T_loc, class T_data>
+-bool are_meshes_in_block(std::vector<imesh_mesh>  meshes, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
+-{
+-  bool flag=false;
+-  for (auto & meshe : meshes)
+-  {
+-    meshe.compute_face_normals(true);
+-    imesh_face_array_base& fs = meshe.faces();
+-    std::list<vgl_point_3d<double> > v_list;
+-    vgl_box_3d<double> bb_global;
+-
+-    for (unsigned i=0; i < fs.size(); ++i)
+-    {
+-      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-      for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-        unsigned int v_id = fs(i,j);
+-        vgl_point_3d<double> v;
+-        if (use_lvcs) {
+-          double lx, ly, lz;
+-          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                               vpgl_lvcs::wgs84,lx,ly,lz);
+-          v=vgl_point_3d<double>(lx,ly,lz);
+-        }
+-        else
+-          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-        bb_global.add(v);
+-        v_list.push_back(v);
+-      }
+-    }
+-
+-    vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
+-    if (!inters.is_empty())
+-      flag=true;
+-  }
+-  return flag;
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
+-                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  for (auto & meshe : meshes)
+-  {
+-    imesh_face_array_base& fs = meshe.faces();
+-    std::list<vgl_point_3d<double> > v_list;
+-    vgl_box_3d<double> bb_scale, bb_global;
+-    for (unsigned i=0; i < fs.size(); ++i)
+-    {
+-      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-      for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-        unsigned int v_id = fs(i,j);
+-        vgl_point_3d<double> v;
+-        if (use_lvcs) {
+-          double lx, ly, lz;
+-          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                               vpgl_lvcs::wgs84,lx,ly,lz);
+-          v=vgl_point_3d<double>(lx,ly,lz);
+-        }
+-        else
+-          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-        bb_global.add(v);
+-        vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-        v.set(diff.x(), diff.y(), diff.z());
+-        // the local coordinates inside the box region
+-        v_list.push_back(v);
+-        //convert the values into [0,1] range
+-        v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-        bb_scale.add(v);
+-      }
+-    }
+-    // check if polygon's bounding box intersects with the block
+-    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-    if (inters.is_empty())
+-      continue;
+-
+-    // locate the polygon bounding box in tree
+-    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
+-    if (region) {
+-      // test all the children for intersection
+-      std::vector<boct_tree_cell<T_loc,T_data>*> children;
+-      if (!region->is_leaf())
+-        region->leaf_children(children);
+-      else // insert the node itself, if no children
+-        children.push_back(region);
+-      for (unsigned i=0; i<children.size(); i++) {
+-        boct_tree_cell<T_loc,T_data>* cell=children[i];
+-        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
+-        if (contains_point(meshe,cell_bb.centroid())) {
+-          cell->set_data(val);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
+-template <>
+-void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
+-                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
+-                                  bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  for (auto & meshe : meshes)
+-  {
+-    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
+-    {
+-      imesh_face_array_base& fs = meshe.faces();
+-      std::list<vgl_point_3d<double> > v_list;
+-      vgl_box_3d<double> bb_scale, bb_global;
+-
+-      for (unsigned i=0; i < fs.size(); ++i)
+-      {
+-        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-        for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-          unsigned int v_id = fs(i,j);
+-          vgl_point_3d<double> v;
+-          if (use_lvcs) {
+-            double lx, ly, lz;
+-            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                                 vpgl_lvcs::wgs84,lx,ly,lz);
+-            v=vgl_point_3d<double>(lx,ly,lz);
+-          }
+-          else
+-            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-          bb_global.add(v);
+-          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-          v.set(diff.x(), diff.y(), diff.z());
+-          // the local coordinates inside the box region
+-          v_list.push_back(v);
+-          //convert the values into [0,1] range
+-          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-          bb_scale.add(v);
+-        }
+-      }
+-
+-      // check if polygon's bounding box intersects with the block
+-      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-      if (inters.is_empty())
+-        continue;
+-
+-      meshe.compute_face_normals();
+-
+-      // locate the polygon bounding box in tree
+-      boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
+-      if (region)
+-      {
+-        // test all the children for intersection
+-        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
+-        if (!region->is_leaf())
+-          region->leaf_children(children);
+-        else // insert the node itself, if no children
+-          children.push_back(region);
+-        for (auto cell : children) {
+-          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
+-
+-          if (contains_point(meshe,cell_bb.centroid())) {
+-            boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
+-            tempdata.set_appearance(val.appearance());
+-            tempdata.alpha*=val.alpha;
+-            cell->set_data(tempdata);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-template <>
+-void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > > *block,
+-                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
+-                                  bool use_lvcs, boxm_sample<BOXM_APM_SIMPLE_GREY> val)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  for (auto & meshe : meshes)
+-  {
+-    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
+-    {
+-      imesh_face_array_base& fs = meshe.faces();
+-      std::list<vgl_point_3d<double> > v_list;
+-      vgl_box_3d<double> bb_scale, bb_global;
+-
+-      for (unsigned i=0; i < fs.size(); ++i)
+-      {
+-        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
+-        for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-          unsigned int v_id = fs(i,j);
+-          vgl_point_3d<double> v;
+-          if (use_lvcs) {
+-            double lx, ly, lz;
+-            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                                 vpgl_lvcs::wgs84,lx,ly,lz);
+-            v=vgl_point_3d<double>(lx,ly,lz);
+-          }
+-          else
+-            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-          bb_global.add(v);
+-          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-          v.set(diff.x(), diff.y(), diff.z());
+-          // the local coordinates inside the box region
+-          v_list.push_back(v);
+-          //convert the values into [0,1] range
+-          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-          bb_scale.add(v);
+-        }
+-      }
+-
+-      // check if polygon's bounding box intersects with the block
+-      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-      if (inters.is_empty())
+-        continue;
+-
+-      meshe.compute_face_normals();
+-
+-      // locate the polygon bounding box in tree
+-      boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >* region=tree->locate_region(inters);
+-      if (region)
+-      {
+-        // test all the children for intersection
+-        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >*> children;
+-        if (!region->is_leaf())
+-          region->leaf_children(children);
+-        else // insert the node itself, if no children
+-          children.push_back(region);
+-        for (auto cell : children) {
+-          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
+-
+-          if (contains_point(meshe,cell_bb.centroid())) {
+-            boxm_sample<BOXM_APM_SIMPLE_GREY> tempdata=cell->data();
+-            tempdata.set_appearance(val.appearance());
+-            tempdata.alpha*=val.alpha;
+-            cell->set_data(tempdata);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_fill_in_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                  std::vector<imesh_mesh> meshes, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  vpgl_lvcs lvcs=scene.lvcs();
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  for (; !iter.end(); iter++) {
+-    vgl_box_3d<double> block_bb=scene.get_block_bbox(iter.index().x(),iter.index().y(),iter.index().z());
+-    if (are_meshes_in_block<T_loc, T_data >(meshes,block_bb,lvcs,use_lvcs))
+-    {
+-      scene.load_block(iter.index());
+-      boxm_block<tree_type>* block = *iter;
+-      boxm_fill_in_mesh_into_block(block, meshes, lvcs, use_lvcs, val);
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-#endif // boxm_fill_in_mesh_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h b/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
+deleted file mode 100644
+index 6d81beef0f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
++++ /dev/null
+@@ -1,80 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_fill_internal_cells.h
+-#ifndef boxm_fill_internal_cells_h
+-#define boxm_fill_internal_cells_h
+-//:
+-// \file
+-// \brief Class in charged of filling the intermediate nodes of a tree.
+-// \author Maria Isabel Restrepo mir@lems.brown.edu
+-// \date  Feb 3, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: A class to combine children cells and fill intermediate nodes
+-template <class T_data>
+-class boxm_fill_internal_cells
+-{
+- public:
+-  typedef boct_tree<short,T_data> tree_type;
+-
+-  boxm_scene<boct_tree<short,T_data> > * traverse_and_fill(boxm_scene<boct_tree<short,T_data> > *scene_in)
+-  {
+-    // Most parameters of the output scene are the same as those of the input scene
+-    // but we need to change the mode of the scene to be saving internal nodes
+-    bool save_internal_nodes = true;
+-    boxm_scene<tree_type> *scene_out = new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
+-                                                                 scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
+-                                                                 false, save_internal_nodes);
+-    std::string block_pref = scene_in->block_prefix() + "_all_nodes";
+-    scene_out->set_paths(scene_in->path(), block_pref);
+-    scene_out->set_appearance_model(scene_in->appearence_model());
+-
+-    scene_out->write_scene(block_pref + ".xml");
+-
+-    //Iterate through the blocks
+-    boxm_block_iterator<tree_type> iter_in = scene_in->iterator();
+-    boxm_block_iterator<tree_type> iter_out = scene_out->iterator();
+-
+-    iter_in.begin();
+-    iter_out.begin();
+-
+-    while (!iter_in.end() && !iter_out.end())
+-    {
+-      scene_in->load_block(iter_in.index());
+-      scene_out->load_block(iter_out.index());
+-
+-      tree_type *tree_in= (*iter_in)->get_tree();
+-      // Copy input tree into output tree and fill
+-      tree_type *tree_out = tree_in->clone();
+-      this->traverse_and_fill(tree_out);
+-      (*iter_out)->init_tree(tree_out);
+-      std::cout << "writing block: " << iter_out.index() <<std::endl;
+-      scene_out->write_active_block();
+-
+-      iter_in++; iter_out++;
+-    }
+-
+-    return scene_out;
+-  }
+-
+- protected:
+-
+-  //: Traverses a tree and fills intermediate cells with the average of the 8 children.
+-  // If there is need to fill cells with something different to the average, this function can be made abstract and
+-  // write specializations. As in the template method design pattern
+-  void traverse_and_fill(tree_type *tree_to_fill)
+-  {
+-    tree_to_fill->fill_with_average();
+-  }
+-};
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h b/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
+deleted file mode 100644
+index 9325f47c46..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
++++ /dev/null
+@@ -1,60 +0,0 @@
+-#ifndef boxm_init_scene_h_
+-#define boxm_init_scene_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: This method inits the blocks (octrees) of the scene of type boxm_sample
+-template <boxm_apm_type APM_TYPE>
+-void boxm_init_scene(boxm_scene<boct_tree<short, boxm_sample<APM_TYPE> > > &scene)
+-{
+-  typedef boct_tree<short, boxm_sample<APM_TYPE> > tree_type;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  float pinit=scene.pinit();
+-  float dimx=(float)scene.block_dim().x();
+-  float numbercells=(float)(1<<(scene.init_level()-1));
+-
+-  float alpha_init=-std::log(1-pinit)*numbercells/dimx;
+-  for (; !iter.end(); iter++) {
+-       vgl_point_3d<int> index=iter.index();
+-    if (!scene.discover_block(index.x(),index.y(),index.z()))
+-    {
+-      boxm_sample<APM_TYPE> initsample(alpha_init);
+-      tree_type* tree= new tree_type(initsample,scene.max_level(),scene.init_level());
+-      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
+-      scene.set_block(index,block);
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-//: Initializes a general scene
+-template <class T_data>
+-void boxm_init_scene(boxm_scene<boct_tree<short, T_data> > &scene)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  float dimx=(float)scene.block_dim().x();
+-
+-  for (; !iter.end(); iter++) {
+-    vgl_point_3d<int> index=iter.index();
+-    if (!scene.discover_block(index.x(),index.y(),index.z()))
+-    {
+-      T_data initdata;
+-      tree_type* tree= new tree_type(initdata,scene.max_level(),scene.init_level());
+-      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
+-      scene.set_block(index,block);
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-#endif // boxm_init_scene_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h b/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
+deleted file mode 100644
+index 01726ab977..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
++++ /dev/null
+@@ -1,60 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_linear_operations.h
+-#ifndef boxm_linear_operations_h
+-#define boxm_linear_operations_h
+-//:
+-// \file
+-// \brief Functions to perfoms linear operations on boxm scenes and/or blocks
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  2-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_block.h>
+-#include <boct/boct_tree.h>
+-#include <cassert>
+-#ifdef DEBUG
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-//: Computes the linear combination of two blocks in place. i.e block1 = s1*block1 +  s2*block2
+-template<class T_data>
+-bool boxm_linear_combination(boxm_block<boct_tree<short, T_data> > *block1, boxm_block<boct_tree<short, T_data> > *block2, float s1, float s2)
+-{
+-  boct_tree<short, T_data> *tree1 = block1->get_tree();
+-  boct_tree<short, T_data> *tree2 = block2->get_tree();
+-
+-  std::vector<boct_tree_cell<short, T_data>* > cells1 = tree1->leaf_cells();
+-  std::vector<boct_tree_cell<short, T_data>* > cells2 = tree2->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it1 = cells1.begin();
+-  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it2 = cells2.begin();
+-
+-  for (; (it1!=cells1.end())&&(it2!= cells2.end()); it1++, it2++)
+-  {
+-    boct_tree_cell<short,T_data> *cell1 = *it1;
+-    boct_tree_cell<short,T_data> *cell2 = *it2;
+-
+-#ifdef DEBUG
+-    //if level and location code of cells isn't the same quit
+-    boct_loc_code<short> code1 = cell1->get_code();
+-    boct_loc_code<short> code2 = cell2->get_code();
+-    if (!(code1.isequal(code2)))
+-    {
+-      std::cerr << "In boxm_linear_combination: Blocks must have the same structure\n";
+-      return false;
+-    }
+-#endif
+-
+-    cell1->set_data(s1*cell1->data() + s2*cell2->data());
+-  }
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
+deleted file mode 100644
+index e7e2f6585c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
++++ /dev/null
+@@ -1,239 +0,0 @@
+-#include <vector>
+-#include <iostream>
+-#include <limits>
+-#include "boxm_merge_mog.h"
+-//:
+-// \file
+-
+-#include <boxm/boxm_scene.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vnl/vnl_math.h> // for vnl_math::sqr()
+-
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-
+-void boxm_merge_mog::kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian)
+-{
+-  //When merging components of gaussian mixtures, we need to perform the following calculations
+-  //1. find the normalizing weight of the new component.
+-  //   In this case this value is 1 because we are merging all the components
+-  //2. find the mean
+-  //3. find the variance
+-
+-  float mean = 0.0f;
+-  float var = 0.0f;
+-
+-  //CAUTION: only mixtures of 3 modes are supported for now.
+-  assert(mixture.num_components() == 3);
+-  unsigned num_components = mixture.num_components();
+-
+-  for (unsigned i = 0; i<num_components; ++i)
+-  {
+-    // note: these equations omit the weight of the final distribution
+-    // only because in this case it is 1
+-    mean += mixture.weight(i) * mixture.distribution(i).mean();
+-    var  += mixture.weight(i) *(mixture.distribution(i).var() +
+-                                vnl_math::sqr(mixture.distribution(i).mean()));
+-  }
+-  if (var <  vnl_math::sqr(mean))
+-    std::cout<< "This should not happen: " << mixture << std::endl;
+-  var -= vnl_math::sqr(mean);
+-  assert(var >= 0);
+-
+-  gaussian.set_mean(mean);
+-  gaussian.set_var(var);
+-  return;
+-}
+-
+-//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
+-//  Thus the resulting grid contains unimodal gaussians
+-bool boxm_merge_mog::kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &mog_scene,
+-                                    boxm_scene<boct_tree<short, gauss_type> > &gauss_scene)
+-{
+-    // iterate through the scene
+-    boxm_block_iterator<mog_tree_type > mog_iter = mog_scene.iterator();
+-    boxm_block_iterator<gauss_tree_type > gauss_iter = gauss_scene.iterator();
+-
+-    for (mog_iter.begin(), gauss_iter.begin(); !mog_iter.end(); ++mog_iter, ++gauss_iter) {
+-      mog_scene.load_block(mog_iter.index());
+-      gauss_scene.load_block(gauss_iter.index());
+-      mog_tree_type  *mog_tree = (*mog_iter)->get_tree();
+-      gauss_tree_type  *gauss_tree = mog_tree->clone_to_type<gauss_type>();
+-#if 0
+-      gauss_tree->init_cells(func_max.min_response());
+-#endif
+-      this->kl_merge_octree(mog_tree,gauss_tree);
+-      (*gauss_iter)->init_tree(gauss_tree);
+-      gauss_scene.write_active_block();
+-    }
+-
+-    return true;
+-}
+-
+-//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
+-//  Thus the resulting grid contains unimodal gaussians
+-bool boxm_merge_mog::kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree,
+-                                     boct_tree<short, gauss_type> *gauss_tree)
+-{
+-  // iterate through the trees
+-  std::vector<mog_cell_type*> mog_cells = mog_tree->all_cells();
+-  std::vector<gauss_cell_type*> gauss_cells = gauss_tree->all_cells();
+-
+-  if (mog_cells.size()!=gauss_cells.size() ) {
+-    std::cerr << "Different size vectors in boxm_merge_mog::kl_merge_octree\n";
+-    return false;
+-  }
+-
+-
+-  for (unsigned i = 0; i < mog_cells.size(); ++i)
+-  {
+-    gauss_type result_gauss;
+-    this->kl_merge(mog_cells[i]->data(), result_gauss);
+-    gauss_cells[i]->set_data(result_gauss);
+-  }
+-  return true;
+-}
+-
+-/********************** Non-class functions************************************/
+-
+-//: Computes the differential entropy of a gaussian scene- only for leave cells
+-bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene_in,boxm_scene<boct_tree<short, float> >& scene_out)
+-{
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
+-
+-  //iterate through the leaf cells computing entropy
+-  boxm_cell_iterator<boct_tree<short, gauss_type > > it_in =
+-  scene_in.cell_iterator(&boxm_scene<boct_tree<short, gauss_type> >::load_block);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it_out =
+-  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
+-
+-  it_in.begin();
+-  it_out.begin();
+-
+-  while ( !(it_in.end() || it_out.end()) ) {
+-    boct_tree_cell<short,gauss_type> *cell_in = *it_in;
+-    boct_tree_cell<short,float> *cell_out = *it_out;
+-
+-    boct_loc_code<short> out_code = cell_in->get_code();
+-    boct_loc_code<short> in_code = cell_out->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++it_in;
+-      ++it_out;
+-      continue;
+-    }
+-
+-    double h = 0.5*std::log(vnl_math::pi*vnl_math::e*2*cell_in->data().var());
+-    cell_out->set_data(float(h));
+-    ++it_in;
+-    ++it_out;
+-  }
+-
+-  return true;
+-}
+-
+-
+-//: Compute expectation given that the voxel is occupied
+-bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
+-  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
+-
+-  //iterate through the leaf cells computing mean appearance
+-  boxm_cell_iterator<scene_tree_type > it_in =
+-  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it_out =
+-  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
+-
+-  it_in.begin();
+-  it_out.begin();
+-
+-  while ( !(it_in.end() || it_out.end()) ) {
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
+-    boct_tree_cell<short,float> *cell_out = *it_out;
+-
+-    boct_loc_code<short> out_code = cell_in->get_code();
+-    boct_loc_code<short> in_code = cell_out->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++it_in;
+-      ++it_out;
+-      continue;
+-    }
+-
+-    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
+-    // update alpha integral
+-    float vis_color = float(1.0 - std::exp(- cell_in->data().alpha * it_in.length()))*(mean_color+grey_offset);
+-    cell_out->set_data(vis_color);
+-    ++it_in;
+-    ++it_out;
+-  }
+-
+-  scene_in.unload_active_blocks();
+-  scene_out.unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-#if 0
+-//: Compute total expectation E(I) = E(I| X \in S) P(X \in S) + E(I| X !\in S) P(X !\in S)
+-//  Expected appearance of a non surface voxel is not defined. Every intensity is equally likely therefore E(I| X !\in S) = 127.5 for I in [0,255]
+-bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
+-  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
+-
+-  //iterate through the leaf cells computing mean appearance
+-  boxm_cell_iterator<scene_tree_type > it_in =
+-  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it_out =
+-  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
+-
+-  it_in.begin();
+-  it_out.begin();
+-
+-  while ( !(it_in.end() || it_out.end()) )
+-  {
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
+-    boct_tree_cell<short,float> *cell_out = *it_out;
+-
+-    boct_loc_code<short> out_code = cell_in->get_code();
+-    boct_loc_code<short> in_code = cell_out->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++it_in;
+-      ++it_out;
+-      continue;
+-    }
+-
+-    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
+-    //alpha integral
+-    float vis = std::exp(- cell_in->data().alpha * it_in.length());
+-    float vis_color = (1.0f - vis) *mean_color;
+-    float invis_color = vis * 0.5f; // E(I| X !\in S) = 127.5/255
+-    cell_out->set_data(vis_color + invis_color);
+-    ++it_in;
+-    ++it_out;
+-  }
+-
+-  scene_in.unload_active_blocks();
+-  scene_out.unload_active_blocks();
+-
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
+deleted file mode 100644
+index 1c39b9e84c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_merge_mog.h
+-#ifndef boxm_merge_mog_h_
+-#define boxm_merge_mog_h_
+-//:
+-// \file
+-// \brief class with methods to merge gaussian mixtures.
+-// \author Isabel Restrepo
+-// \date April 20, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   Nov 7 2009 - Isabel Restrepo: Copied from bvxm
+-// \endverbatim
+-
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gaussian_indep.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-//:
+-// Only floating point are supported for now and mixtures with 3 components.
+-// This class can be further templated if necessary
+-class boxm_merge_mog
+-{
+- private:
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef bsta_mixture_fixed<gauss_type, 3> mix_gauss;
+-  typedef bsta_num_obs<mix_gauss> mix_gauss_type;
+-  typedef boct_tree<short, mix_gauss_type> mog_tree_type;
+-  typedef boct_tree<short, gauss_type> gauss_tree_type;
+-  typedef boct_tree_cell<short, mix_gauss_type> mog_cell_type;
+-  typedef boct_tree_cell<short, gauss_type> gauss_cell_type;
+-
+- public:
+-
+-  // === Scene operations ===
+-
+-  //: Merges the components of the gaussian mixtures at each voxel into a single gaussian, that minimizes KL divergence.
+-  //  The resulting scene contains unimodal Gaussians.
+-  bool kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &app_scene,  boxm_scene<boct_tree<short, gauss_type> > &gauss_app);
+-
+-  bool kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree, boct_tree<short, gauss_type> *gauss_tree);
+-
+-#if 0
+-  //: Converts a mixture of gaussians grid into an unimodal gaussian grid corresponding to the most probable mode
+-  static bool mpm_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> app_scene,  boxm_scene<boct_tree<short, gauss_type> gauss_app);
+-#endif
+-
+-  // === Distribution operations ===
+-
+-  //: Merges all the components in the mixture into one component that minimizes the KL divergence between the two distributions
+-  static void kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian);
+-};
+-
+-
+-//: Computes the differential entropy of a gaussian scene- only for leave cells
+-bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene,boxm_scene<boct_tree<short, float > >& scene_out);
+-
+-//: Computes expected color of a voxel as mean/occupancy
+-bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset);
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_refine.h b/contrib/brl/bseg/boxm/algo/boxm_refine.h
+deleted file mode 100644
+index c3f464f906..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_refine.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_refine_h_
+-#define boxm_refine_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-void boxm_refine_block(boxm_block<boct_tree<T_loc, T_data> > *block,
+-                       float occlusion_prob_thresh, unsigned & num_split, bool reset_appearance = true)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  tree_type* tree = block->get_tree();
+-  float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
+-  // get the leaf nodes of the block
+-  std::vector<boct_tree_cell<T_loc, T_data>*> leaf_nodes = tree->leaf_cells();
+-#ifdef DEBUG
+-  std::cout << "  NUMBER OF LEAF NODES=" << leaf_nodes.size();
+-#endif
+-  std::vector<boct_tree_cell<T_loc, T_data >*> split_list;
+-  for (unsigned i=0; i<leaf_nodes.size(); i++) {
+-    boct_tree_cell<T_loc, T_data>* cell = leaf_nodes[i];
+-    T_data data = cell->data();
+-
+-    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
+-    float alpha_int = data.alpha * side_len;
+-
+-    if ((alpha_int > max_alpha_int) && (cell->level() > 0)) {
+-      split_list.push_back(cell);
+-      // make sure neighbor cells are not already coarser than this cell
+-      // get all the faces;
+-#if 0
+-      boct_face_idx faces = ALL;
+-      std::vector<boct_tree_cell<T_loc, T_data >*> neighbors;
+-      cell->find_neighbors(faces, neighbors, cell->level()+1);
+-      split_list.insert(split_list.end(), neighbors.begin(), neighbors.end());
+-#endif
+-    }
+-  }
+-  num_split+=(int)split_list.size();
+-#ifdef DEBUG
+-  std::cout<<" Splitting "<<split_list.size()<<" cells" << std::endl;
+-#endif
+-  // splitting
+-  for (unsigned i=0; i<split_list.size(); i++) {
+-    boct_tree_cell<T_loc, T_data>* cell = split_list[i];
+-    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
+-    float new_alpha = max_alpha_int / side_len;
+-
+-    T_data old_sample = cell->data();
+-    typename T_data::apm_datatype app;
+-    if (!reset_appearance) {
+-      // if it is not set, transfer the old appearance to the new sample
+-      T_data new_sample = old_sample;
+-      new_sample.alpha=new_alpha;
+-      cell->split(new_sample);
+-    }
+-    else {
+-      T_data new_sample = T_data();
+-      new_sample.alpha = new_alpha;
+-      cell->split(new_sample);
+-    }
+-  }
+-}
+-
+-//: This method refines the blocks (octrees) of the scene
+-// If there are some cells with big values they are spitted into new child cells;
+-// the data of the cell is copied to the children's data. The purpose of this
+-// method is to elaborate the octree at the areas where more details exist.
+-// returns the number of leaf nodes in the refined octree
+-template <class T_loc, class T_data>
+-unsigned int boxm_refine_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                               float occlusion_prob_thresh,
+-                               bool reset_appearance = true)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  unsigned int nleaves = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  //float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boxm_refine_block(block, occlusion_prob_thresh,nleaves, reset_appearance);
+-    //nleaves += block->size();
+-    scene.write_active_block();
+-  }
+-  std::cout<<"Total No of leaves split "<<nleaves<<std::endl;
+-  return nleaves;
+-}
+-
+-#endif // boxm_refine_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
+deleted file mode 100644
+index 65c03397ce..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
++++ /dev/null
+@@ -1,155 +0,0 @@
+-#ifndef boxm_save_block_raw_h_
+-#define boxm_save_block_raw_h_
+-
+-#include <vector>
+-#include <new>
+-#include <iostream>
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/util/boxm_cell_data_traits.h>
+-
+-#include <bsta/bsta_attributes.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-void boxm_save_block_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                         vgl_point_3d<int> block_idx,
+-                         std::string filename,
+-                         unsigned int resolution_level)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  scene.load_block(block_idx);
+-  boxm_block<tree_type>* block = scene.get_block(block_idx);
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  tree_type* tree = block->get_tree();
+-
+-  // query the finest level of the tree and do not make the resolution smaller than that
+-  if (tree->finest_level() > (int)resolution_level)
+-    resolution_level = tree->finest_level();
+-
+-  // get origin of block
+-  vgl_point_3d<double> min = block_bb.min_point();
+-
+-  const unsigned int ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-  // assume that bounding box is a cube
+-  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-  // origin should specify center of first cell
+-  vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-  int data_size = ncells*ncells*ncells;
+-  int y_size = ncells*ncells;
+-  float *data = nullptr;
+-  data = new (std::nothrow)float[data_size];
+-
+-  if (data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-    return;
+-  }
+-  // init to zero
+-  for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-    *dp = 0.0f;
+-  }
+-
+-  double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-  out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-  std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-  for (unsigned i=0; i<cells.size(); i++)
+-  {
+-    vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-    float cell_val = boxm_cell_to_float(cells[i], step_len);
+-
+-    unsigned int level = cells[i]->get_code().level;
+-
+-    if (level == resolution_level) {
+-      // just copy value to output array
+-      int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
+-      if (out_index >= data_size)
+-        std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-      else
+-        data[out_index] = cell_val;
+-    }
+-    else if (level > resolution_level) {
+-      // cell is bigger than output cells.  copy value to all contained output cells.
+-      const unsigned int us_factor = 1 << (level - resolution_level);
+-      const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-      const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-      const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-      for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-        for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-          for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-            int out_index = z*y_size + y*ncells + x;
+-            //std::cout << level << "  " << out_index << std::endl;
+-            if (out_index >= data_size)
+-              std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-            else
+-              data[out_index] = cell_val;
+-          }
+-        }
+-      }
+-    }
+-    else {
+-      // cell is smaller than output cells. increment output cell value
+-      unsigned int ds_factor = 1 << (resolution_level - level);
+-      double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-      const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-      const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-      const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-      unsigned int out_index = static_cast<unsigned int>((node_z)*y_size + (node_y)*ncells + (node_x));
+-      data[out_index] += float(cell_val*update_weight);
+-    }
+-  }
+-  // convert float values to char
+-
+-  unsigned char *byte_data = nullptr;
+-  byte_data = new (std::nothrow) unsigned char[data_size];
+-  if (byte_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
+-    return;
+-  }
+-
+-  float* dp = data;
+-  for (unsigned char* bdp = byte_data; dp < data + data_size; ++dp, ++bdp) {
+-    //double P = 1.0 - std::exp(-*dp*step_len);
+-    *bdp = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5)); // always positive so this is an ok way to round
+-  }
+-  delete[] data;
+-
+-  // write header
+-  unsigned char data_type = 0; // 0 means unsigned byte
+-
+-  vxl_uint_32 nx = ncells;
+-  vxl_uint_32 ny = ncells;
+-  vxl_uint_32 nz = ncells;
+-
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx),sizeof(nx));
+-  os.write(reinterpret_cast<char*>(&ny),sizeof(ny));
+-  os.write(reinterpret_cast<char*>(&nz),sizeof(nz));
+-
+-  os.write((char*)byte_data,data_size);
+-  delete[] byte_data;
+-
+-  return;
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
+deleted file mode 100644
+index f3051e8f6e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
++++ /dev/null
+@@ -1,277 +0,0 @@
+-#ifndef boxm_save_scene_raw_h_
+-#define boxm_save_scene_raw_h_
+-//:
+-// \file
+-// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
+-//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
+-//         And then these sets of data combined and saved in a raw file.
+-//
+-// \author Gamze Tunali
+-// \date   September 9, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vector>
+-#include <new>
+-#include <iostream>
+-#include <sstream>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_cell_data_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-
+-#include <bsta/bsta_histogram.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vsl/vsl_binary_io.h>
+-#include <vpl/vpl.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-template <class T_loc, class T_data>
+-void boxm_save_scene_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                         std::string filename,
+-                         unsigned int resolution_level)
+-{
+-  float minv = 1.0e10, maxv = 0.0;
+-  bsta_histogram<float> h(0.0f, 1.0f, 20);
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  unsigned int finest_level=scene.finest_level();
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  if (resolution_level < finest_level)
+-  resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    float *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)float[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-    // init to zero
+-    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = 0.0f;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      float cell_val = boxm_cell_to_float(cells[i], step_len);
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              //int out_index=x*y_size + y*ncells + z;
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-              //////int out_index=z + y*ncells + x*ncells*ncells;
+-              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
+-
+-        data[out_index] += float(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << fn << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    float* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      //double P = 1.0 - std::exp(-*dp*step_len);
+-      // always positive so this is an ok way to round
+-      float fv = *dp;
+-      h.upcount(fv, 1.0f);
+-      if (fv<minv) minv = fv;
+-      if (fv>maxv) maxv = fv;
+-      unsigned char c = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5));
+-      vsl_b_write(os, (char) c);
+-    }
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-  scene.unload_active_blocks();
+-
+-  assert(ncells > 0);
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  char* byte_data = new (std::nothrow) char[row_data_size];
+-  if (byte_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type = 0; // 0 means unsigned byte
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read(byte_data, ncells);
+-            os.write((char*)byte_data,ncells);
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] byte_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-  std::cout << "Volume Histogram(" << minv << ' ' << maxv << "):[0->1]20bins\n";
+-  h.print();
+-  return;
+-}
+-
+-#endif // boxm_save_scene_raw_h_
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
+deleted file mode 100644
+index 28753c4595..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
++++ /dev/null
+@@ -1,824 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
+-#ifndef boxm_save_scene_raw_general_h
+-#define boxm_save_scene_raw_general_h
+-
+-//:
+-// \file
+-// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
+-//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
+-//         And then these sets of data combined and saved in a raw file.
+-//
+-// \author Gamze Tunali
+-// \date   September 9, 2009
+-// \verbatim
+-//  Modifications
+-//   February 17, 2011 Isabel Restrepo: Modified functions to use with more general scenes.
+-//                                      Double, float values are not converted to byte, nor assumptions are made. Values are saves as they are
+-// \endverbatim
+-
+-#include <vector>
+-#include <new>
+-#include <iostream>
+-#include <sstream>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_cell_data_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <bsta/bsta_histogram.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vsl/vsl_binary_io.h>
+-#include <vpl/vpl.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-#include <vul/vul_file.h>
+-
+-
+-//: Traits for saving grids of different datatypes to Drishti .raw file
+-template <class T>
+-class boxm_dristhi_traits;
+-
+-//: Drishti datatypes for header:
+-// * 0 : unsigned byte - 1 byte per voxel
+-// * 1 : signed byte - 1 byte per voxel
+-// * 2 : unsigned short - 2 bytes per voxel
+-// * 3 : signed short - 2 bytes per voxel
+-// * 4 : integer - 4 bytes per voxel
+-// * 8 : float - 4 bytes per voxel
+-
+-//: Drishti traits specializations. Please extent as needed
+-
+-template <>
+-class boxm_dristhi_traits<float>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 8;}
+-};
+-
+-
+-template <>
+-class boxm_dristhi_traits<unsigned char>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 0;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<char>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 1;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<short>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 3;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<unsigned int>
+-{
+- public:
+-  static unsigned char dristhi_header() {return 4;}
+-};
+-
+-template <>
+-class boxm_dristhi_traits<bsta_num_obs<bsta_gauss_sf1> >
+-{
+- public:
+-  static unsigned char dristhi_header() {return 8;}
+-};
+-
+-
+-template <class T_loc>
+-void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, bool > > &scene,
+-                                 std::string filename,
+-                                 unsigned int resolution_level)
+-{
+-  unsigned long n_zeros = 0;
+-  unsigned long n_ones = 0;
+-  unsigned long n_zeros_level0 = 0;
+-  unsigned long n_ones_level0 = 0;
+-
+-  typedef boct_tree<T_loc, bool > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  unsigned int finest_level=scene.finest_level();
+-
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    unsigned char *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)unsigned char[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-
+-    // init to zero
+-    for (unsigned char* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = (unsigned char)0.0;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, bool > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      unsigned char cell_val = (unsigned char)cells[i]->data()*255;
+-      if (cells[i]->data()) {
+-        n_ones++;
+-        if (cells[i]->get_code().level ==0)
+-          n_ones_level0++;
+-      }
+-      else {
+-        n_zeros++;
+-        if (cells[i]->get_code().level ==0)
+-          n_zeros_level0++;
+-      }
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-
+-        data[out_index] += (unsigned char)(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << filename << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    unsigned char* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      unsigned char v = *dp;
+-      vsl_b_write(os, (unsigned char)v);
+-    }
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-
+-  scene.unload_active_blocks();
+-
+-  assert(ncells > 0);
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  unsigned char* read_data = new (std::nothrow) unsigned char[row_data_size];
+-  if (read_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type= 0;
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read(reinterpret_cast<char*>(read_data), ncells*sizeof(unsigned char));
+-            os.write(reinterpret_cast<char*>(read_data),ncells*sizeof(unsigned char));
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] read_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-
+-  std::cout << "Number of true cells : " << n_ones << "\n Number of false cells: " << n_zeros << std::endl;
+-  std::cout << "Number of true cells at level 0 : " << n_ones_level0 << "\n Number of false cells at level 0: " << n_zeros_level0 << std::endl;
+-
+-  return;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                 std::string filename,
+-                                 unsigned int resolution_level)
+-{
+-  std::cout << " Using boxm_save_scene_raw_general\n";
+-  bsta_histogram<float> hist;
+-  boxm_compute_scene_statistics(&scene, hist);
+-  hist.pretty_print();
+-
+-  std::stringstream ss;
+-  ss << vul_file::strip_extension(filename) << "_hist_plot.txt" ;
+-  std::ofstream hist_arrays_ofs((ss.str()).c_str());
+-  hist.print_to_arrays(hist_arrays_ofs);
+-  hist_arrays_ofs.close();
+-
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  unsigned int finest_level=scene.finest_level();
+-
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    T_data *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)T_data[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-
+-    // init to zero
+-    for (T_data* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = (T_data)0.0;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      T_data cell_val = cells[i]->data();
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-
+-        data[out_index] += (T_data)(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << filename << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    T_data* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      T_data v = *dp;
+-      if (v > 19 || v < -1)
+-        std::cerr << "Error, v: " << v << '\n';
+-      vsl_b_write(os, (T_data)v);
+-    }
+-    std::cerr << " Data Correct ? " << '\n';
+-
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-
+-  scene.unload_active_blocks();
+-
+-  assert(ncells > 0);
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  T_data* read_data = new (std::nothrow) T_data[row_data_size];
+-  if (read_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type = boxm_dristhi_traits<T_data>::dristhi_header();
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read((char*)read_data, ncells*sizeof(T_data));
+-            os.write((char*)read_data,ncells*sizeof(T_data));
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] read_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-  return;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_save_scene_raw_general_to_byte(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                         std::string filename,
+-                                         unsigned int resolution_level)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  std::cout << " Using boxm_save_scene_raw_general_to_byte\n";
+-
+-  bsta_histogram<float> hist;
+-  boxm_compute_scene_statistics(&scene, hist);
+-
+-  // create an array for each block, and save in a binary file
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 0;
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  unsigned int finest_level=scene.finest_level();
+-
+-  // query the finest level of the tree and do not make the resolution
+-  // smaller than that
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    tree_type* tree = block->get_tree();
+-
+-    // get origin of block
+-    vgl_point_3d<double> min = block_bb.min_point();
+-
+-    ncells = 1 << (tree->root_level() - (int)resolution_level);
+-
+-    // assume that bounding box is a cube
+-    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-
+-    // origin should specify center of first cell
+-    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
+-
+-    int data_size = ncells*ncells*ncells;
+-    float *data = nullptr;
+-    std::cout << "Data Size=" << data_size << std::endl;
+-    data = new (std::nothrow)float[data_size];
+-
+-    if (data == nullptr) {
+-      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
+-      return;
+-    }
+-    // init to zero
+-    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
+-      *dp = 0.0f;
+-    }
+-
+-    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
+-    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
+-
+-    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++)
+-    {
+-      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
+-
+-      float cell_val = boxm_cell_to_float(cells[i], step_len);
+-
+-      unsigned int level = cells[i]->get_code().level;
+-      if (level == resolution_level) {
+-        // just copy value to output array
+-        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
+-        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
+-        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
+-
+-        if (out_index >= data_size)
+-          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-        else
+-          data[out_index] = cell_val;
+-      }
+-      else if (level > resolution_level) {
+-        // cell is bigger than output cells.  copy value to all contained output cells.
+-        const unsigned int us_factor = 1 << (level - resolution_level);
+-        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
+-        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
+-          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
+-            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
+-              //int out_index=x*y_size + y*ncells + z;
+-              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
+-              //////int out_index=z + y*ncells + x*ncells*ncells;
+-              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
+-
+-              if (out_index >= data_size)
+-                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
+-              else
+-                data[out_index] = cell_val;
+-            }
+-          }
+-        }
+-      }
+-      else {
+-        // cell is smaller than output cells. increment output cell value
+-        unsigned int ds_factor = 1 << (resolution_level - level);
+-        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
+-        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
+-        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
+-        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
+-        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
+-        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
+-        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
+-
+-        data[out_index] += float(cell_val*update_weight);
+-      }
+-    }
+-
+-    // write the data into a bin file, generate a file name
+-    std::stringstream strm;
+-    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
+-    std::string fn(strm.str());
+-    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
+-    if (!os.os().good()) {
+-      std::cerr << "error opening " << filename << " for write!\n";
+-      return;
+-    }
+-
+-    vsl_b_write(os, (unsigned int) ncells);  // x dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // y dimension
+-    vsl_b_write(os, (unsigned int) ncells);  // z dimension
+-
+-    T_data minv = hist.min();
+-    T_data maxv = hist.max();
+-    T_data rangev = maxv-minv;
+-
+-    float* dp = data;
+-    for (; dp < data + data_size; ++dp) {
+-      unsigned char c = (unsigned char)(std::floor((255.0f * float((*dp)-minv)/float(rangev)) + 0.5f));
+-      vsl_b_write(os, (char) c);
+-    }
+-    delete[] data;
+-    os.close();
+-    iter++;
+-  }
+-  assert(ncells > 0);
+-
+-  scene.unload_active_blocks();
+-
+-  // combine the blocks
+-  vgl_vector_3d<unsigned> dim = scene.world_dim();
+-  unsigned dimx = dim.x()*ncells;
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  // we will read the data a column at a time and this is enough
+-  int row_data_size = ncells;
+-  char* byte_data = new (std::nothrow) char[row_data_size];
+-  if (byte_data == nullptr) {
+-    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
+-    return;
+-  }
+-
+-  // open the binary files streams, saved earlier
+-  unsigned int nx,ny,nz;
+-  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
+-        vsl_b_read(*s, nx);
+-        vsl_b_read(*s, ny);
+-        vsl_b_read(*s, nz);
+-      }
+-    }
+-  }
+-
+-  // start writing the raw header
+-  unsigned char data_type = 0; // 0 means unsigned byte
+-  vxl_uint_32 nx_uint = dimx;
+-  vxl_uint_32 ny_uint = dimy;
+-  vxl_uint_32 nz_uint = dimz;
+-  std::ofstream os(filename.c_str(),std::ios::binary);
+-  if (!os.good()) {
+-    std::cerr << "error opening " << filename << " for write!\n";
+-    return;
+-  }
+-
+-  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
+-  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
+-  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
+-  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
+-
+-  // combine the column from streams to generate one raw file
+-  for (unsigned x=0; x<dim.x(); x++) {
+-    unsigned k=0;
+-    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        unsigned j=0;
+-        while (j < ncells*ncells*dim.z()) {
+-          for (unsigned z=dim.z();z>0; z--) {
+-            vsl_b_ifstream* s=streams(x,y,z-1);
+-            s->is().read(byte_data, ncells);
+-            os.write((char*)byte_data,ncells);
+-            j+=ncells;
+-            k+=ncells;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  os.close();
+-  delete[] byte_data;
+-
+-  // remove the intermediate bin files
+-  for (unsigned z=0; z<dim.z(); z++) {
+-    for (unsigned y=0; y<dim.y(); y++) {
+-      for (unsigned x=0; x<dim.x(); x++) {
+-        vsl_b_ifstream*& s = streams(x,y,z);
+-        s->close();
+-        std::stringstream strm;
+-        strm << filename << x << '_' << y << '_' << z << ".bin";
+-        std::string fn(strm.str());
+-        std::cout << "Deleting " << fn << std::endl;
+-        vpl_unlink(fn.data());
+-        delete s;
+-      }
+-    }
+-  }
+-  std::cout << "Volume Histogram\n";
+-  hist.pretty_print();
+-  return;
+-}
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h b/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
+deleted file mode 100644
+index bdfb1db979..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
++++ /dev/null
+@@ -1,97 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_scene_levels_utils.h
+-#ifndef boxm_scene_levels_utils_h
+-#define boxm_scene_levels_utils_h
+-//:
+-// \file
+-// \brief Functions to explore the levels of an octre
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Sep-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_data>
+-boxm_scene<boct_tree<short, bool> >* boxm_explore_cells_at_level(boxm_scene<boct_tree<short, T_data> > *scene_in, short level)
+-{
+-  //parameters and structure of the output scene are the same as those of the input scene
+-  boxm_scene<boct_tree<short, bool> > *scene_out = new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-  scene_out->set_paths(scene_in->path(), "level");
+-  scene_out->set_appearance_model(BOXM_BOOL);
+-  scene_out->write_scene("level.xml");
+-
+-  scene_in->template clone_blocks_to_type<boct_tree<short, bool> >(*scene_out, false);
+-
+-  //iterate through the leaf cells
+-  boxm_cell_iterator<boct_tree<short, T_data> > it_in =
+-    scene_in->cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block, true);
+-  boxm_cell_iterator<boct_tree<short, bool> > it_out =
+-    scene_out->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
+-
+-  for (it_in.begin(), it_out.begin(); !it_in.end() && !it_out.end(); ++it_in, ++it_out)
+-  {
+-    boct_tree_cell<short,T_data > *cell_in = *it_in;
+-    boct_tree_cell<short,bool > *cell_out = *it_out;
+-
+-    //check for level
+-    if ((cell_in->level() == level)) {
+-      cell_out->set_data(true);
+-    }
+-  }
+-
+-  scene_in->unload_active_blocks();
+-  scene_out->unload_active_blocks();
+-
+-  return scene_out;
+-}
+-
+-
+-template <class T_data>
+-void boxm_remove_level_0_leaves(boxm_scene<boct_tree<short, T_data> > *scene_in)
+-{
+-  typedef boct_tree<short,T_data> tree_type;
+-
+-  //Iterate through the blocks
+-  boxm_block_iterator<tree_type> it_in = scene_in->iterator();
+-  for (it_in.begin(); !it_in.end(); ++it_in)
+-  {
+-    scene_in->load_block(it_in.index());
+-    tree_type *tree_in= (*it_in)->get_tree();
+-
+-    std::vector<boct_tree_cell<short, T_data> * > all_cells =  tree_in->all_cells();
+-    typename std::vector<boct_tree_cell<short, T_data> * >::iterator cells_it = all_cells.begin();
+-
+-    for (; cells_it!=all_cells.end(); cells_it++) {
+-      boct_tree_cell<short, T_data> * cell_in = *cells_it;
+-      //check for level
+-      short level = cell_in->level();
+-      if (level == 0) {
+-        cell_in = nullptr;
+-      }
+-      else {
+-        if (level == 1)
+-          cell_in->set_children_null();
+-        //shift loccode one space to the rigth
+-        boct_loc_code<short> shift_code;
+-        shift_code.set_code(cell_in->get_code().x_loc_ >> 1, cell_in->get_code().y_loc_ >> 1, cell_in->get_code().z_loc_ >> 1);
+-        shift_code.set_level(level - 1);
+-        cell_in->set_code(shift_code);
+-      }
+-    }
+-
+-    tree_in->reset_num_levels(tree_in->number_levels() - 1);
+-    scene_in->write_active_block();
+-    std::cout << '.';
+-  }
+-  std::cout << "\nCleaning\n";
+-  scene_in->unload_active_blocks();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h b/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
+deleted file mode 100644
+index eb982606db..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
++++ /dev/null
+@@ -1,105 +0,0 @@
+-// This is brl/bseg/boxm/algo/boxm_split_sample.h
+-#ifndef boxm_split_sample_h
+-#define boxm_split_sample_h
+-//:
+-// \file
+-// \brief  A class enclosing set of functions to split a boxm_sample scenes/trees into appearance and occupancy scenes/trees
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  December 3, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<boxm_apm_type APM_MODEL>
+-class boxm_split_sample
+-{
+- public:
+-  typedef boct_tree<short, boxm_sample<APM_MODEL> > sample_tree_type;
+-  typedef boct_tree_cell<short, boxm_sample<APM_MODEL> > sample_cell_type;
+-
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
+-  typedef boct_tree<short, apm_datatype> apm_tree_type;
+-  typedef boct_tree_cell<short, apm_datatype> apm_cell_type;
+-
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype alpha_datatype;
+-  typedef boct_tree<short, alpha_datatype> alpha_tree_type;
+-  typedef boct_tree_cell<short, alpha_datatype> alpha_cell_type;
+-
+-  //: A function to split an boxm_sample scene, into an appearance and an occupancy scene
+-  void split_scene(boxm_scene<sample_tree_type> &scene_in, boxm_scene<apm_tree_type> &apm_scene, boxm_scene<alpha_tree_type > &alpha_scene);
+-
+-  //: A function to split an boxm_sample tree, into an appearance and an occupancy tree
+-  void split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree);
+-};
+-
+-
+-//: A function to split an boxm_sample scene, into an appearance and an occupancy scene
+-template<boxm_apm_type APM_MODEL>
+-void boxm_split_sample<APM_MODEL>::split_scene(boxm_scene<sample_tree_type> &scene_in,
+-                                               boxm_scene<apm_tree_type> &apm_scene,
+-                                               boxm_scene<alpha_tree_type > &alpha_scene)
+-{
+-  //missing:check that dimensions of all scenes agree
+-
+-  //iterate through blocks in the scenes
+-  boxm_block_iterator<sample_tree_type> iter_in = scene_in.iterator();
+-  boxm_block_iterator<apm_tree_type> apm_iter = apm_scene.iterator();
+-  boxm_block_iterator<alpha_tree_type> alpha_iter = alpha_scene.iterator();
+-
+-  iter_in.begin();
+-  apm_iter.begin();
+-  alpha_iter.begin();
+-  while (!iter_in.end() || !apm_iter.end() ||!alpha_iter.end())
+-  {
+-    scene_in.load_block(iter_in.index());
+-    apm_scene.load_block(apm_iter.index());
+-    alpha_scene.load_block(alpha_iter.index());
+-
+-    sample_tree_type *tree_in= (*iter_in)->get_tree();
+-    apm_tree_type *apm_tree = tree_in->template clone_to_type<apm_datatype>();
+-    alpha_tree_type *alpha_tree = tree_in->template clone_to_type<alpha_datatype>();
+-    this->split_tree(tree_in, apm_tree,alpha_tree);
+-    (*apm_iter)->init_tree(apm_tree);
+-    (*alpha_iter)->init_tree(alpha_tree);
+-    apm_scene.write_active_block();
+-    alpha_scene.write_active_block();
+-
+-    iter_in++; apm_iter++; alpha_iter++;
+-  }
+-}
+-
+-
+-//: A function to split an boxm_sample tree, into an appearance and an occupancy tree
+-template<boxm_apm_type APM_MODEL>
+-void boxm_split_sample<APM_MODEL>::split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree)
+-{
+-  //iterate through the trees
+-  std::vector<sample_cell_type*> sample_cells = tree_in->all_cells();
+-  std::vector<apm_cell_type*> apm_cells = apm_tree->all_cells();
+-  std::vector<alpha_cell_type*> alpha_cells = alpha_tree->all_cells();
+-
+-  if (sample_cells.size()!=apm_cells.size() || apm_cells.size()!=alpha_cells.size()){
+-    std::cerr << "Different size vectors in split_sample_scene::split_tree\n";
+-    return;
+-  }
+-
+-  for (unsigned i = 0; i < sample_cells.size(); i++)
+-  {
+-    boxm_sample<APM_MODEL> sample = sample_cells[i]->data();
+-    apm_cells[i]->set_data(sample.appearance_);
+-    alpha_cells[i]->set_data(sample.alpha);
+-  }
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
+deleted file mode 100644
+index 63fe2ff02b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
++++ /dev/null
+@@ -1,156 +0,0 @@
+-#ifndef boxm_render_mesh_h_
+-#define boxm_render_mesh_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <imesh/imesh_mesh.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-void boxm_upload_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
+-                                 imesh_mesh& mesh, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  imesh_face_array_base& fs = mesh.faces();
+-  for (unsigned i=0; i < fs.size(); ++i)
+-  {
+-    std::list<vgl_point_3d<double> > v_list;
+-    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
+-    vgl_box_3d<double> bb_scale, bb_global;
+-    for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-      unsigned int v_id = fs(i,j);
+-      vgl_point_3d<double> v;
+-      if (use_lvcs) {
+-        double lx, ly, lz;
+-        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                             vpgl_lvcs::wgs84,lx,ly,lz);
+-        v=vgl_point_3d<double>(lx,ly,lz);
+-      }
+-      else
+-        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-      bb_global.add(v);
+-      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-      v.set(diff.x(), diff.y(), diff.z());
+-      // the local coordinates inside the box region
+-      v_list.push_back(v);
+-      //convert the values into [0,1] range
+-      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-      bb_scale.add(v);
+-    }
+-    // check if polygon's bounding box intersects with the block
+-    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
+-    if (inters.is_empty())
+-      return;
+-
+-    // locate the polygon bounding box in tree
+-    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
+-    if (region) {
+-      // test all the children for intersection
+-      std::vector<boct_tree_cell<T_loc,T_data>*> children;
+-      if (!region->is_leaf())
+-        region->leaf_children(children);
+-      else // insert the node itself, if no children
+-        children.push_back(region);
+-      for (unsigned i=0; i<children.size(); i++) {
+-        boct_tree_cell<T_loc,T_data>* cell=children[i];
+-        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
+-        if (vgl_intersection<double>(cell_bb, v_list)) {
+-          cell->set_data(val);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
+-template <>
+-void boxm_upload_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
+-                                 imesh_mesh& mesh, vpgl_lvcs& lvcs,
+-                                 bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
+-{
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  tree_type* tree = block->get_tree();
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  imesh_face_array_base& fs = mesh.faces();
+-  for (unsigned i=0; i < fs.size(); ++i)
+-  {
+-    std::list<vgl_point_3d<double> > v_list;
+-    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
+-    vgl_box_3d<double> bb_scale, bb_global;
+-    for (unsigned j=0; j<fs.num_verts(i); ++j) {
+-      unsigned int v_id = fs(i,j);
+-      vgl_point_3d<double> v;
+-      if (use_lvcs) {
+-        double lx, ly, lz;
+-        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
+-                             vpgl_lvcs::wgs84,lx,ly,lz);
+-        v=vgl_point_3d<double>(lx,ly,lz);
+-      }
+-      else
+-        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
+-      bb_global.add(v);
+-      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
+-      v.set(diff.x(), diff.y(), diff.z());
+-      // the local coordinates inside the box region
+-      v_list.push_back(v);
+-      //convert the values into [0,1] range
+-      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
+-      bb_scale.add(v);
+-    }
+-    // check if polygon's bounding box intersects with the block
+-    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,0.999,0.999,0.999), bb_scale);
+-    if (inters.is_empty())
+-      return;
+-
+-    // locate the polygon bounding box in tree
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
+-    if (region) {
+-      // test all the children for intersection
+-      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
+-      if (!region->is_leaf())
+-        region->leaf_children(children);
+-      else // insert the node itself, if no children
+-        children.push_back(region);
+-      for (auto cell : children) {
+-        vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
+-        if (vgl_intersection<double>(cell_bb, v_list)) {
+-          boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
+-          tempdata.set_appearance(val.appearance());
+-          tempdata.alpha*=val.alpha;
+-          cell->set_data(tempdata);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-//: calls all the blocks for drawing meshes
+-template <class T_loc, class T_data>
+-void boxm_upload_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                 imesh_mesh& mesh, bool use_lvcs, T_data val)
+-{
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  vpgl_lvcs lvcs=scene.lvcs();
+-  boxm_block_iterator<tree_type> iter(&scene);
+-  mesh.compute_face_normals(true);
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boxm_upload_mesh_into_block(block, mesh, lvcs, use_lvcs, val);
+-    scene.write_active_block();
+-  }
+-}
+-
+-#endif // boxm_render_mesh_h_
+diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+deleted file mode 100644
+index 2a41c2db1a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,40 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and bvxm_pro depends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-FIND_PACKAGE(RPLY REQUIRED)
+-if(RPLY_FOUND)
+-  include_directories( ${RPLY_INCLUDE_DIR} )
+-else()
+-  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
+-endif()
+-
+-  set(boxm_algo_pro_sources
+-      boxm_algo_processes.h
+-      boxm_algo_register.h   boxm_algo_register.cxx
+-  )
+-
+-  #aux_source_directory(Templates boxm_algo_pro_sources)
+-  aux_source_directory(processes boxm_algo_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_algo_pro LIBRARY_SOURCES ${boxm_algo_pro_sources} )
+-
+-  target_link_libraries(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil vsol ${VXL_LIB_PREFIX}vgl brip ${VXL_LIB_PREFIX}vcl rply)
+-  # Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
+-  # Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
+-  # Need vil_pro  only for the instantiation of brdb_value_t<vil_smart_ptr<vil_image_view_base> >
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
+deleted file mode 100644
+index f22427eeed..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
++++ /dev/null
+@@ -1,28 +0,0 @@
+-#ifndef boxm_algo_processes_h_
+-#define boxm_algo_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_describe_scene_process);
+-DECLARE_FUNC_CONS(boxm_init_scene_process);
+-DECLARE_FUNC_CONS(boxm_line_backproject_process);
+-DECLARE_FUNC_CONS(boxm_refine_scene_process);
+-DECLARE_FUNC_CONS(boxm_replace_const_app_process);
+-DECLARE_FUNC_CONS(boxm_roi_init_process);
+-DECLARE_FUNC_CONS(boxm_roi_init_rational_camera_process);
+-DECLARE_FUNC_CONS(boxm_save_occupancy_raw_process);
+-DECLARE_FUNC_CONS(boxm_save_scene_raw_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
+-DECLARE_FUNC_CONS(boxm_merge_mixtures_process);
+-DECLARE_FUNC_CONS(boxm_split_scene_process);
+-DECLARE_FUNC_CONS(boxm_compute_scene_difference_process);
+-DECLARE_FUNC_CONS(boxm_compute_entropy_process);
+-DECLARE_FUNC_CONS(boxm_compute_expected_color_scene_process);
+-DECLARE_FUNC_CONS(boxm_linear_combination_process);
+-DECLARE_FUNC_CONS(boxm_explore_cells_at_level_process);
+-DECLARE_FUNC_CONS(boxm_fill_internal_cells_process);
+-DECLARE_FUNC_CONS(boxm_remove_level0_process);
+-DECLARE_FUNC_CONS(boxm_create_scene_from_ply_process);
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
+deleted file mode 100644
+index b883c164fa..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
++++ /dev/null
+@@ -1,35 +0,0 @@
+-#include "boxm_algo_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "boxm_algo_processes.h"
+-
+-void boxm_algo_register::register_datatype()
+-{
+-}
+-
+-void boxm_algo_register::register_process()
+-{
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_describe_scene_process,"boxmDescribeSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_init_scene_process,"boxmInitSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process,"boxmLineBackprojectProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_refine_scene_process, "boxmRefineSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_replace_const_app_process,"boxmReplaceConstAppProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_process, "boxmROIInitProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_rational_camera_process, "boxmROIInitRationalCameraProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_occupancy_raw_process, "boxmSaveOccupancyRawProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_scene_raw_process, "boxmSaveSceneRawProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_vrml_process, "boxmRenderExpectedEdgeVRMLProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_merge_mixtures_process, "boxmMergeMixturesProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_split_scene_process ,"boxmSplitSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_scene_difference_process, "boxmComputeSceneDifferenceProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_entropy_process, "boxmComputeEntropyProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_expected_color_scene_process, "boxmComputeExpectedColorSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_linear_combination_process, "boxmLinearCombinationProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_explore_cells_at_level_process, "boxmExploreCellsAtLevelProcess");
+-  REG_PROCESS_FUNC_CONS2(boxm_fill_internal_cells_process);
+-  REG_PROCESS_FUNC_CONS2(boxm_remove_level0_process);
+-  REG_PROCESS_FUNC_CONS2(boxm_create_scene_from_ply_process);
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
+deleted file mode 100644
+index 3c21937894..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_algo_register_h_
+-#define boxm_algo_register_h_
+-
+-class boxm_algo_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_algo_register_h_
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
+deleted file mode 100644
+index 1b8cf32459..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-//:
+-// \file
+-// \brief A process that outputs the differential entropy of the gaussian stored at every leave cell
+-// \author Isabel Restrepo
+-// \date 15-Nov-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/algo/boxm_merge_mog.h>
+-
+-
+-//:global variables
+-namespace boxm_compute_entropy_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_compute_entropy_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_entropy_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_compute_entropy_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_entropy_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef boct_tree<short, gauss_type> gauss_tree_type;
+-
+-  auto *gauss_scene = dynamic_cast<boxm_scene<gauss_tree_type>* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!gauss_scene) {
+-    std::cout <<  " :-- Scene is not of valid type!\n";
+-    return false;
+-  }
+-
+-  //parameters and structure of the output scene are the same as those of the input scene
+-  boxm_scene<boct_tree<short, float> > *entropy_scene = new boxm_scene<boct_tree<short, float> >(gauss_scene->lvcs(), gauss_scene->origin(), gauss_scene->block_dim(), gauss_scene->world_dim(), gauss_scene->max_level(), gauss_scene->init_level());
+-  entropy_scene->set_paths(gauss_scene->path(), "entropy");
+-  entropy_scene->set_appearance_model(BOXM_FLOAT);
+-
+-  compute_differential_entropy(*gauss_scene, *entropy_scene);
+-  gauss_scene->write_scene("entropy_scene.xml");
+-  pro.set_output_val<boxm_scene_base_sptr>(0, entropy_scene);
+-  std::cout<<"Exiting" << std::endl;
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
+deleted file mode 100644
+index e99f978d28..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-//:
+-// \file
+-// \brief A process that computes the "expected visible color"  at each voxel
+-// \author Isabel Restrepo
+-// \date 17-Nov-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/algo/boxm_merge_mog.h>
+-
+-
+-//:global variables
+-namespace boxm_compute_expected_color_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_compute_expected_color_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_expected_color_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float"; //offset for appearance values
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_compute_expected_color_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_expected_color_scene_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  auto grey_offset = pro.get_input<float>(1);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
+-
+-  auto *scene = dynamic_cast<boxm_scene<scene_tree_type>* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!scene) {
+-    std::cout <<  " :-- Scene is not of valid type!\n";
+-    return false;
+-  }
+-
+-  //parameters and structure of the output scene are the same as those of the input scene
+-  boxm_scene<boct_tree<short, float> > *mean_color_scene = new boxm_scene<boct_tree<short, float> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  mean_color_scene->set_paths(scene->path(), "mean_color");
+-  mean_color_scene->set_appearance_model(BOXM_FLOAT);
+-
+-  compute_expected_color(*scene, *mean_color_scene, grey_offset);
+-  mean_color_scene->write_scene("mean_color_scene.xml");
+-  pro.set_output_val<boxm_scene_base_sptr>(0, mean_color_scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
+deleted file mode 100644
+index f7efed8c52..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
++++ /dev/null
+@@ -1,91 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
+-
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for computing the difference between two scenes.
+-//
+-// \author Vishal Jain
+-// \date Sept 8, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_parser.h>
+-#include <boxm/algo/boxm_compute_scene_difference.h>
+-
+-//: global variables
+-namespace boxm_compute_scene_difference_process_globals
+-{
+-  //this process takes no outputs
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: sets input and output types
+-bool boxm_compute_scene_difference_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_scene_difference_process_globals;
+-
+-  // process takes 1 input and no outputs
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "boxm_scene_base_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "float";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//: creates a scene from parameters
+-bool boxm_compute_scene_difference_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_compute_scene_difference_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_compute_scene_difference_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene1_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr scene2_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr sceneout_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto t = pro.get_input<float>(i++);
+-
+-  if (scene1_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
+-      scene2_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
+-      sceneout_ptr->appearence_model() == BOXM_APM_MOG_GREY )
+-  {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *scene1 = static_cast<boxm_scene<tree_type>*> (scene1_ptr.as_pointer());
+-      auto *scene2 = static_cast<boxm_scene<tree_type>*> (scene2_ptr.as_pointer());
+-      auto *sceneout = static_cast<boxm_scene<tree_type>*> (sceneout_ptr.as_pointer());
+-
+-    boxm_compute_scene_difference(*scene1,*scene2,*sceneout,t);
+-  }
+-  else {
+-    std::cout << "boxm_compute_scene_difference_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
+deleted file mode 100644
+index fdf40edf0e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
++++ /dev/null
+@@ -1,257 +0,0 @@
+-//:
+-// \file
+-// \brief A process that creates a boxm scene from a .ply file
+-// \author Isabel Restrepo
+-// \date 2-Jan-2012
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <rply.h>   //.ply parser
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boct/util/boct_construct_tree.h>
+-#define DEBUG_PLY
+-
+-class boxm_vgl_point_3d_coord_compare
+-{
+- public:
+-  boxm_vgl_point_3d_coord_compare() = default;
+-  ~boxm_vgl_point_3d_coord_compare() = default;
+-
+-  bool operator() ( vgl_point_3d<int> const& pa, vgl_point_3d<int> pb ) const
+-  {
+-    if      ( pa.x() != pb.x() ) return pa.x() < pb.x();
+-    else if ( pa.y() != pb.y() ) return pa.y() < pb.y();
+-    else                         return pa.z() < pb.z();
+-  }
+-};
+-
+-
+-class boxm_apperace_fileio_parsed_ply_
+-{
+- public:
+-  double p[3];  //holds location
+-  unsigned char color; //holds color
+-  double grey_offset; //offset the floating point (0,1) color value
+-  //accumulated data in the shape of leaf cells
+-  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
+-  boxm_scene<boct_tree<short, float> > *scene;
+-};
+-
+-bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
+-                         std::map<vgl_point_3d<int>,
+-                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
+-                         const float &grey_offset);
+-
+-//: Call-back function for a "vertex" element
+-int boxm_plyio_vertex_cb_(p_ply_argument argument);
+-
+-//: global variables
+-namespace boxm_create_scene_from_ply_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool boxm_create_scene_from_ply_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_from_ply_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; //path to .ply file
+-  input_types_[1] = "boxm_scene_base_sptr"; //the scene to fill up
+-  input_types_[2] = "float"; //offset for appearance values
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool boxm_create_scene_from_ply_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_from_ply_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  std::string ply_file = pro.get_input<std::string>(0);
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(1);
+-  auto grey_offset = pro.get_input<float>(2);
+-
+-  // Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-  // cast input scene
+-  auto *scene = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  // Map to hold the index of block and the cell containing appearance (0,1)
+-  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
+-
+-  boxm_block_iterator<boct_tree<short, float> > block_iter = scene->iterator();
+-
+-  for (block_iter.begin(); !block_iter.end(); ++block_iter)
+-  {
+-    data[block_iter.index()]= std::vector<boct_tree_cell<short, float> >();
+-  }
+-
+-  if (!boxm_load_color_ply(ply_file, scene, data, grey_offset)){
+-    pro.set_output_val<boxm_scene_base_sptr>(0, nullptr);
+-    return false;
+-  }
+-
+-
+-  //construct trees
+-  for (block_iter.begin(); !block_iter.end(); ++block_iter)
+-  {
+-    std::cout << "In block: " << block_iter.index() << "Number of leaves: " <<data[block_iter.index()].size() << std::endl;
+-    boct_tree_cell<short, float>* root = boct_construct_tree(data[block_iter.index()], scene->max_level(), 0.0f );
+-    auto* tree = new boct_tree<short,float>(root,  scene->max_level());
+-    vgl_box_3d<double> tree_bbox= scene->get_block_bbox(block_iter.index());
+-    tree->set_bbox(tree_bbox);
+-
+-    scene->load_block(block_iter.index());
+-    (*block_iter)->init_tree(tree);
+-    scene->write_active_block();
+-    data[block_iter.index()].clear();
+-  }
+-
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
+-
+-  return true;
+-}
+-
+-
+-// ============================== PLY ==============================
+-
+-
+-bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
+-                         std::map<vgl_point_3d<int>,
+-                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
+-                         const float &grey_offset)
+-{
+-  long nvertices;
+-
+-  boxm_apperace_fileio_parsed_ply_ parsed_ply;
+-  parsed_ply.grey_offset = grey_offset;
+-  parsed_ply.data = data;
+-  parsed_ply.scene = scene;
+-
+-
+-  // OPEN file
+-#ifdef DEBUG_PLY
+-  std::cerr << " loading " << ply_file << " :\n";
+-  std::cerr << " gray_offset " << parsed_ply.grey_offset << grey_offset << " :\n";
+-
+-#endif
+-
+-  p_ply ply = ply_open(ply_file.c_str(), nullptr, 0, nullptr);
+-  if (!ply){
+-    std::cerr << "Couldn't open ply file: " << ply_file << '\n';
+-    return false;
+-  }
+-
+-  // Read HEADER
+-  if (!ply_read_header(ply)) return false;
+-
+-  // vertex
+-  nvertices =
+-  ply_set_read_cb(ply, "vertex", "x",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 0);
+-  ply_set_read_cb(ply, "vertex", "y",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 1);
+-  ply_set_read_cb(ply, "vertex", "z",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 2);
+-  ply_set_read_cb(ply, "vertex", "diffuse_red",
+-                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 3);
+-
+-#ifdef DEBUG_PLY
+-  std::cerr << nvertices << " points\n";
+-#endif
+-
+-  // Read DATA
+-  if (!ply_read(ply)) return false;
+-
+-  // CLOSE file
+-  ply_close(ply);
+-
+-  data=parsed_ply.data;
+-
+-#ifdef DEBUG_PLY
+-  std::cerr << "  done.\n";
+-#endif
+-
+-  return true;
+-}
+-
+-
+-//: Call-back function for a "vertex" element
+-int boxm_plyio_vertex_cb_(p_ply_argument argument)
+-{
+-  long index;
+-  void* temp;
+-  ply_get_argument_user_data(argument, &temp, &index);
+-
+-  auto* parsed_ply =  (boxm_apperace_fileio_parsed_ply_*) temp;
+-  //std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
+-
+-  switch (index)
+-  {
+-    case 0: // "x" coordinate
+-      parsed_ply->p[0] = ply_get_argument_value(argument);
+-      break;
+-    case 1: // "y" coordinate
+-      parsed_ply->p[1] = ply_get_argument_value(argument);
+-      break;
+-    case 2: // "z" coordinate
+-      parsed_ply->p[2] = ply_get_argument_value(argument);
+-      break;
+-    case 3:
+-    {
+-      parsed_ply->color = (unsigned char)ply_get_argument_value(argument);
+-      //insert data
+-      vgl_point_3d<int> block_index(-1,-1,-1);
+-      if (parsed_ply->scene->get_block_index(vgl_point_3d<double>(parsed_ply->p), block_index))
+-      {
+-        //convert point into local(tree coordinates)
+-        vgl_box_3d<double> global_bbox= parsed_ply->scene->get_block_bbox(block_index);
+-        vgl_point_3d<double> norm_p((parsed_ply->p[0]-global_bbox.min_x())/global_bbox.width(),
+-                                    (parsed_ply->p[1]-global_bbox.min_y())/global_bbox.height(),
+-                                    (parsed_ply->p[2]-global_bbox.min_z())/global_bbox.depth());
+-        // convert point to location code.
+-        boct_loc_code<short> loc_code(norm_p, parsed_ply->scene->max_level()-1);
+-        boct_tree_cell<short, float> leaf_cell(loc_code);
+-        float expected_color = float(parsed_ply->color)/255.0f + float(parsed_ply->grey_offset);
+-        if (expected_color > 2.0f || expected_color < 0.0f)
+-          std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
+-        leaf_cell.set_data(expected_color);
+-        parsed_ply->data[block_index].push_back(leaf_cell);
+-      }
+-      break;
+-    }
+-    default:
+-      assert(!"This should not happen: index out of range");
+-      break;
+-  }
+-  return 1;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
+deleted file mode 100644
+index 2fb47d460f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
++++ /dev/null
+@@ -1,106 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A process for describing the attributes of a scene
+-//
+-// \author J.L. Mundy
+-// \date January 24, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <bsta/bsta_histogram_sptr.h>
+-
+-namespace boxm_describe_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 4;
+-}
+-
+-bool boxm_describe_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_describe_scene_process_globals;
+-
+-  //process takes 1 input
+-  //input[0]: scene binary file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  // process has 4 outputs:
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "bsta_histogram_sptr"; // Omega Histogram
+-  output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
+-  output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
+-  output_types_[3] = "unsigned";            // Number of leaves
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-// This process produces four outputs
+-//  1) The distribution of "Omega" values where Omega = 1-e^( alpha x length )
+-//  2) The distribution of "Sigma" values where Sigma is the std_dev of
+-//     the appearance model. (currently implemented only for simple grey)
+-//  3) The histogram of levels for leaves in the octree
+-//  4) The number of leaves in the tree
+-//
+-bool boxm_describe_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_describe_scene_process_globals;
+-
+-  if ( !pro.verify_inputs() ) {
+-    std::cerr << pro.name() << ": invalid inputs\n";
+-    return false;
+-  }
+-  unsigned n_leaves = 0;
+-  //assign tree type
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      std::cerr<<"boxm_describe_scene_process not yet implemented for Gaussian mixture\n";
+-      return false;//not implemented
+-    }
+-    else
+-    {
+-      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/Gaussian mixture\n";
+-      return false;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
+-  {
+-    if (!scene_ptr->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
+-
+-      bsta_histogram<float> omega_hist, sigma_hist, level_hist;
+-      if (!compute_scene_statistics(*scene, omega_hist, sigma_hist,
+-                                    level_hist, n_leaves))
+-        return false;
+-      std::cout << "Omega Hist\n";
+-      omega_hist.print_vals_prob();
+-      std::cout << "Sigma Hist\n";
+-      sigma_hist.print_vals_prob();
+-      std::cout << "Level Hist\n";
+-      level_hist.print_vals_prob();
+-      std::cout << "Number of Leaves " << n_leaves << '\n';
+-      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(omega_hist));
+-      pro.set_output_val<bsta_histogram_sptr>(1, new bsta_histogram<float>(sigma_hist));
+-      pro.set_output_val<bsta_histogram_sptr>(2, new bsta_histogram<float>(level_hist));
+-      pro.set_output_val<unsigned>(3, n_leaves);
+-    }
+-    else {
+-      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/simple_grey\n";
+-      return false;
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
+deleted file mode 100644
+index 1dfc74a8ee..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \brief A process to label cells at a given leve
+-// \author Isabel Restrepo
+-// \date 15-Sep-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-
+-
+-//:global variables
+-namespace boxm_explore_cells_at_level_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_explore_cells_at_level_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_explore_cells_at_level_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr"; //scene in
+-  input_types_[1] = "unsigned"; //octree level
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr"; //label scene
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_explore_cells_at_level_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_explore_cells_at_level_process_globals;
+-
+-  //get inputs
+-  boxm_scene_base_sptr scene_in_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  auto level = pro.get_input<unsigned>(1);
+-
+-  if (scene_in_base->appearence_model() == BOXM_FLOAT)
+-  {
+-    typedef boct_tree<short, float > type;
+-
+-    auto* scene = dynamic_cast<boxm_scene<type>*>(scene_in_base.as_pointer());
+-
+-    if (!scene)
+-      return false;
+-
+-    //store output
+-    pro.set_output_val<boxm_scene_base_sptr>(0, boxm_explore_cells_at_level(scene,level));
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
+deleted file mode 100644
+index c222d74cd7..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
+-//:
+-// \file
+-// \brief process fills the internal cells of the octrees in the scene
+-//
+-// \author Isabel Restrepo
+-// \date December 3, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <boxm/algo/boxm_fill_internal_cells.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace boxm_fill_internal_cells_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 1 input and 1 output.
+-// input[0]: The input scene
+-// output[0]: The output scene
+-
+-bool boxm_fill_internal_cells_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_fill_internal_cells_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_fill_internal_cells_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_fill_internal_cells_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
+-  {
+-    boxm_fill_internal_cells<float> filler;
+-    pro.set_output_val<boxm_scene_base_sptr>(0, filler.traverse_and_fill(scene_in));
+-    return true;
+-  }
+-
+-  std::cerr << "In boxm_fill_internal_cells_process: Unsupportted scene type\n";
+-  return false;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
+deleted file mode 100644
+index e023ca2500..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
++++ /dev/null
+@@ -1,111 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
+-
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for initializing a new boxm_scene when there is not a saved one.
+-//        It receives the parameters from a parameter file in XML
+-//
+-// \author Vishal Jain
+-// \date Feb 8, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene_parser.h>
+-#include <boxm/algo/boxm_init_scene.h>
+-
+-//: global variables
+-namespace boxm_init_scene_process_globals
+-{
+-  //this process takes no outputs
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: sets input and output types
+-bool boxm_init_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_init_scene_process_globals;
+-
+-  // process takes 1 input and no outputs
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//: creates a scene from parameters
+-bool boxm_init_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_init_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_init_scene_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_init_scene_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_init_scene<BOXM_APM_MOG_GREY>(*s);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_init_scene<BOXM_APM_SIMPLE_GREY>(*s);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_init_scene<BOXM_APM_MOB_GREY >(*s);
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_init_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
+deleted file mode 100644
+index b8767b24bc..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
++++ /dev/null
+@@ -1,259 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
+-#include <iostream>
+-#include <cstdio>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for computing the backprojection of lines.
+-//         Lines are represented as an image with 3 plane images (plane 0=a, plane1=b,
+-//         plane2=c, line is defined as ax+by=c). The backprojection, which is a plane
+-//         is stored as an other image with 4 planes (ax+by+cz=d) as the output.
+-//
+-// \author Gamze Tunali
+-// \date   Feb 4, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <vpgl/vpgl_proj_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-#include <vpgl/algo/vpgl_ray.h>
+-
+-#include <vgl/vgl_plane_3d.h>
+-
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: globals
+-namespace boxm_line_backproject_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: set input and output types
+-// process takes 2 inputs and has 1 output:
+-// input[0]: The edge image (vil_image_view<float> with three planes for (a,b,c))
+-// input[1]: camera
+-// output[0]: The plane image
+-bool boxm_line_backproject_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_line_backproject_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  input_types_[i++] = "vpgl_camera_double_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j = 0;
+-  output_types_[j++] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-vpgl_rational_camera<double>
+-perspective_to_rational(vpgl_perspective_camera<double>&cam_pers)
+-{
+-  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
+-  std::vector<double> neu_u,den_u,neu_v,den_v;
+-  double x_scale = 1.0, x_off = 0.0, y_scale = 1.0, y_off = 0.0, z_scale = 1.0, z_off = 0.0, u_scale = 1.0, u_off = 0.0, v_scale = 1.0, v_off = 0.0;
+-
+-  for (int i=0; i<20; i++) {
+-    neu_u.push_back(0.0);
+-    neu_v.push_back(0.0);
+-    den_u.push_back(0.0);
+-    den_v.push_back(0.0);
+-  }
+-
+-  int vector_map[] = {9,15,18,19};
+-
+-  for (int i=0; i<4; i++) {
+-    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
+-    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
+-    den_u[vector_map[i]] = cam_pers_matrix(2,i);
+-    den_v[vector_map[i]] = cam_pers_matrix(2,i);
+-  }
+-
+-  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
+-                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
+-                                       u_scale,u_off,v_scale,v_off);
+-  return cam_rat;
+-}
+-
+-//: optimizes rpc camera parameters based on edges
+-bool boxm_line_backproject_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_line_backproject_process_globals;
+-
+-  // check number of inputs
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The number of inputs should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  unsigned i = 0;
+-
+-  // image
+-  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-
+-  // make sure that image has 3 planes
+-  if (edge_image_sptr->nplanes() != 3) {
+-    std::cerr << "boxm_line_backproject_process: The edge image is expected to have 3 planes!\n";
+-    return false;
+-  }
+-
+-  vil_image_view<float> *plane_image;
+-  if (edge_image_sptr->pixel_format() == VIL_PIXEL_FORMAT_FLOAT) {
+-    vil_image_view<float> edge_image(edge_image_sptr);
+-    unsigned ni=edge_image.ni();
+-    unsigned nj=edge_image.nj();
+-
+-    // the output image
+-    plane_image = new vil_image_view<float>(ni,nj,4);
+-    float col, row, theta;
+-
+-    if (camera->type_name() == "vpgl_proj_camera") {
+-      auto* cam = dynamic_cast<vpgl_proj_camera<double>*>(camera.ptr());
+-
+-      for (unsigned i=0; i<ni; i++) {
+-        for (unsigned j=0; j<nj; j++) {
+-          col =edge_image(i,j,0); // sub-pixel column
+-          row =edge_image(i,j,1); // sub_pixel row
+-          theta=edge_image(i,j,2); // orientation in radians
+-
+-          if (col<0 || row<0) // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
+-            (*plane_image)(i,j) = 0.0f;
+-          else {
+-            // get two points on the line
+-            vgl_point_2d<double> p1(col,row);
+-
+-            float x = col + 0.5f*std::cos(theta);
+-            float y = row + 0.5f*std::sin(theta);
+-            vgl_point_2d<double> p2(x,y);
+-
+-            vgl_line_2d<double> line(p1,p2);
+-
+-            //create a line and backproject it
+-            vgl_homg_line_2d<double> image_line(line);
+-            vgl_homg_plane_3d<double> plane = cam->backproject(image_line);
+-            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
+-            std::cout << "ZERO a,b,c,d" << std::endl;
+-            (*plane_image)(i,j,0)=float(plane.a());
+-            (*plane_image)(i,j,1)=float(plane.b());
+-            (*plane_image)(i,j,2)=float(plane.c());
+-            (*plane_image)(i,j,3)=float(plane.d());
+-          }
+-        }
+-      }
+-    }
+-    else if (camera->type_name() == "vpgl_local_rational_camera") {
+-      auto* cam = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
+-      for (unsigned i=0; i<ni; i++) {
+-        for (unsigned j=0; j<nj; j++) {
+-          col =edge_image(i,j,0); // sub-pixel column
+-          row =edge_image(i,j,1); // sub_pixel row
+-          theta=edge_image(i,j,2); // orientation in radians
+-
+-          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
+-            (*plane_image)(i,j,0) = 0.0f;
+-            (*plane_image)(i,j,1) = 0.0f;
+-            (*plane_image)(i,j,2) = 0.0f;
+-            (*plane_image)(i,j,3) = 0.0f;
+-          }
+-          else {
+-            // get two point on the line
+-            vgl_point_2d<double> p1(col, row);
+-
+-            float x = col + 0.5f*std::cos(theta);
+-            float y = row + 0.5f*std::sin(theta);
+-            vgl_point_2d<double> p2(x,y);
+-
+-            //backproject it
+-            vgl_plane_3d<double> plane;
+-            if (vpgl_ray::plane_ray(*cam, p1, p2, plane)) {
+-              (*plane_image)(i,j,0)=float(plane.a());
+-              (*plane_image)(i,j,1)=float(plane.b());
+-              (*plane_image)(i,j,2)=float(plane.c());
+-              (*plane_image)(i,j,3)=float(plane.d());
+-            }
+-            else { // the backprojection was unsuccessful
+-              std::cout << i << ',' << j << "NO PLANE!!!!!" << std::endl;
+-              (*plane_image)(i,j,0) = 0.0f;
+-              (*plane_image)(i,j,1) = 0.0f;
+-              (*plane_image)(i,j,2) = 0.0f;
+-              (*plane_image)(i,j,3) = 0.0f;
+-            }
+-          }
+-        }
+-      }
+-    }
+-    else if (camera->type_name() == "vpgl_perspective_camera") {
+-      auto* cam = dynamic_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-      auto* proj_cam = static_cast<vpgl_proj_camera<double>*>(cam);
+-      for (unsigned i=0; i<ni; i++) {
+-        for (unsigned j=0; j<nj; j++) {
+-          col =edge_image(i,j,0); // sub-pixel column
+-          row =edge_image(i,j,1); // sub_pixel row
+-          theta=edge_image(i,j,2); // orientation in radians
+-
+-          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
+-            (*plane_image)(i,j,0) = 0.0f;
+-            (*plane_image)(i,j,1) = 0.0f;
+-            (*plane_image)(i,j,2) = 0.0f;
+-            (*plane_image)(i,j,3) = 0.0f;
+-          }
+-          else {
+-            // get two point on the line
+-            vgl_point_2d<double> p1(col, row);
+-
+-            float x = col + 0.5f*std::cos(theta);
+-            float y = row + 0.5f*std::sin(theta);
+-            vgl_point_2d<double> p2(x,y);
+-
+-            vgl_line_2d<double> line(p1,p2);
+-
+-            //create a line and backproject it
+-            vgl_homg_line_2d<double> image_line(line);
+-
+-            vgl_homg_plane_3d<double> plane = proj_cam->backproject(image_line);
+-            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
+-            std::cout << "ZERO a,b,c,d" << std::endl;
+-            (*plane_image)(i,j,0)=float(plane.a());
+-            (*plane_image)(i,j,1)=float(plane.b());
+-            (*plane_image)(i,j,2)=float(plane.c());
+-            (*plane_image)(i,j,3)=float(plane.d());
+-          }
+-        }
+-      }
+-    }
+-    else {
+-      std::cerr << "boxm_line_backproject_process: The camera type [" << camera->type_name() << "]is not defined yet!\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_line_backproject_process: This pixel format is not supported yet!\n";
+-    return false;
+-  }
+-  // output
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, plane_image);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
+deleted file mode 100644
+index 3cdbcbe8e4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-//:
+-// \file
+-// \brief A process to perform linear combination of blocks in situ i.e block1 = s1*block1+ s2*block2
+-// \author Isabel Restrepo
+-// \date 2-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_linear_operations.h>
+-
+-//:global variables
+-namespace boxm_linear_combination_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_linear_combination_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_linear_combination_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr" ; //scene1
+-  input_types_[i++] = "boxm_scene_base_sptr" ; //scene2
+-  input_types_[i++] = "float" ; //s1
+-  input_types_[i++] = "float" ; //s2
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool boxm_linear_combination_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_linear_combination_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base1 = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr scene_base2 = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto s1 = pro.get_input<float>(i++);
+-  auto s2 = pro.get_input<float>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!(scene_base1 && scene_base2))
+-  {
+-    std::cerr << "In boxm_linear_combination_process: Null input scene\n";
+-    return false;
+-  }
+-
+-  switch (scene_base1->appearence_model())
+-  {
+-    case BOXM_FLOAT:
+-    {
+-      if (scene_base2->appearence_model()!= BOXM_FLOAT)
+-      {
+-        std::cerr << "In boxm_linear_combination_process, datatype not supported\n";
+-        return false;
+-      }
+-      auto *scene1 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base1.as_pointer());
+-      auto *scene2 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base2.as_pointer());
+-
+-      scene1->load_block(block_i,block_j,block_k);
+-      scene2->load_block(block_i,block_j,block_k);
+-
+-      boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(block_i,block_j,block_k);
+-      boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(block_i,block_j,block_k);
+-
+-      //The result is block1 = s1*block1+ s2*block2
+-      boxm_linear_combination(block1, block2, s1, s2);
+-
+-      //make sure to write the block back to disk
+-      scene1->write_active_block();
+-
+-      //clean memory
+-      scene1->unload_active_blocks();
+-      scene2->unload_active_blocks();
+-
+-      break;
+-    }
+-    default:
+-      std::cerr << "In boxm_linear_combination_process: Invalid datatype\n";
+-      return false;
+-      break;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
+deleted file mode 100644
+index 700f8bba5c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
++++ /dev/null
+@@ -1,90 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief process that merges all gaussian mixtures in a  boxm_scene into unimodal gaussians
+-//
+-// \author Isabel Restrepo
+-// \date December 8, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/algo/boxm_merge_mog.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace boxm_merge_mixtures_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 1 input and 1 output.
+-// input[0]: The sample scene
+-// output[0]: The appearance scene
+-
+-bool boxm_merge_mixtures_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_merge_mixtures_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_merge_mixtures_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_merge_mixtures_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-  typedef boct_tree<short, apm_datatype> mog_tree_type;
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef boct_tree<short, gauss_type> gauss_tree_type;
+-
+-  auto *mog_scene = dynamic_cast<boxm_scene<mog_tree_type>* > (scene_base.as_pointer());
+-
+-  //check input's validity
+-  if (!mog_scene) {
+-    std::cout <<  " :-- Grid is not of valid type!\n";
+-    return false;
+-  }
+-
+-  //parameters of the output scene are the same as those of the input scene
+-  boxm_scene<gauss_tree_type> *gauss_scene = new boxm_scene<gauss_tree_type>(mog_scene->lvcs(), mog_scene->origin(), mog_scene->block_dim(), mog_scene->world_dim());
+-  gauss_scene->set_paths(mog_scene->path(), "bsta_gauss_sf1");
+-  gauss_scene->set_appearance_model(BSTA_GAUSS_F1);
+-
+-  boxm_merge_mog merger;
+-  merger.kl_merge_scene( *mog_scene, *gauss_scene);
+-  gauss_scene->write_scene("gaussf1_scene.xml");
+-  pro.set_output_val<boxm_scene_base_sptr>(0, gauss_scene);
+-  std::cout<<"Exiting" << std::endl;
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
+deleted file mode 100644
+index 6b3f53a79c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
++++ /dev/null
+@@ -1,119 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to refine the block (octrees) of the scene
+-//        If there are some cells with big values they are spit into
+-//        new child cells; the data of the cell is copied to the
+-//        children's data. The purpose of this process is to elaborate
+-//        the octree at the areas where more details exist.
+-//
+-// \author Gamze Tunali
+-// \date April 24, 2009
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-namespace boxm_refine_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_refine_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_refine_scene_process_globals;
+-
+-  //process takes 3 inputs
+-  //input[0]: The scene
+-  //input[1]: The threshold for splitting
+-  //input[2]: bool for resetting the appearence model
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float";
+-  input_types_[2] = "bool";
+-
+-  //process has 1 output
+-  //output[0]: The number of leaf cells in the refined scene
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "int";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_refine_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_refine_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_refine_scene_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto thresh = pro.get_input<float>(i++);
+-  bool reset = pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_refine_scene_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned int ncells = 0;
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (scene->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, thresh, reset);
+-    }
+-  }
+-  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
+-    if (scene->multi_bin()) {
+-      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
+-      return false;
+-    }
+-    else {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, thresh, reset);
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  // set output
+-  pro.set_output_val<int>(0,ncells);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
+deleted file mode 100644
+index 67086ac142..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
++++ /dev/null
+@@ -1,87 +0,0 @@
+-//:
+-// \file
+-// \brief A process to remove level 0 of the octrees
+-// \author Isabel Restrepo
+-// \date Nov 23 2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-
+-//:global variables
+-namespace boxm_remove_level0_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool boxm_remove_level0_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_remove_level0_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr"; //scene_in
+-  input_types_[1] = "vcl_string"; //block_prefix for scene out
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr"; //scene_out
+-
+-  return pro.set_input_types(input_types_)
+-      && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool boxm_remove_level0_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_remove_level0_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string block_pref = pro.get_input<std::string>(1);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
+-  {
+-    //clone the input scene
+-    boxm_scene<boct_tree<short, float> > *scene_out = new boxm_scene<boct_tree<short, float> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
+-                                                                                               scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
+-                                                                                               scene_in->load_all_blocks(), scene_in->save_internal_nodes());
+-
+-    scene_out->set_paths(scene_in->path(), block_pref);
+-    scene_out->set_appearance_model(scene_in->appearence_model());
+-    std::cout << "Cloning\n";
+-    scene_in->clone_blocks(*scene_out);
+-
+-    std::cout << "Restructuring\n";
+-    boxm_remove_level_0_leaves(scene_out);
+-    std::cout << "Done\n";
+-
+-    //write the scene after the number of levels has been adjusted
+-    scene_out->set_octree_levels(scene_in->max_level() - 1, scene_in->init_level());
+-    scene_out->write_scene(block_pref + ".xml");
+-
+-    pro.set_output_val<boxm_scene_base_sptr>(0, scene_out);
+-    return true;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
+deleted file mode 100644
+index c14dfbda09..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
++++ /dev/null
+@@ -1,149 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <bvrml/bvrml_write.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-namespace boxm_render_expected_edge_vrml_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_render_expected_edge_vrml_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_vrml_process_globals;
+-
+-  // process takes 4 inputs and no output
+-  //input[0]: scene binary file
+-  //input[1]: the path for vrml file
+-  //input[2]: threshold
+-  //input[3]: s (to write every s cell)
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "float";
+-  input_types_[3] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_edge_vrml_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_vrml_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< '\n';
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  //vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  std::string path = pro.get_input<std::string>(i++);
+-  auto threshold = pro.get_input<float>(i++);
+-  int s = pro.get_input<int>(i++); // FIXME - unused!
+-
+-  std::ofstream stream(path.c_str());
+-
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE)
+-  {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cout << "boxm_render_expected_edge_process: the scene is not of expected type" << std::endl;
+-        return false;
+-      }
+-      bvrml_write::write_vrml_header(stream);
+-#if 0
+-      vgl_point_3d<double> origin(0.0,0.0,0.0);
+-      vgl_vector_3d<double> dirx(1,0,0);
+-      vgl_vector_3d<double> diry(0,1,0);
+-      vgl_vector_3d<double> dirz(0,0,1);
+-      bvrml_write::write_vrml_line(stream,origin,dirx,3,1,0,0);
+-      bvrml_write::write_vrml_line(stream,origin,diry,3,0,1,0);
+-      bvrml_write::write_vrml_line(stream,origin,dirz,3,0,0,1);
+-#endif
+-      // for each block
+-      boxm_block_iterator<type> iter(scene);
+-      iter.begin();
+-      while (!iter.end())
+-      {
+-        scene->load_block(iter.index());
+-        boxm_block<type>* block = *iter;
+-        type* tree = block->get_tree();
+-        std::vector<boct_tree_cell<short,boxm_inf_line_sample<float> >*> cells = tree->leaf_cells();
+-
+-        // iterate over cells
+-        for (auto cell : cells)
+-        {
+-          boxm_inf_line_sample<float> data = cell->data();
+-          vgl_infinite_line_3d<float> line = data.line_;
+-          vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
+-          // TODO: revise with segment length
+-          if (!(line.x0().x()==0 && line.x0().y()==0)) {
+-            //if (data.num_obs_ > threshold)
+-            {
+-              vgl_point_3d<double> p0,p1;
+-              vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
+-              // convert to line type (from float to double)
+-              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
+-
+-              vgl_infinite_line_3d<double> dline(x0,dir);
+-              if (vgl_intersection<double>(bb, dline, p0, p1)) {
+-                vgl_vector_3d<double> dir(p1-p0);
+-                double length=dir.length();
+-                dir/=length;
+-                std::cout<<data.residual_<<' ';
+-                if (data.residual_<threshold)
+-                {
+-                  bvrml_write::write_vrml_line(stream, p0,dir,float(length),1.f,0.f,0.f);
+-                  //bvrml_write::write_vrml_disk(stream,p0,dir,data.residual_,0.f,1.0f,0.f);
+-                }
+-              }
+-            }
+-          }
+-        }
+-        iter++;
+-      }
+-    }
+-    else
+-    {
+-      std::cerr << "Ray tracing version not yet implemented\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_render_expected_edge_vrml_process: undefined APM type\n";
+-    return false;
+-  }
+-
+-  // no output
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
+deleted file mode 100644
+index 1ca0a383ac..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
++++ /dev/null
+@@ -1,95 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to replace the appearance model for the whole scene by a constant appearance model
+-// \author Vishal Jain
+-// \date July 28, 2009
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean);
+-
+-namespace boxm_replace_const_app_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_replace_const_app_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_replace_const_app_process_globals;
+-
+-  //process takes 2 inputs and no output
+-  //input[0]: The scene
+-  //input[1]: mean value for appearance
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_replace_const_app_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_replace_const_app_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_replace_const_app_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto meanval = pro.get_input<float>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_replace_const_app_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-    boxm_replace_constant_app(*s,meanval );
+-  }
+-  else {
+-    std::cout << "boxm_replace_const_app_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+-
+-void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean)
+-{
+-  boxm_block_iterator<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype app=boxm_utils::obtain_mog_grey_single_mode(mean);
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >* block = *iter;
+-    boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >* tree = block->get_tree();
+-
+-    std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> leaf_cells=tree->leaf_cells();
+-    for (auto & leaf_cell : leaf_cells)
+-    {
+-      boxm_sample<BOXM_APM_MOG_GREY> new_data(leaf_cell->data().alpha,app);
+-      leaf_cell->set_data(new_data);
+-    }
+-    scene.write_active_block();
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
+deleted file mode 100644
+index ce50f795ba..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
++++ /dev/null
+@@ -1,195 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for clipping and image based on a 3D bounding box.
+-//        -  Input:
+-//             - Image path (string)
+-//             - boxm_voxel_world_sptr
+-//
+-//        -  Output:
+-//             - modified rational camera "vpgl_camera_double_sptr"
+-//             - clipped image area (NITF) "vil_image_view_base_sptr"
+-//
+-//        -  Params:
+-//             -geographic uncertainty (error) in meters
+-//
+-// \author  Copied from boxm/pro
+-// \date    May 5, 2008
+-// \verbatim
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <vsol/vsol_box_2d_sptr.h>
+-#include <vsol/vsol_box_2d.h>
+-
+-#include <brip/brip_roi.h>
+-
+-#include <vil/vil_load.h>
+-#include <vil/vil_crop.h>
+-#include <vil/file_formats/vil_nitf2_image.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-//: globals variables and functions
+-namespace boxm_roi_init_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 3;
+-
+-  //functions
+-  bool roi_init(const std::string& img_path,
+-                const vpgl_camera_double_sptr& camera,
+-                vgl_box_3d<double> box,
+-                vil_image_view<unsigned char> & roi_img);
+-
+-  //: projects the box on the image by taking the union of all the projected corners
+-  vgl_box_2d<double>* project_box(const vpgl_camera_double_sptr& cam,
+-                                  vgl_box_3d<double> box);
+-}
+-
+-//: set input and output types
+-bool boxm_roi_init_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_process_globals;
+-
+-  //this process takes 3 input:
+-  //the filename of the image, the camera and the voxel world
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned  i=0;
+-  input_types_[i++] = "vcl_string";                // image path
+-  input_types_[i++] = "vpgl_camera_double_sptr";   //  camera
+-  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
+-
+-  //output
+-  unsigned j = 0;
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
+-  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
+-  output_types_[j++] = "float"; // uncertainty
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-bool boxm_roi_init_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_process_globals;
+-  //static const parameters
+-  static const std::string error = "error";
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs:
+-  unsigned i = 0;
+-  // image
+-  std::string image_path = pro.get_input<std::string>(i++);
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  //voxel_world
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  vil_image_view_base_sptr img_ptr=vil_load(image_path.c_str());
+-  auto *temp=new vil_image_view<unsigned char>();
+-  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
+-  {
+-    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
+-    {
+-        vgl_box_2d<double>* roi_box = project_box(camera, scene->get_world_bbox());
+-        brip_roi broi(img->ni(), img->nj());
+-        vsol_box_2d_sptr bb = new vsol_box_2d();
+-        bb->add_point(roi_box->min_x(), roi_box->min_y());
+-        bb->add_point(roi_box->max_x(), roi_box->max_y());
+-        bb = broi.clip_to_image_bounds(bb);
+-        if (bb->width() <= 0 || bb->height() <= 0) {
+-            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
+-            return false;
+-        }
+-        temp->set_size(int(bb->width()),int(bb->height()));
+-        temp->deep_copy(vil_crop(*img,(unsigned int)bb->get_min_x(),
+-                            (unsigned int)bb->width(),
+-                            (unsigned int)bb->get_min_y(),
+-                            (unsigned int)bb->height()));
+-    }
+-  }
+-  if (temp->ni() == 0 || temp->nj() == 0)
+-    return false;
+-
+-  //Store outputs
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<vpgl_camera_double_sptr >(j++, camera);
+-  // store image output
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, temp);
+-  // store uncertainty
+-  pro.set_output_val<float>(j++, 0);
+-
+-  return true;
+-}
+-
+-//: roi_init function
+-bool boxm_roi_init_process_globals::roi_init(const std::string&  img_path,
+-                                             const vpgl_camera_double_sptr& camera,
+-                                             vgl_box_3d<double> box,
+-                                             vil_image_view<unsigned char> & roi_img)
+-{
+-  vil_image_view_base_sptr img_ptr=vil_load(img_path.c_str());
+-  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
+-  {
+-    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
+-    {
+-        vgl_box_2d<double>* roi_box = project_box(camera, box);
+-        brip_roi broi(img->ni(), img->nj());
+-        vsol_box_2d_sptr bb = new vsol_box_2d();
+-        bb->add_point(roi_box->min_x(), roi_box->min_y());
+-        bb->add_point(roi_box->max_x(), roi_box->max_y());
+-        bb = broi.clip_to_image_bounds(bb);
+-        if (bb->width() <= 0 || bb->height() <= 0) {
+-            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
+-            return false;
+-        }
+-
+-         vil_image_view<unsigned char> temp=vil_crop(*img,
+-                                                     (unsigned int)bb->get_min_x(),
+-                                                     (unsigned int)bb->width(),
+-                                                     (unsigned int)bb->get_min_y(),
+-                                                     (unsigned int)bb->height());
+-        roi_img=temp;
+-        return true;
+-    }
+-    else
+-      return false;
+-  }
+-  else // non-supported pixel format
+-    return false;
+-}
+-
+-//: project_box function
+-vgl_box_2d<double>* boxm_roi_init_process_globals::project_box( const vpgl_camera_double_sptr& cam,
+-                                                                vgl_box_3d<double> box)
+-{
+-  // create a box with uncertainty
+-  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
+-
+-  auto* roi = new vgl_box_2d<double>();
+-
+-  for (auto & box_corner : box_corners) {
+-      double u,v;
+-      cam->project(box_corner.x(),box_corner.y(),box_corner.z(),u,v);
+-      vgl_point_2d<double> p2d(u,v);
+-      std::cout<<u<<' '<<v<<'\n';
+-      roi->add(p2d);
+-  }
+-  return roi;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
+deleted file mode 100644
+index fbfe3b9704..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
++++ /dev/null
+@@ -1,310 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for clipping and image based on a 3D bounding box.
+-// *  Input:
+-//   - Image path (string)
+-//   - boxm_voxel_world_sptr
+-//
+-// *  Output:
+-//   - modified rational camera "vpgl_camera_double_sptr"
+-//   - clipped image area (NITF) "vil_image_view_base_sptr"
+-//
+-// *  Params:
+-//   - geographic uncertainty (error) in meters
+-//
+-// \author  Copied from boxm/pro
+-// \date    May 5, 2008
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <vsol/vsol_box_2d_sptr.h>
+-#include <vsol/vsol_box_2d.h>
+-
+-#include <brip/brip_roi.h>
+-
+-#include <vil/vil_load.h>
+-#include <vil/file_formats/vil_nitf2_image.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-#include <vpgl/vpgl_lvcs.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-//: globals variables and functions
+-namespace boxm_roi_init_rational_camera_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 3;
+-
+-  // functions
+-  bool roi_init(std::string const& image_path,
+-                vpgl_rational_camera<double>* camera,
+-                vgl_box_3d<double> box,
+-                const vpgl_lvcs& lvcs,
+-                float uncertainty,
+-                vil_image_view<unsigned char>* nitf_image_unsigned_char,
+-                vpgl_local_rational_camera<double>& local_camera);
+-
+-  //: projects the box on the image by taking the union of all the projected corners
+-  vgl_box_2d<double>* project_box(vpgl_rational_camera<double>* cam,
+-                                  vpgl_lvcs lvcs,
+-                                  vgl_box_3d<double> box,
+-                                  float r);
+-}
+-
+-//:set input and output types
+-bool boxm_roi_init_rational_camera_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_rational_camera_process_globals;
+-
+-  //this process takes 3 input:
+-  //the filename of the image, the camera and the voxel world
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned  i=0;
+-  input_types_[i++] = "vcl_string";                // NITF image path
+-  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
+-  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
+-
+-  //output
+-  unsigned j = 0;
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
+-  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
+-  output_types_[j++] = "float"; // uncertainty
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-bool boxm_roi_init_rational_camera_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_roi_init_rational_camera_process_globals;
+-  //static const parameters
+-  static const std::string error = "error";
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-  // uncertainty (meters) -- SHOULD BE A PARAM
+-  float uncertainty=10.0;
+-  if ( !pro.parameters()->get_value(error, uncertainty) ) {
+-    std::cout << pro.name() << ": error in retrieving parameters\n";
+-    return false;
+-  }
+-
+-  // get the inputs:
+-  unsigned i = 0;
+-  // image
+-  std::string image_path = pro.get_input<std::string>(i++);
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  //voxel_world
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  auto* img_ptr = new vil_image_view<unsigned char>();
+-  auto* rat_camera =
+-  dynamic_cast<vpgl_rational_camera<double>*> (camera.as_pointer());
+-
+-  if (!rat_camera) {
+-    std::cerr << "The camera input is not a rational camera\n";
+-    return false;
+-  }
+-
+-  vpgl_local_rational_camera<double> local_camera;
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY ||
+-      scene->appearence_model() == BOXM_EDGE_FLOAT ||
+-      scene->appearence_model() == BOXM_EDGE_LINE) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-
+-    if (!roi_init(image_path, rat_camera, s->get_world_bbox(),(s->lvcs()), uncertainty, img_ptr, local_camera)) {
+-      std::cerr << "The process has failed!\n";
+-      return false;
+-    }
+-
+-    if (img_ptr->ni() == 0 || img_ptr->nj() == 0)
+-      return false;
+-
+-    //Store outputs
+-    unsigned j = 0;
+-    // update the camera and store
+-    pro.set_output_val<vpgl_camera_double_sptr >(j++, new vpgl_local_rational_camera<double> (local_camera));
+-    // store image output
+-    pro.set_output_val<vil_image_view_base_sptr>(j++, img_ptr);
+-    // store uncertainty
+-    pro.set_output_val<float>(j++, uncertainty);
+-  }
+-  else {
+-    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+-
+-//: roi_init function
+-bool boxm_roi_init_rational_camera_process_globals::roi_init(std::string const& image_path,
+-                                                             vpgl_rational_camera<double>* camera,
+-                                                             vgl_box_3d<double> box,
+-                                                             const vpgl_lvcs& lvcs,
+-                                                             float uncertainty,
+-                                                             vil_image_view<unsigned char>* nitf_image_unsigned_char,
+-                                                             vpgl_local_rational_camera<double>& local_camera)
+-{
+-  // read the image and extract the camera
+-  vil_image_resource_sptr img = vil_load_image_resource(image_path.c_str());
+-  std::string format = img->file_format();
+-  std::string prefix = format.substr(0,4);
+-  if (prefix.compare("nitf") != 0) {
+-    std::cerr << "boxm_roi_init_rational_camera_process::execute - The image should be an NITF\n";
+-    return false;
+-  }
+-
+-  auto* nitf =  static_cast<vil_nitf2_image*> (img.ptr());
+-
+-  vgl_box_2d<double>* roi_box = project_box(camera, lvcs, box, uncertainty);
+-
+-  brip_roi broi(nitf->ni(), nitf->nj());
+-  vsol_box_2d_sptr bb = new vsol_box_2d();
+-  bb->add_point(roi_box->min_x(), roi_box->min_y());
+-  bb->add_point(roi_box->max_x(), roi_box->max_y());
+-  bb = broi.clip_to_image_bounds(bb);
+-
+-  if (bb->width() <= 0 || bb->height() <= 0) {
+-    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
+-    return false;
+-  }
+-
+-  vil_image_view_base_sptr roi = nitf->get_copy_view((unsigned int)bb->get_min_x(),
+-                                                     (unsigned int)bb->width(),
+-                                                     (unsigned int)bb->get_min_y(),
+-                                                     (unsigned int)bb->height());
+-  if (!roi) {
+-    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
+-    return false;
+-  }
+-
+-  if (!roi.as_pointer())
+-    return false;
+-
+-  if (roi->pixel_format() == VIL_PIXEL_FORMAT_UINT_16)
+-  {
+-    vil_image_view<vxl_uint_16> nitf_image_vxl_uint_16(roi);
+-
+-    *nitf_image_unsigned_char = vil_image_view<unsigned char> (roi->ni(),roi->nj(),roi->nplanes());
+-
+-    int bigendian = 0;
+-    { union { unsigned int i; char c[4]; } u; u.i = 1; bigendian = u.c[0] == 0; }
+-    for (unsigned m=0; m<nitf_image_unsigned_char->ni(); ++m)
+-    {
+-      for (unsigned n=0; n<nitf_image_unsigned_char->nj(); ++n)
+-      {
+-        for (unsigned p=0; p<nitf_image_unsigned_char->nplanes(); ++p)
+-        {
+-          // we will ignore the most significant 5 bits and less significant 3 bits
+-          vxl_uint_16 curr_pixel_val = nitf_image_vxl_uint_16(m,n,p);
+-
+-          if (bigendian) {
+-            auto* arr = (unsigned char*) &curr_pixel_val;
+-            // [defgh3][5abc]
+-            // --> [abcdefgh]
+-            unsigned char big = *arr;
+-            unsigned char small = *(++arr);
+-            big >>= 3;
+-            small <<= 5;
+-            curr_pixel_val = big || small;
+-          }
+-          else { // little endian
+-            // [5abc][defgh3]
+-            // --> [abcdefgh]
+-            curr_pixel_val <<= 5;
+-            // [defgh3][5abc]
+-            // --> [abcdefgh]
+-            curr_pixel_val >>= 8;
+-          }
+-
+-          auto pixel_val = static_cast<unsigned char> (curr_pixel_val);
+-
+-#if 0
+-          //This is how Thom uses to get the region
+-          int temp_pix_val = int(int(curr_pixel_val)*255.0/1500.0);
+-          if (temp_pix_val > 255)
+-            temp_pix_val =255;
+-          unsigned char pixel_val = static_cast<unsigned char>(temp_pix_val);
+-          //end hack
+-#endif
+-
+-          (*nitf_image_unsigned_char)(m,n,p) = pixel_val;
+-        }
+-      }
+-    }
+-  }
+-  else if (roi->pixel_format() == VIL_PIXEL_FORMAT_BYTE) {
+-    *nitf_image_unsigned_char = vil_image_view<unsigned char>(roi);
+-  }
+-  else
+-    std::cout << "boxm_roi_init_rational_camera_process - Unsupported Pixel Format = " << roi->pixel_format() << std::endl;
+-
+-  double u, v;
+-  camera->image_offset(u, v);
+-  double tu =  u - roi_box->min_x();
+-  double tv =  v - roi_box->min_y();
+-  camera->set_image_offset(tu, tv);
+-  local_camera = vpgl_local_rational_camera<double> (lvcs, *camera);
+-  delete roi_box;
+-
+-  return true;
+-}
+-
+-//:project_box function
+-vgl_box_2d<double>*boxm_roi_init_rational_camera_process_globals::project_box( vpgl_rational_camera<double>* cam,
+-                                                                               vpgl_lvcs lvcs,
+-                                                                               vgl_box_3d<double> box,
+-                                                                               float r)
+-{
+-  double xoff, yoff, zoff;
+-  xoff = cam->offset(vpgl_rational_camera<double>::X_INDX);
+-  yoff = cam->offset(vpgl_rational_camera<double>::Y_INDX);
+-  zoff = cam->offset(vpgl_rational_camera<double>::Z_INDX);
+-
+-  // global to local
+-  double lx, ly, lz;
+-  lvcs.global_to_local(xoff, yoff, zoff, vpgl_lvcs::wgs84, lx, ly, lz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  double center[3];
+-  center[0] = lx;
+-  center[1] = ly;
+-  center[2] = lz;
+-
+-  // create a box with uncertainty
+-  vgl_box_3d<double> cam_box(center, 2*r, 2*r, 2*r, vgl_box_3d<double>::centre);
+-  std::vector<vgl_point_3d<double> > cam_corners = boxm_utils::corners_of_box_3d(cam_box);
+-  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
+-  auto* roi = new vgl_box_2d<double>();
+-
+-  double lon, lat, gz;
+-  for (auto cam_corner : cam_corners) {
+-    lvcs.local_to_global(cam_corner.x(), cam_corner.y(), cam_corner.z(),
+-                         vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-    vpgl_rational_camera<double>* new_cam = cam->clone();
+-    new_cam->set_offset(vpgl_rational_camera<double>::X_INDX, lon);
+-    new_cam->set_offset(vpgl_rational_camera<double>::Y_INDX, lat);
+-    new_cam->set_offset(vpgl_rational_camera<double>::Z_INDX, gz);
+-
+-    // project the box
+-    for (auto & box_corner : box_corners) {
+-      // convert the box corners to world coordinates
+-      lvcs.local_to_global(box_corner.x(), box_corner.y(), box_corner.z(),
+-                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-      vgl_point_2d<double> p2d = new_cam->project(vgl_point_3d<double>(lon, lat, gz));
+-      roi->add(p2d);
+-    }
+-  }
+-  return roi;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
+deleted file mode 100644
+index 8c8b260f04..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
++++ /dev/null
+@@ -1,229 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <sstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for writing the occupancy probability of scenes to drishti raw files
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   Sep 11, 2009   Gamze Tunali
+-//                  Added scene writing option, input number is increased to 4 and if 4th
+-//                  input is 0, blocks saved as raw files separately, if 1, then blocks
+-//                  combined to generate 1 raw file for the whole scene
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boxm/algo/boxm_save_scene_raw.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-namespace boxm_save_occupancy_raw_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_save_occupancy_raw_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_occupancy_raw_process_globals;
+-
+-  // process takes 4 inputs but has no outputs
+-  //input[0]: scene binary file
+-  //input[1]: output file (raw) path
+-  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
+-  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_save_occupancy_raw_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_occupancy_raw_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string filepath = pro.get_input<std::string>(i++);
+-  auto resolution =  pro.get_input<unsigned>(i++);
+-  auto whole = pro.get_input<unsigned>(i++);
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if (!whole) {
+-        boxm_block_iterator<type> it(scene);
+-        it.begin();
+-        while (!it.end()) {
+-          std::stringstream strm;
+-          vgl_point_3d<int> index = it.index();
+-          strm << index.x() << '_' << index.y() << '_' << index.z();
+-          std::string str(strm.str());
+-          std::string s = filepath + str + ".raw";
+-          boxm_save_block_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
+-          it++;
+-        }
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if (!whole) {
+-        boxm_block_iterator<type> it(scene);
+-        it.begin();
+-        while (!it.end()) {
+-          std::stringstream strm;
+-          vgl_point_3d<int> index = it.index();
+-          strm << index.x() << '_' << index.y() << '_' << index.z();
+-          std::string str(strm.str());
+-          std::string s = filepath + str + ".raw";
+-          boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
+-          it++;
+-        }
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    if (!whole) {
+-      boxm_block_iterator<type> it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_ptr.as_pointer())) {
+-    if (!whole) {
+-      boxm_block_iterator<boct_tree<short, float> > it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,float >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,float >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BSTA_MOG_F1){
+-    if (!whole) {
+-      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>* > (scene_ptr.as_pointer());
+-      boxm_block_iterator<tree_type> it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      //boxm_save_scene_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_ptr.as_pointer())) {
+-    if (!whole) {
+-      boxm_block_iterator<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    if (!whole) {
+-      boxm_block_iterator<type> it(scene);
+-      it.begin();
+-      while (!it.end()) {
+-        std::stringstream strm;
+-        vgl_point_3d<int> index = it.index();
+-        strm << index.x() << '_' << index.y() << '_' << index.z();
+-        std::string str(strm.str());
+-        std::string s = filepath + str + ".raw";
+-        boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, it.index(), s, resolution);
+-        it++;
+-      }
+-    }
+-    else { // write the whole scene
+-      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, filepath + ".raw", resolution);
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
+-    typedef boct_tree<short, boxm_edge_sample<float> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    boxm_save_scene_raw<short,boxm_edge_sample<float> >(*scene, filepath + ".raw", resolution);
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
+-    typedef boct_tree<short, boxm_scalar_sample<float> > type;
+-    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-    boxm_save_scene_raw<short,boxm_scalar_sample<float> >(*scene, filepath + ".raw", resolution);
+-  }
+-  else {
+-    std::cout << "boxm_save_occupancy_raw_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
+deleted file mode 100644
+index 5f4d68c008..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
++++ /dev/null
+@@ -1,140 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <sstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for writing general scenes to drishti raw files. Values in voxels are saved as they are
+-//
+-// \author Isabel Restrepo
+-// \date Feb 17, 2011
+-// \verbatim
+-//  Modifications
+-//  <None>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_save_scene_raw_general.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-namespace boxm_save_scene_raw_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_save_scene_raw_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_scene_raw_process_globals;
+-
+-  // process takes 4 inputs but has no outputs
+-  //input[0]: scene binary file
+-  //input[1]: output file (raw) path
+-  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
+-  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_save_scene_raw_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_save_scene_raw_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string filepath = pro.get_input<std::string>(i++);
+-  auto resolution =  pro.get_input<unsigned>(i++);
+-  auto whole = pro.get_input<unsigned>(i++);
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_FLOAT)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
+-      return false;
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, float > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if(!scene)
+-        return false;
+-      if (!whole) {
+-        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
+-        return false;
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw_general_to_byte<short,float>(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  // check the scene's app model
+-  else if (scene_ptr->appearence_model() == BOXM_CHAR)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
+-      return false;
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, char > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if(!scene)
+-        return false;
+-      if (!whole) {
+-        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
+-        return false;
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw_general<short,char>(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  // check the scene's app model
+-  else if (scene_ptr->appearence_model() == BOXM_BOOL)
+-  {
+-    if (scene_ptr->multi_bin())
+-    {
+-      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
+-      return false;
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, bool > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
+-      if(!scene)
+-        return false;
+-      if (!whole) {
+-        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
+-        return false;
+-      }
+-      else { // write the whole scene
+-        boxm_save_scene_raw_general<short>(*scene, filepath + ".raw", resolution);
+-      }
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_save_scene_raw_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
+deleted file mode 100644
+index d5b044d0db..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
++++ /dev/null
+@@ -1,97 +0,0 @@
+-// This is brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
+-//:
+-// \file
+-// \brief process that splits a boxm_scene of boxm samples into an appearance and occupancy scene
+-//
+-// \author Isabel Restrepo
+-// \date December 3, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <boxm/algo/boxm_split_sample.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace boxm_split_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-//: process takes 1 input and two outputs.
+-// input[0]: The sample scene
+-// output[0]: The appearance scene
+-// output[1]: The alpha scene
+-
+-bool boxm_split_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_split_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-  output_types_[1] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_split_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_split_scene_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  //: Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > sample_tree_type;
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-  typedef boct_tree<short, apm_datatype> apm_tree_type;
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype alpha_type;
+-  typedef boct_tree<short, alpha_type> alpha_tree_type;
+-
+-  auto *scene_in = static_cast<boxm_scene<sample_tree_type>* > (scene_base.as_pointer());
+-
+-  // parameters of the output scene are the same as those of the input scene
+-  boxm_scene<apm_tree_type> *apm_scene = new boxm_scene<apm_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
+-                                                                       scene_in->max_level(), scene_in->init_level());
+-  apm_scene->set_paths(scene_in->path(), "apm_mog_grey");
+-  apm_scene->set_appearance_model(BSTA_MOG_F1);
+-  boxm_scene<alpha_tree_type > *alpha_scene = new boxm_scene<alpha_tree_type >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
+-                                                                               scene_in->max_level(), scene_in->init_level());
+-  alpha_scene->set_paths(scene_in->path(), "alpha");
+-  alpha_scene->set_appearance_model(BOXM_FLOAT);
+-  boxm_split_sample<BOXM_APM_MOG_GREY> splitter;
+-
+-  splitter.split_scene( *scene_in, *apm_scene, *alpha_scene);
+-
+-  apm_scene->write_scene("apm_scene.xml");
+-  alpha_scene->write_scene("/alpha_scene.xml");
+-
+-  pro.set_output_val<boxm_scene_base_sptr>(0, apm_scene);
+-  pro.set_output_val<boxm_scene_base_sptr>(1, alpha_scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index 2c499a1c2f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_algo_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_pro_test_include boxm_algo_pro)
+diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
+deleted file mode 100644
+index 8ee327ed5f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/pro/boxm_algo_processes.h>
+-#include <boxm/algo/pro/boxm_algo_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
+deleted file mode 100644
+index 6140bcbb4a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
++++ /dev/null
+@@ -1,46 +0,0 @@
+-# brl/bseg/boxm/algo/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_algo_rt_sources
+-    boxm_change_probability_functor.h
+-    boxm_edge_tangent_updater.h             boxm_edge_tangent_updater.hxx
+-    boxm_edge_updater.h                     boxm_edge_updater.hxx
+-    boxm_generate_edge_sample_functor.h
+-    boxm_generate_edge_tangent_sample_functor.h
+-    boxm_generate_opt2_sample_functor.h
+-    boxm_generate_opt3_sample_functor.h
+-    boxm_generate_opt_sample_functor.h
+-    boxm_opt2_optimizer.h                   boxm_opt2_optimizer.hxx
+-    boxm_opt3_optimizer.h                   boxm_opt3_optimizer.hxx
+-    boxm_opt_appearance_estimator.h
+-    boxm_opt_rt_bayesian_optimizer.h        boxm_opt_rt_bayesian_optimizer.hxx
+-    boxm_pre_infinity_functor.h
+-    boxm_render_expected_depth_functor.h
+-    boxm_render_expected_edge_image_functor.h
+-    boxm_render_expected_edge_tangent_image_functor.h
+-    boxm_render_expected_image_functor.h
+-    boxm_render_expected_shadow_image_functor.h
+-    boxm_rpc_registration.h
+-    boxm_sun_vis_prob_functor.h
+-    boxm_update_image_functor.h
+-    boxm_compute_num_rays_statistics.h
+-    boxm_expected_edge_functor.h
+-    boxm_shadow_appearance_estimator.h
+-    boxm_generate_shadow_sample_functor.h
+-    boxm_shadow_app_initializer.h            boxm_shadow_app_initializer.hxx
+-    boxm_shadow_bayes_optimizer.h            boxm_shadow_bayes_optimizer.hxx
+-    dummy.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_algo_rt_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo_rt LIBRARY_SOURCES ${boxm_algo_rt_sources})
+-
+-#processes
+-add_subdirectory(pro)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_algo_rt boxm boxm_sample boxm_sample_algo boxm_basic boxm_util ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vgl_algo bsta ${VXL_LIB_PREFIX}vnl sdet brip ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo )
+-
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
+deleted file mode 100644
+index ef11ac6b96..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
+-
+-BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(short,float,float);
+-BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(short,float,float);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
+deleted file mode 100644
+index 8d4e1a9f37..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/algo/rt/boxm_edge_updater.hxx>
+-
+-BOXM_EDGE_UPDATER_INSTANTIATE(short,float,float);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
+deleted file mode 100644
+index ca43ee5ebf..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT2_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
+deleted file mode 100644
+index fc93c9b10a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT2_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index a9b24b175b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index 318336e55b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY, BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 89f46b6393..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 0c8a2da7d1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 1cc6084872..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
+deleted file mode 100644
+index 8a9638f4b1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
+deleted file mode 100644
+index 71036d42a6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <bpgl/bpgl_camera_estimator.hxx>
+-#include <boxm/algo/rt/boxm_expected_edge_functor.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boxm_inf_line_sample<float> sample;
+-typedef boxm_expected_edge_functor<short,sample > functor;
+-BPGL_CAMERA_ESTIMATOR_INSTANTIATE(functor);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
+deleted file mode 100644
+index 5700690341..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_change_3d_functor_h
+-#define boxm_change_3d_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM>
+-class boxm_change_3d_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_change_3d_functor(vil_image_view<float> const& change_image, float prob_ratio)
+-    : change_image_(change_image),
+-      vis_img_(change_image.ni(),change_image.nj(), 1),
+-      alpha_integral_(change_image.ni(),change_image.nj(), 1),
+-      prob_ratio_(prob_ratio)
+-  {
+-    vis_img_.fill(1.0f);
+-    alpha_integral_.fill(0.0f);
+-
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM>& cell_value, boxm_scalar_sample<float>& scalar)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-
+-    // update segment length sum
+-    scalar.seg_len_ += seg_len;
+-
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-
+-    float back_prob = change_image_(i,j);
+-    float fore_prob = 1.0f/(1.0f + prob_ratio_*back_prob);
+-
+-    // set change prob in auxiliary voxel
+-    scalar.scalar_sum_ += Omega * fore_prob * seg_len;
+-
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> change_image_;
+-  vil_image_view<float> alpha_integral_;
+-  vil_image_view<float> vis_img_;
+-  float prob_ratio_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_change_3d(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                    vpgl_camera_double_sptr cam,
+-                    vil_image_view<float> &change_image,
+-                    std::string chng_name,
+-                    float prob_ratio)
+-{
+-  typedef boxm_scalar_sample<float> sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,chng_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-
+-  std::cout<<"Chng visibility"<<std::endl;
+-  // functor to compute 3-d change prob
+-  typedef boxm_change_3d_functor<T_data::apm_type> change_functor;
+-
+-  // set up the raytrace function
+-  boxm_raytrace_function<change_functor,T_loc, T_data, sample_datatype> raytracer_chng(scene,aux_scene,cam.ptr(),change_image.ni(),change_image.nj());
+-
+-  // construct the change probability functor
+-  change_functor chng_func(change_image, prob_ratio);
+-
+-  // run the functor over the octree
+-  raytracer_chng.run(chng_func);
+-
+-  std::cout<<"Change 3-d Done."<<std::endl;
+-}
+-
+-#endif // boxm_change_3d_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
+deleted file mode 100644
+index a5d584f2c0..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
++++ /dev/null
+@@ -1,83 +0,0 @@
+-#ifndef boxm_change_probability_functor_h
+-#define boxm_change_probability_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_change_probability_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_change_probability_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const & image, vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob,
+-                                  vil_image_view<float> &mask_vis,
+-                                  unsigned int ni,unsigned nj,
+-                                  bool scene_read_only=false,bool is_aux=true)
+-    : image_(image), change_prob_(change_prob),  vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    change_prob_.fill(nil);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float prob_den  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), image_(i,j));
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    change_prob_(i,j) +=  prob_den* Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image_;
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_change_prob_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                         vil_image_view<typename T_data::obs_datatype> const& image,
+-                         vpgl_camera_double_sptr cam,
+-                         vil_image_view<typename T_data::obs_datatype> &change_prob,
+-                         vil_image_view<float> & mask,
+-                         int /*bin*/ = -1,
+-                         bool /*use_black_background*/ = false)
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
+-  typedef boxm_change_probability_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > chng_functor;
+-  boxm_raytrace_function<chng_functor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),change_prob.ni(),change_prob.nj());
+-  chng_functor functor(image, change_prob,mask,change_prob.ni(),change_prob.nj(),true,false);
+-  raytracer.run(functor);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h b/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
+deleted file mode 100644
+index 144d5bd7bf..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#ifndef boxm_compute_num_rays_statistics_h
+-#define boxm_compute_num_rays_statistics_h
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_histogram.h>
+-#include <boxm/basic/boxm_num_rays_functor.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-template <class T_loc, class T_data>
+-bool compute_ray_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene,
+-                            vpgl_camera_double_sptr cam,
+-                            bsta_histogram<float>& num_rays_hist,
+-                            unsigned ni, unsigned nj)
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> >::CLONE);
+-
+-  typedef boxm_num_rays_functor<T_data::apm_type,boxm_scalar_sample<sample_datatype> > functor_type;
+-  boxm_raytrace_function<functor_type,T_loc, T_data,boxm_scalar_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),ni,nj);
+-  functor_type num_rays_functor;
+-  raytracer.run(num_rays_functor);
+-
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  typedef boct_tree<T_loc, boxm_scalar_sample<sample_datatype> > aux_tree_type;
+-  typedef boct_tree_cell<T_loc,boxm_scalar_sample<sample_datatype> > aux_cell_type;
+-
+-  num_rays_hist = bsta_histogram<float>(0.0f, 80.0f, 40);
+-  boxm_block_iterator<tree_type> bit = scene.iterator();
+-  float avg_rays=0;
+-  float num_cells=0;
+-  for (; !bit.end(); ++bit)
+-  {
+-    vgl_point_3d<int> block_index = bit.index();
+-    //aux_scene.load_block(block_index);
+-    boxm_block<aux_tree_type> * block = aux_scene.get_block(block_index);
+-    aux_tree_type* tree=block->get_tree();
+-    if (!tree) return false;
+-    std::vector<aux_cell_type *> leaves = tree->leaf_cells();
+-    for (typename std::vector<aux_cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
+-    {
+-      boxm_scalar_sample<sample_datatype>  data = (*cit)->data();
+-      num_rays_hist.upcount(static_cast<float>(data.scalar_sum_), 1.0f);
+-      avg_rays+=data.scalar_sum_;
+-      num_cells++;
+-    }
+-  }
+-
+-  //aux_scene.clean_scene();
+-  std::cout<<"Avg num of rays per cell "<<avg_rays/num_cells<<std::endl
+-          << "[#rays]=Frequency" << '\n';
+-
+-  for (unsigned int i=0; i<num_rays_hist.nbins(); i++)
+-  {
+-      std::cout<< '[' << num_rays_hist.avg_bin_value(i) << "]=" << num_rays_hist.counts(i) << '\n';
+-  }
+-
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
+deleted file mode 100644
+index 510fb1158d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
++++ /dev/null
+@@ -1,76 +0,0 @@
+-#ifndef boxm_edge_tangent_updater_h_
+-#define boxm_edge_tangent_updater_h_
+-//:
+-// \file
+-// \brief class to find the optimal intersecting 3D lines for each voxel in the scene
+-//
+-// \author G. Tunali
+-//
+-// \verbatim
+-//  Modifications
+-//    Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
+-// \endverbatim
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <vil/vil_image_view.h>
+-
+-template<class T_loc, class APM, class AUX>
+-class boxm_edge_tangent_updater
+-{
+- public:
+-
+-  boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
+-                            std::vector<std::string>  image_ids, bool use_ransac=true, float ransac_ortho_thres = 0.01f, float ransac_volume_ratio = 128.0f, int ransac_consensus_cnt = 3);
+-
+-  ~boxm_edge_tangent_updater()= default;
+-
+-  bool add_cells();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-  bool use_ransac_;
+-
+-  float ransac_ortho_thres_;
+-  float ransac_volume_ratio_;
+-  int ransac_consensus_cnt_;  // number of images that need to contribute planes to a hypothesis for a cell to be assigned a 3D edge
+-                              // there should be at least ransac_consensus_cnt_+1 training images for some consensus to be met at any voxel, otherwise edge world will be empty
+-
+-  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
+-};
+-
+-template<class T_loc, class APM, class AUX>
+-class boxm_edge_tangent_refine_updates
+-{
+- public:
+-
+-  boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene, int consensus_cnt,
+-                                   std::vector<vil_image_view<float> >  edge_images,
+-                                   std::vector<vpgl_camera_double_sptr>  cameras);
+-
+-  ~boxm_edge_tangent_refine_updates() = default;
+-
+-  bool refine_cells();
+-
+- protected:
+-  std::vector<vil_image_view<float> > edge_images_; // edge_img(ix, iy, 0) = static_cast<float>(x); subpixel location of edge
+-                                                   // edge_img(ix, iy, 1) = static_cast<float>(y);
+-                                                   // edge_img(ix, iy, 2) = static_cast<float>(dir); tangent direction of the edgel
+-  std::vector<vpgl_camera_double_sptr> cameras_;
+-
+-  int consensus_cnt_;  // how many images need to be in agreement for an edgel to survive
+-  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
+deleted file mode 100644
+index 5c3d68f321..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
++++ /dev/null
+@@ -1,291 +0,0 @@
+-#ifndef boxm_edge_tangent_updater_hxx_
+-#define boxm_edge_tangent_updater_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_edge_tangent_updater.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/util/boxm_plane_ransac.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <bsta/bsta_histogram.h>
+-
+-template <class T_loc, class APM, class AUX>
+-boxm_edge_tangent_updater<T_loc,APM,AUX>::boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc,
+-                                                                    boxm_inf_line_sample<APM> > > &scene,
+-                                                                    std::vector<std::string>  image_ids,
+-                                                                    bool use_ransac,
+-                                                                    float ransac_ortho_thres,
+-                                                                    float ransac_volume_ratio,
+-                                                                    int ransac_concensus_cnt)
+-: image_ids_(std::move(image_ids)), use_ransac_(use_ransac), ransac_ortho_thres_(ransac_ortho_thres), ransac_volume_ratio_(ransac_volume_ratio), ransac_consensus_cnt_(ransac_concensus_cnt), scene_(scene)
+-{}
+-
+-
+-template <class T_loc, class APM, class AUX>
+-bool boxm_edge_tangent_updater<T_loc,APM,AUX>::add_cells()
+-{
+-  // get auxiliary scenes associated with each input image
+-
+-  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> > > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> >
+-    aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>,
+-              boxm_edge_tangent_sample<AUX> >::LOAD, BOXM_EDGE_TANGENT_LINE);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_edge_tangent_sample<APM> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
+-    int nums=0;
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, boxm_edge_tangent_sample<AUX> > *> aux_readers(aux_scenes.size());
+-    std::vector<unsigned> aux_samples_num(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-      aux_samples_num[i] = 0;
+-    }
+-    //int a;
+-    //std::cin>>a;
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
+-      // initialize the cell
+-      boxm_inf_line_sample<AUX> data(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(0,0),vgl_vector_3d<AUX>(1,1,1)));
+-      cell->set_data(data);
+-
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, boxm_edge_tangent_sample<AUX> > temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().num_obs()>0)
+-        {
+-            aux_samples.push_back(temp_cell.data());
+-            //aux_samples_num[j]++;
+-        }
+-      }
+-
+-      if (aux_samples.size() > 1)
+-      {
+-        std::vector<vgl_plane_3d<AUX> > planes;
+-        std::vector<AUX> weights;
+-
+-        for (unsigned int k=0;k<aux_samples.size(); ++k) {
+-          boxm_edge_tangent_sample<APM> s = aux_samples[k];
+-          for (unsigned int j=0; j<s.num_obs(); j++) {
+-            boxm_plane_obs<AUX> obs = s.obs(j);
+-            weights.push_back(obs.seg_len_);
+-            vgl_plane_3d<AUX> plane(obs.plane_);
+-            planes.push_back(plane);
+-          }
+-        }
+-        nums+=planes.size();
+-        if (planes.size() > 1) {
+-          if (use_ransac_) {
+-            vgl_infinite_line_3d<AUX> line;
+-            float residual=1e5;
+-            vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
+-
+-            // ransac_consensus_cnt_ used to be hard-coded here to 5; made it into a parameter with a default value of 3
+-            if (boxm_plane_ransac<AUX>(aux_samples, weights, line, residual,bb, ransac_consensus_cnt_, ransac_ortho_thres_, ransac_volume_ratio_)) {
+-              boxm_inf_line_sample<AUX> data(line,aux_samples.size());
+-              data.residual_=residual;
+-
+-              // now set the clipped line
+-              // convert to type double
+-              vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
+-              vgl_point_3d<double> p0,p1;
+-              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
+-              vgl_infinite_line_3d<double> dline(x0,dir);
+-              if (!vgl_intersection<double>(bb, dline, p0, p1))
+-                data.residual_=0;
+-              else {
+-                // convert back to type AUX
+-                vgl_point_3d<AUX> p0_t(AUX(p0.x()), AUX(p0.y()), AUX(p0.z()));
+-                vgl_point_3d<AUX> p1_t(AUX(p1.x()), AUX(p1.y()), AUX(p1.z()));
+-                vgl_line_3d_2_points<AUX> line_clipped(p0_t,p1_t);
+-                data.line_clipped_ = line_clipped;
+-              }
+-
+-              cell->set_data(data);
+-            }
+-            else
+-            {
+-              boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-              cell->set_data(sample);
+-            }
+-          }
+-          else
+-          {
+-            boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-            cell->set_data(sample);
+-          }
+-        }
+-        else
+-        {
+-          boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-          cell->set_data(sample);
+-        }
+-      }
+-      else
+-      {
+-        boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
+-        cell->set_data(sample);
+-      }
+-    }
+-    nums/=cells.size();
+-
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-#if 0
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-#endif
+-  return true;
+-}
+-
+-template <class T_loc, class APM, class AUX>
+-boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
+-                                                                                  int consensus_cnt,
+-                                                                                  std::vector<vil_image_view<float> >  edge_images,
+-                                                                                  std::vector<vpgl_camera_double_sptr>  cameras)
+-: edge_images_(std::move(edge_images)), cameras_(std::move(cameras)), consensus_cnt_(consensus_cnt), scene_(scene)
+-{}
+-
+-template <class T_loc, class APM, class AUX>
+-bool boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::refine_cells()
+-{
+-  std::cout << "using " << edge_images_.size() << " images to refine edge world!" << std::endl;
+-
+-  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
+-      boxm_inf_line_sample<AUX> cell_value = cell->data();
+-
+-      // update residual of cell_value based on the visibility and support of this 3D line in all the images
+-      if (cell_value.residual_<1.0)
+-      {
+-        // go through each image
+-        int cnt = 0;
+-        for (unsigned k = 0; k < edge_images_.size(); k++) {
+-          int ni = edge_images_[k].ni();
+-          int nj = edge_images_[k].nj();
+-          // project this 3D line to the image
+-          double u1,v1,u2,v2;
+-          vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
+-          vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
+-          cameras_[k]->project(p1.x(),p1.y(),p1.z(),u1,v1);
+-          cameras_[k]->project(p2.x(),p2.y(),p2.z(),u2,v2);
+-
+-          double line_angle = vnl_math::angle_0_to_2pi(std::atan2(v2-v1, -(u2-u1)));
+-          double line_angle2 = vnl_math::angle_0_to_2pi(line_angle + vnl_math::pi); // line segment is symmetric
+-
+-          // find mid point of line seg
+-          int cent_i = int(u1+(u2-u1)/2.0);
+-          int cent_j = int(v1+(v2-v1)/2.0);
+-
+-          // check a neighborhood of 10x10 in the image to find the edgel that is nearest to this line segment
+-          double angle_of_min = 0.0;
+-          double dist = 10.0;
+-          for (int ii = cent_i - 10; ii < cent_i + 10; ii++) {
+-            if (ii < 0 || ii >= ni) continue;
+-            for (int jj = cent_j - 10; jj < cent_j + 10; jj++) {
+-              if (jj < 0 || jj >= nj) continue;
+-              double ex = edge_images_[k](ii,jj,0);
+-              double ey = edge_images_[k](ii,jj,1);
+-              double dir = edge_images_[k](ii,jj,2);
+-              double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, ex, ey);
+-              if (dist_to_seg < dist) {
+-                dist = dist_to_seg;
+-                angle_of_min = dir;
+-              }
+-            }
+-          }
+-          if (dist < 10.0)
+-            if (std::abs(angle_of_min - line_angle) < vnl_math::pi/16.0 || std::abs(angle_of_min - line_angle2) < vnl_math::pi/16.0)
+-              cnt++;
+-        }
+-
+-        if (cnt >= consensus_cnt_)
+-          cell_value.residual_ = AUX(1.0)-AUX(cnt)/AUX(edge_images_.size());
+-        else
+-          cell_value.residual_ = AUX(1.0);
+-        cell->set_data(cell_value);
+-      }
+-    }
+-    scene_.write_active_block();
+-    iter++;
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_edge_tangent_updater<T1,T2,T3 >
+-
+-#define BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(T1,T2,T3) \
+-template class boxm_edge_tangent_refine_updates<T1,T2,T3 >
+-
+-#endif // boxm_edge_tangent_updater_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
+deleted file mode 100644
+index 646f92a418..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
++++ /dev/null
+@@ -1,34 +0,0 @@
+-#ifndef boxm_edge_updater_h_
+-#define boxm_edge_updater_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-template<class T_loc, class APM, class AUX>
+-class boxm_edge_updater
+-{
+- public:
+-  boxm_edge_updater(boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene,
+-                    std::vector<std::string>  image_ids);
+-
+-  ~boxm_edge_updater()= default;
+-
+-  bool add_cells();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
+deleted file mode 100644
+index 029f503587..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
++++ /dev/null
+@@ -1,110 +0,0 @@
+-#ifndef boxm_edge_updater_hxx_
+-#define boxm_edge_updater_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_edge_updater.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class APM, class AUX>
+-boxm_edge_updater<T_loc,APM,AUX>::boxm_edge_updater(boxm_scene<boct_tree<T_loc,
+-                                                    boxm_edge_sample<APM> > > &scene,
+-                                                    std::vector<std::string>  image_ids)
+-: image_ids_(std::move(image_ids)), scene_(scene)
+-{}
+-
+-
+-template <class T_loc, class APM, class AUX>
+-bool boxm_edge_updater<T_loc,APM,AUX>::add_cells()
+-{
+-  // get auxiliary scenes associated with each input image
+-  //typedef typename boxm_aux_traits<AUX>::sample_datatype AUX;
+-
+-  typedef boct_tree<T_loc, boxm_edge_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> >::LOAD);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_aux_edge_sample<APM> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_edge_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_edge_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, boxm_aux_edge_sample<AUX> > *> aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_edge_sample<APM> >* cell = cells[i];
+-      boxm_edge_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, boxm_aux_edge_sample<AUX> > temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-
+-      //std::vector<typename boxm_edge_sample<APM> > obs_vector(aux_samples.size());
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        data.edge_prob_ += aux_samples[s].obs_/aux_samples[s].seg_len_;
+-      }
+-      data.num_obs_ += 1;
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_EDGE_UPDATER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_edge_updater<T1,T2,T3 >
+-
+-#endif // boxm_edge_updater_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
+deleted file mode 100644
+index b0d443ca27..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#ifndef boxm_expected_edge_functor_h_
+-#define boxm_expected_edge_functor_h_
+-//:
+-// \file
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
+-
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_transform.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-
+-//: Functor class to compute (1-x)
+-// assumes that max range value is "1"
+-// only sensible for real types
+-class boxm_exp_edge_vil_not_functor
+-{
+- public:
+-  float operator()(float x)       const { return x<1.0f?(1.0f-x):0.0f; }
+-  double operator()(double x)     const { return x<1.0?1.0-x:0.0; }
+-};
+-
+-template <class T_loc, class T_data>
+-class boxm_expected_edge_functor
+-{
+- public:
+-  boxm_expected_edge_functor(boxm_scene<boct_tree<T_loc, T_data > > &scene)
+-    : scene_(scene) {}
+-  ~boxm_expected_edge_functor() = default;
+-
+-  bool apply(const vpgl_camera_double_sptr& cam, vil_image_view<float> *img_eei)
+-  {
+-    boxm_render_edge_tangent_image_rt(scene_,cam,*img_eei);
+-    // now take the inverse of this image, pixels which contain edges will have values closer to 1 and others will be zero
+-    boxm_exp_edge_vil_not_functor nt;
+-    vil_transform(*img_eei, nt);
+-
+-    // now blur this image
+-    *img_eei = brip_vil_float_ops::gaussian(*img_eei, 1.0f);
+-
+-    return true;
+-  }
+-
+- private:
+-  boxm_scene<boct_tree<T_loc, T_data > > scene_;
+-};
+-
+-#undef BOXM_EXPECTED_EDGE_INSTANTIATE
+-#define BOXM_EXPECTED_EDGE_INSTANTIATE(T1,T2) \
+-template class boxm_expected_edge_functor<T1, T2 >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
+deleted file mode 100644
+index 756c0ca4a6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#ifndef boxm_generate_edge_sample_functor_h
+-#define boxm_generate_edge_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T, class T_aux>
+-class boxm_generate_edge_sample_functor
+-{
+- public:
+-  boxm_generate_edge_sample_functor(vil_image_view<float> &observation,
+-                                    unsigned int /*ni*/=0,unsigned /*nj*/=0)
+-    : obs_(observation)
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        T &cell_value, // FIXME: unused...
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-    aux_val.obs_ += obs_(i,j) * seg_len;
+-    aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> &obs_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_edge_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                  vpgl_camera_double_sptr cam,
+-                                  vil_image_view<float> &obs,
+-                                  std::string iname)
+-{
+-    typedef boxm_aux_edge_sample<float> aux_datatype;
+-    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE);
+-    typedef boxm_generate_edge_sample_functor<boxm_edge_sample<float>,aux_datatype> func;
+-    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PROCESSING EDGE IMAGE\n";
+-    func functor(obs,obs.ni(),obs.nj());
+-    raytracer.run(functor);
+-
+-    //aux_scene.clean_scene();
+-    std::cerr << "DONE.\n";
+-}
+-
+-#endif // boxm_generate_edge_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
+deleted file mode 100644
+index 009e75228c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
++++ /dev/null
+@@ -1,78 +0,0 @@
+-#ifndef boxm_generate_edge_tangent_sample_functor_h
+-#define boxm_generate_edge_tangent_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vgl/vgl_homg_plane_3d.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T, class T_aux>
+-class boxm_generate_edge_tangent_sample_functor
+-{
+- public:
+-  boxm_generate_edge_tangent_sample_functor(vil_image_view<float> &observation,
+-                                            unsigned int /*ni*/=0, unsigned /*nj*/=0)
+-    : obs_(observation)
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-    // make sure that the image has 4 planes ((a,b,c,d) params of a plane ax+by+cz=d )
+-    if (observation.nplanes() != 4)
+-      std::cerr << "boxm_generate_edge_tangent_sample_functor: the image does not have 4 planes\n";
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        T &cell_value, // FIXME - unused
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-    float a = obs_(i,j,0);
+-    float b = obs_(i,j,1);
+-    float c = obs_(i,j,2);
+-    float d = obs_(i,j,3);
+-
+-    if (a||b||c||d) {
+-      vgl_homg_plane_3d<float> p(a,b,c,d);
+-      boxm_plane_obs<float> observation(p,seg_len);
+-      aux_val.insert(observation);
+-    }
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> &obs_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_edge_tangent_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                          vpgl_camera_double_sptr cam,
+-                                          vil_image_view<float> &obs,
+-                                          std::string iname)
+-{
+-    typedef boxm_edge_tangent_sample<float> aux_datatype;
+-    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE, BOXM_EDGE_TANGENT_LINE);
+-    typedef boxm_generate_edge_tangent_sample_functor<boxm_inf_line_sample<float>,aux_datatype> func;
+-    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PROCESSING EDGE IMAGE\n";
+-    func functor(obs,obs.ni(),obs.nj());
+-    raytracer.run(functor);
+-    //aux_scene.clean_scene();
+-    std::cerr << "DONE.\n";
+-}
+-
+-#endif // boxm_generate_edge_tangent_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
+deleted file mode 100644
+index 5cbaef86fc..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
++++ /dev/null
+@@ -1,197 +0,0 @@
+-#ifndef boxm_generate_opt2_sample_functor_h
+-#define boxm_generate_opt2_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_opt2_sample_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_opt2_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                           vil_image_view<float> const& beta_denom,
+-                                           float model_prior,
+-                                           vil_image_view<float> const& alt_prob_img)
+-    : scene_read_only_(true) /*only reads info from the scene*/, is_aux_(true) /*needs to write aux*/,
+-      model_prior_(model_prior), alt_prob_img_(alt_prob_img), obs_(image), beta_denom_(beta_denom),
+-      vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    vis_img_.fill(1.0f);
+-    pre_img_.fill(0.0f);
+-    alpha_integral_.fill(0.0f);
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs = aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    // accumulate aux sample values
+-    aux_val.pre_ += (pre * model_prior_ + alt_prob_img_(i,j)) * seg_len;
+-    aux_val.vis_ += vis * model_prior_ * seg_len;
+-
+-    const float beta_num = pre + vis*PI;
+-    const float beta_num_expanded = (beta_num  * model_prior_) + alt_prob_img_(i,j);
+-    const float beta_denom = beta_denom_(i,j);
+-    const float beta_denom_expanded = (beta_denom * model_prior_) + alt_prob_img_(i,j);
+-
+-    float beta = 1.0f;
+-    if (beta_denom_expanded > 1e-5f) {
+-      beta =  beta_num_expanded / beta_denom_expanded;
+-    }
+-    const float old_PQ = (float)(1.0 - std::exp(-cell_value.alpha*seg_len));
+-    const float new_PQ = old_PQ * beta;
+-    const float pass_prob_old = 1.0f - old_PQ;
+-    float pass_prob = 1.0f - new_PQ;
+-
+-    // compute expected information gained from update
+-    const float weight = new_PQ * std::log(new_PQ / old_PQ) + pass_prob * std::log(pass_prob / pass_prob_old);
+-    // ensure log doesn't go to infinity
+-    if (pass_prob < 1e-5f) {
+-      pass_prob = 1e-5f;
+-    }
+-    aux_val.log_pass_prob_sum_ += std::log(pass_prob) * weight/seg_len;
+-    aux_val.weighted_seg_len_sum_ += weight; // += seg_len * weight/seg_len;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  float model_prior_;
+-  vil_image_view<float> const& alt_prob_img_;
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& beta_denom_;
+-
+-  //vil_image_view<float> const& pre_inf_;
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data, boxm_aux_type AUX_T>
+-void boxm_generate_opt2_samples(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                vpgl_camera_double_sptr cam,
+-                                vil_image_view<typename T_data::obs_datatype> &obs,
+-                                std::string iname,
+-                                std::vector<float> const& alt_appearance_priors,
+-                                std::vector<typename T_data::apm_datatype> const& alt_appearance_models,
+-                                bool black_background = false)
+-{
+-  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
+-  //std::cout << "scene.save_platform_independent() = " << scene.save_platform_independent() << std::endl;
+-  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 0"<<std::endl;
+-  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-  raytracer_0.run(pass_0_functor);
+-
+-  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-  vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-
+-  typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-  boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 1"<<std::endl;
+-  pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-  raytracer_1.run(pass_1_functor);
+-
+-  // compute observation probability for "infinity" appearance model
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    // use single-mode gaussian centered at 0
+-    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
+-    typename T_data::obs_mathtype black(0);
+-    const float black_std_dev = 8.0f/255;
+-    const gauss_type appearance_dist(black, black_std_dev*black_std_dev);
+-
+-    //float peak=T_data::apm_processor::expected_color(background_apm);
+-    //std::cout<<"Peak: "<<peak<<std::endl;
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-    for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-      *PI_it = appearance_dist.prob_density(*img_it);
+-    }
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-  }
+-  else {
+-    // assume uniform prob. density on interval [0, 1]
+-    //PI_inf.fill(1.0f);
+-    // don't actually have to compute anything since multiplying by 1
+-    inf_term = vis_inf;
+-  }
+-  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
+-  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
+-
+-  // compute model prior
+-  float model_prior = 1.0f;
+-  for (float alt_appearance_prior : alt_appearance_priors) {
+-    model_prior -= alt_appearance_prior;
+-  }
+-  // sanity check
+-  if (model_prior <= 0.0f) {
+-    std::cerr << "error: boxm_generate_opt2_samples : alt_appearance_priors sum to " << 1.0f - model_prior << " >= 1.0!\n";
+-  }
+-
+-  // compute alternate appearance probability for each pixel in the image
+-  vil_image_view<float> alt_prob_img(obs.ni(), obs.nj());
+-  alt_prob_img.fill(0.0f);
+-  const unsigned int n_alt = alt_appearance_priors.size();
+-  if (n_alt > 0) {
+-    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-    typename vil_image_view<float>::iterator alt_prob_it = alt_prob_img.begin();
+-    for (; img_it != obs.end(); ++img_it, ++alt_prob_it) {
+-      for (unsigned int a=0; a< n_alt; ++a) {
+-        const float alt_prob_density = boxm_apm_traits<T_data::apm_type>::apm_processor::prob_density(alt_appearance_models[a],*img_it);
+-        *alt_prob_it +=  alt_prob_density * alt_appearance_priors[a];
+-      }
+-    }
+-  }
+-
+-  // run the raytrace function
+-  std::cout<<"PASS 2"<<std::endl;
+-  typedef boxm_generate_opt2_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
+-  boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  pass_2 pass_2_functor(obs,beta_denom_img, model_prior, alt_prob_img);
+-  raytracer_2.run(pass_2_functor);
+-
+-  //aux_scene.clean_scene();
+-  std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_opt2_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
+deleted file mode 100644
+index 2447f5f483..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
++++ /dev/null
+@@ -1,219 +0,0 @@
+-#ifndef boxm_generate_opt3_sample_functor_h
+-#define boxm_generate_opt3_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM>
+-class pre_inf_functor
+-{
+-  typedef typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype aux_null_t;
+- public:
+-  //: "default" constructor
+-  pre_inf_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                  vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
+-    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //no need to write aux
+-    is_aux_=false;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value, aux_null_t & /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),obs_(i,j)); // aux_val.PI_;
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-  vil_image_view<float> alpha_integral_;
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> &pre_img_;
+-};
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_opt3_sample_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_opt3_sample_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                    vil_image_view<float> const& beta_denom)
+-    : obs_(image), beta_denom_(beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux &aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), obs_(i,j));
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = (float)std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    // update observation distribution
+-    aux_val.update_obs_dist(obs_(i,j),vis);
+-    aux_val.weighted_vis_sum_ += vis*seg_len;
+-
+-    const float old_PQ = 1.0f - (float)std::exp(-cell_value.alpha * seg_len);
+-    float new_PQ = old_PQ;
+-    const float beta_denom_val = beta_denom_(i,j);
+-    const double epsilon = 1e-6;
+-    if (beta_denom_val > epsilon) {
+-      const float beta = (pre + vis*PI) / beta_denom_val;
+-      new_PQ = old_PQ * beta;
+-    }
+-    double pass_prob = 1.0 - new_PQ;
+-    if (pass_prob < epsilon) {
+-      pass_prob = epsilon;
+-    }
+-    aux_val.log_pass_prob_sum_ += (float)std::log(pass_prob);
+-    aux_val.seg_len_sum_ += seg_len;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& beta_denom_;
+-
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data, boxm_aux_type AUX_T>
+-void boxm_generate_opt3_sample(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                               vpgl_camera_double_sptr cam,
+-                               vil_image_view<typename T_data::obs_datatype> &obs,
+-                               std::string image_id,
+-                               bool black_background = false)
+-{
+-  typedef boxm_opt3_sample<boxm_aux_traits<AUX_T>::APM_TYPE> aux_sample_datatype;
+-  boxm_aux_scene<T_loc, T_data, aux_sample_datatype> aux_scene(&scene, image_id, boxm_aux_scene<T_loc, T_data, aux_sample_datatype>::CLONE);
+-#if 0
+-  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 0"<<std::endl;
+-  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-  raytracer_0.run(pass_0_functor);
+-#endif
+-  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-  typedef pre_inf_functor<T_data::apm_type> pre_inf_functor_t;
+-  boxm_raytrace_function<pre_inf_functor_t, T_loc, T_data> raytracer_1(scene,cam.ptr(),obs.ni(),obs.nj());
+-  std::cout<<"PASS 1"<<std::endl;
+-  pre_inf_functor_t pass_1_functor(obs,pre_inf,vis_inf);
+-  raytracer_1.run(pass_1_functor);
+-
+-  vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
+-
+-  // compute observation probability for "infinity" appearance model
+-  vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    // use single-mode gaussian centered at 0
+-    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
+-    typename T_data::obs_mathtype black(0);
+-    const float black_std_dev = 8.0f/255;
+-    const gauss_type appearance_dist(black, black_std_dev);
+-#if 0
+-    float peak=T_data::apm_processor::expected_color(background_apm);
+-    std::cout<<"Peak: "<<peak<<std::endl;
+-#endif
+-    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-    for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-      *PI_it = appearance_dist.prob_density(*img_it);
+-    }
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-  }
+-  else {
+-    // assume uniform prob. density on interval [0, 1]
+-    //PI_inf.fill(1.0f);
+-    // don't actually have to compute anything since multiplying by 1
+-    inf_term = vis_inf;
+-  }
+-  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
+-
+-#ifdef DEBUG
+-  vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
+-  vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
+-  vil_save(beta_denom_img, "E:/tests/capitol/beta_denom_img.tiff");
+-  vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
+-#endif
+-
+-  std::cout<<"PASS 2"<<std::endl;
+-  typedef boxm_generate_opt3_sample_functor<T_data::apm_type, aux_sample_datatype> pass_2_functor_t;
+-  boxm_raytrace_function<pass_2_functor_t, T_loc, T_data, aux_sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-  pass_2_functor_t pass_2_functor(obs, beta_denom_img);
+-  raytracer_2.run(pass_2_functor);
+-#if 0
+-  aux_scene.clean_scene();
+-#endif
+-  std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_opt3_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
+deleted file mode 100644
+index c23998293f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
++++ /dev/null
+@@ -1,164 +0,0 @@
+-#ifndef boxm_generate_opt_sample_functor_h
+-#define boxm_generate_opt_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_opt_sample_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_opt_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                          vil_image_view<float> const& Beta_denom)
+-  : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs= aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    // accumulate aux sample values
+-    aux_val.pre_ += pre * seg_len;
+-    aux_val.vis_ += vis * seg_len;
+-
+-    const float Beta_num = pre + vis*PI;
+-    float Beta = 1.0f;
+-    if (Beta_denom_(i,j) < 1e-6) {
+-      if (Beta_num > 1e-5) {
+-        Beta = 10.0f;
+-      }
+-    }
+-    else {
+-      Beta = Beta_num / Beta_denom_(i,j);
+-    }
+-    if (Beta < 0) {
+-      if (Beta < -1e-5) {
+-        std::cerr << " error: beta = " << Beta << "  setting to 0. " << '\n';
+-      }
+-      Beta = 0;
+-    }
+-    aux_val.Beta_ += Beta * seg_len;
+-    //aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& Beta_denom_;
+-
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_opt_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                 vpgl_camera_double_sptr cam,
+-                                 vil_image_view<typename T_data::obs_datatype> &obs,
+-                                 std::string iname,
+-                                 bool black_background = false)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 0"<<std::endl;
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-
+-    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 1"<<std::endl;
+-    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-    raytracer_1.run(pass_1_functor);
+-
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-
+-
+-    if (black_background) {
+-        std::cout << "using black background model" << std::endl;
+-        typename T_data::obs_datatype black(0.0f);
+-        float background_std_dev = 8.0f/255; // ???????????? 4/255 Vishal's
+-        typename T_data::apm_datatype background_apm(black, background_std_dev*background_std_dev,1.0f);
+-
+-        float peak=T_data::apm_processor::expected_color(background_apm);
+-        std::cout<<"Peak: "<<peak<<std::endl;
+-        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-        for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
+-        }
+-    }
+-    else {
+-        PI_inf.fill(1.0f);
+-    }
+-
+-    vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
+-    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
+-#ifdef DEBUG
+-    vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
+-    vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
+-    vil_save(Beta_denom_img, "E:/tests/capitol/Beta_denom_img.tiff");
+-    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
+-#endif
+-    std::cout<<"PASS 2"<<std::endl;
+-    typedef boxm_generate_opt_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
+-    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    pass_2 pass_2_functor(obs,Beta_denom_img);
+-    raytracer_2.run(pass_2_functor);
+-
+-#if 0
+-    aux_scene.clean_scene();
+-#endif
+-    std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_opt_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
+deleted file mode 100644
+index 551c049134..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
++++ /dev/null
+@@ -1,212 +0,0 @@
+-#ifndef boxm_generate_shadow_sample_functor_h
+-#define boxm_generate_shadow_sample_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_generate_shadow_sample_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_generate_shadow_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                             vil_image_view<float> const& Beta_denom, float shadow_prior, vil_image_view<float> const& shadow_density)
+-    : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1), shadow_prior_(shadow_prior), shadow_density_(shadow_density)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs= aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    float alpha_l = cell_value.alpha * seg_len; //change
+-    alpha_integral_(i,j) += alpha_l;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // grab this cell's pre and vis value
+-    const float pre = pre_img_(i,j);
+-    const float vis = vis_img_(i,j);
+-    // compute weight for this cell
+-    const float Omega = vis - vis_prob_end;
+-
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    // accumulate aux sample values
+-    aux_val.pre_ += pre * seg_len;
+-    aux_val.vis_ += vis * seg_len;  //<<changed Feb 05, 2010
+-    float Beta_num = pre + vis*PI;
+-    Beta_num *=(1.0f - shadow_prior_);
+-    Beta_num += shadow_density_(i,j);
+-    float Beta = 1.0f;
+-    if (Beta_denom_(i,j) < 1e-6) {
+-      if (Beta_num > 1e-5) {
+-        Beta = 10.0f;
+-      }
+-    }
+-    else {
+-      Beta = Beta_num / Beta_denom_(i,j);
+-    }
+-    if (Beta < 0) {
+-      if (Beta < -1e-5) {
+-        std::cerr << " error: beta = " << Beta << "  setting to 0.\n";
+-      }
+-      Beta = 0;
+-    }
+-#if 0
+-    if (mean_obs == 0.0f){
+-      std::cout << PI << ' ' << shadow_density_(i,j) << ' '
+-               << pre << ' ' << vis << ' ' << Beta_denom_(i,j)
+-               << ' ' << Beta << '\n';
+-    }
+-#endif
+-    aux_val.Beta_ += Beta * seg_len;
+-    //New discrete probability computations
+-    float PQ_prior = 1.0f - std::exp(-alpha_l);
+-    float PQ_post = Beta*PQ_prior;
+-    if (PQ_post>=0.999f) PQ_post = 0.999f;
+-    //         v------note minus sign
+-    float lg = -std::log(1.0f-PQ_post);
+-    aux_val.log_sum_ += lg;
+-    //End of new discrete probability calculations
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-  float shadow_prior_;
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& Beta_denom_;
+-
+-  //vil_image_view<float> const& pre_inf_;
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-  vil_image_view<float> shadow_density_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_initial_shadow_sampler_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                    vpgl_camera_double_sptr cam,
+-                                    vil_image_view<typename T_data::obs_datatype> &obs,
+-                                    std::string iname)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"Collect Observations"<<std::endl;
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-    std::cout<<"Samples collected\n"<<std::endl;
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_generate_shadow_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                    vpgl_camera_double_sptr cam,
+-                                    vil_image_view<typename T_data::obs_datatype> &obs,
+-                                    std::string iname,
+-                                    float shadow_prior,
+-                                    float shadow_mean,
+-                                    float shadow_sigma,
+-                                    bool black_background = false)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 0"<<std::endl;
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-
+-    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cout<<"PASS 1"<<std::endl;
+-    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-    raytracer_1.run(pass_1_functor);
+-
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-
+-
+-    if (black_background) {
+-        std::cout << "using black background model" << std::endl;
+-        typename T_data::obs_datatype black(0.0f);
+-        float background_std_dev = 8.0f/255;//???????????? 4/255 Vishal's
+-        typename T_data::apm_datatype background_apm(black, background_std_dev,1.0f);
+-
+-        float peak=T_data::apm_processor::expected_color(background_apm);
+-        std::cout<<"Peak: "<<peak<<std::endl;
+-        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-        for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
+-        }
+-    }
+-    else {
+-        PI_inf.fill(1.0f);
+-    }
+-
+-    vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
+-    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
+-
+-    boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
+-    vil_image_view<float> shadow_density(obs.ni(), obs.nj());
+-    for (unsigned j=0; j<obs.nj(); ++j)
+-      for (unsigned i=0; i<obs.ni(); ++i)
+-      {
+-        float sh_density =
+-          boxm_simple_grey_processor::prob_density(shadow_dist, obs(i,j));
+-        sh_density *=2.0f;//if Gaussian centered at 0
+-        shadow_density(i,j) = sh_density*shadow_prior;
+-        Beta_denom_img(i,j) *= (1.0f-shadow_prior);
+-        Beta_denom_img(i,j) += shadow_density(i,j);
+-      }
+-
+-#if 0
+-    vil_save(vis_inf, "E:/ShadowSite/vis_inf.tiff");
+-    vil_save(pre_inf, "E:/ShadowSite/pre_inf.tiff");
+-    vil_save(Beta_denom_img, "E:/ShadowSite/Beta_denom_img.tiff");
+-    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
+-#endif
+-    std::cout<<"PASS 2"<<std::endl;
+-    typedef boxm_generate_shadow_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
+-    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    pass_2 pass_2_functor(obs,Beta_denom_img, shadow_prior, shadow_density);
+-    raytracer_2.run(pass_2_functor);
+-
+-    //aux_scene.clean_scene();
+-    std::cout<<"DONE."<<std::endl;
+-}
+-
+-#endif // boxm_generate_shadow_sample_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
+deleted file mode 100644
+index 0b7a1f34f7..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#ifndef boxm_opt2_bayesian_optimizer_h_
+-#define boxm_opt2_bayesian_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_opt2_optimizer
+-{
+- public:
+-  boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                      std::vector<std::string>  image_ids);
+-
+-  ~boxm_opt2_optimizer()= default;
+-
+-  bool update();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
+deleted file mode 100644
+index ae00724692..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
++++ /dev/null
+@@ -1,152 +0,0 @@
+-#ifndef boxm_opt2_optimizer_hxx_
+-#define boxm_opt2_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_opt2_optimizer.h"
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_opt2_optimizer<T_loc,APM,AUX>::boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                        std::vector<std::string>  image_ids)
+-                                                        : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_opt2_optimizer<T_loc,APM,AUX>::update()
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_opt2_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-      std::vector<float> pre_vector;
+-      std::vector<float> vis_vector;
+-      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector;
+-
+-      // UPDATE METHOD #1 : "OR" of occlusion probabilities
+-      double log_pass_prob_sum = 0.0;
+-      double weighted_seg_len_sum = 0.0;
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        const float obs_seg_len = aux_samples[s].seg_len_;
+-        const float obs_weighted_seg_len = aux_samples[s].weighted_seg_len_sum_;
+-
+-        if (obs_seg_len > 1e-6) {
+-          if (obs_weighted_seg_len > 1e-6) {
+-            log_pass_prob_sum += aux_samples[s].log_pass_prob_sum_;
+-            weighted_seg_len_sum += obs_weighted_seg_len;
+-          }
+-          // add observation and vis,pre to list
+-          obs_vector.push_back(aux_samples[s].obs_ / obs_seg_len);
+-          pre_vector.push_back(aux_samples[s].pre_ / obs_seg_len);
+-          vis_vector.push_back(aux_samples[s].vis_ / obs_seg_len);
+-        }
+-      }
+-      // update the occlusion density
+-      if (weighted_seg_len_sum > 1e-6) {
+-        data.alpha = (float)(-log_pass_prob_sum / weighted_seg_len_sum);
+-      }
+-
+-      // do bounds check on new alpha value
+-      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-      const float cell_len = float(cell_bb.width());
+-      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-      if (data.alpha > max_alpha) {
+-        data.alpha = max_alpha;
+-      }
+-      if (data.alpha < min_alpha) {
+-        data.alpha = min_alpha;
+-      }
+-      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
+-        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n';
+-        //std::cerr << " log_alpha_sum = " << log_alpha_sum << ", n_actual_samples = " << n_actual_samples << '\n';
+-      }
+-      // update with new appearance
+-      const float min_sigma = 0.02f;
+-      boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, pre_vector, vis_vector, data.appearance_, min_sigma);
+-
+-      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_OPT2_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-  template class boxm_opt2_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_opt2_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
+deleted file mode 100644
+index d19ab2d9f4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#ifndef boxm_opt3_optimizer_h_
+-#define boxm_opt3_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
+-class boxm_opt3_optimizer
+-{
+- public:
+-  boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                      std::vector<std::string>  image_ids);
+-
+-  ~boxm_opt3_optimizer()= default;
+-
+-  bool optimize_cells();
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
+deleted file mode 100644
+index da5f7ba0fb..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
++++ /dev/null
+@@ -1,172 +0,0 @@
+-#ifndef boxm_opt3_optimizer_hxx_
+-#define boxm_opt3_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_opt3_optimizer.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-
+-#include <vnl/vnl_random.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
+-boxm_opt3_optimizer<T_loc,APM,AUX_APM>::boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                            std::vector<std::string>  image_ids)
+-                                                            : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
+-bool boxm_opt3_optimizer<T_loc,APM,AUX_APM>::optimize_cells()
+-{
+-  constexpr unsigned int n_samples_per_obs = 10;
+-
+-  // get auxiliary scenes associated with each input image
+-  typedef boxm_opt3_sample<AUX_APM> aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  typedef typename boxm_apm_traits<APM>::obs_datatype obs_t;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<float> vis_vector;
+-  std::vector<obs_t> obs_vector;
+-  vnl_random rand_gen;
+-  std::vector<boxm_opt3_sample<AUX_APM> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        aux_samples.push_back(temp_cell.data());
+-      }
+-
+-      vis_vector.clear();
+-      obs_vector.clear();
+-
+-      double log_alpha_sum = 0.0;
+-      unsigned int n_actual_observations = 0;
+-
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        double total_seg_len = aux_samples[s].seg_len_sum_;
+-
+-        if (total_seg_len > 1e-6) {
+-          ++n_actual_observations;
+-          // compute mean vis
+-          float obs_vis = (float)(aux_samples[s].weighted_vis_sum_ / total_seg_len);
+-          // draw samples from obs_dist
+-
+-          for (unsigned int n=0; n<n_samples_per_obs; ++n) {
+-            obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::sample(aux_samples[s].obs_dist_, rand_gen);
+-            //obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::expected_color(aux_samples[s].obs_dist_);
+-            obs_vector.push_back(obs_sample);
+-            vis_vector.push_back(obs_vis);
+-          }
+-          double alpha_s = -aux_samples[s].log_pass_prob_sum_ / total_seg_len;
+-          log_alpha_sum += std::log(alpha_s);
+-        }
+-      }
+-      float alpha_new = 0.0f;
+-      if (n_actual_observations > 0) {
+-        //std::cout << "cell IN " << data.alpha << ' ' << data.appearance_<< std::endl;
+-        // compute new alpha value
+-        alpha_new = (float)std::exp(log_alpha_sum / n_actual_observations);
+-
+-        // do bounds check on new alpha value
+-        vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-        const float cell_len = float(cell_bb.width());
+-        const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-        const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-        if (alpha_new > max_alpha) {
+-          alpha_new = max_alpha;
+-        }
+-        if (alpha_new < min_alpha) {
+-          alpha_new = min_alpha;
+-        }
+-        if (!((alpha_new >= min_alpha) && (alpha_new <= max_alpha)) ){
+-          std::cerr << std::endl << "error: alpha_new = " << alpha_new << '\n'
+-                   << "n_actual_observations = " << n_actual_observations << " log_alpha_sum = " << log_alpha_sum << '\n';
+-          alpha_new = min_alpha;
+-        }
+-        else {
+-          data.alpha = alpha_new;
+-        }
+-        // update with new appearance
+-        //std::cout << obs_vector.size() << ' ' << std::endl;
+-        if (obs_vector.size() != n_samples_per_obs * n_actual_observations) {
+-          std::cerr << "error: n_samples_per_obs = " << n_samples_per_obs << " n_actual_observations = " << n_actual_observations << " obs_vector.size() " << obs_vector.size() << '\n';
+-        }
+-        boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, vis_vector, data.appearance_, 0.025f);
+-        //std::cout << "cell OUT " << data.alpha << data.appearance_ << std::endl << std::endl;
+-        cell->set_data(data);
+-      }
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_OPT3_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-  template class boxm_opt3_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_opt3_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
+deleted file mode 100644
+index c6f87c3817..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
++++ /dev/null
+@@ -1,85 +0,0 @@
+-#ifndef boxm_opt_appearance_estimator_h_
+-#define boxm_opt_appearance_estimator_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#if 0
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM>
+-void boxm_opt_compute_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
+-                                 std::vector<float> const& pre,
+-                                 std::vector<float> const& vis,
+-                                 typename boxm_apm_traits<APM>::apm_datatype &model)
+-{
+-  const float min_sigma=0.1f;
+-  // initialize appearance model estimate using visibility probabilities as weights.
+-  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,vis,model,min_sigma);
+-#if 1
+-  // use EM to refine estimate until convergence.
+-  unsigned int nobs= obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  std::vector<float> obs_weights = vis;
+-
+-  const float epsilon = 1e-4f;
+-  constexpr unsigned int max_its = 100;
+-  const float min_weight_change = 1e-5f;
+-  for (unsigned int i=0; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION
+-    for (unsigned int n=0; n<nobs; ++n) {
+-      // for each observation, assign probabilities to each of 3 possibilities
+-      // P1: observation is generated by appearance model.
+-      // P2: point is visible, but observation is generated by a point "behind" this one. (i.e. point is not on a surface)
+-      // P3: point is not visible - observation is generated by a point "ahead" of this one.
+-      const float P1 = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
+-      const float P2 = 0.0f; //post_prob[n];
+-      const float P3 = pre[n];
+-      const float normalizing_factor = P1 + P2 + P3;
+-      float new_obs_weight = 0;
+-      if (normalizing_factor > epsilon) {
+-        new_obs_weight = P1 / normalizing_factor;
+-      }
+-
+-      // compute delta weight for convergence check
+-      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
+-      if (weight_delta > max_weight_change) {
+-        max_weight_change = weight_delta;
+-      }
+-      obs_weights[n] = new_obs_weight;
+-    }
+-    // check for convergence
+-    if (max_weight_change < min_weight_change) {
+-#if 0
+-    if (nobs > 1) {
+-      std::cout << "EM converged in " << i << " iterations." << std::endl;
+-      float total_prob = 0.0f;
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        total_prob += obs_weights[n];
+-      }
+-      std::cout << "total prob for " << nobs << " observations = " << total_prob << std::endl
+-               << "sigma = " << model.sigma() << ",  gauss_weight = " << model.gauss_weight() << std::endl;
+-    }
+-#endif
+-      break;
+-    }
+-    // MAXIMIZATION
+-    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_sigma);
+-  }
+-
+-  // adjust model to account for small sample sizes.
+-  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
+-#endif
+-  return;
+-}
+-
+-#endif // boxm_opt_appearance_estimator_h_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
+deleted file mode 100644
+index 7275093568..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
++++ /dev/null
+@@ -1,36 +0,0 @@
+-#ifndef boxm_opt_rt_bayesian_optimizer_h_
+-#define boxm_opt_rt_bayesian_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_opt_rt_bayesian_optimizer
+-{
+- public:
+-  boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                 std::vector<std::string>  image_ids);
+-
+-  ~boxm_opt_rt_bayesian_optimizer()= default;
+-
+-  bool optimize_cells(double damping_factor);
+-
+- protected:
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
+deleted file mode 100644
+index 10f61e8572..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
++++ /dev/null
+@@ -1,151 +0,0 @@
+-#ifndef boxm_opt_rt_bayesian_optimizer_hxx_
+-#define boxm_opt_rt_bayesian_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_opt_rt_bayesian_optimizer.h"
+-#include "boxm_opt_appearance_estimator.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                                              std::vector<std::string>  image_ids)
+-: image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-
+-      //boxm_sample<APM> &cell_data = cell_it->data();
+-      std::vector<float> pre_vector(aux_samples.size());
+-      std::vector<float> vis_vector(aux_samples.size());
+-      //std::vector<float> post_prob_vector(aux_samples.size());
+-      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector(aux_samples.size());
+-      double Beta = 1.0;
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        float seg_len = aux_samples[s].seg_len_;
+-        if (seg_len > 1e-5) {
+-          Beta *= (aux_samples[s].Beta_ / seg_len);
+-          obs_vector[s] = aux_samples[s].obs_ / seg_len;
+-          pre_vector[s] = aux_samples[s].pre_ / seg_len;
+-          vis_vector[s] = aux_samples[s].vis_ / seg_len;
+-          //post_prob_vector[s] = aux_samples[s].post_prob_ / seg_len;
+-        }
+-        else {
+-          pre_vector[s] = 0.0f;
+-          vis_vector[s] = 0.0f;
+-          //post_prob_vector[s] = 0.0f;
+-          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
+-        }
+-      }
+-      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
+-
+-      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
+-        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
+-
+-      data.alpha *= (float)damped_Beta;
+-      // do bounds check on new alpha value
+-      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-      const float cell_len = float(cell_bb.width());
+-      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-      if (data.alpha > max_alpha) {
+-        data.alpha = max_alpha;
+-      }
+-      if (data.alpha < min_alpha) {
+-        data.alpha = min_alpha;
+-      }
+-      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
+-        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n'
+-                 << "damped_Beta = " << damped_Beta << '\n';
+-      }
+-      // update with new appearance
+-      boxm_opt_compute_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_);
+-      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-#ifdef DEBUG
+-  std::cout << "done with all cells" << std::endl;
+-#endif
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_opt_rt_bayesian_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_opt_rt_bayesian_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
+deleted file mode 100644
+index 0d50efd8a4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
++++ /dev/null
+@@ -1,67 +0,0 @@
+-#ifndef boxm_pre_infinity_functor_h
+-#define boxm_pre_infinity_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_pre_infinity_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_pre_infinity_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                            vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
+-    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute average intensity for the cell
+-    const float mean_obs_ =aux_val.obs_/aux_val.seg_len_;
+-    // compute appearance probability of observation
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),mean_obs_); // aux_val.PI_;
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-  vil_image_view<float> alpha_integral_;
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> &pre_img_;
+-};
+-
+-#endif // boxm_pre_infinity_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
+deleted file mode 100644
+index bfd4c3b08d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
++++ /dev/null
+@@ -1,109 +0,0 @@
+-#ifndef boxm_render_expected_depth_functor_h
+-#define boxm_render_expected_depth_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-#include <vil/vil_transform.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_depth_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_depth_functor(vil_image_view<float> &expected,
+-                                     vil_image_view<float> &mask_vis,
+-                                     vgl_point_3d<double> cam_center,
+-                                     unsigned int ni,unsigned nj,
+-                                     bool scene_read_only=false,
+-                                     bool is_aux=true)
+-  : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj,1), center_(cam_center)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    expected_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value, T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    const float depthexp = (float)(s1 - center_).length();
+-#if 0
+-    // compute appearance probability of observation
+-    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
+-#endif
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    expected_(i,j) += depthexp * Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float> &expected_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-  vgl_point_3d<double> center_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-class normalize_expected_functor_depth_rt
+-{
+- public:
+-  normalize_expected_functor_depth_rt(float depth_max):depth_max_(depth_max) {}
+-
+-  void operator()(float mask, float &pix) const
+-  {
+-    pix += mask*depth_max_;
+-  }
+-
+- private:
+-  float depth_max_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_depth_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vpgl_camera_double_sptr cam,
+-                          vil_image_view<float> &expected,
+-                          vil_image_view<float> &mask,
+-                          int bin = -1,                      // FIXME - unused
+-                          bool use_black_background = false) // FIXME - unused
+-{
+-  if (vpgl_perspective_camera<double> *pcam=dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-  {
+-    typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> >::LOAD);
+-
+-    typedef boxm_render_expected_depth_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
+-    boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
+-    expfunctor exp_functor(expected,mask,pcam->camera_center(),expected.ni(),expected.nj(),true,false);
+-    raytracer.run(exp_functor);
+-
+-    float max_depth=(float)boxm_utils::max_point_to_box_dist(scene.get_world_bbox(),pcam->camera_center());
+-
+-    normalize_expected_functor_depth_rt norm_fn(max_depth);
+-    vil_transform2<float,float, normalize_expected_functor_depth_rt >(mask,expected,norm_fn);
+-  }
+-}
+-
+-#endif // boxm_render_expected_depth_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
+deleted file mode 100644
+index c210b8d20f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
++++ /dev/null
+@@ -1,109 +0,0 @@
+-#ifndef boxm_render_expected_edge_image_functor_h
+-#define boxm_render_expected_edge_image_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <vnl/vnl_math.h>
+-#include <vil/vil_transform.h>
+-#include <sdet/sdet_img_edge.h>
+-
+-#ifdef DEBUG
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_edge_image_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_edge_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
+-                                          vil_image_view<float> &mask_vis, // FIXME: unused...
+-                                          unsigned int /*ni*/=0, unsigned /*nj*/=0,
+-                                          bool scene_read_only=false,
+-                                          bool is_aux=true)
+-    : expected_(expected)
+-  {
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    expected_.fill(nil);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> /*s0*/, // currently unused, see below
+-                        vgl_point_3d<double> /*s1*/,
+-                        boxm_edge_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    //const float seg_len = (float)(s1-s0).length(); // FIXME: unused...
+-
+-    // TODO: revise with segment length
+-    const float exp  = cell_value.edge_prob_;
+-
+-    // keep the max value in expected image
+-    // if (expected_(i,j) < exp)
+-    expected_(i,j) =  std::max(expected_(i,j), exp);
+-
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_expected_functor_edge
+-{
+- public:
+-  normalize_expected_functor_edge(float n_normal, unsigned int dof) : n_normal_(n_normal), dof_(dof)
+-  {
+-#ifdef DEBUG
+-    std::cout << "Degrees of freedom: " << dof << std::endl;
+-#endif
+-  }
+-
+-  void operator()(float mask, float &pix) const
+-  {
+-    pix = sdet_img_edge::convert_edge_statistics_to_probability(pix,n_normal_,dof_);
+-  }
+-
+-  float n_normal_;
+-  unsigned int dof_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_edge_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                               vpgl_camera_double_sptr cam,
+-                               vil_image_view<float> &expected,
+-                               vil_image_view<float> & mask,
+-                               float n_normal,
+-                               unsigned int num_samples, //degrees of freedom
+-                               int bin = -1) // FIXME - unused
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> >::LOAD);
+-  typedef boxm_render_expected_edge_image_functor<BOXM_EDGE_FLOAT,sample_datatype > expfunctor;
+-  boxm_raytrace_function<expfunctor,T_loc, T_data > raytracer(scene,cam.ptr(),expected.ni(),expected.nj());
+-  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
+-  raytracer.run(exp_functor);
+-
+-  normalize_expected_functor_edge<T_data> norm_fn(n_normal,num_samples-1);
+-  vil_transform2<float,float, normalize_expected_functor_edge<T_data> >(mask,expected,norm_fn);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
+deleted file mode 100644
+index 17f8da724c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
++++ /dev/null
+@@ -1,126 +0,0 @@
+-#ifndef boxm_render_expected_edge_tangent_image_functor_h
+-#define boxm_render_expected_edge_tangent_image_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <vnl/vnl_math.h>
+-#include <vil/vil_image_view.h>
+-#include <sdet/sdet_img_edge.h>
+-#include <vgl/vgl_distance.h>
+-#ifdef DEBUG
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_edge_tangent_image_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_edge_tangent_image_functor(vil_image_view<float > &expected,
+-                                                  vpgl_camera_double_sptr cam,
+-                                                  //float threshold,
+-                                                  unsigned int /*ni*/=0, unsigned /*nj*/=0,
+-                                                  bool scene_read_only=false,
+-                                                  bool is_aux=true)
+-  : expected_(expected), num_obs_(expected.ni(),expected.nj()), cam_(cam), residual(1.0)
+-  {
+-    expected_.fill(1.0);
+-    num_obs_.fill(0);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> /*s0*/, // FIXME - unused
+-                        vgl_point_3d<double> /*s1*/, // FIXME - unused
+-                        boxm_inf_line_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    //std::cout<< cell_value.residual_<<' ';
+-#if 0
+-    if (cell_value.residual_<residual) {
+-      if (expected_(i,j) > cell_value.residual_)
+-        expected_(i,j) = cell_value.residual_;
+-    }
+-#endif
+-    if (cell_value.residual_<residual) {
+-      if (expected_(i,j) > cell_value.residual_) {
+-        double u1,v1,u2,v2;
+-        vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
+-        vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
+-        cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
+-        cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
+-        vgl_point_2d<double> img_p1(u1,v1);
+-        vgl_point_2d<double> img_p2(u2,v2);
+-        double dist = length(img_p1-img_p2);
+-        if (dist > 1.0)  // for img lines shorter than a pixel don't bother
+-        {
+-          double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, i, j);
+-          if (dist_to_seg <= 0.5) { // if the current pixel is less than 0.5 pixels closer to the projected line then mark it
+-            expected_(i,j)=cell_value.residual_;
+-          }
+-        }
+-      }
+-    }
+-#if 0
+-    if (cell_value.num_obs_>2 && cell_value.residual_<residual && cell_value.num_obs_>num_obs_(i,j))
+-    {
+-      num_obs_(i,j)=cell_value.num_obs_;
+-      double u1,v1,u2,v2;
+-      vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
+-      vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
+-      cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
+-      cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
+-      if ((u1-u2)==0 && v1-v2==0)
+-      {
+-        expected_(i,j,0)=-1;
+-        expected_(i,j,1)=-1;
+-        expected_(i,j,2)=-1;
+-      }
+-      else
+-      {
+-        expected_(i,j,0)=float(u1+u2)/2;
+-        expected_(i,j,1)=float(v1+v2)/2;
+-        expected_(i,j,2)=float(vnl_math::angle_0_to_2pi(std::atan2(v2-v1,u2-u1)));
+-      }
+-    }
+-#endif // 0
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<float > &expected_;
+-  vil_image_view<unsigned> num_obs_;
+-  vpgl_camera_double_sptr cam_;
+-  float residual;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_render_edge_tangent_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                       vpgl_camera_double_sptr cam,
+-                                       vil_image_view<float> &expected)
+-                                     //  float n_normal, // FIXME - unused
+-                                     //  unsigned int num_samples, // FIXME - unused
+-                                     //  float threshold) // degrees of freedom
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> >::LOAD);
+-  typedef boxm_render_expected_edge_tangent_image_functor<BOXM_EDGE_LINE,sample_datatype > expfunctor;
+-  boxm_raytrace_function<expfunctor,T_loc, T_data> raytracer(scene, cam.ptr(),expected.ni(),expected.nj());
+-  expfunctor exp_functor(expected,cam,/*threshold,*/expected.ni(),expected.nj(),true,false);
+-  raytracer.run(exp_functor);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
+deleted file mode 100644
+index 51a2c930ce..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
++++ /dev/null
+@@ -1,103 +0,0 @@
+-#ifndef boxm_render_expected_image_functor_h
+-#define boxm_render_expected_image_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <vil/vil_transform.h>
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_render_expected_image_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_render_expected_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
+-                                     vil_image_view<float> &mask_vis,
+-                                     unsigned int ni,unsigned nj,
+-                                     bool scene_read_only=false,bool is_aux=true)
+-    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    expected_.fill(nil);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value,
+-                        T_aux /*aux_val*/)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    expected_(i,j) +=  exp* Omega;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_expected_functor_rt
+-{
+- public:
+-  normalize_expected_functor_rt(bool use_black_background) : use_black_background_(use_black_background) {}
+-
+-  void operator()(float mask, typename T_data::obs_datatype &pix) const
+-  {
+-    if (!use_black_background_) {
+-      pix += mask*0.5f;
+-    }
+-  }
+-  bool use_black_background_;
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vpgl_camera_double_sptr cam,
+-                          vil_image_view<typename T_data::obs_datatype> &expected,
+-                          vil_image_view<float> & mask,
+-                          int /*bin*/ = -1,
+-                          bool use_black_background = false)
+-{
+-  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
+-  typedef boxm_render_expected_image_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
+-  boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
+-  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
+-  raytracer.run(exp_functor);
+-
+-  normalize_expected_functor_rt<T_data> norm_fn(use_black_background);
+-  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_rt<T_data> >(mask,expected,norm_fn);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
+deleted file mode 100644
+index acbde275c3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
++++ /dev/null
+@@ -1,120 +0,0 @@
+-#ifndef boxm_render_expected_shadow_image_functor_h
+-#define boxm_render_expected_shadow_image_functor_h
+-//:
+-// \file
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <vil/vil_transform.h>
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_render_expected_shadow_image_functor
+-{
+- public:
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
+-  //: "default" constructor
+-  boxm_render_expected_shadow_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
+-                                            vil_image_view<float> &mask_vis,
+-                                            unsigned int ni,unsigned nj,
+-                                            bool scene_read_only=false,bool is_aux=true)
+-    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    typename boxm_apm_traits<APM>::obs_datatype nil(0);
+-    expected_.fill(nil);
+-    vis_img_.fill(1.0f);
+-    scene_read_only_=scene_read_only;
+-    is_aux_=is_aux;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j,
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> &cell_value,
+-                        T_aux& aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
+-
+-    //compute sun visibility
+-    float length_sum = aux_val.seg_len_;
+-    float avg_sun_vis = 1.0f;
+-    if (length_sum>0.0f)
+-      avg_sun_vis = aux_val.vis_/length_sum;
+-
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // and update expected image
+-    expected_(i,j) +=  exp * Omega * avg_sun_vis;
+-    // update visibility probability
+-    vis_img_(i,j) = vis_prob_end;
+-    return true;
+-  }
+-
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
+-  vil_image_view<float> &vis_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_shadow_functor
+-{
+- public:
+-
+-  normalize_shadow_functor(bool use_black_background)
+-    {use_black_background_ = use_black_background;}
+-
+-  void operator()(float mask, typename T_data::obs_datatype &pix) const
+-  {
+-    if (!use_black_background_) {
+-      pix += mask*0.5f;
+-    }
+-  }
+-  bool use_black_background_;
+-};
+-
+-
+-template <class T_loc, boxm_apm_type APM ,  boxm_aux_type AUX>
+-void boxm_render_shadow_image_rt(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                 std::string const& aux_scene_id,
+-                                 vpgl_camera_double_sptr cam,
+-                                 vil_image_view<typename boxm_sample<APM>::obs_datatype> &expected,
+-                                 vil_image_view<float> & mask,
+-                                 bool use_black_background = false)
+-{
+-  typedef boxm_sample<APM> T_data;
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
+-  boxm_aux_scene<T_loc, T_data, T_aux> aux_scene(&scene, aux_scene_id, boxm_aux_scene<T_loc, T_data, T_aux>::LOAD);
+-
+-  typedef boxm_render_expected_shadow_image_functor<T_loc, APM, AUX > exp_funct;
+-
+-  boxm_raytrace_function<exp_funct, T_loc, T_data, T_aux > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
+-  exp_funct expf(expected,mask,expected.ni(),expected.nj(),true,true);
+-  raytracer.run(expf);
+-
+-  normalize_shadow_functor<T_data> norm_fn(use_black_background);
+-  vil_transform2<float,typename T_data::obs_datatype, normalize_shadow_functor<T_data> >(mask,expected,norm_fn);
+-
+-  //  aux_scene.clean_scene();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h b/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
+deleted file mode 100644
+index 78df79d9c4..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
++++ /dev/null
+@@ -1,447 +0,0 @@
+-#ifndef boxm_rpc_registration_h_
+-#define boxm_rpc_registration_h_
+-//:
+-// \file
+-// This part contains the correction rpc camera parameters using the expected
+-// edge image obtained from the world (scene) and edge map of the current image.
+-// if the camera parameters are manually corrected by the user, this part should
+-// be omitted by setting the "rpc_correction_flag" parameter to 0 (false) in the
+-// boxm_rpc_registration_process.
+-//
+-// \author Ibrahim Eden
+-// \date   Jan, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//     Feb 1st, 2010 Gamze Tunali
+-//         This piece of code is moved from bvxm_rpc_registration process to this file
+-//         as a standalone function to be used in boxm/opt/boxm_rpc_registration_process
+-// \endverbatim
+-
+-
+-#include <iostream>
+-#include <fstream>
+-#include <limits>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-#include <vpgl/algo/vpgl_backproject.h>
+-#include <vpgl/vpgl_lvcs.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vil/vil_image_view.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-int convert_uncertainty_from_meters_to_pixels(float uncertainty,
+-                                              vpgl_lvcs lvcs,
+-                                              vpgl_camera_double_sptr camera)
+-{
+-  // estimate the offset search size in the image space
+-  vgl_box_3d<double> box_uncertainty(-uncertainty,-uncertainty,-uncertainty,uncertainty,uncertainty,uncertainty);
+-  std::vector<vgl_point_3d<double> > box_uncertainty_corners = boxm_utils::corners_of_box_3d(box_uncertainty);
+-  vgl_box_2d<double> roi_uncertainty;
+-
+-  for (auto curr_corner : box_uncertainty_corners) {
+-    vgl_point_3d<double> curr_pt;
+-    if (camera->type_name()=="vpgl_local_rational_camera") {
+-      curr_pt.set(curr_corner.x(),curr_corner.y(),curr_corner.z());
+-    }
+-    else if (camera->type_name()=="vpgl_rational_camera") {
+-      double lon, lat, gz;
+-      lvcs.local_to_global(curr_corner.x(), curr_corner.y(), curr_corner.z(),
+-                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-      curr_pt.set(lon, lat, gz);
+-    }
+-    else // dummy initialisation, to avoid compiler warning
+-      curr_pt.set(-1e99, -1e99, -1.0);
+-
+-    double curr_u,curr_v;
+-    camera->project(curr_pt.x(),curr_pt.y(),curr_pt.z(),curr_u,curr_v);
+-    vgl_point_2d<double> p2d_uncertainty(curr_u,curr_v);
+-    roi_uncertainty.add(p2d_uncertainty);
+-  }
+-
+-  return vnl_math::ceil(0.5*std::max(roi_uncertainty.width(),roi_uncertainty.height()));
+-}
+-
+-template<class T_loc, class T_data>
+-bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
+-                           vil_image_view<vxl_byte> edge_image,
+-                           vil_image_view<vxl_byte> expected_edge_image,
+-                           vpgl_camera_double_sptr camera,
+-                           vpgl_camera_double_sptr camera_out,
+-                           bool rpc_shift_3d_flag,
+-                           float uncertainty,
+-                           float n_normal, // FIXME - unused
+-                           unsigned num_observations)
+-{
+-  double max_prob = std::numeric_limits<double>::min();
+-  unsigned int best_offset_u = 0, best_offset_v = 0;
+-
+-  typedef boct_tree<T_loc,T_data> tree_type;
+-  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-
+-  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
+-  int ni = edge_image.ni();
+-  int nj = edge_image.nj();
+-
+-  // this is the two level offset search algorithm
+-  int offset_lower_limit_u = -offset_search_size;
+-  int offset_lower_limit_v = -offset_search_size;
+-  int offset_upper_limit_u =  offset_search_size;
+-  int offset_upper_limit_v =  offset_search_size;
+-  std::cout << "Estimating image offsets:" << std::endl;
+-  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
+-    std::cout << '.';
+-    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
+-      // for each offset pair (u,v)
+-      double prob = 0.0;
+-      double norm = 0.0;
+-      // find the total probability of the edge image given the expected edge image
+-      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
+-        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
+-          if (edge_image(m,n)==255) {
+-            prob += expected_edge_image(m-u,n-v);
+-          }
+-          norm += expected_edge_image(m-u,n-v);
+-        }
+-      }
+-
+-      if (norm>0.0)
+-          prob/=norm;
+-
+-      // if maximum is found
+-      if (prob > max_prob) {
+-        max_prob = prob;
+-        best_offset_u = u;
+-        best_offset_v = v;
+-      }
+-    }
+-  }
+-  std::cout << std::endl;
+-
+-  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
+-  // local variables
+-  std::ifstream file_inp;
+-  std::ofstream file_out;
+-  file_out.clear();
+-  file_out.open("offsets.txt",std::ofstream::app);
+-  file_out << best_offset_u << ' ' << best_offset_v << '\n';
+-  file_out.close();
+-
+-  double nlx=0.f,nly=0.f,nlz=0.f;
+-  double motion_mult = 0.0;
+-  if (rpc_shift_3d_flag)
+-  {
+-    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
+-
+-    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
+-    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
+-
+-    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
+-    vgl_point_3d<double> init_point(0.0,0.0,0.001);
+-    vgl_point_3d<double> world_point;
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
+-
+-    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
+-    motion_plane_normal = normalize(motion_plane_normal);
+-    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
+-
+-    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
+-    vgl_point_3d<double> moved_origin;
+-    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
+-
+-    vgl_vector_3d<double> motion = moved_origin - origin_3d;
+-
+-    motion_mult = 1.0/((double)(num_observations+1));
+-    motion = motion*motion_mult;
+-
+-    double lx,ly,lz;
+-    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
+-    lx = rpc_origin.x();
+-    ly = rpc_origin.y();
+-    lz = rpc_origin.z();
+-
+-    lx = lx*(1.0f-(double)motion_mult);
+-    ly = ly*(1.0f-(double)motion_mult);
+-    lz = lz*(1.0f-(double)motion_mult);
+-
+-    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
+-    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
+-
+-    nlx = (double)pt_3d_updated.x();
+-    nly = (double)pt_3d_updated.y();
+-    nlz = (double)pt_3d_updated.z();
+-
+-    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
+-    scene->set_rpc_origin(new_rpc_origin);
+-  }
+-
+-  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
+-  // the following block of code takes care of different input camera types
+-  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
+-  bool is_local_cam = true;
+-  bool is_rational_cam = true;
+-  vpgl_local_rational_camera<double> *cam_inp_local;
+-  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
+-    is_local_cam = false;
+-  }
+-  vpgl_rational_camera<double> *cam_inp_rational;
+-  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
+-    is_rational_cam = false;
+-  }
+-
+-  if (is_local_cam) {
+-    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
+-    double offset_u,offset_v;
+-    cam_out_local.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_local.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
+-  }
+-  else if (is_rational_cam) {
+-    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
+-    double offset_u,offset_v;
+-    cam_out_rational.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_rational.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
+-  }
+-  else {
+-    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
+-    return false;
+-  }
+-
+-  return true;
+-}
+-
+-
+-template<class T_loc, class T_data>
+-bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
+-                           vil_image_view<float> edge_image,
+-                           vil_image_view<float > expected_edge_image,
+-                           vpgl_camera_double_sptr camera,
+-                           vpgl_camera_double_sptr camera_out,
+-                           bool rpc_shift_3d_flag,
+-                           float uncertainty,
+-                           unsigned num_observations)
+-{
+-  double max_cost = std::numeric_limits<double>::max();
+-  unsigned int best_offset_u = 0, best_offset_v = 0;
+-  double subpixel_best_offset_u = 0.0, subpixel_best_offset_v = 0.0;
+-
+-  typedef boct_tree<T_loc,T_data> tree_type;
+-  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-
+-  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
+-  int ni = edge_image.ni();
+-  int nj = edge_image.nj();
+-
+-  std::cout<<ni<<','<<nj<<','<<expected_edge_image.ni()<<','<<expected_edge_image.nj();
+-  // this is the two level offset search algorithm
+-  int offset_lower_limit_u = -offset_search_size;
+-  int offset_lower_limit_v = -offset_search_size;
+-  int offset_upper_limit_u =  offset_search_size;
+-  int offset_upper_limit_v =  offset_search_size;
+-  std::cout << "Estimating image offsets:" << std::endl;
+-  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
+-    std::cout << '.';
+-    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
+-      // for each offset pair (u,v)
+-      double cost = 0.0;
+-      double norm = 0.0;
+-      // find the total probability of the edge image given the expected edge image
+-      for (int m=offset_search_size+1; m<ni-offset_search_size-1; m++) {
+-        for (int n=offset_search_size+1; n<nj-offset_search_size-1; n++) {
+-          if (edge_image(m,n,0)>-1 && edge_image(m,n,1)>-1 && edge_image(m,n,2)>-1) {
+-            if (expected_edge_image(m-u,n-v,0)>0 && expected_edge_image(m-u,n-v,1)>0 && expected_edge_image(m-u,n-v,2)>0) {
+-            //std::cout<<'.';
+-            float sintheta1=std::sin(edge_image(m,n,2));
+-            float costheta1=std::cos(edge_image(m,n,2));
+-
+-            float sintheta2=std::sin(expected_edge_image(m-u,n-v,2));
+-            float costheta2=std::cos(expected_edge_image(m-u,n-v,2));
+-#if 0
+-            float dx=expected_edge_image(m-u,n-v,0)+u-edge_image(m,n,0);
+-            float dy=expected_edge_image(m-u,n-v,1)+v-edge_image(m,n,1);
+-
+-            float dist=std::sqrt(dx*dx+dy*dy);
+-            if (dist<min_dist)
+-              min_dist=dist;
+-
+-            float dist1=std::sqrt((dx*sintheta1*sintheta1+dy*sintheta1*costheta1)*(dx*sintheta1*sintheta1+dy*sintheta1*costheta1)
+-                                +(dy*costheta1*costheta1+dx*sintheta1*costheta1)*(dy*costheta1*costheta1+dx*sintheta1*costheta1));
+-            float dist2=std::sqrt((dx*sintheta2*sintheta2+dy*sintheta2*costheta2)*(dx*sintheta2*sintheta2+dy*sintheta2*costheta2)
+-                                +(dy*costheta2*costheta2+dx*sintheta2*costheta2)*(dy*costheta2*costheta2+dx*sintheta2*costheta2));
+-            if ((dist1+dist2)/2<min_dist)
+-              min_dist=(dist1+dist2)/2;
+-#endif // 0
+-            float dist=(1-std::fabs(sintheta1*sintheta2+costheta2*costheta1));//+std::sqrt(dx*dx+dy*dy);
+-            cost += dist;//(dist1+dist2)/2;
+-          }
+-          else
+-          {
+-            cost+=0.5;
+-          }
+-          norm += 1;
+-        }
+-      }
+-    }
+-
+-    if (norm>0.0)
+-        cost/=norm;
+-
+-      //std::cout<<cost<<"u "<<u<<" v"<<v<<'\n';
+-      // if maximum is found
+-      if (cost < max_cost) {
+-        max_cost = cost;
+-        best_offset_u = u;
+-        best_offset_v = v;
+-      }
+-    }
+-  }
+-  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
+-  double subpixel_offset_limit=0.5;
+-  max_cost = std::numeric_limits<double>::max();
+-  for (double u=-subpixel_offset_limit; u<=subpixel_offset_limit; ) {
+-    std::cout << '.';
+-    for (double v=-subpixel_offset_limit; v<=subpixel_offset_limit; ) {
+-      // for each offset pair (u,v)
+-      double cost = 0.0;
+-      // find the total probability of the edge image given the expected edge image
+-      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
+-        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
+-          if (edge_image(m,n,0)!=-1 || edge_image(m,n,1)!=-1 || edge_image(m,n,2)!=-1) {
+-            if (expected_edge_image(m-best_offset_u,n-best_offset_v,0)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,1)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,2)>0) {
+-              double dx=expected_edge_image(m-best_offset_u,n-best_offset_v,0)+best_offset_u+u-edge_image(m,n,0);
+-              double dy=expected_edge_image(m-best_offset_u,n-best_offset_v,1)+best_offset_v+v-edge_image(m,n,1);
+-              double dist=std::sqrt(dx*dx+dy*dy);
+-              cost += dist;
+-            }
+-          }
+-        }
+-      }
+-      //std::cout<<cost<<' ';
+-      if (cost < max_cost) {
+-          max_cost = cost;
+-          subpixel_best_offset_u = (double)u;
+-          subpixel_best_offset_v = (double)v;
+-      }
+-
+-      v=v+0.05;
+-    }
+-    u+=0.05;
+-  }
+-  std::cout << "Estimated changes in offsets (u,v)=(" << subpixel_best_offset_u << ',' << subpixel_best_offset_v << ')' << std::endl;
+-
+-  // local variables
+-  std::ifstream file_inp;
+-  std::ofstream file_out;
+-  file_out.clear();
+-  file_out.open("offsets.txt",std::ofstream::app);
+-  file_out << best_offset_u +subpixel_best_offset_u<< ' ' << best_offset_v+subpixel_best_offset_v << '\n';
+-  file_out.close();
+-
+-  double nlx=0.f,nly=0.f,nlz=0.f;
+-  double motion_mult = 0.0;
+-  if (rpc_shift_3d_flag)
+-  {
+-    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
+-
+-    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
+-    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
+-
+-    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
+-    vgl_point_3d<double> init_point(0.0,0.0,0.001);
+-    vgl_point_3d<double> world_point;
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
+-
+-    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
+-    motion_plane_normal = normalize(motion_plane_normal);
+-    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
+-
+-    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
+-    vgl_point_3d<double> moved_origin;
+-    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
+-    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
+-
+-    vgl_vector_3d<double> motion = moved_origin - origin_3d;
+-
+-    motion_mult = 1.0/((double)(num_observations+1));
+-    motion = motion*motion_mult;
+-
+-    double lx,ly,lz;
+-    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
+-    lx = rpc_origin.x();
+-    ly = rpc_origin.y();
+-    lz = rpc_origin.z();
+-
+-    lx = lx*(1.0f-(double)motion_mult);
+-    ly = ly*(1.0f-(double)motion_mult);
+-    lz = lz*(1.0f-(double)motion_mult);
+-
+-    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
+-    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
+-
+-    nlx = (double)pt_3d_updated.x();
+-    nly = (double)pt_3d_updated.y();
+-    nlz = (double)pt_3d_updated.z();
+-
+-    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
+-    scene->set_rpc_origin(new_rpc_origin);
+-  }
+-
+-  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
+-  // the following block of code takes care of different input camera types
+-  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
+-  bool is_local_cam = true;
+-  bool is_rational_cam = true;
+-  vpgl_local_rational_camera<double> *cam_inp_local;
+-  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
+-    is_local_cam = false;
+-  }
+-  vpgl_rational_camera<double> *cam_inp_rational;
+-  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
+-    is_rational_cam = false;
+-  }
+-
+-  if (is_local_cam) {
+-    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
+-    double offset_u,offset_v;
+-    cam_out_local.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_local.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
+-  }
+-  else if (is_rational_cam) {
+-    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
+-    double offset_u,offset_v;
+-    cam_out_rational.image_offset(offset_u,offset_v);
+-    offset_u += (best_offset_u*(1.0-motion_mult));
+-    offset_v += (best_offset_v*(1.0-motion_mult));
+-    cam_out_rational.set_image_offset(offset_u,offset_v);
+-    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
+-  }
+-  else {
+-    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
+-    return false;
+-  }
+-
+-  return true;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
+deleted file mode 100644
+index 0d4d93d05d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
++++ /dev/null
+@@ -1,45 +0,0 @@
+-#ifndef boxm_shadow_app_initializer_h_
+-#define boxm_shadow_app_initializer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_shadow_app_initializer
+-{
+-public:
+-
+-  boxm_shadow_app_initializer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                              std::vector<std::string>  image_ids,
+-                              float min_app_sigma,
+-                              float shadow_prior,
+-                              float shadow_mean, float shadow_sigma,
+-                              bool verbose=false);
+-
+-  ~boxm_shadow_app_initializer()= default;
+-
+-  bool initialize();
+-
+-protected:
+-
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  float min_app_sigma_;
+-  float shadow_prior_;
+-  float shadow_mean_;
+-  float shadow_sigma_;
+-  bool verbose_;
+-};
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
+deleted file mode 100644
+index 22c469ec72..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
++++ /dev/null
+@@ -1,122 +0,0 @@
+-#ifndef boxm_shadow_app_initializer_hxx_
+-#define boxm_shadow_app_initializer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_shadow_app_initializer.h"
+-#include "boxm_shadow_appearance_estimator.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_shadow_app_initializer<T_loc,APM,AUX>::boxm_shadow_app_initializer(
+-            boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-            std::vector<std::string>  image_ids, float min_app_sigma,
+-            float shadow_prior, float shadow_mean, float shadow_sigma,
+-            bool verbose)
+-  : image_ids_(std::move(image_ids)), scene_(scene), min_app_sigma_(min_app_sigma),
+-    shadow_prior_(shadow_prior), shadow_mean_(shadow_mean),
+-    shadow_sigma_(shadow_sigma),verbose_(verbose)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_shadow_app_initializer<T_loc,APM,AUX>::initialize()
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-            return false;
+-        }
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
+-      std::vector<obs_type> obs_vector;
+-      for (unsigned int s=0; s<aux_samples.size(); ++s) {
+-        float seg_len = aux_samples[s].seg_len_;
+-        obs_type obs = aux_samples[s].obs_;
+-        if ( seg_len > 1e-5 && (obs > obs_type(0)) ){
+-          obs_vector.push_back(obs / seg_len);
+-        }
+-      }
+-      unsigned n_obs = obs_vector.size();
+-      if(n_obs>1){
+-      std::vector<float> pre_vector(n_obs, 0.0f);
+-      std::vector<float> vis_vector(n_obs, 1.0f);
+-      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector,
+-                                          vis_vector, data.appearance_,
+-                                          min_app_sigma_, shadow_prior_,
+-                                          shadow_mean_, shadow_sigma_,
+-                                          verbose_);
+-      cell->set_data(data);
+-      }
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    iter++;
+-  }
+-  // clear the aux scenes
+-  for (unsigned i=0; i<aux_scenes.size(); i++)
+-    aux_scenes[i].clean_scene();
+-  return true;
+-}
+-
+-
+-#define BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_shadow_app_initializer<T1,T2,T3 >
+-
+-#endif // boxm_shadow_app_initializer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
+deleted file mode 100644
+index 15dd5763ba..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
++++ /dev/null
+@@ -1,114 +0,0 @@
+-#ifndef boxm_shadow_appearance_estimator_h_
+-#define boxm_shadow_appearance_estimator_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#if 1
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-template <boxm_apm_type APM>
+-void boxm_compute_shadow_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
+-                                    std::vector<float> const& pre,
+-                                    std::vector<float> const& vis,
+-                                    typename boxm_apm_traits<APM>::apm_datatype &model,
+-                                    float min_app_sigma,
+-                                    float shadow_prior,
+-                                    float shadow_mean, float shadow_sigma,
+-                                    bool verbose = false)
+-{
+-  std::vector<float> obs_weights(vis.size(), 0.0f);
+-  std::vector<float> sh_density(vis.size(), 0.0f);
+-  //assume that the initial appearance distribution is uniform on [0 1]
+-  //thus a reasonable initialization for weights is
+-  //
+-  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
+-  //
+-  //, where Psh is shadow_prior and psh(x) is the shadow density function,
+-  // sh_density. vis is the visibilty probability
+-  //
+-  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
+-  for(unsigned n = 0; n<obs.size(); ++n)
+-    {
+-      //2.0 x density since centered on zero
+-      sh_density[n] =
+-        2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
+-      float neu = vis[n]*(1-shadow_prior);
+-      float weight =
+-        neu/(neu + sh_density[n]*shadow_prior);
+-      obs_weights[n]=weight;
+-    }
+-  std::vector<float> initial_weights = obs_weights;
+-  // initial estimate for the illuminated appearance model
+-  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
+-  double initial_mean = model.color();
+-  double initial_sigma = model.sigma();
+-#if 1
+-  // use EM to refine estimate until convergence.
+-  unsigned int nobs= obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  const float epsilon = 1e-4f;
+-  constexpr unsigned int max_its = 100;
+-  const float min_weight_change = 1e-5f;
+-  unsigned int i=0;
+-  for (; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION - determine the weights
+-    for (unsigned int n=0; n<nobs; ++n) {
+-
+-      float PI = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
+-      float neu = PI*(1-shadow_prior);
+-      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
+-      float new_obs_weight = 0;
+-      if (den > epsilon) {
+-        new_obs_weight = neu / den;
+-      }
+-      // compute delta weight for convergence check
+-      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
+-      if (weight_delta > max_weight_change) {
+-        max_weight_change = weight_delta;
+-      }
+-      obs_weights[n] = new_obs_weight;
+-    }
+-    // check for convergence
+-    if (max_weight_change < min_weight_change)
+-      break;
+-    // MAXIMIZATION - determine the parameters of the appearance distribution
+-    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
+-  }
+-  if(verbose) {
+-    bool print = false;
+-    for(unsigned n = 0; n<obs.size(); ++n)
+-      if(obs[n]>0) print = true;
+-      if(i<max_its&&print){
+-        std::cout << "converged after " << i << " iterations.\n";
+-        std::cout << " initial mean = " << initial_mean << " final mean = "
+-                 << model.color() << '\n';
+-        std::cout << " initial sigma = " << initial_sigma << " final sigma = "
+-                 << model.sigma() << '\n';
+-      }else{ std::cout << "failed to converge\n";}
+-
+-      std::cout << "Initial (Observations, Weights):\n";
+-      for(unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
+-      std::cout << '\n';
+-      std::cout << "Final (Observations, Weights):\n";
+-      for(unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
+-      std::cout << '\n';
+-  }
+-
+-  // adjust model to account for small sample sizes.
+-  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
+-#endif
+-  return;
+-}
+-
+-#endif // boxm_shadow_appearance_estimator_h_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
+deleted file mode 100644
+index beaa3b2c7d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
++++ /dev/null
+@@ -1,51 +0,0 @@
+-#ifndef boxm_shadow_bayes_optimizer_h_
+-#define boxm_shadow_bayes_optimizer_h_
+-
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vgl/vgl_point_3d.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-class boxm_shadow_bayes_optimizer
+-{
+-public:
+-
+-  boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                              std::vector<std::string>  image_ids,
+-                              float min_app_sigma,
+-                              float shadow_prior,
+-                              float shadow_mean, float shadow_sigma,
+-                              bool verbose=false,
+-                              vgl_point_3d<double> debug_pt =
+-                              vgl_point_3d<double>(0,0,0)
+-                              );
+-
+-  ~boxm_shadow_bayes_optimizer()= default;
+-
+-  bool optimize_cells(double damping_factor);
+-
+-protected:
+-
+-  std::vector<std::string> image_ids_;
+-
+-  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
+-
+-  const float max_cell_P_;
+-  const float min_cell_P_;
+-  float min_app_sigma_;
+-  float shadow_prior_;
+-  float shadow_mean_;
+-  float shadow_sigma_;
+-  bool verbose_;
+-  vgl_point_3d<double> debug_pt_;
+-};
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
+deleted file mode 100644
+index a2d24ee683..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
++++ /dev/null
+@@ -1,195 +0,0 @@
+-#ifndef boxm_shadow_bayes_optimizer_hxx_
+-#define boxm_shadow_bayes_optimizer_hxx_
+-
+-#include <utility>
+-#include <vector>
+-#include <iostream>
+-#include <string>
+-#include "boxm_shadow_bayes_optimizer.h"
+-#include "boxm_shadow_appearance_estimator.h"
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
+-                                                                        std::vector<std::string>  image_ids, float min_app_sigma,
+-                                                                        float shadow_prior, float shadow_mean, float shadow_sigma,
+-                                                                        bool verbose, vgl_point_3d<double> debug_pt)
+-  : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f),
+-    min_app_sigma_(min_app_sigma), shadow_prior_(shadow_prior),
+-    shadow_mean_(shadow_mean), shadow_sigma_(shadow_sigma),
+-    verbose_(verbose), debug_pt_(debug_pt)
+-{}
+-
+-
+-template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
+-bool boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
+-{
+-  // get auxiliary scenes associated with each input image
+-  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
+-
+-  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
+-
+-  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
+-  for (unsigned int i=0; i<image_ids_.size(); ++i) {
+-    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
+-    aux_scenes.push_back(aux_scene);
+-  }
+-
+-  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
+-
+-  // for each block
+-  boxm_block_iterator<tree_type> iter(&scene_);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene_.load_block(iter.index());
+-    boxm_block<tree_type>* block = *iter;
+-    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
+-    boct_tree_cell<T_loc,boxm_sample<APM> >* debug_cell  = nullptr;
+-    if (verbose_)
+-      debug_cell = tree->locate_point_global(debug_pt_);
+-    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
+-
+-    // get a vector of incremental readers for each aux scene.
+-    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
+-    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
+-      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
+-    }
+-    // iterate over cells
+-    for (unsigned i=0; i<cells.size(); ++i)
+-    {
+-      aux_samples.clear();
+-      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
+-      boxm_sample<APM> data = cell->data();
+-      for (unsigned j=0; j<aux_readers.size(); j++) {
+-        boct_tree_cell<T_loc, aux_type> temp_cell;
+-
+-        if (!aux_readers[j]->next(temp_cell)) {
+-          std::cerr << "error: incremental reader returned false.\n";
+-          return false;
+-        }
+-        if (!temp_cell.code_.isequal(&(cell->code_))) {
+-          std::cerr << "error: temp_cell idx does not match cell idx.\n";
+-          return false;
+-        }
+-        if (temp_cell.data().seg_len_ > 0.0f) {
+-          aux_samples.push_back(temp_cell.data());
+-        }
+-      }
+-      unsigned n_samp = aux_samples.size();
+-      std::vector<float> pre_vector(n_samp);
+-      std::vector<float> vis_vector(n_samp);
+-      // new discrete probability code
+-      float log_sum = 0.0f;
+-      float total_length_sum = 0.0f;
+-      //===
+-      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
+-      std::vector<obs_type> obs_vector(n_samp);
+-//#if 0 // old beta calculation
+-      double Beta = 1.0;
+-//#endif
+-      if (verbose_&&cell == debug_cell){
+-        std::cout << "Contents of Debug Cell\n"
+-                 << "s    vis[s]    pre[s]    beta[s]\n";
+-      }
+-      double vis_sum = 0;
+-      for (unsigned int s=0; s<n_samp; ++s) {
+-        float seg_len_sum = aux_samples[s].seg_len_;
+-        obs_type obs = aux_samples[s].obs_;
+-        if (seg_len_sum > 1e-5) {
+-          obs_vector[s] = obs / seg_len_sum;
+-          float pre = aux_samples[s].pre_ / seg_len_sum;
+-          float vis = aux_samples[s].vis_ / seg_len_sum;
+-          pre_vector[s] = pre;
+-          vis_vector[s] = vis;
+-
+-//#if 0 // old beta calculation
+-          double beta_s = (aux_samples[s].Beta_ / seg_len_sum);
+-          Beta *= beta_s;
+-//#else // New discrete prob code
+-          log_sum += aux_samples[s].log_sum_;
+-          total_length_sum += seg_len_sum;
+-//#endif
+-          // ====
+-          if (cell == debug_cell)
+-          {
+-            std::cout << s << ' ' << vis << ' ' << pre << ' '
+-                     << beta_s << '\n';
+-          }
+-        }
+-        else {
+-          pre_vector[s] = 0.0f;
+-          vis_vector[s] = 0.0f;
+-          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
+-        }
+-      }
+-      vis_sum /= n_samp;
+-
+-#if 0 // old beta calculation
+-      double damped_Beta = 1.0;
+-      if (n_samp>1.0){
+-        damped_Beta = std::pow(Beta, 1.0/n_samp);
+-      }
+-#else
+-      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
+-
+-      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
+-        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
+-
+-      data.alpha *= static_cast<float>(damped_Beta);
+-
+-      float alpha_post = data.alpha;
+-      if (total_length_sum > 0.0f) alpha_post = log_sum/total_length_sum;
+-      data.alpha = alpha_post;
+-#endif
+-      // do bounds check on new alpha value
+-      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
+-      const float cell_len = float(cell_bb.width());
+-      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
+-      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
+-      if (data.alpha > max_alpha) {
+-        data.alpha = max_alpha;
+-      }
+-      if (data.alpha < min_alpha) {
+-        data.alpha = min_alpha;
+-      }
+-      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
+-        std::cerr << "\nerror: data.alpha = " << data.alpha << std::endl;
+-      }
+-      // update with new appearance
+-      bool print_p = false;
+-      if (verbose_&&cell == debug_cell){
+-        std::cout << "Cell Level = " << cell->level()
+-                 << "  AlphaPosterior  = " << data.alpha << '\n';
+-        print_p = true;
+-      }
+-      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_, min_app_sigma_, shadow_prior_, shadow_mean_, shadow_sigma_, print_p);
+-      cell->set_data(data);
+-    }
+-    scene_.write_active_block();
+-    for (unsigned int i=0; i<aux_readers.size(); ++i) {
+-      aux_readers[i]->close();
+-    }
+-    ++iter;
+-  }
+-
+-  // clear the aux scenes so that its starts with the refined scene next time
+-  for (unsigned i=0; i<aux_scenes.size(); i++) {
+-    aux_scenes[i].clean_scene();
+-  }
+-
+-  return true;
+-}
+-
+-
+-#define BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
+-template class boxm_shadow_bayes_optimizer<T1,T2,T3 >
+-
+-#endif // boxm_shadow_bayes_optimizer_hxx_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
+deleted file mode 100644
+index 798aac81a9..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
++++ /dev/null
+@@ -1,103 +0,0 @@
+-#ifndef boxm_sun_vis_prob_functor_h
+-#define boxm_sun_vis_prob_functor_h
+-//:
+-//\file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include "boxm_pre_infinity_functor.h"
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <bpgl/algo/bpgl_camera_from_box.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_sun_vis_prob_functor
+-{
+- public:
+-  //: "default" constructor
+-  boxm_sun_vis_prob_functor(unsigned sun_ni, unsigned sun_nj)
+-  : sun_ni_(sun_ni), sun_nj_(sun_nj)
+-  {
+-    alpha_integral_ = vil_image_view<float>(sun_ni_, sun_nj_);
+-    alpha_integral_.fill(0.0f);
+-
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-
+-    // accumulate segment length
+-    aux_val.seg_len_ += seg_len;
+-
+-    // current sun visibility
+-    const float sun_vis = std::exp(-alpha_integral_(i,j));
+-
+-    // update sun vis
+-    aux_val.vis_ +=  sun_vis * seg_len;
+-
+-    // update alpha integral along sun ray i, j
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  unsigned sun_ni_;
+-  unsigned sun_nj_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <class T_loc, class T_data, boxm_aux_type AUX_T>
+-void boxm_sun_vis_prob(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                       vgl_vector_3d<double> sun_angle,
+-                       std::string sun_occ_name)
+-{
+-  // scene bounding box
+-  vgl_box_3d<double> world_bb = scene.get_world_bbox();
+-  unsigned max_level = scene.max_level();
+-  unsigned sun_ni = 1<<max_level;//twice as many
+-  unsigned sun_nj = sun_ni;
+-  vpgl_affine_camera<double> sun_cam =
+-  bpgl_camera_from_box::affine_camera_from_box(world_bb, -sun_angle, sun_ni, sun_nj);
+-
+-  vpgl_camera_double_sptr cam = new vpgl_affine_camera<double> (sun_cam);
+-
+-  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
+-  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,sun_occ_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
+-
+-  std::cout<<"Sun visibility"<<std::endl;
+-  // functor to accumulate sun visibility
+-  typedef boxm_sun_vis_prob_functor<T_data::apm_type, sample_datatype> sun_vis;
+-
+-  // set up the raytrace function
+-  boxm_raytrace_function<sun_vis,T_loc, T_data, sample_datatype> raytracer_vis(scene,aux_scene,cam.ptr(),sun_ni,sun_nj);
+-
+-  // construct the sun visibility functor need only sun ray space dimensions
+-  sun_vis sun_vis_functor(sun_ni, sun_nj);
+-
+-  // run the functor over the octree
+-  raytracer_vis.run(sun_vis_functor);
+-  std::cout<<"Sun Occlusion Done."<<std::endl;
+-}
+-
+-#endif // boxm_sun_vis_prob_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
+deleted file mode 100644
+index cc1567a545..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
++++ /dev/null
+@@ -1,172 +0,0 @@
+-#ifndef boxm_update_image_functor_h
+-#define boxm_update_image_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
+-#include <vil/vil_math.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_update_image_functor_pass_2
+-{
+- public:
+-  //: "default" constructor
+-  boxm_update_image_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
+-                                   vil_image_view<float> const& normalizing_img)
+-  : obs_(image), norm_(normalizing_img), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
+-  {
+-    alpha_integral_.fill(0.0f);
+-    pre_img_.fill(0.0f);
+-    vis_img_.fill(1.0f);
+-    //only reads info from the scene
+-    scene_read_only_=true;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    // compute segment length
+-    const float seg_len = (float)(s1 - s0).length();
+-    // compute appearance probability of observation
+-    float mean_obs= aux_val.obs_/aux_val.seg_len_;
+-    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
+-    // update alpha integral
+-    alpha_integral_(i,j) += cell_value.alpha * seg_len;
+-
+-    // compute new visibility probability with updated alpha_integral
+-    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
+-    // compute weight for this cell
+-    const float Omega = vis_img_(i,j) - vis_prob_end;
+-    // update vis and pre
+-    pre_img_(i,j) +=  PI * Omega;
+-    vis_img_(i,j) = vis_prob_end;
+-    aux_val.vis_+=seg_len*vis_img_(i,j);
+-
+-    if(norm_(i,j)>1e-10f)
+-        aux_val.updatefactor_+=(((pre_img_(i,j)+vis_img_(i,j)*PI)/norm_(i,j))* seg_len);
+-
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
+-  vil_image_view<float> const& norm_;
+-  //vil_image_view<float> const& pre_inf_;
+-  vil_image_view<float> vis_img_;
+-  vil_image_view<float> pre_img_;
+-  vil_image_view<float> alpha_integral_;
+-};
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_update_image_functor_pass_3
+-{
+- public:
+-  //: default constructor
+-  boxm_update_image_functor_pass_3()
+-  {
+-    //only reads info from the scene
+-    scene_read_only_=false;
+-    //needs to write aux
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(boxm_sample<APM> &cell_value, T_aux & aux_val)
+-  {
+-    if (aux_val.seg_len_>1e-10)
+-    {
+-      boxm_apm_traits<APM>::apm_processor::update(cell_value.appearance(),
+-                                                  aux_val.obs_/aux_val.seg_len_,
+-                                                  aux_val.vis_/aux_val.seg_len_);
+-      cell_value.alpha*=(aux_val.updatefactor_/aux_val.seg_len_);
+-      aux_val.seg_len_=0;
+-      aux_val.obs_=0;
+-      aux_val.vis_=0;
+-      aux_val.updatefactor_=0.0;
+-    }
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_update_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vpgl_camera_double_sptr cam,
+-                          vil_image_view<typename T_data::obs_datatype> &obs,
+-                          bool black_background = false)
+-{
+-    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
+-    boxm_aux_scene<T_loc, T_data, sample_datatype > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::storage_subdir(), boxm_aux_scene<T_loc, T_data, sample_datatype>::CLONE);
+-    typedef boxm_seg_length_functor<T_data::apm_type, sample_datatype>  pass_0;
+-    boxm_raytrace_function<pass_0, T_loc, T_data, sample_datatype> raytracer_0(scene, aux_scene, cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PASS 0\n";
+-    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
+-    raytracer_0.run(pass_0_functor);
+-
+-    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
+-    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
+-
+-    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
+-    boxm_raytrace_function<pass_1,T_loc, T_data,sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    std::cerr << "PASS 1\n";
+-    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
+-    raytracer_1.run(pass_1_functor);
+-
+-    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
+-
+-    typename T_data::apm_datatype background_apm;
+-
+-    if (black_background) {
+-        std::cerr << "using black background model\n";
+-        for (unsigned int i=0; i<4; ++i) {
+-            T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
+-            float peak=T_data::apm_processor::prob_density(background_apm,0.0f);
+-            std::cout<<"Peak: "<<peak<<std::endl;
+-        }
+-        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
+-        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
+-        for (; img_it != obs.end(); ++img_it, ++PI_it) {
+-            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
+-        }
+-    }
+-    else {
+-        PI_inf.fill(0.5f);
+-    }
+-
+-    vil_image_view<float> inf_term(obs.ni(), obs.nj());
+-    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
+-    vil_image_view<float> norm_img(obs.ni(), obs.nj());
+-    vil_math_image_sum<float,float,float>(pre_inf,inf_term,norm_img);
+-    std::cerr << "PASS 2\n";
+-    typedef boxm_update_image_functor_pass_2<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_2;
+-    boxm_raytrace_function<pass_2,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-    pass_2 pass_2_functor(obs,norm_img);
+-    raytracer_2.run(pass_2_functor);
+-    std::cerr << "PASS 3\n";
+-    typedef boxm_update_image_functor_pass_3<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_3;
+-    boxm_iterate_cells_function<pass_3,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> cell_tracer_3(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
+-
+-    pass_3 pass_3_functor;
+-    cell_tracer_3.run(pass_3_functor);
+-
+-    aux_scene.clean_scene();
+-    std::cerr << "DONE.\n";
+-}
+-
+-#endif // boxm_update_image_functor_h
+diff --git a/contrib/brl/bseg/boxm/algo/rt/dummy.cxx b/contrib/brl/bseg/boxm/algo/rt/dummy.cxx
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+deleted file mode 100644
+index 112a19f789..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and boxm_pro depends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+- # include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+- # include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-  set(boxm_algo_rt_pro_sources
+-      boxm_algo_rt_processes.h
+-      boxm_algo_rt_register.h   boxm_algo_rt_register.cxx
+-  )
+-
+-  #aux_source_directory(Templates boxm_algo_rt_pro_sources)
+-  aux_source_directory(processes boxm_algo_rt_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_algo_rt_pro LIBRARY_SOURCES ${boxm_algo_rt_pro_sources} )
+-
+-  target_link_libraries(boxm_algo_rt_pro boxm_algo_rt boxm_algo_pro boxm boxm_sample boxm_sample_algo boct bprb brdb brip sdet ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
+deleted file mode 100644
+index 1ec223e9d5..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
++++ /dev/null
+@@ -1,29 +0,0 @@
+-#ifndef boxm_algo_rt_processes_h_
+-#define boxm_algo_rt_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_opt_bayesian_update_process);
+-DECLARE_FUNC_CONS(boxm_update_rt_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_rt_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_depth_rt_process);
+-DECLARE_FUNC_CONS(boxm_generate_opt_samples_process);
+-DECLARE_FUNC_CONS(boxm_generate_edge_samples_process);
+-DECLARE_FUNC_CONS(boxm_edge_update_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_edge_process);
+-DECLARE_FUNC_CONS(boxm_rpc_registration_process);
+-DECLARE_FUNC_CONS(boxm_line_backproject_process);
+-DECLARE_FUNC_CONS(boxm_generate_opt2_samples_process);
+-DECLARE_FUNC_CONS(boxm_opt2_update_process);
+-DECLARE_FUNC_CONS(boxm_generate_opt3_samples_process);
+-DECLARE_FUNC_CONS(boxm_opt3_update_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
+-DECLARE_FUNC_CONS(boxm_ray_statistics_process);
+-DECLARE_FUNC_CONS(boxm_change_probability_process);
+-DECLARE_FUNC_CONS(boxm_estimate_camera_process);
+-DECLARE_FUNC_CONS(boxm_edge_refine_updates_process);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
+deleted file mode 100644
+index d0ebc7375e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
++++ /dev/null
+@@ -1,33 +0,0 @@
+-#include "boxm_algo_rt_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "boxm_algo_rt_processes.h"
+-
+-void boxm_algo_rt_register::register_datatype()
+-{
+-}
+-
+-void boxm_algo_rt_register::register_process()
+-{
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt_bayesian_update_process,"boxmOptBayesianUpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_rt_process,"boxmUpdateRTProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_rt_process, "boxmRenderExpectedRTProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_depth_rt_process, "boxmRenderExpectedDepthRTProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt_samples_process, "boxmGenerateOptSamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_edge_samples_process, "boxmGenerateEdgeSamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_update_process, "boxmEdgeUpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_process, "boxmRenderExpectedEdgeProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_rpc_registration_process, "boxmRPCRegistrationProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process, "boxmLineBackprojectProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt2_update_process,"boxmOpt2UpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt3_update_process,"boxmOpt3UpdateProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt2_samples_process,"boxmGenerateOpt2SamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt3_samples_process,"boxmGenerateOpt3SamplesProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_ray_statistics_process,"boxmRayStatisticsProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_change_probability_process,"boxmChangeProbabilityProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_estimate_camera_process,"boxmEstimateCameraProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_refine_updates_process, "boxmEdgeRefineUpdatesProcess");
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
+deleted file mode 100644
+index c060c1220f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_algo_rt_register_h_
+-#define boxm_algo_rt_register_h_
+-
+-class boxm_algo_rt_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_algo_rt_register_h_
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
+deleted file mode 100644
+index d7d9002e0c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
++++ /dev/null
+@@ -1,120 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining expected depth map for the world
+-//
+-// \author Vishal Jain
+-// \date Aug 26, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_change_probability_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_change_probability_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_change_probability_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_change_probability_process_globals;
+-
+-  //process takes 4 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vil_image_view_base_sptr";
+-  input_types_[2] = "vpgl_camera_double_sptr";
+-  //input_types_[3] = "unsigned";
+-  //input_types_[4] = "unsigned";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_change_probability_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_change_probability_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vil_image_view_base_sptr input_img_ptr=pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-
+-  unsigned ni=input_img_ptr->ni();
+-  unsigned nj=input_img_ptr->nj();
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    vil_image_view<float> mask(ni,nj,1);
+-    vil_image_view<float> expected(ni,nj,1);
+-
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene,img_in, camera, expected, mask);
+-    img_mask = new vil_image_view<float>(mask);
+-    img = new vil_image_view<float>(expected);
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    vil_image_view<float> mask(ni,nj,1);
+-    vil_image_view<float> expected(ni,nj,1);
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-
+-    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene,img_in, camera, expected, mask);
+-    img_mask = new vil_image_view<float>(mask);
+-    img = new vil_image_view<float>(expected);
+-  }
+-  else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
+deleted file mode 100644
+index 1593ab6590..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
++++ /dev/null
+@@ -1,280 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of edge images
+-// \author Gamze Tunali
+-// \date   Jan, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
+-#include <boxm/algo/rt/boxm_edge_updater.h>
+-
+-#include <vil/vil_load.h>
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-
+-namespace boxm_edge_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 6;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_edge_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_edge_update_process_globals;
+-
+-  // process takes 6 inputs:
+-  //input[0]: The scene
+-  //input[1]: Image list filename
+-  //input[2]: Use ransac?
+-  //input[3]: consensus cnt, param of ransac algo, value depends on number of training images
+-  //          unless planes from this number of images agree at a voxel on a hypothesis, a 3D edge won't be formed,
+-  //          there should be at least this number of training images during the update for any kind of consensus to be met at any voxel
+-  //          (if consensus cnt < training img cnt --> edge world will be empty)
+-  //input[4]: orthogonality threshold, a good value 0.01, param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
+-  //input[5]: volume ratio denominator: a good value 128 , param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
+-  //          algo checks whether a current plane is within cell_volume/denominator radius of current hypothesis
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "bool";
+-  input_types_[3] = "int";
+-  input_types_[4] = "float";
+-  input_types_[5] = "float";
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_edge_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_edge_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-  bool use_ransac=pro.get_input<bool>(2);
+-  int consensus_cnt = pro.get_input<int>(3);
+-  auto ortho_thres = pro.get_input<float>(4);
+-  auto vol_ratio = pro.get_input<float>(5);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  std::cout << "using image ids: ";
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    std::cout << img_id << std::endl;
+-    image_ids.push_back(img_id);
+-    std::cout << img_id << ' ';
+-  }
+-  ifs.close();
+-  std::cout << std::endl;
+-
+-  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
+-    std::cout << "appearance model EDGE_FLOAT\n";
+-    typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
+-    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-    }
+-    boxm_edge_updater<short,float,float> updater(*scene, image_ids);
+-    updater.add_cells();
+-  }
+-  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
+-    std::cout << "appearance model EDGE_LINE\n";
+-    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-    }
+-
+-    boxm_edge_tangent_updater<short,float,float> updater(*scene, image_ids, use_ransac, ortho_thres, vol_ratio, consensus_cnt);
+-    updater.add_cells();
+-  }
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+-
+-//: set input and output types
+-bool boxm_edge_refine_updates_process_cons(bprb_func_process& pro)
+-{
+-  // process takes 3 inputs:
+-  //input[0]: The scene
+-  //input[1]: Image list filename
+-  //input[2]: camera list filename
+-  //input[3]: consensus cnt,
+-  std::vector<std::string> input_types_(4);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "int";
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(0);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_edge_refine_updates_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_edge_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != 4)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << 4 << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-  std::string cam_list_fname = pro.get_input<std::string>(2);
+-  int consensus_cnt = pro.get_input<int>(3);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<vil_image_view<float> > images;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  std::cout << "using image ids: ";
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    std::cout << "loading: " << img_id << std::endl;
+-
+-    vil_image_view_base_sptr loaded_image = vil_load(img_id.c_str() );
+-    if ( !loaded_image || loaded_image->pixel_format() != VIL_PIXEL_FORMAT_FLOAT) {
+-      std::cerr << "Failed to load image file: " << img_id << " or format is not FLOAT img!\n";
+-      return false;
+-    }
+-    vil_image_view<float> img(loaded_image);
+-    images.push_back(img);
+-  }
+-  ifs.close();
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifsc(cam_list_fname.c_str());
+-  if (!ifsc.good()) {
+-    std::cerr << "error opening file " << cam_list_fname << '\n';
+-    return false;
+-  }
+-
+-  std::vector<vpgl_camera_double_sptr> cameras;
+-  unsigned int n_cameras = 0;
+-  ifsc >> n_cameras;
+-  if (n_cameras != n_images) {
+-    std::cerr << "camera file and image file do not contain equal numbers of items!\n";
+-    return false;
+-  }
+-
+-  std::cout << "using cameras: ";
+-  for (unsigned int i=0; i<n_cameras; ++i) {
+-    std::string img_id;
+-    ifsc >> img_id;
+-    std::cout << "loading camera: " << img_id << std::endl;
+-
+-    vpgl_camera_double_sptr ratcam = read_local_rational_camera<double>(img_id);
+-    if ( !ratcam.as_pointer() ) {
+-      std::cerr << "Rational camera isn't local... trying global\n";
+-      ratcam = read_rational_camera<double>(img_id);
+-      if ( !ratcam.as_pointer() ) {
+-        std::cout << " camera: " << img_id << " is not local or global rational camera, not supporting any other type for now!\n";
+-        return false;
+-      }
+-    }
+-
+-    cameras.push_back(ratcam);
+-  }
+-  ifsc.close();
+-  std::cout << std::endl;
+-
+-  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
+-    std::cout << "appearance model EDGE_FLOAT\n";
+-    std::cerr << "this process is not defined for this type of scene!\n";
+-    return false;
+-  }
+-  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
+-    std::cout << "appearance model EDGE_LINE\n";
+-    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-    }
+-
+-    boxm_edge_tangent_refine_updates<short,float,float> refiner(*scene, consensus_cnt, images, cameras);
+-    refiner.refine_cells();
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
+deleted file mode 100644
+index d1010864dd..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
++++ /dev/null
+@@ -1,199 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
+-//:
+-// \file
+-#include <iostream>
+-#include <cstdio>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-
+-#include <vnl/algo/vnl_amoeba.h>
+-
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <bpgl/bpgl_camera_estimator.h>
+-#include <bpgl/bpgl_camera_estimator_amoeba.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-#include <boxm/algo/rt/boxm_expected_edge_functor.h>
+-
+-//: globals
+-namespace boxm_estimate_camera_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 3;
+-
+-  // parameter strings
+-  const std::string theta_range_ =  "theta_range";
+-  const std::string theta_step_ =  "theta_step";
+-  const std::string phi_range_ =  "phi_range";
+-  const std::string phi_step_ =  "phi_step";
+-  const std::string rot_range_ =  "rot_range";
+-  const std::string rot_step_ =  "rot_step";
+-  const std::string max_iter_rot_angle_ =  "max_iter_rot_angle";
+-  const std::string max_iter_cam_center_ =  "max_iter_cam_center";
+-}
+-
+-//: set input and output types
+-bool boxm_estimate_camera_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_estimate_camera_process_globals;
+-
+-  // process takes 3 inputs:
+-  //input[0]: The scene
+-  //input[1]: Initial camera
+-  //input[2]: Edge image
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "vpgl_camera_double_sptr";
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  // process has 3 outputs:
+-  // output[0]: The optimized camera
+-  // output[1]: Expected edge image (after camera correction)
+-  // output[2]: Expected edge image (before camera correction)
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j = 0;
+-  output_types_[j++] = "vpgl_camera_double_sptr";
+-  output_types_[j++] = "vil_image_view_base_sptr";
+-  output_types_[j++] = "vil_image_view_base_sptr";
+-  return pro.set_output_types(output_types_);
+-}
+-
+-//:  optimizes camera parameters based on edges
+-bool boxm_estimate_camera_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_estimate_camera_process_globals;
+-
+-  //check number of inputs
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  unsigned i = 0;
+-
+-  // scene
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // camera
+-  vpgl_camera_double_sptr cam_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto *cam_init = dynamic_cast<vpgl_perspective_camera<double>*>(cam_inp.ptr());
+-
+-  // image
+-  vil_image_view_base_sptr img_e_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vil_image_view<vxl_byte> img_e_vb(img_e_sptr);
+-
+-  vil_image_view<float> img_e;
+-  brip_vil_float_ops::normalize_to_interval<vxl_byte,float>(img_e_vb,img_e,0.0f,1.0f);
+-
+-  unsigned ni = img_e.ni();
+-  unsigned nj = img_e.nj();
+-
+-  double deg2rad = vnl_math::pi_over_180;
+-
+-  // parameters are in degrees
+-  double theta_range = 12.0, theta_step = 0.05, phi_range = 12.0, phi_step = 0.05, rot_range = 10.0, rot_step = 1.0;
+-  int max_iter_rot_angle = 5, max_iter_cam_center = 50;
+-
+-  pro.parameters()->get_value(theta_range_, theta_range);
+-  pro.parameters()->get_value(theta_step_, theta_step);
+-  pro.parameters()->get_value(phi_range_, phi_range);
+-  pro.parameters()->get_value(phi_step_, phi_step);
+-  pro.parameters()->get_value(rot_range_, rot_range);
+-  pro.parameters()->get_value(rot_step_, rot_step);
+-  pro.parameters()->get_value(max_iter_rot_angle_, max_iter_rot_angle);
+-  pro.parameters()->get_value(max_iter_cam_center_, max_iter_cam_center);
+-
+-#if 0
+-  std::cout << "printing boxm_estimate_camera_process parameters:\n"
+-           << "theta_range: " << theta_range << '\n'
+-           << "theta_step: " << theta_step << '\n'
+-           << "phi_range: " << phi_range << '\n'
+-           << "phi_step: " << phi_step << '\n'
+-           << "rot_range: " << rot_range << '\n'
+-           << "rot_step: " << rot_step << '\n'
+-           << "max_iter_rot_angle: " << max_iter_rot_angle << '\n'
+-           << "max_iter_cam_center: " << max_iter_cam_center << '\n';
+-#endif
+-
+-  // change the parameters into radians
+-  theta_range *= deg2rad; theta_step *= deg2rad; phi_range *= deg2rad; phi_step *= deg2rad; rot_range *= deg2rad; rot_step *= deg2rad;
+-
+-  auto *img_eei = new vil_image_view<float>(ni,nj,1);
+-  img_eei->fill(0.0f);
+-
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
+-        return false;
+-      }
+-
+-      // create the functor that finds edges
+-      typedef boxm_expected_edge_functor<short, boxm_inf_line_sample<float> > func_type;
+-      func_type func(*scene);
+-      bpgl_camera_estimator<func_type > cam_estimator(func);
+-      cam_estimator.set_estimation_params(theta_range,theta_step,phi_range,phi_step,rot_range,rot_step,max_iter_rot_angle);
+-
+-      func.apply(cam_inp,img_eei);
+-
+-      auto *img_eei_before_correction = new vil_image_view<vxl_byte>(ni,nj,1);
+-      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_before_correction,0.0f,255.0f);
+-
+-      bpgl_camera_estimator_amoeba<func_type> cost_ftn(cam_estimator,img_e,cam_inp);
+-      vnl_vector<double> x(2,1.0);
+-      vnl_amoeba amoeba(cost_ftn);
+-      amoeba.verbose = 1;
+-      amoeba.default_verbose = true;
+-      amoeba.set_relative_diameter(3.0);
+-      amoeba.set_max_iterations(max_iter_cam_center);
+-      amoeba.minimize(x);
+-      auto *cam_est = new vpgl_perspective_camera<double>(*cam_init);
+-      cost_ftn.get_result(x,cam_est);
+-
+-      vpgl_camera_double_sptr cam_ptr = new vpgl_perspective_camera<double>(*cam_est);
+-      func.apply(cam_ptr,img_eei);
+-
+-      auto *img_eei_vb = new vil_image_view<vxl_byte>(ni,nj,1);
+-      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_vb,0.0f,255.0f);
+-
+-      delete cam_est;
+-      delete img_eei;
+-
+-      // output
+-      unsigned j = 0;
+-      // update the camera and store
+-      pro.set_output_val<vpgl_camera_double_sptr>(j++, cam_ptr);
+-      // update the edge image after update and store
+-      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_vb);
+-      // update the edge image before update and store
+-      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_before_correction);
+-
+-      return true;
+-    }
+-    else
+-    {
+-      std::cerr << "boxm_estimate_camera_process: Multibin version not yet implemented\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_estimate_camera_process: undefined APM type\n";
+-    return false;
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
+deleted file mode 100644
+index bb10974eef..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
++++ /dev/null
+@@ -1,139 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Sep 15, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-
+-#include <sdet/sdet_img_edge.h>
+-
+-namespace boxm_generate_edge_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_generate_edge_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_edge_samples_process_globals;
+-
+-  //process takes 5 inputs
+-  //input[0]: The cropped edge image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: n_normal
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "float";
+-
+-  //output
+-  unsigned j = 0;
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[j++] = "float"; // new n_normal value
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_edge_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_edge_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << "boxm_generate_edge_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr edge_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string img_name =  pro.get_input<std::string>(i++);
+-  auto n_normal = pro.get_input<float>(i++);
+-
+-  // get parameters
+-  int edge_prob_mask_size = 21;
+-  pro.parameters()->get_value("edge_prob_mask_size",edge_prob_mask_size);
+-  float edge_prob_mask_sigma = 1.0f;
+-  pro.parameters()->get_value("edge_prob_mask_sigma",edge_prob_mask_sigma);
+-
+-  // check the input validity
+-  if ((edge_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-     std::cout << "boxm_generate_edge_samples_process: null input value, cannot run" << std::endl;
+-     return false;
+-  }
+-
+-  float new_n_normal=0.0;
+-
+-
+-  if (scene->appearence_model() == BOXM_EDGE_FLOAT) {
+-    vil_image_view<float> edge_prob_image;
+-    sdet_img_edge::estimate_edge_prob_image(edge_image, edge_prob_image, edge_prob_mask_size, edge_prob_mask_sigma);
+-    float edge_prob_image_mean;
+-    vil_math_mean(edge_prob_image_mean,edge_prob_image,0);
+-    vil_image_view<float> img(edge_prob_image);
+-    new_n_normal = n_normal + edge_prob_image_mean;
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_generate_edge_sample_rt<short,boxm_edge_sample<float> > (*s, camera, img, img_name);
+-    }
+-    else
+-    {
+-      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
+-    }
+-  }
+-  if (scene->appearence_model() == BOXM_EDGE_LINE) {
+-    // get the edges as an image with 3 planes (a,b,c)
+-    if (!scene->multi_bin())
+-    {
+-      typedef boxm_inf_line_sample<float> sample_type;
+-      typedef boct_tree<short, sample_type> tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      // for this case, the image should be with 4 planes, representing plane definitions
+-      vil_image_view<float> img(edge_image);
+-      boxm_generate_edge_tangent_sample_rt<short,sample_type> (*s, camera, img, img_name);
+-    }
+-    else
+-    {
+-      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_generate_edge_samples_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  pro.set_output_val<float>(0, float(new_n_normal));
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
+deleted file mode 100644
+index 06261e8d44..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
++++ /dev/null
+@@ -1,142 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to generate samples needed for boxm_opt2_optimizer_process from a given image/camera pair
+-//
+-// \author Daniel Crispell
+-// \date Feb 17, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_generate_opt2_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_generate_opt2_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt2_samples_process_globals;
+-
+-  // process takes 7 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: shadow prior
+-  //input[5]: shadow sigma
+-  //input[6]: use black background
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "float";
+-  input_types_[5] = "float";
+-  input_types_[6] = "bool";
+-
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_opt2_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt2_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_generate_opt2_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(0);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(1);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(2);
+-  std::string img_name =  pro.get_input<std::string>(3); // TODO - unused!!
+-  auto shadow_prior = pro.get_input<float>(4);
+-  auto shadow_sigma = pro.get_input<float>(5);
+-  bool use_black_background =  pro.get_input<bool>(6);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-    std::cout << "boxm_generate_opt2_samples_process: null input value, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      // create alternate appearance models
+-      std::vector<float> alt_appearance_priors;
+-      std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype> alt_appearance_models;
+-      if (shadow_prior > 0.0f) {
+-        boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype shadow_model(0.0f, shadow_sigma);
+-        alt_appearance_priors.push_back(shadow_prior);
+-        alt_appearance_models.push_back(shadow_model);
+-      }
+-      if (!scene->multi_bin()) {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
+-      }
+-      else {
+-        std::cerr << "error: multi-bin scenes not supported\n";
+-      }
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      // create alternate appearance models
+-      std::vector<float> alt_appearance_priors;
+-      std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype> alt_appearance_models;
+-      if (shadow_prior > 0.0f) {
+-        boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype shadow_model;
+-        // insert a single mode with mean at 0
+-        bsta_gauss_sf1 single_mode(0.0f, shadow_sigma*shadow_sigma);
+-        shadow_model.insert(bsta_num_obs<bsta_gauss_sf1>(single_mode), 1.0f);
+-        alt_appearance_priors.push_back(shadow_prior);
+-        alt_appearance_models.push_back(shadow_model);
+-      }
+-      if (!scene->multi_bin()) {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
+-      }
+-      else {
+-        std::cerr << "error: multi-bin scenes not supported\n";
+-      }
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_generate_opt2_samples_process: unsupported APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
+deleted file mode 100644
+index 0eb591c79c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
++++ /dev/null
+@@ -1,114 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to generate samples needed for boxm_opt3_optimizer_process from a given image/camera pair
+-//
+-// \author Daniel Crispell
+-// \date Feb 17, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_generate_opt3_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_generate_opt3_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt3_samples_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: use black background
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_opt3_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt3_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_generate_opt3_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-    std::cout << "boxm_generate_opt3_samples_process: null input value, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      if (!scene->multi_bin())
+-      {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
+-      }
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-      if (!scene->multi_bin())
+-      {
+-        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
+-      }
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_generate_opt3_samples_process: unsupported APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
+deleted file mode 100644
+index fac0d9d3ae..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Sep 15, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_generate_opt_samples_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_generate_opt_samples_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt_samples_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: image name for saving scene
+-  //input[4]: use black background
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_generate_opt_samples_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_generate_opt_samples_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_generate_opt_samples_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-     std::cout << "boxm_generate_opt_samples_process: null input value, cannot run" << std::endl;
+-     return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_generate_opt_sample_rt(*s, camera,img,img_name,use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_generate_opt_samples_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
+deleted file mode 100644
+index 30a4014572..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
++++ /dev/null
+@@ -1,153 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
+-// \author Daniel Crispell
+-// \date   February 17, 2010
+-//
+-// \verbatim
+-//  Modifications
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/algo/rt/boxm_opt2_optimizer.h>
+-
+-namespace boxm_opt2_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 2;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_opt2_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt2_update_process_globals;
+-
+-  // process takes 2 inputs:
+-  //input[0]: The scene
+-  //input[1]: The filename of the text file containing list of image names
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_opt2_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt2_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  boxm_apm_type apm_type = scene_base->appearence_model();
+-
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    image_ids.push_back(img_id);
+-  }
+-  ifs.close();
+-
+-  switch (apm_type)
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt2_optimizer<short,BOXM_APM_SIMPLE_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
+-      optimizer.update();
+-
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt2_optimizer<short,BOXM_APM_MOG_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
+-      optimizer.update();
+-
+-      break;
+-    }
+-#if 0 // commented out
+-   case BOXM_APM_SIMPLE_RGB:
+-    {
+-      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#endif // 0
+-   default:
+-    std::cerr << "error - boxm_opt2_update_process: unsupported appearance model type " << apm_type << '\n';
+-    return false;
+-  }
+-
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
+deleted file mode 100644
+index 47f40dd19a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
++++ /dev/null
+@@ -1,153 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
+-// \author Daniel Crispell
+-// \date   February 17, 2010
+-//
+-// \verbatim
+-//  Modifications
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/algo/rt/boxm_opt3_optimizer.h>
+-
+-namespace boxm_opt3_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 2;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_opt3_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt3_update_process_globals;
+-
+-  // process takes 2 inputs:
+-  //input[0]: The scene
+-  //input[1]: The filename of the text file containing list of image names
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_opt3_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt3_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  boxm_apm_type apm_type = scene_base->appearence_model();
+-
+-  std::string image_list_fname = pro.get_input<std::string>(1);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << '\n';
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    image_ids.push_back(img_id);
+-  }
+-  ifs.close();
+-
+-  switch (apm_type)
+-  {
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt3_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells();
+-
+-      break;
+-    }
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt3_optimizer<short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells();
+-
+-      break;
+-    }
+-#if 0 // commented out
+-   case BOXM_APM_SIMPLE_RGB:
+-    {
+-      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#endif // 0
+-   default:
+-    std::cerr << "error - boxm_opt3_update_process: unsupported appearance model type " << apm_type << '\n';
+-    return false;
+-  }
+-
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
+deleted file mode 100644
+index 56d4d9051d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
++++ /dev/null
+@@ -1,145 +0,0 @@
+-//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for updating a boxm_scene with a set of images, using a damped version of Bayes' rule
+-// \author Daniel Crispell
+-// \date   April 2, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   Aug 3, 2009  Gamze Tunali - Moved from lemsvxl/psm_opt to vxl
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
+-
+-namespace boxm_opt_bayesian_update_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 3;
+-  constexpr unsigned int n_outputs_ = 0;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool boxm_opt_bayesian_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt_bayesian_update_process_globals;
+-
+-  // process takes 3 inputs:
+-  //input[0]: The scene
+-  //input[1]: The damping value
+-  //input[2]: The filename of the text file containing list of image names
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "float";
+-  input_types_[2] = "vcl_string";
+-
+-  // process has 0 outputs:
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool boxm_opt_bayesian_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_opt_bayesian_update_process_globals;
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the parameters
+-  // (none)
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  boxm_apm_type apm_type = scene_base->appearence_model();
+-
+-  auto damping_factor = pro.get_input<float>(1);
+-
+-  std::string image_list_fname = pro.get_input<std::string>(2);
+-
+-  // extract list of image_ids from file
+-  std::ifstream ifs(image_list_fname.c_str());
+-  if (!ifs.good()) {
+-    std::cerr << "error opening file " << image_list_fname << std::endl;
+-    return false;
+-  }
+-  std::vector<std::string> image_ids;
+-  unsigned int n_images = 0;
+-  ifs >> n_images;
+-  for (unsigned int i=0; i<n_images; ++i) {
+-    std::string img_id;
+-    ifs >> img_id;
+-    image_ids.push_back(img_id);
+-  }
+-  ifs.close();
+-
+-  switch (apm_type)
+-  {
+-    case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#if 0 // commented out
+-    case BOXM_APM_SIMPLE_RGB:
+-    {
+-      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
+-      if (!scene) {
+-        std::cerr << "error casting scene_base to scene\n";
+-        return false;
+-      }
+-      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
+-      optimizer.optimize_cells(damping_factor);
+-
+-      break;
+-    }
+-#endif // 0
+-    default:
+-      std::cerr << "error - boxm_opt_bayesian_update_process: unsupported appearance model type " << apm_type << std::endl;
+-      return false;
+-  }
+-
+-  //store output
+-  // (none)
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
+deleted file mode 100644
+index 5507b5b55b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
++++ /dev/null
+@@ -1,107 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A process for describing the attributes of a scene
+-//
+-// \author J.L. Mundy
+-// \date January 24, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <bsta/bsta_histogram_sptr.h>
+-#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
+-
+-namespace boxm_ray_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_ray_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_ray_statistics_process_globals;
+-
+-  //process takes 2 input
+-  //input[0]: scene binary file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";  //ni
+-  input_types_[3] = "unsigned";  //nj
+-
+-  // process has 1 output:
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "bsta_histogram_sptr"; // No of rays per cell Histogram
+-  //output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
+-  //output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
+-  //output_types_[3] = "unsigned";            // Number of leaves
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//: This process produces one output:
+-//  * The distribution of "Omega" values where Omega = 1-e^( alpha x length )
+-//  The following three outputs are no longer present:
+-//  * The distribution of "Sigma" values where Sigma is the std_dev of
+-//    the appearance model. (currently implemented only for simple grey)
+-//  * The histogram of levels for leaves in the octree
+-//  * The number of leaves in the tree
+-//
+-bool boxm_ray_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_ray_statistics_process_globals;
+-
+-  if ( !pro.verify_inputs() ) {
+-    std::cerr << pro.name() << ": invalid inputs\n";
+-    return false;
+-  }
+-  // assign tree type
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
+-  vpgl_camera_double_sptr cam_ptr = pro.get_input<vpgl_camera_double_sptr>(1);
+-  auto ni = pro.get_input<unsigned>(2);
+-  auto nj = pro.get_input<unsigned>(3);
+-
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
+-
+-      bsta_histogram<float> num_rays_hist;
+-      if (!compute_ray_statistics<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
+-        return false;
+-      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));    }
+-    else
+-    {
+-      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/Gaussian mixture\n";
+-      return false;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
+-  {
+-    if (!scene_ptr->multi_bin()) {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
+-
+-      bsta_histogram<float> num_rays_hist;
+-      if (!compute_ray_statistics<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
+-        return false;
+-      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));
+-    }
+-    else {
+-      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/simple_grey\n";
+-      return false;
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
+deleted file mode 100644
+index 5af8acd7f8..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
++++ /dev/null
+@@ -1,114 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining expected depth map for the world
+-//
+-// \author Vishal Jain
+-// \date Aug 26, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_image_view.h>
+-
+-namespace boxm_render_expected_depth_rt_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_depth_rt_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_depth_rt_process_globals;
+-
+-  //process takes 4 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_depth_rt_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_depth_rt_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-      vil_image_view<float> mask(ni,nj,1);
+-      vil_image_view<float> expected(ni,nj,1);
+-
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask);
+-      img_mask = new vil_image_view<float>(mask);
+-      img = new vil_image_view<float>(expected);
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-      vil_image_view<float> mask(ni,nj,1);
+-      vil_image_view<float> expected(ni,nj,1);
+-
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask);
+-      img_mask = new vil_image_view<float>(mask);
+-      img = new vil_image_view<float>(expected);
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-      vil_image_view<float> mask(ni,nj,1);
+-      vil_image_view<float> expected(ni,nj,1);
+-
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask);
+-      img_mask = new vil_image_view<float>(mask);
+-      img = new vil_image_view<float>(expected);
+-  } else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
+deleted file mode 100644
+index 74ee8c9a88..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
++++ /dev/null
+@@ -1,162 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-namespace boxm_render_expected_edge_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_edge_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_process_globals;
+-
+-  //process takes 7 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4]: n_normal
+-  //input[5]: num samples used for update
+-  //input[6]: Threshold for edges
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "float";
+-  input_types_[5] = "unsigned";
+-  input_types_[6] = "float";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[1]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_edge_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_edge_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-  auto n_normal = pro.get_input<float>(i++);
+-  // number of updates
+-  auto num_updates = pro.get_input<unsigned>(i++);
+-  //float threshold = pro.get_input<float>(i++); // FIXME: unused; see line 138
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
+-    vil_image_view<boxm_apm_traits<BOXM_EDGE_FLOAT>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_edge_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
+-        return false;
+-      }
+-      boxm_render_edge_image_rt<short, boxm_edge_sample<float> >(*scene, camera, expected, mask,n_normal,num_updates);
+-    }
+-    else
+-    {
+-      std::cerr << "Ray tracing version not yet implemented\n";
+-      return false;
+-    }
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<vxl_byte>(ni,nj,expected.nplanes());
+-    for (unsigned i=0; i<ni; i++) {
+-      for (unsigned j=0; j<nj; j++) {
+-        (*expected_byte)(i,j) = static_cast<unsigned char>(255.0*(expected(i,j)));
+-      }
+-    }
+-    img = expected_byte;
+-        img_mask = new vil_image_view<float>(mask);
+-
+-    auto *ex = new vil_image_view<float>(ni,nj,expected.nplanes());
+-    for (unsigned i=0; i<ni; i++) {
+-      for (unsigned j=0; j<nj; j++) {
+-        (*ex)(i,j) = expected(i,j);//static_cast<unsigned char>(255.0*(expected(i,j)));
+-      }
+-    }
+-    img = ex;
+-      unsigned j = 0;
+-    pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-    pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-    return true;
+-  }
+-
+-  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
+-    vil_image_view<float > expected(ni,nj,1);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      if (!scene) {
+-        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
+-        return false;
+-      }
+-      boxm_render_edge_tangent_image_rt<short, boxm_inf_line_sample<float> >(*scene, camera, expected);//, n_normal,num_updates, threshold);
+-
+-      auto *edge_image=new  vil_image_view<float >(ni,nj,1);
+-      *edge_image=expected;
+-
+-      unsigned j = 0;
+-      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
+-      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
+-      return true;
+-    }
+-    else
+-    {
+-      std::cerr << "Ray tracing version not yet implemented\n";
+-      return false;
+-    }
+-  }
+-  else {
+-    std::cerr << "boxm_render_expected_edge_process: undefined APM type\n";
+-    return false;
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
+deleted file mode 100644
+index f92621784d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
++++ /dev/null
+@@ -1,143 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for rendering an expected image of a given scene and camera.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_render_expected_rt_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_rt_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_rt_process_globals;
+-
+-  //process takes 5 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4]: black background?
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "bool";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_rt_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_rt_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
+-    }
+-    else
+-    {
+-       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
+-       return false;
+-    }
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
+-    }
+-    else
+-    {
+-       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
+-       return false;
+-    }
+-  //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
+-    }
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  } else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
+deleted file mode 100644
+index b3c1ee031e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
++++ /dev/null
+@@ -1,119 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
+-#include <iostream>
+-#include <cstdio>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for registering the RPC camera based on the edges in the world
+-// \author Gamze Tunali
+-// \date   Feb 1st, 2010
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-#include <boxm/algo/rt/boxm_rpc_registration.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: globals
+-namespace boxm_rpc_registration_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 8;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: set input and output types
+-bool boxm_rpc_registration_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_rpc_registration_process_globals;
+-
+-  // process takes 8 inputs:
+-  // input[0]: The scene
+-  // input[1]: The current camera
+-  // input[2]: The current edge image
+-  // input[3]: The expected edge image
+-  // input[4]: The flag indicating whether to align the 3D voxel world along with image
+-  // input[5]: Uncertainty in meters
+-  // input[6]: n_normal
+-  // input[7]: num_observation
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "vpgl_camera_double_sptr";
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  input_types_[i++] = "vil_image_view_base_sptr";
+-  input_types_[i++] = "bool";
+-  input_types_[i++] = "float";
+-  input_types_[i++] = "float";
+-  input_types_[i++] = "unsigned";
+-
+-  // process has 1 output:
+-  // output[0]: The optimized camera
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j = 0;
+-  output_types_[j++] = "vpgl_camera_double_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:  optimizes rpc camera parameters based on edges
+-bool boxm_rpc_registration_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_rpc_registration_process_globals;
+-
+-  //check number of inputs
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  unsigned i = 0;
+-
+-  // scene
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // camera
+-  vpgl_camera_double_sptr camera_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
+-
+-  // image
+-  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-
+-  vil_image_view_base_sptr expected_edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
+-
+-  // boolean parameter specifying the voxel world alignment state
+-  bool rpc_shift_3d_flag = pro.get_input<bool>(i++);
+-
+-  // uncertainty in meters
+-  auto uncertainty = pro.get_input<float>(i++);
+-
+-  // n_normal
+-  auto n_normal = pro.get_input<float>(i++);
+-
+-  // number of observations
+-  auto num_observation = pro.get_input<unsigned>(i++);
+-
+-  std::string edge_type="subpixel";//pro.get_input<std::string>(i++);
+-
+-  vpgl_camera_double_sptr camera_out;
+-
+-  if (edge_type=="subpixel")
+-  {
+-    vil_image_view<float > expected_edge_image(expected_edge_image_sptr);
+-    vil_image_view<float> edge_image(edge_image_sptr);
+-    boxm_rpc_registration<short,boxm_inf_line_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty, num_observation);
+-  }
+-  else {
+-    vil_image_view<vxl_byte> expected_edge_image(expected_edge_image_sptr);
+-    vil_image_view<vxl_byte> edge_image(edge_image_sptr);
+-    boxm_rpc_registration<short,boxm_edge_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty,n_normal, num_observation);
+-  }
+-
+-  // output
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<vpgl_camera_double_sptr>(j++, camera_out);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
+deleted file mode 100644
+index 128496aee8..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
++++ /dev/null
+@@ -1,136 +0,0 @@
+-// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Apr 21, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/rt/boxm_update_image_functor.h>
+-#include <boxm/boxm_apm_traits.h> // for BOXM_APM_MOG_GREY
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-namespace boxm_update_rt_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_update_rt_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_rt_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: The bin index to be updated
+-  //input[4]: Use black background?
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_update_rt_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_rt_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_update_rt_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  /* unsigned bin_index = */   pro.get_input<unsigned>(i++);
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-     std::cout << "boxm_update_rt_process: null input value, cannot run" << std::endl;
+-     return false;
+-  }
+-
+-  // Mixture of Gaussians
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, camera,img, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  // Mixture of Beta's
+-  } else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, camera,img, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  } else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_image_rt(*s, camera,img, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Not yet implemented"<<std::endl;
+-    }
+-  }
+-  else {
+-    std::cout << "boxm_update_rt_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index 1b63879e8e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_algo_rt_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_rt_pro_test_include boxm_algo_rt_pro)
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
+deleted file mode 100644
+index f43a3a7286..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/rt/pro/boxm_algo_rt_processes.h>
+-#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
+deleted file mode 100644
+index 73a8978f93..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-add_executable( boxm_algo_rt_test_all
+-  test_driver.cxx
+-  test_bayesian_optimizer.cxx
+-  test_edges.cxx
+-  test_shadow_appearance.cxx
+- )
+-
+-target_link_libraries( boxm_algo_rt_test_all boxm_algo_rt boxm boxm_util boxm_sample boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME boxm_algo_rt_test_bayesian_optimizer COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_bayesian_optimizer  )
+-add_test( NAME boxm_algo_rt_test_edges COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_edges  )
+-add_test( NAME boxm_algo_rt_test_shadow_appearance COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_shadow_appearance  )
+-add_executable( boxm_algo_rt_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_rt_test_include boxm_algo_rt)
+-add_executable( boxm_algo_rt_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_algo_rt_test_template_include boxm_algo_rt)
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
+deleted file mode 100644
+index 5ec14a4181..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
+-#include <boct/boct_tree.h>
+-#include <vul/vul_file.h>
+-
+-static void test_bayesian_optimizer()
+-{
+-  typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
+-  typedef boxm_rt_sample<float> aux_type;
+-
+-  // create the main scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_octree_levels(3,2);
+-  scene.set_paths("./boxm_scene", "block");
+-  scene.set_appearance_model(BOXM_APM_SIMPLE_GREY);
+-  x_write(std::cout, scene, "scene");
+-  vul_file::make_directory("./boxm_scene");
+-  scene.write_scene();
+-  //vsl_b_ofstream os("scene.bin");
+-  //scene.b_write(os);
+-  //os.close();
+-
+-  boxm_block_iterator<boct_tree<short,data_type> > iter(&scene);
+-  // default model
+-  boxm_simple_grey apm(0.3f, 0.4f, 0.5f);
+-
+-  boxm_sample<BOXM_APM_SIMPLE_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(apm);
+-
+-  // sample 1
+-  boxm_sample<BOXM_APM_SIMPLE_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(apm);
+-
+-  // sample 2
+-  boxm_sample<BOXM_APM_SIMPLE_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(apm);
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
+-    boct_tree<short,data_type> * tree= block->get_tree();//new boct_tree<short,data_type>(3,2);
+-    boct_tree_cell<short,data_type>* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,data_type>* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    block->get_tree()->print();
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  // create the auxiliary scenes for each image
+-  std::vector<std::string> image_names;
+-  image_names.emplace_back("image1");
+-  image_names.emplace_back("image2");
+-  image_names.emplace_back("image3");
+-  std::vector<boxm_scene<boct_tree<short,aux_type> >*> aux_scenes(image_names.size());
+-
+-  // create aux scenes
+-  for (unsigned i=0; i<image_names.size(); i++) {
+-    aux_scenes[i] = new boxm_scene<boct_tree<short,aux_type> >(scene.lvcs(), scene.origin(), scene.block_dim(), scene.world_dim());
+-    aux_scenes[i]->set_path(scene.path(),  image_names[i]);
+-    iter.begin();
+-    while (!iter.end()) {
+-      scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-      boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
+-      boct_tree<short,data_type>* tree=block->get_tree();
+-      boct_tree<short,aux_type>* aux_tree = tree->clone_to_type<aux_type>();
+-      boct_tree_cell<short,aux_type>* cell1=aux_tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-      boxm_rt_sample<float> rt;
+-      rt.seg_len_=1.0;
+-      cell1->set_data(rt);
+-      boct_tree_cell<short,aux_type>* cell2=aux_tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-      rt.seg_len_=0.5;
+-      cell2->set_data(rt);
+-      aux_scenes[i]->set_block(iter.index(), new boxm_block<boct_tree<short,aux_type> >(block->bounding_box(), aux_tree));
+-      aux_scenes[i]->write_active_block();
+-      ++iter;
+-    }
+-  }
+-
+-  boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> opt(scene, image_names);
+-  opt.optimize_cells(0.01);
+-
+-  for (unsigned i=0; i<image_names.size(); i++) {
+-    delete aux_scenes[i];
+-  }
+-}
+-
+-TESTMAIN(test_bayesian_optimizer);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
+deleted file mode 100644
+index 7473709bdf..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_bayesian_optimizer );
+-DECLARE( test_edges );
+-DECLARE( test_shadow_appearance );
+-
+-void register_tests()
+-{
+-  REGISTER( test_bayesian_optimizer );
+-  REGISTER( test_edges );
+-  REGISTER( test_shadow_appearance );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
+deleted file mode 100644
+index 6f6a62f9c6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
++++ /dev/null
+@@ -1,26 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boct/boct_tree.h>
+-
+-static void test_edges()
+-{
+-  typedef boxm_inf_line_sample<float> data_type;
+-  // create the main scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
+-  // create the auxiliary scenes for each image
+-  std::vector<std::string> image_names;
+-  image_names.emplace_back("image1");
+-  image_names.emplace_back("image2");
+-  image_names.emplace_back("image3");
+-  //boxm_edge_tangent_updater<short, float, aux_type> u(scene,imgs);
+-}
+-
+-TESTMAIN(test_edges);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
+deleted file mode 100644
+index 6b1edbffb5..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#include <boxm/algo/rt/boxm_change_3d_functor.h>
+-#include <boxm/algo/rt/boxm_change_probability_functor.h>
+-#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
+-#include <boxm/algo/rt/boxm_edge_updater.h>
+-#include <boxm/algo/rt/boxm_expected_edge_functor.h>
+-#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
+-#include <boxm/algo/rt/boxm_generate_shadow_sample_functor.h>
+-#include <boxm/algo/rt/boxm_opt2_optimizer.h>
+-#include <boxm/algo/rt/boxm_opt3_optimizer.h>
+-#include <boxm/algo/rt/boxm_opt_appearance_estimator.h>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
+-#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
+-#include <boxm/algo/rt/boxm_render_expected_shadow_image_functor.h>
+-#include <boxm/algo/rt/boxm_rpc_registration.h>
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
+-#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
+-#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.h>
+-#include <boxm/algo/rt/boxm_sun_vis_prob_functor.h>
+-#include <boxm/algo/rt/boxm_update_image_functor.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
+deleted file mode 100644
+index f97877bc43..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
+-
+-namespace test_shadow_appearance_globals
+-{
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_type;
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype app_type;
+-}
+-
+-
+-static void test_shadow_appearance()
+-{
+-  using namespace test_shadow_appearance_globals;
+-  //normalized observations square building (I-A)/(mu+ - A), partly in shadow
+-  double obs_arr[] = {0.600555,0.7,0.061111,0.748335,0.77611,0.68611,
+-                      0.148889,0.855555,0.664445,0.651665,0.101111,
+-                      0.0272222,0.67278,0.70389,0.1733335,0.77111,
+-                      0.701665,0.64778,0.65111,0.72611,0.82889,0.735,
+-                      0.077222,0.0816665,0.051111,0.71722,0.61722,
+-                      0.065,0.095,0.0866665,0.58611,0.665555};
+-  std::vector<obs_type> obs;
+-  std::vector<float> pre, vis;
+-  for (double i : obs_arr) {
+-    obs.push_back(static_cast<obs_type>(i));
+-    pre.push_back(0.0f);
+-    vis.push_back(1.0f);
+-  }
+-  float min_app_sigma = 0.05f;
+-  float shadow_prior = 0.5f;
+-  float shadow_mean = 0.0f;
+-  float shadow_sigma = 0.05f;
+-  bool verbose = true;
+-  app_type model;
+-  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(obs, pre, vis,
+-                                                       model,
+-                                                       min_app_sigma,
+-                                                       shadow_prior,
+-                                                       shadow_mean,
+-                                                       shadow_sigma,
+-                                                       verbose);
+-  double er = std::fabs(0.70034355-model.color())+
+-    std::fabs(model.sigma()- 1.0/11.954589);
+-  TEST_NEAR("test shadow appearance EM", er, 0.0, 1e-6);
+-  // normalized observations for dark road surface
+-double dark_obs_arr[] ={0.0477778,0.0666665,0.0072222,0.175,0.12,
+-                        0.162778,0.003333335,0.188889,0.233889,
+-                        0.0605555,0.0077778,0.004444445,0.0883335,
+-                        0.15,0.0716665,0.1233335,0.1983335,0.15,
+-                        0.0883335,0.03944445,0.122222,0.125,0.25,
+-                        0.005,0.0122222,0.1,0.1166665,0.03166665,
+-                        0.015,0.01,0.1016665,0.167222};
+-  std::vector<obs_type> dark_obs;
+-  for (double i : dark_obs_arr)
+-    dark_obs.push_back(static_cast<obs_type>(i));
+-  app_type dark_model;
+-  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(dark_obs, pre, vis,
+-                                                       dark_model,
+-                                                       min_app_sigma,
+-                                                       shadow_prior,
+-                                                       shadow_mean,
+-                                                       shadow_sigma,
+-                                                       verbose);
+-  double dark_er = std::fabs(0.14765342-dark_model.color())
+-                 + std::fabs(dark_model.sigma()- 1.0/16.097824);
+-  TEST_NEAR("test dark surface shadow appearance EM", dark_er, 0.0, 1e-6);
+-}
+-
+-TESTMAIN(test_shadow_appearance);
+diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
+deleted file mode 100644
+index 03c12cb61b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
+-#include <boxm/algo/rt/boxm_edge_updater.hxx>
+-#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
+-#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
+-#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
+-#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
+-#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
+deleted file mode 100644
+index 16a9fc1839..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
++++ /dev/null
+@@ -1,22 +0,0 @@
+-# brl/bseg/boxm/algo/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_algo_sp_sources
+-    boxm_compute_volume_visibility.h
+-    boxm_depth_image_triangle.h
+-    boxm_render_image.h
+-    boxm_render_image_triangle.h
+-    boxm_update.h
+-    boxm_update_triangle.h
+-    dummy.cxx
+-   )
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo_sp LIBRARY_SOURCES ${boxm_algo_sp_sources})
+-
+-#processes
+-add_subdirectory(pro)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_algo_sp boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h b/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
+deleted file mode 100644
+index 1f1bbbd6c9..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
++++ /dev/null
+@@ -1,172 +0,0 @@
+-#ifndef boxm_compute_volume_visibility_h
+-#define boxm_compute_volume_visibility_h
+-#include <iostream>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-float boxm_compute_point_visibility(vgl_point_3d<double> point,
+-                                    boxm_scene<boct_tree<T_loc, T_data > > & scene,
+-                                    vpgl_camera_double_sptr & camera )
+-{
+-  typedef boct_tree<T_loc,T_data > tree_type;
+-  // locate the cells corresponding to query volume.
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    // make a test for vertices for behind-front case
+-    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-
+-    std::cout<<"The point is "<<point;
+-    if (cam->is_behind_camera(vgl_homg_point_3d<double>(point)))
+-    return 1.0f;
+-    // first block of intersection
+-
+-    // case 1 : when the camera lies inside the scene
+-    vgl_homg_point_3d<double> cam_center_homg = cam->camera_center();
+-    vgl_point_3d<double> cam_center(cam_center_homg);
+-    vgl_point_3d<int> curr_block_index;
+-
+-    vgl_vector_3d<double> dir=(point-cam_center);
+-    double lambda0=dir.length();
+-    dir/=lambda0;
+-
+-    boxm_block<tree_type> * curr_block=scene.get_block(cam_center);
+-    vgl_point_3d<double> entry_point=cam_center;
+-    double lambda=0;
+-
+-    // case 2: camera lies outside the scene
+-    if (!curr_block)
+-    {
+-      vgl_box_3d<double> world_bb=scene.get_world_bbox();
+-      boct_face_idx face_id;
+-      if (!boxm_utils::cube_entry_point(world_bb,cam_center,dir,entry_point,lambda,face_id))
+-      return 1.0f;
+-      if (!scene.get_block_index(entry_point,curr_block_index))
+-      return 1.0f;
+-    }
+-    else
+-    {
+-      scene.get_block_index(cam_center,curr_block_index);
+-    }
+-
+-    scene.load_block(curr_block_index);
+-    curr_block=scene.get_active_block();
+-    bool continue_flag=true;
+-
+-    tree_type * tree=curr_block->get_tree();
+-
+-    vgl_point_3d<double> exit_point;
+-    boct_face_idx face_id=NONE;
+-    double alpha_int=0;
+-    boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(entry_point);
+-    while (continue_flag)
+-    {
+-      // do processing in the block
+-      if (curr_cell)
+-      {
+-        if (boxm_utils::cube_exit_point(tree->cell_bounding_box(curr_cell),
+-        cam_center,dir,exit_point,lambda,face_id))
+-        {
+-          if (lambda>lambda0)
+-          continue_flag=false;
+-          else
+-          {
+-            std::vector<boct_tree_cell<T_loc,T_data > * > neighbors;
+-            curr_cell->find_neighbors(face_id,neighbors,tree->root_level());
+-
+-            vgl_vector_3d<double> len(exit_point-entry_point);
+-            T_data data=curr_cell->data();
+-            alpha_int-=data.alpha*len.length();
+-            curr_cell=nullptr;
+-#if 0
+-            std::cout<<"Lambda= "<<lambda<<" lambda0= "<<lambda0
+-                    <<" exit_point="<<exit_point<<"# of neighbors"<< neighbors.size()<<std::endl;
+-#endif
+-            double min_dist=1e5;
+-            int min_i=-1;
+-            for (unsigned i=0;i<neighbors.size();++i)
+-            {
+-              vgl_box_3d<double> bbox=tree->cell_bounding_box(neighbors[i]);
+-              double dist=0;
+-              if (exit_point.x()<bbox.min_x())
+-                dist+=std::fabs(exit_point.x()-bbox.min_x());
+-              if (exit_point.x()>bbox.max_x())
+-                dist+=std::fabs(exit_point.x()-bbox.max_x());
+-              if (exit_point.y()<bbox.min_y())
+-                dist+=std::fabs(exit_point.y()-bbox.min_y());
+-              if (exit_point.y()>bbox.max_y())
+-                dist+=std::fabs(exit_point.y()-bbox.max_y());
+-              if (exit_point.z()<bbox.min_z())
+-                dist+=std::fabs(exit_point.z()-bbox.min_z());
+-              if (exit_point.z()>bbox.max_z())
+-                dist+=std::fabs(exit_point.z()-bbox.max_z());
+-
+-              if (dist<min_dist)
+-              {
+-                min_dist=dist;
+-                min_i=i;
+-              }
+-            }
+-            if (min_i>=0)
+-              curr_cell=neighbors[min_i];
+-            else if (neighbors.size()>0)
+-            {
+-              std::cout<<"ERROR"<<std::endl;return -1.0f;
+-            }
+-            entry_point=exit_point;
+-          }
+-        }
+-      }
+-      // when the block is exhausted obtain a new block
+-      else
+-      {
+-        if (face_id==X_LOW)
+-          curr_block_index.set(curr_block_index.x()-1,curr_block_index.y(),curr_block_index.z());
+-        if (face_id==X_HIGH)
+-          curr_block_index.set(curr_block_index.x()+1,curr_block_index.y(),curr_block_index.z());
+-        if (face_id==Y_LOW)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y()-1,curr_block_index.z());
+-        if (face_id==Y_HIGH)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y()+1,curr_block_index.z());
+-        if (face_id==Z_LOW)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()-1);
+-        if (face_id==Z_HIGH)
+-          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()+1);
+-
+-        if (scene.valid_index(curr_block_index))
+-        {
+-          scene.load_block(curr_block_index);
+-          curr_block=scene.get_active_block();
+-          tree=curr_block->get_tree();
+-          curr_cell=tree->locate_point_global(entry_point);
+-        }
+-        else
+-        {
+-          continue_flag=false;
+-        }
+-      }
+-    }
+-    return (float)std::exp(alpha_int);
+-  }
+-  else
+-  {
+-  std::cout<<"Not a perspective camera"<<std::endl;
+-  return -1.0f;
+-  }
+-}
+-
+-
+-template <class T_loc, class T_data>
+-float boxm_compute_volume_visibility(vgl_box_3d<double> bbox,
+-                                     boxm_scene<boct_tree<T_loc,T_data> > & scene,
+-                                     vpgl_camera_double_sptr & cam )
+-{
+-  // locate the cells corresponding to query volume.
+-  return boxm_compute_point_visibility<T_loc,T_data>(bbox.centroid(),scene,cam);
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
+deleted file mode 100644
+index bb07d38325..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
++++ /dev/null
+@@ -1,127 +0,0 @@
+-#ifndef boxm_depth_image_triangle_h_
+-#define boxm_depth_image_triangle_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include "boxm_render_image.h"
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vpgl/vpgl_camera.h>
+-
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_transform.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vul/vul_timer.h>
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_depth_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                         vpgl_camera_double_sptr cam,
+-                                         vil_image_view<float> &expected,
+-                                         vil_image_view<float> &mask)
+-{
+-  unsigned ni=expected.ni();
+-  unsigned nj=expected.nj();
+-  expected.fill(0.0f);
+-  vgl_plane_3d<double> projection_plane;
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
+-  vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
+-  vul_timer t;
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
+-  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
+-
+-  while (block_vis_iter.next())
+-  {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) // code for each block
+-    {
+-      t.mark();
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      t.mark();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_depth(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
+-      normalize_expected_functor norm_fn;
+-
+-      double xverts[8];
+-      double yverts[8];
+-      float vertdists[8];
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        vis_end.fill(0.0f);
+-        temp_depth.fill(0.0f);
+-        temp_weights.fill(0.0f);
+-        alpha_img_.fill(0.0f);
+-
+-        std::cout<<'.';
+-
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          //if (sample.alpha>0.001)
+-          {
+-            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-            // get  alpha
+-            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-            boxm_depth_fill(xverts, yverts, vertdists, vis_face_ids,temp_depth);
+-          }
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights_);
+-
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( temp_depth,pix_weights_, temp_depth);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(temp_depth,expected,expected);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-    }
+-  }
+-  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
+deleted file mode 100644
+index d6cd56258c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
++++ /dev/null
+@@ -1,166 +0,0 @@
+-#ifndef boxm_render_image_h_
+-#define boxm_render_image_h_
+-
+-#include <vector>
+-#include <sstream>
+-#include <iostream>
+-
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_transform.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vul/vul_timer.h>
+-
+-class normalize_expected_functor
+-{
+- public:
+-  normalize_expected_functor() = default;
+-
+-  void operator()(float  norm, float & val) const
+-  {
+-    if (norm>0)
+-      val/=norm;
+-  }
+-};
+-
+-class image_exp_functor
+-{
+- public:
+-  float operator()(float x) const { return x<0?std::exp(x):1.0f; }
+-};
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_render_image_splatting(boxm_scene<boct_tree<T_loc,T_data> >& scene,
+-                                 vpgl_camera_double_sptr cam,
+-                                 vil_image_view<typename T_data::obs_datatype>& expected,
+-                                 vil_image_view<float>& /*mask*/,       // TODO: use this param
+-                                 int bin=-1,
+-                                 bool /*use_black_background*/ = false) // TODO: use this param
+-{
+-  unsigned ni=expected.ni();
+-  unsigned nj=expected.nj();
+-  expected.fill(0.0f);
+-
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
+-  vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
+-
+-  vul_timer t;
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
+-  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
+-
+-  int cnt=0;
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-
+-      t.mark();
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
+-
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      std::cout<<"Block: "<<curr_block->bounding_box()<<std::endl
+-              <<"Tree: "<<curr_block->get_tree()->number_levels()
+-              << " #of leaf cells "<<curr_block->get_tree()->leaf_cells().size()<<std::endl;
+-
+-      t.mark();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(expected.ni(),expected.nj(),3);
+-      vil_image_view<float> back_xyz(expected.ni(),expected.nj(),3);
+-      vil_image_view<float> alphas(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
+-      normalize_expected_functor norm_fn;
+-
+-      double  xverts[8];
+-      double  yverts[8];
+-
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        front_xyz.fill(0.0f);
+-        back_xyz.fill(0.0f);
+-        alphas.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        temp_weights.fill(0.0f);
+-        std::cout<<'.';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          //if (sample.alpha>0.001)
+-          {
+-            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-            boxm_utils::project_corners(corners,cam,xverts,yverts);
+-            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-            boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
+-            // get expected color of cell
+-            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
+-            // get  alpha
+-            boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-            // fill expected value image
+-            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
+-            boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
+-         }
+-        }
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(expected.ni(),expected.nj(),1);
+-
+-        len_seg.fill(0.0f);
+-        std::stringstream s,s1;
+-
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,back_xyz);
+-        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
+-        vil_math_sqrt<float>(len_seg);
+-        vil_math_image_product(len_seg,alphas, alphas);
+-        vil_transform2(temp_weights,temp_expected,norm_fn);
+-        ++cnt;
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,vis);
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( temp_expected,vis, temp_expected);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(temp_expected,expected,expected);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
+deleted file mode 100644
+index abcca0dbe5..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
++++ /dev/null
+@@ -1,167 +0,0 @@
+-#ifndef boxm_render_image_triangle_h_
+-#define boxm_render_image_triangle_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include "boxm_render_image.h"
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-
+-#include <vil/vil_image_view.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_transform.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vul/vul_timer.h>
+-
+-
+-//: Functor class to normalize expected image
+-template<class T_data>
+-class normalize_expected_functor_splatting
+-{
+- public:
+-  normalize_expected_functor_splatting(bool use_black_background) : use_black_background_(use_black_background) {}
+-
+-  void operator()(float mask, typename T_data::obs_datatype &pix) const
+-  {
+-    if (!use_black_background_) {
+-      pix += mask*0.5f;
+-    }
+-  }
+-  bool use_black_background_;
+-};
+-
+-template <class T_loc, class T_data>
+-void boxm_render_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                          vpgl_camera_double_sptr cam,
+-                                          vil_image_view<typename T_data::obs_datatype> &expected,
+-                                          vil_image_view<float> &/*mask*/, // FIXME: use this param
+-                                          int bin=-1,
+-                                          bool use_black_background = false)
+-{
+-  unsigned ni=expected.ni();
+-  unsigned nj=expected.nj();
+-  expected.fill(0.0f);
+-  vgl_plane_3d<double> projection_plane;
+-  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
+-    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
+-    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,expected.ni(),expected.nj());
+-  }
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
+-  vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
+-  vul_timer t;
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
+-  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
+-
+-  while (block_vis_iter.next())
+-  {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) // code for each block
+-    {
+-      t.mark();
+-      //if (block_indices[i].x()!=2 || block_indices[i].z()!=0)
+-      //  continue;
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      t.mark();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
+-      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
+-      normalize_expected_functor norm_fn;
+-
+-      double  xverts[8];
+-      double  yverts[8];
+-      float vertdists[8];
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        temp_weights.fill(0.0f);
+-        alpha_img_.fill(0.0f);
+-
+-        std::cout<<'.';
+-
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          //if (sample.alpha>0.001)
+-          {
+-            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-            {
+-              boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-            }
+-            else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-              boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-            }
+-            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-            //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
+-            // get expected color of cell
+-            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
+-            // get  alpha
+-            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-
+-            cube_fill_value(xverts, yverts, vis_face_ids, temp_expected,  cell_expected);            // fill expected value image
+-            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
+-            //boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
+-          }
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights_);
+-
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( temp_expected,pix_weights_, temp_expected);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(temp_expected,expected,expected);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-    }
+-  }
+-  normalize_expected_functor_splatting<T_data> norm_fn(use_black_background);
+-  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_splatting<T_data> >(vis,expected,norm_fn);
+-
+-  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
+deleted file mode 100644
+index 9642cdd4c1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
++++ /dev/null
+@@ -1,374 +0,0 @@
+-#ifndef boxm_update_h_
+-#define boxm_update_h_
+-//:
+-//\file
+-#include <iostream>
+-#include "boxm_render_image.h"
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vil/vil_math.h>
+-#include <vil/vil_save.h>
+-#include <vul/vul_timer.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: functor used for normalizing cell_expected image
+-template <class T_loc, class T_data>
+-void boxm_update_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                       vpgl_camera_double_sptr cam,
+-                       vil_image_view<typename T_data::obs_mathtype> &img,
+-                       vil_image_view<float> &norm_img,
+-                       typename T_data::apm_datatype background_model, int bin)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-
+-  vil_image_view<float> pre(ni,nj,1); pre.fill(0.0f);
+-  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
+-
+-#if 0 // TODO: vgl_plane_3d<double> has no constructor with 3 double params....???!!!
+-  //       and projection_plane is unused ..!!
+-  if (vpgl_rational_camera<double> const* rcam = dynamic_cast<vpgl_rational_camera<double> const*>(cam.as_pointer())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(bbox.min_x(),bbox.min_y(),bbox.max_z());
+-    vgl_plane_3d<double> bottom(bbox.min_x(),bbox.min_y(),bbox.min_z());
+-    vgl_plane_3d<double> projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
+-  }
+-#endif // 0
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(ni,nj,1);
+-      vil_image_view<float> back_xyz(ni,nj,1);
+-      vil_image_view<float> alphas(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      int cnt=0;
+-      while (frontier_it.next())
+-      {
+-        ++cnt;
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        front_xyz.fill(0.0f);
+-        back_xyz.fill(0.0f);
+-        alphas.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-        std::cout<<cnt<<' ';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (vpgl_camera_double_sptr pcam = dynamic_cast<vpgl_perspective_camera<double>*>(cam.as_pointer()))
+-          {
+-            boxm_utils::project_corners(corners,pcam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double>* rcam = dynamic_cast<vpgl_rational_camera<double>*>(cam.as_pointer())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,vgl_plane_3d<double>(),xverts,yverts,vertdists);
+-            // TODO: 3rd argument should most likely be a "real" plane!!!
+-          }
+-
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          // get  alpha
+-          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-        }
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
+-        //vil_math_sum_sqr<float,float>(back_xyz,len_seg);
+-        //vil_math_sqrt<float>(len_seg);
+-
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, img, len_seg,cell_mean_obs,xverts,yverts)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-            // fill obs probability density image
+-            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,cell_PI, xverts,yverts);
+-          }
+-        }
+-        vil_math_image_product(len_seg,alphas, alphas);
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,vis);
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( PI_img,vis, PI_img);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(PI_img,pre,pre);
+-
+-        vis.deep_copy(vis_end);
+-#if 0
+-        if (cnt == 70) {
+-          std::cout << "saving debug images" << std::endl;
+-          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
+-          vil_save(len_seg,(output_dir + "len_seg.tiff").c_str());
+-          vil_save(alphas,(output_dir + "alphas.tiff").c_str());
+-          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
+-          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
+-          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
+-          vil_save(vis,(output_dir + "vis.tiff").c_str());
+-          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
+-          vil_save(img,(output_dir + "obs.tiff").c_str());
+-        }
+-#endif
+-      }
+-
+-      scene.write_active_block();
+-    }
+-  }
+-  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
+-  for (unsigned int j=0; j<img.nj(); ++j) {
+-    for (unsigned int i=0; i<img.ni(); ++i) {
+-      // this will have to be modified slightly when we deal with multi-plane images -dec
+-      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
+-    }
+-  }
+-
+-  vil_math_image_product(PI_background, vis, norm_img);
+-  vil_math_image_sum(pre,norm_img,norm_img);
+-  safe_inverse_functor inv_func(1e-8f);
+-  vil_transform(norm_img, inv_func);
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_update_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                       vpgl_camera_double_sptr cam,
+-                       vil_image_view<typename T_data::obs_mathtype> &img,
+-                       vil_image_view<float> &norm_img, int bin)
+-{
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  typedef boct_tree_cell<T_loc, T_data > cell_type;
+-  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
+-  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
+-  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
+-  vil_image_view<float> pix_weights(ni,nj,1);
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-
+-  vul_timer t;  t.mark();
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(ni,nj,1);
+-      vil_image_view<float> back_xyz(ni,nj,1);
+-      vil_image_view<float> alphas(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      vil_image_view<float> update_factor(ni,nj,1);
+-      unsigned count=0;
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        front_xyz.fill(0.0f);
+-        back_xyz.fill(0.0f);
+-        alphas.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-
+-        std::cout<<'.';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          // get  alpha
+-          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-        }
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
+-
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          //// get  alpha
+-          //boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, img,len_seg, cell_mean_obs,xverts,yverts)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-#if 0
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-#endif // 0
+-            // fill obs probability density image
+-            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,(float)cell_PI, xverts,yverts);
+-          }
+-          float cell_mean_vis = 0.0f;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, vis, len_seg,cell_mean_vis,xverts,yverts)) {
+-            // update appearance model
+-            if (cell_mean_vis > 1e-6) {
+-              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
+-            }
+-          }
+-          (*cell_it)->set_data(sample);
+-        }
+-#if 0
+-        // compute the length of ray segment at each pixel
+-        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
+-        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
+-        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
+-        vil_math_sqrt<float>(len_seg);
+-#endif // 0
+-        vil_math_image_product(len_seg,alphas, alphas);
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights);
+-        // multiply PI by vis..
+-        vil_math_image_product(PI_img, vis, update_factor);
+-        // ..add preX to get numerator term for update..
+-        vil_math_image_sum(pre_img, update_factor, update_factor);
+-        //.. and normalize
+-        vil_math_image_product(norm_img, update_factor, update_factor);
+-
+-        float max_cell_P=0.99f;
+-        float min_cell_P=0.001f;
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          boxm_utils::project_corners(corners,cam,xverts,yverts);
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
+-          float mean_update_factor = 0.0f;
+-          if (boxm_utils::cube_weighted_mean(vis_face_ids, update_factor,len_seg, mean_update_factor,xverts,yverts))
+-          {  // update alpha value
+-            sample.alpha *= mean_update_factor;
+-            // do bounds check on new alpha value
+-            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
+-            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
+-            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
+-            if (sample.alpha > max_alpha)
+-            sample.alpha = max_alpha;
+-
+-            if (sample.alpha < min_alpha)
+-            sample.alpha = min_alpha;
+-
+-            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
+-              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
+-                       << "mean_update_factor = " << mean_update_factor << '\n';
+-            }
+-            (*cell_it)->set_data(sample);
+-          }
+-        }
+-        // multiply cell_PI by cell weights
+-        vil_math_image_product(pix_weights, PI_img, PI_img);
+-        // update pre_img
+-        vil_math_image_sum(PI_img, pre_img, pre_img);
+-
+-        vis.deep_copy(vis_end);
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_update(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                 vil_image_view<typename T_data::obs_datatype> &img,
+-                 vpgl_camera_double_sptr cam, int bin=-1,
+-                 bool black_background = false)
+-{
+-  typename T_data::apm_datatype background_apm;
+-
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    for (unsigned int i=0; i<4; ++i) {
+-      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
+-      T_data::apm_processor::prob_density(background_apm,0.0f);
+-    }
+-  }
+-  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
+-  boxm_update_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
+-  std::cout << "update: pass1 completed" << std::endl;
+-  vil_save(norm_img,"D:/vj/scripts/boxm/exp1/norm.tiff");
+-  boxm_update_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
+-  std::cout << "update: pass2 completed" << std::endl;
+-
+-  return;
+-}
+-
+-#endif // boxm_update_h_
+diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
+deleted file mode 100644
+index 723284ff3b..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
++++ /dev/null
+@@ -1,356 +0,0 @@
+-#ifndef boxm_update_triangle_h_
+-#define boxm_update_triangle_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vil/vil_math.h>
+-#include <vul/vul_timer.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: functor used for normalizing cell_expected image
+-template <class T_loc, class T_data>
+-void boxm_update_triangle_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                vpgl_camera_double_sptr cam,
+-                                vil_image_view<typename T_data::obs_mathtype> &img,
+-                                vil_image_view<float> &norm_img,
+-                                typename T_data::apm_datatype background_model, int bin)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc, T_data> cell_type;
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-
+-  vil_image_view<float> pre(ni,nj,1);
+-  vil_image_view<float> vis(ni,nj,1);
+-  vil_image_view<float> alpha_integral(ni,nj,1);
+-  vil_image_view<float> PI_img(ni,nj,1);
+-  vil_image_view<float> pix_weights_(ni,nj,1);
+-  vil_image_view<float> alpha_img_(ni,nj,1);
+-
+-  alpha_integral.fill(0.0f);
+-  pre.fill(0.0f);
+-  vis.fill(1.0f);
+-
+-  vgl_plane_3d<double> projection_plane;
+-  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
+-    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
+-    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
+-  }
+-
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next())
+-  {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) // code for each block
+-    {
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      // project vertices to the image determine which faces of the cell are visible
+-      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> front_xyz(ni,nj,1);
+-      vil_image_view<float> back_xyz(ni,nj,1);
+-      vil_image_view<float> alphas(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      int cnt=0;
+-
+-      while (frontier_it.next())
+-      {
+-        ++cnt;
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        alpha_img_.fill(0.0f);
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-          {
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-          }
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
+-          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-
+-
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-            // fill obs probability density image
+-            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
+-          }
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights_);
+-        // scale cell expected image by weighting function..
+-        vil_math_image_product( pix_weights_,PI_img, PI_img);
+-        // ..and use result to update final expected image
+-        vil_math_image_sum(PI_img,pre,pre);
+-        vis.deep_copy(vis_end);
+-#if 0
+-        if (cnt == 10) {
+-          std::cout << "saving debug images" << std::endl;
+-          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
+-          vil_save(alpha_img_,(output_dir + "alpha_img.tiff").c_str());
+-          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
+-          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
+-          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
+-          vil_save(vis,(output_dir + "vis.tiff").c_str());
+-          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
+-          vil_save(img,(output_dir + "obs.tiff").c_str());
+-        }
+-#endif
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
+-  for (unsigned int j=0; j<img.nj(); ++j) {
+-    for (unsigned int i=0; i<img.ni(); ++i) {
+-      // this will have to be modified slightly when we deal with multi-plane images -dec
+-      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
+-    }
+-  }
+-
+-  vil_math_image_product(PI_background, vis, norm_img);
+-  vil_math_image_sum(pre,norm_img,norm_img);
+-  safe_inverse_functor inv_func(1e-8f);
+-  vil_transform(norm_img, inv_func);
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void boxm_update_triangle_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                vpgl_camera_double_sptr cam,
+-                                vil_image_view<typename T_data::obs_mathtype> &img,
+-                                vil_image_view<float> &norm_img, int bin)
+-{
+-  unsigned ni=img.ni();
+-  unsigned nj=img.nj();
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-  typedef boct_tree_cell<T_loc, T_data > cell_type;
+-  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
+-  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
+-  vil_image_view<float> alpha_integral(ni,nj,1);
+-  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
+-  vil_image_view<float> pix_weights(ni,nj,1);
+-  alpha_integral.fill(0.0f);
+-  pre_img.fill(0.0f);
+-  vis.fill(1.0f);
+-
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdists[8];
+-  vgl_plane_3d<double> projection_plane;
+-  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-    vgl_box_3d<double> bbox=scene.get_world_bbox();
+-    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
+-    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
+-    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
+-  }
+-  vul_timer t;  t.mark();
+-  // code to iterate over the blocks in order of visibility
+-  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
+-  while (block_vis_iter.next()) {
+-    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-    for (auto & block_indice : block_indices) { // code for each block
+-      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
+-      boxm_block<tree_type> * curr_block=scene.get_active_block();
+-      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
+-
+-      // for each frontier layer of each block
+-      tree_type * tree=curr_block->get_tree();
+-      vil_image_view<float> alpha_img_(ni,nj,1);
+-      vil_image_view<float> vis_end(ni,nj,1);
+-      vil_image_view<float> temp_expected(ni,nj,1);
+-      vil_image_view<float> update_factor(ni,nj,1);
+-
+-      while (frontier_it.next())
+-      {
+-        std::vector<cell_type *> vis_cells=frontier_it.frontier();
+-        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
+-        vis_end.fill(0.0f);
+-        temp_expected.fill(0.0f);
+-        PI_img.fill(0.0f);
+-        alpha_img_.fill(0.0f);
+-
+-        std::cout<<'.';
+-        for (;cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-          {
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-          }
+-
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
+-          typename T_data::obs_datatype cell_mean_obs;
+-          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
+-            // get probability density of mean observation
+-            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
+-#if 0
+-            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
+-              std::cout << "\ncell_PI = " << cell_PI << '\n'
+-                       << "  cell_obs = " << cell_mean_obs << '\n'
+-                       << "  cell id = " << *cell_it << std::endl;
+-            }
+-#endif // 0
+-            // fill obs probability density image
+-            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
+-          }
+-          float cell_mean_vis = 0.0f;
+-          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,vis,cell_mean_vis)) {
+-            // update appearance model
+-            if (cell_mean_vis > 1e-6) {
+-              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
+-            }
+-          }
+-          (*cell_it)->set_data(sample);
+-        }
+-        abs_functor abs_fun;
+-        vil_transform(alpha_img_,alpha_img_,abs_fun);
+-
+-        // compute visibility
+-        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
+-
+-        // compute new vis image
+-        image_exp_functor exp_fun;
+-        vil_transform(alpha_integral,vis_end,exp_fun);
+-        // compute weights for each pixel
+-        vil_math_image_difference(vis,vis_end,pix_weights);
+-        // multiply PI by vis..
+-        vil_math_image_product(PI_img, vis, update_factor);
+-        // ..add preX to get numerator term for update..
+-        vil_math_image_sum(pre_img, update_factor, update_factor);
+-        //.. and normalize
+-        vil_math_image_product(norm_img, update_factor, update_factor);
+-
+-
+-        float max_cell_P=0.99f;
+-        float min_cell_P=0.001f;
+-        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
+-        {
+-          // for each cell
+-          T_data sample=(*cell_it)->data();
+-          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
+-          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
+-          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
+-          {
+-            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
+-          }
+-          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
+-            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
+-          }
+-          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
+-
+-          float mean_update_factor = 0.0f;
+-          if (cube_mean(xverts,yverts,vertdists,vis_face_ids, update_factor, mean_update_factor))
+-          {
+-            // update alpha value
+-            sample.alpha *= mean_update_factor;
+-            // do bounds check on new alpha value
+-            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
+-            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
+-            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
+-            if (sample.alpha > max_alpha)
+-            sample.alpha = max_alpha;
+-
+-            if (sample.alpha < min_alpha)
+-            sample.alpha = min_alpha;
+-
+-            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
+-              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
+-                       << "mean_update_factor = " << mean_update_factor << '\n';
+-            }
+-            (*cell_it)->set_data(sample);
+-          }
+-        }
+-        // multiply cell_PI by cell weights
+-        vil_math_image_product(pix_weights, PI_img, PI_img);
+-        // update pre_img
+-        vil_math_image_sum(PI_img, pre_img, pre_img);
+-        vis.deep_copy(vis_end);
+-      }
+-      scene.write_active_block();
+-    }
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void boxm_update_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                          vil_image_view<typename T_data::obs_datatype> &img,
+-                          vpgl_camera_double_sptr cam, int bin=-1,
+-                          bool black_background = false)
+-{
+-  typename T_data::apm_datatype background_apm;
+-
+-  if (black_background) {
+-    std::cout << "using black background model" << std::endl;
+-    for (unsigned int i=0; i<4; ++i) {
+-      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
+-      T_data::apm_processor::prob_density(background_apm,0.0f);
+-    }
+-  }
+-  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
+-  boxm_update_triangle_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
+-  std::cout << "update: pass1 completed" << std::endl;
+-  boxm_update_triangle_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
+-  std::cout << "update: pass2 completed" << std::endl;
+-
+-  return;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/dummy.cxx b/contrib/brl/bseg/boxm/algo/sp/dummy.cxx
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+deleted file mode 100644
+index 41fe3f9dbd..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,27 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and bvxm_prodepends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-  set(boxm_algo_sp_pro_sources
+-      boxm_algo_sp_processes.h
+-      boxm_algo_sp_register.h   boxm_algo_sp_register.cxx
+-     )
+-  aux_source_directory(Templates boxm_algo_sp_pro_sources)
+-  aux_source_directory(processes boxm_algo_sp_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_algo_sp_pro LIBRARY_SOURCES ${boxm_algo_sp_pro_sources} )
+-  target_link_libraries(boxm_algo_sp_pro boxm boxm_algo_sp boxm_util bprb brdb brip sdet vsol vil_pro ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil)
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
+deleted file mode 100644
+index 5339909524..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vil/vil_image_view_base.h>
+-#include <vil/io/vil_io_smart_ptr.h>
+-
+-#include <vil/io/vil_io_image_view_base.h>
+-
+-typedef vil_image_view_base_sptr img_sptr;
+-
+-BRDB_VALUE_INSTANTIATE(img_sptr, "vil_image_view_base_sptr");
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
+deleted file mode 100644
+index 24cdc3672a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#ifndef boxm_algo_sp_processes_h_
+-#define boxm_algo_sp_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_volume_visibility_process);
+-DECLARE_FUNC_CONS(boxm_update_process);
+-DECLARE_FUNC_CONS(boxm_render_expected_process);
+-
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
+deleted file mode 100644
+index 8acaac16c3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#include "boxm_algo_sp_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "boxm_algo_sp_processes.h"
+-
+-void boxm_algo_sp_register::register_datatype()
+-{
+-}
+-
+-void boxm_algo_sp_register::register_process()
+-{
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_process,"boxmUpdateSPProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_process, "boxmRenderExpectedProcess");
+-    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_volume_visibility_process, "boxmVolumeVisibilityProcess");
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
+deleted file mode 100644
+index 5b7f15d213..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_algo_sp_register_h_
+-#define boxm_algo_sp_register_h_
+-
+-class boxm_algo_sp_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_algo_sp_register_h_
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
+deleted file mode 100644
+index 6ffd752df2..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
++++ /dev/null
+@@ -1,117 +0,0 @@
+-// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
+-
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_render_expected_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-bool boxm_render_expected_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_process_globals;
+-
+-  //process takes 5 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4]: bin number
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "unsigned";
+-
+-  // process has 2 outputs:
+-  // output[0]: rendered image
+-  // output[0]: mask
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-  output_types_[1] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_render_expected_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_render_expected_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-
+-  vil_image_view_base_sptr img;
+-  vil_image_view_base_sptr img_mask;
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
+-    vil_image_view<float> mask(ni,nj);
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_splatting_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,true);
+-    }
+-    else
+-    {
+-      auto bin = pro.get_input<unsigned>(i++);
+-      std::cout<<"Multi Bin"<<std::endl;
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      boxm_render_image_splatting_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,bin,true);
+-    }
+-
+-    //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
+-    img_mask = new vil_image_view<float>(mask);
+-
+-    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
+-    img = expected_byte;
+-  }
+-  else {
+-    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
+deleted file mode 100644
+index bf3d27ab6d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
++++ /dev/null
+@@ -1,107 +0,0 @@
+-// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
+-//:
+-// \file
+-// \brief Process to update the scene from an image and camera pair
+-//
+-// \author Gamze Tunali
+-// \date Apr 21, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-namespace boxm_update_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-bool boxm_update_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_process_globals;
+-
+-  // process takes 5 inputs and no output
+-  //input[0]: The observation image
+-  //input[1]: The camera of the observation
+-  //input[2]: The scene
+-  //input[3]: The bin index to be updated
+-  //input[4]: ???
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "boxm_scene_base_sptr";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_update_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_update_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_update_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto bin_index =  pro.get_input<unsigned>(i++);
+-  bool use_black_background =  pro.get_input<bool>(i++);
+-
+-  // check the input validity
+-  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
+-    std::cout << "boxm_update_process: null input value, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    auto *img_byte
+- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
+-    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
+-    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      //boxm_update<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, false);
+-      boxm_update_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, use_black_background);
+-    }
+-    else
+-    {
+-      std::cout<<"Multi Bin Update"<<std::endl;
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_update_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, img, camera, bin_index,use_black_background);
+-    }
+-    //vil_image_view<float> image = *vil_convert_cast(float(), input_image);
+-  }
+-  else {
+-    std::cout << "boxm_update_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
+deleted file mode 100644
+index 34ecc27c3f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
++++ /dev/null
+@@ -1,129 +0,0 @@
+-// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
+-//:
+-// \file
+-// \brief A class for obtaining visibility of a volume
+-//
+-// \author Vishal Jain
+-// \date Apr 30, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <vil/vil_convert.h>
+-
+-namespace boxm_volume_visibility_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 10;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_volume_visibility_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_volume_visibility_process_globals;
+-
+-  //process takes 10 inputs
+-  //input[0]: scene binary file
+-  //input[1]: camera
+-  //input[2]: ni of the expected image
+-  //input[3]: nj of the expected image
+-  //input[4-9]: bounding box
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vpgl_camera_double_sptr";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "unsigned";
+-  input_types_[4] = "float";
+-  input_types_[5] = "float";
+-  input_types_[6] = "float";
+-  input_types_[7] = "float";
+-  input_types_[8] = "float";
+-  input_types_[9] = "float";
+-
+-  // process has 1 output:
+-  // output[0]: rendered image
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "vil_image_view_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_volume_visibility_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_volume_visibility_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  auto ni = pro.get_input<unsigned>(i++);
+-  auto nj = pro.get_input<unsigned>(i++);
+-
+-  auto min_x=pro.get_input<float>(i++);
+-  auto min_y=pro.get_input<float>(i++);
+-  auto min_z=pro.get_input<float>(i++);
+-
+-  auto max_x=pro.get_input<float>(i++);
+-  auto max_y=pro.get_input<float>(i++);
+-  auto max_z=pro.get_input<float>(i++);
+-
+-  vgl_box_3d<double> query(min_x,min_y,min_z,
+-                           max_x,max_y,max_z);
+-
+-  double xverts[8];
+-  double yverts[8];
+-
+-  boxm_utils::project_corners(boxm_utils::corners_of_box_3d(query),camera,xverts,yverts);
+-  boct_face_idx face_id=boxm_utils::visible_faces(query,camera,xverts,yverts);
+-  vil_image_view_base_sptr img;
+-
+-  // check the scene's app model
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    float val=1.0;
+-
+-    if (!scene_ptr->multi_bin()){
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      val=boxm_compute_volume_visibility<short, boxm_sample<BOXM_APM_MOG_GREY> >(query,*scene, camera);
+-    }
+-    else
+-    {
+-      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
+-      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
+-      val=boxm_compute_volume_visibility<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(query,*scene, camera);
+-    }
+-    vil_image_view<float> img_vol(ni,nj);img_vol.fill(0.0);
+-    boxm_utils::project_cube_fill_val(face_id,img_vol,val,xverts,yverts);
+-    auto *vol_vis = new vil_image_view<unsigned char>(img_vol.ni(),img_vol.nj(),img_vol.nplanes());
+-    vil_convert_stretch_range_limited(img_vol,*vol_vis, 0.0f, 1.0f);
+-    img = vol_vis;
+-
+-    std::cout<<"\n Visibility is "<<val;
+-  }
+-  else {
+-    std::cout << "boxm_volume_visibility_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index bc15f419d9..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_algo_sp_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_sp_pro_test_include boxm_algo_sp_pro)
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
+deleted file mode 100644
+index bfdbc4ffa3..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/algo/sp/pro/boxm_algo_sp_processes.h>
+-#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
+deleted file mode 100644
+index 99806c193d..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,19 +0,0 @@
+-add_executable( boxm_algo_sp_test_all
+-  test_driver.cxx
+-  test_compute_visibility.cxx
+-  test_render_image.cxx
+-  test_update.cxx
+-  test_update_multi_bin.cxx
+- )
+-
+-target_link_libraries( boxm_algo_sp_test_all boxm_algo_sp boxm_algo boxm boxm_util boxm_sample boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME boxm_algo_sp_test_compute_visibility COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_compute_visibility  )
+-add_test( NAME boxm_algo_sp_test_render_image COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_render_image  )
+-if( VXL_RUN_FAILING_TESTS )
+-add_test( NAME boxm_algo_sp_test_update COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update  )
+-endif()
+-add_test( NAME boxm_algo_sp_test_update_multi_bin COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update_multi_bin  )
+-
+-add_executable( boxm_algo_sp_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_sp_test_include boxm_algo_sp)
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
+deleted file mode 100644
+index 69c019a479..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
++++ /dev/null
+@@ -1,90 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_test_util.h>
+-
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_compute_visibility()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,3);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("./boxm_scene1", "block");
+-  vul_file::make_directory("./boxm_scene1");
+-  std::ofstream os("scene1.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3> s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3> s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3> s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
+-    if (iter.index().z()==1)
+-    {
+-      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells=tree->leaf_cells();
+-      s1_sample.alpha=0.6f;
+-
+-      for (auto & leaf_cell : leaf_cells)
+-      {
+-        leaf_cell->set_data(s1_sample);
+-      }
+-      block->init_tree(tree);
+-      scene.write_active_block();
+-    }
+-    else
+-    {
+-      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells= tree->leaf_cells();
+-      s1_sample.alpha=0.01f;
+-
+-      for (auto & leaf_cell : leaf_cells)
+-      {
+-        leaf_cell->set_data(s1_sample);
+-      }
+-      block->init_tree(tree);
+-      scene.write_active_block();
+-    }
+-
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-
+-  double X=5,Y=5,Z;
+-  for (Z=40; Z>-10; --Z)
+-  {
+-    boxm_compute_point_visibility<short,boxm_sample<BOXM_APM_MOG_GREY> >(vgl_point_3d<double>(X,Y,Z),scene, camera);
+-  }
+-  vpl_rmdir("./boxm_scene1");
+-  vpl_unlink("./scene1.xml");
+-}
+-
+-TESTMAIN(test_compute_visibility);
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
+deleted file mode 100644
+index 2ea0124c63..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_compute_visibility );
+-DECLARE( test_render_image );
+-DECLARE( test_update );
+-DECLARE( test_update_multi_bin );
+-
+-void register_tests()
+-{
+-  REGISTER( test_compute_visibility );
+-  REGISTER( test_render_image );
+-  REGISTER( test_update );
+-  REGISTER( test_update_multi_bin );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
+deleted file mode 100644
+index 85e7588707..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
+-#include <boxm/algo/sp/boxm_depth_image_triangle.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <boxm/algo/sp/boxm_update.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
+deleted file mode 100644
+index c36e76f0dd..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
++++ /dev/null
+@@ -1,103 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree_cell.h>
+-#include <vpl/vpl.h>
+-#include <boxm/algo/sp/boxm_render_image.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-
+-static void test_render_image()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,3);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("./boxm_scene1", "block");
+-  vul_file::make_directory("./boxm_scene1");
+-  std::ofstream os("scene1.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
+-
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
+-  expected.fill(0.0);
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
+-  mask.fill(0.0);
+-
+-  boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,camera,expected,mask);
+-  vpl_rmdir("boxm_scene1");
+-  vpl_unlink("scene1.xml");
+-}
+-
+-TESTMAIN(test_render_image);
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
+deleted file mode 100644
+index 9e530c4af6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
++++ /dev/null
+@@ -1,259 +0,0 @@
+-#include <iostream>
+-#include <sstream>
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_homg_point_3d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_load.h>
+-#include <vil/vil_save.h>
+-#include <vil/vil_convert.h>
+-#if 0
+-#include <vpl/vpl.h>
+-#endif
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_z(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/36.;
+-  std::vector<vgl_point_3d<double> > centers;
+-  for (unsigned i=0; i<11; i++) {
+-    // double x = boxm_camera_dist*std::cos(alpha)/10;
+-    double z = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
+-    std::cout << centers[i] << std::endl;
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
+-    rat_cameras.push_back(rat_cam);
+-
+-    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-    for (auto c : corners) {
+-      double u,v, u2, v2;
+-      vpgl_perspective_camera<double> persp_cam;
+-      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
+-      bb.add(vgl_point_2d<double> (u,v));
+-
+-      if (verbose)
+-      {
+-        std::cout << "Perspective [" << u << ',' << v << "]\n"
+-                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
+-      }
+-    }
+-    std::cout << bb << std::endl;
+-  }
+-  return rat_cameras;
+-}
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_yz(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  std::cout << "centroid: " << centroid << std::endl;
+-  double alpha = (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/40.;
+-  std::vector<vgl_point_3d<double> > centers;
+-
+-  for (unsigned i=0; i<num_train_images; i++) {
+-    double x = boxm_camera_dist*std::cos(alpha);
+-    double y = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
+-  if (verbose)
+-    std::cout << centers[i] << std::endl;
+-
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> persp_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vgl_point_3d<double> camera_center  = centers[i];
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
+-    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-
+-    //save the camera to file
+-    std::stringstream cam_file;
+-    vul_file::make_directory("./cams");
+-    cam_file << "./cams/cam_" << i << ".txt";
+-    std::ofstream cam_out(cam_file.str().c_str());
+-    cam_out << persp_cam;
+-
+-    if (verbose) {
+-      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-      for (auto c : corners) {
+-        double u,v;
+-        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-        bb.add(vgl_point_2d<double> (u,v));
+-        std::cout << "Perspective [" << u << ',' << v << "]\n"<< std::endl;
+-      }
+-      std::cout << bb << std::endl;
+-    }
+-  }
+-  return persp_cameras;
+-}
+-
+-
+-static void test_update()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-#ifdef SET_APPEARENCE_MODEL_EXISTS
+-  scene.set_appearence_model(BOXM_APM_MOG_GREY);
+-#endif
+-  scene.set_paths("boxm_scene2", "block");
+-  vul_file::make_directory("boxm_scene2");
+-  std::ofstream os("scene2.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
+-
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(4,3);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-#if 0
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-#endif
+-  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z(world);
+-
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
+-
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    expected.fill(0.0);
+-    mask.fill(0.0);
+-
+-    boxm_render_image_splatting_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask);
+-    std::stringstream ss;
+-    ss << "./boxm_scene2/img" << i << ".tif";
+-#if 0
+-    vil_image_view<unsigned char> expected_byte(expected.ni(),expected.nj(),expected.nplanes());
+-    vil_convert_stretch_range_limited(expected,expected_byte, 0.0f, 1.0f);
+-#endif
+-
+-    vil_save(expected, ss.str().data());
+-  }
+-#if 0
+-  vpl_rmdir("./boxm_scene1");
+-  vpl_unlink("./scene1.xml");
+-#endif
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
+-                                                                          block_dim, world_dim, 4U, 3U);
+-  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene_new.set_paths("./boxm_scene_update", "block");
+-  vul_file::make_directory("./boxm_scene_update");
+-  std::ofstream os1("./boxm_scene_update/scene.xml");
+-  x_write(os1, scene_new, "scene");
+-  os1.close();
+-
+-  // update the world, with all the generated images and cameras
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss;
+-    ss << "./boxm_scene2/img" << i << ".tif";
+-    expected = vil_load(ss.str().data());
+-    boxm_update_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i] );
+-  }
+-
+-  // regenerate the images from world
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss; ss << "boxm_scene2/img_new" << i << ".tif";
+-    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
+-    boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask);
+-    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
+-    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
+-
+-    vil_save(expected_byte, ss.str().data());
+-  }
+-}
+-
+-TESTMAIN(test_update);
+diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
+deleted file mode 100644
+index 27c310aea1..0000000000
+--- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
++++ /dev/null
+@@ -1,262 +0,0 @@
+-#include <iostream>
+-#include <sstream>
+-#include <testlib/testlib_test.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_homg_point_3d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/algo/sp/boxm_update_triangle.h>
+-#include <boxm/algo/sp/boxm_render_image_triangle.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_load.h>
+-#include <vil/vil_save.h>
+-#include <vil/vil_convert.h>
+-#ifdef CLEANUP
+-#include <vpl/vpl.h>
+-#endif
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_z_multi_bin(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/36.;
+-  std::vector<vgl_point_3d<double> > centers;
+-  for (unsigned i=0; i<11; i++) {
+-    double z = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
+-    std::cout << centers[i] << std::endl;
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
+-    rat_cameras.push_back(rat_cam);
+-
+-    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-    for (auto c : corners) {
+-      double u,v, u2, v2;
+-      vpgl_perspective_camera<double> persp_cam;
+-      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
+-      bb.add(vgl_point_2d<double> (u,v));
+-
+-      if (verbose)
+-      {
+-        std::cout << "Perspective [" << u << ',' << v << "]\n"
+-                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
+-      }
+-    }
+-    std::cout << bb << std::endl;
+-  }
+-  return rat_cameras;
+-}
+-
+-std::vector<vpgl_camera_double_sptr > generate_cameras_yz_multi_bin(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  std::cout << "centroid: " << centroid << std::endl;
+-  double alpha = (vnl_math::pi/8.) * 3;
+-  double delta_alpha = vnl_math::pi/40.;
+-  std::vector<vgl_point_3d<double> > centers;
+-
+-  for (unsigned i=0; i<num_train_images; i++) {
+-    double x = boxm_camera_dist*std::cos(alpha);
+-    double y = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
+-  if (verbose)
+-    std::cout << centers[i] << std::endl;
+-
+-    alpha += delta_alpha;
+-  }
+-
+-  vgl_box_2d<double> bb;
+-  std::vector<vpgl_camera_double_sptr> persp_cameras;
+-  for (unsigned i=0; i<centers.size(); i++)
+-  {
+-    vgl_point_3d<double> camera_center  = centers[i];
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
+-    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-
+-    //save the camera to file
+-    std::stringstream cam_file;
+-    vul_file::make_directory("./cams");
+-    cam_file << "./cams/cam_" << i << ".txt";
+-    std::ofstream cam_out(cam_file.str().c_str());
+-    cam_out << persp_cam;
+-
+-    if (verbose) {
+-      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
+-      for (auto c : corners) {
+-        double u,v;
+-        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
+-        bb.add(vgl_point_2d<double> (u,v));
+-        std::cout << "Perspective [" << u << ',' << v << ']' << std::endl << std::endl;
+-      }
+-      std::cout << bb << std::endl;
+-    }
+-  }
+-  return persp_cameras;
+-}
+-
+-
+-static void test_update_multi_bin()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,1);
+-  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-#ifdef SET_APPEARENCE_MODEL_EXISTS
+-  scene.set_appearence_model(BOXM_APM_MOG_GREY);
+-#endif
+-  scene.set_paths("boxm_scene2_mb", "block");
+-  vul_file::make_directory("boxm_scene2_mb");
+-  std::ofstream os("scene2.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1,5);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1,5);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1,3);
+-
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(4,3);
+-    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
+-    cel11->set_data(s2_sample);
+-    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
+-    cell2->set_data(s1_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-#if 0
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-#endif
+-  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z_multi_bin(world);
+-
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
+-  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
+-
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    expected.fill(0.0);
+-    mask.fill(0.0);
+-
+-    boxm_render_image_splatting<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,3);
+-    std::stringstream ss;
+-    ss << "./boxm_scene2_mb/img3" << i << ".tif";
+-    vil_save(expected, ss.str().data());
+-
+-    expected.fill(0.0);
+-    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,5);
+-    std::stringstream ss1;
+-    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
+-    vil_save(expected, ss1.str().data());
+-  }
+-#ifdef CLEANUP
+-  vpl_rmdir("./boxm_scene1");
+-  vpl_unlink("./scene1.xml");
+-#endif
+-  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
+-                                                                                    block_dim, world_dim, 4U, 3U);
+-  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene_new.set_paths("./boxm_scene_update", "block");
+-  vul_file::make_directory("./boxm_scene_update");
+-  std::ofstream os1("./boxm_scene_update/scene.xml");
+-  x_write(os1, scene_new, "scene");
+-  os1.close();
+-
+-  // update the world, with all the generated images and cameras
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss;
+-    ss << "./boxm_scene2_mb/img3" << i << ".tif";
+-    expected = vil_load(ss.str().data());
+-    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],3 );
+-    std::stringstream ss1;
+-    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
+-    expected = vil_load(ss1.str().data());
+-    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],5 );
+-  }
+-
+-  // regenerate the images from world
+-  for (unsigned i=0; i<cameras.size(); i++) {
+-    std::stringstream ss; ss << "boxm_scene2_mb/img_new" << i << ".tif";
+-    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
+-    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask,3);
+-    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
+-    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
+-
+-    vil_save(expected_byte, ss.str().data());
+-  }
+-}
+-
+-TESTMAIN(test_update_multi_bin);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
+deleted file mode 100644
+index 5e823166ae..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,31 +0,0 @@
+-add_executable( boxm_algo_test_all
+-  test_driver.cxx
+-  test_fill_in_mesh.cxx
+-  test_save_scene_raw.cxx
+-  test_upload_mesh.cxx
+-  test_boxm_fill_internal_cells.cxx
+-  test_boxm_scene_crop.cxx
+-  test_linear_operations.cxx
+-  test_remove_level0.cxx
+-
+- )
+-
+-set(boxm_algo_test_all_sources
+-    test_utils.h    test_utils.cxx
+-    )
+-
+-vxl_add_library(LIBRARY_NAME boxm_algo_tests LIBRARY_SOURCES  ${boxm_algo_test_all_sources})
+-
+-target_link_libraries( boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
+-target_link_libraries( boxm_algo_test_all boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
+-
+-add_test( NAME boxm_algo_test_fill_in_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_fill_in_mesh  )
+-add_test( NAME boxm_algo_test_save_scene_raw COMMAND $<TARGET_FILE:boxm_algo_test_all> test_save_scene_raw  )
+-add_test( NAME boxm_algo_test_upload_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_upload_mesh  )
+-add_test( NAME boxm_algo_test_fill_internal_cells COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_fill_internal_cells  )
+-add_test( NAME boxm_algo_test_scene_crop COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_scene_crop  )
+-add_test( NAME boxm_algo_test_linear_operations COMMAND $<TARGET_FILE:boxm_algo_test_all> test_linear_operations )
+-add_test( NAME boxm_algo_remove_level0 COMMAND $<TARGET_FILE:boxm_algo_test_all> test_remove_level0 )
+-
+-add_executable( boxm_algo_test_include test_include.cxx )
+-target_link_libraries( boxm_algo_test_include boxm_algo)
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
+deleted file mode 100644
+index 509f828fb6..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
++++ /dev/null
+@@ -1,112 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date February 4, 2010
+-
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/boxm_fill_internal_cells.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-const bool debug = false;
+-
+-void build_tree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  // Create tree
+-  tree->split();
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    leaves[1]->set_data(0.1f);
+-    leaves[1]->split();
+-    for (auto & leave : leaves)
+-      leave->set_data(0.1f);
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "All Levels" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
+-    for (auto & leave : leaves) {
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-}
+-
+-static void test_boxm_fill_internal_cells()
+-{
+-  //Create a dummy scene
+-  typedef boct_tree<short,float > tree_type;
+-  auto *tree = new boct_tree<short,float>(3);
+-  build_tree(tree);
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-
+-  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
+-  std::string scene_path=".";
+-  scene->set_paths(scene_path, "in_block");
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->clean_scene();
+-
+-  boxm_block_iterator<tree_type >  iter =scene->iterator();
+-  iter.begin();
+-  scene->load_block(iter.index());
+-  boxm_block<tree_type> *block = scene->get_active_block();
+-  block->init_tree(tree);
+-  scene->write_active_block();
+-
+-  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
+-
+-  boxm_fill_internal_cells<float> filler;
+-  boxm_scene<tree_type> *scene_out = filler.traverse_and_fill(scene);
+-
+-  //check that output scene is correct
+-  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
+-  iter_out.begin();
+-  scene_out->load_block(iter_out.index());
+-  boxm_block<tree_type> *block_out = scene_out->get_active_block();
+-  boct_tree<short, float>  *tree_out= block_out->get_tree();
+-  std::vector<boct_tree_cell<short,float>*> cells = tree_out->all_cells();
+-  bool result = true;
+-  for (auto & cell : cells)
+-  {
+-    if (!cell->is_leaf())
+-    {
+-      boct_tree_cell<short,float>* children = cell->children();
+-      float avg =0;
+-      for (unsigned c=0; c<8; c++)
+-      {
+-        avg+=children[c].data();
+-      }
+-      result = result && (cell->data()==(avg/8.f));
+-    }
+-  }
+-  TEST("Valid average cells", result, true);
+-
+-  if (debug) {
+-    std::cout << "Printing Output Tree" << std::endl;
+-    for (auto & cell : cells) {
+-      std::cout<< cell->get_code().x_loc_ << ','
+-              << cell->get_code().y_loc_ << ','
+-              << cell->get_code().z_loc_ << ','
+-              << cell->get_code().level << ','
+-              << cell->data() << std::endl;
+-    }
+-  }
+-
+-  scene->clean_scene();
+-  scene_out->clean_scene();
+-}
+-
+-TESTMAIN(test_boxm_fill_internal_cells);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
+deleted file mode 100644
+index 73eff00099..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
++++ /dev/null
+@@ -1,129 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov. 16, 2009.
+-
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/boxm_crop_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-const bool debug = true;
+-
+-void fill_sample_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-  tree->init_cells(0.1f);
+-  tree->split();
+-  std::cout << "Level 1" << std::endl;
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5f);
+-    if (debug)
+-      for (auto & leave : leaves) {
+-        std::cout<< leave->get_code().x_loc_ << ','
+-                << leave->get_code().y_loc_ << ','
+-                << leave->get_code().z_loc_ << ','
+-                << leave->data() << std::endl;
+-      }
+-
+-    leaves[1]->split();
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "Level 0" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (auto & leave : leaves) {
+-      leave->set_data(0.9f);
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "All Levels" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
+-    for (auto & leave : leaves) {
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-}
+-
+-static void test_boxm_scene_crop()
+-{
+-  //Create a dummy scene
+-  typedef boct_tree<short,float > tree_type;
+-  auto *tree = new boct_tree<short,float>(3);
+-  fill_sample_octree(tree);
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-
+-  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
+-  std::string scene_path=".";
+-  scene->set_paths(scene_path, "in_block");
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->clean_scene();
+-
+-  boxm_block_iterator<tree_type >  iter =scene->iterator();
+-  iter.begin();
+-  scene->load_block(iter.index());
+-  boxm_block<tree_type> *block = scene->get_active_block();
+-  block->init_tree(tree);
+-  scene->write_active_block();
+-
+-  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
+-
+-  boxm_scene<tree_type> *scene_out = boxm_crop_scene<float>(scene, bbox);
+-
+-  //check that output scene is correct
+-  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
+-  iter_out.begin();
+-  scene_out->load_block(iter_out.index());
+-  boxm_block<tree_type> *block_out = scene_out->get_active_block();
+-  boct_tree<short, float>  *tree_out= block_out->get_tree();
+-
+-  std::vector<boct_tree_cell<short,float>*> leaves_out = tree_out->leaf_cells();
+-  bool result = true;
+-  for (auto & i : leaves_out)
+-  {
+-    result = result && (std::abs(i->data() - 0.9)< 1e-5);
+-  }
+-
+-  TEST("Valid cropped tree", result, true);
+-
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree_out->all_cells();
+-  if (debug) {
+-    std::cout << "Printing Output Tree" << std::endl;
+-    for (auto & leave : leaves) {
+-      std::cout<< leave->get_code().x_loc_ << ','
+-              << leave->get_code().y_loc_ << ','
+-              << leave->get_code().z_loc_ << ','
+-              << leave->get_code().level << ','
+-              << leave->data() << std::endl;
+-    }
+-  }
+-
+-  scene->clean_scene();
+-  scene_out->clean_scene();
+-}
+-
+-TESTMAIN(test_boxm_scene_crop);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
+deleted file mode 100644
+index 299ce36aab..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_fill_in_mesh );
+-DECLARE( test_save_scene_raw );
+-DECLARE( test_upload_mesh );
+-DECLARE( test_boxm_fill_internal_cells );
+-DECLARE( test_boxm_scene_crop );
+-DECLARE( test_linear_operations );
+-DECLARE( test_remove_level0 );
+-
+-void register_tests()
+-{
+-  REGISTER( test_fill_in_mesh );
+-  REGISTER( test_save_scene_raw );
+-  REGISTER( test_upload_mesh );
+-  REGISTER( test_boxm_fill_internal_cells );
+-  REGISTER( test_boxm_scene_crop );
+-  REGISTER( test_linear_operations );
+-  REGISTER( test_remove_level0 );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
+deleted file mode 100644
+index 564a5c4359..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
++++ /dev/null
+@@ -1,121 +0,0 @@
+-#include <iostream>
+-#include <limits>
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_fill_in_mesh.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boct/boct_tree_cell.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_fileio.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static void test_fill_in_mesh()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("./boxm_fill_in", "block");
+-  vul_file::make_directory("./boxm_fill_in");
+-  std::ofstream os("scene.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  //// create a mesh
+-  unsigned int num_faces=6;
+-  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(8));
+-  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
+-  imesh_vertex<3>& vert0 = (*verts)[0]; imesh_vertex<3>& vert4 = (*verts)[4];
+-  vert0[0]=2;                           vert4[0]=2;
+-  vert0[1]=2;                           vert4[1]=2;
+-  vert0[2]=4;                           vert4[2]=8;
+-  imesh_vertex<3>& vert1 = (*verts)[1]; imesh_vertex<3>& vert5 = (*verts)[5];
+-  vert1[0]=4;                           vert5[0]=4;
+-  vert1[1]=2;                           vert5[1]=2;
+-  vert1[2]=4;                           vert5[2]=8;
+-  imesh_vertex<3>& vert2 = (*verts)[2]; imesh_vertex<3>& vert6 = (*verts)[6];
+-  vert2[0]=4;                           vert6[0]=4;
+-  vert2[1]=4;                           vert6[1]=4;
+-  vert2[2]=4;                           vert6[2]=8;
+-
+-  imesh_vertex<3>& vert3 = (*verts)[3]; imesh_vertex<3>& vert7 = (*verts)[7];
+-  vert3[0]=2;                           vert7[0]=2;
+-  vert3[1]=4;                           vert7[1]=4;
+-  vert3[2]=4;                           vert7[2]=8;
+-
+-  std::vector<unsigned int> face(4,0);
+-  face[0]=4;face[1]=5;face[2]=6;face[3]=7;
+-  (*faces)[0]=face;
+-  face[0]=3;face[1]=2;face[2]=1;face[3]=0;
+-  (*faces)[1]=face;
+-  face[0]=0;face[1]=4;face[2]=7;face[3]=3;
+-  (*faces)[2]=face;
+-  face[0]=1;face[1]=2;face[2]=6;face[3]=5;
+-  (*faces)[3]=face;
+-  face[0]=1;face[1]=5;face[2]=4;face[3]=0;
+-  (*faces)[4]=face;
+-  face[0]=3;face[1]=7;face[2]=6;face[3]=2;
+-  (*faces)[5]=face;
+-
+-
+-  imesh_mesh mesh;
+-#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
+-  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
+-  mesh.set_vertices(std::move(tempv));
+-  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
+-  mesh.set_faces(std::move(tempf));
+-#else
+-  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
+-  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
+-#endif
+-
+-  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(7,6);
+-    boxm_sample<BOXM_APM_MOG_GREY> s;
+-    s.alpha=std::numeric_limits<float>::max();
+-    tree->init_cells(s);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> val;
+-  val.alpha=0;
+-  std::vector<imesh_mesh> meshes; meshes.push_back(mesh);
+-  boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, meshes, false, val);
+-
+-  std::vector<std::string> fnames;
+-  boxm_block_iterator<tree_type> it(&scene);
+-
+-  // check the first block
+-  scene.load_block(it.index().x(),it.index().y(),it.index().z());
+-  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
+-
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vgl_point_3d<double>(3,3,6));
+-  TEST("Centroid of the mesh is in the octree", cell0->data().alpha, 0.0f);
+-
+-
+-  vpl_rmdir("boxm_fill_in");
+-  vpl_unlink("scene.xml");
+-}
+-
+-TESTMAIN(test_fill_in_mesh);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
+deleted file mode 100644
+index c59d7e8540..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <boxm/algo/boxm_compute_scene_difference.h>
+-#include <boxm/algo/boxm_compute_scene_statistics.h>
+-#include <boxm/algo/boxm_crop_scene.h>
+-#include <boxm/algo/boxm_fill_in_mesh.h>
+-#include <boxm/algo/boxm_fill_internal_cells.h>
+-#include <boxm/algo/boxm_init_scene.h>
+-#include <boxm/algo/boxm_linear_operations.h>
+-#include <boxm/algo/boxm_merge_mog.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boxm/algo/boxm_save_scene_raw.h>
+-#include <boxm/algo/boxm_save_scene_raw_general.h>
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-#include <boxm/algo/boxm_split_sample.h>
+-#include <boxm/algo/boxm_upload_mesh.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx b/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
+deleted file mode 100644
+index 0e4fe4f91c..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
++++ /dev/null
+@@ -1,82 +0,0 @@
+-//:
+-// \file
+-// \brief Test linear combinations of blocks
+-// \author Isabel Restrepo
+-// \date 2-Feb-2011
+-
+-#include <testlib/testlib_test.h>
+-#include <boxm/algo/boxm_linear_operations.h>
+-#include "test_utils.h"
+-
+-void test_linear_operations()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
+-  boxm_scene<boct_tree<short, float> > *scene2 = create_scene(2,2,2,true, "test_scene2");
+-
+-  float s1 = 2.0, s2=3.0;
+-  for (unsigned i = 0; i< 2; i++)
+-    for (unsigned j = 0; j < 2; j++)
+-      for (unsigned k = 0; k< 2; k++)
+-      {
+-        scene1->load_block(i,j,k);
+-        scene2->load_block(i,j,k);
+-
+-        boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(i,j,k);
+-        boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(i,j,k);
+-
+-        //The result is block1 = s1*block1+ s2*block2
+-        boxm_linear_combination(block1, block2, s1, s2);
+-
+-        //make sure to write the block back to disk
+-        scene1->write_active_block();
+-
+-        //clean memory
+-        scene1->unload_active_blocks();
+-        scene2->unload_active_blocks();
+-      }
+-
+-
+-  //Test the output scene. Scene1 should contain the result i.e (2*0.8 + 3*0.8) and scene2 should be unchanged
+-  boxm_cell_iterator<boct_tree<short, float> > it1 =
+-  scene1->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
+-
+-  boxm_cell_iterator<boct_tree<short, float > > it2 =
+-  scene2->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
+-
+-  it1.begin();
+-  it2.begin();
+-  bool result = true;
+-
+-  while ( !(it1.end() || it2.end()) ) {
+-
+-    boct_tree_cell<short,float > *cell1 = *it1;
+-    boct_tree_cell<short,float > *cell2 = *it2;
+-
+-    if (std::abs(cell1->data()- 4.0f) > 1.0e-7){
+-      std::cerr << "Data1 is incorrect: "<< cell1->data()  <<"Error: " << std::abs(cell1->data()- 4.0f) << '\n';
+-      result = false;
+-      break;
+-    }
+-
+-    if (std::abs(cell2->data()- 0.8f) > 1.0e-7){
+-      std::cerr << "Data2 is incorrect: " << cell2->data()<<'\n';
+-      result = false;
+-      break;
+-    }
+-
+-    ++it1;
+-    ++it2;
+-  }
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_linear_operations " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  TEST("Output data is correct", result, true);
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_linear_operations);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx b/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
+deleted file mode 100644
+index 1243faf34f..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
++++ /dev/null
+@@ -1,54 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov 23 2011
+-
+-#include <testlib/testlib_test.h>
+-#include "test_utils.h"
+-
+-#include <boxm/algo/boxm_scene_levels_utils.h>
+-
+-
+-void test_remove_level0()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
+-
+-  //clone the input scene
+-  boxm_scene<boct_tree<short, float> > *scene2 = new boxm_scene<boct_tree<short, float> >(scene1->lvcs(), scene1->origin(), scene1->block_dim(),
+-                                                                                          scene1->world_dim(), scene1->max_level(), scene1->init_level(),
+-                                                                                          scene1->load_all_blocks(), scene1->save_internal_nodes());
+-
+-  std::stringstream block_pref;
+-  block_pref << scene1->block_prefix() << "_max_level_"  << (scene1->max_level() - 1);
+-  scene2->set_paths(scene1->path(), block_pref.str());
+-  scene2->set_appearance_model(scene1->appearence_model());
+-
+-  std::cout << "Cloning\n";
+-  scene1->clone_blocks(*scene2);
+-  std::cout << "Restructuring\n";
+-  boxm_remove_level_0_leaves(scene2);
+-  std::cout << "Done\n";
+-
+-  //Show contents of the scenes scene
+-  boxm_block_iterator<boct_tree<short, float> > it1 = scene1->iterator();
+-  boxm_block_iterator<boct_tree<short, float> > it2 = scene2->iterator();
+-  for (it1.begin(), it2.begin(); !it1.end() && !it2.end(); ++it1, ++it2)
+-  {
+-    scene1->load_block(it1.index());
+-    scene2->load_block(it2.index());
+-
+-    boxm_block<boct_tree<short, float> > *block1 = scene1->get_active_block();
+-    boxm_block<boct_tree<short, float> > *block2 = scene2->get_active_block();
+-
+-    block1->get_tree()->print();
+-    block2->get_tree()->print();
+-  }
+-
+-  scene1->unload_active_blocks();
+-  scene2->unload_active_blocks();
+-}
+-
+-
+-TESTMAIN(test_remove_level0);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx b/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
+deleted file mode 100644
+index 62b425171a..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
++++ /dev/null
+@@ -1,122 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_save_scene_raw.h>
+-#include <boxm/algo/boxm_refine.h>
+-#include <boct/boct_tree_cell.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_lvcs.h>
+-
+-static int test_save_scene_raw()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(5,5,5);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-  scene.set_paths("boxm_scene1", "block");
+-  vul_file::make_directory("boxm_scene1");
+-  std::ofstream os("scene1.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  unsigned max_level=10, init_level=3;
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  // default model
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
+-  default_sample.alpha=0.001f;
+-  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 1
+-  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
+-
+-  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
+-  s1_sample.alpha=0.6f;
+-  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
+-
+-  // sample 2
+-  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
+-
+-  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
+-
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
+-  s2_sample.alpha=0.6f;
+-  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
+-
+-
+-  float count=0.1f;
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
+-    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree;
+-    if (iter.index().x()==0 && iter.index().y()==0 && iter.index().z()==0) {
+-      tree = new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level);
+-    }
+-    else {
+-      tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level-1);
+-    }
+-    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.9));
+-    s2_sample.alpha=count;
+-
+-    cel11->set_data(s2_sample);
+-    //boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.51));
+-    //cell2->set_data(s2_sample);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-    count+=0.1f;
+-  }
+-
+-
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
+-
+-  float thresh=0.02f;
+-  bool reset=false;
+-  for (unsigned i=0; i<10; i++) {
+-    boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, thresh, reset);
+-    boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene, "scene.raw", 0);
+-#ifdef DEBUG_LEAKS
+-    std::cerr << "Leaks at test_save_scene_raw " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-  }
+-
+-  SUMMARY();
+-}
+-
+-TESTMAIN(test_save_scene_raw);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
+deleted file mode 100644
+index ced456755e..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
++++ /dev/null
+@@ -1,127 +0,0 @@
+-#include <iostream>
+-#include <limits>
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/algo/boxm_upload_mesh.h>
+-#include <boxm/algo/boxm_save_block_raw.h>
+-#include <boct/boct_tree_cell.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_fileio.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static void test_upload_mesh()
+-{
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,1);
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-
+-#if 0
+-  if (vul_file_is_directory("./boxm_upload"))
+-  {
+-    vul_file_iterator fiter("./boxm_upload/*");
+-    while (!fiter)
+-    {
+-      vpl_unlink(fiter());
+-      fiter++;
+-    }
+-    vpl_rmdir("./boxm_upload");
+-  }
+-#endif // 0
+-
+-  scene.set_paths("./boxm_upload", "block");
+-  vul_file::make_directory("./boxm_upload");
+-  std::ofstream os("scene.xml");
+-  x_write(os, scene, "scene");
+-  os.close();
+-
+-  // create a mesh
+-  unsigned int num_faces=1;
+-  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(3));
+-  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
+-  imesh_vertex<3>& vert0 = (*verts)[0];
+-  vert0[0]=2;
+-  vert0[1]=2;
+-  vert0[2]=4;
+-  imesh_vertex<3>& vert1 = (*verts)[1];
+-  vert1[0]=8;
+-  vert1[1]=2;
+-  vert1[2]=4;
+-  imesh_vertex<3>& vert2 = (*verts)[2];
+-  vert2[0]=8;
+-  vert2[1]=8;
+-  vert2[2]=4;
+-
+-  for (unsigned int f=0; f<num_faces; ++f) {
+-    std::vector<unsigned int>& face = (*faces)[f];
+-    unsigned int cnt=3;
+-    face.resize(cnt,0);
+-    for (unsigned int v=0; v<cnt; ++v)
+-      face[v]=v;
+-  }
+-  imesh_mesh mesh;
+-#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
+-  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
+-  mesh.set_vertices(std::move(tempv));
+-  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
+-  mesh.set_faces(std::move(tempf));
+-#else
+-  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
+-  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
+-#endif
+-
+-  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(6,5);
+-    boxm_sample<BOXM_APM_MOG_GREY> s;
+-    s.alpha=std::numeric_limits<float>::max();
+-    tree->init_cells(s);
+-    block->init_tree(tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> val;
+-  val.alpha=0;
+-  boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, mesh, false, val);
+-
+-  std::vector<std::string> fnames;
+-  boxm_block_iterator<tree_type> it(&scene);
+-  it.begin();
+-  // check the first block
+-  scene.load_block(it.index().x(),it.index().y(),it.index().z());
+-  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
+-  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vert0.operator vgl_point_3d<double>());
+-  TEST("Vertex 0 is in the octree", cell0->data().alpha, 0.0f);
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell1 = tree->locate_point_global(vert1.operator vgl_point_3d<double>());
+-  TEST("Vertex 1 is in the octree", cell1->data().alpha, 0.0f);
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2 = tree->locate_point_global(vert2.operator vgl_point_3d<double>());
+-  TEST("Vertex 2 is in the octree", cell2->data().alpha, 0.0f);
+-
+-  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell = tree->locate_point_global(vgl_point_3d<double>(1,1,1));
+-  TEST_NEAR("A non-polygon point should be non-zero", cell->data().alpha, std::numeric_limits<float>::max(), 1e-6);
+-
+-  vpl_rmdir("./boxm_upload");
+-  vpl_unlink("./scene.xml");
+-}
+-
+-TESTMAIN(test_upload_mesh);
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx b/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
+deleted file mode 100644
+index f286501eee..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#include "test_utils.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Aug-2010
+-
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-#include <utility>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i)
+-{
+-  tree-> split(); //now we have 8 cells
+-  //tree->print();
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  leaves[i]->set_data(0.8f);
+-  leaves[i]->split();
+-}
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz, bool uniform, std::string scene_name)
+-{
+-  //crete the input scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-
+-  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
+-
+-    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
+-
+-  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path("./");
+-  scene->set_paths(scene_path,  std::move(scene_name));
+-
+-  unsigned cell_index = 7;
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene->load_block(iter.index());
+-    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
+-    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
+-
+-    float init_val = 0.5f;
+-    if (uniform)
+-      init_val = 0.8f;
+-
+-    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
+-    //tree->print();
+-    init_tree(tree, cell_index);
+-    //tree->print();
+-    block->init_tree(tree);
+-    scene->write_active_block();
+-    if (cell_index == 0) cell_index = 7;
+-    cell_index--;
+-    ++iter;
+-  }
+-  return scene;
+-}
+-
+-void clean_up()
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());
+-    vul_file::delete_file_glob(file_it());
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.h b/contrib/brl/bseg/boxm/algo/tests/test_utils.h
+deleted file mode 100644
+index f646d0b390..0000000000
+--- a/contrib/brl/bseg/boxm/algo/tests/test_utils.h
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#ifndef boxm_algo_test_utils_h_
+-#define boxm_algo_test_utils_h_
+-//:
+-// \file
+-// \brief  A file containing utility functions for other tests
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <boxm/boxm_scene.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i);
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
+-                                                   bool uniform = false, std::string scene_name = "test_scene");
+-
+-void clean_up();
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/CMakeLists.txt
+deleted file mode 100644
+index a5e13d6975..0000000000
+--- a/contrib/brl/bseg/boxm/basic/CMakeLists.txt
++++ /dev/null
+@@ -1,21 +0,0 @@
+-# brl/bseg/boxm/basic/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_basic_sources
+-    boxm_block_vis_graph_iterator.h     boxm_block_vis_graph_iterator.hxx
+-    boxm_block_vis_graph_node.h
+-    boxm_cell_vis_graph_iterator.h      boxm_cell_vis_graph_iterator.hxx
+-    boxm_raytrace_function.h
+-    boxm_seg_length_functor.h
+-    boxm_num_rays_functor.h
+-    boxm_util_data_types.h boxm_util_data_types.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_basic_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_basic LIBRARY_SOURCES ${boxm_basic_sources})
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-target_link_libraries(boxm_basic boxm boxm_util boxm_sample boxm_sample_algo boct ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index b4bce045ed..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/boxm_scene.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short,gauss_type> tree_type;
+-
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
+deleted file mode 100644
+index 4129f1a830..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,float >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
+deleted file mode 100644
+index 450ee3e72c..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,int>  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 2cd39a3534..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <vgl/vgl_point_3d.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index 60ef86952b..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index d4a5a0384f..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boct_tree<short, boxm_edge_tangent_sample<float> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short, boxm_inf_line_sample<float> > aux_tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type);
+-
+-typedef boct_tree<short, float > aux_tree_type2;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type2);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index 10b6aa91a5..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 72ebcd47fb..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index 0fcf5fd35c..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 3ad032ddf2..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index 9ee11b98ea..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
+deleted file mode 100644
+index c2743dff25..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_node.h>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-typedef boct_tree<short, vgl_point_3d<double> > tree_type;
+-BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index fb158b16d1..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_sample<float>);
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index b561f8e125..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_tangent_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
+deleted file mode 100644
+index 343941bf71..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_inf_line_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index 69a4394c0b..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 2bf0739edf..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+deleted file mode 100644
+index 29aadb8cb1..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index ed5b966521..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
+deleted file mode 100644
+index c961518029..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-
+-BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,vgl_point_3d<double>);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx b/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
+deleted file mode 100644
+index 84a7a2e75f..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-BRDB_VALUE_INSTANTIATE(boxm_array_1d_float_sptr,"boxm_array_1d_float_sptr");
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
+deleted file mode 100644
+index d887b99938..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
+diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
+deleted file mode 100644
+index 2a77fe6767..0000000000
+--- a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <vbl/vbl_smart_ptr.hxx>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-VBL_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
+deleted file mode 100644
+index 70f36b1047..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#ifndef boxm_block_vis_graph_iterator_h_
+-#define boxm_block_vis_graph_iterator_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include <map>
+-#include "boxm_block_vis_graph_node.h"
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_scene.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T>
+-class boxm_block_vis_graph_iterator
+-{
+- public:
+-  boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam, boxm_scene<T>* scene,
+-                                unsigned img_ni, unsigned img_nj, bool rev_iter=false);
+-
+-  ~boxm_block_vis_graph_iterator()= default;
+-
+-  bool next();
+-
+-  std::vector<boxm_block<T>*> frontier_blocks();
+-
+-  std::vector<vgl_point_3d<int> > frontier_indices() const {return to_process_indices_; }
+-
+-  void set_reverse_iter(bool reverse) { reverse_it_ = reverse; }
+-
+- private:
+-
+-  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
+-
+-  //: visibility graph, indexed by the block indices
+-  vis_graph_type vis_graph_;
+-
+-  //: blocks that can be seen by the camera unoccluded
+-  std::vector<typename vis_graph_type::iterator> curr_blocks_;
+-
+-  std::vector<vgl_point_3d<int> > to_process_indices_;
+-
+-  //: the camera
+-  vpgl_camera_double_sptr camera_;
+-
+-  boxm_scene<T>* scene_;
+-
+-  bool reverse_it_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
+deleted file mode 100644
+index 4baa6d8992..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
++++ /dev/null
+@@ -1,173 +0,0 @@
+-#ifndef boxm_block_vis_graph_iterator_hxx_
+-#define boxm_block_vis_graph_iterator_hxx_
+-
+-#include "boxm_block_vis_graph_iterator.h"
+-#include "boxm_block_vis_graph_node.h"
+-#include <boxm/util/boxm_utils.h>
+-#include <boct/boct_tree_cell.h>
+-
+-template <class T>
+-boxm_block_vis_graph_iterator<T>::boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam,
+-                                                                boxm_scene<T>* scene,
+-                                                                unsigned img_ni,
+-                                                                unsigned img_nj,
+-                                                                bool rev_iter)
+-    : camera_(cam), scene_(scene), reverse_it_(rev_iter)
+-{
+-  // compute the visibility graph
+-  boxm_block_iterator<T> iter = scene->iterator();
+-  for (; !iter.end(); iter++) {
+-    boxm_block<T>* block = *iter;
+-    if (boxm_utils::is_visible(block->bounding_box(), cam, img_ni, img_nj))
+-      vis_graph_.insert(std::make_pair<vgl_point_3d<int>,boxm_block_vis_graph_node<T> >(iter.index(),boxm_block_vis_graph_node<T>()));
+-  }
+-
+-  typename vis_graph_type::iterator vis_iter;
+-  for (vis_iter=vis_graph_.begin(); vis_iter!=vis_graph_.end(); vis_iter++) {
+-    vgl_point_3d<int> idx = vis_iter->first;
+-    boxm_block<T>* block = scene->get_block(idx);
+-    boct_face_idx vis_faces = boxm_utils::visible_faces(block->bounding_box(), cam);
+-
+-    vgl_point_3d<int> neighbor_idx = vis_iter->first;
+-    bool face_in = false;
+-    if (vis_faces & X_HIGH) {
+-      // check for neighbor on X_HIGH face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(1,0,0);
+-      face_in = true;
+-    } else if (vis_faces & X_LOW) {
+-      // check for neighbor on X_LOW face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(1,0,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
+-      face_in = true;
+-    }
+-
+-    if (face_in) {
+-      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
+-      if (nit == vis_graph_.end()) {
+-        vis_iter->second.in_count++;
+-        curr_blocks_.push_back(vis_iter);
+-      } else {
+-        vis_iter->second.in_count++;
+-        nit->second.out_links.push_back(vis_iter);
+-      }
+-    }
+-
+-    face_in = false;
+-    neighbor_idx = vis_iter->first;
+-    if (vis_faces & Y_HIGH) {
+-      // check for neighbor on Y_HIGH face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,1,0);
+-      face_in = true;
+-    } else if (vis_faces & Y_LOW) {
+-      // check for neighbor on Y_LOW face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,1,0);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
+-      face_in = true;
+-    }
+-
+-    if (face_in) {
+-      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
+-      if (nit == vis_graph_.end()) {
+-        vis_iter->second.in_count++;
+-        curr_blocks_.push_back(vis_iter);
+-      } else {
+-        vis_iter->second.in_count++;
+-        nit->second.out_links.push_back(vis_iter);
+-      }
+-    }
+-
+-    face_in=false;
+-    neighbor_idx = vis_iter->first;
+-    if (vis_faces & Z_HIGH) {
+-      // check for neighbor on Z_HIGH face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,0,1);
+-      face_in = true;
+-    }else if (vis_faces & Z_LOW) {
+-      // check for neighbor on Y_LOW face
+-      if (reverse_it_)
+-        neighbor_idx += vgl_vector_3d<int>(0,0,1);
+-      else
+-        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
+-      face_in = true;
+-     }
+-
+-    if (face_in) {
+-      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
+-      if (nit == vis_graph_.end()) {
+-        vis_iter->second.in_count++;
+-        curr_blocks_.push_back(vis_iter);
+-      }
+-      else {
+-        vis_iter->second.in_count++;
+-        nit->second.out_links.push_back(vis_iter);
+-      }
+-    }
+-  }
+-}
+-
+-template <class T>
+-bool boxm_block_vis_graph_iterator<T>::next()
+-{
+-  typename std::vector<typename vis_graph_type::iterator>::iterator block_iter = curr_blocks_.begin();
+-  std::vector<typename vis_graph_type::iterator> to_process;
+-
+-  for (; block_iter != curr_blocks_.end(); block_iter++) {
+-    //std::cout << (*block_iter)->first;
+-    //std::cout << (*block_iter)->second.in_count << std::endl;
+-    if (--((*block_iter)->second.in_count) == 0)
+-      to_process.push_back(*block_iter);
+-  }
+-
+-  if (to_process.size() == 0) {
+-    to_process_indices_.resize(0);
+-    return false;
+-  }
+-  to_process_indices_.resize(to_process.size());
+-
+-  std::vector<vgl_point_3d<int> >::iterator to_proc_it = to_process_indices_.begin();
+-  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter, ++to_proc_it) {
+-    *to_proc_it = (*block_iter)->first;
+-  }
+-
+-  // add linked blocks to list for next iteration
+-  curr_blocks_.clear();
+-  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter) {
+-    std::vector<typename vis_graph_type::iterator > &links = (*block_iter)->second.out_links;
+-    typename std::vector<typename vis_graph_type::iterator >::iterator neighbor_it = links.begin();
+-    for (; neighbor_it != links.end(); ++neighbor_it) {
+-      curr_blocks_.push_back(*neighbor_it);
+-    }
+-  }
+-  return true;
+-}
+-
+-template <class T>
+-std::vector<boxm_block<T>*> boxm_block_vis_graph_iterator<T>::frontier_blocks()
+-{
+-  std::vector<boxm_block<T>*> frontier;
+-
+-  std::vector<vgl_point_3d<int> > blocks = to_process_indices_;
+-  for (auto index : blocks) {
+-    frontier.push_back(scene_->get_block(index)); //.x(), index.y(), index.z());
+-  }
+-
+-  return frontier;
+-}
+-
+-#define BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(T) \
+-template class boxm_block_vis_graph_iterator<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
+deleted file mode 100644
+index 1d615b1477..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
++++ /dev/null
+@@ -1,52 +0,0 @@
+-#ifndef boxm_block_vis_graph_node_h_
+-#define boxm_block_vis_graph_node_h_
+-//:
+-// \file
+-#include <vector>
+-#include <iostream>
+-#include <map>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vgl/vgl_point_3d.h>
+-
+-//: A comparison functor for vgl_point_3d's. Needed to create a std::set of vgl_point_3d<int>'s.
+-template <class T>
+-class vgl_point_3d_cmp
+-{
+- public:
+-  vgl_point_3d_cmp() = default;
+-
+-  bool operator()(vgl_point_3d<T> const& v0, vgl_point_3d<T> const& v1) const
+-  {
+-    if (v0.z() != v1.z())
+-      return v0.z() < v1.z();
+-    else if (v0.y() != v1.y())
+-      return v0.y() < v1.y();
+-    else
+-      return v0.x() < v1.x();
+-  }
+-};
+-
+-template <class T>
+-class boxm_block_vis_graph_node
+-{
+- public:
+-  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
+-
+-  boxm_block_vis_graph_node() : in_count(0) {}
+-  ~boxm_block_vis_graph_node()= default;
+-
+-  int dec_in_count() { return --in_count; }
+-
+-  //: the number of incoming edges to this node
+-  int in_count;
+-
+-  //: graph links to the outgoing blocks
+-  std::vector<typename vis_graph_type::iterator> out_links;
+-};
+-
+-#define BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(T) \
+-template class boxm_block_vis_graph_node<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
+deleted file mode 100644
+index 6bc8372e16..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#ifndef boxm_cell_vis_graph_iterator_h_
+-#define boxm_cell_vis_graph_iterator_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <vector>
+-#include <boct/boct_tree_cell.h>
+-#include <boct/boct_tree.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T_data>
+-class boxm_cell_vis_graph_iterator
+-{
+- public:
+-  boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
+-                               boct_tree<T_loc,T_data>* tree,
+-                               unsigned img_ni,
+-                               unsigned img_nj);
+-
+-  ~boxm_cell_vis_graph_iterator() = default;
+-
+-  bool next();
+-
+-  std::vector<boct_tree_cell<T_loc,T_data>*> frontier() { return frontier_; }
+-
+-  void set_reverse_iter(bool reverse) { reverse_iter_ = reverse; }
+-
+- private:
+-  //: the camera
+-  vpgl_camera_double_sptr camera_;
+-
+-  //: blocks that can be seen by the camera unoccluded
+-  std::vector<boct_tree_cell<T_loc,T_data>*> frontier_;
+-  std::vector<boct_tree_cell<T_loc,T_data>*> curr_cells_;
+-  bool reverse_iter_;
+-
+-  unsigned img_ni_;
+-  unsigned img_nj_;
+-
+-  //: recursive function
+-  void check_cell_visibility(boct_tree<T_loc,T_data>* tree,
+-                             boct_tree_cell<T_loc,T_data>* tree_cell);
+-
+-  void form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,
+-                           boct_face_idx face_idx,
+-                           boct_tree<T_loc,T_data>* tree);
+-
+-  std::vector<boct_tree_cell<T_loc,T_data>* > list_of_vis_nodes_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
+deleted file mode 100644
+index 4108982a68..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
++++ /dev/null
+@@ -1,131 +0,0 @@
+-#ifndef boxm_cell_vis_graph_iterator_hxx_
+-#define boxm_cell_vis_graph_iterator_hxx_
+-
+-#include "boxm_cell_vis_graph_iterator.h"
+-#include <boxm/util/boxm_utils.h>
+-
+-template <class T_loc,class T_data>
+-boxm_cell_vis_graph_iterator<T_loc,T_data>::boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
+-                                                                         boct_tree<T_loc,T_data>* tree,
+-                                                                         unsigned img_ni,
+-                                                                         unsigned img_nj) : camera_(cam),img_ni_(img_ni), img_nj_(img_nj)
+-{
+-  if (!tree)
+-  {
+-   std::cout<<"No Tree found"<<std::endl;
+-  }
+-  else
+-  {
+-    list_of_vis_nodes_.clear();
+-    // check if each node is visible or notr
+-    check_cell_visibility(tree,tree->root());
+-    // compute the visibility graph
+-    for (unsigned i=0;i<list_of_vis_nodes_.size();i++)
+-    {
+-      boct_face_idx vis_faces = boxm_utils::visible_faces(tree->cell_bounding_box(list_of_vis_nodes_[i]), cam);
+-      if (vis_faces & ::X_HIGH) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],X_HIGH,tree);
+-      }
+-      else if (vis_faces & ::X_LOW) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],X_LOW,tree);
+-      }
+-      if (vis_faces & ::Y_HIGH) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Y_HIGH,tree);
+-      }
+-      else if (vis_faces & ::Y_LOW) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Y_LOW,tree);
+-      }
+-      if (vis_faces & ::Z_HIGH) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Z_HIGH,tree);
+-      }
+-      else if (vis_faces & ::Z_LOW) {
+-        form_graph_per_cell(list_of_vis_nodes_[i],Z_LOW,tree);
+-      }
+-    }
+-    list_of_vis_nodes_.clear();
+-  }
+-}
+-
+-template <class T_loc,class T_data>
+-bool boxm_cell_vis_graph_iterator<T_loc,T_data>::next()
+-{
+-  std::vector<boct_tree_cell<T_loc,T_data>* > to_process;
+-  std::vector<boct_tree_cell<T_loc,T_data>* > to_process_refine;
+-
+-  typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator cell_it = curr_cells_.begin();
+-  for (; cell_it != curr_cells_.end(); ++cell_it) {
+-    // decrement each cell's count in list. if count == 0, add to list of nodes to process
+-    if (--((*cell_it)->vis_node()->incoming_count) == 0) {
+-      to_process.push_back(*cell_it);
+-    }
+-  }
+-  if (to_process.size() == 0) {
+-    return false;
+-  }
+-   frontier_.clear();
+-
+-  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
+-    frontier_.push_back((*cell_it));
+-  }
+-  // add linked cells to list for next iteration
+-  curr_cells_.clear();
+-  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
+-    std::vector<boct_tree_cell<T_loc,T_data>* > links = (*cell_it)->vis_node()->outgoing_links;
+-    typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator neighbor_it = links.begin();
+-    for (; neighbor_it != links.end(); ++neighbor_it) {
+-      curr_cells_.push_back(*neighbor_it);
+-    }
+-  }
+-  return true;
+-}
+-
+-template<class T_loc,class T_data>
+-void boxm_cell_vis_graph_iterator<T_loc,T_data>::check_cell_visibility(boct_tree<T_loc,T_data>* tree,
+-                                                                       boct_tree_cell<T_loc,T_data>* tree_cell)
+-{
+-  vgl_box_3d<double> bbox=tree->cell_bounding_box(tree_cell);
+-  if (boxm_utils::is_visible(bbox, camera_,img_ni_, img_nj_, true))
+-  {
+-    // base case for recursion
+-    if (tree_cell->is_leaf())
+-    {
+-      boct_cell_vis_graph_node<T_loc,T_data> * node=new boct_cell_vis_graph_node<T_loc,T_data>();
+-      node->visible=true;
+-      tree_cell->set_vis_node(node);
+-      list_of_vis_nodes_.push_back(tree_cell);
+-    }
+-    else
+-    {
+-      boct_tree_cell<T_loc,T_data>* children = tree_cell->children();
+-      for (unsigned i=0; i<8; i++)
+-      check_cell_visibility(tree,&children[i]);
+-    }
+-  }
+-}
+-
+-template<class T_loc,class T_data>
+-void boxm_cell_vis_graph_iterator<T_loc,T_data>::form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,boct_face_idx face_idx,boct_tree<T_loc,T_data>* tree)
+-{
+-  boct_cell_vis_graph_node<T_loc,T_data>* vis_node=cell->vis_node();
+-  std::vector<boct_tree_cell<T_loc,T_data>*> neighbors;
+-  cell->find_neighbors(face_idx, neighbors,tree->root_level());
+-  typename std::vector<boct_tree_cell<T_loc,T_data>*>::iterator neighbor_it = neighbors.begin();
+-  bool visible_neighbors=false;
+-  for (; neighbor_it != neighbors.end(); ++neighbor_it) {
+-    boct_cell_vis_graph_node<T_loc,T_data>* neighbor_vis_node=(*neighbor_it)->vis_node();
+-    if (neighbor_vis_node) {
+-      vis_node->incoming_count++;
+-      neighbor_vis_node->outgoing_links.push_back(cell);
+-      visible_neighbors=true;
+-    }
+-  }
+-  if (!visible_neighbors) {
+-    vis_node->incoming_count++;
+-    curr_cells_.push_back(cell);
+-  }
+-}
+-
+-#define BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(T1,T2) \
+-template class boxm_cell_vis_graph_iterator<T1,T2 >
+-
+-#endif // boxm_cell_vis_graph_iterator_hxx_
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h b/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
+deleted file mode 100644
+index 98703eec22..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
++++ /dev/null
+@@ -1,44 +0,0 @@
+-#ifndef boxm_num_rays_functor_h
+-#define boxm_num_rays_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_histogram.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include "boxm_raytrace_function.h"
+-
+-//: this functor is to compute no of rays passing through a cell
+-// Works for boxm_scalar_sample
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_num_rays_functor
+-{
+- public:
+-  boxm_num_rays_functor()
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int /*i*/, unsigned int /*j*/,  // FIXME: both unused!
+-                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> & /*cell_value*/,       // FIXME: unused...
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-
+-    aux_val.scalar_sum_+=1;
+-    //std::cout<<aux_val.scalar_sum_<<' ';
+-    aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h b/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
+deleted file mode 100644
+index 88897fd462..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
++++ /dev/null
+@@ -1,618 +0,0 @@
+-#ifndef boxm_raytrace_function_h_
+-#define boxm_raytrace_function_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-#include <vpgl/vpgl_camera.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vpgl/vpgl_affine_camera.h>
+-#include <vpgl/algo/vpgl_backproject.h>
+-#include <vpgl/algo/vpgl_ray.h>
+-
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/vgl_homg_point_2d.h>
+-#include <vgl/vgl_line_3d_2_points.h>
+-
+-#include <vul/vul_timer.h>
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<class F, class T_loc, class T_data, class T_aux = typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype>
+-class boxm_raytrace_function
+-{
+-  // null scene used as placeholder for operations that don't require an auxiliary scene
+-  boxm_aux_scene<T_loc, T_data, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> null_scene_;
+-
+- public:
+-    typedef boct_tree<T_loc,T_data> tree_type;
+-    typedef boct_tree<T_loc,T_aux> aux_tree_type;
+-    typedef boct_tree_cell<T_loc,T_data> cell_type;
+-
+-    //: constructor for functions with no auxiliary scene needed
+-    boxm_raytrace_function(boxm_scene<tree_type> &scene,
+-                           vpgl_camera_double_sptr cam,
+-                           unsigned int ni, unsigned int nj,
+-                           bool reverse_traversal = false,
+-                           unsigned int i0 = 0, unsigned int j0 = 0
+-                          )
+-    : scene_(scene), aux_scene_(null_scene_), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
+-
+-    //: constructor for functions using an auxiliary scene
+-    boxm_raytrace_function(boxm_scene<tree_type> &scene,
+-                           boxm_aux_scene<T_loc, T_data,  T_aux> &aux_scene,
+-                           vpgl_camera_double_sptr cam,
+-                           unsigned int ni, unsigned int nj,
+-                           bool reverse_traversal = false,
+-                           unsigned int i0 = 0, unsigned int j0 = 0)
+-    : scene_(scene), aux_scene_(aux_scene), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
+-
+-    bool run_single_ray(F& step_functor,float i, float j)
+-    {
+-        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
+-        continue_trace.fill(true);
+-        // code to iterate over the blocks in order of visibility
+-        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
+-        while (block_vis_iter.next())
+-        {
+-            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-            for (unsigned i=0; i<block_indices.size(); i++) // code for each block
+-            {
+-                scene_.load_block(block_indices[i]);
+-                boxm_block<tree_type> * curr_block=scene_.get_active_block();
+-                boxm_block<aux_tree_type> * curr_aux_block=NULL;
+-                if (step_functor.is_aux_)
+-                    curr_aux_block=aux_scene_.get_block(block_indices[i]);
+-
+-                if (debug_lvl_ > 0)
+-                    std::cout << "processing block at index (" <<block_indices[i] << ')' << std::endl;
+-                // make sure block projects to inside of image
+-                vgl_box_3d<double> block_bb = curr_block->bounding_box();
+-
+-                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
+-                    continue;
+-
+-
+-                vgl_box_2d<double> img_bb;
+-
+-                // initialize ray_origin() function for this block
+-                if (!generate_ray_init(block_bb, img_bb)) {
+-                    continue;
+-                }
+-                tree_type * tree=curr_block->get_tree();
+-
+-                aux_tree_type * aux_tree=NULL;
+-                if (step_functor.is_aux_)
+-                {
+-                    aux_tree=curr_aux_block->get_tree();
+-                }
+-
+-                 // get direction of vector and enter point - this depends on which camera type we have
+-                vgl_point_3d<double> ray_origin;
+-                vgl_vector_3d<double> direction;
+-                vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
+-                std::vector<vgl_point_3d<double> > plane_intersections(6);
+-                // add 0.5 to get center of pixel
+-                generate_ray(i , j, block_bb, ray_origin, direction);
+-
+-                // compute intersection of each plane with ray
+-                double lambda[6];
+-                lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
+-                lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
+-                lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
+-                lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
+-                lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
+-                lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
+-
+-                if (block_bb.contains(ray_origin))
+-                    enter_pt=ray_origin;
+-                else
+-                {
+-                    for (unsigned int face=0; face<6; ++face) {
+-                        plane_intersections[face] = ray_origin + (direction * lambda[face]);
+-                    }
+-
+-                    // determine which point is the entrance point based on direction
+-                    const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
+-                    if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
+-                        (direction.z() < -epsilon) )
+-                    {
+-                        // ray intersects the zmax plane
+-                        // check zmax first since it is probably the most common
+-                        enter_pt = plane_intersections[5];
+-                    }
+-                    else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
+-                        (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
+-                        (direction.x() > epsilon) )
+-                    {
+-                        // ray intersects the xmin plane
+-                        enter_pt = plane_intersections[0];
+-                    }
+-                    else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
+-                        (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
+-                        (direction.x() < -epsilon) )
+-                    {
+-                        // ray intersects the xmax plane
+-                        enter_pt = plane_intersections[1];
+-                    }
+-                    else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
+-                        (direction.y() > epsilon) )
+-                    {
+-                        // ray intersects the ymin plane
+-                        enter_pt = plane_intersections[2];
+-                    }
+-                    else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
+-                        (direction.y() < -epsilon) )
+-                    {
+-                        // ray intersects the ymax plane
+-                        enter_pt = plane_intersections[3];
+-                    }
+-                    else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
+-                        (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
+-                        (direction.z() > epsilon) )
+-                    {
+-                        // ray intersects the zmin plane
+-                        enter_pt = plane_intersections[4];
+-                    }
+-                    else {
+-                        // no entry point into this block found
+-                        continue;
+-                    }
+-                }
+-                boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(enter_pt);
+-                while (true)
+-                {
+-                    boct_loc_code<T_loc> cell_code(curr_cell->get_code());
+-
+-                    boct_tree_cell<T_loc,T_aux > * curr_aux_cell=NULL;
+-                    if (step_functor.is_aux_)
+-                        curr_aux_cell=aux_tree->get_cell(cell_code);
+-                    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
+-                    // find exit point of cell
+-                    vgl_point_3d<double> exit_pt;
+-                    double lambda=0;
+-                    boct_face_idx face_id=NONE;
+-                    bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
+-                    if (!found_exit) {
+-                        std::cerr << "error: could not find cell exit point\n"
+-                                 << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
+-                                 << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
+-                                 << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
+-                                 << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
+-                        assert(found_exit);
+-                        break;
+-                    }
+-                    T_data cell_val=curr_cell->data();
+-                    T_aux aux_val;
+-                    if (step_functor.is_aux_)
+-                        aux_val=curr_aux_cell->data();
+-                    continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(enter_pt, exit_pt, cell_val,aux_val);
+-                    curr_cell->set_data(cell_val);
+-                    if (step_functor.is_aux_)
+-                        curr_aux_cell->set_data(aux_val);
+-                    // normalize the point to [0-1]to obtain the index.
+-                    vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
+-                                                      (exit_pt.y()-block_bb.min_y())/block_bb.height(),
+-                                                      (exit_pt.z()-block_bb.min_z())/block_bb.depth());
+-                    // obtain the code for the exit point
+-                    boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level());
+-                    cell_type *neighborcell=NULL;
+-                    if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
+-                        curr_cell=neighborcell->traverse_force(exit_loc_code);
+-                    else
+-                    {
+-                        std::cerr << "NO NEIGHBORS FOUND!\n";
+-                        break;
+-                    }
+-                    enter_pt=exit_pt;
+-                }
+-                if (!step_functor.scene_read_only_)
+-                    scene_.write_active_block();
+-                if (step_functor.is_aux_)
+-                    aux_scene_.write_active_block();
+-            }
+-        }
+-        scene_.unload_active_blocks();
+-        aux_scene_.unload_active_blocks();
+-        return true;
+-    }
+-
+-    bool run(F& step_functor)
+-    {
+-        vul_timer timer;
+-        float total_load_time = 0.0f;
+-        float total_compute_time = 0.0f;
+-        float total_save_time = 0.0f;
+-        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
+-        continue_trace.fill(true);
+-        // code to iterate over the blocks in order of visibility
+-        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
+-        while (block_vis_iter.next())
+-        {
+-            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-            for (auto & block_indice : block_indices) // code for each block
+-            {
+-                timer.mark();
+-                scene_.load_block(block_indice);
+-                boxm_block<tree_type> * curr_block=scene_.get_active_block();
+-
+-                if (debug_lvl_ > 0)
+-                    std::cout << "processing block at index (" <<block_indice << ')' << std::endl;
+-                // make sure block projects to inside of image
+-                vgl_box_3d<double> block_bb = curr_block->bounding_box();
+-
+-                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
+-                    continue;
+-                vgl_box_2d<double> img_bb;
+-                // initialize ray_origin() function for this block
+-                if (!generate_ray_init(block_bb, img_bb)) {
+-                    continue;
+-                }
+-
+-                tree_type * tree=curr_block->get_tree();
+-
+-                boxm_block<aux_tree_type> * curr_aux_block=nullptr;
+-                aux_tree_type * aux_tree=nullptr;
+-                if (step_functor.is_aux_)
+-                {
+-                   curr_aux_block=aux_scene_.get_block(block_indice);
+-                   aux_tree=curr_aux_block->get_tree();
+-                }
+-                float load_time = (float)timer.all() / 1e3f;
+-                total_load_time += load_time;
+-                timer.mark();
+-                // for each image pixel
+-                for (unsigned int i = int(img_bb.min_x()+0.99); i <= img_bb.max_x(); ++i)
+-                {
+-                    if (debug_lvl_ > 1) {
+-                        if (!(i % 10))
+-                            std::cout << '.';
+-                    }
+-                    for (unsigned int j = int(img_bb.min_y()+0.99); j <= img_bb.max_y(); ++j)
+-                    {
+-                        if (!continue_trace(i - img_i0_ , j - img_j0_)) {
+-                            continue;
+-                        }
+-                        // get direction of vector and enter point - this depends on which camera type we have
+-                        vgl_point_3d<double> ray_origin;
+-                        vgl_vector_3d<double>direction;
+-                        vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
+-                        vgl_point_3d<double> exit_pt;
+-                        // add 0.5 to get center of pixel
+-                        generate_ray((float)i + 0.5f, (float)j + 0.5f, block_bb, ray_origin, direction);
+-                        if (!entry_point(block_bb,ray_origin,direction,enter_pt))
+-                            continue;
+-                        // normalize the entry point to [0,1]
+-                        vgl_point_3d<double> enter_pt_norm((enter_pt.x()-block_bb.min_x())/block_bb.width(),
+-                                                           (enter_pt.y()-block_bb.min_y())/block_bb.height(),
+-                                                           (enter_pt.z()-block_bb.min_z())/block_bb.depth());
+-                        boct_loc_code<T_loc> curr_cell_code(enter_pt_norm,tree->root_level());
+-                        boct_tree_cell<T_loc,T_data > * curr_cell=tree->root()->traverse_force(curr_cell_code);
+-
+-                        boct_tree_cell<T_loc, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> aux_cell_null;
+-
+-                        while (continue_trace(i-img_i0_, j-img_j0_))
+-                        {
+-                            boct_tree_cell<T_loc,T_aux > *curr_aux_cell= reinterpret_cast<boct_tree_cell<T_loc,T_aux>*>(&aux_cell_null);
+-                            if (step_functor.is_aux_)
+-                            {
+-                                boct_loc_code<T_loc> cell_code(curr_cell->get_code());
+-                                curr_aux_cell=aux_tree->get_cell(cell_code);
+-                            }
+-                            // get the canonical bounding box
+-                            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
+-                            // find exit point of cell
+-
+-                            double lambda=0;
+-                            boct_face_idx face_id=NONE;
+-                            bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
+-                            if (!found_exit) {
+-                                std::cerr << "error: could not find cell exit point\n"
+-                                         << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
+-                                         << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
+-                                         << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
+-                                         << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
+-                                assert(found_exit);
+-                                break;
+-                            }
+-                            T_data cell_val=curr_cell->data();
+-                            T_aux aux_val=curr_aux_cell->data();
+-
+-
+-                            continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(i,j, enter_pt, exit_pt, cell_val,aux_val);
+-
+-                            curr_cell->set_data(cell_val);
+-                            if (step_functor.is_aux_)
+-                                curr_aux_cell->set_data(aux_val);
+-                             vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
+-                                                               (exit_pt.y()-block_bb.min_y())/block_bb.height(),
+-                                                              (exit_pt.z()-block_bb.min_z())/block_bb.depth());
+-
+-                            // obtain the code for the exit point
+-                            boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level(), tree->max_val());
+-                            cell_type *neighborcell=nullptr;
+-                            if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
+-                                curr_cell=neighborcell->traverse_force(exit_loc_code);
+-                            else
+-                                break;
+-                            enter_pt=exit_pt;
+-                        }
+-                    }
+-                }
+-                float compute_time = (float)timer.all() / 1e3f;
+-                total_compute_time += compute_time;
+-                timer.mark();
+-
+-                if (!step_functor.scene_read_only_)
+-                    scene_.write_active_block();
+-                if (step_functor.is_aux_)
+-                    aux_scene_.write_active_block();
+-
+-                float save_time = (float)timer.all() /  1e3f;
+-                total_save_time += save_time;
+-                //std::cout << "load: " << load_time << "s  compute: " << compute_time << "s  save: " << save_time << 's' << std::endl;
+-            }
+-        }
+-        scene_.unload_active_blocks();
+-        aux_scene_.unload_active_blocks();
+-
+-        //std::cout << "total load: " << total_load_time << "s  total compute: " << total_compute_time << "s  total save: " << total_save_time << 's' << std::endl;
+-        return true;
+-    }
+-
+- protected:
+-
+-    bool generate_ray_init(vgl_box_3d<double> const& block_bb, vgl_box_2d<double> &img_bb)
+-    {
+-        // determine intersection of block bounding box projection and image bounds
+-        vgl_box_2d<double> img_bounds;
+-        img_bounds.add(vgl_point_2d<double>(img_i0_,img_j0_));
+-        img_bounds.add(vgl_point_2d<double>(img_i0_ + img_ni_ - 1, img_j0_ + img_nj_ - 1));
+-
+-        vgl_box_2d<double> block_projection;
+-        double u,v;
+-        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.min_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.max_z(),u,v);
+-        block_projection.add(vgl_point_2d<double>(u,v));
+-
+-        img_bb=vgl_intersection(img_bounds,block_projection);
+-
+-        if (img_bb.is_empty())
+-            return false;
+-        else
+-            return true;
+-    }
+-
+-    void generate_ray(float i, float j, vgl_box_3d<double> const& /*block_bb*/, vgl_point_3d<double> &ray_origin, vgl_vector_3d<double> &norm_direction)
+-    {
+-      if (cam_->type_name() == "vpgl_perspective_camera") {
+-        vpgl_perspective_camera<double> const* pcam =
+-          static_cast<vpgl_perspective_camera<double> const*>(cam_.ptr());
+-        // backproject image point to a ray
+-        ray_origin = pcam->camera_center();
+-        vgl_line_3d_2_points<double> cam_ray = pcam->backproject(vgl_point_2d<double>((double)i,(double)j));
+-        norm_direction=cam_ray.direction();
+-        normalize(norm_direction);
+-        return;
+-      }
+-      if (cam_->type_name() == "vpgl_proj_camera") {
+-        vpgl_proj_camera<double> const* prcam =
+-          static_cast<vpgl_proj_camera<double> const*>(cam_.ptr());
+-        ray_origin = prcam->camera_center();
+-        vgl_homg_line_3d_2_points<double>  cam_ray =
+-          prcam->backproject(vgl_homg_point_2d<double>((double)i,(double)j));
+-        vgl_homg_point_3d<double> hp = cam_ray.point_infinite();
+-        vgl_vector_3d<double> direction(hp.x(), hp.y(), hp.z());
+-        norm_direction=direction;
+-        normalize(norm_direction);
+-        return;
+-      }
+-      if (cam_->type_name() == "vpgl_affine_camera") {
+-        vgl_homg_point_2d<double> ph(i, j);
+-        vpgl_affine_camera<double> const * afcam =
+-          static_cast<vpgl_affine_camera<double> const*>(cam_.ptr());
+-        vgl_homg_line_3d_2_points<double>  cam_ray =
+-          afcam->backproject(ph);
+-        vgl_homg_point_3d<double> hpinf = cam_ray.point_infinite();
+-        vgl_homg_point_3d<double> hpfin = cam_ray.point_finite();
+-        vgl_vector_3d<double> direction(hpinf.x(), hpinf.y(), hpinf.z());
+-        norm_direction=direction;
+-        normalize(norm_direction);
+-        vgl_point_3d<double> temp(hpfin);
+-        ray_origin = temp;
+-        return;
+-      }
+-      if (cam_->type_name() == "vpgl_local_rational_camera") {
+-        vpgl_local_rational_camera<double> const* lrcam =
+-          static_cast<vpgl_local_rational_camera<double> const*>(cam_.ptr());
+-        vpgl_ray::ray(*lrcam,(double)i, (double)j, ray_origin, norm_direction);
+-        return;
+-      }
+-      else {
+-        std::cerr << "In boxm_raytrace_function: camera type not handled\n";
+-        assert(false);
+-      }
+-    }
+-
+-    bool entry_point(vgl_box_3d<double> & block_bb, vgl_point_3d<double>  &ray_origin,
+-                     vgl_vector_3d<double> &direction, vgl_point_3d<double> & enter_pt)
+-    {
+-      double lambda[6];
+-      std::vector<vgl_point_3d<double> > plane_intersections(6);
+-
+-      lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
+-      lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
+-      lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
+-      lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
+-      lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
+-      lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
+-
+-      if (block_bb.contains(ray_origin))
+-          enter_pt=ray_origin;
+-      else
+-      {
+-          for (unsigned int face=0; face<6; ++face) {
+-              plane_intersections[face] = ray_origin + (direction * lambda[face]);
+-          }
+-
+-          // determine which point is the entrance point based on direction
+-          const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
+-          if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
+-              (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
+-              (direction.z() < -epsilon) )
+-          {
+-              // ray intersects the zmax plane
+-              // check zmax first since it is probably the most common
+-              enter_pt = plane_intersections[5];
+-          }
+-          else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
+-              (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
+-              (direction.x() > epsilon) )
+-          {
+-              // ray intersects the xmin plane
+-              enter_pt = plane_intersections[0];
+-          }
+-          else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
+-              (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
+-              (direction.x() < -epsilon) )
+-          {
+-              // ray intersects the xmax plane
+-              enter_pt = plane_intersections[1];
+-          }
+-          else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
+-              (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
+-              (direction.y() > epsilon) )
+-          {
+-              // ray intersects the ymin plane
+-              enter_pt = plane_intersections[2];
+-          }
+-          else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
+-              (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
+-              (direction.y() < -epsilon) )
+-          {
+-              // ray intersects the ymax plane
+-              enter_pt = plane_intersections[3];
+-          }
+-          else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
+-              (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
+-              (direction.z() > epsilon) )
+-          {
+-              // ray intersects the zmin plane
+-              enter_pt = plane_intersections[4];
+-          }
+-          else {
+-              // no entry point into this block found
+-              return false;;
+-          }
+-      }
+-      return true;
+-    }
+-
+-    boxm_scene<tree_type> &scene_;
+-    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
+-
+-    bool reverse_traversal_;
+-
+-    const vpgl_camera_double_sptr cam_;
+-    unsigned int img_i0_;
+-    unsigned int img_j0_;
+-    unsigned int img_ni_;
+-    unsigned int img_nj_;
+-
+-    unsigned int debug_lvl_;
+-};
+-
+-template<class F, class T_loc, class T_data, class T_aux>
+-class boxm_iterate_cells_function
+-{
+- public:
+-    typedef boct_tree<T_loc,T_data> tree_type;
+-    typedef boct_tree<T_loc,T_aux> aux_tree_type;
+-    typedef boct_tree_cell<T_loc,T_data> cell_type;
+-    typedef boct_tree_cell<T_loc,T_aux> aux_cell_type;
+-    //: constructor
+-    boxm_iterate_cells_function(boxm_scene<tree_type> &scene,
+-                                boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene,
+-                                vpgl_camera_double_sptr cam,
+-                                unsigned int ni, unsigned int nj )
+-    : scene_(scene), aux_scene_(aux_scene), img_ni_(ni), img_nj_(nj), cam_(cam)
+-    {}
+-
+-
+-    bool run(F& step_functor)
+-    {
+-        // code to iterate over the blocks in order of visibility
+-        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
+-        while (block_vis_iter.next())
+-        {
+-            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
+-            for (auto & block_indice : block_indices) // code for each block
+-            {
+-                scene_.load_block(block_indice);
+-                boxm_block<tree_type> * curr_block=scene_.get_active_block();
+-                boxm_block<aux_tree_type> * curr_aux_block=aux_scene_.get_block(block_indice);
+-                tree_type * tree=curr_block->get_tree();
+-                aux_tree_type * aux_tree=curr_aux_block->get_tree();
+-
+-                std::vector<cell_type*> leaves=tree->leaf_cells();
+-                for (unsigned i=0;i<leaves.size();i++)
+-                {
+-                    T_data cell_val=leaves[i]->data();
+-                    boct_loc_code<T_loc> cell_code(leaves[i]->get_code());
+-                    aux_cell_type * aux_cell=aux_tree->get_cell(cell_code);
+-                    T_aux aux_val=aux_cell->data();
+-                    step_functor.step_cell(cell_val,aux_val);
+-                    leaves[i]->set_data(cell_val);
+-                    aux_cell->set_data(aux_val);
+-                }
+-                scene_.write_active_block();
+-                aux_scene_.write_active_block();
+-            }
+-        }
+-        return true;
+-    }
+-
+- protected:
+-    boxm_scene<tree_type> &scene_;
+-    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
+-    bool reverse_traversal_;
+-
+-    unsigned img_ni_;
+-    unsigned img_nj_;
+-
+-    const vpgl_camera_double_sptr cam_;
+-};
+-
+-#endif // boxm_raytrace_function_h_
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h b/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
+deleted file mode 100644
+index ea44cd7eed..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
++++ /dev/null
+@@ -1,46 +0,0 @@
+-#ifndef boxm_seg_length_functor_h
+-#define boxm_seg_length_functor_h
+-//:
+-// \file
+-#include <iostream>
+-#include <boxm/boxm_apm_traits.h>
+-#include "boxm_raytrace_function.h"
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <vil/vil_image_view.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <boxm_apm_type APM, class T_aux>
+-class boxm_seg_length_functor
+-{
+- public:
+-  boxm_seg_length_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &observation,
+-                          unsigned int /*ni*/=0, unsigned /*nj*/=0)
+-    : obs_(observation)
+-  {
+-    scene_read_only_=true;
+-    is_aux_=true;
+-  }
+-
+-  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
+-                        boxm_sample<APM> & /*cell_value*/,    // FIXME: unused...
+-                        T_aux &aux_val)
+-  {
+-    const float seg_len = (float)(s1 - s0).length();
+-    aux_val.obs_ += obs_(i,j) * seg_len;
+-    aux_val.seg_len_ += seg_len;
+-    return true;
+-  }
+-
+- public:
+-  bool scene_read_only_;
+-  bool is_aux_;
+-
+- private:
+-  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &obs_;
+-};
+-
+-#endif // boxm_seg_length_functor_h
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
+deleted file mode 100644
+index a6f2af30f1..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include "boxm_util_data_types.h"
+-
+-// Binary write boxm_render_probe_manager scene to stream
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_write(vsl_b_ostream &, boxm_array_1d_float const&) {}
+-
+-// Binary load boxm_render_probe_manager scene from stream.
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_read(vsl_b_istream &, boxm_array_1d_float &) {}
+-
+-// Binary load boxm_render_probe_manager scene from stream.
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_read(vsl_b_istream&, boxm_array_1d_float*) {}
+-
+-// Binary write scene pointer to stream
+-// DUMMY IMPLEMENTATION: does nothing!
+-void vsl_b_write(vsl_b_ostream&, const boxm_array_1d_float* &) {}
+diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
+deleted file mode 100644
+index 827e172bbc..0000000000
+--- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#ifndef boxm_util_data_types_h
+-#define boxm_util_data_types_h
+-//:
+-// \file
+-#include <vbl/vbl_ref_count.h>
+-#include <vbl/vbl_smart_ptr.h>
+-#include <vbl/vbl_array_1d.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-class boxm_array_1d_float: public vbl_ref_count
+-{
+- public:
+-  boxm_array_1d_float(unsigned n):data_array(n,-1.0f){}
+-  vbl_array_1d<float> data_array;
+-};
+-
+-typedef vbl_smart_ptr<boxm_array_1d_float> boxm_array_1d_float_sptr;
+-
+-//: Binary write boxm_render_probe_manager scene to stream
+-void vsl_b_write(vsl_b_ostream & os, boxm_array_1d_float const& a);
+-
+-//: Binary load boxm_render_probe_manager scene from stream.
+-void vsl_b_read(vsl_b_istream & is, boxm_array_1d_float &a);
+-
+-void vsl_b_read(vsl_b_istream& is, boxm_array_1d_float* b);
+-
+-//: Binary write  scene pointer to stream
+-void vsl_b_write(vsl_b_ostream& os, const boxm_array_1d_float* &b);
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
+deleted file mode 100644
+index 96c61fe483..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-add_executable( boxm_basic_test_all
+-  test_driver.cxx
+-  test_block_vis_graph.cxx
+-  test_cell_vis_graph.cxx
+- )
+-
+-target_link_libraries( boxm_basic_test_all boxm_basic boxm boxm_util ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME boxm_basic_test_block_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_block_vis_graph  )
+-add_test( NAME boxm_basic_test_cell_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_cell_vis_graph  )
+-
+-add_executable( boxm_basic_test_include test_include.cxx )
+-target_link_libraries( boxm_basic_test_include boxm_basic)
+-add_executable( boxm_basic_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_basic_test_template_include boxm_basic)
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
+deleted file mode 100644
+index 70a87b0476..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
++++ /dev/null
+@@ -1,48 +0,0 @@
+-
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_block_vis_graph()
+-{
+-  // create scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(2,2,3);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  vul_file::make_directory("boxm_scene");
+-  scene.set_paths("boxm_scene", "block");
+-
+-
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-  boxm_block_vis_graph_iterator<tree_type> block_vis_iter(camera, &scene, IMAGE_U, IMAGE_V);
+-
+-  int vis_count = -1;
+-  std::vector<boxm_block<tree_type>*> blocks;
+-  int counts[] = {4,4,4};
+-  while (block_vis_iter.next()) {
+-    int block_count = 0;
+-    ++vis_count;
+-    std::cout << "Frontier\n";
+-    blocks = block_vis_iter.frontier_blocks();
+-    for (unsigned i=0; i<blocks.size(); ++i) {
+-      std::cout << i << "- " << blocks[i]->bounding_box() << std::endl;
+-      ++block_count;
+-    }
+-    TEST("block count", block_count, counts[vis_count]);
+-  }
+-  vpl_rmdir("boxm_scene");
+-  TEST("vis count", ++vis_count, 3);
+-}
+-
+-TESTMAIN(test_block_vis_graph);
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
+deleted file mode 100644
+index d9e2da00f7..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/util/boxm_test_util.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_cell_vis_graph()
+-{
+-  // create scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_paths("boxm_scene_cell", "block");
+-  vul_file::make_directory("boxm_scene_cell");
+-
+-  vgl_box_3d<double> world;
+-  world.add(origin);
+-  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
+-                                 origin.y()+block_dim.y()*world_dim.y(),
+-                                 origin.z()+block_dim.z()*world_dim.z()));
+-
+-  vpgl_camera_double_sptr camera = generate_camera_top(world);
+-  boxm_block_iterator<boct_tree<short,vgl_point_3d<double> > > iter(&scene);
+-
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,vgl_point_3d<double> > > * block=scene.get_active_block();
+-    auto * tree=new boct_tree<short,vgl_point_3d<double> >(3,2);
+-    block->init_tree(tree);
+-    boxm_cell_vis_graph_iterator<short,vgl_point_3d<double> > cell_iterator(camera,tree,IMAGE_U, IMAGE_V);
+-    double cnt=30;
+-    while (cell_iterator.next()){
+-      std::cout<<"Frontier\n";
+-      std::vector<boct_tree_cell<short,vgl_point_3d<double> > *> vis_cells=cell_iterator.frontier();
+-      for (auto & vis_cell : vis_cells)
+-      {
+-        vgl_box_3d<double> box=tree->cell_bounding_box(vis_cell);
+-        TEST("Returns correct frontier",cnt,box.max_z());
+-      }
+-      cnt-=5;
+-    }
+-
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  vpl_rmdir("boxm_scene_cell");
+-}
+-
+-TESTMAIN(test_cell_vis_graph);
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx b/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
+deleted file mode 100644
+index 1e4f60a571..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_block_vis_graph );
+-DECLARE( test_cell_vis_graph );
+-
+-void register_tests()
+-{
+-  REGISTER( test_block_vis_graph );
+-  REGISTER( test_cell_vis_graph );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
+deleted file mode 100644
+index cbaeca0acc..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_block_vis_graph_node.h>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
+-#include <boxm/basic/boxm_num_rays_functor.h>
+-#include <boxm/basic/boxm_raytrace_function.h>
+-#include <boxm/basic/boxm_seg_length_functor.h>
+-#include <boxm/basic/boxm_util_data_types.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
+deleted file mode 100644
+index 131baa9347..0000000000
+--- a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
+-#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx b/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
+deleted file mode 100644
+index 1d3c646178..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
++++ /dev/null
+@@ -1,86 +0,0 @@
+-#include "boxm_apm_traits.h"
+-
+-const char* boxm_apm_types::app_model_strings[]  = { "apm_mog_grey",
+-                                                     "apm_mog_rgb",
+-                                                     "apm_simple_grey",
+-                                                     "apm_simple_rgb",
+-                                                     "apm_mob_grey",
+-                                                     "float",
+-                                                     "int",
+-                                                     "short",
+-                                                     "char",
+-                                                     "bool",
+-                                                     "vnl_double_10",
+-                                                     "vnl_float_10",
+-                                                     "vnl_float_3",
+-                                                     "bsta_mog_f1",
+-                                                     "bsta_gauss_f1",
+-                                                     "bvpl_sample_float",
+-                                                     "bvpl_sample_gauss_f1",
+-                                                     "bvpl_pca_basis_sample_10",
+-                                                     "edge_float",
+-                                                     "edge_line",
+-                                                     "edge_tangent_line",
+-                                                     "scalar_float",
+-                                                     "dbrec3d_part_instance",
+-                                                     "dbrec3d_pair_composite_instance",
+-                                                     "apm_na",
+-                                                     "apm_unknown" };
+-
+-
+-boxm_apm_type boxm_apm_types::str_to_enum(const char* s)
+-{
+-  for (int i=0; i < int(BOXM_APM_UNKNOWN); i++)
+-  {
+-    if (std::strcmp(s, boxm_apm_types::app_model_strings[i]) == 0)
+-      return (boxm_apm_type) i;
+-  }
+-  return BOXM_APM_UNKNOWN;
+-}
+-
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.color_);
+-  vsl_b_write(os, sample.one_over_sigma_);
+-  //vsl_b_write(os, sample.gauss_weight_);
+-}
+-
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.color_);
+-    vsl_b_read(is, sample.one_over_sigma_);
+-    //vsl_b_read(is, sample.gauss_weight_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm)
+-{
+-  os << "color: " << apm.color() << ", one_over_sigma: " << apm.one_over_sigma() << std::endl;
+-  return os;
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.h b/contrib/brl/bseg/boxm/boxm_apm_traits.h
+deleted file mode 100644
+index 17f80b5a70..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_apm_traits.h
++++ /dev/null
+@@ -1,206 +0,0 @@
+-#ifndef boxm_appearance_model_traits_h_
+-#define boxm_appearance_model_traits_h_
+-//:
+-// \file
+-// \brief A class for appearance model traits
+-//
+-// \author Daniel Crispell
+-// \date April 03, 2009
+-
+-#include <iostream>
+-#include <iosfwd>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_gauss_if3.h>
+-#include <bsta/bsta_beta.h>
+-#include <bsta/bsta_beta_f1.h>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include "boxm_export.h"
+-
+-class boxm_mog_grey_processor;
+-class boxm_mog_rgb_processor;
+-class boxm_simple_grey_processor;
+-class boxm_mob_grey_processor;
+-
+-enum boxm_apm_type
+-{
+-  BOXM_APM_MOG_GREY = 0,
+-  BOXM_APM_MOG_RGB,
+-  BOXM_APM_SIMPLE_GREY,
+-  BOXM_APM_SIMPLE_RGB,
+-  BOXM_APM_MOB_GREY,
+-  BOXM_FLOAT,
+-  BOXM_INT,
+-  BOXM_SHORT,
+-  BOXM_CHAR,
+-  BOXM_BOOL,
+-  VNL_DOUBLE_10,
+-  VNL_FLOAT_10,
+-  VNL_FLOAT_3,
+-  BSTA_MOG_F1,
+-  BSTA_GAUSS_F1,
+-  BVPL_SAMPLE_FLOAT,
+-  BVPL_SAMPLE_BSTA_GAUSS_F1,
+-  BVPL_PCA_BASIS_SAMPLE_10,
+-  BOXM_EDGE_FLOAT,
+-  BOXM_EDGE_LINE,
+-  BOXM_EDGE_TANGENT_LINE,
+-  BOXM_SCALAR_FLOAT,
+-  DBREC3D_PART_INSTANCE,
+-  DBREC3D_PAIR_COMPOSITE_INSTANCE,
+-  BOXM_APM_NA,
+-  BOXM_APM_UNKNOWN
+-};
+-
+-class boxm_apm_types
+-{
+- public:
+-  static boxm_EXPORT_DATA const char* app_model_strings[];
+-  static boxm_apm_type str_to_enum(const char* s);
+-};
+-
+-//: Pixel properties for templates.
+-template <boxm_apm_type>
+-class boxm_apm_traits;
+-
+-
+-//: traits for a mixture of gaussian appearance model of gray-scale images
+-template<>
+-class boxm_apm_traits<BOXM_APM_MOG_GREY>
+-{
+- public:
+-  static const unsigned int n_gaussian_modes_ = 3;
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
+-  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
+-
+- public:
+-  static const unsigned int obs_dim = 1;
+-  typedef  mix_gauss_sf1_type apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_mog_grey_processor apm_processor;
+-};
+-
+-
+-//: traits for a mixture of gaussian appearance model of rgb images
+-template<>
+-class boxm_apm_traits<BOXM_APM_MOG_RGB>
+-{
+- public:
+-  static const unsigned int n_gaussian_modes_ = 3;
+-
+-  typedef bsta_num_obs<bsta_gauss_if3> gauss_type_if3;
+-  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_if3, n_gaussian_modes_> > mix_gauss_if3_type;
+-
+- public:
+-  static const unsigned int obs_dim = 3;
+-  typedef  mix_gauss_if3_type apm_datatype;
+-  typedef vil_rgb<float> obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_mog_rgb_processor apm_processor;
+-};
+-
+-
+-//: traits for a simple one-valued appearance model of grey-scale images
+-class boxm_simple_grey
+-{
+- public:
+-  boxm_simple_grey() : color_(0.5f), one_over_sigma_(1.0f),gauss_weight_(1.0f) {}
+-  boxm_simple_grey(float colour, float std_dev, float gauss_wght=1.0f) : color_(colour), one_over_sigma_(1/std_dev), gauss_weight_(gauss_wght)  { check_vals(); }
+-  boxm_simple_grey(vnl_vector_fixed<float,3> const& params) : color_(params[0]), one_over_sigma_(1.0f/params[1])  { check_vals(); }
+-  static short version_no() { return 1; }
+-  inline float color() const { return color_; }
+-  inline float sigma() const { return 1.0f/one_over_sigma_; }
+-  inline float gauss_weight() const { return gauss_weight_; }
+-  inline float one_over_sigma() const { return one_over_sigma_; }
+-
+- protected:
+-  inline void check_vals()
+-  {
+-    if (!(color_ > 0.0f))
+-      color_ = 0.0f;
+-    if (!(color_ < 1.0f))
+-      color_ = 1.0f;
+-    if (!(one_over_sigma_ < 1e4))
+-      one_over_sigma_ = 1e4f;
+-    if (!(one_over_sigma_ > 1e-4))
+-      one_over_sigma_ = 1e-4f;
+-  }
+-
+- public:
+-  float color_;
+-  float one_over_sigma_;
+-  float gauss_weight_;
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_APM_SIMPLE_GREY>
+-{
+- public:
+-  static const unsigned int n_gaussian_modes_ = 1;
+-  static const unsigned int obs_dim = 1;
+-  static const unsigned int n_params = 3;
+-  typedef boxm_simple_grey apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_simple_grey_processor apm_processor;
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_APM_MOB_GREY>
+-{
+- public:
+-  static const unsigned int n_beta_modes_ = 3;
+-
+-  typedef bsta_num_obs<bsta_beta_f1> beta_type;
+-  typedef bsta_num_obs<bsta_mixture_fixed<beta_type, n_beta_modes_> > mix_beta_type;
+-
+- public:
+-  static const unsigned int obs_dim = 1;
+-  typedef  mix_beta_type apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-  typedef boxm_mob_grey_processor apm_processor;
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_EDGE_FLOAT>
+-{
+- public:
+-  static const unsigned int obs_dim = 1;
+-  static const unsigned int n_params = 2;
+-  typedef boxm_edge_sample<float> apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-#if 0
+-  typedef boxm_edge_processor apm_processor;
+-#endif
+-};
+-
+-template<>
+-class boxm_apm_traits<BOXM_EDGE_LINE>
+-{
+- public:
+-  static const unsigned int obs_dim = 1;
+-  static const unsigned int n_params = 2;
+-  typedef boxm_inf_line_sample<float> apm_datatype;
+-  typedef float obs_datatype;
+-  typedef float obs_mathtype;
+-};
+-
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample);
+-void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample);
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample);
+-void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample);
+-std::ostream& operator << (std::ostream& os, const boxm_simple_grey& sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.h b/contrib/brl/bseg/boxm/boxm_aux_scene.h
+deleted file mode 100644
+index 40a2a56914..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_aux_scene.h
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#ifndef boxm_aux_scene_h_
+-#define boxm_aux_scene_h_
+-//:
+-// \file
+-// \brief  an auxiliary scene keeps a set of octrees for a given main scene
+-//
+-// \author Gamze Tunali
+-// \date   July 31, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell_reader.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_block.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-
+-template <class T_loc, class T, class T_AUX>
+-class boxm_aux_scene
+-{
+- public:
+-   typedef enum {EMPTY=0, CLONE, LOAD, UNDEFINED } tree_creation_type ;
+-   typedef  boct_tree<T_loc, T> tree_type;
+-   typedef  boct_tree<T_loc, T_AUX> aux_tree_type;
+-   boxm_aux_scene() : aux_scene_(nullptr), aux_storage_dir_("") {}
+-   boxm_aux_scene(boxm_scene<tree_type>* scene, std::string suffix,
+-                  tree_creation_type type, boxm_apm_type app_model=BOXM_APM_UNKNOWN);
+-
+-   ~boxm_aux_scene(){ /*delete aux_scene_;*/ }
+-
+-   void init_scene(){}
+-
+-
+-   boxm_block<boct_tree<T_loc,T_AUX> > * get_block(vgl_point_3d<int> index){
+-       aux_scene_->load_block(index);
+-       return aux_scene_->get_active_block();
+-   }
+-
+-   //: get an incremental reader for a scene block
+-   boct_tree_cell_reader<T_loc, T_AUX >* get_block_incremental(vgl_point_3d<int> block_idx);
+-
+-   void write_active_block() { aux_scene_->write_active_block(); }
+-  void unload_active_blocks() { aux_scene_->unload_active_blocks(); }
+-   void clean_scene();
+-
+- private:
+-  boxm_scene<aux_tree_type>* aux_scene_;
+-  std::string aux_storage_dir_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx b/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
+deleted file mode 100644
+index d3ceaf9c84..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
++++ /dev/null
+@@ -1,121 +0,0 @@
+-#ifndef boxm_aux_scene_hxx_
+-#define boxm_aux_scene_hxx_
+-
+-#include "boxm_aux_scene.h"
+-#include <boxm/boxm_aux_traits.h>
+-
+-#include <vpl/vpl.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template <class T_loc, class T, class T_AUX>
+-boxm_aux_scene<T_loc,T,T_AUX>::boxm_aux_scene(boxm_scene<tree_type>* scene,
+-                                              std::string storage_suffix,
+-                                              tree_creation_type type,
+-                                              boxm_apm_type app_model)
+-: aux_scene_(nullptr)
+-{
+-  std::string aux_storage_dir;
+-  aux_storage_dir_ = scene->path();
+-  aux_scene_ = new boxm_scene<aux_tree_type >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->load_all_blocks(),scene->save_internal_nodes(), scene->save_platform_independent());
+-  aux_scene_->set_path(aux_storage_dir_,  storage_suffix);
+-  aux_scene_->set_appearance_model(app_model);
+-  aux_scene_->set_octree_levels(scene->max_level(),scene->init_level());
+-  if (type != EMPTY)
+-  {
+-    // loop through valid blocks and init same blocks in aux scene
+-    boxm_block_iterator<tree_type > iter(scene);
+-    iter.begin();
+-    while (!iter.end()) {
+-      if (scene->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-        if (type == LOAD) {
+-          if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-#if 0
+-            // auxiliary block file exist
+-            aux_scene_->load_block(iter.index());
+-            boxm_block<boct_tree<T_loc,T_AUX> > * block=aux_scene_->get_active_block();
+-            assert(block->get_tree() != 0);
+-#endif
+-          }
+-        }
+-        else if (type==CLONE) {  //clone from the primary block
+-          scene->load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-          boxm_block<boct_tree<T_loc,T> > * block=scene->get_active_block();
+-          boct_tree<T_loc,T>* tree=block->get_tree();
+-          aux_tree_type *aux_tree = tree->template clone_to_type<T_AUX>();
+-          boxm_block<aux_tree_type >* aux_block = new boxm_block<aux_tree_type >(block->bounding_box(),aux_tree );
+-          aux_scene_->set_block(iter.index(), aux_block);
+-          aux_scene_->write_active_block();
+-        }
+-      }
+-      ++iter;
+-    }
+-    aux_scene_->write_scene(storage_suffix+".xml");
+-    scene->unload_active_blocks();
+-    aux_scene_->unload_active_blocks();
+-    }
+-}
+-
+-
+-template <class T_loc, class T, class T_AUX>
+-boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::get_block_incremental(vgl_point_3d<int> block_idx)
+-{
+-  if (aux_scene_) {
+-    std::string path=aux_scene_->gen_block_path(block_idx.x(), block_idx.y(), block_idx.z());
+-    boct_tree_cell_reader<T_loc, T_AUX>* reader = new boct_tree_cell_reader<T_loc, T_AUX>(path);
+-    reader->begin();
+-    return reader;
+-  }
+-  else {
+-    return nullptr;
+-  }
+-}
+-
+-template <class T_loc, class T, class T_AUX>
+-void boxm_aux_scene<T_loc,T,T_AUX>::clean_scene()
+-{
+-  std::cout<<"Clean AUX scene "<<std::endl;
+-  aux_scene_->unload_active_blocks();
+-  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(aux_scene_);
+-  iter.begin();
+-  if (!aux_scene_->load_all_blocks())
+-  {
+-    while (!iter.end()) {
+-      if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-        std::string filename=aux_scene_->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
+-        vpl_unlink(filename.c_str());
+-      }
+-      iter++;
+-    }
+-  }
+-  else
+-  {
+-    while (!iter.end()) {
+-      if (iter->get_tree()!=nullptr)
+-      {
+-        iter->delete_tree();
+-        iter->set_tree(nullptr);
+-      }
+-      iter++;
+-    }
+-  }
+-}
+-
+-#if 0 // commented out
+-template <class T_loc, class T, class T_AUX>
+-boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::save_scene()
+-{
+-  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(&aux_scene);
+-  iter.begin();
+-  while (!iter.end()) {
+-    // body
+-  }
+-}
+-#endif // 0
+-
+-#define BOXM_AUX_SCENE_INSTANTIATE(T1,T2,T3) \
+-template class boxm_aux_scene<T1,T2,T3 >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_aux_traits.h b/contrib/brl/bseg/boxm/boxm_aux_traits.h
+deleted file mode 100644
+index 4e4c5113da..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_aux_traits.h
++++ /dev/null
+@@ -1,74 +0,0 @@
+-#ifndef boxm_aux_traits_h_
+-#define boxm_aux_traits_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/sample/boxm_vis_implicit_sample.h>
+-#include <boxm/sample/boxm_update_sample.h>
+-
+-enum boxm_aux_type
+-{
+-  BOXM_AUX_VIS_IMPLICIT,
+-  BOXM_AUX_UPDATE,
+-  BOXM_AUX_OPT_GREY,
+-  BOXM_AUX_OPT_RT_GREY,
+-  BOXM_AUX_OPT_RGB,
+-  BOXM_AUX_OPT_RT_RGB,
+-  BOXM_AUX_NULL,
+-  BOXM_AUX_UNKNOWN,
+-  BOXM_AUX_OPT2_GREY,
+-  BOXM_AUX_OPT2_RGB,
+-  BOXM_AUX_OPT3_MOG_GREY,
+-  BOXM_AUX_OPT3_MOG_RGB,
+-  BOXM_AUX_SCALAR_SAMPLE
+-};
+-
+-//: sample properties for templates.
+-template <boxm_aux_type>
+-class boxm_aux_traits;
+-
+-//: traits for a visibility-based implicit surface sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_VIS_IMPLICIT>
+-{
+- public:
+-  typedef boxm_vis_implicit_sample sample_datatype;
+-
+-  static std::string storage_subdir() { return "vis_implicit"; }
+-};
+-
+-template<>
+-class boxm_aux_traits<BOXM_AUX_UPDATE>
+-{
+- public:
+-  typedef boxm_update_sample sample_datatype;
+-
+-  static std::string storage_subdir() { return "update_work";}
+-};
+-
+-//: traits for a null sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_NULL>
+-{
+- public:
+-  typedef float sample_datatype;
+-
+-  static std::string storage_subdir() { return "null"; }
+-};
+-template<>
+-class boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>
+-{
+- public:
+-  typedef float sample_datatype;
+-
+-  static std::string storage_subdir() { return "scalar"; }
+-};
+-
+-
+-
+-#endif // boxm_aux_traits_h_
+diff --git a/contrib/brl/bseg/boxm/boxm_block.h b/contrib/brl/bseg/boxm/boxm_block.h
+deleted file mode 100644
+index 6bda381539..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_block.h
++++ /dev/null
+@@ -1,58 +0,0 @@
+-#ifndef boxm_block_h_
+-#define boxm_block_h_
+-//:
+-// \file
+-// \brief  a block is a smallest area that is going to be processed with an octree
+-//
+-// \author Gamze Tunali
+-// \date Apr 01, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vgl/vgl_box_3d.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-template <class T>
+-class boxm_block
+-{
+- public:
+-  //: Default Constructor
+-  boxm_block(): octree_(nullptr) {}
+-  //: Destructor
+-  ~boxm_block() { if (octree_) delete octree_; }
+-  //: Constructor from boundinf box
+-  boxm_block(vgl_box_3d<double> bbox): bbox_(bbox), octree_(nullptr) {}
+-  //: Constructor from bounding box and octree
+-  boxm_block(vgl_box_3d<double> bbox, T* tree) : bbox_(bbox), octree_(tree) {octree_->set_bbox(bbox_);}
+-  //: Returns the number of leaf cells in the tree
+-  unsigned int size();
+-  //: Initializes octree and bounding-box
+-  void init_tree(T * octree);
+-  //: Sets the current octree
+-  void set_tree(T * octree);
+-
+-  // Accessors
+-  vgl_box_3d<double> bounding_box() const { return bbox_; }
+-  T* get_tree() { return octree_; }
+-
+-  //: Releases memory
+-  void delete_tree() { delete octree_; octree_ = nullptr; }
+-
+-  // IO
+-  void b_read(vsl_b_istream &s);
+-  void b_write(vsl_b_ostream &s, const bool save_internal_nodes_, const bool platform_independent = true);
+-  static short version_no() { return 1; }
+-
+-  bool operator==(boxm_block<T> const& other) const {
+-    return bbox_ == other.bounding_box()
+-        && octree_ == other.octree_;
+-  }
+-
+- private:
+-  vgl_box_3d<double> bbox_;
+-  T* octree_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_block.hxx b/contrib/brl/bseg/boxm/boxm_block.hxx
+deleted file mode 100644
+index a8f27f2bfe..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_block.hxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-#ifndef boxm_block_hxx_
+-#define boxm_block_hxx_
+-
+-#include <iostream>
+-#include "boxm_block.h"
+-
+-#include <vgl/io/vgl_io_box_3d.h>
+-template <class T>
+-void boxm_block<T>::init_tree(T * octree)
+-{
+-  if(octree_){
+-   //release old memory unless the same tree
+-   if(octree!=octree_)
+-     delete octree_;
+-   }
+-  octree_=octree;
+-  octree->set_bbox(bbox_);
+-}
+-
+-template <class T>
+-void boxm_block<T>::set_tree(T * octree)
+-{
+-  if(octree_) //release old memory
+-    delete octree_;
+-  octree_=octree;
+-}
+-
+-template <class T>
+-unsigned int boxm_block<T>::size()
+-{
+-  if (octree_) {
+-    return octree_->size();
+-  }
+-  else {
+-    return 0;
+-  }
+-}
+-
+-template <class T>
+-void boxm_block<T>::b_read(vsl_b_istream &is)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case (1):
+-      vsl_b_read(is, bbox_);
+-      // if already allocated, destroy it and read from the file
+-      if (octree_ != nullptr) {
+-        delete octree_;
+-      }
+-      octree_ = new T();
+-      octree_->b_read(is);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_block<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      return;
+-  }
+-}
+-
+-
+-template <class T>
+-void boxm_block<T>::b_write(vsl_b_ostream &os, const bool save_internal_nodes, const bool platform_independent)
+-{
+-  vsl_b_write(os, version_no());
+-  vsl_b_write(os, bbox_);
+-#if 0
+-  std::cout << "Internal Nodes 3: " << save_internal_nodes << std::endl;
+-#endif
+-  octree_->b_write(os, save_internal_nodes, platform_independent);
+-}
+-
+-#define BOXM_BLOCK_INSTANTIATE(T) \
+-template class boxm_block<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_export.h b/contrib/brl/bseg/boxm/boxm_export.h
+deleted file mode 100644
+index 7827178bdf..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_export.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#ifndef BOXM_EXPORT_H
+-#define BOXM_EXPORT_H
+-
+-#include <vxl_config.h> // get BUILD_SHARED_LIBS
+-
+-#ifndef BUILD_SHARED_LIBS  // if not a shared build
+-# define boxm_EXPORT_DATA
+-#else  // this is a shared build
+-# ifdef boxm_EXPORTS  // if building this library
+-#  if defined(_WIN32) || defined(WIN32)
+-#   define boxm_EXPORT_DATA __declspec(dllexport)
+-#  else
+-#   define boxm_EXPORT_DATA
+-#  endif
+-# else // we are using this library and it is built shared
+-#  if defined(_WIN32) || defined(WIN32)
+-#   define boxm_EXPORT_DATA __declspec(dllimport)
+-#  else
+-#   define boxm_EXPORT_DATA
+-#  endif
+-# endif
+-#endif
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
+deleted file mode 100644
+index b1415333d6..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
++++ /dev/null
+@@ -1,25 +0,0 @@
+-#include "boxm_io_scene_base.h"
+-//:
+-// \file
+-
+-
+-//: Binary write boxm scene to stream
+-void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base const& /*scene_base*/)
+-{
+-}
+-
+-
+-//: Binary load boxm scene from stream.
+-void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base& /*scene_base*/)
+-{
+-}
+-
+-//: Binary write boxm scene pointer to stream
+-void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base* /*ph*/)
+-{
+-}
+-
+-//: Binary write boxm scene pointer to stream
+-void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base* const& /*ph*/)
+-{
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.h b/contrib/brl/bseg/boxm/boxm_io_scene_base.h
+deleted file mode 100644
+index 1abc4fa90c..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_io_scene_base.h
++++ /dev/null
+@@ -1,21 +0,0 @@
+-#ifndef boxm_io_scene_base_h_
+-#define boxm_io_scene_base_h_
+-//:
+-// \file
+-#include <boxm/boxm_scene_base.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary write boxm scene to stream
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene_base const& scene_base);
+-
+-//: Binary load boxm scene from stream.
+-void vsl_b_read(vsl_b_istream & is, boxm_scene_base &scene_base);
+-
+-//: Binary load boxm scene pointer from stream.
+-void vsl_b_read(vsl_b_istream& is, boxm_scene_base* p);
+-
+-//: Binary write boxm scene pointer to stream
+-void vsl_b_write(vsl_b_ostream& os, const boxm_scene_base* &p);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_scene.h b/contrib/brl/bseg/boxm/boxm_scene.h
+deleted file mode 100644
+index 8d1bd207d3..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene.h
++++ /dev/null
+@@ -1,559 +0,0 @@
+-#ifndef boxm_scene_h_
+-#define boxm_scene_h_
+-//:
+-// \file
+-// \brief  The main class to keep the 3D world data. It is a grid of boxm_blocks containing octrees.
+-//
+-// \author Gamze Tunali
+-// \date Apr 03, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <string>
+-#include <iostream>
+-#include <iosfwd>
+-#include <set>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <bvgl/bvgl_point_3d_cmp.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vbl/vbl_array_3d.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <boct/boct_tree.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-class boxm_scene_parser;
+-template <class T> class boxm_block_iterator;
+-template <class T> class boxm_cell_iterator;
+-
+-template <class T>
+-class boxm_scene :public boxm_scene_base
+-{
+- public:
+-  typedef typename T::loc_type loc_type;
+-  typedef typename T::datatype datatype;
+-
+-  //: Default constructor
+-  boxm_scene() : active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
+-
+-  //: Constructor from lvcs, world origin, dimension of the block (in world coordinates) and number of blocks(world_dim)
+-  boxm_scene(const vpgl_lvcs& lvcs,
+-             const vgl_point_3d<double>& origin,
+-             const vgl_vector_3d<double>& block_dim,
+-             const vgl_vector_3d<unsigned>& world_dim,
+-             const bool load_all_blocks=false,
+-             const bool save_internal_nodes_ = false,
+-             const bool save_platform_independent_ = true);
+-
+-  //: Constructor from lvcs, world origin, dimension of the block, number of blocks and initialization level
+-  boxm_scene(const vpgl_lvcs& lvcs,
+-             const vgl_point_3d<double>& origin,
+-             const vgl_vector_3d<double>& block_dim,
+-             const vgl_vector_3d<unsigned>& world_dim,
+-             unsigned max_level, unsigned init_level,
+-             const bool load_all_blocks=false,
+-             const bool save_internal_nodes_ = false,
+-             const bool save_platform_independent_ = true);
+-
+-  //: Constructor when lvcs is not available. World origin, block dimensions and number of blocks
+-  boxm_scene( const vgl_point_3d<double>& origin,
+-              const vgl_vector_3d<double>& block_dim,
+-              const vgl_vector_3d<unsigned>& world_dim,
+-              const bool load_all_blocks=false,
+-              const bool save_internal_nodes_ = false,
+-              const bool save_platform_independent_ = true);
+-
+-  //: Copy constructor
+-  boxm_scene(const boxm_scene& scene);
+-
+-  //: Constructor from base_scene
+-  boxm_scene(const boxm_scene_base& scene_base):
+-  boxm_scene_base(scene_base),active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
+-
+-  //: Destructor
+-  ~boxm_scene() override;
+-
+-  bool discover_block(vgl_point_3d<unsigned> index) { return discover_block(index.x(),index.y(),index.z()); }
+-
+-  bool discover_block(unsigned i, unsigned j, unsigned k);
+-
+-  //: Loads block into memory.
+-  // Returns true if the block bin file is found on disc, otherwise returns false and creates a new tree for the block
+-  bool load_block(unsigned i, unsigned j, unsigned k);
+-
+-  // Load block into memory without using global variables
+-  bool load_block_thread_safe(unsigned i, unsigned j, unsigned k);
+-
+-  //: Loads block into memory.
+-  bool load_block(vgl_point_3d<int> i) { return load_block(i.x(), i.y(), i.z()); }
+-
+-  //: Loads a block and all its neighboring(adjacent) blocks
+-  bool load_block_and_neighbors(unsigned i, unsigned j, unsigned k);
+-
+-  //: Loads a block and all its neighboring(adjacent) blocks
+-  bool load_block_and_neighbors(vgl_point_3d<int> i) { return load_block_and_neighbors(i.x(), i.y(), i.z()); }
+-
+-  //: Reads and loads all blocks into memorty
+-  bool read_all_blocks();
+-
+-  //: Write the active block to disk
+-  void write_active_block(bool unload_block=true);
+-
+-  //: Write the active block to disk
+-  void write_active_block(bool unload_block=false) const;
+-
+-  //: Write the active blocks to disk
+-  void write_active_blocks(bool unload_block=true);
+-
+-  //: Write the active blocks to disk
+-  void write_active_blocks(bool unload_block=false) const;
+-
+-  //: Write the specified block to disk without changing global variables
+-  void write_block_thread_safe(unsigned i, unsigned j, unsigned k);
+-
+-  //: Returns the active block(in memory)
+-  boxm_block<T>* get_active_block();
+-
+-  //: Returns the index of active block
+-  vgl_point_3d<int> active_block() const { return active_block_; }
+-
+-  //: Returns the indices of active neighbors;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >& active_blocks() { return active_blocks_; }
+-
+-  vpgl_lvcs lvcs() const { return lvcs_; }
+-
+-  vgl_point_3d<double> origin() const { return origin_; }
+-
+-  void set_origin(vgl_point_3d<double> o) { origin_=o; }
+-
+-  vgl_vector_3d<double> block_dim() const { return block_dim_; }
+-
+-  bool save_internal_nodes() const { return save_internal_nodes_; }
+-
+-  bool save_platform_independent() const { return save_platform_independent_; }
+-
+-  bool load_all_blocks() const { return load_all_blocks_; }
+-
+-  void block_num(int &x, int &y, int &z) const {
+-    x=(int) blocks_.get_row1_count();
+-    y=(int) blocks_.get_row2_count();
+-    z=(int) blocks_.get_row3_count();
+-  }
+-
+-  vgl_vector_3d<unsigned> world_dim() const override {
+-    unsigned x=(unsigned) blocks_.get_row1_count();
+-    unsigned y=(unsigned) blocks_.get_row2_count();
+-    unsigned z=(unsigned) blocks_.get_row3_count();
+-    return {x,y,z};
+-  }
+-
+-  std::string path() const { return scene_path_; }
+-
+-  std::string block_prefix() const { return block_pref_; }
+-
+-  void set_path(std::string path, std::string block_prefix) { scene_path_=path; block_pref_= block_prefix; }
+-
+-  void b_read(vsl_b_istream & s);
+-
+-  void b_write(vsl_b_ostream& s) const;
+-
+-  //: Returns the block this point resides in
+-  boxm_block<T>* get_block(vgl_point_3d<double> const& p) const;
+-
+-  //: Returns the index of the block containing this point
+-  bool get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index);
+-
+-  //: Returns a block, assumes block is in memory - if not it returns null
+-  boxm_block<T>* get_block(unsigned i, unsigned j, unsigned k) const { return blocks_(i,j,k); }
+-
+-  //: Returns a block, assumes block is in memory - if not it returns null
+-  boxm_block<T>* get_block(const vgl_point_3d<int>& idx) { return blocks_(idx.x(), idx.y(), idx.z()); }
+-
+-  //: Returns a read-only block, assumes block is in memory - if not it returns null
+-  const boxm_block<T>* get_block_read_only(unsigned i, unsigned j, unsigned k) { return blocks_(i,j,k); }
+-
+-  //: Return all leaf cells in a region
+-  void leaves_in_region(vgl_box_3d<double>, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
+-
+-  //: Return the level of the smallest cell entirely containing the 3d region
+-  short level_region(vgl_box_3d<double> box);
+-
+-  //: Return all leaf_data in a region - data is copied to new memory location
+-  void leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data);
+-
+-  //: Returns the data of all cells at a given level, that are contained in the specified region
+-  void cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level);
+-
+-  //: Return all leaf cells between an inner box and an outter box
+-  void leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
+-
+-  //: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
+-  void change_leaves_in_region(vgl_box_3d<double> box, const datatype &cell_data);
+-  void change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<datatype> &all_data);
+-
+-  //: Locate point in scene coordinates. Assumes that the block containing the point is already loaded into memory
+-  boct_tree_cell<loc_type, datatype>* locate_point_in_memory(vgl_point_3d<double> &p, unsigned level = 0);
+-
+-  void set_block(vgl_point_3d<int> const& idx, boxm_block<T>* block)
+-  {
+-    if (blocks_(idx.x(),idx.y(),idx.z())) // release memory
+-      delete blocks_(idx.x(),idx.y(),idx.z());
+-
+-    blocks_(idx.x(),idx.y(),idx.z()) = block; active_block_=idx;
+-  }
+-
+-  void set_block(int i, int j, int k , boxm_block<T>* block) { set_block(vgl_point_3d<int>(i,j,k), block); }
+-
+-  //: Write scene xml file at the scenes' path
+-  void write_scene(std::string filename = "scene.xml");
+-
+-  //: Write scene xml file at the location indicated by path
+-  void write_scene(std::string path, std::string filename);
+-
+-  void load_scene(std::string filename);
+-
+-  void load_scene(boxm_scene_parser& parser);
+-
+-  void force_write_blocks();
+-
+-  static short version_no() { return 1; }
+-
+-  boxm_block_iterator<T> iterator() { return boxm_block_iterator<T>(this); }
+-
+-  boxm_block_iterator<T> const_iterator() const { return boxm_block_iterator<T>(this); }
+-
+-  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned), bool read_only = false)
+-  {
+-    boxm_cell_iterator<T> cell_iter(this->iterator(), block_loading_func, read_only);
+-    return cell_iter;
+-  }
+-
+-  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned) const, bool read_only)
+-  {
+-    assert (read_only);
+-    boxm_cell_iterator<T> cell_iter(this->const_iterator(), block_loading_func, read_only);
+-    return cell_iter;
+-  }
+-
+-  vgl_box_3d<double> get_world_bbox() const override;
+-
+-  //: Return the dimensions of the scene along each axis - this are equivalent to bbox width, length and depth
+-  void axes_length(double &x_length,double &y_length, double &z_length) const;
+-
+-  //: Return true if the block index is valid
+-  bool valid_index(vgl_point_3d<int> const& idx) const { return valid_index(idx.x(), idx.y(), idx.z()); }
+-
+-
+-  //: Return true if the block index is valid
+-  inline bool valid_index(int const& x, int const& y, int const& z) const {
+-    return  x >= (int)0 && x < (int)blocks_.get_row1_count() &&
+-            y >= (int)0 && y < (int)blocks_.get_row2_count() &&
+-            z >= (int)0 && z < (int)blocks_.get_row3_count();
+-   }
+-
+-  void set_pinit(float pinit) { pinit_=pinit; }
+-
+-  float pinit() const { return pinit_; }
+-
+-  vgl_box_3d<double> get_block_bbox(vgl_point_3d<int> const& idx) const { return get_block_bbox(idx.x(), idx.y(), idx.z()); }
+-
+-  vgl_box_3d<double> get_block_bbox(int x, int y, int z) const;
+-
+-  //: generates a name for the block binary file based on the 3D vector index
+-  std::string gen_block_path(int x, int y, int z) const;
+-
+-  void clean_scene();
+-
+-  //: Returns a scene with the same structure and initialized with given value
+-  void clone_blocks(boxm_scene<T> &scene_out, datatype data);
+-
+-  //: Returns a scene with the same structure and data
+-  void clone_blocks(boxm_scene<T> &scene_out);
+-
+-  //: Returns a scene of a different type with the same structure  and initialized with given value
+-  template <class T_out>
+-  void clone_blocks_to_type(boxm_scene<T_out> &scene_out, typename boxm_scene<T_out>::datatype data )
+-  {
+-    std::cout << "Clone blocks to type\n";
+-    boxm_block_iterator<T> iter(this);
+-    boxm_block_iterator<T_out> iter_out = scene_out.iterator();
+-    iter.begin();
+-    iter_out.begin();
+-    while (!iter.end())
+-    {
+-      load_block(iter.index());
+-      scene_out.load_block(iter.index());
+-      T_out  *tree_out =(*iter)->get_tree()->template clone_to_type<typename boxm_scene<T_out>::datatype>();
+-      (*iter_out)->init_tree(tree_out);
+-      tree_out->init_cells(data);
+-      scene_out.write_active_block();
+-      ++iter;
+-      ++iter_out;
+-    }
+-  }
+-
+-  //: Returns a scene of a vector type with the same structure and vector initialized to the the same data
+-  template <unsigned DIM>
+-  void clone_blocks_to_vector(boxm_scene<boct_tree<short, vnl_vector_fixed<datatype, DIM> > > &scene_out)
+-  {
+-    typedef boct_tree<short, vnl_vector_fixed<datatype, DIM> > type_tree_out;
+-    std::cout << "Clone blocks to type\n";
+-    boxm_block_iterator<T> iter(this);
+-    boxm_block_iterator<type_tree_out> iter_out = scene_out.iterator();
+-    iter.begin();
+-    iter_out.begin();
+-    while (!iter.end())
+-    {
+-      load_block(iter.index());
+-      scene_out.load_block(iter.index());
+-      type_tree_out  *tree_out =(*iter)->get_tree()->template clone_to_vector<DIM>();
+-      (*iter_out)->init_tree(tree_out);
+-      scene_out.write_active_block();
+-      ++iter;
+-      ++iter_out;
+-    }
+-  }
+-
+-  //: Unload active blocks
+-  void unload_active_blocks() const;
+-
+-  //: Print out the trees in the scene
+-  void print();
+-
+-  //: Return the finest level in the scene
+-  short finest_level();
+-
+-  //: Return the length of finest-level cell in the scene
+-  double finest_cell_length();
+-
+-  //: Return the length of cells at a given level in the scene
+-  double cell_length(unsigned level);
+-
+-  //: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
+-  double finest_cell_length_in_memory() const;
+-
+-  //: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
+-  short finest_level_in_memory() const;
+-
+-  //: Return the number of leaf nodes in the scene
+-  unsigned long size();
+-
+-  vgl_point_3d<double> rpc_origin() const { return rpc_origin_; }
+-
+-  void set_rpc_origin(vgl_point_3d<double>& new_rpc_origin) {
+-    vgl_point_3d<double> old_origin = origin();
+-    vgl_point_3d<double> new_origin(
+-      old_origin.x() + new_rpc_origin.x() - rpc_origin_.x(),
+-      old_origin.y() + new_rpc_origin.y() - rpc_origin_.y(),
+-      old_origin.z() + new_rpc_origin.z() - rpc_origin_.z());
+-    set_origin(new_origin);
+-    rpc_origin_ = new_rpc_origin;
+-  }
+-
+- protected:
+-  vpgl_lvcs lvcs_;
+-  vgl_point_3d<double> origin_;
+-  vgl_point_3d<double> rpc_origin_;
+-
+-  //: World dimensions of a block .e.g 1 meter x 1 meter x 1 meter
+-  vgl_vector_3d<double> block_dim_;
+-
+-  vbl_array_3d<boxm_block<T>*> blocks_;
+-
+-  //: index of the blocks (3D array) that is active; only one active block at a time
+-  mutable vgl_point_3d<int> active_block_;
+-
+-  //: if neighbors of the active block are loaded into memory, their indices are stored in this set
+-  mutable std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  active_blocks_;
+-
+-  float pinit_;
+-
+-  //: Flag that indicates whether internal nodes of the trees should be saved
+-  bool save_internal_nodes_;
+-
+-  //: Flag that indicates whether the octree data should be saved in a platform-independent way (slower)
+-  bool save_platform_independent_;
+-
+-  //: Flag to load all the blocks in the memory
+-  bool load_all_blocks_;
+-
+-  // ************** private methods *******************
+-
+-  void create_block(unsigned i, unsigned j, unsigned k);
+-
+-  void create_blocks(const vgl_vector_3d<double>& block_dim, const vgl_vector_3d<unsigned>& world_dim);
+-  bool parse_config(boxm_scene_parser& parser);
+-
+-  bool parse_xml_string(std::string xml, boxm_scene_parser& parser);
+-
+-  //: Load all blocks in between min-max indices. This method is private and the user needs to take care of unloading the blocks
+-  bool load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
+-
+-  //: Unload all blocks in between min-max indices.
+-  bool unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
+-
+-
+-  //: A helper function to generate the indices of neighboring blocks
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  neighboring_blocks(vgl_point_3d<int> idx)
+-  {
+-    std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > neighbors;
+-    for (int i = -1; i <= 1; i++)
+-    {
+-      int active_i = idx.x() + i;
+-      if (active_i >= 0 && active_i < int(blocks_.get_row1_count()))
+-        for (int j = -1; j <= 1; j++)
+-        {
+-          int active_j = idx.y() + j;
+-          if (active_j >= 0 && active_j < int(blocks_.get_row2_count()) )
+-            for (int k = -1; k <= 1; k++)
+-            {
+-              int active_k = idx.z() + k;
+-              if (active_k >= 0 && active_k < int(blocks_.get_row3_count()))
+-                neighbors.insert(vgl_point_3d<int>(active_i, active_j, active_k));
+-            }
+-        }
+-    }
+-    return neighbors;
+-  }
+-};
+-
+-template <class T>
+-class boxm_block_iterator
+-{
+-  friend class boxm_cell_iterator<T>;
+-
+- public:
+-  boxm_block_iterator(boxm_scene<T> const* scene): i_(0), j_(0), k_(0), scene_(scene) {}
+-
+-  //: Copy constructor
+-  boxm_block_iterator(boxm_block_iterator<T> const& other): i_(other.i_), j_(other.j_), k_(other.k_), scene_(other.scene_) {}
+-
+-  ~boxm_block_iterator() = default;
+-
+-  boxm_block_iterator<T>& begin();
+-
+-  bool end();
+-
+-  boxm_block_iterator<T>& operator=(const boxm_block_iterator<T>& that);
+-
+-  bool operator==(const boxm_block_iterator<T>& that);
+-
+-  bool operator!=(const boxm_block_iterator<T>& that);
+-
+-  boxm_block_iterator<T>& operator++();  // pre-inc
+-
+-  boxm_block_iterator<T> operator++(int); // post-inc
+-
+-  boxm_block_iterator<T>& operator--();
+-
+-  boxm_block<T>* operator*();
+-
+-  boxm_block<T>* operator->();
+-
+-  vgl_point_3d<int> index() const { return vgl_point_3d<int>(i_,j_,k_); }
+-
+- private:
+-  int i_;
+-  int j_;
+-  int k_;
+-
+-  boxm_scene<T> const* scene_;
+-};
+-
+-
+-//: A class to iterate through all -or only leaf- cells in a boxm_scene
+-template <class T>
+-class boxm_cell_iterator
+-{
+- public:
+-  typedef bool (boxm_scene<T>::*ptr2func)(unsigned, unsigned, unsigned);
+-  typedef bool (boxm_scene<T>::*ptr2constfunc)(unsigned, unsigned, unsigned) const;
+-  typedef typename T::loc_type loc_type;
+-  typedef typename T::datatype datatype;
+-
+-  //: Copy constructor
+-  boxm_cell_iterator(boxm_cell_iterator<T> const& other)
+-   : block_iterator_(other.block_iterator_), cells_(other.cells_),
+-     block_loading_func_(other.block_loading_func_), read_only_(other.read_only_) {}
+-
+-  //: Constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
+-  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2func block_loading_func, bool read_only = false, bool use_internal_cells = false)
+-    : block_iterator_(iter), block_loading_func_((ptr2constfunc)block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) {}
+-
+-  //: "Const" constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
+-  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2constfunc block_loading_func, bool read_only, bool use_internal_cells = false)
+-    : block_iterator_(iter), block_loading_func_(block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) { assert(read_only); }
+-
+-  //: Destructor
+-  ~boxm_cell_iterator() = default;
+-
+-  //: Iterator begin
+-  boxm_cell_iterator<T>& begin(bool use_internal_cells=false);
+-
+-  //: Iterator end
+-  bool end();
+-
+-  /*************** Operators ****************/
+-
+-  boxm_cell_iterator<T>& operator=( const boxm_cell_iterator<T>& that);
+-
+-  bool operator==(const boxm_cell_iterator<T>& that);
+-
+-  bool operator!=(const boxm_cell_iterator<T>& that);
+-
+-  //: Prefix increment. When the end of the block is reached, it writes the block to disk and loads the next one
+-  boxm_cell_iterator<T>& operator++();
+-
+-  //: Increment. When the end of the block is reached, it writes the block to disk and loads the next one
+-  boxm_cell_iterator<T> operator+=(unsigned const &rhs);
+-
+-  boct_tree_cell<loc_type, datatype>* operator*();
+-
+-  boct_tree_cell<loc_type, datatype>* operator->();
+-
+-  /*************** Data accessor *************/
+-  //: Return the global origin of the current cell
+-  vgl_point_3d<double> global_origin();
+-
+-  //: Return the global centroid of the current cell - use only if cells are cubical
+-  vgl_point_3d<double> global_centroid();
+-
+-  //: Return the global length of this cell
+-  double length();
+-
+- private:
+-
+-  boxm_block_iterator<T> block_iterator_;
+-  std::vector<boct_tree_cell<loc_type ,datatype >* > cells_;
+-  typename std::vector< boct_tree_cell<loc_type , datatype >* >::const_iterator cells_iterator_;
+-  ptr2constfunc block_loading_func_;
+-  bool read_only_;
+-  bool use_internal_cells_;
+-};
+-
+-
+-//: generates an XML file from the member variables
+-template <class T>
+-void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name="boxm_scene");
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene);
+-
+-
+-#endif // boxm_scene_h_
+diff --git a/contrib/brl/bseg/boxm/boxm_scene.hxx b/contrib/brl/bseg/boxm/boxm_scene.hxx
+deleted file mode 100644
+index b398bcc2ad..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene.hxx
++++ /dev/null
+@@ -1,1764 +0,0 @@
+-#ifndef boxm_scene_hxx_
+-#define boxm_scene_hxx_
+-//:
+-// \file
+-#include <cmath>
+-#include <cstdio>
+-#include <sstream>
+-#include <iostream>
+-#include <algorithm>
+-#include <iterator>
+-#include "boxm_scene.h"
+-//
+-#include "boxm_apm_traits.h"
+-#include "boxm_scene_parser.h"
+-
+-#include <vgl/xio/vgl_xio_point_3d.h>
+-#include <vgl/xio/vgl_xio_vector_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vsl/vsl_basic_xml_element.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vpgl/xio/vpgl_xio_lvcs.h>
+-
+-#include <vpl/vpl.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
+-                          const vgl_point_3d<double>& origin,
+-                          const vgl_vector_3d<double>& block_dim,
+-                          const vgl_vector_3d<unsigned>& world_dim,
+-                          const bool load_all_blocks,
+-                          const bool save_internal_nodes,
+-                          const bool save_platform_independent)
+-: lvcs_(lvcs),
+-  origin_(origin),
+-  block_dim_(block_dim),
+-  active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-  save_internal_nodes_(save_internal_nodes),
+-  save_platform_independent_(save_platform_independent),
+-  load_all_blocks_(load_all_blocks)
+-{
+-  create_blocks(block_dim, world_dim);
+-}
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene( const vgl_point_3d<double>& origin,
+-                           const vgl_vector_3d<double>& block_dim,
+-                           const vgl_vector_3d<unsigned>& world_dim,
+-                           const bool load_all_blocks,
+-                           const bool save_internal_nodes,
+-                           const bool save_platform_independent)
+-: origin_(origin),
+-  block_dim_(block_dim),
+-  active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-  save_internal_nodes_(save_internal_nodes),
+-  save_platform_independent_(save_platform_independent),
+-  load_all_blocks_(load_all_blocks)
+-{
+-  create_blocks(block_dim, world_dim);
+-}
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene(const boxm_scene& scene)
+-: boxm_scene_base(scene),
+-  lvcs_(scene.lvcs()),
+-  origin_(scene.origin()),
+-  block_dim_(scene.block_dim()),
+-  active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-  save_internal_nodes_(scene.save_internal_nodes()),
+-  save_platform_independent_(scene.save_platform_independent()),
+-  load_all_blocks_(scene.load_all_blocks())
+-{
+-  int x,y,z;
+-  scene.block_num(x,y,z);
+-  create_blocks(block_dim_, vgl_vector_3d<unsigned>(x,y,z));
+-}
+-
+-
+-template <class T>
+-void boxm_scene<T>::create_blocks(const vgl_vector_3d<double>& /*block_dim*/,
+-                                  const vgl_vector_3d<unsigned>& world_dim)
+-{
+-  // compute the dimensions of 3D array
+-  unsigned x_dim = world_dim.x(); // = static_cast<int>(std::floor(world_dim.x()/block_dim.x()));
+-  unsigned y_dim = world_dim.y(); // = static_cast<int>(std::floor(world_dim.y()/block_dim.y()));
+-  unsigned z_dim = world_dim.z(); // = static_cast<int>(std::floor(world_dim.z()/block_dim.z()));
+-
+-  // pointers are initialized to NULL
+-  blocks_ =  vbl_array_3d<boxm_block<T>*>(x_dim, y_dim, z_dim, (boxm_block<T>*)nullptr);
+-  for (unsigned i=0; i<x_dim; ++i) {
+-    for (unsigned j=0; j<y_dim; ++j) {
+-      for (unsigned k=0; k<z_dim; ++k) {
+-        create_block(i,j,k);
+-      }
+-    }
+-  }
+-}
+-
+-template <class T>
+-boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
+-                          const vgl_point_3d<double>& origin,
+-                          const vgl_vector_3d<double>& block_dim,
+-                          const vgl_vector_3d<unsigned>& world_dim,
+-                          unsigned max_level, unsigned init_level,
+-                          const bool load_all_blocks,
+-                          const bool save_internal_nodes,
+-                          const bool save_platform_independent)
+-: lvcs_(lvcs),
+-origin_(origin),
+-block_dim_(block_dim),
+-active_block_(vgl_point_3d<int>(-1,-1,-1)),
+-save_internal_nodes_(save_internal_nodes),
+-save_platform_independent_(save_platform_independent),
+-load_all_blocks_(load_all_blocks)
+-{
+-  create_blocks(block_dim, world_dim);
+-  set_octree_levels(max_level, init_level);
+-}
+-
+-template <class T>
+-void boxm_scene<T>::create_block(unsigned i, unsigned j, unsigned k)
+-{
+-  if (blocks_(i,j,k) == NULL) {
+-    vgl_box_3d<double> bbox = get_block_bbox(i,j,k);
+-    blocks_(i,j,k) = new boxm_block<T>(bbox);
+-  }
+-}
+-
+-template <class T>
+-boxm_scene<T>::~boxm_scene()
+-{
+-  // delete the blocks
+-  int x_dim, y_dim, z_dim;
+-  block_num(x_dim, y_dim, z_dim);
+-  for (int i=0; i<x_dim; i++) {
+-    for (int j=0; j<y_dim; j++) {
+-      for (int k=0; k<z_dim; k++) {
+-        if (blocks_(i,j,k))
+-          delete blocks_(i,j,k);
+-      }
+-    }
+-  }
+-}
+-
+-//: Returns a scene with the same structure and initialized with given value
+-template<class T>
+-void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out, datatype data)
+-{
+-  boxm_block_iterator<T> iter(this);
+-  boxm_block_iterator<T> iter_out = scene_out.iterator();
+-  iter.begin();
+-  iter_out.begin();
+-  while (!iter.end())
+-  {
+-    load_block(iter.index());
+-    scene_out.load_block(iter_out.index());
+-    T  *tree_out = (*iter)->get_tree()->clone_all();
+-    tree_out->init_cells(data);
+-    (*iter_out)->init_tree(tree_out);
+-    scene_out.write_active_block();
+-    ++iter;
+-    ++iter_out;
+-  }
+-}
+-
+-//: Returns a scene with the same structure and data
+-template<class T>
+-void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out)
+-{
+-  boxm_block_iterator<T> iter(this);
+-  boxm_block_iterator<T> iter_out = scene_out.iterator();
+-  iter.begin();
+-  iter_out.begin();
+-  while (!iter.end())
+-  {
+-    load_block(iter.index());
+-    T  *tree_out = (*iter)->get_tree()->clone_all();
+-    (*iter_out)->init_tree(tree_out);
+-    scene_out.write_active_block();
+-    ++iter;
+-    ++iter_out;
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_active_block(bool unload_block)
+-{
+-  if (valid_index(active_block_)&& (!load_all_blocks_))
+-  {
+-    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
+-    std::string path = gen_block_path(x,y,z);
+-    vsl_b_ofstream os(path);
+-#ifdef DEBUG
+-    std::cout << "block path: " << path << '\n'
+-             << "Load All blocks " << load_all_blocks_ << '\n'
+-             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-#endif
+-    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-
+-    // delete the block's data
+-    if (unload_block)
+-    {
+-      boxm_block<T>* block = blocks_(x,y,z);
+-      block->delete_tree();
+-      block->set_tree(nullptr);
+-      active_block_.set(-1,-1,-1);
+-    }
+-    os.close();
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_active_block(bool unload_block) const
+-{
+-  assert(!unload_block); // use the "non-const" method ::write_active_block if you want to delete the block's data
+-
+-  if (valid_index(active_block_)&& (!load_all_blocks_))
+-  {
+-    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
+-    std::string path = gen_block_path(x,y,z);
+-    vsl_b_ofstream os(path);
+-#ifdef DEBUG
+-    std::cout << "block path: " << path << '\n'
+-             << "Load All blocks " << load_all_blocks_ << '\n'
+-             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-#endif
+-    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-    os.close();
+-  }
+-}
+-
+-
+-template <class T>
+-void boxm_scene<T>::write_active_blocks(bool unload_block)
+-{
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
+-  for (; it!=active_blocks_.end(); it++)
+-  {
+-    vgl_point_3d<int> bidx = *it;
+-    if (valid_index(bidx)&& (!load_all_blocks_))
+-    {
+-      int x=bidx.x(), y=bidx.y(), z=bidx.z();
+-      std::string path = gen_block_path(x,y,z);
+-      vsl_b_ofstream os(path);
+-  #ifdef DEBUG
+-      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
+-              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-  #endif
+-      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-
+-      // delete the block's data
+-      if (unload_block)
+-      {
+-        boxm_block<T>* block = blocks_(x,y,z);
+-        block->delete_tree();
+-        block->set_tree(nullptr);
+-        active_block_.set(-1,-1,-1);
+-      }
+-      os.close();
+-    }
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_active_blocks(bool unload_block) const
+-{
+-  assert(!unload_block); // use the "non-const" method ::write_active_blocks if you want to delete the block's data
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
+-  for (; it!=active_blocks_.end(); it++)
+-  {
+-    vgl_point_3d<int> bidx = *it;
+-    if (valid_index(bidx)&& (!load_all_blocks_))
+-    {
+-      int x=bidx.x(), y=bidx.y(), z=bidx.z();
+-      std::string path = gen_block_path(x,y,z);
+-      vsl_b_ofstream os(path);
+-  #ifdef DEBUG
+-      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
+-              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
+-  #endif
+-      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-      os.close();
+-    }
+-  }
+-}
+-
+-//: Writes and unloads the specified block. It doesn't modify global variables
+-template <class T>
+-void boxm_scene<T>::write_block_thread_safe(unsigned i, unsigned j, unsigned k)
+-{
+-  if (valid_index(i,j,k)&& (!load_all_blocks_))
+-  {
+-    std::string path = gen_block_path(i,j,k);
+-    vsl_b_ofstream os(path);
+-
+-    if (blocks_(i,j,k))
+-      blocks_(i,j,k)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-
+-    // delete the block's data
+-    boxm_block<T>* block = blocks_(i,j,k);
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-
+-    os.close();
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::force_write_blocks()
+-{
+-  boxm_block_iterator<T> iter(this);
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    int x=iter.index().x(), y=iter.index().y(), z=iter.index().z();
+-    if (blocks_(x,y,z)->get_tree()!=nullptr)
+-    {
+-      std::cout<<" ? ";
+-      std::string path = gen_block_path(x,y,z);
+-      vsl_b_ofstream os(path);
+-      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
+-      os.close();
+-    }
+-    iter++;
+-  }
+-}
+-
+-//: Returns the block this point resides in
+-template <class T>
+-boxm_block<T>* boxm_scene<T>::get_block(vgl_point_3d<double> const& p) const
+-{
+-  vgl_box_3d<double> world(get_world_bbox());
+-  if (world.contains(p)) {
+-    // find the block index
+-    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
+-    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
+-    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
+-    return blocks_(i,j,k);
+-  }
+-  else {
+-#ifdef DEBUG
+-    std::cerr << "Point " << p << " is out of world " << world << '\n';
+-#endif
+-    return nullptr;
+-  }
+-}
+-
+-
+-//: Returns the index of the block containing this point
+-template <class T>
+-bool boxm_scene<T>::get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index)
+-{
+-  vgl_box_3d<double> world(get_world_bbox());
+-  if (world.contains(p)) {
+-    // find the block index
+-    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
+-    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
+-    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
+-    // boundary case
+-    double tol = 1e-9;
+-    if (std::abs(p.x()-world.max_x())<tol)
+-      i-=1;
+-    if (std::abs(p.y()-world.max_y())<tol)
+-      j-=1;
+-    if (std::abs(p.z()-world.max_z())<tol)
+-      k-=1;
+-
+-    index=vgl_point_3d<int>(i,j,k);
+-    return true;
+-  }
+-  else {
+-#ifdef DEBUG
+-    std::cerr << "Point " << p << " is out of world " << world << '\n';
+-#endif
+-    return false;
+-  }
+-}
+-
+-template <class T>
+-boxm_block<T>* boxm_scene<T>::get_active_block()
+-{
+-  if (valid_index(active_block_)) {
+-    boxm_block<T>* block = blocks_(active_block_.x(),active_block_.y(),active_block_.z());
+-    if (block->get_tree() == nullptr)
+-      load_block(active_block_.x(),active_block_.y(),active_block_.z());
+-    return block;
+-  }
+-  else {
+-    std::cerr << "index"<<active_block_<<"  is out of world\n";
+-    return nullptr;
+-  }
+-}
+-
+-template <class T>
+-vgl_box_3d<double> boxm_scene<T>::get_world_bbox() const
+-{
+-  vgl_point_3d<double> min_p(origin_.x(), origin_.y(), origin_.z());
+-  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x()*blocks_.get_row1_count(),
+-                             min_p.y()+block_dim_.y()*blocks_.get_row2_count(),
+-                             min_p.z()+block_dim_.z()*blocks_.get_row3_count());
+-
+-  vgl_box_3d<double> bbox(min_p, max_p);
+-  return bbox;
+-}
+-
+-template <class T>
+-void boxm_scene<T>::axes_length(double &x_length,double &y_length, double &z_length) const
+-{
+-  x_length = block_dim_.x()*blocks_.get_row1_count();
+-  y_length = block_dim_.y()*blocks_.get_row2_count();
+-  z_length = block_dim_.z()*blocks_.get_row3_count();
+-}
+-
+-
+-template <class T>
+-vgl_box_3d<double> boxm_scene<T>::get_block_bbox(int x, int y, int z) const
+-{
+-  vgl_point_3d<double> min_p(block_dim_.x()*x+origin_.x(), block_dim_.y()*y+origin_.y(), block_dim_.z()*z+origin_.z());
+-  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x(), min_p.y()+block_dim_.y(), min_p.z()+block_dim_.z());
+-
+-  vgl_box_3d<double> bbox(min_p, max_p);
+-  return bbox;
+-}
+-
+-template <class T>
+-std::string boxm_scene<T>::gen_block_path(int x, int y, int z) const
+-{
+-  std::stringstream strm;
+-
+-  strm << scene_path_ << '/' << block_pref_ << '_' <<  x << '_' << y << '_' << z << ".bin";
+-
+-  return strm.str();
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::discover_block(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-  std::string block_path = gen_block_path(i,j,k);
+-  vsl_b_ifstream os(block_path);
+-
+-  // if the binary block file is not found, return "false"
+-  return !os == false;
+-}
+-
+-//: returns true if the block bin file is found on disc, false otherwise.
+-// If false, a new tree is create for the block
+-template <class T>
+-bool boxm_scene<T>::load_block(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-
+-  if (!load_all_blocks_)
+-  {
+-    // this does not save the active block so make sure to save it first
+-    if (valid_index(active_block_)) {
+-      if (!(active_block_ == vgl_point_3d<int>(i,j,k)))
+-      {
+-        int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
+-        boxm_block<T>* block = blocks_(x,y,z);
+-        block->delete_tree();
+-        block->set_tree(nullptr);
+-      }
+-    }
+-  }
+-
+-  active_block_.set(i,j,k);
+-
+-  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
+-  {
+-    std::string block_path = gen_block_path(i,j,k);
+-    vsl_b_ifstream os(block_path);
+-
+-    // if the binary block file is not found
+-    if (!os) {
+-      if (blocks_(i,j,k)->get_tree()==nullptr) {
+-        T* tree= new T(max_tree_level_,init_tree_level_);
+-        blocks_(i,j,k)->init_tree(tree);
+-      }
+-      return false;
+-    }
+-    blocks_(i,j,k)->b_read(os);
+-    os.close();
+-  }
+-
+-  return true;
+-}
+-
+-
+-//: Load block into memory - this doesn't use global variables so user is responsible for unloading it
+-template <class T>
+-bool boxm_scene<T>::load_block_thread_safe(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-
+-  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
+-  {
+-    std::string block_path = gen_block_path(i,j,k);
+-    vsl_b_ifstream os(block_path);
+-
+-    // if the binary block file is not found
+-    if (!os) {
+-      if (blocks_(i,j,k)->get_tree()==nullptr) {
+-        T* tree= new T(max_tree_level_,init_tree_level_);
+-        blocks_(i,j,k)->init_tree(tree);
+-      }
+-      return false;
+-    }
+-    blocks_(i,j,k)->b_read(os);
+-    os.close();
+-  }
+-
+-  return true;
+-}
+-
+-//: Reads and loads all blocks into memorty
+-template <class T>
+-bool boxm_scene<T>::read_all_blocks()
+-{
+-  load_all_blocks_ = true;
+-  this->unload_active_blocks();
+-
+-  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
+-    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
+-      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
+-        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) // read it from file
+-        {
+-          std::string block_path = gen_block_path(block_i,block_j,block_k);
+-          vsl_b_ifstream os(block_path);
+-
+-          // if the binary block file is not found
+-          if (!os) {
+-            if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
+-              T* tree= new T(max_tree_level_,init_tree_level_);
+-              blocks_(block_i,block_j,block_k)->init_tree(tree);
+-            }
+-          }
+-          else
+-            blocks_(block_i,block_j,block_k)->b_read(os);
+-
+-          active_blocks_.insert(vgl_point_3d<int>(block_i, block_j, block_k));
+-          os.close();
+-        }
+-      }
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::load_block_and_neighbors(unsigned i, unsigned j, unsigned k)
+-{
+-  if (!valid_index(vgl_point_3d<int>(i,j,k)))
+-    return false;
+-
+-  active_block_.set(i,j,k);
+-  // Set unused blocks to null and load new blocks
+-  // this is to avoid rereading blocks that are already in memory
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks  = neighboring_blocks(vgl_point_3d<int>(i,j,k));
+-  new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
+-  bvgl_point_3d_cmp<int>  cmp;
+-  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
+-                     new_active_blocks.begin(), new_active_blocks.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
+-                     cmp);
+-
+-  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
+-                     active_blocks_.begin(), active_blocks_.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
+-                     cmp);
+-
+-  active_blocks_.clear();
+-  active_blocks_ = new_active_blocks;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
+-
+-  for (; unload_it!=blocks_to_unload.end(); unload_it++)
+-  {
+-    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-  }
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
+-
+-  for (; load_it!=blocks_to_load.end(); load_it++)
+-  {
+-    int block_i = (*load_it).x();
+-    int block_j = (*load_it).y();
+-    int block_k = (*load_it).z();
+-
+-    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
+-    {
+-      std::string block_path = gen_block_path(block_i,block_j,block_k);
+-      vsl_b_ifstream os(block_path);
+-
+-      // if the binary block file is not found
+-      if (!os) {
+-        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
+-          T* tree= new T(max_tree_level_,init_tree_level_);
+-          blocks_(block_i,block_j,block_k)->init_tree(tree);
+-        }
+-        return false;
+-      }
+-      blocks_(block_i,block_j,block_k)->b_read(os);
+-      assert(blocks_(block_i,block_j,block_k)!=NULL);
+-      assert(blocks_(block_i,block_j,block_k)->get_tree()!=nullptr);
+-
+-      os.close();
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-//: Return the finest level in the scene
+-template <class T>
+-short boxm_scene<T>::finest_level()
+-{
+-  // iterate through the blocks requesting the finest level
+-  boxm_block_iterator<T > iter=this->const_iterator();
+-  iter.begin();
+-  short finest_level = this->max_tree_level_;
+-  while (!iter.end()) {
+-    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      short this_level = get_active_block()->get_tree()->finest_level();
+-      if (this_level < finest_level)
+-        finest_level = this_level;
+-    }
+-    iter++;
+-  }
+-
+-  return finest_level;
+-}
+-
+-
+-//: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
+-template <class T>
+-short boxm_scene<T>::finest_level_in_memory() const
+-{
+-  if (!load_all_blocks_)
+-    return -1;
+-
+- // iterate through the blocks requesting the finest level
+-  short finest_level = this->max_tree_level_;
+-  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
+-    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
+-      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
+-        if (blocks_(block_i,block_j,block_k)) {
+-            short this_level = blocks_(block_i,block_j,block_k)->get_tree()->finest_level();
+-            if (this_level < finest_level)
+-              finest_level = this_level;
+-          }
+-      }
+-    }
+-  }
+-
+-  return finest_level;
+-}
+-
+-//: Return the length of finest-level cell in the scene
+-template <class T>
+-double  boxm_scene<T>::finest_cell_length()
+-{
+-  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level()));
+-
+-  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
+-    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
+-             << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
+-  }
+-
+-  return local_cell_length * block_dim_.x();
+-}
+-
+-//: Return the length of cells at a given level in the scene
+-template <class T>
+-double  boxm_scene<T>::cell_length(unsigned level)
+-{
+-  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - level));
+-
+-  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
+-    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
+-    << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
+-  }
+-
+-  return local_cell_length * block_dim_.x();
+-}
+-
+-//: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
+-template <class T>
+-double  boxm_scene<T>::finest_cell_length_in_memory() const
+-{
+-  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level_in_memory()));
+-
+-  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7))
+-    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n";
+-
+-  return local_cell_length * block_dim_.x();
+-}
+-
+-//: Return the number of leaf nodes in the scene
+-template <class T>
+-unsigned long boxm_scene<T>::size()
+-{
+-  // iterate through the blocks requesting the finest level
+-  boxm_block_iterator<T > iter=this->const_iterator();
+-  iter.begin();
+-  unsigned long size = 0;
+-  while (!iter.end()) {
+-    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z()))
+-    {
+-      size += get_active_block()->get_tree()->size();
+-    }
+-
+-    iter++;
+-  }
+-
+-  return size;
+-}
+-
+-template <class T>
+-void boxm_scene<T>::b_read(vsl_b_istream & is)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      std::string xml="";
+-      vsl_b_read(is, xml);
+-      std::cout << xml << std::endl;
+-      boxm_scene_parser parser;
+-      parse_xml_string(xml, parser);
+-      break;
+-#if 0
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scene<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      return;
+-#endif
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::b_write(vsl_b_ostream & s) const
+-{
+-  // create an XML stream for the parameters
+-  std::stringstream strm;
+-  boxm_scene<T> scene(this->lvcs(), this->origin(), this->block_dim(), this->world_dim());
+-  x_write(strm, scene, "scene");
+-  std::string str(strm.str());
+-
+-  short v = boxm_scene<T>::version_no();
+-  vsl_b_write(s, v);
+-  // write the XML as char stream
+-  vsl_b_write(s, str);
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_scene(std::string filename)
+-{
+-  std::string fullpath=scene_path_+ "/" + filename;
+-  std::ofstream os(fullpath.c_str());
+-  x_write(os, *this, "boxm_scene");
+-  this->filename_ = fullpath;
+-  os.close();
+-}
+-
+-template <class T>
+-void boxm_scene<T>::write_scene(std::string path, std::string filename)
+-{
+-  std::string fullpath= path+ "/" + filename;
+-  std::ofstream os(fullpath.c_str());
+-  x_write(os, *this, "boxm_scene");
+-  this->filename_ = fullpath;
+-  os.close();
+-}
+-
+-template <class T>
+-void boxm_scene<T>::load_scene(std::string filename)
+-{
+-  boxm_scene_parser parser;
+-  boxm_scene_base::load_scene(filename, parser);
+-  this->filename_ = filename;
+-  parse_config(parser);
+-}
+-
+-template <class T>
+-void boxm_scene<T>::load_scene(boxm_scene_parser& parser)
+-{
+-  parse_config(parser);
+-}
+-
+-template <class T>
+-void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name)
+-{
+-  vsl_basic_xml_element scene_elm(name);
+-  scene_elm.x_write_open(os);
+-
+-  vsl_basic_xml_element app_model(APP_MODEL_TAG);
+-  app_model.add_attribute("type", boxm_apm_types::app_model_strings[scene.appearence_model()]);
+-  app_model.x_write(os);
+-
+-  vsl_basic_xml_element bin(MULTI_BIN_TAG);
+-  bin.add_attribute("value", scene.multi_bin()? 1 : 0);
+-  bin.x_write(os);
+-
+-  vsl_basic_xml_element save_nodes(SAVE_INTERNAL_NODES_TAG);
+-  save_nodes.add_attribute("value", scene.save_internal_nodes()? 1 : 0);
+-  save_nodes.x_write(os);
+-
+-  vsl_basic_xml_element save_platform_independent(SAVE_PLATFORM_INDEPENDENT_TAG);
+-  save_platform_independent.add_attribute("value", scene.save_platform_independent()? 1 : 0);
+-  save_platform_independent.x_write(os);
+-
+-  vsl_basic_xml_element load_all_blocks(LOAD_ALL_BLOCKS_TAG);
+-  load_all_blocks.add_attribute("value", scene.load_all_blocks()? 1 : 0);
+-  load_all_blocks.x_write(os);
+-
+-  vpgl_lvcs lvcs=scene.lvcs();
+-  x_write(os, lvcs, LVCS_TAG);
+-  x_write(os, scene.origin(), LOCAL_ORIGIN_TAG);
+-  x_write(os, scene.block_dim(), BLOCK_DIMENSIONS_TAG);
+-
+-  vsl_basic_xml_element blocks(BLOCK_NUM_TAG);
+-  int x_dim, y_dim, z_dim;
+-  scene.block_num(x_dim, y_dim, z_dim);
+-  blocks.add_attribute("x_dimension", x_dim);
+-  blocks.add_attribute("y_dimension", y_dim);
+-  blocks.add_attribute("z_dimension", z_dim);
+-  blocks.x_write(os);
+-
+-  vsl_basic_xml_element paths(SCENE_PATHS_TAG);
+-  paths.add_attribute("path", scene.path());
+-  paths.add_attribute("block_prefix", scene.block_prefix());
+-  paths.x_write(os);
+-
+-  vsl_basic_xml_element tree(OCTREE_LEVELS_TAG);
+-  tree.add_attribute("max", (int) scene.max_level());
+-  tree.add_attribute("init", (int) scene.init_level());
+-  tree.x_write(os);
+-
+-  scene_elm.x_write_close(os);
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::parse_config(boxm_scene_parser& parser)
+-{
+-  vpgl_lvcs lvcs;
+-  parser.lvcs(lvcs);
+-  vgl_vector_3d<unsigned> dims = parser.block_nums();
+-
+-  lvcs_ = lvcs;
+-  origin_ =  parser.origin();
+-  block_dim_ = parser.block_dim();
+-  create_blocks(block_dim_, dims);
+-
+-  parser.paths(scene_path_, block_pref_);
+-  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
+-  multi_bin_ = parser.multi_bin();
+-  save_internal_nodes_ =parser.save_internal_nodes();
+-  save_platform_independent_ = parser.save_platform_independent();
+-  load_all_blocks_ = parser.load_all_blocks();
+-  pinit_=parser.p_init();
+-#if 0
+-  std::cout << "Internal Nodes 1: " << save_internal_nodes_ << std::endl;
+-#endif
+-  parser.levels(max_tree_level_, init_tree_level_);
+-  return true;
+-}
+-
+-template <class T>
+-bool boxm_scene<T>::parse_xml_string(std::string xml, boxm_scene_parser& parser)
+-{
+-  if (xml.size() == 0) {
+-    std::cerr << "XML string is empty\n";
+-    return false;
+-  }
+-  if (!parser.parseString(xml.data())) {
+-    std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
+-             << parser.XML_GetCurrentLineNumber() << '\n';
+-
+-    return false;
+-  }
+-
+-  vpgl_lvcs lvcs;
+-  parser.lvcs(lvcs);
+-  vgl_vector_3d<unsigned> nums = parser.block_nums();
+-
+-  lvcs_ = lvcs;
+-  origin_ =  parser.origin();
+-  block_dim_ = parser.block_dim();
+-  create_blocks(block_dim_, nums);
+-
+-  parser.paths(scene_path_, block_pref_);
+-  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
+-  multi_bin_ = parser.multi_bin();
+-  pinit_=parser.p_init();
+-  load_all_blocks_ = parser.load_all_blocks();
+-
+-  return true;
+-}
+-
+-template <class T>
+-void boxm_scene<T>::clean_scene()
+-{
+-  boxm_block_iterator<T > iter=this->iterator();
+-  iter.begin();
+-  while (!iter.end()) {
+-    if (this->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      std::string filename=this->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
+-      vpl_unlink(filename.c_str());
+-    }
+-    iter++;
+-  }
+-}
+-
+-template <class T>
+-void boxm_scene<T>::print()
+-{
+-  boxm_block_iterator<T > iter=this->const_iterator();
+-  iter.begin();
+-  while (!iter.end()) {
+-    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      std::cout << "Printing Block : " <<  iter.index() << std::endl;
+-      get_active_block()->get_tree()->print();
+-    }
+-    ++iter;
+-  }
+-}
+-
+-//: Load all blocks in between min-max indices.
+-template <class T>
+-bool boxm_scene<T>::load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
+-{
+-  if (!valid_index(min_idx) || !valid_index(max_idx))
+-    return false;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks;
+-
+-  for (int i = min_idx.x(); i <= max_idx.x(); i++)
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-      for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-        new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
+-
+-  // Set unused blocks to null and load new blocks
+-  // this is to avoid rereading blocks that are already in memory
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
+-  bvgl_point_3d_cmp<int>  cmp;
+-  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
+-                     new_active_blocks.begin(), new_active_blocks.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
+-                     cmp);
+-
+-  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
+-                     active_blocks_.begin(), active_blocks_.end(),
+-                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
+-                     cmp);
+-
+-  active_blocks_.clear();
+-  active_blocks_ = new_active_blocks;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
+-
+-  for (; unload_it!=blocks_to_unload.end(); unload_it++)
+-  {
+-    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-  }
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
+-
+-  for (; load_it!=blocks_to_load.end(); load_it++)
+-  {
+-    int block_i = (*load_it).x();
+-    int block_j = (*load_it).y();
+-    int block_k = (*load_it).z();
+-
+-    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
+-    {
+-      std::string block_path = gen_block_path(block_i,block_j,block_k);
+-      vsl_b_ifstream os(block_path);
+-
+-      // if the binary block file is not found
+-      if (!os) {
+-        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
+-          T* tree= new T(max_tree_level_,init_tree_level_);
+-          blocks_(block_i,block_j,block_k)->init_tree(tree);
+-        }
+-        return false;
+-      }
+-      blocks_(block_i,block_j,block_k)->b_read(os);
+-      os.close();
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-//: Unload all blocks in between min-max indices.
+-template <class T>
+-bool boxm_scene<T>::unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
+-{
+-  if (!valid_index(min_idx) || !valid_index(max_idx))
+-    return false;
+-
+-  for (int i = min_idx.x(); i <= max_idx.x(); i++)
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-      for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        block->delete_tree();
+-        block->set_tree(nullptr);
+-      }
+-  return true;
+-}
+-
+-//: Unload active blocks.
+-template <class T>
+-void boxm_scene<T>::unload_active_blocks() const
+-{
+-  // unload active block
+-  if (valid_index(active_block_))
+-  {
+-    boxm_block<T>* block = blocks_(active_block_.x(), active_block_.y(),active_block_.z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-    active_block_ = vgl_point_3d<int>(-1,-1,-1);
+-  }
+-
+-  if (active_blocks_.size()==0)
+-    return;
+-
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = active_blocks_.begin();
+-
+-  for (; unload_it!=active_blocks_.end(); unload_it++)
+-  {
+-    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
+-    block->delete_tree();
+-    block->set_tree(nullptr);
+-  }
+-  active_blocks_.clear();
+-
+-  return;
+-}
+-
+-
+-//: Locate all cells within a 3d region, which coordinates are given in scene coordinates.
+-//  Use with care --- blocks need to be unloaded by user to not create memory leaks
+-template <class T>
+-void boxm_scene<T>::leaves_in_region(vgl_box_3d<double> box, std::vector<boct_tree_cell<typename T::loc_type, typename T::datatype>* > &cells)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-  cells.clear();
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
+-    return;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
+-        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
+-      }
+-    }
+-  }
+-
+-  // FIXME: I should unload the blocks
+-  return;
+-}
+-
+-//: Level of the cell containing a 3d region, which coordinates are given in scene coordinates.
+-template <class T>
+-short boxm_scene<T>::level_region(vgl_box_3d<double> box)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::level_region: Region does not intersect scene\n";
+-    return -1;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-//#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-//#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return -1;
+-
+-  short level = -1;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        std::cout << ".....In tree with box dimension: " << get_block_bbox(i,j,k).width() << ", " << get_block_bbox(i,j,k).depth() << ", " << get_block_bbox(i,j,k).height()
+-            << "looking for box with dim: " << box.width() << ", " << box.depth() << ", " <<box.height() <<std::endl;
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-
+-        boct_tree_cell<loc_type, datatype>* region_cell = tree->locate_region_global(local_box_exclusive);
+-        if (region_cell->level() > level)
+-          level = region_cell->level();
+-
+-        std::cout << "level: " << level << box <<std::endl;
+-
+-      }
+-    }
+-  }
+-  this->unload_active_blocks();
+-  return level;
+-}
+-
+-
+-
+-
+-//: Return all leaf cells between an inner box and an outter box
+-template <class T>
+-void boxm_scene<T>::leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<typename T::loc_type, typename T::datatype> > &cell_data)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-  cell_data.clear();
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
+-    return;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
+-
+-        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
+-        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
+-          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
+-                                                                (*temp_cell_it)->level(), (*temp_cell_it)->data()));
+-        }
+-      }
+-    }
+-  }
+-  unload_active_blocks();
+-  return;
+-}
+-
+-//: Returns the data of all cells at a given level, that are contained in the specified region
+-template <class T>
+-void boxm_scene<T>::cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level)
+-{
+-  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
+-  cell_data.clear();
+-
+-  if (valid_box.is_empty()) {
+-    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
+-    return;
+-  }
+-
+-  vgl_point_3d<double> min_point = valid_box.min_point();
+-  vgl_point_3d<double> max_point = valid_box.max_point();
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-#ifdef DEBUG
+-  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
+-#endif
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_region_cells_global(local_box_exclusive, temp_cells, level);
+-
+-        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
+-        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
+-          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
+-                                                                 (*temp_cell_it)->level(), (*temp_cell_it)->data()));
+-        }
+-      }
+-    }
+-  }
+-  unload_active_blocks();
+-  return;
+-}
+-
+-//: Return all leaf cells between an inner box and an outter box. Use with care --- blocks need to be unloaded by user
+-template <class T>
+-void boxm_scene<T>::leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells)
+-{
+-  if (!outer_box.contains(inner_box))
+-    return;
+-
+-  // load blocks intersecting the region
+-  vgl_point_3d<double> min_point = outer_box.min_point();
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<double> max_point = outer_box.max_point();
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),outer_box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_outer_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                                     local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-
+-        vgl_box_3d<double> local_inner_box_exclusive = vgl_intersection(local_outer_box_exclusive,inner_box);
+-
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
+-        temp_cells.clear();
+-        tree->locate_leaves_in_hollow_region_global(local_outer_box_exclusive, local_inner_box_exclusive, temp_cells);
+-        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
+-      }
+-    }
+-  }
+-
+-  // FIXME: I should unload the blocks
+-  return;
+-}
+-
+-//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
+-template <class T>
+-void boxm_scene<T>::change_leaves_in_region(vgl_box_3d<double> box, const typename T::datatype &cell_data)
+-{
+-  // load blocks intersecting the region
+-  vgl_point_3d<double> min_point = box.min_point();
+-  vgl_point_3d<int> min_idx;
+-  get_block_index(min_point, min_idx);
+-
+-  vgl_point_3d<double> max_point = box.max_point();
+-  vgl_point_3d<int> max_idx;
+-  get_block_index(max_point, max_idx);
+-
+-  if (!load_blocks(min_idx, max_idx))
+-    return;
+-
+-  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-  for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-  {
+-    for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-    {
+-      for (int i = min_idx.x(); i <= max_idx.x();i++)
+-      {
+-        boxm_block<T>* block = blocks_(i,j,k);
+-        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-        // if this is not done, the endpoint may be out of bounds
+-        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-        T *tree = block->get_tree();
+-        if (!tree)
+-          continue;
+-
+-        tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
+-
+-        std::string path = gen_block_path(i,j,k);
+-        vsl_b_ofstream os(path);
+-        block->b_write(os, save_internal_nodes_, save_platform_independent_);
+-      }
+-    }
+-  }
+-
+-  unload_active_blocks();
+-  return;
+-}
+-
+-//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
+-template <class T>
+-void boxm_scene<T>::change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<typename T::datatype> &all_data)
+-{
+-  if (boxes.size()!= all_data.size()) {
+-    std::cerr << "Error in boxm_scene<T>::change_leaves_in_regions --> Input vectors don't have the same size\n";
+-    return;
+-  }
+-
+-  for (unsigned bi = 0; bi < boxes.size(); bi++)
+-  {
+-    const vgl_box_3d<double> &box = boxes[bi];
+-    const datatype &cell_data=all_data[bi];
+-    // load blocks intersecting the region
+-    vgl_point_3d<double> min_point = box.min_point();
+-    vgl_point_3d<int> min_idx;
+-    get_block_index(min_point, min_idx);
+-
+-    vgl_point_3d<double> max_point = box.max_point();
+-    vgl_point_3d<int> max_idx;
+-    get_block_index(max_point, max_idx);
+-
+-    if (!load_blocks(min_idx, max_idx))
+-      return;
+-
+-    // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
+-    for (int k = min_idx.z(); k <= max_idx.z(); k++)
+-    {
+-      for (int j = min_idx.y(); j <= max_idx.y(); j++)
+-      {
+-        for (int i = min_idx.x(); i <= max_idx.x();i++)
+-        {
+-          boxm_block<T>* block = blocks_(i,j,k);
+-          vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
+-
+-          // subtract a little from the max point because octree cell are give by a half-closed interval [...).
+-          // if this is not done, the endpoint may be out of bounds
+-          vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
+-                                                 local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
+-          T *tree = block->get_tree();
+-          if (!tree)
+-            continue;
+-
+-          tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
+-
+-          std::string path = gen_block_path(i,j,k);
+-          vsl_b_ofstream os(path);
+-          block->b_write(os, save_internal_nodes_, save_platform_independent_);
+-        }
+-      }
+-    }
+-  }
+-
+-  unload_active_blocks();
+-  return;
+-}
+-
+-
+-//: Locate point
+-template <class T>
+-boct_tree_cell<typename T::loc_type, typename T::datatype>* boxm_scene<T>::locate_point_in_memory(vgl_point_3d<double> &p, unsigned level)
+-{
+-  // get the indices for the block containing this point
+-  vgl_point_3d<int> block_idx;
+-  if (!get_block_index(p, block_idx))
+-    return nullptr;
+-
+-#ifdef DEBUG
+-  std::cout << "Requesting blocks : "<< block_idx<< '\n'
+-           << "Active blocks :" << std::endl;
+-  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
+-  for (; it!=active_blocks_.end(); it++) {
+-    std::cout << *it << std::endl;
+-    boxm_block<T > *block = get_block(*it);
+-    if (!block)
+-      std::cerr << " NULL block\n";
+-    T *tree = block->get_tree();
+-    if (!tree)
+-      std::cerr << " NULL tree\n";
+-  }
+-#endif
+-
+-  // get the block, if block is not already in memory, return null
+-  boxm_block<T>* block = blocks_(block_idx.x(), block_idx.y(), block_idx.z());
+-  if (!block) {
+-    std::cerr << "In locate_point_in_memory: NULL block\n";
+-    return nullptr;
+-  }
+-  T *tree = block->get_tree();
+-  if (!tree) {
+-    std::cerr << "In locate_point_in_memory: NULL tree\n";
+-    return nullptr;
+-  }
+-  return tree->locate_point_global(p, (short)level);
+-}
+-
+-/************************************************ BOXM_BLOCK_ITERATOR *******************************************/
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::begin()
+-{
+-  i_=j_=k_=0;
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_block_iterator<T>::end()
+-{
+-  int x,y,z;
+-  scene_->block_num(x,y,z);
+-
+-  // if ((i_==x-1) && (j_==y-1) && (k_==z-1))
+-  bool end = (k_==z || k_ == -1);
+-
+-  //:If end, release memory
+-  if (end)
+-    scene_->unload_active_blocks();
+-
+-  return end;
+-}
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::operator=(const boxm_block_iterator<T>& that)
+-{
+-  this->i_ = that.i_;
+-  this->j_ = that.j_;
+-  this->k_ = that.k_;
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_block_iterator<T>::operator==(const boxm_block_iterator<T>& that)
+-{
+-  return (this->i_ == that.i_) && (this->j_ == that.j_) && (this->k_ == that.k_) && (this->scene_ == that.scene_);
+-}
+-
+-template <class T>
+-bool boxm_block_iterator<T>::operator!=(const boxm_block_iterator<T>& that)
+-{
+-  return (this->i_ != that.i_) || (this->j_ != that.j_) == (this->k_ != that.k_) || (this->scene_ != that.scene_);
+-}
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::operator++()
+-{
+-  int x,y,z;
+-  scene_->block_num(x,y,z);
+-
+-  if (++i_==x) {
+-    i_=0;
+-    if (++j_==y) {
+-      j_=0;
+-      ++k_;
+-    }
+-  }
+-  return *this;
+-}
+-
+-template <class T>
+-boxm_block_iterator<T> boxm_block_iterator<T>::operator++(int)
+-{
+-  boxm_block_iterator<T> old = *this;
+-  ++*this;
+-  return old;
+-}
+-
+-template <class T>
+-boxm_block_iterator<T>& boxm_block_iterator<T>::operator--()
+-{
+-  int x,y,z;
+-
+-  scene_->block_num(x,y,z);
+-  if (--i_==-1) {
+-    i_=0;
+-    if (--j_==-1) {
+-      j_=0;
+-      k_--;
+-    }
+-  }
+-  return *this;
+-}
+-
+-template <class T>
+-boxm_block<T>* boxm_block_iterator<T>::operator*()
+-{
+-  return scene_->get_block(i_,j_,k_);
+-}
+-
+-template <class T>
+-boxm_block<T>*  boxm_block_iterator<T>::operator->()
+-{
+-  return scene_->get_block(i_,j_,k_);
+-}
+-
+-/************************************************ BOXM_CELL_ITERATOR *******************************************/
+-template <class T>
+-boxm_cell_iterator<T>& boxm_cell_iterator<T>::begin(bool use_internal_cells)
+-{
+-  use_internal_cells_= use_internal_cells;
+-
+-  // unload all blocks from memory
+-  block_iterator_.scene_->unload_active_blocks();
+-  block_iterator_.begin();
+-
+-  // load active block using function pointer, retrieve pointer to all cells
+-  (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
+-  T *tree = (*block_iterator_)->get_tree();
+-  assert(tree != nullptr);
+-  if(use_internal_cells_)
+-    cells_=tree->all_cells();
+-  else
+-    cells_ = tree->leaf_cells();
+-  cells_iterator_ = cells_.begin();
+-
+-  std::cout << "Cell iterator: # of cells: " << cells_.size() << std::endl;
+-
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_cell_iterator<T>::end()
+-{
+-  bool end = false;
+-
+-  end = cells_.empty() || (block_iterator_.end() && (cells_iterator_ == cells_.end()));
+-
+-  if (end)
+-    block_iterator_.scene_->unload_active_blocks();
+-
+-  return end;
+-}
+-
+-template <class T>
+-boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator=(const boxm_cell_iterator<T>& /*that*/)
+-{
+-  std::cerr << "assignment operator not yet implemented\n";
+-  return *this;
+-}
+-
+-template <class T>
+-bool boxm_cell_iterator<T>::operator==(const boxm_cell_iterator<T>& that)
+-{
+-  return (this->block_iterator_ == that.block_iterator_) && (this->cells_iterator_ == that.cells_iterator_);
+-}
+-
+-template <class T>
+-bool boxm_cell_iterator<T>::operator!=(const boxm_cell_iterator<T>& that)
+-{
+-  return (this->block_iterator_ != that.block_iterator_) && (this->cells_iterator_ != that.cells_iterator_);
+-}
+-
+-//: Prefix operator.
+-//  When the end of the block is reached, it writes the block to disk and loads the next one, unless the read_only flag was set
+-template <class T>
+-boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator++()
+-{
+-  if (++cells_iterator_ == cells_.end())
+-  {
+-    if (!read_only_)
+-      block_iterator_.scene_->write_active_block(false);
+-
+-    ++block_iterator_;
+-
+-    if (!block_iterator_.end())
+-    {
+-      // load active block using function pointer, retrieve pointer to all cells
+-      (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
+-      T *tree = (*block_iterator_)->get_tree();
+-      assert(tree != nullptr);
+-
+-      if(use_internal_cells_)
+-        cells_=tree->all_cells();
+-      else
+-        cells_ = tree->leaf_cells();
+-
+-      cells_iterator_ = cells_.begin();
+-    }
+-  }
+-  return *this;
+-}
+-
+-template <class T>
+-boxm_cell_iterator<T> boxm_cell_iterator<T>::operator+=(unsigned const &rhs)
+-{
+-  // is there a more efficient way to do this whitout messing all the iterator up?
+-  for (unsigned i =0; i<rhs; ++i)
+-    ++(*this);
+-
+-  return *this;
+-}
+-
+-
+-template <class T>
+-boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>* boxm_cell_iterator<T>::operator*()
+-{
+-  return *cells_iterator_;
+-}
+-
+-template <class T>
+-boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>*  boxm_cell_iterator<T>::operator->()
+-{
+-  return *cells_iterator_;
+-}
+-
+-template<class T>
+-vgl_point_3d<double> boxm_cell_iterator<T>::global_origin()
+-{
+-  return (*block_iterator_)->get_tree()->global_origin(*cells_iterator_);
+-}
+-
+-template<class T>
+-vgl_point_3d<double> boxm_cell_iterator<T>::global_centroid()
+-{
+-  return (*block_iterator_)->get_tree()->global_centroid(*cells_iterator_);
+-}
+-
+-//: Return the global length of this cell
+-template<class T>
+-double boxm_cell_iterator<T>::length()
+-{
+-  return (*block_iterator_)->get_tree()->cell_length(*cells_iterator_)*(*block_iterator_)->bounding_box().width();
+-}
+-
+-/******************************************* I/ O *******************************************************/
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene)
+-{
+-  scene.b_write(os);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene)
+-{
+-  scene->b_write(os);
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene)
+-{
+-  scene.b_read(is);
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene)
+-{
+-  scene->b_read(is);
+-}
+-
+-#define BOXM_SCENE_INSTANTIATE(T) \
+-template class boxm_scene<T >; \
+-template void x_write(std::ostream&, boxm_scene<T >&, std::string); \
+-template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const &scene); \
+-template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const * &scene); \
+-template void vsl_b_read(vsl_b_istream & is, boxm_scene<T >  &scene); \
+-template void vsl_b_read(vsl_b_istream & is, boxm_scene<T > * &scene)
+-
+-#define BOXM_BLOCK_ITERATOR_INSTANTIATE(T) \
+-template class boxm_block_iterator<T >; \
+-template class boxm_cell_iterator<T >
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_scene_base.cxx
+deleted file mode 100644
+index 11fb0faf88..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_base.cxx
++++ /dev/null
+@@ -1,35 +0,0 @@
+-#include <iostream>
+-#include <cstdio>
+-#include "boxm_scene_base.h"
+-#include "boxm_scene_parser.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bool boxm_scene_base::load_scene(const std::string& filename, boxm_scene_parser& parser)
+-{
+-
+-  if (filename.size() > 0) {
+-    std::FILE* xmlFile = std::fopen(filename.c_str(), "r");
+-    if (!xmlFile){
+-    std::cerr << filename.c_str() << " error on opening" << std::endl;
+-    return false;
+-    }
+-    if (!parser.parseFile(xmlFile)) {
+-      std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
+-               << parser.XML_GetCurrentLineNumber() << '\n';
+-      std::fclose(xmlFile);
+-      return false;
+-    }
+-    std::fclose(xmlFile);
+-  }
+-  else
+-    std::cerr << " Filename is empty" << std::endl;
+-
+-  parser.paths(scene_path_, block_pref_);
+-  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
+-  multi_bin_ = parser.multi_bin();
+-  parser.levels(max_tree_level_, init_tree_level_);
+-  filename_ = filename;
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.h b/contrib/brl/bseg/boxm/boxm_scene_base.h
+deleted file mode 100644
+index 5e52195ac3..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_base.h
++++ /dev/null
+@@ -1,85 +0,0 @@
+-#ifndef boxm_scene_base_h_
+-#define boxm_scene_base_h_
+-//:
+-// \file
+-// \brief  The main class to keep the 3D world data and pieces
+-//
+-// \author Gamze Tunali
+-// \date Apr 14, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vbl/vbl_ref_count.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <vbl/vbl_smart_ptr.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-
+-class boxm_scene_parser;
+-
+-class boxm_scene_base : public vbl_ref_count
+-{
+- public:
+-  boxm_scene_base()
+-  : app_model_(BOXM_APM_UNKNOWN), multi_bin_(false), tree_level_set_(false),
+-    scene_path_(""), filename_(""), block_pref_(""), max_tree_level_(0), init_tree_level_(0) {}
+-
+-  ~boxm_scene_base() override = default;
+-
+-  bool load_scene(const std::string& filename, boxm_scene_parser& parser);
+-
+-  boxm_apm_type appearence_model() { return app_model_; }
+-
+-  void set_appearance_model(boxm_apm_type model) { app_model_ = model; }
+-
+-  void set_bin_option(bool multi_bin) { multi_bin_ = multi_bin; }
+-
+-  void set_octree_levels(unsigned max, unsigned init, bool tree_level_set=true)
+-  {
+-    max_tree_level_=max;
+-    init_tree_level_=init;
+-    tree_level_set_=tree_level_set;
+-  }
+-
+-  void set_paths(std::string scene_path, std::string block_prefix)
+-  {
+-    scene_path_ = scene_path;
+-    block_pref_=block_prefix;
+-  }
+-
+-  bool multi_bin() const { return multi_bin_; }
+-
+-  bool parse_config(std::string xml, boxm_scene_parser& parser, bool filename);
+-
+-  unsigned max_level() const { return max_tree_level_; }
+-  unsigned init_level() const { return init_tree_level_; }
+-  std::string filename() const { return filename_; }
+-
+-  virtual vgl_box_3d<double> get_world_bbox() const { return {}; }
+-  virtual vgl_vector_3d<unsigned> world_dim() const { return {}; }
+-
+- protected:
+-  boxm_apm_type app_model_;
+-
+-  bool multi_bin_;
+-
+-  //: it is set to true when max and init tree levels are given
+-  bool tree_level_set_;
+-
+-  std::string scene_path_;
+-  std::string filename_;
+-  std::string block_pref_;
+-
+-  //: maximum octree levels allowed
+-  unsigned max_tree_level_;
+-
+-  //: number of initial octree levels created at the tree creation step
+-  unsigned init_tree_level_;
+-};
+-
+-typedef vbl_smart_ptr<boxm_scene_base> boxm_scene_base_sptr;
+-
+-#endif // boxm_scene_base_h_
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx b/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
+deleted file mode 100644
+index be04cb28ed..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
++++ /dev/null
+@@ -1,277 +0,0 @@
+-//:
+-// \file
+-// \brief Parses the configuration file for bwm tool.
+-//
+-#include <sstream>
+-#include <cstring>
+-#include <iostream>
+-#include <cstdio>
+-#include "boxm_scene_parser.h"
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-// --------------
+-// --- PARSER ---
+-// --------------
+-template <typename T>
+-void convert(const char* t, T& d)
+-{
+-  std::stringstream strm(t);
+-  strm >> d;
+-}
+-
+-boxm_scene_parser::boxm_scene_parser()
+-{
+-  init_params();
+-}
+-
+-bool boxm_scene_parser::lvcs(vpgl_lvcs& lvcs) {
+-  vpgl_lvcs::cs_names cs_name = vpgl_lvcs::str_to_enum(lvcs_cs_name_.data());
+-  vpgl_lvcs::LenUnits len_unit;
+-  vpgl_lvcs::AngUnits geo_unit;
+-   if (std::strcmp(lvcs_XYZ_unit_.data(), "feet")==0) {
+-     len_unit = vpgl_lvcs::FEET;
+-   }
+-   else if (std::strcmp(lvcs_XYZ_unit_.data(), "meters")==0) {
+-     len_unit = vpgl_lvcs::METERS;
+-   }
+-   else {
+-     std::cout << "LVCS Length Unit " << lvcs_XYZ_unit_ << " is not valid\n";
+-     return false;
+-   }
+-
+-   if (std::strcmp(lvcs_geo_angle_unit_.data(), "radians")==0) {
+-     geo_unit = vpgl_lvcs::RADIANS;
+-   }
+-   else if (std::strcmp(lvcs_geo_angle_unit_.data(), "degrees")==0) {
+-     geo_unit = vpgl_lvcs::DEG;
+-   }
+-   else {
+-     std::cout << "LVCS Geo Angle Unit " << lvcs_geo_angle_unit_ << " is not valid\n";
+-     return false;
+-   }
+-
+-   lvcs = vpgl_lvcs(lvcs_origin_lat_,lvcs_origin_lon_,lvcs_origin_elev_, cs_name,
+-                  lvcs_lat_scale_, lvcs_lon_scale_, geo_unit, len_unit,
+-                  lvcs_local_origin_x_, lvcs_local_origin_y_, lvcs_theta_);
+-  return true;
+-}
+-
+-void boxm_scene_parser::init_params()
+-{
+-  lvcs_cs_name_="";
+-  lvcs_origin_lon_=0;
+-  lvcs_origin_lat_=0;
+-  lvcs_origin_elev_=0;
+-  lvcs_lon_scale_=0;
+-  lvcs_lat_scale_=0;
+-  lvcs_XYZ_unit_="";
+-  lvcs_geo_angle_unit_="";
+-  lvcs_local_origin_x_=0;
+-  lvcs_local_origin_y_=0;
+-  lvcs_theta_=0;
+-
+-  // world origin
+-  local_orig_x_=0;
+-  local_orig_y_=0;
+-  local_orig_z_=0;
+-
+-  // block dimensions
+-  block_dim_x_=0;
+-  block_dim_y_=0;
+-  block_dim_z_=0;
+-
+-  // block numbers
+-  block_num_x_=0;
+-  block_num_y_=0;
+-  block_num_z_=0;
+-
+-  path_="";
+-  block_pref_="";
+-  save_internal_nodes_ = false;
+-  save_platform_independent_ = true;
+-  load_all_blocks_=false;
+-  p_init_=0.01f;
+-  num_buffers_init_ = 0;
+-  size_buffer_init_ = 0;
+-}
+-
+-void
+-boxm_scene_parser::startElement(const char* name, const char** atts)
+-{
+-#if 0
+-  std::cout<< "element=" << name << std::endl;
+-#endif
+-  if (std::strcmp(name, LVCS_TAG) == 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-        if (std::strcmp(atts[i], "cs_name") == 0)
+-        convert(atts[i+1], lvcs_cs_name_);
+-      else if (std::strcmp(atts[i], "origin_lon") == 0)
+-        convert(atts[i+1], lvcs_origin_lon_);
+-      else if (std::strcmp(atts[i], "origin_lat") == 0)
+-        convert(atts[i+1], lvcs_origin_lat_);
+-      else if (std::strcmp(atts[i], "origin_elev") == 0)
+-        convert(atts[i+1], lvcs_origin_elev_);
+-      else if (std::strcmp(atts[i], "lon_scale") == 0)
+-        convert(atts[i+1], lvcs_lon_scale_);
+-      else if (std::strcmp(atts[i], "lat_scale") == 0)
+-        convert(atts[i+1], lvcs_lat_scale_);
+-      else if (std::strcmp(atts[i], "local_XYZ_unit") == 0)
+-        convert(atts[i+1], lvcs_XYZ_unit_);
+-      else if (std::strcmp(atts[i], "geo_angle_unit") == 0)
+-        convert(atts[i+1], lvcs_geo_angle_unit_);
+-      else if (std::strcmp(atts[i], "local_origin_x") == 0)
+-        convert(atts[i+1], lvcs_local_origin_x_);
+-      else if (std::strcmp(atts[i], "local_origin_y") == 0)
+-        convert(atts[i+1], lvcs_local_origin_y_);
+-      else if (std::strcmp(atts[i], "theta_") == 0)
+-        convert(atts[i+1], lvcs_theta_);
+-    }
+-  }
+-  else if (std::strcmp(name,LOCAL_ORIGIN_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-        if (std::strcmp(atts[i], "x") == 0)
+-        convert(atts[i+1], local_orig_x_);
+-      else if (std::strcmp(atts[i], "y") == 0)
+-        convert(atts[i+1], local_orig_y_);
+-      else if (std::strcmp(atts[i], "z") == 0)
+-        convert(atts[i+1], local_orig_z_);
+-    }
+-  }
+-  else if (std::strcmp(name,BLOCK_DIMENSIONS_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-        if (std::strcmp(atts[i], "x") == 0)
+-        convert(atts[i+1], block_dim_x_);
+-      else if (std::strcmp(atts[i], "y") == 0)
+-        convert(atts[i+1], block_dim_y_);
+-      else if (std::strcmp(atts[i], "z") == 0)
+-        convert(atts[i+1], block_dim_z_);
+-    }
+-  }
+-  else if (std::strcmp(name,BLOCK_NUM_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "x_dimension") == 0)
+-        convert(atts[i+1], block_num_x_);
+-      else if (std::strcmp(atts[i], "y_dimension") == 0)
+-        convert(atts[i+1], block_num_y_);
+-      else if (std::strcmp(atts[i], "z_dimension") == 0)
+-        convert(atts[i+1], block_num_z_);
+-    }
+-  }
+-  else if (std::strcmp(name,SCENE_PATHS_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "path") == 0)
+-        convert(atts[i+1], path_);
+-      else if (std::strcmp(atts[i], "block_prefix") == 0)
+-        convert(atts[i+1], block_pref_);
+-    }
+-  }
+-  else if (std::strcmp(name,APP_MODEL_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "type") == 0)
+-        convert(atts[i+1], app_model_);
+-    }
+-  }
+-  else if (std::strcmp(name,MULTI_BIN_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], multi_bin_);
+-    }
+-  }
+-  else if (std::strcmp(name,SAVE_INTERNAL_NODES_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], save_internal_nodes_);
+-    }
+-  }
+-  else if (std::strcmp(name,SAVE_PLATFORM_INDEPENDENT_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], save_platform_independent_);
+-    }
+-    //std::cout << "parser: save_platform_independent_ = " << save_platform_independent_ << std::endl;
+-  }
+-  else if (std::strcmp(name,LOAD_ALL_BLOCKS_TAG)== 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "value") == 0)
+-        convert(atts[i+1], load_all_blocks_);
+-    }
+-    //std::cout << "parser: load_all_blocks_ = " << load_all_blocks_ << std::endl;
+-  }
+-
+-  else if (std::strcmp(name, "octree_level")==0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "max") == 0)
+-        convert(atts[i+1], max_tree_level_);
+-      else if (std::strcmp(atts[i], "init") == 0)
+-        convert(atts[i+1], init_tree_level_);
+-    }
+-  }
+-  else if (std::strcmp(name, "p_init")==0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-    if (std::strcmp(atts[i], "val") == 0)
+-        convert(atts[i+1], p_init_);
+-    }
+-  }
+-
+-  else if (std::strcmp(name, "tree_init") == 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "num_buffers")==0)
+-        convert(atts[i+1], num_buffers_init_);
+-      if (std::strcmp(atts[i], "buff_size")==0)
+-        convert(atts[i+1], size_buffer_init_);
+-    }
+-  }
+-
+-  else if (std::strcmp(name, "max_mb") == 0) {
+-    for (int i=0; atts[i]; i+=2) {
+-#if 0
+-        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
+-#endif
+-      if (std::strcmp(atts[i], "mb") == 0)
+-        convert(atts[i+1], max_mb_);
+-    }
+-  }
+-
+-}
+diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.h b/contrib/brl/bseg/boxm/boxm_scene_parser.h
+deleted file mode 100644
+index cbda358d2d..0000000000
+--- a/contrib/brl/bseg/boxm/boxm_scene_parser.h
++++ /dev/null
+@@ -1,108 +0,0 @@
+-#ifndef boxm_scene_parser_h_
+-#define boxm_scene_parser_h_
+-
+-#include <iostream>
+-#include <string>
+-#include <boxm/boxm_scene.h>
+-
+-#ifdef WIN32
+- #define _LIB
+-#endif
+-#include <expatpp.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vpgl/vpgl_lvcs.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_vector_3d.h>
+-
+-#define LVCS_TAG "lvcs"
+-#define LOCAL_ORIGIN_TAG "local_origin"
+-#define BLOCK_DIMENSIONS_TAG "block_dimensions"
+-#define BLOCK_NUM_TAG "blocks"
+-#define SCENE_PATHS_TAG "scene_paths"
+-#define APP_MODEL_TAG "appearence_model"
+-#define MULTI_BIN_TAG "multi_bin"
+-#define SAVE_INTERNAL_NODES_TAG "save_internal_nodes"
+-#define SAVE_PLATFORM_INDEPENDENT_TAG "save_platform_independent"
+-#define LOAD_ALL_BLOCKS_TAG "load_all_blocks"
+-#define OCTREE_LEVELS_TAG "octree_level"
+-#define P_INIT_TAG "p_init"
+-#define TREE_INIT_TAG "tree_init"
+-#define MAX_MB_TAG "max_mb"
+-
+-class boxm_scene_parser : public expatpp
+-{
+- public:
+-  boxm_scene_parser();
+-
+-  ~boxm_scene_parser(void) override = default;
+-
+-   bool lvcs(vpgl_lvcs& lvcs);
+-   vgl_point_3d<double> origin() const { return {local_orig_x_,local_orig_y_,local_orig_z_}; }
+-   vgl_vector_3d<double> block_dim() const { return {block_dim_x_,block_dim_y_,block_dim_z_}; }
+-   vgl_vector_3d<unsigned> block_nums() const { return {block_num_x_,block_num_y_,block_num_z_}; }
+-   void paths(std::string& scene_path, std::string& block_pref) { scene_path=path_; block_pref=block_pref_; }
+-   std::string app_model() const { return app_model_; }
+-   bool multi_bin() const { return multi_bin_; }
+-   void levels(unsigned& max, unsigned& init) { max = max_tree_level_; init=init_tree_level_; }
+-   bool save_internal_nodes() const { return save_internal_nodes_; }
+-   bool save_platform_independent() const { return save_platform_independent_; }
+-   bool load_all_blocks() const { return load_all_blocks_; }
+-   void tree_buffer_shape(int &num_buffers, int &buff_size) { num_buffers = num_buffers_init_; buff_size = size_buffer_init_; }
+-   int max_mb() const { return max_mb_; }
+-
+-   float p_init() const { return p_init_; }
+-
+- private:
+-  void startElement(const XML_Char* name, const XML_Char** atts) override;
+-  void endElement(const XML_Char* /*name*/) override {}
+-  void charData(const XML_Char* /*s*/, int /*len*/) override {}
+-
+-  void init_params();
+-
+-  // temporary values
+-  //lvcs
+-  std::string lvcs_cs_name_;
+-  double lvcs_origin_lon_;
+-  double lvcs_origin_lat_;
+-  double lvcs_origin_elev_;
+-  double lvcs_lon_scale_;
+-  double lvcs_lat_scale_;
+-  std::string lvcs_XYZ_unit_;
+-  std::string lvcs_geo_angle_unit_;
+-  double lvcs_local_origin_x_;
+-  double lvcs_local_origin_y_;
+-  double lvcs_theta_;
+-
+-  // world origin
+-  double local_orig_x_;
+-  double local_orig_y_;
+-  double local_orig_z_;
+-
+-  // block dimensions
+-  double block_dim_x_;
+-  double block_dim_y_;
+-  double block_dim_z_;
+-
+-  // block numbers
+-  unsigned block_num_x_;
+-  unsigned block_num_y_;
+-  unsigned block_num_z_;
+-
+-  std::string path_;
+-  std::string block_pref_;
+-  std::string app_model_;
+-  bool multi_bin_;
+-  unsigned max_tree_level_;
+-  unsigned init_tree_level_;
+-  bool save_internal_nodes_;
+-  bool save_platform_independent_;
+-  bool load_all_blocks_;
+-  float p_init_;
+-  int num_buffers_init_, size_buffer_init_;
+-  int max_mb_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
+deleted file mode 100644
+index 4c0cd29038..0000000000
+--- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# boxm's Process Library
+-
+-# bprb depends on expat and bvxm_prodepends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-  include_directories( ${BRL_INCLUDE_DIR}/bseg )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-
+-  set(boxm_pro_sources
+-      boxm_processes.h
+-      boxm_register.h   boxm_register.cxx
+-     )
+-
+-  aux_source_directory(Templates boxm_pro_sources)
+-  aux_source_directory(processes boxm_pro_sources)
+-
+-  vxl_add_library(LIBRARY_NAME boxm_pro LIBRARY_SOURCES ${boxm_pro_sources})
+-
+-  target_link_libraries(boxm_pro boxm boxm_util boxm_sample_algo boxm_sample vpgl_pro imesh bprb brdb brip vsol bsta bsta_pro ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
+deleted file mode 100644
+index fb055c2df5..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-typedef vnl_vector_fixed<float,3> vector;
+-
+-
+-BOCT_TREE_INSTANTIATE(short, vector );
+-BOCT_TREE_CELL_INSTANTIATE(short, vector);
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+deleted file mode 100644
+index ac40b5ec2d..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
+deleted file mode 100644
+index 24334a0ce4..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-typedef boct_tree<short,vnl_vector_fixed<float,3> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+deleted file mode 100644
+index 5de38b0662..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
+diff --git a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx b/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
+deleted file mode 100644
+index d1cce77af7..0000000000
+--- a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_block.h>
+-#include <boct/boct_tree.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-typedef boct_tree<short,vnl_vector_fixed<float,3> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/pro/boxm_processes.h b/contrib/brl/bseg/boxm/pro/boxm_processes.h
+deleted file mode 100644
+index 4466447bb1..0000000000
+--- a/contrib/brl/bseg/boxm/pro/boxm_processes.h
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#ifndef boxm_processes_h_
+-#define boxm_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-//the init functions
+-DECLARE_FUNC_CONS(boxm_load_scene_process);
+-DECLARE_FUNC_CONS(boxm_create_scene_process);
+-DECLARE_FUNC_CONS(boxm_construct_scene_from_image_process);
+-DECLARE_FUNC_CONS(boxm_proj_local_cam_process);
+-DECLARE_FUNC_CONS(boxm_camera_viewing_scene_process);
+-DECLARE_FUNC_CONS(boxm_upload_mesh_process);
+-DECLARE_FUNC_CONS(boxm_clean_scene_process);
+-DECLARE_FUNC_CONS(boxm_force_write_blocks_process);
+-#endif
+diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.cxx b/contrib/brl/bseg/boxm/pro/boxm_register.cxx
+deleted file mode 100644
+index 631b5beadc..0000000000
+--- a/contrib/brl/bseg/boxm/pro/boxm_register.cxx
++++ /dev/null
+@@ -1,27 +0,0 @@
+-#include "boxm_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-
+-#include "boxm_processes.h"
+-
+-void boxm_register::register_datatype()
+-{
+-  REGISTER_DATATYPE( boxm_scene_base_sptr );
+-}
+-
+-void boxm_register::register_process()
+-{
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_load_scene_process, "boxmLoadSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_create_scene_process, "boxmCreateSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_proj_local_cam_process,"boxmProjLocalCamProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_camera_viewing_scene_process,"boxmCameraViewingSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_construct_scene_from_image_process, "boxmConstructSceneFromImageProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_upload_mesh_process,"boxmUploadMeshProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_clean_scene_process,"boxmCleanSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_force_write_blocks_process,"boxmForceWriteBlocksProcess");
+-
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.h b/contrib/brl/bseg/boxm/pro/boxm_register.h
+deleted file mode 100644
+index 784df08bde..0000000000
+--- a/contrib/brl/bseg/boxm/pro/boxm_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef boxm_register_h_
+-#define boxm_register_h_
+-
+-class boxm_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // boxm_register_h_
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
+deleted file mode 100644
+index 799958429f..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
++++ /dev/null
+@@ -1,131 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <cmath>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for generating cameras that view a scene
+-//
+-// \author J.L. Mundy
+-// \date January 23, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <bpgl/algo/bpgl_project.h>
+-#include <vnl/vnl_math.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-//:global variables
+-namespace boxm_camera_viewing_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//:sets input and output types
+-bool boxm_camera_viewing_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_camera_viewing_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";// the scene
+-  input_types_[1] = "vcl_string";//the camera type, e.g. perspective
+-  input_types_[2] = "double";//camera elevation degrees
+-  input_types_[3] = "double";//camera azimuth degrees
+-  input_types_[4] = "double";//radius
+-
+-  input_types_[5] = "unsigned";//image ni
+-  input_types_[6] = "unsigned";//image nj
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "vpgl_camera_double_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:creates a scene from parameters
+-bool boxm_camera_viewing_scene_process(bprb_func_process& pro)
+-{
+-  if ( !pro.verify_inputs()) {
+-    std::cout << pro.name() << "boxm_camera_viewing_scene_process: invalid inputs" << std::endl;
+-    return false;
+-  }
+-  using namespace boxm_camera_viewing_scene_process_globals;
+-  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::cout<<"h";
+-  if (!scene_ptr) return false;
+-  std::cout<<"hi";
+-  vgl_box_3d<double> bb =  scene_ptr->get_world_bbox();
+-
+-  std::string cam_type = pro.get_input<std::string>(1);
+-  if (cam_type!="vpgl_perspective_camera")
+-    return false; //later other camera types
+-  auto elevation = pro.get_input<double>(2);
+-  auto azimuth = pro.get_input<double>(3);
+-  auto radius = pro.get_input<double>(4);
+-
+-  auto ni = pro.get_input<unsigned>(5);
+-  auto nj = pro.get_input<unsigned>(6);
+-  auto dni = static_cast<double>(ni), dnj = static_cast<double>(nj);
+-  //
+-  //find a camera that will project the scene bounding box
+-  //entirely inside the image
+-  //
+-  // 1) determine the stare point (center of bounding box)
+-  vgl_point_3d<double> cn = bb.centroid();
+-  vgl_homg_point_3d<double> stpt(cn.x(), cn.y(), cn.z());
+-
+-  // 2) determine camera center
+-  // the viewsphere radius is set to 10x the bounding box diameter
+-  //double w = bb.width(), h = bb.height(), d = bb.depth();
+-  double r = radius;//std::sqrt(w*w + h*h + d*d);
+-  //r *=10;
+-  double deg_to_rad = vnl_math::pi_over_180;
+-  double el = elevation*deg_to_rad, az = azimuth*deg_to_rad;
+-  double cx = r*std::sin(el)*std::cos(az);
+-  double cy = r*std::sin(el)*std::sin(az);
+-  double cz = r*std::cos(el);
+-  vgl_point_3d<double> cent(cx+cn.x(), cy+cn.y(), cz);
+-
+-  // 3) start with a unit focal length and position the camera
+-  vpgl_calibration_matrix<double> K(1.0, vgl_point_2d<double>(ni/2, nj/2));
+-  vgl_rotation_3d<double> R;
+-  auto* cam =
+-    new vpgl_perspective_camera<double>(K, cent, R);
+-
+-  //stare at the center of the scene
+-  vgl_vector_3d<double> up(0.0, 1.0, 0.0);
+-  if (std::fabs(el)<1.0e-3)
+-    cam->look_at(stpt, up);
+-  else
+-    cam->look_at(stpt);
+-
+-  //4) Adjust the focal length so that the box projects into the image
+-  // project the bounding box
+-  vgl_box_2d<double> image_bb = bpgl_project::project_bounding_box(*cam, bb);
+-  // get 2-d box diameter and image diameter
+-  double bw = image_bb.width(), bh = image_bb.height();
+-  double bd = std::sqrt(bw*bw + bh*bh);
+-  double id = std::sqrt(dni*dni + dnj*dnj);
+-  //find the adjusted focal length
+-  double f = id/bd;
+-  K.set_focal_length(f);
+-  cam->set_calibration(K);
+-
+-  std::cout<<"Camera  :" <<*cam<<std::endl;
+-  pro.set_output_val<vpgl_camera_double_sptr>(0, cam);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
+deleted file mode 100644
+index 82051affab..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for removing any previously created scene data from disk
+-//
+-// \author Daniel Crispell
+-// \date Feb 18, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-//:global variables
+-namespace boxm_clean_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned int n_inputs_ = 1;
+-  constexpr unsigned int n_outputs_ = 0;
+-}
+-
+-//:sets input and output types
+-bool boxm_clean_scene_process_cons(bprb_func_process& pro)
+-{
+-  //set output types
+-  using namespace boxm_clean_scene_process_globals;
+-  //process takes 1 input
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: removes data previously associated with scene
+-bool boxm_clean_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_clean_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_clean_scene_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_clean_scene_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->clean_scene();
+-      break;
+-    }
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->clean_scene();
+-      break;
+-    }
+-   case BOXM_APM_MOB_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->clean_scene();
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_clean_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
+deleted file mode 100644
+index 0129877c53..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
++++ /dev/null
+@@ -1,219 +0,0 @@
+-// This is brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief Process to construct an ideal scene for testing
+-//
+-// \author J.L. Mundy
+-// \date January 23, 2010
+-// \verbatim
+-//  Modifications
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <vil/vil_convert.h>
+-#include <vil/vil_image_view_base.h>
+-#include <vil/vil_image_view.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-namespace boxm_construct_scene_from_image_process_globals
+-{
+-  // The image area should be a multiple of area unit, e.g. 64.
+-  // This granularity is useful for parallel implementation
+-  template <class T>
+-  void tree_from_image(vil_image_view<float> const& image,
+-                       unsigned area_unit,
+-                       unsigned& base_ni, unsigned& base_nj,
+-                       boct_tree<short, T >*& tree)
+-  {
+-    tree = nullptr;
+-    unsigned ni = image.ni(), nj = image.nj();
+-    // find a square arrangement consistent with area unit
+-    auto gsize = static_cast<double>(area_unit);
+-    auto gwidth = static_cast<unsigned>(std::sqrt(gsize));
+-    unsigned gheight = area_unit/gwidth;
+-    if (gwidth*gheight!=gsize)
+-      return;//maybe fixup later to handle all situations
+-    unsigned mni = (ni/gwidth)*gwidth, mnj = (nj/gheight)*gheight;
+-    double min_dim = mni;
+-    if (mnj<min_dim)
+-      min_dim = mnj;
+-    double dlev = std::log(min_dim)/std::log(2.0);
+-    auto n_levels = static_cast<unsigned>(dlev+1.0);
+-
+-    //note that tree is being constructed in local coordinates
+-    float rni = 1.0f/static_cast<float>(mni), rnj =1.0f/static_cast<float>(mnj);
+-    base_ni = mni; base_nj = mnj;
+-    std::vector<boct_loc_code<short> > leaf_codes;
+-    std::vector<float> image_int;
+-    float upper_v=float(mnj-1)*rnj;
+-    for (unsigned j=0; j<mnj; ++j)
+-      for (unsigned i=0; i<mni; ++i)
+-      {
+-        float u = static_cast<float>(i)*rni;
+-        float v = upper_v-static_cast<float>(j)*rnj;
+-        vgl_point_3d<double> p(u, v, 0.0f);
+-        boct_loc_code<short> loc(p, n_levels-1);
+-        leaf_codes.push_back(loc);
+-        image_int.push_back(image(i,j));
+-      }
+-    //construct leaves
+-    std::vector<boct_tree_cell<short, T > > leaves;
+-    for (auto & leaf_code : leaf_codes) {
+-      boct_tree_cell<short, T > leaf(leaf_code);
+-      leaves.push_back(leaf);
+-    }
+-
+-    //construct tree from leaves
+-    auto *init_tree =
+-      new boct_tree<short, T >(n_levels, 0);
+-    boct_tree_cell<short, T > *root =
+-      init_tree->construct_tree(leaves, init_tree->number_levels());
+-
+-    // construct full tree with leaves and root
+-    //set the global bounding box, assuming a box with depth ni
+-    vgl_box_3d<double> box;
+-    vgl_point_3d<double> p0(0,0,0);
+-    vgl_point_3d<double> p1(mni, mnj, mni);
+-    box.add(p0); box.add(p1);
+-    tree = new boct_tree<short, T >(root, init_tree->number_levels());
+-    tree->set_bbox(box);
+-    delete init_tree;
+-
+-    // fill the leaves with data
+-    std::vector<boct_tree_cell<short, T >* > tleaves;
+-    tleaves = tree->leaf_cells();
+-    std::size_t i = 0;
+-    auto lit =
+-      tleaves.begin();
+-    for (; lit!= tleaves.end(); ++lit, ++i)
+-    {
+-      boct_loc_code<short> code = (*lit)->get_code();
+-      bool found = false;
+-      unsigned found_k = 0;
+-      for (unsigned k = 0; k<leaf_codes.size()&&!found; ++k)
+-        if (code == leaf_codes[k]) {
+-          found = true;
+-          found_k = k;
+-        }
+-      if (auto * cell_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >* >(*lit))
+-      {
+-        if (found) {
+-          boxm_sample<BOXM_APM_SIMPLE_GREY> data(1.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(image_int[found_k],0.0008f));
+-          cell_grey_ptr->set_data(data);
+-        }
+-        else {
+-          boxm_sample<BOXM_APM_SIMPLE_GREY> data(0.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.0f,0.0008f));
+-          cell_grey_ptr->set_data(data);
+-        }
+-      }
+-      else if (auto * cell_mog_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> >* >(*lit))
+-      {
+-        if (found) {
+-          boxm_sample<BOXM_APM_MOG_GREY> data(1.0f);
+-          typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_processor aproc;
+-          aproc::update(data.appearance(),image_int[found_k],1.0);
+-          cell_mog_grey_ptr->set_data(data);
+-        }
+-        else {
+-          boxm_sample<BOXM_APM_MOG_GREY> data(0.0f);
+-          cell_mog_grey_ptr->set_data(data);
+-        }
+-      }
+-      else if (auto * cell_float_ptr
+-               =reinterpret_cast<boct_tree_cell<short, float >* >(*lit))
+-      {
+-        if (found) {
+-          float data(1.0f);
+-          cell_float_ptr->set_data(data);
+-        }
+-      }
+-    }
+-  }
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_construct_scene_from_image_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_construct_scene_from_image_process_globals;
+-
+-  //input[0]: The image view
+-  //input[1]: appearance model type
+-  //input[2]: scene directory
+-  //input[3]: scene xml path
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vil_image_view_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-
+-  //output[0]: The scene
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0]=  "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_construct_scene_from_image_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_construct_scene_from_image_process_globals;
+-
+-  if ( !pro.verify_inputs()){
+-    std::cerr << pro.name() << "boxm_construct_scene_from_image_process: invalid inputs\n";
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  vil_image_view_base_sptr image = pro.get_input<vil_image_view_base_sptr>(i++);
+-  std::string app_type =  pro.get_input<std::string>(i++);
+-  std::string scene_dir =  pro.get_input<std::string>(i++);
+-  std::string xml_path =  pro.get_input<std::string>(i++);
+-  if (image == nullptr) {
+-    std::cerr << "boxm_construct_scene_from_image_process: null image value, cannot run\n";
+-    return false;
+-  }
+-
+-  vil_image_view<float> img = *vil_convert_cast(float(), image);
+-  if (image->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
+-    vil_math_scale_values(img,1.0/255.0);
+-
+-  unsigned base_ni =0, base_nj=0;
+-  std::string block_prefix = "ideal";
+-  boxm_scene_base_sptr scene_base = nullptr;
+-  if (app_type == "simple_grey")
+-  {
+-    typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
+-    boct_tree<short, data_type>* tree = nullptr;
+-    tree_from_image<data_type>(img, 16, base_ni, base_nj,tree);
+-    if (tree == nullptr) return false;
+-    boxm_block<boct_tree<short, data_type> >* blk =
+-      new boxm_block<boct_tree<short, data_type> >(tree->bounding_box(), tree);
+-    vgl_box_3d<double> bb = blk->bounding_box();
+-    vgl_point_3d<double> origin(0,0,0);
+-    vgl_vector_3d<double> block_dim(bb.width(),bb.height(),bb.depth());
+-    vgl_vector_3d<unsigned> world_dim(1,1,1);
+-    auto* scene
+- = new boxm_scene<boct_tree<short, data_type> >(origin, block_dim, world_dim);
+-    scene->set_appearance_model(BOXM_APM_SIMPLE_GREY);
+-    scene->set_block(vgl_point_3d<int>(0,0,0), blk);
+-    scene->set_path(scene_dir, block_prefix);
+-    scene->write_scene(xml_path);
+-    scene->write_active_block();
+-    scene_base = scene;
+-  }
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene_base);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
+deleted file mode 100644
+index d2abb94b67..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
++++ /dev/null
+@@ -1,218 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for creating a new boxm_scene when there is not a saved one.
+-//        It receives the parameters from a parameter file in XML
+-//
+-// \author Gamze Tunali
+-// \date Apr 21, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene_parser.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-//:global variables
+-namespace boxm_create_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//:sets input and output types
+-bool boxm_create_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:creates a scene from parameters
+-bool boxm_create_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_create_scene_process_globals;
+-  std::string fname = pro.get_input<std::string>(0);
+-
+-  boxm_scene_parser parser;
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-  scene_ptr->load_scene(fname, parser);
+-  std::cout << "Scene path: " << scene_ptr->filename()<< '\n'
+-           << "Scene appearance: " <<scene_ptr->appearence_model()<< std::endl;
+-
+-  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-    else {
+-      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      std::cout<<"Multi Bin set"<<std::endl;
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-    else {
+-      std::cout<<"Multi Bin for BOXM_APM_MOB_GREY is not defined yet"<<std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-#if 0
+-    else {
+-      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      boxm_scene<tree_type>* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      std::cout<<"Multi Bin set"<<std::endl;
+-      scene_ptr = scene;
+-    }
+-#endif
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_FLOAT) {
+-      if (!scene_ptr->multi_bin())
+-      {
+-        typedef boct_tree<short,float> tree_type;
+-        auto* scene = new boxm_scene<tree_type>();
+-        scene->load_scene(fname);
+-        scene_ptr = scene;
+-        std::cout << "Scene path: " << scene->filename()<< std::endl;
+-      }
+-  }
+-  else if (scene_ptr->appearence_model() == VNL_FLOAT_3) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,vnl_vector_fixed<float, 3> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      scene_ptr = scene;
+-      std::cout << "Loading scene of type vnl_float_3" << '\n'
+-               << "Scene path: " << scene->filename()<< std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == VNL_FLOAT_10) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,vnl_vector_fixed<float, 10> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      scene_ptr = scene;
+-      std::cout << "Loading scene of type vnl_float_10" << '\n'
+-               << "Scene path: " << scene->filename()<< std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_BOOL) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bool> tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(fname);
+-      scene_ptr = scene;
+-      std::cout << "Scene path: " << scene->filename()<< std::endl;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BSTA_MOG_F1) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BSTA_GAUSS_F1) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bsta_num_obs<bsta_gauss_sf1> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
+-    typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
+-    auto* scene = new boxm_scene<tree_type>();
+-    scene->load_scene(parser);
+-    scene_ptr = scene;
+-  }
+-  else {
+-    std::cerr << "boxm_create_scene_process: undefined APM type\n";
+-    return false;
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
+deleted file mode 100644
+index dba8e9687e..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
++++ /dev/null
+@@ -1,102 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-//:
+-// \file
+-// \brief A process for removing any previously created scene data from disk
+-//
+-// \author Daniel Crispell
+-// \date Feb 18, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-//:global variables
+-namespace boxm_force_write_blocks_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned int n_inputs_ = 1;
+-  constexpr unsigned int n_outputs_ = 0;
+-}
+-
+-//:sets input and output types
+-bool boxm_force_write_blocks_process_cons(bprb_func_process& pro)
+-{
+-  //set output types
+-  using namespace boxm_force_write_blocks_process_globals;
+-  //process takes 1 input
+-  //input[0]: The scene
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: removes data previously associated with scene
+-bool boxm_force_write_blocks_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_force_write_blocks_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << "boxm_force_write_blocks_process: The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  // check the input validity
+-  if (scene == nullptr) {
+-    std::cout << "boxm_force_write_blocks_process: scene is null, cannot run" << std::endl;
+-    return false;
+-  }
+-
+-  switch (scene->appearence_model())
+-  {
+-   case BOXM_APM_MOG_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->force_write_blocks();
+-      break;
+-    }
+-   case BOXM_APM_SIMPLE_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->force_write_blocks();
+-      break;
+-    }
+-   case BOXM_APM_MOB_GREY:
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      s->force_write_blocks();
+-      break;
+-    }
+-   default:
+-    std::cout << "boxm_force_write_blocks_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
+deleted file mode 100644
+index 59808debc7..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
++++ /dev/null
+@@ -1,73 +0,0 @@
+-// This is brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
+-//:
+-// \file
+-// \brief A class for obtaining roc curve from change detection results.
+-//
+-// \author Gamze Tunali
+-// \date April 14, 2009
+-
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-namespace boxm_load_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm_load_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_load_scene_process_globals;
+-
+-  //process takes 1 input
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  // process has 1 output:
+-  // output[0]: scene sptr
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_load_scene_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_load_scene_process_globals;
+-
+-  if ( pro.n_inputs() < n_inputs_ ){
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned i = 0;
+-  std::string scene_file = pro.get_input<std::string>(i++);
+-
+-  boxm_scene_base_sptr scene= new boxm_scene_base();
+-  boxm_scene_parser parser;
+-  scene->load_scene(scene_file, parser);
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-    auto *s = new boxm_scene<tree_type>();
+-    s->load_scene(parser);
+-   // scene.unref(scene);
+-    scene = s;
+-  } else {
+-    std::cout << "boxm_load_scene_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  unsigned j = 0;
+-  // store scene smaprt pointer
+-  pro.set_output_val<boxm_scene_base_sptr>(j++, scene);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
+deleted file mode 100644
+index b250a33a61..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
++++ /dev/null
+@@ -1,103 +0,0 @@
+-// This is brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for clipping and image based on a 3D bounding box.
+-//        -  Input:
+-//             - Image path (string)
+-//             - boxm_voxel_world_sptr
+-//
+-//        -  Output:
+-//             - modified rational camera "vpgl_camera_double_sptr"
+-//             - clipped image area (NITF) "vil_image_view_base_sptr"
+-//
+-//        -  Params:
+-//             -geographic uncertainty (error) in meters
+-//
+-// \author  Gamze D. Tunali
+-// \date    Feb 19, 2008
+-// \verbatim
+-//  Modifications
+-//   Brandon Mayer - Jan 28, 2009 - converted process-class to function to conform with new boxm_process architecture.
+-// \endverbatim
+-
+-
+-#include <brip/brip_roi.h>
+-
+-//#include <vil/file_formats/vil_nitf2_image.h> // unused?
+-//#include <vil/vil_image_view_base.h> // unused?
+-#include <vpgl/vpgl_local_rational_camera.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-//: globals variables and functions
+-namespace boxm_proj_local_cam_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-//: set input and output types
+-// this process takes 4 inputs:
+-// the camera and the (x,y,z) input coordinates
+-// this process takes 2 outputs:
+-// the (u,v) output coordinates
+-bool boxm_proj_local_cam_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_proj_local_cam_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned  i=0;
+-  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
+-  input_types_[i++] = "float";   // x
+-  input_types_[i++] = "float";   // y
+-  input_types_[i++] = "float";   // z
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  unsigned j=0;
+-  output_types_[j++] = "float"; // u
+-  output_types_[j++] = "float"; // v
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-bool boxm_proj_local_cam_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_proj_local_cam_process_globals;
+-  //static const parameters
+-  static const std::string error = "error";
+-
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs:
+-  unsigned i = 0;
+-  // camera
+-  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
+-  float X=0.0,Y=0.0,Z=0.0;
+-  //voxel_world
+-  X = pro.get_input<float>(i++);
+-  Y = pro.get_input<float>(i++);
+-  Z = pro.get_input<float>(i++);
+-
+-  auto* rat_camera =
+-    dynamic_cast<vpgl_local_rational_camera<double>*> (camera.as_pointer());
+-  if (!rat_camera) {
+-    std::cerr << "The camera input is not a rational camera\n";
+-    return false;
+-  }
+-
+-  double u=0,v=0;
+-  rat_camera->project((double)X,(double)Y,(double)Z,u,v);
+-  //Store outputs
+-  unsigned j = 0;
+-  // update the camera and store
+-  pro.set_output_val<float>(j++, float(u));
+-  pro.set_output_val<float>(j++, float(v));
+-
+-  std::cout<<"(u,v):"<<u<<','<<v<<std::endl;
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
+deleted file mode 100644
+index 0488a2cbdb..0000000000
+--- a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
++++ /dev/null
+@@ -1,148 +0,0 @@
+-//This is brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <sstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for populating the octree with meshes.
+-//         Meshes are in ply format and the grid will be filled with 0's at the faces
+-//         of the meshes.
+-// \author Gamze D. Tunali
+-// \date   July 14, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/algo/boxm_upload_mesh.h>
+-#include <boxm/algo/boxm_fill_in_mesh.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vul/vul_file.h>
+-#include <vul/vul_string.h>
+-
+-#include <imesh/imesh_mesh.h>
+-#include <imesh/imesh_fileio.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-namespace boxm_upload_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//: set input and output types
+-bool boxm_upload_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_upload_mesh_process_globals;
+-
+-  // process takes 4 inputs and no output
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i=0;
+-  input_types_[i++]="vcl_string";           //the directory for ply files
+-  input_types_[i++]="boxm_scene_base_sptr"; //scene to be uploaded
+-  input_types_[i++]="bool";                 //true, if mesh vertices are in geo coordinates
+-  input_types_[i++]="vcl_string";                 //true, if mesh vertices are in geo coordinates
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: Execute the process
+-bool boxm_upload_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_upload_mesh_process_globals;
+-  // check number of inputs
+-  if (pro.input_types().size() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  unsigned i=0;
+-  std::string input_path = pro.get_input<std::string>(i++);
+-  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bool use_lvcs = pro.get_input<bool>(i++);
+-  std::string draw_or_fill = pro.get_input<std::string>(i++);
+-
+-  if (!vul_file::is_directory(input_path)) {
+-    std::cerr << "In boxm_upload_mesh_process -- input path " << input_path<< "is not valid!\n";
+-    return false;
+-  }
+-
+-  // get all the files in the directory
+-  std::stringstream glob;
+-  glob << input_path << "/*.ply*";
+-
+-  std::vector<imesh_mesh> meshes;
+-  for (vul_file_iterator file_it = glob.str().c_str(); file_it; ++file_it)
+-  {
+-    std::string file(file_it());
+-    std::string file_format = vul_file::extension(file);
+-    vul_string_upcase(file_format);
+-
+-
+-    std::cout << "format = " << file_format << '\n'
+-             << "file = " << file << '\n';
+-    // call appropriate load functions to load the M
+-    imesh_mesh mesh;
+-    if (file_format == ".PLY")
+-      imesh_read(file, mesh);
+-    else if (file_format == ".PLY2")
+-      imesh_read_ply2(file, mesh);
+-
+-    meshes.push_back(mesh);
+-  }
+-  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-
+-      boxm_sample<BOXM_APM_MOG_GREY> val(0,boxm_utils::obtain_mog_grey_unit_mode());
+-      if (draw_or_fill=="draw")
+-        std::cout<<"Not yet";
+-        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
+-      else if (draw_or_fill=="fill")
+-        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, meshes, use_lvcs, val);
+-    }
+-    else
+-      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
+-  }
+-  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
+-    if (!scene->multi_bin())
+-    {
+-      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
+-      boxm_simple_grey simplegrey(1.0f,0.1f,1.0f);
+-      boxm_sample<BOXM_APM_SIMPLE_GREY> val(1,simplegrey);
+-      if (draw_or_fill=="draw")
+-        std::cout<<"Not yet";
+-        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
+-      else if (draw_or_fill=="fill")
+-        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, meshes, use_lvcs, val);
+-    }
+-    else
+-      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
+-  }
+-  else {
+-    std::cout << "boxm_upload_mesh_process: undefined APM type" << std::endl;
+-    return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index f37ad237ce..0000000000
+--- a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_pro_test_include test_include.cxx )
+-target_link_libraries( boxm_pro_test_include boxm_pro)
+diff --git a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
+deleted file mode 100644
+index 7a3d47df60..0000000000
+--- a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/pro/boxm_processes.h>
+-#include <boxm/pro/boxm_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/sample/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/CMakeLists.txt
+deleted file mode 100644
+index 42618cc7ca..0000000000
+--- a/contrib/brl/bseg/boxm/sample/CMakeLists.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# brl/bseg/boxm/sample/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_sample_sources
+-    boxm_edge_sample.h                        boxm_edge_sample.hxx
+-    boxm_edge_tangent_sample.h                boxm_edge_tangent_sample.hxx
+-    boxm_inf_line_sample.h                    boxm_inf_line_sample.hxx
+-    boxm_opt2_sample.h                        boxm_opt2_sample.hxx
+-    boxm_opt3_sample.h                        boxm_opt3_sample.hxx
+-    boxm_plane_obs.h                          boxm_plane_obs.hxx
+-    boxm_rt_sample.h                          boxm_rt_sample.hxx
+-    boxm_sample.h                             boxm_sample.hxx
+-    boxm_sample_multi_bin.h                   boxm_sample_multi_bin.hxx
+-    boxm_scalar_sample.h                      boxm_scalar_sample.hxx
+-    boxm_vis_implicit_sample.h
+-    boxm_update_sample.h
+-    dummy.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_sample_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_sample LIBRARY_SOURCES ${boxm_sample_sources})
+-target_link_libraries(boxm_sample boxm ${VXL_LIB_PREFIX}vgl_io bsta ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-#processors for the samples
+-add_subdirectory(algo)
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index a08cc93e31..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_edge_sample<float>);
+-BOCT_TREE_INSTANTIATE(short,boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index 130866a26d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
+-BOCT_TREE_INSTANTIATE(short,boxm_inf_line_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 8d3ee3d65a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index ca506845c1..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index c1d7480b1c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOB_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 5eaa3da056..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-// tree with alpha and appearance combined
+-BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOG_GREY>);
+-
+-// tree with appearance
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_INSTANTIATE(short, apm_datatype);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+deleted file mode 100644
+index ef07d67c7a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_SIMPLE_GREY>);
+-
+-// tree with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_INSTANTIATE(short, apm_datatype);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index b45fc2a401..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-BOCT_TREE_INSTANTIATE(short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 7c93436b6a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_scalar_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index 8c4d0a0f82..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_sample<float>);
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index 55b487a7aa..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_inf_line_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 39216280e0..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 3d0b6e71a5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index 9a5432b934..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mob_grey );
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 58cc1cfacf..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_CELL_INSTANTIATE(short,apm_datatype );
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
+deleted file mode 100644
+index 28198f869f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_SIMPLE_GREY> boxm_sample_simple_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_simple_grey );
+-
+-// tree with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-BOCT_TREE_CELL_INSTANTIATE(short, apm_datatype);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 1b9ee1e0de..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample_multi_bin.h"
+-
+-typedef boxm_sample_multi_bin<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 78c61bf35e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_scalar_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
+deleted file mode 100644
+index 13ae4934e9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boxm_edge_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+-
+-typedef boxm_aux_edge_sample<float> aux_sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index 3744b8ee6f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-
+-typedef boxm_edge_tangent_sample<float> aux_sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
+deleted file mode 100644
+index 08ad36f2ea..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boxm_inf_line_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 18262443a5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-typedef boxm_opt2_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 1784facefe..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-typedef boxm_rt_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
+deleted file mode 100644
+index 83cf840aa8..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mob_grey);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 68c063579f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include "boxm/boxm_apm_traits.h"
+-#include "boxm/sample/boxm_sample.h"
+-
+-typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mog_grey);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 81c19507f9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-typedef boxm_scalar_sample<float> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
+deleted file mode 100644
+index 5e771c97e2..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_edge_sample<float>,boxm_aux_edge_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index a73d09d6f5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_inf_line_sample<float>,boxm_edge_tangent_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index c134345620..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index b8aa7777ee..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 918a3be765..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
+deleted file mode 100644
+index 70bf413567..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
+deleted file mode 100644
+index 6a0f7d745c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt2_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
+deleted file mode 100644
+index 03014e67ab..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_rt_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
+deleted file mode 100644
+index 1b75036c3b..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_scalar_sample<float>);
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_scalar_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
+deleted file mode 100644
+index a27805ad73..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
+deleted file mode 100644
+index dc6a48e38b..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,float,boxm_edge_tangent_sample<float>);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index c814f6a8fe..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
+-BOXM_BLOCK_INSTANTIATE(aux_tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index 802a8ca615..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
+deleted file mode 100644
+index 9ef6e210dd..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
+deleted file mode 100644
+index dc6e57af68..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-typedef boct_tree<short,boxm_opt2_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
+deleted file mode 100644
+index ef11cd85a7..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-typedef boct_tree<short,boxm_rt_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index 647e553d5e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index b5e4f8cce0..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index 5a2482adbc..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-
+-// block with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_BLOCK_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 6e13f9977a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
+deleted file mode 100644
+index 0348b21996..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-typedef boct_tree<short,boxm_scalar_sample<float> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index 0b79668c5f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_edge_sample<float> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boct_tree<short,boxm_aux_edge_sample<float> >  aux_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index ea335e591d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_edge_tangent_sample<float> >  aux_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
+-
+-typedef boct_tree<short,boxm_inf_line_sample<float> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index 7c96bfeeee..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 052fa82c04..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index a9d55be913..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-
+-// block iterator with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 25f9ca6e61..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
+deleted file mode 100644
+index d68f374c40..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/sample/boxm_edge_sample.hxx>
+-
+-BOXM_EDGE_SAMPLE_INSTANTIATE(float);
+-BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
+deleted file mode 100644
+index a00d2268b5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_edge_tangent_sample.hxx>
+-
+-BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
+deleted file mode 100644
+index f957308804..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_inf_line_sample.hxx>
+-
+-BOXM_INF_LINE_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
+deleted file mode 100644
+index 66ceeacd2d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/sample/boxm_opt2_sample.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_OPT2_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
+deleted file mode 100644
+index c6e45bdcca..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_plane_obs.hxx>
+-
+-BOXM_PLANE_OBS_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
+deleted file mode 100644
+index 1fc6db3c56..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_rt_sample.hxx>
+-
+-BOXM_RT_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
+deleted file mode 100644
+index 4ee2f52816..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_beta.h>
+-
+-BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOB_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index d1054422d9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <bsta/io/bsta_io_mixture.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-
+-BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
+deleted file mode 100644
+index e3c225ae4d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.hxx>
+-
+-BOXM_SAMPLE_INSTANTIATE(BOXM_APM_SIMPLE_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index 4e2b56c696..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample_multi_bin.hxx>
+-
+-BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
+deleted file mode 100644
+index a9552e4b00..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm/sample/boxm_scalar_sample.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOXM_SCALAR_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
+deleted file mode 100644
+index 4fd83d2d66..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+-
+-typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
+-BOXM_SCENE_INSTANTIATE(aux_tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
+deleted file mode 100644
+index 882f421e87..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boct_tree<short,boxm_edge_tangent_sample<float> > aux_tree;
+-BOXM_SCENE_INSTANTIATE(aux_tree);
+-
+-typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
+deleted file mode 100644
+index dfec334150..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-
+-typedef boct_tree<short,boxm_opt2_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
+deleted file mode 100644
+index cd3c475545..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-
+-typedef boct_tree<short,boxm_rt_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
+deleted file mode 100644
+index db72e7c8ea..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 6d21678187..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_SCENE_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
+deleted file mode 100644
+index 52e5afb01c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-
+-// scene with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-BOXM_SCENE_INSTANTIATE(apm_tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index 262d6e4f89..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
+-BOXM_SCENE_INSTANTIATE(tree_type);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
+deleted file mode 100644
+index 4a2c0c7437..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-typedef boct_tree<short,boxm_scalar_sample<float> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
+deleted file mode 100644
+index b727cb7d12..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.hxx>
+-
+-typedef boct_tree<short,int > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
+deleted file mode 100644
+index fc06a01419..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-typedef boct_tree<short, boxm_aux_edge_sample<float> > aux_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
+deleted file mode 100644
+index 0b4f55a413..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_edge_tangent_sample<float> > aux_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
+-
+-typedef boct_tree<short, boxm_inf_line_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
+deleted file mode 100644
+index 1372664c8c..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_opt2_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
+deleted file mode 100644
+index 5409ed1d26..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_rt_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
+deleted file mode 100644
+index 3508b23e74..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
+deleted file mode 100644
+index 9676fc11a4..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
+deleted file mode 100644
+index e8c9902c7e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample.h>
+-
+-typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+-
+-// scene with appearance
+-typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-typedef boct_tree<short,apm_datatype >  apm_tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
+deleted file mode 100644
+index 4cadf24760..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-
+-typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
+deleted file mode 100644
+index f013383f50..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#include <boct/boct_tree.h>
+-
+-typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
+deleted file mode 100644
+index 116b748109..0000000000
+--- a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <vil/vil_image_view.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-typedef boxm_inf_line_sample<float> sample;
+-VIL_IMAGE_VIEW_INSTANTIATE(sample);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
+deleted file mode 100644
+index c758e9f2a4..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
++++ /dev/null
+@@ -1,18 +0,0 @@
+-# brl/bseg/boxm/util/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_sample_algo_sources
+-    boxm_mob_grey_processor.h        boxm_mob_grey_processor.cxx
+-    boxm_mog_grey_processor.h        boxm_mog_grey_processor.cxx
+-    boxm_simple_grey_processor.h     boxm_simple_grey_processor.cxx
+-    boxm_sigma_normalizer.h          boxm_sigma_normalizer.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_sample_algo_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_sample_algo LIBRARY_SOURCES ${boxm_sample_algo_sources})
+-
+-target_link_libraries(boxm_sample_algo boxm_sample boxm boxm_util bsta bsta_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vbl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 994d8628d9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOCT_TREE_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 10fc203f38..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boct/boct_tree_cell.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index b5be45d2b1..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree_cell_reader.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boxm_opt3_sample<BOXM_APM_MOG_GREY> sample;
+-BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 0772000b0d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
+deleted file mode 100644
+index 00af986d6d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/boxm_aux_scene.hxx>
+-
+-BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index b4aef87f19..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
+-BOXM_BLOCK_INSTANTIATE(tree);
+-
+-#include <boxm/boxm_scene.hxx>
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
+deleted file mode 100644
+index c67fd5c479..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/sample/boxm_opt3_sample.hxx>
+-
+-BOXM_OPT3_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
+deleted file mode 100644
+index e0c8931986..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <boxm/boxm_scene.hxx>
+-#include <boct/boct_tree.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
+-BOXM_SCENE_INSTANTIATE(tree);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
+deleted file mode 100644
+index 0bf4864b81..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vbl/vbl_array_3d.hxx>
+-#include <vgl/io/vgl_io_point_3d.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-typedef boct_tree<short, boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree_type;
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
+deleted file mode 100644
+index e93ea9b17a..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-#include "boxm_mob_grey_processor.h"
+-//:
+-// \file
+-#include <bsta/algo/bsta_beta_updater.h>
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_beta.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_beta_f1.h>
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: Expected value
+-boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype
+-boxm_mob_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype const& appear)
+-{
+-  float total_weight= 0;
+-  obs_datatype c = 0;
+-  obs_datatype expected = 0;
+-
+-  //should be components used
+-  for (unsigned i = 0; i< appear.num_components(); ++i)
+-  {
+-    total_weight += appear.weight(i);
+-    c += appear.distribution(i).mean() * appear.weight(i);
+-  }
+-  if (total_weight > 0.0f) {
+-    expected = c/total_weight;
+-  }
+-
+-  return expected;
+-}
+-//: Return probability density of observing pixel values
+-float boxm_mob_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
+-{
+-  if (appear.num_components() ==0) {
+-    return 1.00f;
+-  }
+-  else {
+-    return appear.prob_density(obs);
+-  }
+-}
+-
+-//: Update with a new sample image
+-bool boxm_mob_grey_processor::update( apm_datatype &appear,
+-                                      obs_datatype const& obs,
+-                                      float const& weight)
+-{
+-  // the model
+-  float init_variance = 0.008f;
+-  float g_thresh = 0.025f; // number of std devs from mean sample must be
+-
+-  //float t_l_u = float(std::sqrt(1-4*init_variance)*0.5);
+-  //float lower = 0.5f-t_l_u;
+-  //float upper = 0.5f+t_l_u;
+-
+-  obs_datatype val = obs;
+-  //if (obs < lower)
+-  //  val = lower+0.000001f;
+-  //else if (obs > upper)
+-  //  val = upper-0.000001f;
+-
+-  float alpha, beta;
+-  bsta_beta<float>::bsta_beta_from_moments(val, init_variance,alpha,beta);
+-  bsta_beta_f1 this_beta(alpha,beta);
+-
+-  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOB_GREY>::n_beta_modes_;
+-
+-  typedef bsta_num_obs<bsta_beta_f1> beta_type;
+-  typedef bsta_mixture_fixed<beta_type, nmodes> mix_beta;
+-
+-  // the updater
+-  bsta_mix_beta_updater<mix_beta> updater(this_beta, g_thresh, init_variance, nmodes );
+-
+-  if (weight > 0) {
+-    updater(appear, obs);
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
+deleted file mode 100644
+index 8c6c4b46d8..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
++++ /dev/null
+@@ -1,35 +0,0 @@
+-// This is brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
+-#ifndef boxm_mob_grey_processor_h_
+-#define boxm_mob_grey_processor_h_
+-//:
+-// \file
+-// \brief A class for a grey-scale-mixture-of-beta processor
+-//
+-// \author Gamze Tunali
+-// \date   Nov 24, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-
+-class  boxm_mob_grey_processor
+-{
+- protected:
+-  // convenience typedefs
+-  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype apm_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype obs_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_mathtype obs_mathtype;
+-
+- public:
+-  static obs_datatype expected_color(apm_datatype const& appear);
+-  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
+-  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
+-};
+-
+-#endif // boxm_mob_grey_processor_h_
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
+deleted file mode 100644
+index 7c7e011b07..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
++++ /dev/null
+@@ -1,286 +0,0 @@
+-#include "boxm_mog_grey_processor.h"
+-//:
+-// \file
+-#include <bsta/algo/bsta_adaptive_updater.h>
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gaussian_indep.h>
+-#include <bsta/algo/bsta_fit_gaussian.h>
+-
+-#include <vnl/vnl_random.h>
+-
+-#include "boxm_sigma_normalizer.h"
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: Expected value
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
+-boxm_mog_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear)
+-{
+-  float total_weight= 0;
+-  obs_datatype c = 0;
+-  obs_datatype expected = 0;
+-
+-  //should be components used
+-  for (unsigned i = 0; i< appear.num_components(); ++i)
+-  {
+-    total_weight += appear.weight(i);
+-    c += appear.distribution(i).mean() * appear.weight(i);
+-  }
+-  if (total_weight > 0.0f) {
+-    expected = c/total_weight;
+-  }
+-
+-  return expected;
+-}
+-
+-//: Return a random sample from the appearance distribution
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
+-boxm_mog_grey_processor::sample(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear, vnl_random &rand_gen)
+-{
+-  return appear.sample(rand_gen);
+-}
+-
+-
+-//: Return probability density of observing pixel values
+-float boxm_mog_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
+-{
+-  if (appear.num_components() ==0) {
+-    return 1.00f;
+-  }
+-  else {
+-    return appear.prob_density(obs);
+-  }
+-}
+-
+-//: Update with a new sample image
+-bool boxm_mog_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& weight)
+-{
+-  // the model
+-  float init_variance = 0.008f;
+-  float min_stddev = 0.030f; //TO UNDERSTAND: changed from 0.02 for dinoRing dataset -dec
+-  float g_thresh = 2.5; // number of std devs from mean sample must be
+-  bsta_gauss_sf1 this_gauss(0.0f, init_variance);
+-
+-  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
+-
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-  typedef bsta_mixture_fixed<gauss_type, nmodes> mix_gauss;
+-
+-  // the updater
+-  bsta_mg_grimson_weighted_updater<mix_gauss> updater(this_gauss, nmodes ,g_thresh,min_stddev);
+-
+-  if (weight > 0) {
+-    updater(appear, obs, weight);
+-  }
+-
+-  return true;
+-}
+-
+-void boxm_mog_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  std::vector<float> pre(obs.size(),0.0f);
+-  compute_appearance(obs,pre,obs_weights,model,min_sigma);
+-  return;
+-}
+-
+-void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  std::vector<float> pre(obs.size(),0.0f);
+-  compute_appearance(obs,pre,obs_weights,model,min_sigma);
+-  return;
+-}
+-
+-void boxm_mog_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs,
+-                                                  std::vector<float> const&  /*obs_weights*/, // FIXME - unused
+-                                                  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model,
+-                                                  float min_sigma)
+-{
+-  static const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
+-  const auto nobs = (unsigned int)obs.size();
+-  const float min_var = min_sigma*min_sigma;
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-  const float big_var = big_sigma * big_sigma;
+-
+-  static boxm_sigma_normalizer sigma_norm(0.1f);
+-  for (unsigned int m=0; m<nmodes; ++m) {
+-    //float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
+-    float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
+-
+-    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
+-    float mode_var = model.distribution(m).var();
+-    mode_var *= (unbias_factor*unbias_factor);
+-
+-    // make sure variance does not get too big
+-    if (!(mode_var < big_var)) {
+-      mode_var = big_var;
+-    }
+-    // or too small
+-    if (!(mode_var > min_var)) {
+-      mode_var = min_var;
+-    }
+-    model.distribution(m).set_var(mode_var);
+-  }
+-  return;
+-}
+-
+-void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  static const unsigned int max_nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
+-  const float min_var = min_sigma*min_sigma;
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-  const float big_var = big_sigma * big_sigma;
+-
+-  auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  if (nobs == 1) {
+-    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
+-    bsta_gauss_sf1 mode(obs[0], big_sigma*big_sigma);
+-    model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), 1.0f);
+-    return;
+-  }
+-
+-  unsigned int nmodes = model.num_components();
+-
+-  if (nmodes == 0) {
+-    // if initial model is "blank", create an arbitrary starting point for the optimization with max number of modes
+-    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
+-    nmodes = max_nmodes;
+-    // no need for model to have more modes than observations
+-    if (nobs < nmodes) {
+-      nmodes = nobs;
+-    }
+-    // initialize parameters
+-    for (unsigned int m=0; m<nmodes; ++m) {
+-      float mean = (float(m) + 0.5f) / float(nmodes);
+-      float sigma = 0.3f;
+-      float mode_weight = 1.0f / float(nmodes);
+-      bsta_gauss_sf1 mode(mean, sigma*sigma);
+-      model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), mode_weight);
+-    }
+-  }
+-
+-  std::vector<std::vector<float> > mode_probs(nobs);
+-  for (unsigned int n=0; n<nobs; ++n) {
+-    for (unsigned int m=0; m<nmodes; ++m) {
+-      mode_probs[n].push_back(0.0f);
+-    }
+-  }
+-  std::vector<float> mode_weight_sum(nmodes,0.0f);
+-
+-  // run EM algorithm to maximize expected probability of observations
+-  constexpr unsigned int max_its = 50;
+-  const float max_converged_weight_change = 1e-3f;
+-
+-  for (unsigned int i=0; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION
+-    for (unsigned int n=0; n<nobs; ++n) {
+-      // for each observation, assign probabilities to each mode of appearance model (and to a "previous cell")
+-      float total_prob = 0.0f;
+-      std::vector<float> new_mode_probs(nmodes);
+-      for (unsigned int m=0; m<nmodes; ++m) {
+-        // compute probability that nth data point was produced by mth mode
+-        const float new_mode_prob = vis[n] * model.distribution(m).prob_density(obs[n]) * model.weight(m);
+-        new_mode_probs[m] = new_mode_prob;
+-        total_prob += new_mode_prob;
+-      }
+-      // compute the probability the observation came from an occluding cell
+-      const float prev_prob = pre[n];
+-      total_prob += prev_prob;
+-      if (total_prob > 1e-6) {
+-        for (unsigned int m=0; m<nmodes; ++m) {
+-          new_mode_probs[m] /= total_prob;
+-          const float weight_change = std::fabs(new_mode_probs[m] - mode_probs[n][m]);
+-          if (weight_change > max_weight_change) {
+-            max_weight_change = weight_change;
+-          }
+-          mode_probs[n][m] = new_mode_probs[m];
+-        }
+-      }
+-    }
+-    // check for convergence
+-    if (max_weight_change < max_converged_weight_change) {
+-      break;
+-    }
+-    // MAXIMIZATION
+-    // computed the weighted means and variances for each mode based on the probabilities
+-    float total_weight_sum = 0.0f;
+-
+-    // update the mode parameters
+-    for (unsigned int m=0; m<nmodes; ++m) {
+-      mode_weight_sum[m] = 0.0f;
+-      std::vector<float> obs_weights(nobs);
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        obs_weights[n] = mode_probs[n][m];
+-        mode_weight_sum[m] += obs_weights[n];
+-      }
+-      total_weight_sum += mode_weight_sum[m];
+-      float mode_mean(0.5f);
+-      float mode_var(1.0f);
+-      bsta_gauss_sf1 single_gauss(mode_mean,mode_var);
+-      bsta_fit_gaussian(obs, obs_weights, single_gauss);
+-      mode_mean = single_gauss.mean();
+-      mode_var = single_gauss.var();
+-
+-      // unbias variance based on number of observations
+-      //float unbias_factor = sigma_norm_factor(mode_weight_sum[m]);
+-      // mode_var *= (unbias_factor*unbias_factor);
+-
+-      // make sure variance does not get too big
+-      if (!(mode_var < big_var)) {
+-        mode_var = big_var;
+-      }
+-      // or too small
+-      if (!(mode_var > min_var)) {
+-        mode_var = min_var;
+-      }
+-
+-      // update mode parameters
+-      model.distribution(m).set_mean(mode_mean);
+-      model.distribution(m).set_var(mode_var);
+-    }
+-    // update mode probabilities
+-    if (total_weight_sum > 1e-6) {
+-      for (unsigned int m=0; m<nmodes; ++m) {
+-        const float mode_weight = mode_weight_sum[m] / total_weight_sum;
+-        // update mode weight
+-        model.set_weight(m, mode_weight);
+-      }
+-    }
+-  }
+-
+-  // unbias variance based on number of observations
+-  static const boxm_sigma_normalizer sigma_norm(0.20f);
+-  for (unsigned int m=0; m<nmodes; ++m) {
+-    float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
+-    //float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
+-    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
+-
+-    float mode_var = model.distribution(m).var();
+-    mode_var *= (unbias_factor*unbias_factor);
+-
+-    // make sure variance does not get too big
+-    if (!(mode_var < big_var)) {
+-      mode_var = big_var;
+-    }
+-    // or too small
+-    if (!(mode_var > min_var)) {
+-      mode_var = min_var;
+-    }
+-    model.distribution(m).set_var(mode_var);
+-  }
+-
+-  // sort the modes based on weight
+-  model.sort();
+-
+-  return;
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
+deleted file mode 100644
+index b4d64bc6ad..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
++++ /dev/null
+@@ -1,50 +0,0 @@
+-// This is brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
+-#ifndef boxm_mog_grey_processor_h_
+-#define boxm_mog_grey_processor_h_
+-//:
+-// \file
+-// \brief A class for a grey-scale-mixture-of-gaussian processor
+-//
+-// \author Gamze Tunali
+-// \date   Apr 03, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bsta/algo/bsta_adaptive_updater.h>
+-#include <bsta/bsta_distribution.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gaussian_indep.h>
+-
+-#include <vnl/vnl_random.h>
+-
+-#include <boxm/boxm_apm_traits.h>
+-
+-
+-class  boxm_mog_grey_processor
+-{
+- protected:
+-  // convienance typedefs
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype obs_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype obs_mathtype;
+-
+- public:
+-  static obs_datatype expected_color(apm_datatype const& appear);
+-
+-  static obs_datatype sample(apm_datatype const& appear, vnl_random &rand_gen);
+-
+-  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
+-
+-  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
+-
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-};
+-
+-#endif // boxm_mog_grey_processor_h_
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
+deleted file mode 100644
+index b88fd5c03d..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
++++ /dev/null
+@@ -1,104 +0,0 @@
+-#include <iostream>
+-#include "boxm_sigma_normalizer.h"
+-//:
+-// \file
+-// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_gamma.h>
+-#include <vnl/vnl_least_squares_function.h>
+-#include <vnl/algo/vnl_levenberg_marquardt.h>
+-
+-boxm_sigma_normalizer::boxm_sigma_normalizer(float under_estimation_probability) : unbias_const_(N_PRECOMPUTED_+1, 0.0f)
+-{
+-  class gammainc_error_fn : public vnl_least_squares_function
+-  {
+-   public:
+-    gammainc_error_fn(unsigned int ndof, float under_estimation_prob) : vnl_least_squares_function(1,1,no_gradient), ndof_(ndof), p_(under_estimation_prob) {}
+-
+-    void f(vnl_vector<double> const& x, vnl_vector<double>& fx) override
+-    {
+-      // don't allow x to become negative
+-      if (x[0] < 0.0f) {
+-        fx[0] = x[0] - p_; // so error function is c0 continuous at x=0
+-        return;
+-      }
+-      double cdf_prob = vnl_cum_prob_chi2(ndof_, x[0]);
+-      fx[0] = cdf_prob - p_;
+-      return;
+-    }
+-   private:
+-    unsigned int ndof_;
+-    float p_;
+-  };
+-
+-  // sanity check on probability
+-  if (under_estimation_probability < 1e-4) {
+-    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too low" << std::endl;
+-    return;
+-  }
+-  if (under_estimation_probability > (1 - 1e-4)) {
+-    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too high" << std::endl;
+-    return;
+-  }
+-
+-  // populate array of normalization factors for easy lookup
+-  vnl_vector_fixed<double,1> x(1.0);
+-
+-  for (unsigned int n=2; n<= N_PRECOMPUTED_; ++n) {
+-    gammainc_error_fn f(n-1, under_estimation_probability);
+-    vnl_levenberg_marquardt minimizer(f);
+-    minimizer.set_f_tolerance(1e-8);
+-    minimizer.set_x_tolerance(1e-8);
+-
+-    minimizer.minimize(x);
+-    //minimizer.diagnose_outcome();
+-    double end_error = minimizer.get_end_error();
+-    if (end_error > 1e-3) {
+-      std::cerr << "error: boxm_sigma_normalizer: levenberg_marquardt final error = " << end_error << '\n';
+-    }
+-    auto unbias_constant = (float)std::sqrt((float)(n-1) / x[0]);
+-
+-    unbias_const_[n] = unbias_constant;
+-  }
+-  // sigma is undefined for samples sizes of 0 and 1, but we can linearly interpolate to get values anyway
+-  unbias_const_[1] = unbias_const_[2] - (unbias_const_[3] - unbias_const_[2]);
+-  unbias_const_[0] = unbias_const_[1] - (unbias_const_[2] - unbias_const_[1]);
+-}
+-
+-
+-float boxm_sigma_normalizer::normalization_factor(float number_of_observations) const
+-{
+-  if (number_of_observations <= 1.0f) {
+-    return normalization_factor_int((unsigned int)1);
+-  }
+-
+-  // linearly interpolate between integer values
+-  float nobs_floor = std::floor(number_of_observations);
+-  float nobs_ceil = std::ceil(number_of_observations);
+-  float floor_weight = nobs_ceil - number_of_observations;
+-  float norm_factor = (normalization_factor_int((unsigned int)nobs_floor) * floor_weight) + (normalization_factor_int((unsigned int)nobs_ceil) * (1.0f - floor_weight));
+-
+-  return norm_factor;
+-}
+-
+-
+-float boxm_sigma_normalizer::normalization_factor_int(unsigned int number_of_observations) const
+-{
+-  if (number_of_observations < 2) {
+-    return unbias_const_[1];
+-  }
+-
+-  if (number_of_observations <= N_PRECOMPUTED_) {
+-    return unbias_const_[number_of_observations];
+-  }
+-  // else nobs >= N_PRECOMPUTED_
+-  // approximate for big n with function a = m /nobs + b
+-  static const float m = (unbias_const_[N_PRECOMPUTED_] - unbias_const_[N_PRECOMPUTED_ - 5])/(1.0f/N_PRECOMPUTED_ - 1.0f/(N_PRECOMPUTED_ - 5));
+-  static const float b = unbias_const_[N_PRECOMPUTED_]  - m*(1.0f/N_PRECOMPUTED_);
+-  return m/number_of_observations + b;
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
+deleted file mode 100644
+index aafb71a2c2..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// this is brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
+-#ifndef boxm_sigma_normalizer_h_
+-#define boxm_sigma_normalizer_h_
+-//:
+-// \file
+-// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
+-//
+-// \author Daniel Crispell
+-// \date   Feb. 18, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class boxm_sigma_normalizer
+-{
+- public:
+-  //: create a sigma_normalizer object.
+-  boxm_sigma_normalizer(float under_estimation_probability);
+-
+-  //: compute the normalization factor for a sample distribution computing with N observations
+-  // \a sigma_norm = sample_sigma * normalization_factor(N);
+-  float normalization_factor(float number_of_observations) const;
+-
+-  //: compute the normalization factor for a sample distribution computed with N observations
+-  // \a sigma_norm = sample_sigma * normalization_factor(N);
+-  float normalization_factor_int(unsigned int number_of_observations) const;
+-
+- private:
+-  // do not allow default constructor - under-estimation param is necessary
+-  boxm_sigma_normalizer()= default;
+-
+-  static const unsigned int N_PRECOMPUTED_ = 40;
+-  std::vector<float> unbias_const_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
+deleted file mode 100644
+index b1d9e4639b..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
++++ /dev/null
+@@ -1,437 +0,0 @@
+-#include "boxm_simple_grey_processor.h"
+-//:
+-// \file
+-
+-#include <vnl/vnl_erf.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/algo/bsta_fit_gaussian.h>
+-
+-#include "boxm_sigma_normalizer.h"
+-
+-//const float boxm_simple_grey_processor::one_over_sigma_ = 25.0f;
+-const static bool USE_UNIFORM_COMPONENT = false;
+-
+-//: Return probability density of observing pixel values
+-float boxm_simple_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
+-{
+-  const auto norm =  float(appear.one_over_sigma() * vnl_math::one_over_sqrt2pi);
+-  const float diff = obs - appear.color();
+-  const float p = norm * std::exp(-(diff*diff)*appear.one_over_sigma()*appear.one_over_sigma()*0.5f);
+-  // normalize by area of distribution between 0 and 1
+-  //return p / total_prob(appear);
+-  return p * appear.gauss_weight() + (1.0f - appear.gauss_weight());
+-}
+-
+-//: Return probabilities that pixels are in range [min,max]
+-float boxm_simple_grey_processor::prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max)
+-{
+-  // make sure obs_min and obs_max are within bounds
+-  const float obs_min_n = obs_min >= 0 ? obs_min : 0.0f;
+-  const float obs_max_n = obs_max <= 1.0? obs_max : 1.0f;
+-
+-  const float diff_low = obs_min_n - appear.color();
+-  const float diff_high = obs_max_n - appear.color();
+-  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
+-
+-  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
+-  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
+-  const float P = (0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1));
+-  //return P / total_prob(appear);
+-  return P * appear.gauss_weight() + (1.0f - appear.gauss_weight())*(obs_max - obs_min);
+-}
+-
+-//: Return probabilities that pixels are in range [0,1] - used for normalizing
+-float boxm_simple_grey_processor::total_prob(apm_datatype const& appear)
+-{
+-  const float diff_low =  -appear.color();
+-  const float diff_high = 1.0f - appear.color();
+-  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
+-  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
+-  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
+-  return 0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1);
+-}
+-
+-
+-//: Update with a new sample image
+-bool boxm_simple_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& /*weight*/)
+-{
+-  appear = boxm_simple_grey(vnl_vector_fixed<float,3>(obs, appear.sigma(), appear.gauss_weight()));
+-  return true;
+-}
+-
+-
+-//: Expected value
+-boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype boxm_simple_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear)
+-{
+-  return appear.color() * appear.gauss_weight() + 0.5f * (1.0f - appear.gauss_weight());
+-}
+-
+-//: color of the most probable mode in the mixtures in the slab
+-boxm_simple_grey_processor::obs_datatype boxm_simple_grey_processor::most_probable_color(apm_datatype const& appear)
+-{
+-  return appear.color();
+-}
+-
+-void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  bsta_gauss_sf1 model_bsta(model.color(),model.sigma()*model.sigma());
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-  auto nobs = (unsigned int)obs.size();
+-  // check for some simple cases first
+-  if (nobs == 0) {
+-    // zero observations. nothing to do here.
+-    model = boxm_simple_grey(0.5f, big_sigma);
+-    return;
+-  }
+-  if (nobs == 1) {
+-    // one observation: Just return the value as the mean, and a big sigma.
+-    model = boxm_simple_grey(obs[0], big_sigma);
+-    return;
+-  }
+-  //std::cout << "nobs = " << obs.size() << std::endl;
+-  //for (unsigned int i=0; i<obs.size(); ++i) {
+-  //  std::cout << "obs=" << obs[i] << " vis=" << vis[i] << "pre=" << pre[i] << std::endl;
+-  //}
+-  const float min_var_EM = 1.5e-5f; // to prevent degenerate solution (corresponds roughly to sigma = 1/255)
+-  bsta_fit_gaussian(obs,vis,pre,model_bsta,min_var_EM);
+-  // compute expected number of observations
+-  float expected_nobs = 0.0f;
+-  for (float vi : vis) {
+-    expected_nobs += vi;
+-  }
+-  // normalize sigma
+-  static const boxm_sigma_normalizer sigma_norm(0.20f);
+-  const float norm_factor = sigma_norm.normalization_factor(expected_nobs);
+-  //const float norm_factor = 1.0f;
+-  float sigma = std::sqrt(model_bsta.var()) * norm_factor;
+-
+-  // bounds check on std. deviation value
+-  if (sigma < min_sigma) {
+-    sigma = min_sigma;
+-  }
+-  if (sigma > big_sigma) {
+-    sigma = big_sigma;
+-  }
+-  if (!(sigma < big_sigma) && !(sigma > min_sigma)) {
+-    std::cerr << "error: sigma = " << sigma << " model_bsta.var() = " << model_bsta.var() << std::endl;
+-    sigma = big_sigma;
+-  }
+-  // convert back to a boxm_simple_grey model
+-  model = boxm_simple_grey(model_bsta.mean(),sigma);
+-  return;
+-}
+-
+-void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-
+-  const auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // zero observations. nothing to do here.
+-    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.5f, 1.0f, 0.0f);
+-    return;
+-  }
+-  if (nobs == 1) {
+-    // one observation: Just return the value as the mean, and a big sigma.
+-    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma, weights[0]);
+-    return;
+-  }
+-  else {
+-    // compute estimate of gaussian parameters
+-    // Initialize the estimates
+-    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
+-    float sigma_est = 0.0f;
+-
+-    compute_gaussian_params(obs, weights, mean_est, sigma_est);
+-    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype gauss_model(mean_est, sigma_est, 1.0f);
+-
+-    sigma_est *= sigma_norm_factor(nobs);
+-
+-    // make sure standard deviation is not too small
+-    if (sigma_est < min_sigma) {
+-      sigma_est = min_sigma;
+-    }
+-    // or too big
+-    if (sigma_est > big_sigma) {
+-      sigma_est = big_sigma;
+-    }
+-
+-    // compute estimate of gaussian weight by summing probabilities
+-    float gauss_weight = 0.0f;
+-    if (USE_UNIFORM_COMPONENT) {
+-      float weight_sum = 0.0f;
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        const float p_gauss = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(gauss_model,obs[n]);
+-        const float p_uniform = 1.0f;
+-        gauss_weight += weights[n] * p_gauss / (p_gauss + p_uniform);
+-        weight_sum += weights[n];
+-      }
+-      if (weight_sum > 0.0f) {
+-        gauss_weight /= weight_sum;
+-      }
+-    }
+-    else {
+-      gauss_weight = 1.0f;
+-    }
+-
+-    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
+-  }
+-}
+-
+-
+-void boxm_simple_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
+-{
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-
+-  const auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // zero observations. nothing to do here.
+-    return;
+-  }
+-  if (nobs == 1) {
+-    // one observation: Just return the value as the mean, and a big sigma.
+-    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma);
+-    return;
+-  }
+-  else {
+-    // compute estimate of gaussian weight by summing probabilities
+-    std::vector<float> obs_gauss_weights = weights;
+-    float gauss_weight = 0.0f;
+-    float expected_nobs = 0.0f;
+-    if (USE_UNIFORM_COMPONENT) {
+-      float weight_sum = 0.0f;
+-
+-      for (unsigned int n=0; n<nobs; ++n) {
+-        const float p_total = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(model,obs[n]);
+-        const float p_uniform = 1.0f - model.gauss_weight();
+-        const float p_gauss = p_total - p_uniform;
+-        if (p_total > 0.0f) {
+-          obs_gauss_weights[n] = weights[n] * p_gauss / p_total;
+-        }
+-        else {
+-          obs_gauss_weights[n] = 0.0f;
+-        }
+-        gauss_weight += obs_gauss_weights[n];
+-        weight_sum += weights[n];
+-      }
+-      if (weight_sum > 0.0f) {
+-        gauss_weight /= weight_sum;
+-      }
+-      expected_nobs = weight_sum;
+-    }
+-    else {
+-      auto wit = weights.begin();
+-      for (; wit != weights.end(); ++wit) {
+-        expected_nobs += *wit;
+-      }
+-      gauss_weight = 1.0f;
+-    }
+-    // Initialize the estimates
+-    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
+-    float sigma_est = 0.0f;
+-
+-    compute_gaussian_params(obs, obs_gauss_weights, mean_est, sigma_est);
+-
+-    //sigma_est *= sigma_norm_factor(nobs);
+-
+-    // make sure standard deviation is not too small
+-    if (sigma_est < min_sigma) {
+-      sigma_est = min_sigma;
+-    }
+-    // or too big
+-    if (sigma_est > big_sigma) {
+-      sigma_est = big_sigma;
+-    }
+-
+-    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
+-  }
+-  return;
+-}
+-
+-void boxm_simple_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
+-                                                     std::vector<float> const& weights,
+-                                                     boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model)
+-{
+-  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
+-
+-  float expected_nobs = 0.0f;
+-    const auto nobs = (unsigned int)obs.size();
+-
+-  auto wit = weights.begin();
+-  for (; wit != weights.end(); ++wit) {
+-    expected_nobs += *wit;
+-  }
+-
+-  //float unbiased_sigma = model.sigma() * sigma_norm_factor(expected_nobs);
+-  float unbiased_sigma = model.sigma() * sigma_norm_factor(nobs);
+-  if (unbiased_sigma > big_sigma) {
+-    unbiased_sigma = big_sigma;
+-  }
+-
+-
+-  model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(model.color(), unbiased_sigma, model.gauss_weight());
+-}
+-
+-
+-void boxm_simple_grey_processor::compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma)
+-{
+-  const auto nobs = (unsigned int)obs.size();
+-  double w_sum = 0.0;
+-  double w2_sum = 0.0;
+-  double obs_sum = 0.0;
+-
+-  for (unsigned int i=0; i<nobs; ++i) {
+-    w_sum += weights[i];
+-    w2_sum += weights[i]*weights[i];
+-    obs_sum += obs[i] * weights[i];
+-  }
+-  double mean_obs = 0.5f;
+-  if (w_sum > 0) {
+-    mean_obs = obs_sum / w_sum;
+-  }
+-
+-  double var_sum = 0.0;
+-  for (unsigned int i=0; i<nobs; ++i) {
+-    const double diff = obs[i] - mean_obs;
+-    var_sum += diff*diff*weights[i];
+-  }
+-  double var = 1.0f;
+-  if (w_sum > 0) {
+-    var = var_sum / (w_sum - (w2_sum/w_sum));
+-  }
+-
+-  mean = (float)mean_obs;
+-  sigma = (float)std::sqrt(var);
+-}
+-
+-float boxm_simple_grey_processor::sigma_norm_factor(float nobs)
+-{
+-  if (nobs <= 1.0f) {
+-    return sigma_norm_factor((unsigned int)1);
+-  }
+-
+-  // linearly interpolate between integer values
+-  float nobs_floor = std::floor(nobs);
+-  float nobs_ceil = std::ceil(nobs);
+-  float floor_weight = nobs_ceil - nobs;
+-  float norm_factor = (sigma_norm_factor((unsigned int)nobs_floor) * floor_weight) + (sigma_norm_factor((unsigned int)nobs_ceil) * (1.0f - floor_weight));
+-
+-  return norm_factor;
+-}
+-
+-float boxm_simple_grey_processor::sigma_norm_factor(unsigned int nobs)
+-{
+-  static const float unbias_const[] = {0, 1e3f, 7.9057f, 3.0787f, 2.2646f, 1.9389f, 1.7617f, 1.6496f, 1.5716f, 1.5140f, 1.4693f, 1.4336f, 1.4043f, 1.3797f, 1.3587f, 1.3406f, 1.3248f, 1.3107f, 1.2983f, 1.2871f, 1.2770f, 1.2678f, 1.2594f, 1.2517f, 1.2446f, 1.2380f, 1.2319f, 1.2262f, 1.2209f, 1.2159f, 1.2112f, 1.2068f, 1.2026f, 1.1987f, 1.1949f, 1.1914f };
+-
+-  if (nobs < 2) {
+-    return unbias_const[1];
+-  }
+-
+-  if (nobs < 36) {
+-    return unbias_const[nobs];
+-  }
+-  // else nobs >= 36
+-  // approximate for big n with function a = m /nobs + b
+-  static const float m = (unbias_const[35] - unbias_const[30])/(1.0f/35.0f - 1.0f/30.0f);
+-  static const float b = unbias_const[35]  - m*(1.0f/35.0f);
+-  return m/nobs + b;
+-}
+-
+-void boxm_simple_grey_processor::
+-boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
+-                               std::vector<float> const& pre,
+-                               std::vector<float> const& vis,
+-                               boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
+-                               float min_app_sigma,
+-                               float shadow_prior,
+-                               float shadow_mean,
+-                               float shadow_sigma,
+-                               bool verbose )
+-{
+-  std::vector<float> obs_weights(vis.size(), 0.0f);
+-  std::vector<float> sh_density(vis.size(), 0.0f);
+-  //assume that the initial appearance distribution is uniform on [0 1]
+-  //thus a reasonable initialization for weights is
+-  //
+-  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
+-  //
+-  //, where Psh is shadow_prior and psh(x) is the shadow density function,
+-  // sh_density. vis is the visibilty probability
+-  //
+-  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
+-  for (unsigned n = 0; n<obs.size(); ++n)
+-  {
+-    //2.0 x density since centered on zero
+-    sh_density[n] =
+-      2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
+-    float neu = vis[n]*(1-shadow_prior);
+-    float weight =
+-      neu/(neu + sh_density[n]*shadow_prior);
+-    obs_weights[n]=weight;
+-  }
+-  std::vector<float> initial_weights = obs_weights;
+-  // initial estimate for the illuminated appearance model
+-  boxm_simple_grey_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
+-  double initial_mean = model.color();
+-  double initial_sigma = model.sigma();
+-
+-  // use EM to refine estimate until convergence.
+-  auto nobs = (unsigned int)obs.size();
+-  if (nobs == 0) {
+-    // nothing to do.
+-    return;
+-  }
+-  const float epsilon = 1e-4f;
+-  constexpr unsigned int max_its = 100;
+-  const float min_weight_change = 1e-5f;
+-  unsigned int i=0;
+-  for (; i<max_its; ++i) {
+-    float max_weight_change = 0.0f;
+-    // EXPECTATION - determine the weights
+-    for (unsigned int n=0; n<nobs; ++n) {
+-      float PI = vis[n] * boxm_simple_grey_processor::prob_density(model,obs[n]);
+-      float neu = PI*(1-shadow_prior);
+-      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
+-      float new_obs_weight = 0;
+-      if (den > epsilon) {
+-        new_obs_weight = neu / den;
+-      }
+-      // compute delta weight for convergence check
+-      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
+-      if (weight_delta > max_weight_change) {
+-        max_weight_change = weight_delta;
+-      }
+-      obs_weights[n] = new_obs_weight;
+-    }
+-    // check for convergence
+-    if (max_weight_change < min_weight_change)
+-      break;
+-    // MAXIMIZATION - determine the parameters of the appearance distribution
+-    boxm_simple_grey_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
+-  }
+-  if (verbose) {
+-    bool print = false;
+-    for (unsigned n = 0; n<obs.size(); ++n) {
+-      if (obs[n]>0) print = true;
+-      if (i<max_its&&print) {
+-        std::cout << "converged after " << i << " iterations.\n"
+-                 << " initial mean = " << initial_mean << " final mean = "
+-                 << model.color() << '\n'
+-                 << " initial sigma = " << initial_sigma << " final sigma = "
+-                 << model.sigma() << '\n';
+-      }
+-      else { std::cout << "failed to converge\n"; }
+-
+-      std::cout << "Initial (Observations, Weights):\n";
+-      for (unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
+-      std::cout << "\nFinal (Observations, Weights):\n";
+-      for (unsigned n=0; n<obs.size(); ++n)
+-        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
+-      std::cout << '\n';
+-    }
+-  }
+-
+-  // adjust model to account for small sample sizes.
+-  boxm_simple_grey_processor::finalize_appearance(obs,obs_weights,model);
+-}
+diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
+deleted file mode 100644
+index 076213bd46..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
++++ /dev/null
+@@ -1,86 +0,0 @@
+-// This is brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
+-#ifndef boxm_simple_grey_processor_h_
+-#define boxm_simple_grey_processor_h_
+-//:
+-// \file
+-// \brief A class for processing simple, single valued grey-scale appearance models.
+-//  The represented distribution can be thought of as a delta function centered on the value.
+-//
+-// \author Daniel Crispell
+-// \date Sept 29, 2008
+-// \verbatim
+-//  Modifications
+-//  <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <iosfwd>
+-#include <boxm/boxm_apm_traits.h>
+-#if 0 // operator<< in commented-out section
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-class  boxm_simple_grey_processor
+-{
+- protected:
+-  // convienance typedefs
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_datatype;
+-  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype obs_mathtype;
+-
+-  // all methods are static - no constructor needed
+- private:
+-  boxm_simple_grey_processor() = default;
+-
+-#if 0  // one_over_sigma is now a member of apm_datatype
+-  static const float one_over_sigma_;
+-#endif
+-
+- public:
+-
+-  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
+-
+-  static float prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max);
+-
+-  static float total_prob(apm_datatype const& appear);
+-
+-  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
+-
+-  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
+-
+-  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype most_probable_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
+-
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma=0.01f);
+-
+-  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
+-
+-  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model);
+-
+-  //: includes a shadow density component to the single gaussian scalar appearance model, defined by a fixed shadow mean and sigma.
+-  // The shadow prior defines the probability that an observation is in shadow.
+-  // The function updates the "model" mean and sigma.
+-  static void boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
+-                                             std::vector<float> const& pre,
+-                                             std::vector<float> const& vis,
+-                                             boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
+-                                             float min_app_sigma,
+-                                             float shadow_prior,
+-                                             float shadow_mean,
+-                                             float shadow_sigma,
+-                                             bool verbose = false);
+- private:
+-  static void compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma);
+-
+-  static float sigma_norm_factor(unsigned int nobs);
+-
+-  static float sigma_norm_factor(float nobs);
+-};
+-
+-#if 0
+-std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm);
+-#endif
+-
+-#endif // boxm_simple_grey_processor_h_
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
+deleted file mode 100644
+index 4390b597bc..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,11 +0,0 @@
+-add_executable( boxm_sample_algo_test_all
+-  test_driver.cxx
+-  test_sigma_normalizer.cxx
+- )
+-
+-target_link_libraries( boxm_sample_algo_test_all boxm_sample_algo boxm_sample boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vbl bsta bsta_algo)
+-
+-add_test( NAME boxm_sample_test_sigma_normalizer COMMAND $<TARGET_FILE:boxm_sample_algo_test_all> test_sigma_normalizer  )
+-
+-add_executable( boxm_sample_algo_test_include test_include.cxx )
+-target_link_libraries( boxm_sample_algo_test_include boxm_sample_algo)
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
+deleted file mode 100644
+index 1258c5dc63..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_sigma_normalizer );
+-
+-void register_tests()
+-{
+-  REGISTER( test_sigma_normalizer );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
+deleted file mode 100644
+index 3c7fc60db6..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boxm/sample/algo/boxm_mob_grey_processor.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-#include <boxm/sample/algo/boxm_simple_grey_processor.h>
+-#include <boxm/sample/algo/boxm_sigma_normalizer.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
+deleted file mode 100644
+index 7231ca0b24..0000000000
+--- a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
++++ /dev/null
+@@ -1,59 +0,0 @@
+-
+-#include <testlib/testlib_test.h>
+-#include <vnl/vnl_random.h>
+-#include <boxm/sample/algo/boxm_sigma_normalizer.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/algo/bsta_fit_gaussian.h>
+-
+-
+-static void test_sigma_normalizer()
+-{
+-  START("boxm_sigma_normalizer test");
+-
+-  // generate random sets of samples from a normal distribution and compare sigma estimate to true value
+-  {
+-    vnl_random rand_gen;
+-    unsigned int n_trials = 5000;
+-
+-    unsigned int n_observations = 6;
+-    float true_sigma = 0.5f;
+-    float true_mean = 2.5f;
+-    float under_estimation_prob = 0.4f;
+-    unsigned int under_estimates = 0;
+-
+-    boxm_sigma_normalizer normalizer(under_estimation_prob);
+-
+-    for (unsigned int t=0; t<n_trials; ++t) {
+-      std::vector<float> samples;
+-      std::vector<float> weights;
+-      for (unsigned int n=0; n<n_observations; ++n) {
+-        float sample = true_mean + true_sigma*(float)rand_gen.normal();
+-        samples.push_back(sample);
+-        weights.push_back(1.0f);
+-      }
+-      // compute the sample mean and variance
+-      bsta_gauss_sf1 gauss_model;
+-      bsta_fit_gaussian(samples, weights, gauss_model);
+-      float normalized_sigma = std::sqrt(gauss_model.var()) * normalizer.normalization_factor_int(n_observations);
+-      if (normalized_sigma < true_sigma) {
+-        ++under_estimates;
+-      }
+-    }
+-    float under_estimate_ratio = (float)under_estimates / n_trials;
+-
+-    TEST_NEAR("correct ratio of sigma under-estimates", under_estimate_ratio, under_estimation_prob, 0.05);
+-  }
+-
+-  // make sure normalization factor approaches 1 for large sample sizes
+-  {
+-    boxm_sigma_normalizer sigma_norm(0.10f);
+-    float norm_factor_f = sigma_norm.normalization_factor(10000.0f);
+-    float norm_factor_i = sigma_norm.normalization_factor_int(10000);
+-
+-    TEST_NEAR("normalization factor (float) approaches 1 for large N",norm_factor_f, 1.0, 0.1);
+-    TEST_NEAR("normalization factor (int) approaches 1 for large N",norm_factor_i, 1.0, 0.1);
+-  }
+-  return;
+-}
+-
+-TESTMAIN(test_sigma_normalizer);
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
+deleted file mode 100644
+index ae46c03fd6..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
++++ /dev/null
+@@ -1,97 +0,0 @@
+-#ifndef boxm_edge_sample_h_
+-#define boxm_edge_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-template<class OBS_T>
+-class boxm_edge_sample
+-{
+- public:
+-  boxm_edge_sample(): edge_prob_(0), num_obs_(0.0f) {}
+-  ~boxm_edge_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val() const { return edge_prob_; }
+-  OBS_T edge_prob_;
+-  float num_obs_;
+-};
+-
+-template<class OBS_T>
+-class boxm_aux_edge_sample
+-{
+- public:
+-  boxm_aux_edge_sample(): obs_(0), seg_len_(0.0f) { }
+-  ~boxm_aux_edge_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  OBS_T obs_;
+-  float seg_len_;
+-};
+-
+-#if 0 // two classes commented out
+-
+-//: traits for a grey optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
+-{
+- public:
+-  typedef boxm_edge_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_grey_work"; }
+-};
+-
+-//: traits for an rgb optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
+-{
+- public:
+-  typedef boxm_edge_sample<vil_rgb<float> > sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
+-};
+-
+-#endif // 0
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample);
+-
+-
+-#endif // boxm_edge_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
+deleted file mode 100644
+index d2e60dc175..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
++++ /dev/null
+@@ -1,137 +0,0 @@
+-#ifndef boxm_edge_sample_hxx_
+-#define boxm_edge_sample_hxx_
+-
+-#include "boxm_edge_sample.h"
+-
+-
+-// Edge Sample Methods
+-template <class OBS_T>
+-void boxm_edge_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(edge_prob=" << edge_prob_ << " num_obs=" << num_obs_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.edge_prob_);
+-  vsl_b_write(os, sample.num_obs_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.edge_prob_);
+-      vsl_b_read(is, sample.num_obs_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-// Auxiliary Edge Sample Methods
+-template <class OBS_T>
+-void boxm_aux_edge_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(obs=" << obs_ << " seg_len=" << seg_len_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.obs_);
+-  vsl_b_write(os, sample.seg_len_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.obs_);
+-      vsl_b_read(is, sample.seg_len_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_aux_edge_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_EDGE_SAMPLE_INSTANTIATE(T) \
+-template class boxm_edge_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_edge_sample<T >&)
+-
+-#define BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(T) \
+-template class boxm_aux_edge_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_aux_edge_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
+deleted file mode 100644
+index a92ae0e38e..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
++++ /dev/null
+@@ -1,69 +0,0 @@
+-#ifndef boxm_edge_tangent_sample_h_
+-#define boxm_edge_tangent_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include "boxm_plane_obs.h"
+-#include <boxm/boxm_aux_traits.h>
+-
+-
+-template <class T>
+-class boxm_edge_tangent_sample
+-{
+- public:
+-  boxm_edge_tangent_sample() = default;
+-  ~boxm_edge_tangent_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  //: adds observations
+-  void insert(boxm_plane_obs<T> const& obs) { obs_.push_back(obs); }
+-
+-  //: insert a lis of observations
+-  void insert(std::vector<boxm_plane_obs<T> > const& obs) {obs_.insert(obs_.end(),obs.begin(),obs.end()); }
+-
+-  //: returns the number of observations
+-  unsigned num_obs() const { return obs_.size(); }
+-
+-  boxm_plane_obs<T> obs(unsigned int i) const {
+-    if (i < obs_.size()) return obs_[i];
+-    std::cerr << "boxm_edge_tangent_sample: " << i << " is out of index - size is " << obs_.size() << std::endl;
+-    return boxm_plane_obs<T>();
+-  }
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val(unsigned int i) {
+-    if (i < obs_.size()) return obs_[i].seg_len_;
+-    std::cerr << "boxm_edge_tangent_sample: " << i << "is out of index - size is " << obs_.size() << std::endl;
+-    return -1.0f;
+-  }
+-
+-  std::vector<boxm_plane_obs<T> > obs_list() { return obs_; }
+-
+- private:
+-  std::vector<boxm_plane_obs<T> > obs_;
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream&operator << (std::ostream& os, boxm_edge_tangent_sample<T>& sample);
+-
+-
+-#endif // boxm_edge_tangent_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
+deleted file mode 100644
+index bb96baa1e0..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
++++ /dev/null
+@@ -1,79 +0,0 @@
+-#ifndef boxm_edge_tangent_sample_hxx_
+-#define boxm_edge_tangent_sample_hxx_
+-
+-#include "boxm_edge_tangent_sample.h"
+-#include "boxm_plane_obs.h"
+-
+-template <class OBS_T>
+-void boxm_edge_tangent_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << " num_obs=" << this->num_obs() << std::endl;
+-  for (unsigned i=0; i<obs_.size(); i++)
+-    os << "    " << i << "- (obs=" << this->obs(i) << ")\n" ;
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const & sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.num_obs());
+-  for (unsigned i=0; i<sample.num_obs(); i++)
+-    vsl_b_write(os, sample.obs(i));
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-     { unsigned num;
+-      vsl_b_read(is, num);
+-      boxm_plane_obs<T> o;
+-      for (unsigned i=0; i<num; i++) {
+-        vsl_b_read(is, o);
+-        sample.insert(o);
+-      }}
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, boxm_edge_tangent_sample<T> &sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(T) \
+-template class boxm_edge_tangent_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, boxm_edge_tangent_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
+deleted file mode 100644
+index 953c9f286f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
++++ /dev/null
+@@ -1,55 +0,0 @@
+-#ifndef boxm_inf_line_sample_h_
+-#define boxm_inf_line_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vgl/vgl_line_3d_2_points.h>
+-
+-#include <boxm/boxm_aux_traits.h>
+-#include <bsta/bsta_kent.h>
+-
+-template<class T>
+-class boxm_inf_line_sample
+-{
+- public:
+-  //: initially the residual is very big, it means the solution to this inf line is not found yet
+-  boxm_inf_line_sample() :
+-       residual_(1e6), line_(vgl_infinite_line_3d<T>(vgl_vector_2d<T>(0,0),
+-       vgl_vector_3d<T>(10,10,10))), num_obs_(0){}
+-
+-  boxm_inf_line_sample(vgl_infinite_line_3d<T> line,unsigned num_obs=0) : residual_(1e6),line_(line),num_obs_(num_obs) {}
+-  ~boxm_inf_line_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) { os << "(line=" << line_ << ')';  }
+-  bool operator==(const boxm_inf_line_sample &rhs) const;
+-  typedef boxm_inf_line_sample<T> value_type;
+-  // public members
+-  T residual_;
+-  vgl_infinite_line_3d<T> line_;
+-  vgl_line_3d_2_points<T> line_clipped_;
+-  unsigned num_obs_;
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample);
+-
+-
+-#endif // boxm_inf_line_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
+deleted file mode 100644
+index 1206b4a5f3..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
++++ /dev/null
+@@ -1,79 +0,0 @@
+-#ifndef boxm_inf_line_sample_hxx_
+-#define boxm_inf_line_sample_hxx_
+-
+-#include "boxm_inf_line_sample.h"
+-#include <vgl/io/vgl_io_infinite_line_3d.h> // for vsl_b_write(os, sample.line_);
+-#include <vgl/io/vgl_io_line_3d_2_points.h> // for vsl_b_write(os, sample.line_clipped_);
+-
+-template <class T>
+-bool boxm_inf_line_sample<T>::operator==(const boxm_inf_line_sample<T> &rhs) const
+-{
+-  if ((this==&rhs) || (line_==rhs.line_ && line_clipped_==rhs.line_clipped_ && num_obs_==rhs.num_obs_))
+-    return true;
+-  else
+-    return false;
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.num_obs_);
+-  vsl_b_write(os, sample.residual_);
+-  vsl_b_write(os, sample.line_);
+-  vsl_b_write(os, sample.line_clipped_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.num_obs_);
+-      vsl_b_read(is, sample.residual_);
+-      vsl_b_read(is, sample.line_);
+-      vsl_b_read(is, sample.line_clipped_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_inf_line_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_INF_LINE_SAMPLE_INSTANTIATE(T) \
+-template class boxm_inf_line_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > *&);\
+-template std::ostream& operator << (std::ostream&, boxm_inf_line_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
+deleted file mode 100644
+index 56ac1825d9..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#ifndef boxm_opt2_sample_h_
+-#define boxm_opt2_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-
+-template <class OBS_T>
+-class boxm_opt2_sample
+-{
+- public:
+-  boxm_opt2_sample()
+-  : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), log_pass_prob_sum_(0.0f), weighted_seg_len_sum_(0.0f)
+-  {}
+-
+-  ~boxm_opt2_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  OBS_T obs_;
+-  float pre_;
+-  float vis_;
+-  float PI_;
+-  float seg_len_;
+-
+-  float log_pass_prob_sum_;
+-  float weighted_seg_len_sum_;
+-};
+-
+-//:traits for a grey optimization sample
+-template <>
+-class boxm_aux_traits<BOXM_AUX_OPT2_GREY>
+-{
+- public:
+-  typedef boxm_opt2_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt2_grey_work"; }
+-};
+-
+-//:traits for an rgb optimization sample
+-template <>
+-class boxm_aux_traits<BOXM_AUX_OPT2_RGB>
+-{
+- public:
+-  typedef boxm_opt2_sample<vil_rgb<float> > sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt2_rgb_work"; }
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator<< (std::ostream& os, const boxm_opt2_sample<T>& sample);
+-
+-#endif // boxm_opt2_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
+deleted file mode 100644
+index 44300e3bf7..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
++++ /dev/null
+@@ -1,83 +0,0 @@
+-#ifndef boxm_opt2_sample_hxx_
+-#define boxm_opt2_sample_hxx_
+-
+-#include "boxm_opt2_sample.h"
+-
+-
+-template <class OBS_T>
+-void boxm_opt2_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_
+-     << " seg_len=" << seg_len_ << " log_pass_prob_sum=" << log_pass_prob_sum_
+-     << " weighted_seg_len_sum=" << weighted_seg_len_sum_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.obs_);
+-  vsl_b_write(os, sample.pre_);
+-  vsl_b_write(os, sample.vis_);
+-  vsl_b_write(os, sample.PI_);
+-  vsl_b_write(os, sample.seg_len_);
+-  vsl_b_write(os, sample.log_pass_prob_sum_);
+-  vsl_b_write(os, sample.weighted_seg_len_sum_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.obs_);
+-    vsl_b_read(is, sample.pre_);
+-    vsl_b_read(is, sample.vis_);
+-    vsl_b_read(is, sample.PI_);
+-    vsl_b_read(is, sample.seg_len_);
+-    vsl_b_read(is, sample.log_pass_prob_sum_);
+-    vsl_b_read(is, sample.weighted_seg_len_sum_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt2_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template<class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_opt2_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_OPT2_SAMPLE_INSTANTIATE(T) \
+-template class boxm_opt2_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_opt2_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
+deleted file mode 100644
+index 3b8d162774..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
++++ /dev/null
+@@ -1,76 +0,0 @@
+-#ifndef boxm_opt3_sample_h_
+-#define boxm_opt3_sample_h_
+-//:
+-// \file
+-
+-#include <vector>
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-//: class for holding auxiliary information for opt3 process.
+-// Note that APM is not necessarily appearance model type of world,
+-// but observation types of the two models should be the same.
+-template<boxm_apm_type APM>
+-class boxm_opt3_sample
+-{
+- public:
+-  typedef typename boxm_apm_traits<APM>::obs_datatype obs_datatype;
+-  typedef typename boxm_apm_traits<APM>::apm_datatype apm_datatype;
+-
+-  boxm_opt3_sample()
+-    : weighted_vis_sum_(0.0f), seg_len_sum_(0.0f), log_pass_prob_sum_(0.0f) { }
+-  ~boxm_opt3_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  void update_obs_dist(obs_datatype obs, float obs_prob);
+-
+-  apm_datatype obs_dist_; // distribution of samples from this observation
+-  float weighted_vis_sum_; // sum of visibility probabilities * corresponding seg_lens
+-  float seg_len_sum_; // sum of sample segment lengths
+-  float log_pass_prob_sum_; // sum of log of updated (1 - PQ)
+-};
+-
+-//: traits for a grey optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT3_MOG_GREY>
+-{
+- public:
+-   typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype sample_datatype;
+-   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_GREY;
+-
+-  static std::string storage_subdir() { return "opt3_mog_grey"; }
+-};
+-
+-//: traits for an rgb optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT3_MOG_RGB>
+-{
+- public:
+-   typedef boxm_apm_traits<BOXM_APM_MOG_RGB>::obs_datatype sample_datatype;
+-   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_RGB;
+-
+-  static std::string storage_subdir() { return "opt3_mog_rgb"; }
+-};
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample);
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample);
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample);
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample);
+-
+-template <boxm_apm_type APM>
+-std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample);
+-
+-#endif // boxm_opt3_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
+deleted file mode 100644
+index 85f2e954dc..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
++++ /dev/null
+@@ -1,92 +0,0 @@
+-#ifndef boxm_opt3_sample_hxx_
+-#define boxm_opt3_sample_hxx_
+-
+-#include "boxm_opt3_sample.h"
+-
+-#include <vsl/vsl_vector_io.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_mixture_fixed.h> // for binary io functions
+-#include <bsta/io/bsta_io_gaussian_indep.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/algo/boxm_mog_grey_processor.h>
+-//#include <boxm/boxm_mog_rgb_processor.h>
+-
+-template <boxm_apm_type APM>
+-void boxm_opt3_sample<APM>::print(std::ostream& os) const
+-{
+-  os << "(log_pass_prob_sum=" << log_pass_prob_sum_ << " seg_len_sum_=" << seg_len_sum_
+-     << "weighted_vis_sum_=" << weighted_vis_sum_ << " obs_dist=" << obs_dist_ << ')';
+-}
+-
+-template <boxm_apm_type APM>
+-void boxm_opt3_sample<APM>::update_obs_dist(typename boxm_opt3_sample<APM>::obs_datatype obs, float obs_prob)
+-{
+-  boxm_apm_traits<APM>::apm_processor::update(obs_dist_, obs, obs_prob);
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.log_pass_prob_sum_);
+-  vsl_b_write(os, sample.seg_len_sum_);
+-  vsl_b_write(os, sample.weighted_vis_sum_);
+-  vsl_b_write(os, sample.obs_dist_);
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.log_pass_prob_sum_);
+-    vsl_b_read(is, sample.seg_len_sum_);
+-    vsl_b_read(is, sample.weighted_vis_sum_);
+-    vsl_b_read(is, sample.obs_dist_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt3_sample<APM>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template <boxm_apm_type APM>
+-void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <boxm_apm_type APM>
+-std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_OPT3_SAMPLE_INSTANTIATE(T) \
+-template class boxm_opt3_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_opt3_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
+deleted file mode 100644
+index 417c0ccc98..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
++++ /dev/null
+@@ -1,45 +0,0 @@
+-#ifndef boxm_plane_obs_h_
+-#define boxm_plane_obs_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <vgl/vgl_homg_plane_3d.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-template<class T>
+-class boxm_plane_obs
+-{
+- public:
+-  boxm_plane_obs() : seg_len_(0.0f), plane_(vgl_homg_plane_3d<T>()) {}
+-  boxm_plane_obs(vgl_homg_plane_3d<T> plane, float seg_len) : seg_len_(seg_len), plane_(plane) {}
+-  ~boxm_plane_obs() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const { os << "(plane=" << plane_ << " seg_len=" << seg_len_ << ')'; }
+-
+-  // public members
+-  float seg_len_;
+-  vgl_homg_plane_3d<T> plane_;
+-};
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_plane_obs<T>& sample);
+-
+-
+-#endif // boxm_plane_obs_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
+deleted file mode 100644
+index 5d2d8b4535..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
++++ /dev/null
+@@ -1,69 +0,0 @@
+-#ifndef boxm_plane_obs_hxx_
+-#define boxm_plane_obs_hxx_
+-
+-#include "boxm_plane_obs.h"
+-
+-#include "boxm_edge_tangent_sample.h"
+-#include "boxm_inf_line_sample.h"
+-
+-#include <vgl/io/vgl_io_homg_plane_3d.h> // for vsl_b_write(os, sample.plane_);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.seg_len_);
+-  vsl_b_write(os, sample.plane_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.seg_len_);
+-      vsl_b_read(is, sample.plane_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator<< (std::ostream& os, boxm_plane_obs<T> const& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_PLANE_OBS_INSTANTIATE(T) \
+-template class boxm_plane_obs<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > *&);\
+-template std::ostream& operator << (std::ostream&, boxm_plane_obs<T > const&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
+deleted file mode 100644
+index e51d415ce8..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
++++ /dev/null
+@@ -1,70 +0,0 @@
+-#ifndef boxm_rt_sample_h_
+-#define boxm_rt_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vil/vil_rgb.h>
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_aux_traits.h>
+-
+-template<class OBS_T>
+-class boxm_rt_sample
+-{
+- public:
+-  boxm_rt_sample()
+-    : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), Beta_(0.0f),
+-    updatefactor_(0.0f), log_sum_(0.0f) {}
+-  ~boxm_rt_sample() = default;
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  OBS_T obs_;
+-  float pre_;
+-  float vis_;
+-  float PI_;
+-  float seg_len_;
+-  float Beta_;
+-  float updatefactor_;
+-  float log_sum_;
+-};
+-
+-
+-//: traits for a grey optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
+-{
+- public:
+-  typedef boxm_rt_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_grey_work"; }
+-};
+-
+-//: traits for an rgb optimization sample
+-template<>
+-class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
+-{
+- public:
+-  typedef boxm_rt_sample<vil_rgb<float> > sample_datatype;
+-
+-  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
+-};
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_rt_sample<T>& sample);
+-
+-#endif // boxm_rt_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
+deleted file mode 100644
+index 4202653363..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
++++ /dev/null
+@@ -1,81 +0,0 @@
+-#ifndef boxm_rt_sample_hxx_
+-#define boxm_rt_sample_hxx_
+-
+-#include "boxm_rt_sample.h"
+-
+-
+-template <class OBS_T>
+-void boxm_rt_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_ << " seg_len=" << seg_len_ << " Beta=" << Beta_ << ')';
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.obs_);
+-  vsl_b_write(os, sample.pre_);
+-  vsl_b_write(os, sample.vis_);
+-  vsl_b_write(os, sample.PI_);
+-  vsl_b_write(os, sample.seg_len_);
+-  vsl_b_write(os, sample.updatefactor_);
+-  vsl_b_write(os, sample.Beta_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.obs_);
+-    vsl_b_read(is, sample.pre_);
+-    vsl_b_read(is, sample.vis_);
+-    vsl_b_read(is, sample.PI_);
+-    vsl_b_read(is, sample.seg_len_);
+-    vsl_b_read(is, sample.updatefactor_);
+-    vsl_b_read(is, sample.Beta_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_rt_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream &operator << (std::ostream& os, const boxm_rt_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_RT_SAMPLE_INSTANTIATE(T) \
+-template class boxm_rt_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_rt_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.h b/contrib/brl/bseg/boxm/sample/boxm_sample.h
+deleted file mode 100644
+index 4d2312ae98..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample.h
++++ /dev/null
+@@ -1,68 +0,0 @@
+-#ifndef boxm_sample_h_
+-#define boxm_sample_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <utility>
+-#include <boxm/boxm_apm_traits.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-class boxm_sample
+-{
+- public:
+-  static const boxm_apm_type apm_type = APM_MODEL;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
+-  static const unsigned int obs_dim = boxm_apm_traits<APM_MODEL>::obs_dim;
+-
+-  //: default constructor: alpha is set to 0.0015.
+-  boxm_sample() : alpha(0.0015f), appearance_() {}
+-
+-  boxm_sample(float alpha_val): alpha(alpha_val), appearance_() {}
+-  //: constructor
+-  boxm_sample(float alpha_val, apm_datatype apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
+-
+-  virtual ~boxm_sample() = default;
+-
+-  static short version_no() { return 1; }
+-
+-  //: bin is to imitate the bin number of multiple_bin case
+-  apm_datatype & appearance(int /*bin*/=-1) { return appearance_; }
+-
+-  void set_appearance(apm_datatype  app,int /*bin*/=-1) { appearance_=app; }
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val() const { return alpha; }
+-
+-  //: the occlusion density at the sample point
+-  float alpha;
+-
+-  //: the appearance model at the sample point
+-  typename boxm_apm_traits<APM_MODEL>::apm_datatype appearance_;
+-
+-  void  print(std::ostream& os) const;
+-};
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
+deleted file mode 100644
+index e644739f43..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#ifndef boxm_sample_hxx_
+-#define boxm_sample_hxx_
+-
+-#include "boxm_sample.h"
+-#include <bsta/bsta_mixture_fixed.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-void boxm_sample<APM_MODEL>::print(std::ostream& os) const
+-{
+-  os << "(alpha=" << alpha << " appearence=" << appearance_ << ')';
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.alpha);
+-  vsl_b_write(os, sample.appearance_);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.alpha);
+-      vsl_b_read(is, sample.appearance_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_SAMPLE_INSTANTIATE(T) \
+-template class boxm_sample<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
+deleted file mode 100644
+index 838637e49f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
++++ /dev/null
+@@ -1,63 +0,0 @@
+-#ifndef boxm_sample_multi_bin_h_
+-#define boxm_sample_multi_bin_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <utility>
+-#include <boxm/boxm_apm_traits.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <bsta/bsta_attributes.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-class boxm_sample_multi_bin
+-{
+- public:
+-  static const boxm_apm_type apm_type = APM_MODEL;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
+-  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
+-
+-  //: default constructor
+-  boxm_sample_multi_bin() : alpha(0.001f) {}
+-  //: constructor
+-  boxm_sample_multi_bin(float alpha_val,std::map<int,apm_datatype> apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
+-
+-  static short version_no() { return 1; }
+-
+-  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
+-  float basic_val() const { return alpha; }
+-
+-  //: the occlusion density at the sample point
+-  float alpha;
+-  apm_datatype & appearance(int bin=0);
+-
+-  void set_appearance(apm_datatype  app,int bin=0);
+-
+-  std::map<int,apm_datatype> appearance_;
+-
+-  void  print(std::ostream& os) const;
+- private:
+-  //: the appearance model at the sample point
+-};
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample);
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
+deleted file mode 100644
+index 714b493eec..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#ifndef boxm_sample_multi_bin_hxx_
+-#define boxm_sample_multi_bin_hxx_
+-
+-#include "boxm_sample_multi_bin.h"
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <vsl/vsl_map_io.hxx>
+-#include <bsta/io/bsta_io_mixture_fixed.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <bsta/io/bsta_io_mixture.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_indep.h>
+-
+-template <boxm_apm_type APM_MODEL>
+-typename boxm_sample_multi_bin<APM_MODEL>::apm_datatype & boxm_sample_multi_bin<APM_MODEL>::appearance(int bin)
+-{
+-  if (appearance_.find(bin)==appearance_.end())
+-  {
+-    appearance_[bin]=apm_datatype();
+-    return appearance_[bin];
+-  }
+-  else
+-    return appearance_[bin];
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void boxm_sample_multi_bin<APM_MODEL>::set_appearance(apm_datatype  app,int bin)
+-{
+-  appearance_[bin]=app;
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void boxm_sample_multi_bin<APM_MODEL>::print(std::ostream& os) const
+-{
+-  os << "(alpha=" << alpha << " appearence=" ;
+-  for (typename std::map<int,apm_datatype>::const_iterator iter=appearance_.begin();
+-       iter!=appearance_.end(); ++iter)
+-    os << "bin#= " << iter->first << ' ' << iter->second;
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.alpha);
+-  vsl_b_write(os, sample.appearance_);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.alpha);
+-      vsl_b_read(is, sample.appearance_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample_multi_bin<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <boxm_apm_type APM_MODEL>
+-std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(T) \
+-template class boxm_sample_multi_bin<T >; \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > &); \
+-template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > *&); \
+-template std::ostream& operator << (std::ostream&, const boxm_sample_multi_bin<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
+deleted file mode 100644
+index ba4cd770ad..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
++++ /dev/null
+@@ -1,55 +0,0 @@
+-#ifndef boxm_scalar_sample_h_
+-#define boxm_scalar_sample_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-
+-template <class T>
+-class boxm_scalar_sample
+-{
+- public:
+-  boxm_scalar_sample() : scalar_sum_(0), seg_len_(0.0f) { }
+-
+-  ~boxm_scalar_sample() = default;
+-  T basic_val() { if (seg_len_>0) return scalar_sum_/seg_len_; else return (T)0; }
+-  static short version_no() { return 1; }
+-  void print(std::ostream& os) const;
+-
+-  T scalar_sum_;
+-  float seg_len_;
+-};
+-
+-//: traits for a scalar sample
+-template <>
+-class boxm_apm_traits<BOXM_SCALAR_FLOAT>
+-{
+- public:
+-  typedef boxm_scalar_sample<float> sample_datatype;
+-
+-  static std::string storage_subdir() { return "scalar_subdir"; }
+-};
+-
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample);
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const* &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample);
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T>* &sample);
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample);
+-
+-#endif // boxm_scalar_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
+deleted file mode 100644
+index 6eb0d37aef..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
++++ /dev/null
+@@ -1,70 +0,0 @@
+-#ifndef boxm_scalar_sample_hxx_
+-#define boxm_scalar_sample_hxx_
+-
+-#include "boxm_scalar_sample.h"
+-
+-template <class OBS_T>
+-void boxm_scalar_sample<OBS_T>::print(std::ostream& os) const
+-{
+-  os << "(scalar=" << scalar_sum_ << " seg_len=" << seg_len_ << ")\n";
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.scalar_sum_);
+-  vsl_b_write(os, sample.seg_len_);
+-}
+-
+-template <class T>
+-void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-   case 1:
+-    vsl_b_read(is, sample.scalar_sum_);
+-    vsl_b_read(is, sample.seg_len_);
+-    break;
+-   default:
+-    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scalar_sample<T>&)\n"
+-             << "           Unknown version number "<< version << '\n';
+-    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-    break;
+-  }
+-}
+-
+-template <class T>
+-void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-template <class T>
+-std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BOXM_SCALAR_SAMPLE_INSTANTIATE(T) \
+-  template class boxm_scalar_sample<T >; \
+-  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const &); \
+-  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const *&); \
+-  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > &); \
+-  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > *&); \
+-  template std::ostream& operator << (std::ostream&, const boxm_scalar_sample<T >&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h b/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
+deleted file mode 100644
+index 666c4a3ac5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#ifndef boxm_update_sample_h_
+-#define boxm_update_sample_h_
+-//:
+-// \file
+-
+-class boxm_update_sample
+-{
+- public:
+-  //: default constructor
+-  boxm_update_sample() : update_multiplier(0.0f), do_update(false) {}
+-
+-  //: the (unnormalized) update multiplier
+-  float update_multiplier;
+-  bool do_update;
+-};
+-
+-#endif // boxm_update_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h b/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
+deleted file mode 100644
+index 3ff4ed3ad5..0000000000
+--- a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#ifndef boxm_vis_implicit_sample_h_
+-#define boxm_vis_implicit_sample_h_
+-//:
+-// \file
+-
+-class boxm_vis_implicit_sample
+-{
+- public:
+-  //: default constructor
+-  boxm_vis_implicit_sample() : max_vis(0.0f), n_obs(0) {}
+-
+-  float max_vis;
+-  unsigned int n_obs;
+-};
+-
+-#endif // boxm_vis_implicit_sample_h_
+diff --git a/contrib/brl/bseg/boxm/sample/dummy.cxx b/contrib/brl/bseg/boxm/sample/dummy.cxx
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
+deleted file mode 100644
+index ed11dfb489..0000000000
+--- a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,4 +0,0 @@
+-add_executable( boxm_sample_test_include test_include.cxx )
+-target_link_libraries( boxm_sample_test_include boxm_sample)
+-add_executable( boxm_sample_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_sample_test_template_include boxm_sample)
+diff --git a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
+deleted file mode 100644
+index 17e8b789dd..0000000000
+--- a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#include <boxm/sample/boxm_edge_sample.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-#include <boxm/sample/boxm_opt2_sample.h>
+-#include <boxm/sample/boxm_opt3_sample.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/sample/boxm_rt_sample.h>
+-#include <boxm/sample/boxm_sample.h>
+-#include <boxm/sample/boxm_sample_multi_bin.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-#include <boxm/sample/boxm_update_sample.h>
+-#include <boxm/sample/boxm_vis_implicit_sample.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
+deleted file mode 100644
+index d1f741b32f..0000000000
+--- a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/sample/boxm_edge_sample.hxx>
+-#include <boxm/sample/boxm_edge_tangent_sample.hxx>
+-#include <boxm/sample/boxm_inf_line_sample.hxx>
+-#include <boxm/sample/boxm_opt2_sample.hxx>
+-#include <boxm/sample/boxm_opt3_sample.hxx>
+-#include <boxm/sample/boxm_plane_obs.hxx>
+-#include <boxm/sample/boxm_rt_sample.hxx>
+-#include <boxm/sample/boxm_sample.hxx>
+-#include <boxm/sample/boxm_sample_multi_bin.hxx>
+-#include <boxm/sample/boxm_scalar_sample.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/tests/CMakeLists.txt
+deleted file mode 100644
+index eb0d974b9f..0000000000
+--- a/contrib/brl/bseg/boxm/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,32 +0,0 @@
+-add_executable( boxm_test_all
+-  test_driver.cxx
+-  test_binary_io.cxx
+-  test_block_iter.cxx
+-# FAILS on DASHBOARD FIX_ME
+-#  test_region_finder.cxx
+-  test_cell_iterator.cxx
+-  test_load_neighboring_blocks.cxx
+- )
+-
+-set(boxm_test_all_sources
+-    test_utils.h    test_utils.cxx
+-    )
+-
+-vxl_add_library(LIBRARY_NAME boxm_tests LIBRARY_SOURCES  ${boxm_test_all_sources})
+-target_link_libraries(boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-
+-target_link_libraries( boxm_test_all boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
+-
+-add_test( NAME boxm_test_binary_io COMMAND $<TARGET_FILE:boxm_test_all>    test_binary_io  )
+-add_test( NAME boxm_test_block_iter COMMAND $<TARGET_FILE:boxm_test_all>    test_block_iter  )
+-#add_test( NAME boxm_test_region_finder COMMAND $<TARGET_FILE:boxm_test_all>    test_region_finder )
+-if( VXL_RUN_FAILING_TESTS ) ## SEGFAULT when testing with ctest -j16 (perhaps files are shared between tests)
+-add_test( NAME boxm_test_cell_iterator COMMAND $<TARGET_FILE:boxm_test_all>    test_cell_iterator )
+-endif()
+-add_test( NAME boxm_test_load_neighboring_blocks COMMAND $<TARGET_FILE:boxm_test_all>    test_load_neighboring_blocks )
+-
+-add_executable( boxm_test_include test_include.cxx )
+-target_link_libraries( boxm_test_include boxm)
+-add_executable( boxm_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_test_template_include boxm)
+diff --git a/contrib/brl/bseg/boxm/tests/camera0.txt b/contrib/brl/bseg/boxm/tests/camera0.txt
+deleted file mode 100644
+index cf11c57707..0000000000
+--- a/contrib/brl/bseg/boxm/tests/camera0.txt
++++ /dev/null
+@@ -1,104 +0,0 @@
+-satId = "????";
+-bandId = "RGB";
+-SpecId = "RPC00B";
+-BEGIN_GROUP = IMAGE
+-
+-
+-  lineOffset = 0.0
+-  sampOffset = 0.0
+-  latOffset = 0.0
+-  longOffset = 0.0
+-  heightOffset = 0.0
+-  lineScale = 1.0
+-  sampScale = 1.0
+-  latScale = 1.0
+-  longScale = 1.0
+-  heightScale = 1.0
+-  lineNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  lineDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-END_GROUP = IMAGE
+-END;
+-lvcs
+-47.550493 35.395931 664.186757
+diff --git a/contrib/brl/bseg/boxm/tests/frame_00000.txt b/contrib/brl/bseg/boxm/tests/frame_00000.txt
+deleted file mode 100644
+index a66e2014bd..0000000000
+--- a/contrib/brl/bseg/boxm/tests/frame_00000.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-1 0 0
+-0 1 0
+-0 0 1
+-1 0 0
+-0 1 0
+-0 0 1
+-0 0 0
+diff --git a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx b/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
+deleted file mode 100644
+index 7dc2da196e..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
++++ /dev/null
+@@ -1,75 +0,0 @@
+-
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree.h>
+-#include <vpl/vpl.h>
+-#include <vul/vul_file.h>
+-
+-static void test_binary_io()
+-{
+-#ifdef DEBUG
+-  short nlevels=5;
+-  typedef vgl_point_3d<double> point_type;
+-  boct_tree<short,point_type > * block = new boct_tree<short,point_type >(nlevels);
+-  TEST("No of Max levels of tree",nlevels, block->num_levels());
+-
+-  block->split(); //block->print();
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<double> world_dim(30,30,30);
+-  boxm_scene<boct_tree<short,point_type > > scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_paths("./boxm_scene", "block");
+-  x_write(std::cout, scene, "scene");
+-
+-  vsl_b_ofstream os("scene.bin");
+-  scene.b_write(os);
+-  os.close();
+-  vul_file::make_directory("./boxm_scene");
+-
+-  boxm_scene<boct_tree<short,vgl_point_3d<double> > > scene_out;
+-  vsl_b_ifstream is("scene.bin", std::ios::binary);
+-  scene_out.b_read(is);
+-  vpl_rmdir("./boxm_scene");
+-  vpl_unlink("./scene.bin");
+-
+-  // writing the binary file for a scene with grey MOG
+-  vgl_point_3d<double>  mog_origin(0,0,0);
+-  vgl_vector_3d<double> mog_block_dim(1,1,1);
+-  vgl_vector_3d<double> mog_world_dim(3,3,1);
+-
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > mog_scene( mog_origin, mog_block_dim, mog_world_dim);
+-  mog_scene.set_paths("./boxm_scene", "block");
+-  vul_file::make_directory("./boxm_scene");
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&mog_scene);
+-
+-  while (!iter.end())
+-  {
+-    mog_scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=mog_scene.get_active_block();
+-    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(10,6);
+-    block->init_tree(tree);
+-    mog_scene.write_active_block();
+-    iter++;
+-  }
+-  mog_scene.write_scene();
+-  // writing the binary file for a scene with grey MOG
+-  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_mog_scene;
+-  read_mog_scene.load_scene("./boxm_scene/scene.xml");
+-
+-  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_iter(&read_mog_scene);
+-  while (!read_iter.end())
+-  {
+-    read_mog_scene.load_block(read_iter.index().x(),read_iter.index().y(),read_iter.index().z());
+-    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=read_mog_scene.get_active_block();
+-    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
+-    read_iter++;
+-  }
+-  vpl_rmdir("./boxm_scene");
+-  vpl_unlink("./scene.bin");
+-#endif // DEBUG
+-}
+-
+-TESTMAIN(test_binary_io);
+diff --git a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx b/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
+deleted file mode 100644
+index 376ee2d9b4..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
++++ /dev/null
+@@ -1,47 +0,0 @@
+-#include <testlib/testlib_test.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boct/boct_tree.h>
+-
+-#include "test_utils.h"
+-
+-typedef boct_tree<short,vgl_point_3d<double> > tree_type;
+-
+-static void test_block_iter()
+-{
+-  clean_up();
+-  short nlevels=5;
+-  auto * block = new tree_type(nlevels);
+-  TEST("No of Max levels of tree",nlevels, block->number_levels());
+-
+-  block->split();
+-  block->print();
+-  delete block;
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(3,3,3);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_paths("./boxm_scene", "block");
+-
+-  boxm_block_iterator<tree_type> iter = scene.iterator();
+-  int num_blocks=0;
+-  for (; !iter.end(); ++iter) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type> *block = scene.get_active_block();
+-    block->set_tree(new tree_type(5,3));
+-    std::cout << block->bounding_box() << std::endl;
+-    ++num_blocks;
+-    scene.write_active_block();
+-  }
+-  int x,y,z;
+-  scene.block_num(x,y,z);
+-  TEST("Number of blocks iterator visits", num_blocks, x*y*z);
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks in test_block_iter: " << boct_tree_cell<short,vgl_point_3d<double> >::nleaks() << '\n';
+-#endif
+-  clean_up();
+-}
+-
+-TESTMAIN(test_block_iter);
+diff --git a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx b/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
+deleted file mode 100644
+index f65529a973..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
++++ /dev/null
+@@ -1,51 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <testlib/testlib_test.h>
+-#include "test_utils.h"
+-
+-void test_cell_iterator()
+-{
+-
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene();
+-
+-  //get the iterator
+-  boxm_cell_iterator<boct_tree<short, float > > iterator = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  boct_tree_cell<short,float> *cell = *iterator;
+-  unsigned num_cells = 0;
+-  bool result = true;
+-
+-  while (!iterator.end()) {
+-
+-    if( (std::abs(cell->data() - 0.8) > 1e-7) && (std::abs(cell->data() - 0.5) > 1e-7) ){
+-      result = false;
+-      std::cerr << " Wrong data: " << cell->data() << std::endl;
+-    }
+-    ++iterator;
+-    num_cells ++;
+-        if(!iterator.end()){
+-    cell = *iterator;
+-        }
+-  }
+-
+-  if(num_cells!=120){
+-    result = false;
+-    std::cerr << "Wrong number of cells: " << num_cells << std::endl;
+-  }
+-
+-  TEST("Valid Test", result, true);
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_cell_iterator " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-  clean_up();
+-
+-}
+-
+-
+-TESTMAIN(test_cell_iterator);
+diff --git a/contrib/brl/bseg/boxm/tests/test_driver.cxx b/contrib/brl/bseg/boxm/tests/test_driver.cxx
+deleted file mode 100644
+index 3e55d5a0ea..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_driver.cxx
++++ /dev/null
+@@ -1,21 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_binary_io );
+-DECLARE( test_block_iter );
+-//FAILS ON DASHBOARD FIX_ME
+-//DECLARE( test_region_finder );
+-DECLARE( test_cell_iterator );
+-DECLARE( test_load_neighboring_blocks );
+-
+-void register_tests()
+-{
+-  REGISTER( test_binary_io );
+-  REGISTER( test_block_iter );
+-//FAILS ON DASHBOARD FIX_ME
+-// REGISTER( test_region_finder );
+-  REGISTER( test_cell_iterator );
+-  REGISTER( test_load_neighboring_blocks );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/tests/test_include.cxx b/contrib/brl/bseg/boxm/tests/test_include.cxx
+deleted file mode 100644
+index ae4ae05a88..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_include.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/boxm_aux_scene.h>
+-#include <boxm/boxm_aux_traits.h>
+-#include <boxm/boxm_block.h>
+-#include <boxm/boxm_io_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx b/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
+deleted file mode 100644
+index 1f8fe346ca..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
++++ /dev/null
+@@ -1,89 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 17-Aug-2010
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-void test_load_neighboring_blocks()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
+-  std::cout << "Scene Created" << std::endl;
+-
+-  //iterate through blocks, loading blocks and eighbors
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  bool result = true;
+-  while (!iter.end()) {
+-    if (scene->load_block_and_neighbors(iter.index().x(),iter.index().y(),iter.index().z())) {
+-      //std::cout << "Center blocks : "  << iter.index()<< std::endl;
+-      std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > active_blocks = scene->active_blocks();
+-
+-      //iterate through the active blocks and check that their trees are in memory
+-      auto it = active_blocks.begin();
+-
+-      for (; it!=active_blocks.end(); it++){
+-        boxm_block<boct_tree<short, float> > *block = scene->get_block(*it);
+-        if(!block)
+-          result = false;
+-        boct_tree<short, float> *tree = block->get_tree();
+-        if(!tree)
+-          result =false;
+-      }
+-
+-
+-      unsigned sum =0;
+-      if (iter.index().x()>0 && iter.index().x()<3) sum++;
+-      if (iter.index().y()>0 && iter.index().y()<3) sum++;
+-      if (iter.index().z()>0 && iter.index().z()<3) sum++;
+-      if(sum == 0)
+-        if(active_blocks.size()!=8){
+-          result = false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-      if(sum == 1)
+-        if(active_blocks.size()!=12){
+-          result = false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-      if(sum == 2)
+-        if(active_blocks.size()!=18){
+-          result = false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-      if(sum == 3)
+-        if(active_blocks.size()!=27){
+-          result=false;
+-          std::cout << sum << ' ' << active_blocks.size() << std::endl;
+-        }
+-#if 0
+-      std::cout << "Active blocks : " << std::endl;
+-      std::set<vgl_point_3d<int> >::iterator it = active_blocks.begin();
+-      for (; it!=active_blocks.end(); it++)
+-        std::cout << *it << std::endl;
+-#endif
+-    }
+-    iter++;
+-
+-  }
+-
+-  scene->unload_active_blocks();
+-  if(scene->active_blocks().size()!=0){
+-    result = false;
+-    std::cout << "Failed to unload active blocks" << std::endl;
+-  }
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks test_load_neighboring_blocks: " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  TEST("Valid Test", result, true);
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_load_neighboring_blocks);
+diff --git a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx b/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
+deleted file mode 100644
+index 47d5fd903b..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-//:
+-// \file
+-// \brief  A test to verify that findind cells within a region is correct
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-void test_region_finder()
+-{
+-  clean_up();
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene();
+-
+-  bool result = true;
+-
+-  if(!scene) result=false;
+-
+-  //find a region
+-
+-  {
+-    vgl_point_3d<double> max_point(14.0, 14.0, 14.0);
+-    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
+-    vgl_box_3d<double> roi(min_point, max_point);
+-
+-    std::vector<boct_tree_cell<short, float>* > cells;
+-    scene->leaves_in_region(roi,cells);
+-
+-
+-    if(cells.size()!=64){
+-      result=false;
+-      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
+-    }
+-
+-    for(unsigned i =0; i<cells.size(); i++)
+-      if(std::abs(cells[i]->data()- 0.8f)>1.0e-7)
+-      {
+-        result = false;
+-        std::cerr << cells[i]->data()<<std::endl;
+-      }
+-
+-    cells.clear();
+-    scene->unload_active_blocks();
+-
+-  }
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Region1: " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  //find another region
+-  {
+-    vgl_point_3d<double> max_point(19.0, 19.0, 19.0);
+-    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
+-    vgl_box_3d<double> roi(min_point, max_point);
+-
+-    std::vector<boct_tree_cell<short, float>* > cells;
+-    scene->leaves_in_region(roi,cells);
+-
+-    if(cells.size()!=83){
+-      result=false;
+-      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
+-    }
+-
+-    cells.clear();
+-    scene->unload_active_blocks();
+-  }
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Region2: " << boct_tree_cell<short, float >::nleaks() << std::endl;
+-#endif
+-
+-  if(!scene) result=false;
+-
+-  TEST("Correct region found", result, true);
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_region_finder);
+diff --git a/contrib/brl/bseg/boxm/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/tests/test_template_include.cxx
+deleted file mode 100644
+index edd7156927..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <boxm/boxm_aux_scene.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/tests/test_utils.cxx b/contrib/brl/bseg/boxm/tests/test_utils.cxx
+deleted file mode 100644
+index 58b40215a5..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_utils.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#include "test_utils.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Aug-2010
+-
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i)
+-{
+-  tree-> split(); //now we have 8 cells
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  leaves[i]->set_data(0.8f);
+-  leaves[i]->split();
+-}
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz)
+-{
+-  //crete the input scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-
+-  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
+-
+-    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
+-
+-  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path("./");
+-  scene->set_paths(scene_path, "test_scene");
+- #ifdef DEBUG
+-  std::cerr << "Leaks Created - scene constructor: " << boct_tree_cell<short,float>::nleaks() << '\n';
+-#endif
+-  unsigned cell_index = 7;
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    //std::cout << "Loading block " << iter.index() << std::endl;
+-    scene->load_block(iter.index());
+-    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
+-    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
+-    auto *tree = new boct_tree<short,float>(0.5f, 3, 1);
+-    //tree->print();
+-    init_tree(tree, cell_index);
+-    //tree->print();
+-    block->init_tree(tree);
+-    scene->write_active_block();
+-    if (cell_index == 0) cell_index = 7;
+-    cell_index--;
+-    ++iter;
+-  }
+-  //scene->unload_active_blocks();
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << '\n';
+-#endif
+-
+-  return scene;
+-}
+-
+-void clean_up()
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());
+-    //vul_file::delete_file_glob(file_it());// already deleted ?? FIX_ME
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/tests/test_utils.h b/contrib/brl/bseg/boxm/tests/test_utils.h
+deleted file mode 100644
+index 43f864a0da..0000000000
+--- a/contrib/brl/bseg/boxm/tests/test_utils.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#ifndef boxm_test_utils_h_
+-#define boxm_test_utils_h_
+-//:
+-// \file
+-// \brief  A file containing utility functions for other tests
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <boxm/boxm_scene.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i);
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2);
+-
+-void clean_up();
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/CMakeLists.txt b/contrib/brl/bseg/boxm/util/CMakeLists.txt
+deleted file mode 100644
+index 10f3b5fd49..0000000000
+--- a/contrib/brl/bseg/boxm/util/CMakeLists.txt
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# brl/bseg/boxm/util/CMakeLists.txt
+-include_directories( ${MUL_INCLUDE_DIR} )
+-set(boxm_util_sources
+-    boxm_cell_data_traits.h                 boxm_cell_data_traits.cxx
+-    boxm_plane_ransac.h
+-    boxm_quad_scan_iterator.h               boxm_quad_scan_iterator.cxx
+-    boxm_rational_camera_utils.h            boxm_rational_camera_utils.cxx
+-    boxm_raytrace_operations.h              boxm_raytrace_operations.cxx
+-    boxm_triangle_interpolation_iterator.h  boxm_triangle_interpolation_iterator.hxx
+-    boxm_triangle_scan_iterator.h           boxm_triangle_scan_iterator.cxx
+-    boxm_utils.h                            boxm_utils.cxx
+-    boxm_vrml_util.h
+-    boxm_test_util.h                        boxm_test_util.cxx
+-   )
+-
+-aux_source_directory(Templates boxm_util_sources)
+-
+-vxl_add_library(LIBRARY_NAME boxm_util LIBRARY_SOURCES ${boxm_util_sources})
+-target_link_libraries(boxm_util boxm boxm_sample bvrml boct bsta ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx b/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
+deleted file mode 100644
+index 3a276cc3b2..0000000000
+--- a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
+-
+-BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
+deleted file mode 100644
+index b4bf234941..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
++++ /dev/null
+@@ -1,25 +0,0 @@
+-#include "boxm_cell_data_traits.h"
+-//:
+-// \file
+-
+-
+-//: Template specialization of zero_val for floating point case
+-template <>
+-float boxm_zero_val<short, float>()
+-{
+-  return 0.0f;
+-}
+-
+-
+-//: Template specialization of zero_val for unimodal gaussian
+-template <>
+-bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >()
+-{
+-  return {};
+-}
+-
+-template <>
+-mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>()
+-{
+-  return {};
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
+deleted file mode 100644
+index c96599e730..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
++++ /dev/null
+@@ -1,89 +0,0 @@
+-// This is brl/bseg/boxm/util/boxm_cell_data_traits.h
+-#ifndef boxm_cell_data_traits_h_
+-#define boxm_cell_data_traits_h_
+-//:
+-// \file
+-// \brief  Set of accessors of cell's data, taking care of different datatypes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date   December 9, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boct/boct_tree_cell.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <boxm/sample/boxm_scalar_sample.h>
+-
+-//: Float to float
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, float >* cell,  double /*step_len*/)
+-{
+-  //return 1.0 - std::exp(-cell->data()*step_len);
+-  return cell->data();
+-}
+-
+-//: Float to float
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, short >* cell,  double /*step_len*/)
+-{
+-  return (float)cell->data();
+-}
+-
+-//: bool to float
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, bool >* cell,  double /*step_len*/)
+-{
+-  return (float)cell->data();
+-}
+-
+-//: Mixture of gaussians to float; return the mean
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, bsta_num_obs<bsta_gauss_sf1> >* cell, double /*step_len*/)
+-{
+-  return cell->data().mean();
+-}
+-
+-//: Mixture of gaussians to float; return the mean
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >* cell, double /*step_len*/)
+-{
+-  return cell->data().expected_value();
+-}
+-
+-//: boxm_sample to float. Return the probability values
+-template <class T_loc, class T_data>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, T_data >* cell, double step_len)
+-{
+-  return 1.f - float(std::exp(-cell->data().basic_val()*step_len));
+-}
+-
+-
+-template <class T_loc, class T_data>
+-T_data boxm_zero_val()
+-{
+-  return T_data(0);
+-}
+-
+-static const unsigned int n_gaussian_modes_ = 3;
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
+-typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
+-template <>
+-mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>();
+-
+-template <>
+-bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >();
+-
+-template <>
+-float boxm_zero_val<short, float >();
+-
+-//: boxm_scalar_sample to float. Return the normalized scalar value
+-template <class T_loc>
+-float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_scalar_sample<float>  >* cell, double /*step_len*/)
+-{
+-  return cell->data().basic_val();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h b/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
+deleted file mode 100644
+index 07d10348a6..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
++++ /dev/null
+@@ -1,126 +0,0 @@
+-#ifndef boxm_plane_ransac_h_
+-#define boxm_plane_ransac_h_
+-//:
+-// \file
+-// \brief class to find the optimal intersecting 3D line of a set of 3D planes.
+-//
+-// \author G. Tunali
+-//
+-// \verbatim
+-//  Modifications
+-//   Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
+-// \endverbatim
+-
+-#include <iostream>
+-#include <cstdlib>
+-#include <list>
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vgl/algo/vgl_intersection.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_distance.h>
+-#include <vgl/vgl_vector_3d.h>
+-#include <vgl/vgl_closest_point.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#define ITER_MAX 100
+-
+-template <class T>
+-bool boxm_plane_ransac(std::vector<boxm_edge_tangent_sample<T> > aux_samples,
+-                       std::vector<T> /*weights*/,
+-                       vgl_infinite_line_3d<T>& line,
+-                       T &min_res, vgl_box_3d<double> cell_global_box,
+-                       unsigned int threshold, float ortho_thres = 0.01f, float volume_ratio = 128.0f)
+-{
+-  unsigned int num_imgs = aux_samples.size();
+-
+-  vgl_point_3d<T> local_origin((T)cell_global_box.centroid_x(),(T)cell_global_box.centroid_y(),(T)cell_global_box.centroid_z());
+-  std::list<vgl_plane_3d<T> > fit_planes;
+-  min_res=T(1e10);
+-  line=vgl_infinite_line_3d<T>(vgl_vector_2d<T>(-10000,-10000),vgl_vector_3d<T>(0,0,1));
+-  std::vector<T> ws;
+-  bool set=false;
+-  // this threshold is to check participation from number of images
+-  if (num_imgs<=threshold)
+-    return set;
+-
+-  for (unsigned iter=0; iter<ITER_MAX; iter++)
+-  {
+-    fit_planes.clear();
+-    ws.clear();
+-    // select two imgs randomly
+-    int index1 = std::rand() % num_imgs;
+-    int index2 = index1;
+-    while (index2==index1)
+-      index2=std::rand() % num_imgs;
+-
+-    int index1_1 =std::rand() % aux_samples[index1].num_obs();
+-    int index2_1 =std::rand() % aux_samples[index2].num_obs();
+-
+-    vgl_plane_3d<T> plane1 = aux_samples[index1].obs(index1_1).plane_;
+-    vgl_plane_3d<T> plane2 = aux_samples[index2].obs(index2_1).plane_;
+-
+-    vgl_infinite_line_3d<T> inters_line;
+-    // form a hypothesis
+-    if (vgl_intersection(plane1, plane2, inters_line))
+-    {
+-      vgl_vector_3d<T> line_dir = inters_line.direction();
+-      vgl_point_3d<T> p=vgl_closest_point<T>(inters_line,local_origin);
+-      int cnt_imgs=0;
+-      // only if the hypothesis is close to the cell in consideration
+-      // can be made more tighter.
+-      if (vgl_distance<T>(p,local_origin)<0.67*cell_global_box.width())
+-      {
+-        for (unsigned i=0; i<aux_samples.size(); ++i) {
+-          bool flag=false;
+-          for (unsigned j=0;j<aux_samples[i].num_obs();j++)
+-          {
+-            vgl_plane_3d<T> plane = aux_samples[i].obs(j).plane_;
+-            vgl_vector_3d<T> normal = plane.normal();
+-            // see if the line direction and plane normal is perpendicular
+-            T res = dot_product(normal,line_dir);
+-            if (std::fabs(res) < T(ortho_thres))  {  // ortho_thres, used to be hard-coded to 0.05, then made a param with default 0.01 (stricter)
+-              // check to see if the line is close to the plane
+-              if (plane.contains(p,T(cell_global_box.width())/T(volume_ratio)))  // volume_ratio, used to be hard-coded to 8, then made a param with default 128 (stricter)
+-              {
+-                fit_planes.push_back(plane);
+-                //ws.push_back(weights[i]);
+-                ws.push_back(aux_samples[i].obs(j).seg_len_);
+-                flag=true;
+-              }
+-            }
+-          }
+-          if (flag)
+-            cnt_imgs++;
+-        }
+-      }
+-
+-      // intersect the selected planes
+-      if (cnt_imgs > (int)threshold ) {
+-        T res=0;
+-        vgl_infinite_line_3d<T> l;
+-        bool good = vgl_intersection(fit_planes, ws, l, res);
+-        vgl_point_3d<double> p0,p1;
+-        vgl_vector_2d<double> x0(l.x0().x(), l.x0().y());
+-        vgl_vector_3d<double> dir(l.direction().x(), l.direction().y(), l.direction().z());
+-
+-        if (good&&vgl_intersection<double>(cell_global_box, vgl_infinite_line_3d<double>(x0,dir), p0, p1)) {
+-          if (res<min_res) {
+-            min_res=res;
+-            line=l;
+-            set=true;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  return set;
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
+deleted file mode 100644
+index c1e220a294..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
++++ /dev/null
+@@ -1,188 +0,0 @@
+-#include <vector>
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_quad_scan_iterator.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: constructor
+-boxm_quad_scan_iterator::boxm_quad_scan_iterator(double *verts_x, double *verts_y,
+-                                                 unsigned int v0, unsigned int v1,
+-                                                 unsigned int v2, unsigned int v3):poly_()
+-{
+-  poly_.new_sheet();
+-
+-  poly_.push_back(verts_x[v0] * supersample_ratio_ - 0.5,
+-                  verts_y[v0] * supersample_ratio_ - 0.5);
+-  poly_.push_back(verts_x[v1] * supersample_ratio_ - 0.5,
+-                  verts_y[v1] * supersample_ratio_ - 0.5);
+-  poly_.push_back(verts_x[v2] * supersample_ratio_ - 0.5,
+-                  verts_y[v2] * supersample_ratio_ - 0.5);
+-  poly_.push_back(verts_x[v3] * supersample_ratio_ - 0.5,
+-                  verts_y[v3] * supersample_ratio_ - 0.5);
+-
+-  super_it_= new vgl_polygon_scan_iterator<double>(poly_,false);
+-
+-  poly_bb_.update(verts_x[v0], verts_y[v0]);
+-  poly_bb_.update(verts_x[v1], verts_y[v1]);
+-  poly_bb_.update(verts_x[v2], verts_y[v2]);
+-  poly_bb_.update(verts_x[v3], verts_y[v3]);
+-
+-  int poly_xmin = (int)std::floor(poly_bb_.xmin());
+-  int poly_xmax = (int)std::floor(poly_bb_.xmax()) + 1;
+-  poly_diameter_x_ = (poly_xmax - poly_xmin) + 1;
+-  aa_vals_ = new float[poly_diameter_x_];
+-  aa_vals_offset_ = -poly_xmin;
+-  next_return_ = false;
+-}
+-
+-
+-//: Resets the scan iterator to before the first scan line
+-//  After calling this function, next() needs to be called before
+-//  startx() and endx() form a valid scan line.
+-void boxm_quad_scan_iterator::reset()
+-{
+-  super_it_->reset();
+-  next_return_ = super_it_->next();
+-  while (next_return_ && super_it_->scany() < 0) {
+-    next_return_ = super_it_->next();
+-  }
+-}
+-
+-//: Tries to move to the next scan line.
+-//  Returns false if there are no more scan lines.
+-bool boxm_quad_scan_iterator::next()
+-{
+-  if (!next_return_) {
+-    return false;
+-  }
+-  int super_scany = super_it_->scany();
+-  scany_ = super_scany / supersample_ratio_; // super_scany should always be >= 0
+-
+-  // initialize startx_ and endx_
+-  startx_ = int(poly_bb_.xmax()) + 1;
+-  endx_ =  int(poly_bb_.xmin()) - 1;
+-
+-  // compute antialiasing values for each pixel in scanline
+-  //std::fill(aa_vals_.begin(), aa_vals_.end(), 0.0f);
+-  for (unsigned int i=0; i<poly_diameter_x_; i++)
+-    aa_vals_[i] = 0.0f;
+-
+-  int super_scany_end = (scany_ + 1)*supersample_ratio_;
+-  static const float increment = 1.0f / (supersample_ratio_*supersample_ratio_);
+-  static const float full_increment = 1.0f / (supersample_ratio_);
+-
+-  while ( (super_scany < super_scany_end) && next_return_ ) {
+-    int super_startx = super_it_->startx();
+-    int super_endx = super_it_->endx() + 1;
+-
+-    super_startx = std::max(0, super_startx);
+-    super_endx = std::max(0, super_endx);
+-    // make sure super_startx < super_endx
+-    if (super_endx > super_startx) {
+-      int scanline_startx = super_startx / supersample_ratio_;
+-      int scanline_endx = ((super_endx - 1)/ supersample_ratio_) + 1;
+-      // update startx and endx
+-      if (scanline_startx < startx_) {
+-        startx_ = scanline_startx;
+-      }
+-      if (scanline_endx > endx_) {
+-        endx_ = scanline_endx;
+-      }
+-      // case 1: run covers 1 superpixel only
+-      if (scanline_startx + 1 == scanline_endx) {
+-        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(super_endx - super_startx);
+-      }
+-      // case 2: startx is less than endx by more than 1
+-      else {
+-        // partial coverage at the beginning of scanline
+-        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(supersample_ratio_ - (super_startx % supersample_ratio_));
+-
+-        // full coverage in middle of scanline
+-        for (int x = scanline_startx + 1; x < scanline_endx-1; ++x) {
+-          aa_vals_[aa_vals_offset_ + x] += full_increment;
+-        }
+-        // partial coverage at end of scanline
+-        aa_vals_[aa_vals_offset_ + scanline_endx - 1] += increment*((super_endx - 1)% supersample_ratio_ + 1);
+-      }
+-    }
+-    next_return_ = super_it_->next();
+-    super_scany = super_it_->scany();
+-  }
+-  return true;
+-}
+-
+-//: y-coordinate of the current scan line.
+-int boxm_quad_scan_iterator::scany() const
+-{
+-  return scany_;
+-}
+-
+-//: Returns starting x-value of the current scan line.
+-//  startx() should be smaller than endx(), unless the scan line is empty
+-int boxm_quad_scan_iterator::startx() const
+-{
+-  return startx_;
+-}
+-
+-//: Returns ending x-value of the current scan line.
+-//  endx() should be larger than startx(), unless the scan line is empty
+-int  boxm_quad_scan_iterator::endx() const
+-{
+-  return endx_;
+-}
+-
+-//: returns the amount of pixel at location x in the current scanline covered by the triangle
+-float boxm_quad_scan_iterator::pix_coverage(int x)
+-{
+-  return aa_vals_[aa_vals_offset_ + x];
+-}
+-
+-bool
+-boxm_quad_scan_iterator:: x_start_end_val(const double * vals,double & start_val,double & end_val)
+-{
+-  int * chainnum=nullptr;
+-  int * vertnum=nullptr;
+-  int numcrossedges=0;
+-  super_it_->get_crossedge_vertices(chainnum,vertnum,numcrossedges);
+-  if (numcrossedges==2)
+-  {
+-    for (int i=0;i<numcrossedges;++i)
+-    {
+-      vgl_point_2d<double> p1=poly_[chainnum[i]][vertnum[i]];
+-      double val1=vals[vertnum[i]];
+-      double val2=0;
+-      vgl_point_2d<double> p2;
+-      if (vertnum[i]==3)
+-      {
+-        val2=vals[0];
+-        p2=poly_[chainnum[i]][0];
+-      }
+-      else
+-      {
+-        val2=vals[vertnum[i]+1];
+-        p2=poly_[chainnum[i]][vertnum[i]+1];
+-      }
+-      if (i==0)
+-        start_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
+-      else
+-        end_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
+-    }
+-    delete [] vertnum;
+-    delete [] chainnum;
+-    return true;
+-  }
+-  else
+-    return false;
+-}
+-
+-
+-boxm_quad_scan_iterator::~boxm_quad_scan_iterator()
+-{
+-  delete super_it_;
+-  delete[] aa_vals_;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
+deleted file mode 100644
+index 86c7bd0565..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
++++ /dev/null
+@@ -1,66 +0,0 @@
+-#ifndef boxm_quad_scan_iterator_h_
+-#define boxm_quad_scan_iterator_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vgl/vgl_region_scan_iterator.h>
+-#include <vgl/vgl_polygon_scan_iterator.h>
+-
+-#include <vbl/vbl_bounding_box.h>
+-
+-class boxm_quad_scan_iterator : public vgl_region_scan_iterator
+-{
+- public:
+-  //: constructor
+-  boxm_quad_scan_iterator(double *verts_x, double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2, unsigned int v3 = 3);
+-  ~boxm_quad_scan_iterator() override;
+-
+-  //: Resets the scan iterator to before the first scan line
+-  //  After calling this function, next() needs to be called before
+-  //  startx() and endx() form a valid scan line.
+-  void reset() override;
+-
+-  //: Tries to move to the next scan line.
+-  //  Returns false if there are no more scan lines.
+-  bool next() override;
+-
+-  //: y-coordinate of the current scan line.
+-  int  scany() const override;
+-
+-  //: Returns starting x-value of the current scan line.
+-  //  startx() should be smaller than endx(), unless the scan line is empty
+-  int  startx() const override;
+-
+-  //: Returns ending x-value of the current scan line.
+-  //  endx() should be larger than startx(), unless the scan line is empty
+-  int  endx() const override;
+-
+-  //: returns the amount of pixel at location x in the current scanline covered by the triangle
+-  float pix_coverage(int x);
+-
+-  bool x_start_end_val(const double * vals,double & start_val,double & end_val);
+-
+-
+- protected:
+-  static const unsigned int supersample_ratio_ = 1;
+-  vgl_polygon_scan_iterator<double> * super_it_;
+-  vgl_polygon<double>  poly_;
+-
+-  int startx_;
+-  int endx_;
+-  int scany_;
+-  bool next_return_;
+-
+-  unsigned int poly_diameter_x_;
+-  float* aa_vals_;
+-  int aa_vals_offset_;
+-
+-  vbl_bounding_box<double,2> poly_bb_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
+deleted file mode 100644
+index 4ffdd47b22..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
++++ /dev/null
+@@ -1,36 +0,0 @@
+-#include "boxm_rational_camera_utils.h"
+-#include <vgl/vgl_point_2d.h>
+-
+-vgl_plane_3d<double>
+-boxm_rational_camera_utils::boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
+-                                                           vgl_plane_3d<double> top,
+-                                                           vgl_plane_3d<double> bottom,
+-                                                           unsigned ni, unsigned nj)
+-{
+-   vgl_point_3d<double> top_guess(0,0,-top.d()/top.c());
+-   vgl_point_3d<double> bottom_guess(0,0,-bottom.d()/bottom.c());
+-   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),top,top_guess,top_guess);
+-   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),bottom,bottom_guess,bottom_guess);
+-
+-   vgl_plane_3d<double> parallelplane(bottom_guess-top_guess,top_guess);
+-
+-   return parallelplane;
+-}
+-
+-void
+-boxm_rational_camera_utils::project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
+-                                                            vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
+-                                                            double* xverts, double* yverts,
+-                                                            float* vertdist)
+-{
+-  double a=plane.a();
+-  double b=plane.b();
+-  double c=plane.c();
+-  double d=plane.d();
+-  double denom=std::sqrt(a*a+b*b+c*c);
+-  for (unsigned i=0; i<corners.size(); ++i)
+-  {
+-    rcam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
+-    vertdist[i]=float((corners[i].x()*a+corners[i].y()*b+corners[i].z()*c+d)/denom);
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
+deleted file mode 100644
+index 61c9252276..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#ifndef boxm_rational_camera_utils_h
+-#define boxm_rational_camera_utils_h
+-
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-#include <vpgl/algo/vpgl_backproject.h>
+-
+-class boxm_rational_camera_utils
+-{
+- public:
+-  static vgl_plane_3d<double>  boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
+-                                                              vgl_plane_3d<double> top,
+-                                                              vgl_plane_3d<double> bottom,
+-                                                              unsigned ni, unsigned nj);
+-  static void project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
+-                                              vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
+-                                              double* xverts, double* yverts,
+-                                              float* vertdist);
+-};
+-
+-class abs_functor
+-{
+- public:
+-  abs_functor()= default;
+-
+-  float operator()(float x) const { return std::fabs(x); }
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
+deleted file mode 100644
+index 1b1a95623b..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
++++ /dev/null
+@@ -1,232 +0,0 @@
+-#include "boxm_raytrace_operations.h"
+-
+-bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance)
+-{
+-  // multiply each vertex distance by alpha
+-  float vert_alpha_distances[8];
+-  float *vert_dist_ptr = vert_distances;
+-  float *vert_alpha_dist_ptr = vert_alpha_distances;
+-  for (unsigned int i=0; i<8; ++i) {
+-    *vert_alpha_dist_ptr++ = *vert_dist_ptr++ * alpha;
+-  }
+-
+-  // for each face, create two triangle iterators and fill in pixel data
+-  // X_LOW
+-  // tri 0
+-  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_alpha_distances, 0, 4, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-
+-  // X_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 1, 2, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 2, 6, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-
+-  // Y_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 5, 4);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // Y_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 2, 6);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 6, 7);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // Z_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 2);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 2, 3);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  // Z_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 5, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, alpha_distance, true);
+-  else
+-    tri_interpolate_values(tri_it, alpha_distance, false);
+-
+-  return true;
+-}
+-
+-
+-bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
+-                     float* vert_distances, boct_face_idx visible_faces,
+-                     vil_image_view<float> &depth_image)
+-{
+-  // for each face, create two triangle iterators and fill in pixel data
+-  // X_LOW
+-  // tri 0
+-  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_distances, 0, 4, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 3);
+-  if (visible_faces & X_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-
+-  // X_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 1, 2, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 2, 6, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-
+-  // Y_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 5, 4);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // Y_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 2, 6);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 6, 7);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // Z_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 2);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 2, 3);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  // Z_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 5, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolate_values(tri_it, depth_image, true);
+-
+-  return true;
+-}
+-
+-
+-bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val)
+-{
+-  // for each face, create two triangle iterators and fill in pixel data
+-  boxm_triangle_scan_iterator tri_it(xverts_2d, yverts_2d, 0,4,3);
+-  if (visible_faces & X_LOW) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 4, 3);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 3);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & X_HIGH) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 1, 2, 5);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 2, 6, 5);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Y_LOW) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 5);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 5, 4);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Y_HIGH) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 2, 6);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 6, 7);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Z_LOW) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 2);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 2, 3);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  if (visible_faces & Z_HIGH) {
+-    // tri 0
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 5, 6);
+-    tri_fill_value(tri_it, img, val);
+-    // tri 1
+-    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 6);
+-    tri_fill_value(tri_it, img, val);
+-  }
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
+deleted file mode 100644
+index ee6147127b..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
++++ /dev/null
+@@ -1,452 +0,0 @@
+-#ifndef boxm_raytrace_operations_h_
+-#define boxm_raytrace_operations_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include "boxm_triangle_interpolation_iterator.h"
+-#include "boxm_triangle_scan_iterator.h"
+-#include <boxm/boxm_apm_traits.h>
+-
+-#include <vnl/algo/vnl_determinant.h>
+-#include <vgl/vgl_triangle_scan_iterator.h>
+-#include <boct/boct_tree.h>
+-#include <vil/vil_image_view.h>
+-
+-#if 0
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#endif
+-
+-bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val);
+-
+-bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance);
+-bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
+-                     float* vert_distances, boct_face_idx visible_faces,
+-                     vil_image_view<float> &depth_image);
+-template<class T, class tri_int_it_t>
+-bool tri_interpolated_weighted_sum(tri_int_it_t &tri_it, vil_image_view<T> const& values, T &val_sum, float &weight_sum, bool subtract)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= values.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
+-
+-    if (subtract) {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        float point_dist = tri_it.value_at(x);
+-        val_sum -= values(x,yu) * point_dist;
+-        weight_sum -= point_dist;
+-      }
+-    }
+-    else {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        float point_dist = tri_it.value_at(x);
+-        val_sum += values(x,yu) * point_dist;
+-        weight_sum += point_dist;
+-      }
+-    }
+-  }
+-  return true;
+-}
+-
+-//: returns the sum of the weights
+-template<class T1, class T2, class tri_it_t>
+-bool tri_interpolated_weighted_sum(tri_it_t &tri_it, vil_image_view<T1> const& weights, vil_image_view<T2> const& values, T2 &val_sum, T1 &weight_sum, bool subtract=false)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= values.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
+-
+-    if (subtract) {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        T1 weight = tri_it.value_at(x)*weights(x,yu);
+-        val_sum -= weight * values(x,yu);
+-        weight_sum -= weight;
+-      }
+-    }
+-    else {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        T1 weight = tri_it.value_at(x)*weights(x,yu);
+-        val_sum += weight * values(x,yu);
+-        weight_sum += weight;
+-      }
+-    }
+-  }
+-  return true;
+-}
+-
+-
+-template<class T, class tri_it_t>
+-void tri_interpolate_values(tri_it_t &tri_it, vil_image_view<T> &img, bool subtract = false)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    if (subtract) {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        img(x,yu) -= tri_it.value_at(x);
+-      }
+-    }
+-    else {
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        img(x,yu) += tri_it.value_at(x);
+-      }
+-    }
+-  }
+-  return;
+-}
+-
+-
+-#if 0
+-template<class T, class tri_it_T>
+-void tri_interpolate_values(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &img, vil_image_view<float> &pix_coverage, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
+-{
+-  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  // (no need to compute barycentric coordinates at each step)
+-  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
+-  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
+-  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
+-  double Acol2[] = {1.0, 1.0, 1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2);
+-  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
+-  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
+-  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
+-
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu > img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      T interp_val = (T)(s0*x + s1*y + s2);
+-      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
+-        min_img(x,yu) = interp_val;
+-      }
+-      if (max_img(x,yu) < interp_val) {
+-        max_img(x,yu) = interp_val;
+-      }
+-    }
+-  }
+-  return;
+-}
+-#endif
+-
+-template<class T, class tri_it_T>
+-void tri_interpolate_min_max(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &min_img, vil_image_view<T> &max_img, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
+-{
+-  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  // (no need to compute barycentric coordinates at each step)
+-  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
+-  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
+-  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
+-  double Acol2[] = {1.0, 1.0, 1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2);
+-  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
+-  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
+-  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
+-
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= max_img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)max_img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)max_img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      T interp_val = (T)(s0*x + s1*y + s2);
+-      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
+-        min_img(x,yu) = interp_val;
+-      }
+-      if (max_img(x,yu) < interp_val) {
+-        max_img(x,yu) = interp_val;
+-      }
+-    }
+-  }
+-  return;
+-}
+-
+-template<class T1, class T2>
+-void tri_weighted_sum(vgl_triangle_scan_iterator<double> &tri_it, vil_image_view<T1> &img, vil_image_view<T2> &weights, T1 &val_sum, T2 &weight_sum)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      val_sum += img(x,yu)*weights(x,yu);
+-      weight_sum += weights(x,yu);
+-    }
+-  }
+-  return;
+-}
+-
+-template<class T, class tri_it_T>
+-void tri_fill_value(tri_it_T &tri_it, vil_image_view<T> &img, T val)
+-{
+-  tri_it.reset();
+-  while (tri_it.next()) {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      img(x,yu) = val;
+-    }
+-  }
+-  return;
+-}
+-
+-#if 0 // this function commented out
+-template <class T>
+-void tri_fill_value_aa(boxm_triangle_scan_iterator_aa &tri_it, vil_image_view<T> &img, vil_image_view<float> &aa_weights, T val)
+-{
+-  tri_it.reset();
+-  while (tri_it.next())
+-  {
+-    int y = tri_it.scany();
+-    if (y < 0) {
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      float pix_cov = tri_it.pix_coverage(x);
+-      if ((pix_cov < 0.0f) || (pix_cov > 1.0f)) {
+-        std::cerr << " error: pix_cov = " << pix_cov << std::endl;
+-      }
+-      aa_weights(x,yu) += tri_it.pix_coverage(x);
+-      img(x,yu) += val * pix_cov;
+-    }
+-  }
+-  return;
+-}
+-#endif // 0
+-
+-template<class T>
+-bool cube_mean(double* xverts_2d, double* yverts_2d, float* vert_dists, boct_face_idx visible_faces, vil_image_view<T> const& values, T &mean)
+-{
+-  // for each face, create two triangle iterators to interpolate distances
+-  T value_sum(0);
+-  float weight_sum(0);
+-  // X_LOW
+-  // tri 0
+-  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_dists, 0, 3, 4);
+-  if (visible_faces & X_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 3, 4, 7);
+-  if (visible_faces & X_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // X_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 1, 2, 5);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 5, 6);
+-  if (visible_faces & X_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Y_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 1, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 0, 5);
+-  if (visible_faces & Y_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Y_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 7, 3, 2);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 6, 7);
+-  if (visible_faces & Y_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Z_LOW
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 1);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 3);
+-  if (visible_faces & Z_LOW)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  // Z_HIGH
+-  // tri 0
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 5, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-  // tri 1
+-  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 7, 6);
+-  if (visible_faces & Z_HIGH)
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
+-  else
+-    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
+-
+-  if (std::fabs(weight_sum) > 1e-6)  {
+-    mean = value_sum / weight_sum;
+-  }
+-  else {
+-    mean = T(0);
+-    return false;
+-  }
+-  return true;
+-}
+-
+-inline void init_triangle_scan_iterator(vgl_triangle_scan_iterator<double> &tri_it, const double* xverts, const double* yverts, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
+-{
+-  // subtract 0.5 to follow convention that the center of pixel i,j is located at coordinates i+0.5, j+0.5
+-  tri_it.a.x = xverts[v0] - 0.5; tri_it.a.y = yverts[v0] - 0.5;
+-  tri_it.b.x = xverts[v1] - 0.5; tri_it.b.y = yverts[v1] - 0.5;
+-  tri_it.c.x = xverts[v2] - 0.5; tri_it.c.y = yverts[v2] - 0.5;
+-}
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx b/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
+deleted file mode 100644
+index 1586ba9fcd..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
++++ /dev/null
+@@ -1,141 +0,0 @@
+-#include "boxm_test_util.h"
+-#include <vgl/vgl_line_3d_2_points.h>
+-#include <vnl/io/vnl_io_matrix_fixed.h>
+-#include <vgl/algo/vgl_rotation_3d.h>
+-
+-void generate_persp_camera(double focal_length,
+-                           vgl_point_2d<double>& pp,  //principal point
+-                           double x_scale, double y_scale,
+-                           vgl_point_3d<double>& camera_center,
+-                           vpgl_perspective_camera<double>& cam)
+-{
+-  vpgl_calibration_matrix<double> K(focal_length,pp, x_scale, y_scale);
+-  cam.set_calibration(K);
+-  cam.set_camera_center(camera_center);
+-}
+-
+-vpgl_rational_camera<double>
+-perspective_to_rational(vpgl_perspective_camera<double>& cam_pers)
+-{
+-  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
+-  std::vector<double> neu_u,den_u,neu_v,den_v;
+-  double x_scale = 1.0, x_off = 0.0,
+-         y_scale = 1.0, y_off = 0.0,
+-         z_scale = 1.0, z_off = 0.0,
+-         u_scale = 1.0, u_off = 0.0,
+-         v_scale = 1.0, v_off = 0.0;
+-
+-  for (int i=0; i<20; i++) {
+-    neu_u.push_back(0.0);
+-    neu_v.push_back(0.0);
+-    den_u.push_back(0.0);
+-    den_v.push_back(0.0);
+-  }
+-
+-  int vector_map[] = {9,15,18,19};
+-
+-  for (int i=0; i<4; i++) {
+-    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
+-    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
+-    den_u[vector_map[i]] = cam_pers_matrix(2,i);
+-    den_v[vector_map[i]] = cam_pers_matrix(2,i);
+-  }
+-
+-  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
+-                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
+-                                       u_scale,u_off,v_scale,v_off);
+-  return cam_rat;
+-}
+-
+-vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
+-
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-
+-  vpgl_perspective_camera<double> persp_cam;
+-  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-        double r[] = { 1, 0, 0,
+-              0, -1, 0,
+-              0, 0, -1 };
+-
+-  vnl_matrix_fixed<double,3,3> R(r);
+-  persp_cam.set_rotation(vgl_rotation_3d<double>(R));
+-
+-  //persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
+-  vpgl_rational_camera<double>* rat_cam = new vpgl_rational_camera<double>(perspective_to_rational(persp_cam));
+-  return rat_cam;
+-}
+-
+-vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
+-
+-  vgl_point_3d<double> centroid = world.centroid();
+-  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
+-
+-  std::vector<vpgl_camera_double_sptr> rat_cameras;
+-
+-  auto * persp_cam= new vpgl_perspective_camera<double>();
+-  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, *persp_cam);
+-  persp_cam->look_at(vgl_homg_point_3d<double>(centroid));
+-  return persp_cam;
+-}
+-
+-std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
+-
+-  std::vector<vgl_point_3d<double> > centers;
+-  unsigned i=0;
+-  for (double t=0; t<=1.0; t+=0.1) {
+-    vgl_point_3d<double> centroid = diag.point_t(1-t);
+-    centers.push_back(centroid);
+-    std::cout << centers[i++] << std::endl;
+-  }
+-
+-  std::vector<vpgl_camera_double_sptr> cameras;
+-  for (auto camera_center : centers)
+-  {
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
+-    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-  }
+-  return cameras;
+-}
+-
+-std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world)
+-{
+-  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
+-
+-  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
+-
+-  std::vector<vgl_point_3d<double> > centers;
+-  vgl_point_3d<double> centroid(0,0,0);
+-  double x,y;
+-  double alpha = 0;
+-  double delta_alpha = vnl_math::pi/9.;
+-  for (unsigned i=0; i<11; i++) {
+-    x = boxm_camera_dist*std::cos(alpha);
+-    y = boxm_camera_dist*std::sin(alpha);
+-    centers.emplace_back(centroid.x()+x, centroid.y()+y, centroid.z());
+-    std::cout << centers[i] << std::endl;
+-    alpha += delta_alpha;
+-  }
+-
+-  std::vector<vpgl_camera_double_sptr> cameras;
+-  for (auto camera_center : centers)
+-  {
+-    vpgl_perspective_camera<double> persp_cam;
+-    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
+-    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
+-    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
+-  }
+-  return cameras;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.h b/contrib/brl/bseg/boxm/util/boxm_test_util.h
+deleted file mode 100644
+index b960b6d3c7..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_test_util.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#ifndef boxm_test_util_h
+-#define boxm_test_util_h
+-//:
+-// \file
+-#include <boct/boct_tree.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vpgl/vpgl_rational_camera.h>
+-
+-typedef boct_tree<short,vgl_point_3d<double> > tree_type;
+-
+-constexpr int IMAGE_U = 800;
+-constexpr int IMAGE_V = 500;
+-constexpr int boxm_x_scale = 500;
+-constexpr int boxm_y_scale = 500;
+-constexpr double boxm_focal_length = 1.0;
+-constexpr double boxm_camera_dist = 300;
+-constexpr unsigned num_train_images = 20;
+-constexpr bool verbose = true;
+-
+-void generate_persp_camera(double focal_length,
+-                           vgl_point_2d<double>& pp,  //principal point
+-                           double x_scale, double y_scale,
+-                           vgl_point_3d<double>& camera_center,
+-                           vpgl_perspective_camera<double>& cam);
+-
+-vpgl_rational_camera<double>
+-perspective_to_rational(vpgl_perspective_camera<double>& cam_pers);
+-
+-vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world);
+-
+-vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world);
+-
+-//: create a trajectory of perspective cameras at the diagonal of world (inside)
+-std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world);
+-
+-std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world);
+-#endif // boxm_test_util_h
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
+deleted file mode 100644
+index e3561eb3b5..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#ifndef boxm_triangle_interpolation_iterator_h_
+-#define boxm_triangle_interpolation_iterator_h_
+-//:
+-// \file
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vgl/vgl_region_scan_iterator.h>
+-#include <vgl/vgl_triangle_scan_iterator.h>
+-
+-template<class T>
+-class boxm_triangle_interpolation_iterator : public vgl_region_scan_iterator
+-{
+- public:
+-  //: constructor
+-  boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *values, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
+-
+-  //: Resets the scan iterator to before the first scan line
+-  //  After calling this function, next() needs to be called before
+-  //  startx() and endx() form a valid scan line.
+-  void reset() override;
+-
+-  //: Tries to move to the next scan line.
+-  //  Returns false if there are no more scan lines.
+-  bool next() override;
+-
+-  //: y-coordinate of the current scan line.
+-  int  scany() const override;
+-
+-  //: Returns starting x-value of the current scan line.
+-  //  startx() should be smaller than endx(), unless the scan line is empty
+-  int  startx() const override;
+-
+-  //: Returns ending x-value of the current scan line.
+-  //  endx() should be larger than startx(), unless the scan line is empty
+-  int  endx() const override;
+-
+-  //: returns the interpolated value at location x in the current scanline
+-  T value_at(int x);
+-
+- protected:
+-
+-  vgl_triangle_scan_iterator<double> tri_it_;
+-
+-  double s0_;
+-  double s1_;
+-  double s2_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
+deleted file mode 100644
+index 8ea38cb6c3..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
++++ /dev/null
+@@ -1,100 +0,0 @@
+-#ifndef boxm_triangle_interpolation_iterator_hxx_
+-#define boxm_triangle_interpolation_iterator_hxx_
+-//:
+-// \file
+-
+-#include <vector>
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_triangle_interpolation_iterator.h"
+-
+-#include <vnl/algo/vnl_determinant.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: constructor
+-template<class T>
+-boxm_triangle_interpolation_iterator<T>::boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *vals, unsigned int v0, unsigned int v1, unsigned int v2)
+-: tri_it_()
+-{
+-  tri_it_.a.x = verts_x[v0]  - 0.5;
+-  tri_it_.a.y = verts_y[v0]  - 0.5;
+-  tri_it_.b.x = verts_x[v1]  - 0.5;
+-  tri_it_.b.y = verts_y[v1]  - 0.5;
+-  tri_it_.c.x = verts_x[v2]  - 0.5;
+-  tri_it_.c.y = verts_y[v2]  - 0.5;
+-
+-
+-  // compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  double Acol0[] = {tri_it_.a.x + 0.5, tri_it_.b.x + 0.5, tri_it_.c.x + 0.5};
+-  double Acol1[] = {tri_it_.a.y + 0.5, tri_it_.b.y + 0.5, tri_it_.c.y + 0.5};
+-  double Acol2[] = {1.0, 1.0, 1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2);
+-  s0_ = vnl_determinant(Z, Acol1, Acol2) / detA;
+-  s1_ = vnl_determinant(Acol0, Z, Acol2) / detA;
+-  s2_ = vnl_determinant(Acol0, Acol1, Z) / detA;
+-
+-  //std::cout << "s0 = " << s0_ <<"  s1 = " << s1_ << " s2 = " << s2_ << std::endl;
+-}
+-
+-
+-//: Resets the scan iterator to before the first scan line
+-//  After calling this function, next() needs to be called before
+-//  startx() and endx() form a valid scan line.
+-template<class T>
+-void boxm_triangle_interpolation_iterator<T>::reset()
+-{
+-  tri_it_.reset();
+-}
+-
+-//: Tries to move to the next scan line.
+-//  Returns false if there are no more scan lines.
+-template<class T>
+-bool boxm_triangle_interpolation_iterator<T>::next()
+-{
+-  return tri_it_.next();
+-}
+-
+-//: y-coordinate of the current scan line.
+-template<class T>
+-int boxm_triangle_interpolation_iterator<T>::scany() const
+-{
+-  return tri_it_.scany();
+-}
+-
+-//: Returns starting x-value of the current scan line.
+-//  startx() should be smaller than endx(), unless the scan line is empty
+-template<class T>
+-int boxm_triangle_interpolation_iterator<T>::startx() const
+-{
+-  return tri_it_.startx();
+-}
+-
+-//: Returns ending x-value of the current scan line.
+-//  endx() should be larger than startx(), unless the scan line is empty
+-template<class T>
+-int  boxm_triangle_interpolation_iterator<T>::endx() const
+-{
+-  return tri_it_.endx() + 1;
+-}
+-
+-
+-//: returns the interpolated value at location x in the current scanline
+-template<class T>
+-T boxm_triangle_interpolation_iterator<T>::value_at(int x)
+-{
+-  return (T)((s0_*(x+0.5) + s1_*(tri_it_.scany()+0.5) + s2_));
+-}
+-
+-
+-#define BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(T) \
+-  template class boxm_triangle_interpolation_iterator<T >
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
+deleted file mode 100644
+index c268ecca30..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
++++ /dev/null
+@@ -1,59 +0,0 @@
+-#include <vector>
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_triangle_scan_iterator.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: constructor
+-boxm_triangle_scan_iterator::boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0, unsigned int v1, unsigned int v2)
+-: tri_it_()
+-{
+-  tri_it_.a.x = verts_x[v0] - 0.5;
+-  tri_it_.a.y = verts_y[v0] - 0.5;
+-  tri_it_.b.x = verts_x[v1] - 0.5;
+-  tri_it_.b.y = verts_y[v1] - 0.5;
+-  tri_it_.c.x = verts_x[v2] - 0.5;
+-  tri_it_.c.y = verts_y[v2] - 0.5;
+-}
+-
+-
+-//: Resets the scan iterator to before the first scan line
+-//  After calling this function, next() needs to be called before
+-//  startx() and endx() form a valid scan line.
+-void boxm_triangle_scan_iterator::reset()
+-{
+-  tri_it_.reset();
+-}
+-
+-//: Tries to move to the next scan line.
+-//  Returns false if there are no more scan lines.
+-bool boxm_triangle_scan_iterator::next()
+-{
+-  return tri_it_.next();
+-}
+-
+-//: y-coordinate of the current scan line.
+-int boxm_triangle_scan_iterator::scany() const
+-{
+-  return tri_it_.scany();
+-}
+-
+-//: Returns starting x-value of the current scan line.
+-//  startx() should be smaller than endx(), unless the scan line is empty
+-int boxm_triangle_scan_iterator::startx() const
+-{
+-  return tri_it_.startx();
+-}
+-
+-//: Returns ending x-value of the current scan line.
+-//  endx() should be larger than startx(), unless the scan line is empty
+-int  boxm_triangle_scan_iterator::endx() const
+-{
+-  return tri_it_.endx() + 1;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
+deleted file mode 100644
+index 47b52ebc26..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
++++ /dev/null
+@@ -1,46 +0,0 @@
+-#ifndef boxm_triangle_scan_iterator_h_
+-#define boxm_triangle_scan_iterator_h_
+-//:
+-// \file
+-
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <vgl/vgl_region_scan_iterator.h>
+-#include <vgl/vgl_triangle_scan_iterator.h>
+-
+-class boxm_triangle_scan_iterator : public vgl_region_scan_iterator
+-{
+- public:
+-  //: constructor
+-  boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
+-
+-  //: Resets the scan iterator to before the first scan line
+-  //  After calling this function, next() needs to be called before
+-  //  startx() and endx() form a valid scan line.
+-  void reset() override;
+-
+-  //: Tries to move to the next scan line.
+-  //  Returns false if there are no more scan lines.
+-  bool next() override;
+-
+-  //: y-coordinate of the current scan line.
+-  int  scany() const override;
+-
+-  //: Returns starting x-value of the current scan line.
+-  //  startx() should be smaller than endx(), unless the scan line is empty
+-  int  startx() const override;
+-
+-  //: Returns ending x-value of the current scan line.
+-  //  endx() should be larger than startx(), unless the scan line is empty
+-  int  endx() const override;
+-
+- protected:
+-
+-  vgl_triangle_scan_iterator<double> tri_it_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_utils.cxx
+deleted file mode 100644
+index 2464b5c4a8..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_utils.cxx
++++ /dev/null
+@@ -1,1469 +0,0 @@
+-#include <cmath>
+-#include <iostream>
+-#include <algorithm>
+-#include "boxm_utils.h"
+-//:
+-// \file
+-#include "boxm_quad_scan_iterator.h"
+-#include <boct/boct_tree_cell.h>
+-#include <vgl/vgl_box_2d.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_vector_2d.h>
+-#include <vgl/vgl_polygon.h>
+-#include <vgl/vgl_intersection.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vnl/algo/vnl_determinant.h>
+-#include <vnl/algo/vnl_matrix_inverse.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bool boxm_utils::is_visible(vgl_box_3d<double> const& bbox,
+-                            vpgl_camera_double_sptr const& camera,
+-                            unsigned int img_ni, unsigned int img_nj,
+-                            bool do_front_test)
+-{
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    // make a test for vertices for behind-front case
+-    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-    if (do_front_test) {
+-      if (cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.max_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.max_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.max_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.min_z()))&&
+-          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.max_z())))
+-        return false;
+-    }
+-  }
+-
+-  // make sure corners project into image bounds
+-  vgl_box_2d<double> cube_proj_bb;
+-  vgl_box_2d<double> img_bb;
+-  img_bb.add(vgl_point_2d<double>(0.0, 0.0));
+-  img_bb.add(vgl_point_2d<double>(img_ni, img_nj));
+-  // project corners of block into image
+-  double u,v;
+-  camera->project(bbox.min_x(),bbox.min_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.min_x(),bbox.min_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.min_x(),bbox.max_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.min_x(),bbox.max_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.min_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.min_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.max_y(),bbox.min_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  camera->project(bbox.max_x(),bbox.max_y(),bbox.max_z(),u,v);
+-  cube_proj_bb.add(vgl_point_2d<double>(u,v));
+-  // check for intersection
+-  vgl_box_2d<double> intersection =  vgl_intersection(cube_proj_bb, img_bb);
+-  return ! intersection.is_empty();
+-}
+-
+-//:
+-// \verbatim
+-//                                 MaxPosition
+-//
+-//                       7-----------6
+-//                      /           /|
+-//                     /           / |
+-//                    4-----------5  |
+-//                    |           |  |
+-//                    |           |  |
+-//                    |    3      |  2
+-//     Z              |           | /
+-//     |   Y          |           |/
+-//     |  /           0-----------1
+-//     | /         MinPosition
+-//     O-----X
+-//
+-// \endverbatim
+-std::vector<vgl_point_3d<double> >
+-boxm_utils::corners_of_box_3d(vgl_box_3d<double> const& box)
+-{
+-  std::vector<vgl_point_3d<double> > corners;
+-
+-  corners.push_back(box.min_point());
+-  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.min_z());
+-  corners.emplace_back(box.min_x()+box.width(), box.min_y()+box.height(), box.min_z());
+-  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.min_z());
+-  corners.emplace_back(box.min_x(), box.min_y(), box.max_z());
+-  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.max_z());
+-  corners.push_back(box.max_point());
+-  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.max_z());
+-  return corners;
+-}
+-
+-void
+-boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
+-                            const vpgl_camera_double_sptr& camera,
+-                            double* xverts, double* yverts)
+-{
+-  for (unsigned i=0; i<corners.size(); ++i)
+-    camera->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
+-}
+-
+-void
+-boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
+-                            const vpgl_camera_double_sptr& camera,
+-                            double* xverts, double* yverts,
+-                            float* vertdist)
+-{
+-    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
+-        for (unsigned i=0; i<corners.size(); ++i)
+-        {
+-            cam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
+-            vertdist[i]=(float)(cam_center-corners[i]).length();
+-        }
+-    }
+-}
+-
+-void
+-boxm_utils::project_point3d(vgl_point_3d<double> const& point,
+-                            const vpgl_camera_double_sptr& camera,
+-                            double & xvert, double &yvert,
+-                            double & vertdist)
+-{
+-    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
+-        cam->project(point.x(), point.y(), point.z(), xvert,yvert);
+-        vertdist=(float)(cam_center-point).length();
+-    }
+-}
+-
+-//: corners of the input face: visible?
+-bool boxm_utils::is_face_visible(const double * xverts, const double *yverts,
+-                                 unsigned id1,unsigned id2,unsigned id3,unsigned  /*id4*/) // id4 unused?!? - FIXME
+-{
+-  double normal=(xverts[id2]-xverts[id1])*(yverts[id3]-yverts[id2])-(yverts[id2]-yverts[id1])*(xverts[id3]-xverts[id2]);
+-  return normal < 0;
+-}
+-
+-//: corners of the input face: visible?
+-bool boxm_utils::is_face_visible(std::vector<vgl_point_3d<double> > &face,
+-                                 vpgl_camera_double_sptr const& camera)
+-{
+-  assert(face.size() >= 3);
+-  std::vector<vgl_point_2d<double> > vs;
+-
+-  for (auto & i : face) {
+-    double u,v;
+-    camera->project(i.x(), i.y(), i.z(), u, v);
+-    vs.emplace_back(u,v);
+-  }
+-
+-  vgl_vector_2d<double> v0 = vs[1] - vs[0];
+-  vgl_vector_2d<double> v1 = vs[2] - vs[1];
+-  auto normal = cross_product<double>(v0,v1);
+-  //if (normal>-1e-4 && normal<0.0)
+-  //    std::cout<<"+";
+-  return normal < -1e-5;
+-}
+-
+-std::vector<vgl_point_2d<double> >
+-boxm_utils::project_face(std::vector<vgl_point_3d<double> > &face,
+-                         vpgl_camera_double_sptr const& camera)
+-{
+-  std::vector<vgl_point_2d<double> > vs;
+-
+-  for (auto & i : face) {
+-    double u,v;
+-    camera->project(i.x(), i.y(), i.z(), u, v);
+-    vs.emplace_back(u,v);
+-  }
+-
+-  return vs;
+-}
+-
+-boct_face_idx
+-boxm_utils::visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera)
+-{
+-  boct_face_idx face_idx = NONE;
+-  //if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-  //  vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-  //  vgl_point_3d<double> const& cam_center = cam->camera_center();
+-
+-  //  if (cam_center.x() > bbox.max_x()) {
+-  //    face_idx |= X_HIGH;
+-  //  }
+-  //  else if (cam_center.x() < bbox.min_x()) {
+-  //    face_idx |= X_LOW;
+-  //  }
+-  //  if (cam_center.y() > bbox.max_y()) {
+-  //    face_idx |= Y_HIGH;
+-  //  }
+-  //  else if (cam_center.y() < bbox.min_y()) {
+-  //    face_idx |= Y_LOW;
+-  //  }
+-  //  if (cam_center.z() > bbox.max_x()) {
+-  //    face_idx |= Z_HIGH;
+-  //  }
+-  //  else if (cam_center.z() < bbox.min_z()) {
+-  //    face_idx |= Z_LOW;
+-  //  }
+-  //}
+-  //// for other cameras, use projection and normals
+-  //else
+-  {
+-    // fix the face normals so that the vertices are in counter-clockwise order
+-    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
+-    faces_of_box_3d(bbox, faces);
+-
+-    if (is_face_visible(faces.find(Z_LOW)->second, camera)) {
+-      face_idx |= Z_LOW;
+-#ifdef DEBUG
+-      std::cout << "Z_LOW " ;
+-#endif
+-    }
+-    if (is_face_visible(faces.find(Z_HIGH)->second, camera)) {
+-      face_idx |= Z_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Z_HIGH " ;
+-#endif
+-    }
+-    if (is_face_visible(faces.find(X_LOW)->second, camera)) {
+-      face_idx |= X_LOW;
+-#ifdef DEBUG
+-      std::cout << "X_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(faces.find(X_HIGH)->second, camera)) {
+-      face_idx |= X_HIGH;
+-#ifdef DEBUG
+-      std::cout << "X_HIGH " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(faces.find(Y_LOW)->second, camera)) {
+-      face_idx |= Y_LOW;
+-#ifdef DEBUG
+-      std::cout << "Y_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(faces.find(Y_HIGH)->second, camera)) {
+-      face_idx |= Y_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Y_HIGH " ;
+-#endif
+-    }
+-  }
+-#ifdef DEBUG
+-  std::cout << std::endl;
+-#endif
+-
+-  return face_idx;
+-}
+-
+-boct_face_idx
+-boxm_utils::visible_faces(vgl_box_3d<double> const& /*bbox*/, // FIXME: currently unused -- see commented out code
+-                          const vpgl_camera_double_sptr& /*camera*/, // idem
+-                          double *xverts, double *yverts)
+-{
+-  boct_face_idx face_idx = NONE;
+-#if 0
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-    vgl_point_3d<double> const& cam_center = cam->camera_center();
+-
+-    if (cam_center.x() > bbox.max_x()) {
+-      face_idx |= X_HIGH;
+-    }
+-    else if (cam_center.x() < bbox.min_x()) {
+-      face_idx |= X_LOW;
+-    }
+-    if (cam_center.y() > bbox.max_y()) {
+-      face_idx |= Y_HIGH;
+-    }
+-    else if (cam_center.y() < bbox.min_y()) {
+-      face_idx |= Y_LOW;
+-    }
+-    if (cam_center.z() > bbox.max_x()) {
+-      face_idx |= Z_HIGH;
+-    }
+-    else if (cam_center.z() < bbox.min_z()) {
+-      face_idx |= Z_LOW;
+-    }
+-  }
+-  // for other cameras, use projection and normals
+-  else
+-#endif // 0
+-  {
+-    // fix the face normals so that the vertices are the counter clockwise order
+-#if 0
+-    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
+-    faces_of_box_3d(bbox, faces);
+-    project_corners(bbox,camera,xverts,yverts);
+-#endif // 0
+-    if (is_face_visible(xverts,yverts,1,0,3,2)) {
+-      face_idx |= Z_LOW;
+-#ifdef DEBUG
+-      std::cout << "Z_LOW " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,4,5,6,7)) {
+-      face_idx |= Z_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Z_HIGH " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,7,3,0,4)) {
+-      face_idx |= X_LOW;
+-#ifdef DEBUG
+-      std::cout << "X_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,1,2,6,5)) {
+-      face_idx |= X_HIGH;
+-#ifdef DEBUG
+-      std::cout << "X_HIGH " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,0,1,5,4)) {
+-      face_idx |= Y_LOW;
+-#ifdef DEBUG
+-      std::cout << "Y_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,2,3,7,6)) {
+-      face_idx |= Y_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Y_HIGH " ;
+-#endif
+-    }
+-  }
+-#ifdef DEBUG
+-  std::cout << std::endl;
+-#endif
+-
+-  return face_idx;
+-}
+-
+-boct_face_idx
+-boxm_utils::visible_faces_cell(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera,
+-                               double *xverts, double *yverts)
+-{
+-  boct_face_idx face_idx = NONE;
+-  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
+-    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
+-    vgl_point_3d<double> const& cam_center = cam->camera_center();
+-
+-    if (cam_center.x() > bbox.max_x()) {
+-      face_idx |= X_HIGH;
+-    }
+-    else if (cam_center.x() < bbox.min_x()) {
+-      face_idx |= X_LOW;
+-    }
+-    if (cam_center.y() > bbox.max_y()) {
+-      face_idx |= Y_HIGH;
+-    }
+-    else if (cam_center.y() < bbox.min_y()) {
+-      face_idx |= Y_LOW;
+-    }
+-    if (cam_center.z() > bbox.max_x()) {
+-      face_idx |= Z_HIGH;
+-    }
+-    else if (cam_center.z() < bbox.min_z()) {
+-      face_idx |= Z_LOW;
+-    }
+-  }
+-  // for other cameras, use projection and normals
+-  else
+-  {
+-    // fix the face normals so that the vertices are the counter clockwise order
+-#if 0
+-    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
+-    faces_of_box_3d(bbox, faces);
+-    double * xverts; double *yverts;
+-    project_corners(bbox,camera,xverts,yverts);
+-#endif // 0
+-    if (is_face_visible(xverts,yverts,1,0,3,2)) {
+-      face_idx |= Z_LOW;
+-#ifdef DEBUG
+-      std::cout << "Z_LOW " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,4,5,6,7)) {
+-      face_idx |= Z_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Z_HIGH " ;
+-#endif
+-    }
+-    if (is_face_visible(xverts,yverts,7,3,0,4)) {
+-      face_idx |= X_LOW;
+-#ifdef DEBUG
+-      std::cout << "X_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,1,2,6,5)) {
+-      face_idx |= X_HIGH;
+-#ifdef DEBUG
+-      std::cout << "X_HIGH " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,0,1,5,4)) {
+-      face_idx |= Y_LOW;
+-#ifdef DEBUG
+-      std::cout << "Y_LOW " ;
+-#endif
+-    }
+-
+-    if (is_face_visible(xverts,yverts,2,3,7,6)) {
+-      face_idx |= Y_HIGH;
+-#ifdef DEBUG
+-      std::cout << "Y_HIGH " ;
+-#endif
+-    }
+-  }
+-#ifdef DEBUG
+-  std::cout << std::endl;
+-#endif
+-
+-  return face_idx;
+-}
+-
+-//: returns the faces of a box, the vertices are ordered in the normal direction
+-void boxm_utils::faces_of_box_3d(vgl_box_3d<double> const& bbox,
+-                                 std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >& faces)
+-{
+-  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(bbox);
+-
+-  // face bottom [1,0,3,2]
+-  std::vector<vgl_point_3d<double> > face_corners;
+-  face_corners.push_back(corners[1]);
+-  face_corners.push_back(corners[0]);
+-  face_corners.push_back(corners[3]);
+-  face_corners.push_back(corners[2]);
+-  faces[Z_LOW] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[4]);
+-  face_corners.push_back(corners[5]);
+-  face_corners.push_back(corners[6]);
+-  face_corners.push_back(corners[7]);
+-  faces[Z_HIGH] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[7]);
+-  face_corners.push_back(corners[3]);
+-  face_corners.push_back(corners[0]);
+-  face_corners.push_back(corners[4]);
+-  faces[X_LOW] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[1]);
+-  face_corners.push_back(corners[2]);
+-  face_corners.push_back(corners[6]);
+-  face_corners.push_back(corners[5]);
+-  faces[X_HIGH] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[0]);
+-  face_corners.push_back(corners[1]);
+-  face_corners.push_back(corners[5]);
+-  face_corners.push_back(corners[4]);
+-  faces[Y_LOW] = face_corners;
+-
+-  face_corners.resize(0);
+-  face_corners.push_back(corners[2]);
+-  face_corners.push_back(corners[3]);
+-  face_corners.push_back(corners[7]);
+-  face_corners.push_back(corners[6]);
+-  faces[Y_HIGH] = face_corners;
+-}
+-
+-//: returns the union of the projected faces of a polygon
+-void boxm_utils::project_cube(vgl_box_3d<double> &bbox,
+-                              const vpgl_camera_double_sptr& camera,
+-                              std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
+-                              boct_face_idx & vis_face_ids)
+-{
+-  faces_of_box_3d(bbox, faces);
+-  vis_face_ids=boxm_utils::visible_faces(bbox,camera);
+-}
+-
+-
+-void boxm_utils::quad_interpolate(boxm_quad_scan_iterator &poly_it,
+-                                  double* xvals, double* yvals, double* vals,
+-                                  vil_image_view<float> &img,unsigned img_plane_num,
+-                                  unsigned int v0, unsigned int v1,
+-                                  unsigned int v2,unsigned int v3 )
+-{
+-  // first compute s0, s1, s2, s3 such that  val = s0*x + s1*y + s2 for any point within the triangle
+-  // (no need to compute barycentric coordinates of a quadrilateral at each step)
+-  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
+-
+-  double Acol0[] = {(xvals[v0]-0.5)*(yvals[v0]-0.5),
+-            (xvals[v1]-0.5)*(yvals[v1]-0.5),
+-            (xvals[v2]-0.5)*(yvals[v2]-0.5),
+-            (xvals[v3]-0.5)*(yvals[v3]-0.5)};
+-  double Acol1[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5,xvals[v3]-0.5};
+-  double Acol2[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5,yvals[v3]-0.5};
+-  double Acol3[] = {1.0, 1.0, 1.0,1.0};
+-
+-  double Z[] = {vals[v0], vals[v1], vals[v2],vals[v3]};
+-
+-  double detA = vnl_determinant(Acol0, Acol1, Acol2,Acol3);
+-  double s0 = vnl_determinant(Z, Acol1, Acol2,Acol3) / detA;
+-  double s1 = vnl_determinant(Acol0, Z, Acol2,Acol3) / detA;
+-  double s2 = vnl_determinant(Acol0, Acol1, Z,Acol3) / detA;
+-  double s3 = vnl_determinant(Acol0, Acol1, Acol2,Z) / detA;
+-
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      auto interp_val = (float)(s0*x*y + s1*x + s2*y+s3);
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
+-    }
+-  }
+-  return;
+-#if 0 // commented out
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    unsigned int yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    double start_val=0;
+-    double end_val=0;
+-
+-    if (poly_it.x_start_end_val(vals,start_val,end_val))
+-    {
+-      float rx=endx-startx;
+-      for (unsigned int x = startx; x < endx; ++x) {
+-        float interp_val = start_val+(x-startx)/rx*(end_val-start_val);
+-        img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
+-        //img(x,yu,img_plane_num) =interp_val;
+-      }
+-    }
+-  }
+-  return;
+-#endif // 0
+-}
+-
+-void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
+-                           vil_image_view<float> &img, float val,
+-                           unsigned img_plane_num)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      img(x,yu,img_plane_num) = val;
+-#if 0 // was:
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      if (poly_it.pix_coverage(x)>1)
+-        std::cout<<"ERROR ALERT "<<poly_it.pix_coverage(x)<<std::endl;
+-      assert(poly_it.pix_coverage(x)>1);
+-#endif // 0
+-    }
+-  }
+-  return;
+-}
+-
+-
+-void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
+-                           vil_image_view<float> &img,
+-                           vil_image_view<float> &weights_img,
+-                           float val,
+-                           unsigned img_plane_num)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      //img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
+-      weights_img(x,yu)+=poly_it.pix_coverage(x);
+-    }
+-  }
+-  return;
+-}
+-
+-
+-void boxm_utils::quad_mean(boxm_quad_scan_iterator &poly_it,
+-                           vil_image_view<float> &img, float &val,  float & count)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      val+=poly_it.pix_coverage(x)*img(x,yu) ;
+-      count+=poly_it.pix_coverage(x);
+-    }
+-  }
+-  return;
+-}
+-
+-void boxm_utils::quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
+-                                    vil_image_view<float> &img,
+-                                    vil_image_view<float> &weighted_img,
+-                                    float &numerator,  float & denominator)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      numerator+=poly_it.pix_coverage(x)*img(x,yu)*weighted_img(x,yu);
+-      denominator+=poly_it.pix_coverage(x)*weighted_img(x,yu);
+-      //numerator+=img(x,yu)*weighted_img(x,yu);
+-      //denominator+=weighted_img(x,yu);
+-    }
+-  }
+-  return;
+-}
+-
+-void boxm_utils::quad_sum(boxm_quad_scan_iterator &poly_it,
+-                          vil_image_view<float> &img, float &val)
+-{
+-  poly_it.reset();
+-  while (poly_it.next()) {
+-    int y = poly_it.scany();
+-    if (y < 0){
+-      // not inside of image bounds yet. go to next scanline.
+-      continue;
+-    }
+-    auto yu = (unsigned int)y;
+-    if (yu >= img.nj() ) {
+-      // we have left the image bounds. no need to continue.
+-      break;
+-    }
+-    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
+-      // no part of this scanline is within the image bounds. go to next scanline.
+-      continue;
+-    }
+-    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
+-    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
+-
+-    for (unsigned int x = startx; x < endx; ++x) {
+-      val+=(poly_it.pix_coverage(x)*img(x,yu)) ;
+-    }
+-  }
+-  return;
+-}
+-
+-bool boxm_utils::project_cube_xyz( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                                   boct_face_idx & vis_face_ids,
+-                                   vil_image_view<float> &front_xyz,
+-                                   vil_image_view<float> &back_xyz,
+-                                   const vpgl_camera_double_sptr& cam)
+-{
+-  auto face_it=faces.begin();
+-  for (; face_it!=faces.end(); ++face_it)
+-  {
+-    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
+-    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
+-
+-    double xs[]={face_projected[0].x(),face_projected[1].x(),face_projected[2].x(),face_projected[3].x()};
+-    double ys[]={face_projected[0].y(),face_projected[1].y(),face_projected[2].y(),face_projected[3].y()};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    double Xs[]={face_corners[0].x(),face_corners[1].x(),face_corners[2].x(),face_corners[3].x()};
+-    double Ys[]={face_corners[0].y(),face_corners[1].y(),face_corners[2].y(),face_corners[3].y()};
+-    double Zs[]={face_corners[0].z(),face_corners[1].z(),face_corners[2].z(),face_corners[3].z()};
+-
+-    if (vis_face_ids & face_it->first){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-
+-bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
+-                                  boct_face_idx & vis_face_ids,
+-                                  vil_image_view<float> &front_xyz,
+-                                  vil_image_view<float> &back_xyz,
+-                                  double *xverts,double * yverts)
+-{
+-  // open extra scope, to allow redeclaration of xs[], ys[]
+-  {
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-#if 0
+-    std::vector<vgl_point_2d<double> > face_polygon(4);
+-    for (unsigned i=0;i<4;++i)
+-      face_polygon.push_back(vgl_point_2d<double>(xs[i],ys[i]));
+-#endif // 0
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[1].x(),corners[0].x(),corners[3].x(),corners[2].x()};
+-    double Ys[]={corners[1].y(),corners[0].y(),corners[3].y(),corners[2].y()};
+-    double Zs[]={corners[1].z(),corners[0].z(),corners[3].z(),corners[2].z()};
+-    if (vis_face_ids & Z_LOW){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[4].x(),corners[5].x(),corners[6].x(),corners[7].x()};
+-    double Ys[]={corners[4].y(),corners[5].y(),corners[6].y(),corners[7].y()};
+-    double Zs[]={corners[4].z(),corners[5].z(),corners[6].z(),corners[7].z()};
+-    if (vis_face_ids & Z_HIGH){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    double Xs[]={corners[7].x(),corners[3].x(),corners[0].x(),corners[4].x()};
+-    double Ys[]={corners[7].y(),corners[3].y(),corners[0].y(),corners[4].y()};
+-    double Zs[]={corners[7].z(),corners[3].z(),corners[0].z(),corners[4].z()};
+-    if (vis_face_ids & X_LOW){
+-      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    double Xs[]={corners[1].x(),corners[2].x(),corners[6].x(),corners[5].x()};
+-    double Ys[]={corners[1].y(),corners[2].y(),corners[6].y(),corners[5].y()};
+-    double Zs[]={corners[1].z(),corners[2].z(),corners[6].z(),corners[5].z()};
+-    if (vis_face_ids & X_HIGH){
+-      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
+-      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-        vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[0].x(),corners[1].x(),corners[5].x(),corners[4].x()};
+-    double Ys[]={corners[0].y(),corners[1].y(),corners[5].y(),corners[4].y()};
+-    double Zs[]={corners[0].z(),corners[1].z(),corners[5].z(),corners[4].z()};
+-    if (vis_face_ids & Y_LOW){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-
+-      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-  {
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-
+-    double Xs[]={corners[2].x(),corners[3].x(),corners[7].x(),corners[6].x()};
+-    double Ys[]={corners[2].y(),corners[3].y(),corners[7].y(),corners[6].y()};
+-    double Zs[]={corners[2].z(),corners[3].z(),corners[7].z(),corners[6].z()};
+-    if (vis_face_ids & Y_HIGH){
+-      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
+-      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
+-    }
+-    else
+-    {
+-      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
+-      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
+-      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
+-    }
+-  }
+-
+-  return true;
+-}
+-
+-
+-bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & /*corners*/,
+-                                  boct_face_idx & vis_face_ids,
+-                                  vil_image_view<float> &front_xyz,
+-                                  vil_image_view<float> &back_xyz,
+-                                  double *xverts,double * yverts,float * vertdist)
+-{
+-  // Use extra {} so that destructors will do their work
+-  {
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    double ds[]={vertdist[1],vertdist[0],vertdist[3],vertdist[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Z_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    double ds[]={vertdist[4],vertdist[5],vertdist[6],vertdist[7]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Z_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    double ds[]={vertdist[7],vertdist[3],vertdist[0],vertdist[4]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    if (vis_face_ids & X_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    double ds[]={vertdist[1],vertdist[2],vertdist[6],vertdist[5]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    if (vis_face_ids & X_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    double ds[]={vertdist[0],vertdist[1],vertdist[5],vertdist[4]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Y_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-  {
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    double ds[]={vertdist[2],vertdist[3],vertdist[7],vertdist[6]};
+-
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    vgl_polygon<double> p(xs,ys,4);
+-    if (vis_face_ids & Y_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
+-    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
+-  }
+-
+-  return true;
+-}
+-
+-
+-#if 0
+-bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                                        boct_face_idx & vis_face_ids,
+-                                        vil_image_view<float> &fill_img,
+-                                        float val, vpgl_camera_double_sptr cam)
+-{
+-  for (std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >::iterator face_it=faces.begin();
+-       face_it!=faces.end(); ++face_it)
+-  {
+-    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
+-    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
+-    vgl_polygon<double> face_polygon(face_projected);
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    if (vis_face_ids & face_it->first){
+-      quad_fill(poly_it,fill_img,val,0);
+-    }
+-  }
+-}
+-#else
+-bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > &,
+-                                        boct_face_idx &, vil_image_view<float> &, float, const vpgl_camera_double_sptr&)
+-{ return false; }
+-#endif // 0
+-
+-bool boxm_utils::project_cube_fill_val(boct_face_idx & vis_face_ids,
+-                                       vil_image_view<float> &fill_img,
+-                                       float val, double *xverts,double * yverts)
+-{
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,val,0);
+-  }
+-  return true;
+-}
+-
+-
+-bool boxm_utils::project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
+-                                          vil_image_view<float> &fill_img,
+-                                          vil_image_view<float> &weight_img,
+-                                          float val, double *xverts,double * yverts)
+-{
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_fill(poly_it,fill_img,weight_img,val,0);
+-  }
+-  return true;
+-}
+-
+-bool boxm_utils::cube_sum(boct_face_idx & vis_face_ids,
+-                          vil_image_view<float> &img,
+-                          float & val, double *xverts,double * yverts)
+-{
+-  val=0;
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_sum(poly_it,img,val);
+-  }
+-
+-  return true;
+-}
+-
+-
+-bool boxm_utils::cube_uniform_mean(boct_face_idx & vis_face_ids,
+-                                   vil_image_view<float> &img,
+-                                   float & val, double *xverts,double * yverts)
+-{
+-  val=0;
+-  float count=0;
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_mean(poly_it,img,val,count);
+-  }
+-
+-  if (count > 0) {
+-    val/=(float)count;
+-    return true;
+-  }
+-  else {
+-    val = 0;
+-    return true;
+-  }
+-}
+-
+-
+-bool boxm_utils::cube_weighted_mean(boct_face_idx & vis_face_ids,
+-                                    vil_image_view<float> &img,
+-                                    vil_image_view<float> &weight_img,
+-                                    float & val, double *xverts,double * yverts)
+-{
+-  val=0;
+-  float count=0;
+-  if (vis_face_ids & Z_LOW){
+-    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
+-    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & Z_HIGH){
+-    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
+-    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & X_LOW){
+-    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
+-    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & X_HIGH){
+-    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
+-    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & Y_LOW){
+-    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
+-    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-  if (vis_face_ids & Y_HIGH){
+-    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
+-    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
+-    boxm_quad_scan_iterator poly_it(xs,ys);
+-    quad_weighted_mean(poly_it,img,weight_img,val,count);
+-  }
+-
+-  if (count > 0) {
+-    val/=(float)count;
+-    return true;
+-  }
+-  else {
+-    val = 0;
+-    return true;
+-  }
+-}
+-
+-
+-bool
+-boxm_utils::cube_entry_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
+-                             vgl_vector_3d<double> direction,
+-                             vgl_point_3d<double> & entry_point,
+-                             double & lambda,boct_face_idx & face_id)
+-{
+-  // check each face
+-  if (direction.x() > 0 && pt.x()<=cube.min_x()) {
+-    // intersect with low x plane
+-    lambda = (cube.min_x() - pt.x()) / direction.x();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=X_LOW;
+-        return true;
+-    }
+-  }
+-  else if (direction.x() < 0 && pt.x()>=cube.max_x()){
+-    // intersect with high x plane
+-    lambda = (cube.max_x() - pt.x()) / direction.x();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=X_HIGH;
+-        return true;
+-    }
+-  }
+-  if (direction.y() > 0&& pt.y()<=cube.min_y()) {
+-    // intersect with low y plane
+-    lambda = (cube.min_y() - pt.y()) / direction.y();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=Y_LOW;
+-        return true;
+-    }
+-  }
+-  else if (direction.y() < 0 && pt.y()>=cube.max_y()){
+-    // intersect with high y plane
+-    lambda = (cube.max_y() - pt.y()) / direction.y();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
+-        face_id=Y_HIGH;
+-        return true;
+-    }
+-  }
+-  if (direction.z() > 0&& pt.z()<=cube.min_z()) {
+-    // intersect with low z plane
+-    lambda = (cube.min_z() - pt.z()) / direction.z();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
+-        face_id=Z_LOW;
+-        return true;
+-    }
+-  }
+-  else if (direction.z() < 0 && pt.z()>=cube.max_z()){
+-    // intersect with high z plane
+-    lambda = (cube.max_z() - pt.z()) / direction.z();
+-    entry_point = pt + direction * lambda;
+-    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
+-      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
+-        face_id=Z_HIGH;
+-        return true;
+-    }
+-  }
+-  return false;
+-}
+-
+-
+-bool boxm_utils::cube_exit_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
+-                                 vgl_vector_3d<double> direction,
+-                                 vgl_point_3d<double> & exit_pt,
+-                                 double & lambda,boct_face_idx & face_id)
+-{
+-  // check each face
+-  if (direction.x() < 0 ) {
+-    // intersect with low x plane
+-    lambda = (cube.min_x() - pt.x()) / direction.x();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=X_LOW;
+-      return true;
+-    }
+-  }
+-  else if (direction.x() > 0 ) {
+-    // intersect with high x plane
+-    lambda = (cube.max_x() - pt.x()) / direction.x();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=X_HIGH;
+-      return true;
+-    }
+-  }
+-  if (direction.y() < 0 ) {
+-    // intersect with low y plane
+-    lambda = (cube.min_y() - pt.y()) / direction.y();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=Y_LOW;
+-      return true;
+-    }
+-  }
+-  else if (direction.y() > 0 ) {
+-    // intersect with high y plane
+-    lambda = (cube.max_y() - pt.y()) / direction.y();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
+-      face_id=Y_HIGH;
+-      return true;
+-    }
+-  }
+-  if (direction.z() < 0 ) {
+-    // intersect with low z plane
+-    lambda = (cube.min_z() - pt.z()) / direction.z();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
+-      face_id=Z_LOW;
+-      return true;
+-    }
+-  }
+-  else if (direction.z() > 0 ) {
+-    // intersect with high z plane
+-    lambda = (cube.max_z() - pt.z()) / direction.z();
+-    exit_pt = pt + direction * lambda;
+-    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
+-         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
+-      face_id=Z_HIGH;
+-      return true;
+-    }
+-  }
+-  return false;
+-}
+-
+-
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
+-boxm_utils::obtain_mog_grey_unit_mode()
+-{
+-  bsta_gauss_sf1 simple_gauss_sf1(1.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-  return simple_obs_mix_gauss_val_sf1;
+-}
+-
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
+-boxm_utils::obtain_mog_grey_zero_mode()
+-{
+-  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-  return simple_obs_mix_gauss_val_sf1;
+-}
+-
+-boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
+-boxm_utils::obtain_mog_grey_single_mode(float  mean)
+-{
+-  bsta_gauss_sf1 simple_gauss_sf1(mean,0.1f);
+-  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
+-  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
+-
+-  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
+-
+-  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
+-  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
+-
+-  return simple_obs_mix_gauss_val_sf1;
+-}
+-
+-double boxm_utils::max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt)
+-{
+-  double dist_max=0;
+-
+-  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(box);
+-  for (const auto & corner : corners)
+-  {
+-    if (dist_max<(corner-pt).length())
+-      dist_max=(corner-pt).length();
+-  }
+-  return dist_max;
+-}
+diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.h b/contrib/brl/bseg/boxm/util/boxm_utils.h
+deleted file mode 100644
+index 86f74b3945..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_utils.h
++++ /dev/null
+@@ -1,168 +0,0 @@
+-#ifndef boxm_utils_h_
+-#define boxm_utils_h_
+-//:
+-// \file
+-// \brief  The utility methods for the boxm project
+-//
+-// \author Gamze Tunali
+-// \date Apr 07, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include "boxm_quad_scan_iterator.h"
+-#include <vgl/vgl_box_3d.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <boct/boct_tree_cell.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <vil/vil_image_view.h>
+-
+-class safe_inverse_functor
+-{
+- public:
+-  safe_inverse_functor(float tol = 0.0f) : tol_(tol) {}
+-
+-  float operator()(float x) const { return (x > tol_)? 1.0f/x : 0.0f; }
+-
+-  float tol_;
+-};
+-
+-class boxm_utils
+-{
+- public:
+-
+-  //: returns true if a given box is visible from the camera and the image plane
+-  static bool is_visible(vgl_box_3d<double> const& bbox,
+-                         vpgl_camera_double_sptr const& camera,
+-                         unsigned int img_ni, unsigned int img_nj,
+-                         bool do_front_test = true);
+-
+-  // returns the 8 corner points of a box
+-  static std::vector<vgl_point_3d<double> > corners_of_box_3d(vgl_box_3d<double> const& box);
+-
+-  //: returns the indices of the faces visible from the camera
+-  static bool is_face_visible(std::vector<vgl_point_3d<double> > &face,
+-                              vpgl_camera_double_sptr const& camera);
+-
+-  //:
+-  static bool is_face_visible(const double * xverts, const double *yerts,
+-                              unsigned id1,unsigned id2,unsigned id3,unsigned id4);
+-
+-  //: returns the visible faces of a box given a camera.
+-  // It puts a bit 1 for each face visible based on the boct_cell_face values.
+-  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox,
+-                                     const vpgl_camera_double_sptr& camera,
+-                                     double *xverts, double *yerts);
+-  static boct_face_idx visible_faces_cell(vgl_box_3d<double> const& bbox,
+-                                          const vpgl_camera_double_sptr& camera,
+-                                          double *xverts, double *yverts);
+-
+-  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera);
+-
+-  static void faces_of_box_3d(vgl_box_3d<double> const& bbox,
+-                              std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > & faces);
+-
+-  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,const vpgl_camera_double_sptr& camera,
+-                              double * xverts, double *yerts);
+-  static void project_point3d(vgl_point_3d<double> const& point,
+-                              const vpgl_camera_double_sptr& camera,
+-                              double & xvert, double &yert, double & vertdist);
+-
+-  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,
+-                              const vpgl_camera_double_sptr& camera,
+-                              double* xverts, double* yverts,
+-                              float* vertdist);
+-  static void project_cube(vgl_box_3d<double> &bbox,
+-                           const vpgl_camera_double_sptr& camera,
+-                           std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
+-                           boct_face_idx & vis_face_ids);
+-
+-  static std::vector<vgl_point_2d<double> >  project_face(std::vector<vgl_point_3d<double> > &face,
+-                                                         vpgl_camera_double_sptr const& camera);
+-
+-  static void quad_interpolate(boxm_quad_scan_iterator &poly_it,
+-                               double* xvals, double* yvals, double* vals,
+-                               vil_image_view<float> &img,unsigned img_plane_num=0,
+-                               unsigned int v0=0, unsigned int v1=1,
+-                               unsigned int v2=2,unsigned int v3=3);
+-
+-  static void quad_fill(boxm_quad_scan_iterator &poly_it,
+-                        vil_image_view<float> &img, float val,
+-                        unsigned img_plane_num=0);
+-  static void quad_fill(boxm_quad_scan_iterator &poly_it,
+-                        vil_image_view<float> &img,
+-                        vil_image_view<float> &weights_img,
+-                        float val,
+-                        unsigned img_plane_num=0);
+-
+-  static bool project_cube_xyz(std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                               boct_face_idx & vis_face_ids,
+-                               vil_image_view<float> &front_xyz,
+-                               vil_image_view<float> &back_xyz,
+-                               const vpgl_camera_double_sptr& camera);
+-
+- static bool project_cube_xyz(std::vector< vgl_point_3d<double> >  & corners,
+-                              boct_face_idx & vis_face_ids,
+-                              vil_image_view<float> &front_xyz,
+-                              vil_image_view<float> &back_xyz,
+-                              double *xverts,double * yerts);
+- //: only for perspective camera
+- static bool project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
+-                              boct_face_idx & vis_face_ids,
+-                              vil_image_view<float> &front_xyz,
+-                              vil_image_view<float> &back_xyz,
+-                              double *xverts,double * yverts,float * vertdist);
+-
+-  static bool project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
+-                                     boct_face_idx & vis_face_ids,
+-                                     vil_image_view<float> &fill_img,
+-                                     float val, const vpgl_camera_double_sptr& cam);
+-
+-  static bool project_cube_fill_val(boct_face_idx & vis_face_ids,
+-                                    vil_image_view<float> &fill_img,
+-                                    float val, double *xverts,double * yverts);
+-  static bool project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
+-                                       vil_image_view<float> &fill_img,
+-                                       vil_image_view<float> &weights_img,
+-                                       float val, double *xverts,double * yverts);
+-
+-  static bool cube_uniform_mean(boct_face_idx & vis_face_ids,
+-                                vil_image_view<float> &img,
+-                                float & val, double *xverts,double * yverts);
+-  static bool cube_weighted_mean(boct_face_idx & vis_face_ids,
+-                                 vil_image_view<float> &img,
+-                                 vil_image_view<float> &weight_img,
+-                                 float & val, double *xverts,double * yverts);
+-
+-  static bool cube_sum(boct_face_idx & vis_face_ids,
+-                       vil_image_view<float> &img,
+-                       float & val, double *xverts,double * yverts);
+-
+-  static void quad_mean(boxm_quad_scan_iterator &poly_it,
+-                        vil_image_view<float> &img, float &val,  float & count);
+-  static void quad_sum(boxm_quad_scan_iterator &poly_it,
+-                       vil_image_view<float> &img, float &val);
+-  static void quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
+-                                 vil_image_view<float> &img,
+-                                 vil_image_view<float> &weighted_img,
+-                                 float &numerator,  float & denominator);
+-  static bool cube_entry_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
+-                               vgl_vector_3d<double> dir,
+-                               vgl_point_3d<double> & entry_point,
+-                               double & lambda, boct_face_idx & face_id);
+-  static bool cube_exit_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
+-                              vgl_vector_3d<double> dir, vgl_point_3d<double> & exit_point,
+-                              double & lambda,boct_face_idx & face_id);
+-
+-  static double max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt);
+-
+-  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_unit_mode();
+-
+-  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_zero_mode();
+-
+-  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_single_mode(float  mean);
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h b/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
+deleted file mode 100644
+index 3e7bcdc580..0000000000
+--- a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
++++ /dev/null
+@@ -1,214 +0,0 @@
+-// This is brl/bseg/boxm/util/boxm_vrml_util.h
+-#ifndef boxm_vrml_util_h
+-#define boxm_vrml_util_h
+-//:
+-// \file
+-// \brief  Set of utilities to save a boxm_scene as vrml files
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Dec 9, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <fstream>
+-#include <boxm/boxm_scene.h>
+-#include "boxm_cell_data_traits.h"
+-#include <bvrml/bvrml_write.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class boxm_vrml_util
+-{
+- public:
+-
+-  // Writes the values in the scene above the threshold as vrml dots
+-  template <class T_data>
+-  static void write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene,
+-                               const float threshold= 0.0f);
+-#if 0 // not yet working?
+-  static void write_vrml_scene(std::ofstream& str, bvxm_voxel_scene<bsta_num_obs<bsta_gauss_sf1> > *scene,
+-                               const float threshold);
+-  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<float> *scene, float threshold);
+-  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
+-  static void write_vrml_scene_as_pointers(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
+-#endif // 0
+-};
+-
+-
+-template <class T_data>
+-void boxm_vrml_util::write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene, float /*threshold*/)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short, T_data> cell_type;
+-  std::ofstream temp_stream("temp.txt");
+-
+-  bvrml_write::write_vrml_header(str);
+-
+-  str << "Shape {\n"
+-      << "  appearance NULL\n"
+-      << "    geometry PointSet {\n"
+-      << "      color Color{\n"
+-      << "        color[\n";
+-  // write the colors
+-  // iterate through the scene
+-  boxm_block_iterator<tree_type > iter= scene->iterator();
+-  iter.begin();
+-
+-  for (; !iter.end(); iter++) {
+-    scene->load_block(iter.index());
+-    tree_type  *tree = (*iter)->get_tree();
+-
+-    // iterate through the tree
+-    std::vector<cell_type*> cells = tree->leaf_cells();
+-
+-    for (unsigned i = 0; i < cells.size(); i++)
+-    {
+-      str <<"        0.5 0.2 0.8\n";
+-      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
+-      temp_stream <<"        " << (int)coord.x() << ' ' <<(int)coord.y() << ' ' << (int)coord.z() <<  '\n';
+-    }
+-  }
+-  temp_stream.close();
+-
+-  str << "        ]\n     }\n"
+-      << "      coord Coordinate{\n"
+-      << "        point[\n";
+-
+-  // write the coordinates.
+-  std::ifstream fin;  // file in
+-  std::filebuf *fb;   // file buffer
+-  fb = fin.rdbuf();
+-  fb->open ("temp.txt",std::ios::in);
+-  if (fb->is_open() )
+-  {
+-    while (fb->sgetc()!=EOF)
+-    {
+-      std::string temp_str;
+-      std::istream isbf(fb);
+-      std::getline(isbf, temp_str);
+-      str << temp_str << '\n';
+-    }
+-  }
+-  else
+-    std::cerr << "file is not open.\n";
+-
+-  fin.close();
+-  str << "        ]\n     }\n   }\n}\n";
+-}
+-
+-#if 0 // not yet working?
+-void bvxm_vrml_voxel_grid::write_vrml_grid(std::ofstream& str, bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid, float threshold)
+-{
+-  bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> >::iterator grid_it = grid->begin();
+-
+-  str << "Shape {\n"
+-      << "  appearance NULL\n"
+-      << "    geometry PointSet {\n"
+-      << "      color Color{\n"
+-      << "        color[\n";
+-  // write the colors
+-  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
+-    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
+-      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
+-        if ((((*grid_it)(i,j)).mean() > threshold))
+-          str <<"        " << ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << '\n';
+-      }
+-    }
+-  }
+-  str << "        ]\n     }\n"
+-      << "      coord Coordinate{\n"
+-      << "        point[\n";
+-
+-  // write the coordinates
+-  grid_it = grid->begin();
+-  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
+-    std::cout << '.';
+-    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
+-      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
+-        if (((*grid_it)(i,j)).mean() > threshold)
+-          str<<"        " << i << ' ' <<j << ' ' << k <<  '\n';
+-      }
+-    }
+-  }
+-  str << "        ]\n     }\n   }\n}\n";
+-}
+-
+-
+-void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<float> *grid, float threshold)
+-{
+-  bvxm_voxel_grid<float>::iterator grid_it = grid->begin();
+-  vgl_vector_3d<unsigned> dim=grid->grid_size();
+-  unsigned s=3;
+-  // write the colors
+-  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
+-    if (k%1==0)
+-    {
+-      for (unsigned i=0; i<(*grid_it).nx(); i+=s) {
+-        for (unsigned j=0; j < (*grid_it).ny(); j+=s) {
+-          if (((*grid_it)(i,j) > threshold)) {
+-#ifdef DEBUG
+-            vgl_sphere_3d<float> sphere((float)i,(float)j,(float)k,0.5f);
+-            write_vrml_sphere(str, sphere, (*grid_it)(i,j),(*grid_it)(i,j),(*grid_it)(i,j),1-(*grid_it)(i,j));
+-#endif // DEBUG
+-            vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.4f);
+-            bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
+-{
+-  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
+-  // write the colors
+-  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
+-    for (unsigned i=0; i<(*grid_it).nx(); ) {
+-      for (unsigned j=0; j < (*grid_it).ny(); ) {
+-        if ((*grid_it)(i,j)[3]/255.0f > threshold) {
+-          vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.5f);
+-          bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-
+-void bvxm_vrml_voxel_grid::write_vrml_grid_as_pointers(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
+-{
+-  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-  vgl_vector_3d<double> dirx(1,0,0);
+-  vgl_vector_3d<double> diry(0,1,0);
+-  vgl_vector_3d<double> dirz(0,0,1);
+-  bvrml_write::write_vrml_line(str,origin,dirx,1,1,0,0);
+-  bvrml_write::write_vrml_line(str,origin,diry,1,0,1,0);
+-  bvrml_write::write_vrml_line(str,origin,dirz,1,0,0,1);
+-
+-  vgl_vector_3d<unsigned> dim=grid->grid_size();
+-  // write the colors
+-  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
+-    if (k%s==0)
+-    {
+-      for (unsigned i=0; i<(*grid_it).nx(); i=i+s) {
+-        for (unsigned j=0; j < (*grid_it).ny(); j=j+s) {
+-          if (((*grid_it)(i,j)[3] > threshold)) {
+-            vgl_vector_3d<double> dir((*grid_it)(i,j)[0],(*grid_it)(i,j)[1],(*grid_it)(i,j)[2]);
+-            vgl_point_3d<double> pt((double)i/s,(double)j/s,(double)k/s);
+-            bvrml_write::write_vrml_line(str, pt,dir,4*((*grid_it)(i,j)[3]-0.5f),1,0,0);
+-            bvrml_write::write_vrml_disk(str, pt,dir,2*((*grid_it)(i,j)[3]-0.5f),0,0.5f,0.0f);
+-          }
+-        }
+-      }
+-    }
+-  }
+-}
+-#endif // 0
+-
+-#endif // boxm_vrml_util_h
+diff --git a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
+deleted file mode 100644
+index 91cc0db455..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,18 +0,0 @@
+-add_executable( boxm_util_test_all
+-  test_driver.cxx
+-  test_boxm_plane_ransac.cxx
+-  test_boxm_rational_camera_utils.cxx
+-  test_quad_interpolate.cxx
+- )
+-
+-target_link_libraries( boxm_util_test_all boxm_util boxm boxm_sample ${VXL_LIB_PREFIX}testlib boct bsta ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil bvrml)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
+-
+-add_test( NAME boxm_util_test_plane_ransac COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_plane_ransac  )
+-add_test( NAME boxm_util_test_rational_camera_utils COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_rational_camera_utils  ${CMAKE_CURRENT_SOURCE_DIR})
+-add_test( NAME boxm_util_test_quad_interpolate COMMAND $<TARGET_FILE:boxm_util_test_all> test_quad_interpolate  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+-
+-add_executable( boxm_util_test_include test_include.cxx )
+-target_link_libraries( boxm_util_test_include boxm_util)
+-add_executable( boxm_util_test_template_include test_template_include.cxx )
+-target_link_libraries( boxm_util_test_template_include boxm_util)
+diff --git a/contrib/brl/bseg/boxm/util/tests/camera0.txt b/contrib/brl/bseg/boxm/util/tests/camera0.txt
+deleted file mode 100644
+index cf11c57707..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/camera0.txt
++++ /dev/null
+@@ -1,104 +0,0 @@
+-satId = "????";
+-bandId = "RGB";
+-SpecId = "RPC00B";
+-BEGIN_GROUP = IMAGE
+-
+-
+-  lineOffset = 0.0
+-  sampOffset = 0.0
+-  latOffset = 0.0
+-  longOffset = 0.0
+-  heightOffset = 0.0
+-  lineScale = 1.0
+-  sampScale = 1.0
+-  latScale = 1.0
+-  longScale = 1.0
+-  heightScale = 1.0
+-  lineNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  lineDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampNumCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-  sampDenCoef = (
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1,
+-    1);
+-END_GROUP = IMAGE
+-END;
+-lvcs
+-47.550493 35.395931 664.186757
+diff --git a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt b/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
+deleted file mode 100644
+index a66e2014bd..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-1 0 0
+-0 1 0
+-0 0 1
+-1 0 0
+-0 1 0
+-0 0 1
+-0 0 0
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
+deleted file mode 100644
+index 6664f28f37..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
++++ /dev/null
+@@ -1,79 +0,0 @@
+-//:
+-// \file
+-// \author Gamze Tunali
+-// \brief  this code tests the function boxm_plane_ransac.
+-//  Creates 10 planes that the same line goes through and 10 random planes
+-//  which do not contain the plane. It makes sure it returns only the
+-//  first 10 planes as the fittest ones.
+-//
+-// \date   March 25, 2010
+-
+-#include <iostream>
+-#include <vector>
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_plane_ransac.h>
+-#include <boxm/sample/boxm_plane_obs.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vgl/vgl_infinite_line_3d.h>
+-#include <vnl/vnl_random.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static const unsigned int test_num=10;
+-static const unsigned int test_set=10;
+-
+-static void test_boxm_plane_ransac()
+-{
+-  // create 10 planes that the line go through and 10 random planes
+-  vgl_point_3d<float> p1(20,20,10);
+-  vgl_point_3d<float> p2(30,20,10);
+-  vgl_infinite_line_3d<float> line(p1,p2);
+-
+-  std::vector<boxm_edge_tangent_sample<float> > planes;
+-  vnl_random rand;
+-  // get two points from the line, and create a random 3rd point to define a plane
+-
+-  for (unsigned i=0; i<test_num; ++i) {
+-    auto x=float(rand.drand32()*100);
+-    auto y=float(rand.drand32()*100);
+-    auto z=float(rand.drand32()*100);
+-    vgl_point_3d<float> p3(x,y,z);
+-    vgl_plane_3d<float> plane(p1,p2,p3);
+-    boxm_plane_obs<float> obs(plane,1);
+-    boxm_edge_tangent_sample<float> sample;
+-    sample.insert(obs);
+-    planes.push_back(sample);
+-  }
+-
+-  // add the random planes
+-  for (unsigned i=0; i<test_set; ++i) {
+-    auto a=float(rand.drand32()*100);
+-    auto b=float(rand.drand32()*100);
+-    auto c=float(rand.drand32()*100);
+-    auto d=float(rand.drand32()*100);
+-    vgl_plane_3d<float> plane(a,b,c,d);
+-    boxm_plane_obs<float> obs(plane,1);
+-    boxm_edge_tangent_sample<float> sample;
+-    sample.insert(obs);
+-    planes.push_back(sample);
+-  }
+-
+-  std::cout << " planes size: " << planes.size() << std::endl;
+-
+-  std::vector<float> weights(test_set,1);
+-  int threshold=2;
+-  float residual;
+-  vgl_infinite_line_3d<float> l;
+-  vgl_box_3d<double> cell_global_box(18,15,5,32,25,15);
+-  float ortho_thres = 0.01f;
+-  float volume_ratio = 128;
+-  boxm_plane_ransac<float>(planes, weights, l, residual, cell_global_box, threshold, ortho_thres, volume_ratio);
+-
+-  TEST_NEAR("test_boxm_plane_ransac: found the right plane set",
+-            (l.point()-line.point()).sqr_length() + (l.direction()-line.direction()).sqr_length(),
+-            0.0f, 0.01f);
+-}
+-
+-TESTMAIN(test_boxm_plane_ransac);
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
+deleted file mode 100644
+index bbee3d575d..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <vgl/vgl_plane_3d.h>
+-#include <vpgl/vpgl_local_rational_camera.h>
+-
+-
+-static void test_boxm_rational_camera_utils()
+-{
+-  std::string filename="camera0.txt";
+-
+-  vpgl_local_rational_camera<double>* rcam=read_local_rational_camera<double>( "./" + filename);
+-  vgl_plane_3d<double> top(0,0,1,-200);
+-  vgl_plane_3d<double> bottom(0,0,1,0);
+-
+-  unsigned ni=800,
+-           nj=800;
+-  double u, v;
+-
+-  rcam->project(495,431,200,u,v);
+-  vgl_plane_3d<double>  plane_parallel=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam,top,bottom,ni,nj);
+-  // TODO: do something with plane_parallel !
+-}
+-
+-TESTMAIN(test_boxm_rational_camera_utils);
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx b/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
+deleted file mode 100644
+index 3bc9c909f2..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_boxm_plane_ransac );
+-DECLARE( test_boxm_rational_camera_utils );
+-DECLARE( test_quad_interpolate );
+-
+-void register_tests()
+-{
+-  REGISTER( test_boxm_plane_ransac );
+-  REGISTER( test_boxm_rational_camera_utils );
+-  REGISTER( test_quad_interpolate );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_include.cxx
+deleted file mode 100644
+index fec661974c..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_include.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boxm/util/boxm_cell_data_traits.h>
+-#include <boxm/util/boxm_plane_ransac.h>
+-#include <boxm/util/boxm_quad_scan_iterator.h>
+-#include <boxm/util/boxm_rational_camera_utils.h>
+-#include <boxm/util/boxm_raytrace_operations.h>
+-#include <boxm/util/boxm_triangle_interpolation_iterator.h>
+-#include <boxm/util/boxm_triangle_scan_iterator.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <boxm/util/boxm_vrml_util.h>
+-#include <boxm/util/boxm_test_util.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx b/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
+deleted file mode 100644
+index 2c8c986813..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
++++ /dev/null
+@@ -1,117 +0,0 @@
+-#include <iostream>
+-#include <fstream>
+-#include <testlib/testlib_test.h>
+-#include <boxm/util/boxm_utils.h>
+-#include <vgl/vgl_point_2d.h>
+-#include <vgl/vgl_polygon.h>
+-#include <boxm/util/boxm_quad_scan_iterator.h>
+-#include <vgl/vgl_box_3d.h>
+-#include <boct/boct_tree.h>
+-#include <boct/boct_tree_cell.h>
+-#include <vil/vil_save.h>
+-#include <vil/vil_plane.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vpgl/vpgl_camera_double_sptr.h>
+-#include <vpgl/vpgl_perspective_camera.h>
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/algo/vgl_rotation_3d.h>
+-
+-
+-static void test_quad_interpolate(int argc, char* argv[])
+-{
+-  std::vector<vgl_point_2d<double> > points;
+-  points.emplace_back(10,10);
+-  points.emplace_back(10,12);
+-  points.emplace_back(12,12);
+-  points.emplace_back(12,10);
+-
+-  double xvals[]={10,10,12,12};
+-  double yvals[]={10,12,12,10};
+-  double vals[]={10,10,12,12};
+-  //vgl_polygon<double> poly(points);
+-  boxm_quad_scan_iterator poly_it(xvals,yvals);
+-  vil_image_view<float> img_min(40,40);
+-  vil_image_view<float> img_max(40,40);
+-  vil_image_view<float> g_img_max(40,40);
+-
+-  img_max.fill(0.0f);
+-  g_img_max.fill(0.0f);
+-  // creating ground truth
+-  g_img_max(10,10)=10.5f; g_img_max(10,11)=10.5f;
+-  g_img_max(11,10)=11.5f; g_img_max(11,11)=11.5f;
+-
+-  boxm_utils::quad_interpolate(poly_it, xvals, yvals, vals,img_max,0);
+-  for (unsigned i=10;i<=12;i++)
+-  {
+-    for (unsigned j=10;j<=12;j++)
+-    {
+-      std::cout << img_max(j,i) << ' ';
+-    }
+-    std::cout << '\n';
+-  }
+-  bool flag=true;
+-  for (unsigned i=0; i<g_img_max.ni() && flag; ++i)
+-  for (unsigned j=0; j<g_img_max.nj() && flag; ++j)
+-    if (g_img_max(i,j)!=img_max(i,j))
+-      flag=false;
+-
+-  TEST("Interpolated image", true, flag);
+-
+-  std::vector<vgl_point_2d<double> > points1;
+-  points.emplace_back(10.25,10.25);
+-  points.emplace_back(10.25,12.25);
+-  points.emplace_back(12.25,12.25);
+-  points.emplace_back(12.25,10.25);
+-
+-  double xvals1[]={10.3,10.3,11.4,11.4};
+-  double yvals1[]={10.3,11.4,11.4,10.3};
+-  //double vals1[]={10,10,12,12};
+-  ////vgl_polygon<double> poly(points);
+-  boxm_quad_scan_iterator poly_it_1(xvals1,yvals1);
+-  //vil_image_view<float> img_min(40,40);
+-  //vil_image_view<float> img_max(40,40);
+-
+-  g_img_max.fill(0.0f);
+-  // creating ground truth
+-  g_img_max(10,10)=10;g_img_max(10,11)=10;
+-  g_img_max(11,10)=10;g_img_max(11,11)=10;
+-
+-  float val=0;
+-  float count=0;
+-  boxm_utils::quad_mean(poly_it_1,g_img_max,val,count);
+-
+-  // code to test the projection of a cube .
+-  vgl_box_3d<double> cell_bb(-0.8,19.2,-18.75,0.7625, 20.7625,-17.1875);
+-  std::string camera_input_path = (argc < 2) ? "." : argv[1];
+-  std::ifstream ifs((camera_input_path + "/frame_00000.txt").c_str());
+-  if (!ifs.is_open()) {
+-    std::cerr << "Failed to open file " << camera_input_path << "/frame_00000.txt\n";
+-    TEST("Opening camera file", true, false);
+-    return;
+-  }
+-  auto* cam = new vpgl_perspective_camera<double>();
+-  ifs >> *cam;
+-  double xverts[8];
+-  double yverts[8];
+-  float vertdist[8];
+-  unsigned int ni=1280;
+-  unsigned int nj=720;
+-
+-  vpgl_camera_double_sptr cam_d(cam);
+-  vil_image_view<float> front_xyz(ni,nj,1);front_xyz.fill(0.0f);
+-  vil_image_view<float> back_xyz(ni,nj,1) ;back_xyz.fill(0.0f);
+-
+-  std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
+-  boxm_utils::project_corners(corners,cam_d,xverts,yverts,vertdist);
+-  boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam_d,xverts,yverts);
+-  boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdist);
+-
+-  std::string image_output_path = (argc < 3) ? "." : argv[2];
+-  std::cout << "Saving two TIFF files to directory " << image_output_path << '\n';
+-  vil_save(vil_plane(front_xyz,0),(image_output_path + "/front.tiff").c_str());
+-  vil_save(vil_plane(back_xyz,0), (image_output_path + "/back.tiff").c_str());
+-}
+-
+-TESTMAIN_ARGS(test_quad_interpolate);
+diff --git a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
+deleted file mode 100644
+index a3fbe3c4ae..0000000000
+--- a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+deleted file mode 100644
+index 643a441654..0000000000
+--- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
++++ /dev/null
+@@ -1,59 +0,0 @@
+-# contrib/brl/bseg/boxm_batch/CMakeLists.txt
+-
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+-
+-if( PYTHON_FOUND )
+-  FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-  if( EXPAT_FOUND )
+-    include_directories( ${PYTHON_INCLUDE_DIRS} )
+-    include_directories( ${BRL_INCLUDE_DIR} )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+-
+-    include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-    include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+-    include_directories( ${MUL_INCLUDE_DIR} )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm/algo )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
+-    include_directories( ${BRL_INCLUDE_DIR}/bbas/bsta )
+-
+-     set(boxm_batch_sources
+-         reg_boxm.h   reg_boxm.cxx
+-        )
+-    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
+-      vxl_add_library(LIBRARY_NAME boxm_batch LIBRARY_SOURCES SHARED ${boxm_batch_sources})
+-
+-      #library has to have different name depending on debug or release version.
+-      if(WIN32)
+-        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch DEBUG_POSTFIX _d SUFFIX .pyd)
+-      endif()
+-      if(APPLE)
+-        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch SUFFIX .so)
+-      endif()
+-      set_target_properties(boxm_batch PROPERTIES PREFIX "")
+-
+-      target_link_libraries(boxm_batch bpro_batch boxm_pro boxm_sample_algo boxm_algo_rt_pro boxm_algo_sp_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro sdet_pro bsta_pro icam_pro bapl_pro )
+-
+-      if(PYTHON_DEBUG_LIBRARIES)
+-        target_link_libraries( boxm_batch debug ${PYTHON_DEBUG_LIBRARY})
+-      endif()
+-
+-      if(PYTHON_LIBRARIES)
+-        target_link_libraries( boxm_batch optimized ${PYTHON_LIBRARY})
+-      endif()
+-
+-      if( BUILD_TESTING )
+-        add_subdirectory(tests)
+-      endif()
+-
+-    endif()
+-  endif()
+-endif()
+-
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindDirectShow.cmake )
+-if(DIRECTSHOW_FOUND)
+-  add_definitions(-DHAS_DIRECTSHOW)
+-endif()
+diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx b/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
+deleted file mode 100644
+index baa2f55b02..0000000000
+--- a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
++++ /dev/null
+@@ -1,135 +0,0 @@
+-#include "reg_boxm.h"
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <brdb/brdb_selection.h>
+-
+-// processes
+-#include <vil_pro/vil_register.h>
+-#include <vpgl_pro/vpgl_register.h>
+-#include <sdet_pro/sdet_register.h>
+-//#include <icam_pro/icam_register.h>
+-#include <boxm/pro/boxm_register.h>
+-#include <boxm/algo/pro/boxm_algo_register.h>
+-#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
+-#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
+-
+-#include <bsta/pro/bsta_register.h>
+-#include <bapl/pro/bapl_register.h>
+-
+-#include <bbas_pro/bbas_register.h>
+-
+-#include <boxm/basic/boxm_util_data_types.h>
+-PyObject *
+-register_processes(PyObject *self, PyObject *args)
+-{
+-  vil_register::register_process();
+-  vpgl_register::register_process();
+-  boxm_register::register_process();
+-  boxm_algo_register::register_process();
+-
+-  boxm_algo_rt_register::register_process();
+-  boxm_algo_sp_register::register_process();
+-  sdet_register::register_process();
+-  //icam_register::register_process();
+-  bapl_register::register_process();
+-  bbas_register::register_process();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-PyObject *
+-register_datatypes(PyObject *self, PyObject *args)
+-{
+-  register_basic_datatypes();
+-  vil_register::register_datatype();
+-  vpgl_register::register_datatype();
+-  boxm_register::register_datatype();
+-  boxm_algo_register::register_process();
+-
+-  boxm_algo_rt_register::register_datatype();
+-  boxm_algo_sp_register::register_datatype();
+-
+-  bsta_register::register_datatype();
+-  //icam_register::register_datatype();
+-  bapl_register::register_datatype();
+-  bbas_register::register_datatype();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-
+-PyObject *get_boxm_array_1d_float(PyObject * /*self*/, PyObject *args)
+-{
+-  unsigned id;
+-  boxm_array_1d_float_sptr value;
+-  if (!PyArg_ParseTuple(args, "i:get_boxm_array_1d_float", &id))
+-    return NULL;
+-
+-  std::string relation_name = "boxm_array_1d_float_sptr_data";
+-
+-  // query to get the data
+-  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
+-  brdb_selection_sptr selec = DATABASE->select(relation_name, std::move(Q));
+-  PyObject *array_1d=0;
+-  if (selec->size()!=1) {
+-    std::cout << "in get_boxm_array_1d_float() - no relation with type" << relation_name << " id: " << id << std::endl;
+-
+-    return array_1d;
+-  }
+-
+-  brdb_value_sptr brdb_value;
+-  if (!selec->get_value(std::string("value"), brdb_value)) {
+-    std::cout << "in get_boxm_array_1d_float() didn't get value\n";
+-    return array_1d;
+-  }
+-
+-  if (!brdb_value) {
+-    std::cout << "in get_boxm_array_1d_float() - null value\n";
+-    return array_1d;
+-  }
+-
+-  brdb_value_t<boxm_array_1d_float_sptr>* result_out = static_cast<brdb_value_t<boxm_array_1d_float_sptr>* >(brdb_value.ptr());
+-  value = result_out->value();
+-
+-  array_1d = PyList_New(value->data_array.size());
+-  PyObject *x;
+-  for(unsigned i=0;i<value->data_array.size();i++)
+-  {
+-    x=PyFloat_FromDouble((double)value->data_array[i]);
+-    PyList_SetItem(array_1d, i,x);//Py_DECREF(x);
+-  }
+-  Py_INCREF(array_1d);
+-  return array_1d;
+-}
+-PyMODINIT_FUNC
+-initboxm_batch(void)
+-{
+-  PyMethodDef reg_pro;
+-  reg_pro.ml_name = "register_processes";
+-  reg_pro.ml_meth = register_processes;
+-  reg_pro.ml_doc = "register_processes() create instances of each defined process";
+-  reg_pro.ml_flags = METH_VARARGS;
+-
+-
+-  PyMethodDef reg_data;
+-  reg_data.ml_name = "register_datatypes";
+-  reg_data.ml_meth = register_datatypes;
+-  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
+-  reg_data.ml_flags = METH_VARARGS;
+-
+-  PyMethodDef get_boxm_array_1d_float_func;
+-  get_boxm_array_1d_float_func.ml_name = "get_boxm_array_1d_float";
+-  get_boxm_array_1d_float_func.ml_meth = get_boxm_array_1d_float;
+-  get_boxm_array_1d_float_func.ml_doc = "get_boxm_array_1d_float() Get 1-d array in python";
+-  get_boxm_array_1d_float_func.ml_flags = METH_VARARGS;
+-
+-  boxm_batch_methods[0]=reg_pro;
+-  boxm_batch_methods[1]=reg_data;
+-  boxm_batch_methods[2]=get_boxm_array_1d_float_func;
+-
+-  for (int i=0; i<METHOD_NUM; ++i) {
+-    boxm_batch_methods[i+3]=batch_methods[i];
+-  }
+-
+-  Py_InitModule("boxm_batch", boxm_batch_methods);
+-}
+diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.h b/contrib/brl/bseg/boxm_batch/reg_boxm.h
+deleted file mode 100644
+index fa2ddfee33..0000000000
+--- a/contrib/brl/bseg/boxm_batch/reg_boxm.h
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#ifndef reg_boxm_h_
+-#define reg_boxm_h_
+-
+-#include <bpro/bpro_batch/bpro_batch.h>
+-
+-static PyObject *register_processes(PyObject *self, PyObject *args);
+-static PyObject *register_datatypes(PyObject *self, PyObject *args);
+-static PyObject *get_boxm_array_1d_float(PyObject * self, PyObject *args);
+-
+-static PyMethodDef boxm_batch_methods[METHOD_NUM+3];
+-
+-#endif
+diff --git a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
+deleted file mode 100644
+index 8b72db0d89..0000000000
+--- a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_batch_test_include test_include.cxx )
+-target_link_libraries( boxm_batch_test_include boxm_batch)
+diff --git a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx b/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
+deleted file mode 100644
+index f962b339e8..0000000000
+--- a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <boxm_batch/reg_boxm.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
+deleted file mode 100644
+index 7186a42583..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
++++ /dev/null
+@@ -1,25 +0,0 @@
+-if (HAS_GEOTIFF)
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+-if(OPENCL_FOUND)
+-
+-  add_definitions(-DHAS_OPENCL=1)
+-  include_directories( ${OPENCL_INCLUDE_PATH} )
+-  include_directories( ${GEL_INCLUDE_DIR}/mrc )
+-  include_directories( ${MUL_INCLUDE_DIR} )
+-
+-  add_executable( boxm2_to_boxm_exe boxm2_to_boxm.cxx  boxm2_to_boxm.h)
+-  target_link_libraries( boxm2_to_boxm_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-  # executable to convert a bit scene to a boxm2_scene
+-  add_executable( boxm_to_boxm2_exe boxm_to_boxm2.cxx  boxm_to_boxm2.h)
+-  target_link_libraries( boxm_to_boxm2_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
+-
+-  #tests
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-endif()
+-else()
+-  message(STATUS "Skipping contrib/brl/bseg/boxm_bridge: requires geotiff")
+-endif()
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
+deleted file mode 100644
+index a9a7c43ba6..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
++++ /dev/null
+@@ -1,233 +0,0 @@
+-//:
+-// \file
+-#include <iostream>
+-#include <queue>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree2.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-#define BOXM2_SCENE_HAS_DIMENSIONS
+-
+-//: computes the log2 of a number and returns it.
+-// power_of_2 is set to true if \p x is an exact power of two.
+-// returns -1 when \p x is zero.
+-int mylog2(unsigned x, bool& power_of_2)
+-{
+-  unsigned orig_x = x;
+-  int l = -1; // mylog2(0) will return -1
+-  while (x != 0u) {
+-    x >>= 1u;
+-    ++l;
+-  }
+-  if (orig_x > std::pow(2.0,l)) {
+-    power_of_2 = false;
+-    ++l;
+-  }
+-  else
+-    power_of_2 = true;
+-  return l;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
+-{
+-  // find the leaf node in the tree to insert subtree
+-  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
+-  if (!node)
+-    std::cerr << "The node could NOT be FOUND\n";
+-  if (node->children()) {
+-    std::cerr << "The node is not a leaf node! Cannot insert here\n";
+-    return;   // it should have been a leaf node
+-  }
+-
+-  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
+-  node->insert_subtree(sub_root);
+-}
+-
+-// converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_tree(boct_bit_tree2 const& bit_tree, boct_tree<T_loc,T_data>*& tree,
+-                  boxm2_data<BOXM2_NORMAL>* normal_data)
+-{
+-  // check if root has any child, if not return the empty tree
+-  tree = new boct_tree<T_loc,T_data>(4, 1);
+-
+-  // if root has no child return a root node filled with data
+-  if (!bit_tree.bit_at(0)) {
+-    int data_idx = bit_tree.get_data_index(0,false);
+-    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
+-    tree->root()->set_data(vnl_vector_fixed<float, 3> (data[0], data[1], data[2]));
+-    return;
+-  }
+-
+-  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-  boct_tree_cell<T_loc,T_data>* root = tree->root();
+-  Q.push(root);
+-
+-  // go through the bits and create cells
+-  int data_idx=bit_tree.get_data_index(0,false);
+-  for (unsigned i=0; i<73; i++) {
+-    int parent_idx = (i-1)/8;
+-    if (i==0 || bit_tree.bit_at(parent_idx)) {
+-      if (!Q.empty()) {
+-        boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
+-        vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
+-        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-        ptr->set_data(normal);
+-        Q.pop();
+-        if (bit_tree.bit_at(i)) {
+-          ptr->split();
+-          boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-          for (unsigned j=0; j<8; j++) {
+-            Q.push(&children[j]);
+-          }
+-        }
+-        data_idx++;
+-      }
+-    }
+-  }
+-
+-  // some of the leaf nodes are still in the queue, fill them with data
+-  while (!Q.empty()) {
+-    if (data_idx > bit_tree.get_data_index(0,false)+585)
+-      std::cerr << "ERROR! exceeded!\n";
+-    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
+-    vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
+-    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-    ptr->set_data(normal);
+-    Q.pop();
+-    data_idx++;
+-  }
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
+-  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
+-  vul_arg<std::string> boxm_dir("-out", "output directory", "");
+-  vul_arg_parse(argc, argv);
+-
+-  boxm2_scene scene2(boxm2_file());
+-
+-  //initialize a block and data cache
+-  boxm2_lru_cache::create(&scene2);
+-  boxm2_cache_sptr cache = boxm2_cache::instance();
+-
+-  bgeo_lvcs lvcs = scene2.lvcs();
+-  //vgl_point_3d<double> origin = scene2.local_origin();
+-  vgl_box_3d<double> world = scene2.bounding_box();
+-  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2.blocks();
+-  std::map<boxm2_block_id, boxm2_block_metadata>::iterator iter = blocks.begin();
+-
+-  typedef boct_tree<short, vnl_vector_fixed<float, 3> > tree_type;
+-  vgl_vector_3d<unsigned int> block_nums = scene2.scene_dimensions();
+-  vgl_point_3d<int> min_block_index;
+-  vgl_point_3d<double> origin;
+-  scene2.min_block_index(min_block_index, origin);
+-  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
+-
+-
+-  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
+-  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
+-  scene.set_paths(scene_path,"block");
+-  scene.set_appearance_model(VNL_FLOAT_3);
+-
+-  int x_dim;
+-  while (iter != blocks.end()) {
+-    boxm2_block_metadata metadata = iter ->second;
+-    boxm2_block_id id = iter->first;
+-    boxm2_block *     block     = cache->get_block(iter->first);
+-    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
+-
+-    boxm2_data_base * data_base  = cache->get_data_base(iter->first,boxm2_data_traits<BOXM2_NORMAL>::prefix());
+-    boxm2_data<BOXM2_NORMAL> *data =new boxm2_data<BOXM2_NORMAL>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
+-
+-    // compute the block bounding box etc
+-    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
+-    vgl_vector_3d<double> subdim=block->sub_block_dim();
+-
+-    // block dimensions should be equal
+-    bool equal = (dim.x()==dim.y());
+-    equal = equal && (dim.x()==dim.z());
+-    assert(equal);
+-
+-    // the block dimensions should be the power of 2 for octree creation
+-    bool pow_of_2;
+-    x_dim = mylog2((double)dim.x(),pow_of_2);
+-    assert(pow_of_2);
+-
+-    double p[3];
+-    p[0] = metadata.local_origin_.x();
+-    p[1] = metadata.local_origin_.y();
+-    p[2] = metadata.local_origin_.z();
+-    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
+-    tree_type* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
+-    block_tree->set_bbox(block_bb);
+-    block_tree->init_cells(0);
+-
+-    int block_i = id.i() - min_block_index.x();
+-    int block_j = id.j() - min_block_index.y();
+-    int block_k = id.k() - min_block_index.z();
+-
+-    scene.load_block(block_i, block_j, block_k);
+-    // go over the subtrees
+-    for (unsigned z=0; z<dim.z(); z++) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        for (unsigned x=0; x<dim.x(); x++) {
+-          boxm2_block::uchar16 tree = block->trees()[x][y][z];
+-          boct_bit_tree2 bit_tree((unsigned char*)tree.data_block());
+-          if (bit_tree.num_cells() >= 1) {
+-            tree_type* octree;
+-            convert_tree(bit_tree,octree,data);
+-            int n1=bit_tree.num_cells();
+-            int n2=octree->all_cells().size();
+-            if (n1 != n2) {
+-              std::cerr << x << ',' << y << ',' << z << '\n'
+-              << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
+-            }
+-
+-            // all three dimensions should be same now, so we can use the one value
+-            double cell_dim=1./dim.x();
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            insert(block_tree,octree, cell_bb);
+-
+-            // since the subtree is added to the main tree, we can delete the root node now
+-            delete octree;
+-          }
+-        }
+-      }
+-    }
+-    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
+-    block_new->init_tree(block_tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  scene.set_octree_levels(x_dim+4, x_dim+1);
+-  scene.write_scene("boxm_scene.xml");
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
+deleted file mode 100644
+index a9d5135776..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
++++ /dev/null
+@@ -1,292 +0,0 @@
+-#include <iostream>
+-#include <queue>
+-#include "boxm2_to_boxm.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <cassert>
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-#define BOXM2_SCENE_HAS_DIMENSIONS
+-
+-//: computes the log2 of a number and returns it.
+-// power_of_2 is set to true if \p x is an exact power of two.
+-// returns -1 when \p x is zero.
+-int mylog2(unsigned x, bool& power_of_2)
+-{
+-  unsigned orig_x = x;
+-  int l = -1; // mylog2(0) will return -1
+-  while (x != 0u) {
+-    x >>= 1u;
+-    ++l;
+-  }
+-  if (orig_x > std::pow(2.0,l)) {
+-    power_of_2 = false;
+-    ++l;
+-  }
+-  else
+-    power_of_2 = true;
+-  return l;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
+-{
+-  // find the leaf node in the tree to insert subtree
+-  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
+-  if (!node)
+-    std::cerr << "The node could NOT be FOUND\n";
+-  if (node->children()) {
+-    std::cerr << "The node is not a leaf node! Cannot insert here\n";
+-    return;   // it should have been a leaf node
+-  }
+-
+-  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
+-  node->insert_subtree(sub_root);
+-}
+-
+-//: combine the data values to create a sample
+-boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
+-                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
+-                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs)
+-{
+-  float m0=data[0]/255.0f;
+-  float v0=data[1]/255.0f;
+-  float w0=data[2]/255.0f;
+-  float m1=data[3]/255.0f;
+-  float v1=data[4]/255.0f;
+-  float w1=data[5]/255.0f;
+-  float m2=data[6]/255.0f;
+-  float v2=data[7]/255.0f;
+-  float w2=0;
+-  if (w0>0 && w1>0)
+-    w2=1.0-w0-w1;
+-
+-  unsigned short n0=num_obs[0];
+-  unsigned short n1=num_obs[1];
+-  unsigned short n2=num_obs[2];
+-  unsigned short nmix=num_obs[3];
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::mix_gauss_sf1_type mix_gauss_sf1_type;
+-
+-
+-  bsta_gauss_sf1 dist0((float)m0, (float)v0);
+-  bsta_num_obs<bsta_gauss_sf1> num_obs_dist0(dist0, n0);
+-  bsta_gauss_sf1 dist1((float)m1, (float)v1);
+-  bsta_num_obs<bsta_gauss_sf1> num_obs_dist1(dist1, n1);
+-  bsta_gauss_sf1 dist2((float)m2, (float)v2);
+-  bsta_num_obs<bsta_gauss_sf1> num_obs_dist2(dist2, n2);
+-
+-  bsta_mixture_fixed<gauss_type_sf1, 3>  mf;
+-  mf.insert(num_obs_dist0,w0);
+-  mf.insert(num_obs_dist1,w1);
+-  mf.insert(num_obs_dist2,w2);
+-
+-  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs(mf,nmix/100.0f);
+-
+-  boxm_sample<BOXM_APM_MOG_GREY> sample(alpha, obs);
+-  return sample;
+-}
+-
+-// converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
+-                  boxm2_data<BOXM2_ALPHA>* alpha_data,
+-                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
+-                  boxm2_data<BOXM2_NUM_OBS>* num_obs)
+-{
+-  // check if root has any child, if not return the empty tree
+-  tree = new boct_tree<T_loc,T_data>(4, 1);
+-
+-  // if root has no child return a root node filled with data
+-  if (!bit_tree.bit_at(0)) {
+-    int data_idx = bit_tree.get_data_index(0,false);
+-    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
+-    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
+-    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
+-    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
+-    tree->root()->set_data(sample);
+-    return;
+-  }
+-
+-  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-  boct_tree_cell<T_loc,T_data>* root = tree->root();
+-  Q.push(root);
+-
+-  // go through the bits and create cells
+-  int data_idx=bit_tree.get_data_index(0,false);
+-  for (unsigned i=0; i<73; i++) {
+-    int parent_idx = (i-1)/8;
+-    if (i==0 || bit_tree.bit_at(parent_idx)) {
+-      if (!Q.empty()) {
+-        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
+-        boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
+-        boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
+-        boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
+-
+-        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-        ptr->set_data(sample);
+-        Q.pop();
+-        if (bit_tree.bit_at(i)) {
+-          ptr->split();
+-          boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-          for (unsigned j=0; j<8; j++) {
+-            Q.push(&children[j]);
+-          }
+-        }
+-        data_idx++;
+-      }
+-    }
+-  }
+-
+-  // some of the leaf nodes are still in the queue, fill them with data
+-  while (!Q.empty()) {
+-    if (data_idx > bit_tree.get_data_index(0,false)+585)
+-      std::cerr << "ERROR! exceeded!\n";
+-    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
+-    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
+-    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
+-    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
+-    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-    ptr->set_data(sample);
+-    Q.pop();
+-   data_idx++;
+-  }
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
+-  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
+-  vul_arg<std::string> boxm_dir("-out", "output directory", "");
+-  vul_arg_parse(argc, argv);
+-
+-  boxm2_scene_sptr scene2 = new boxm2_scene(boxm2_file());
+-
+-  //initialize a block and data cache
+-  boxm2_lru_cache::create(scene2);
+-  boxm2_cache_sptr cache = boxm2_cache::instance();
+-
+-  vpgl_lvcs lvcs = scene2->lvcs();
+-  //vgl_point_3d<double> origin = scene2->local_origin();
+-  vgl_box_3d<double> world = scene2->bounding_box();
+-  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2->blocks();
+-  auto iter = blocks.begin();
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  vgl_vector_3d<unsigned int> block_nums = scene2->scene_dimensions();
+-  vgl_point_3d<int> min_block_index;
+-  vgl_point_3d<double> origin;
+-  scene2->min_block_index(min_block_index, origin);
+-  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
+-
+-
+-  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
+-  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
+-  scene.set_paths(scene_path,"block");
+-  scene.set_appearance_model(BOXM_APM_MOG_GREY);
+-
+-  int x_dim;
+-  while (iter != blocks.end()) {
+-    boxm2_block_metadata metadata = iter ->second;
+-    boxm2_block_id id = iter->first;
+-    boxm2_block *     block     = cache->get_block(scene2, iter->first);
+-    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
+-    boxm2_data_base * data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_NUM_OBS>::prefix());
+-    boxm2_data<BOXM2_NUM_OBS> *num_obs=new boxm2_data<BOXM2_NUM_OBS>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
+-
+-    boxm2_data_base * mog3_data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_MOG3_GREY>::prefix());
+-    boxm2_data<BOXM2_MOG3_GREY> *mog3_data=new boxm2_data<BOXM2_MOG3_GREY>(mog3_data_base->data_buffer(),mog3_data_base->buffer_length(),mog3_data_base->block_id());
+-    boxm2_data_base * alpha_data_base  = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_ALPHA>::prefix());
+-    boxm2_data<BOXM2_ALPHA> *alpha_data =new boxm2_data<BOXM2_ALPHA>(alpha_data_base->data_buffer(),alpha_data_base->buffer_length(),alpha_data_base->block_id());
+-
+-    // compute the block bounding box etc
+-    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
+-    vgl_vector_3d<double> subdim=block->sub_block_dim();
+-
+-    // block dimensions should be equal
+-    bool equal = (dim.x()==dim.y());
+-    equal = equal && (dim.x()==dim.z());
+-    assert(equal);
+-
+-    // the block dimensions should be the power of 2 for octree creation
+-    bool pow_of_2;
+-    x_dim = mylog2((double)dim.x(),pow_of_2);
+-    assert(pow_of_2);
+-
+-    double p[3];
+-    p[0] = metadata.local_origin_.x();
+-    p[1] = metadata.local_origin_.y();
+-    p[2] = metadata.local_origin_.z();
+-    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
+-    auto* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
+-    block_tree->set_bbox(block_bb);
+-    block_tree->init_cells(0);
+-
+-    int block_i = id.i() - min_block_index.x();
+-    int block_j = id.j() - min_block_index.y();
+-    int block_k = id.k() - min_block_index.z();
+-
+-    scene.load_block(block_i, block_j, block_k);
+-    // go over the subtrees
+-    for (unsigned z=0; z<dim.z(); z++) {
+-      for (unsigned y=0; y<dim.y(); y++) {
+-        for (unsigned x=0; x<dim.x(); x++) {
+-          boxm2_block::uchar16 tree = block->trees()[x][y][z];
+-          boct_bit_tree bit_tree((unsigned char*)tree.data_block());
+-          if (bit_tree.num_cells() >= 1) {
+-            tree_type* octree;
+-            convert_tree(bit_tree,octree,alpha_data,mog3_data,num_obs);
+-            int n1=bit_tree.num_cells();
+-            int n2=octree->all_cells().size();
+-            if (n1 != n2) {
+-              std::cerr << x << ',' << y << ',' << z << '\n'
+-                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
+-            }
+-
+-            // all three dimensions should be same now, so we can use the one value
+-            double cell_dim=1./dim.x();
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            insert(block_tree,octree, cell_bb);
+-
+-            // since the subtree is added to the main tree, we can delete the root node now
+-            delete octree;
+-          }
+-        }
+-      }
+-    }
+-    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
+-    block_new->init_tree(block_tree);
+-    scene.write_active_block();
+-    iter++;
+-  }
+-  scene.set_octree_levels(x_dim+4, x_dim+1);
+-  scene.write_scene("boxm_scene.xml");
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
+deleted file mode 100644
+index a4dec11806..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#ifndef boxm2_to_boxm_h_
+-#define boxm2_to_boxm_h_
+-//:
+-// \file
+-
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-#include <boxm2/boxm2_data.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-//: combine the data values to create a sample
+-boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
+-                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
+-                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs);
+-
+-//: converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
+-                  boxm2_data<BOXM2_ALPHA>* alpha_data,
+-                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
+-                  boxm2_data<BOXM2_NUM_OBS>* num_obs);
+-
+-#endif // boxm2_to_boxm_h_
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
+deleted file mode 100644
+index 54dc134841..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
++++ /dev/null
+@@ -1,326 +0,0 @@
+-#include <queue>
+-#include <iostream>
+-#include "boxm_to_boxm2.h"
+-//:
+-// \file
+-//
+-//  boxm_normals_to_boxm2.cxx
+-//
+-// \author
+-//  Created by David Borton on 11/28/11.
+-//  Copyright (c) 2011 Brown University. All rights reserved.
+-//
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree2.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-
+-//: extracts the tree cell's data into an array format for boxm2 representation
+-template <class T_loc, class T_data>
+-void convert_data(boct_tree<T_loc,T_data>* tree,
+-                  boct_tree_cell<T_loc,T_data>* tree_cell,
+-                  boct_tree_cell<T_loc, bool>* valid_cell,
+-                  boct_tree_cell<T_loc, float>* alpha_cell,
+-                  boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr,
+-                  boxm2_data_traits<BOXM2_POINT>::datatype* points_arr,
+-                  boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr,
+-                  int& data_idx)
+-{
+-  // go through the tree, in depth first order to collect data
+-  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-  std::queue<boct_tree_cell<T_loc,float>*> alpha_Q;
+-  std::queue<boct_tree_cell<T_loc,bool>*> valid_Q;
+-
+-  Q.push(tree_cell);
+-  alpha_Q.push(alpha_cell);
+-  valid_Q.push(valid_cell);
+-
+-  while (!Q.empty()) {
+-    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-    boct_tree_cell<T_loc, bool>* valid_ptr = valid_Q.front();
+-    boct_tree_cell<T_loc, float> alpha_ptr = alpha_Q.front();
+-    vgl_point_3d<double> point = tree->global_centroid(tree_cell);
+-
+-    if (ptr && valid_ptr && alpha_ptr)
+-    {
+-      if (valid_ptr->data()) {
+-        T_data normal = tree_cell->data();
+-
+-        normals_arr[data_idx][0] = normal[0];
+-        normals_arr[data_idx][1] = normal[2];
+-        normals_arr[data_idx][2] = normal[3];
+-        normals_arr[data_idx][3] = 0.0f;
+-
+-        points_arr[data_idx][0] = point.x();
+-        points_arr[data_idx][1] = point.y();
+-        points_arr[data_idx][2] = point.z();
+-        points_arr[data_idx][3] = 0.0f;
+-
+-        alpha_arr[data_idx]=alpha_cell->data();
+-      }
+-      else {
+-        normals_arr[data_idx][0] = 0.0f;
+-        normals_arr[data_idx][1] = 0.0f;
+-        normals_arr[data_idx][2] = 0.0f;
+-        normals_arr[data_idx][3] = 0.0f;
+-
+-        points_arr[data_idx][0] = point.x();
+-        points_arr[data_idx][1] = point.y();
+-        points_arr[data_idx][2] = point.z();
+-        points_arr[data_idx][3] = 0.0f;
+-
+-        alpha_arr[data_idx]=alpha_cell->data();
+-      }
+-
+-      data_idx++;
+-
+-      if (!ptr->is_leaf()) {
+-        boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-        boct_tree_cell<T_loc, bool>* valid_children = valid_ptr->children();
+-        boct_tree_cell<T_loc, float>* alpha_chidren = alpha_ptr->children();
+-        for (unsigned j=0; j<8; j++) {
+-          Q.push(&children[j]);
+-          alpha_Q.push(&alpha_chidren[j]);
+-          valid_Q.push(&valid_children[j]);
+-        }
+-      }
+-    }
+-    Q.pop();
+-    alpha_Q.pop();
+-    valid_Q.pop();
+-  }
+-}
+-
+-//: recursively sets the bits based on the octree structure
+-template <class T_loc, class T_data>
+-void set_bits(boct_bit_tree2*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
+-{
+-  if (cell.code_.level == 0)
+-    return;
+-
+-  if (!cell.is_leaf()) {
+-    int bit_idx=idx*8+1+child_idx;
+-    bit_tree->set_bit_at(bit_idx,true);
+-    for (unsigned i=0; i<8; i++)
+-      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
+-  }
+-}
+-
+-//: converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree2*& bit_tree)
+-{
+-  bit_tree = new boct_bit_tree2();
+-  // first set all the bits to 0
+-  for (unsigned i=0; i<73; i++)
+-    bit_tree->set_bit_at(i,false);
+-
+-  // empty tree
+-  if (!tree_cell)
+-    return;
+-
+-  // only root node
+-  if (tree_cell->is_leaf())
+-    return;
+-
+-  int idx=0;
+-  bit_tree->set_bit_at(idx,true); // root
+-  for (unsigned i=0; i<8; i++) {  // level root-1
+-    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
+-  }
+-}
+-
+-template <class T_loc, class T_data>
+-void convert_scene( boxm_scene<boct_octree<T_loc, T_data> > &scene,
+-                    boxm_scene<boct_octree<T_loc, bool> > &valid_scene,
+-                    boxm_scene<boct_octree<T_loc, float> > &alpha_scene,
+-                    boxm2_scene &new_scene)
+-{
+-  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
+-  unsigned int dim=sub_block_dim();
+-  typedef boct_octree<T_loc, T_data> tree_type;
+-  boxm_block_iterator<tree_type > iter(&scene);
+-  boxm_block_iterator<tree_type > validd_iter(&valid_scene);
+-  boxm_block_iterator<tree_type > alpha_iter(&alpha_scene);
+-
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type >* block = scene.get_block(idx);
+-    vgl_box_3d<double> block_bb = block->bounding_box();
+-    std::cout<<block_bb<<std::endl;
+-    tree_type * tree = block->get_tree();
+-
+-    valid_scene.load_block(idx);
+-    boxm_block<boct_tree<short, bool> >* valid_block = valid_scene.get_block(idx);
+-    boct_tree<short, bool> * valid_tree = valid_block->get_tree();
+-
+-    alpha_scene.load_block(idx);
+-    boxm_block<boct_tree<short, float> >* alpha_block = alpha_scene.get_block(idx);
+-    boct_tree<short, float> * alpha_tree = alpha_block->get_tree();
+-
+-    // create metadata for the block
+-    boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
+-    vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
+-    vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
+-    vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
+-                                         sub_block_dim.y()*scene.block_dim().y(),
+-                                         sub_block_dim.z()*scene.block_dim().z());
+-    boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
+-                                  real_block_dim,sub_block_num,1,4,650.0,0.001);
+-    boxm2_block new_block(metadata);
+-    new_blocks[block_id]=metadata;
+-
+-    // find the total number of cells to figure out data array sizes, as the first step
+-    int data_size=0;
+-    for (unsigned z=0; z<dim; z++) {
+-      for (unsigned y=0; y<dim; y++) {
+-        for (unsigned x=0; x<dim; x++) {
+-          double cell_dim=1./dim;
+-          double p[3];
+-          p[0] = x*cell_dim;
+-          p[1] = y*cell_dim;
+-          p[2] = z*cell_dim;
+-          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-          boct_tree_cell<T_loc,T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-          if (!node)
+-            std::cout << "The node COULD not be FOUND" << std::endl;
+-          else {
+-            std::vector<boct_tree_cell<T_loc,T_data> > *> children;
+-            node->all_children(children);
+-            int n2= children.size()+1;
+-            data_size += n2;
+-          }
+-        }
+-      }
+-    }
+-
+-    // allocate data array
+-    boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr=new  boxm2_data_traits<BOXM2_NORMAL>::datatype[data_size];
+-    boxm2_data_traits<BOXM2_POINT>::datatype* points_arr=new  boxm2_data_traits<BOXM2_POINT>::datatype[data_size];
+-    boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr = new boxm2_data_traits<BOXM2_ALPHA>::datatype[data_size];
+-
+-    // divide the blocks
+-    int data_idx=0;
+-    boxm2_array_3d<boxm2_block::uchar16>& trees = new_block.trees();
+-    for (unsigned z=0; z<dim; z++) {
+-      for (unsigned y=0; y<dim; y++) {
+-        for (unsigned x=0; x<dim; x++) {
+-          double cell_dim=1./dim;
+-          double p[3];
+-          p[0] = x*cell_dim;
+-          p[1] = y*cell_dim;
+-          p[2] = z*cell_dim;
+-          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-          boct_tree_cell<T_loc, T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-          boct_tree_cell<T_loc, bool>* valid_node = valid_tree->locate_point_at_level(cell_bb.centroid(), 3);
+-          boct_tree_cell<T_loc, float> *alpha_node = alpha_tree->locate_point_at_level(cell_bb.centroid(), 3);
+-
+-          if (!(node && valid_node && alpha_node) )
+-            std::cout << "One of the nodes COULD not be FOUND" << std::endl;
+-          else {
+-            std::vector<boct_tree_cell<T_loc, T_data > *> children;
+-            node->all_children(children);
+-            int n2= children.size()+1;
+-
+-            boct_bit_tree2* bit_tree;
+-            convert_to_bittree(node, bit_tree);
+-            int n1=bit_tree->num_cells();
+-            int start=data_idx;
+-            convert_data(tree, node, valid_node, alpha_node, normals_arr, points_arr, alpha_arr,  data_idx);
+-            // set the data index at the tree
+-            bit_tree->set_data_ptr(start, false);
+-            // set the tree at the block
+-            boxm2_block::uchar16& t=trees[x][y][z];
+-            t.set(bit_tree->get_bits());
+-            if (n1 != n2) {
+-              std::cout << x << ',' << y << ',' << z << '\n'
+-                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
+-            }
+-          }
+-        }
+-      }
+-    }
+-    char* b1 = reinterpret_cast<char *>(normals_arr);
+-    boxm2_data<BOXM2_NORMAL> *normals_data=new boxm2_data<BOXM2_NORMAL>(b1,data_size*sizeof(boxm2_data_traits<BOXM2_NORMAL>::datatype),block_id);
+-    char* b2 = reinterpret_cast<char *>(pointa_arr);
+-    boxm2_data<BOXM2_POINT> *points_data=new boxm2_data<BOXM2_POINT>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_POINT>::datatype),block_id);
+-    char* b3 = reinterpret_cast<char *>(alpha_arr);
+-    boxm2_data<BOXM2_ALPHA> *alpha_data = new boxm2_data<BOXM2_ALPHA>(b3, data_size*sizeof(boxm2_data_traits<BOXM2_ALPHA>::datatype),block_id);
+-
+-    boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
+-    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, normals_data);
+-    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, points_data);
+-    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
+-
+-    delete [] normals_arr;
+-    delete [] points_arr;
+-    delete [] alpha_arr;
+-    iter++;
+-  }
+-  new_scene.set_blocks(new_blocks);
+-  new_scene.save_scene();
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout << "Converting boxm scene with normals to boxm2 normals and points" << std::endl;
+-  vul_arg<std::string> scene_path("-normals_scene", "scene filename", "");
+-  vul_arg<std::string> scene_path("-valid_scene", "scene filename", "");
+-  vul_arg<std::string> scene_path("-alpha_scene", "scene filename", "");
+-  vul_arg<std::string> out_dir("-out", "output directory", "");
+-  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
+-  vul_arg_parse(argc, argv);
+-
+-  boxm_scene_parser parser;
+-  boxm_scene_base_sptr n_scene_ptr=new boxm_scene_base();
+-  n_scene_ptr->load_scene(normals_scene(), parser);
+-
+-  if (n_scene_ptr->appearence_model() == VNL_FLOAT_3)
+-  {
+-    typedef boct_tree<short, VNL_FLOAT_3 > tree_type;
+-    boxm_scene<tree_type > scene;
+-    scene.load_scene(normals_scene());
+-
+-    boxm_scene<boct_tree<short, bool> > valid_scene;
+-    valid_scene.load_scene(valid_scene());
+-
+-    boxm_scene<boct_tree<short, float> > alpha_scene;
+-    alpha_scene.load_scene(alpha_scene());
+-
+-    // create a boxm2 scene
+-    boxm2_scene new_scene;
+-    new_scene.set_data_path(out_dir());
+-    new_scene.set_local_origin(scene.origin());
+-    new_scene.set_lvcs(scene.lvcs());
+-    new_scene.set_xml_path(out_dir()+"/scene.xml");
+-
+-    //initialize a block
+-    boxm2_lru_cache::create(&new_scene);
+-
+-    convert_scene(scene, valid_scene, alpha_scene, new_scene);
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
+deleted file mode 100644
+index 5a3d2d6e83..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
++++ /dev/null
+@@ -1,262 +0,0 @@
+-#include <iostream>
+-#include <queue>
+-#include "boxm_to_boxm2.h"
+-//:
+-// \file
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//executable args
+-#include <vul/vul_arg.h>
+-
+-#include <vgl/vgl_point_3d.h>
+-#include <vgl/vgl_box_3d.h>
+-
+-//boct files
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-
+-//boxm2 files
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_block.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm2/io/boxm2_sio_mgr.h>
+-#include <boxm2/io/boxm2_lru_cache.h>
+-
+-// boxm files
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_apm_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-
+-//: extracts the parameters of a boxm_sample for boxm2 representation
+-void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
+-                        float &alpha,
+-                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
+-                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs)
+-{
+-  alpha=sample.alpha;
+-
+-  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
+-
+-  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs = sample.appearance();
+-  unsigned int nmix = obs.num_observations*100.0;
+-  num_obs[3] = nmix;
+-
+-  for (unsigned i=0; i<obs.num_components(); i++) {
+-    gauss_type_sf1  mf=obs.distribution(i);
+-    auto w = (unsigned char)std::floor(obs.weight(i)*255.0);
+-    unsigned int  n = (unsigned char)mf.num_observations;
+-    auto m = (unsigned char)std::floor(mf.mean()*255.0);
+-    auto v = (unsigned char)std::floor(mf.var()*255.0);
+-    num_obs[i]=n;
+-    data[i*3]=m;
+-    data[i*3+1]=v;
+-    if (i<2)
+-      data[i*3+2]=w;
+-  }
+-}
+-
+-//: extracts the tree cell's data into an array format for boxm2 representation
+-template <class T_loc, class T_data>
+-void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
+-                  float* alpha,
+-                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
+-                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
+-                  int& data_idx)
+-{
+-    // go through the tree, in depth first order to collect data
+-    std::queue<boct_tree_cell<T_loc,T_data>*> Q;
+-    Q.push(tree_cell);
+-    while (!Q.empty()) {
+-        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
+-        {
+-            deconstruct_sample(ptr->data(),alpha[data_idx],data[data_idx],num_obs[data_idx]);
+-            data_idx++;
+-            if (!ptr->is_leaf()) {
+-                boct_tree_cell<T_loc,T_data>* children = ptr->children();
+-                for (unsigned j=0; j<8; j++) {
+-                    Q.push(&children[j]);
+-                }
+-            }
+-        }
+-        Q.pop();
+-    }
+-}
+-
+-//: recursively sets the bits based on the octree structure
+-template <class T_loc, class T_data>
+-void set_bits(boct_bit_tree*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
+-{
+-  if (cell.code_.level == 0)
+-    return;
+-
+-  if (!cell.is_leaf()) {
+-    int bit_idx=idx*8+1+child_idx;
+-    bit_tree->set_bit_at(bit_idx,true);
+-    for (unsigned i=0; i<8; i++)
+-      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
+-  }
+-}
+-
+-//: converts the bit tree to boct_octree representation
+-template <class T_loc, class T_data>
+-void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree)
+-{
+-  bit_tree = new boct_bit_tree();
+-  // first set all the bits to 0
+-  for (unsigned i=0; i<73; i++)
+-    bit_tree->set_bit_at(i,false);
+-
+-  // empty tree
+-  if (!tree_cell)
+-    return;
+-
+-  // only root node
+-  if (tree_cell->is_leaf()) {
+-    return;
+-  }
+-
+-  int idx=0;
+-  bit_tree->set_bit_at(idx,true); // root
+-  for (unsigned i=0; i<8; i++) {  // level root-1
+-    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
+-  }
+-}
+-
+-int main(int argc, char** argv)
+-{
+-  std::cout << "Converting boxm scene to boxm2 Scene" << std::endl;
+-  vul_arg<std::string> scene_path("-scene", "scene filename", "");
+-  vul_arg<std::string> out_dir("-out", "output directory", "");
+-  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
+-  vul_arg_parse(argc, argv);
+-
+-  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
+-  boxm_scene<tree_type > scene;
+-  scene.load_scene(scene_path());
+-
+-  // create a boxm2 scene
+-  boxm2_scene new_scene;
+-  new_scene.set_data_path(out_dir());
+-  new_scene.set_local_origin(scene.origin());
+-  new_scene.set_lvcs(scene.lvcs());
+-  new_scene.set_xml_path(out_dir()+"/scene.xml");
+-
+-  //initialize a block
+-  boxm2_lru_cache::create(&new_scene);
+-
+-  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
+-  unsigned int dim=sub_block_dim();
+-  if (scene.appearence_model() == BOXM_APM_MOG_GREY) {
+-    boxm_block_iterator<tree_type > iter(&scene);
+-    while (!iter.end()) {
+-      vgl_point_3d<int> idx = iter.index();
+-      scene.load_block(idx);
+-      boxm_block<tree_type >* block = scene.get_block(idx);
+-      vgl_box_3d<double> block_bb = block->bounding_box();
+-      std::cout<<block_bb<<std::endl;
+-      tree_type * tree = block->get_tree();
+-
+-      // create metadata for the block
+-      boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
+-      vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
+-      vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
+-      vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
+-                                           sub_block_dim.y()*scene.block_dim().y(),
+-                                           sub_block_dim.z()*scene.block_dim().z());
+-      boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
+-                                    real_block_dim,sub_block_num,1,4,650.0,0.001);
+-      boxm2_block new_block(metadata);
+-      new_blocks[block_id]=metadata;
+-
+-      // find the total number of cells to figure out data array sizes, as the first step
+-      int data_size=0;
+-      for (unsigned z=0; z<dim; z++) {
+-        for (unsigned y=0; y<dim; y++) {
+-          for (unsigned x=0; x<dim; x++) {
+-            double cell_dim=1./dim;
+-            double p[3];
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-            if (!node)
+-              std::cout << "The node COULD not be FOUND" << std::endl;
+-            else {
+-              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
+-              node->all_children(children);
+-              int n2= children.size()+1;
+-              data_size += n2;
+-            }
+-          }
+-        }
+-      }
+-
+-      // allocate data array
+-      auto* data_arr=new  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype[data_size];
+-      auto* num_obs_arr=new  boxm2_data_traits<BOXM2_NUM_OBS>::datatype[data_size];
+-      auto* alpha_arr = new float[data_size];
+-
+-      // divide the blocks
+-      int data_idx=0;
+-      boxm2_array_3d<boxm2_block::uchar16> trees = new_block.trees_copy();
+-      for (unsigned z=0; z<dim; z++) {
+-        for (unsigned y=0; y<dim; y++) {
+-          for (unsigned x=0; x<dim; x++) {
+-            double cell_dim=1./dim;
+-            double p[3];
+-            p[0] = x*cell_dim;
+-            p[1] = y*cell_dim;
+-            p[2] = z*cell_dim;
+-            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
+-            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
+-            if (!node)
+-              std::cout << "The node COULD not be FOUND" << std::endl;
+-            else {
+-              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
+-              node->all_children(children);
+-              int n2= children.size()+1;
+-
+-              boct_bit_tree* bit_tree;
+-              convert_to_bittree(node, bit_tree);
+-              int n1=bit_tree->num_cells();
+-              int start=data_idx;
+-              convert_data(node, alpha_arr, data_arr, num_obs_arr, data_idx);
+-              // set the data index at the tree
+-              bit_tree->set_data_ptr(start, false);
+-              // set the tree at the block
+-              boxm2_block::uchar16& t=trees[x][y][z];
+-              t.set(bit_tree->get_bits());
+-              if (n1 != n2) {
+-                std::cout << x << ',' << y << ',' << z << '\n'
+-                         << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
+-              }
+-            }
+-          }
+-        }
+-      }
+-      new_block.set_trees(trees);
+-      char* b1 = reinterpret_cast<char *>(alpha_arr);
+-      boxm2_data<BOXM2_ALPHA> *alpha_data=new boxm2_data<BOXM2_ALPHA>(b1,data_size*sizeof(float),block_id);
+-      char* b2 = reinterpret_cast<char *>(data_arr);
+-      boxm2_data<BOXM2_MOG3_GREY> *mog_data=new boxm2_data<BOXM2_MOG3_GREY>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_MOG3_GREY>::datatype),block_id);
+-      char* b3 = reinterpret_cast<char *>(num_obs_arr);
+-      boxm2_data<BOXM2_NUM_OBS> *num_data=new boxm2_data<BOXM2_NUM_OBS>(b3,data_size*sizeof(boxm2_data_traits<BOXM2_NUM_OBS>::datatype),block_id);
+-
+-      boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
+-      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
+-      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, mog_data);
+-      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, num_data);
+-
+-      delete [] alpha_arr;
+-      delete [] data_arr;
+-      delete [] num_obs_arr;
+-      iter++;
+-    }
+-    new_scene.set_blocks(new_blocks);
+-    new_scene.save_scene();
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
+deleted file mode 100644
+index 6f15345854..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-#ifndef boxm_to_boxm2_h_
+-#define boxm_to_boxm2_h_
+-//:
+-// \file
+-
+-#include <boct/boct_tree.h>
+-#include <boct/boct_bit_tree.h>
+-#include <boxm2/boxm2_data.h>
+-#include <boxm2/boxm2_data_traits.h>
+-#include <boxm/sample/boxm_sample.h>
+-
+-//: extracts the parameters of a boxm_sample for boxm2 representation
+-void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
+-                        float &alpha,
+-                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
+-                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs);
+-
+-//: extracts the tree cell's data into an array format for boxm2 representation
+-template <class T_loc, class T_data>
+-void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
+-                  float* alpha,
+-                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
+-                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
+-                  int& data_idx);
+-
+-//: converts the boct_octree to bit tree representation
+-template <class T_loc, class T_data>
+-void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree);
+-
+-#endif // boxm_to_boxm2_h_
+diff --git a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
+deleted file mode 100644
+index 62cccc7c6f..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( boxm_bridge_test_include test_include.cxx )
+-target_link_libraries( boxm_bridge_test_include boxm)
+diff --git a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx b/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
+deleted file mode 100644
+index ee10496c92..0000000000
+--- a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <boxm_bridge/boxm2_to_boxm.h>
+-#include <boxm_bridge/boxm_to_boxm2.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/CMakeLists.txt b/contrib/brl/bseg/bvpl/CMakeLists.txt
+index 424ed5bf50..2593480038 100644
+--- a/contrib/brl/bseg/bvpl/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/CMakeLists.txt
+@@ -24,7 +24,6 @@ target_link_libraries(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta ${VXL_
+ 
+ add_subdirectory(pro)
+ add_subdirectory(util)
+-add_subdirectory(bvpl_octree)
+ add_subdirectory(kernels)
+ add_subdirectory(functors)
+ 
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+deleted file mode 100644
+index 1f390f966c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
++++ /dev/null
+@@ -1,71 +0,0 @@
+-# This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+-# Brown Voxel Processing library for octrees
+-
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-
+-#option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
+-#mark_as_advanced( VXL_FORCE_V3P_RPLY )
+-
+-if(EXPAT_FOUND)
+-
+-find_package( Threads )
+-
+-#vxl_configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/bvpl_octree_config.h.in
+-#                ${CMAKE_CURRENT_BINARY_DIR}/bvpl_octree_config.h include/vxl/contrib/brl/bseg/bvpl/bvpl_octree)
+-
+-include_directories( ${EXPAT_INCLUDE_DIR} )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/boct )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl )
+-include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+-
+-set(bvpl_octree_sources
+-    bvpl_octree_kernel_operator.h
+-    bvpl_octree_vector_operator.h
+-    bvpl_scene_kernel_operator.h
+-    bvpl_scene_vector_operator.h
+-    bvpl_block_kernel_operator.h
+-    bvpl_block_vector_operator.h
+-    bvpl_octree_vrml_util.h
+-    bvpl_cell_data_traits.h
+-    bvpl_octree_neighbors.h
+-    bvpl_scene_neighborhood_operator.h    bvpl_scene_neighborhood_operator.cxx
+-    bvpl_scene_statistics.h               bvpl_scene_statistics.cxx
+-    bvpl_discover_pca_kernels.h           bvpl_discover_pca_kernels.cxx
+-    bvpl_pca_error_scenes.h               bvpl_pca_error_scenes.cxx
+-    bvpl_global_pca.h                     bvpl_global_pca.hxx
+-    bvpl_taylor_scenes_map.h              bvpl_taylor_scenes_map.cxx
+-    bvpl_taylor_basis.h                   bvpl_taylor_basis.cxx
+-    bvpl_global_taylor.h                  bvpl_global_taylor.hxx          bvpl_global_taylor.cxx
+-    bvpl_global_corners.h                 bvpl_global_corners.cxx
+-    bvpl_corner_detector.h
+-    bvpl_corner_functors.h
+-    bvpl_gauss3D_steerable_filters.h      bvpl_gauss3D_steerable_filters.cxx
+-   )
+-
+-aux_source_directory(Templates bvpl_octree_sources)
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree LIBRARY_SOURCES ${bvpl_octree_sources})
+-target_link_libraries(bvpl_octree bvpl_kernels bvpl_functors bvpl_octree_sample bvrml boxm boct ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+-
+-#Binary io
+-add_subdirectory(io)
+-
+-#Directory with python/c++ processes
+-add_subdirectory(pro)
+-
+-# Octree samples needed by bvpl
+-add_subdirectory(sample)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-if( CMAKE_USE_PTHREADS_INIT )
+-  add_definitions(-DBVPL_OCTREE_HAS_PTHREADS=1)
+-  set_target_properties(bvpl_octree PROPERTIES COMPILE_FLAGS -pthread)
+-  target_link_libraries(bvpl_octree pthread)
+-endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
+deleted file mode 100644
+index 067773b3d9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
+deleted file mode 100644
+index a5900cfb6b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<float>);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<float>);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
+deleted file mode 100644
+index 7c2f63355a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
+deleted file mode 100644
+index 81366222a6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-BOCT_TREE_INSTANTIATE(short, bvpl_taylor_basis2_sample);
+-BOCT_TREE_CELL_INSTANTIATE(short, bvpl_taylor_basis2_sample);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
+deleted file mode 100644
+index 7cad8969f8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef boct_tree<short, bvpl_octree_sample< gauss_type> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
+deleted file mode 100644
+index 8a135d4e05..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#include <iostream>
+-#include <string>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-typedef boct_tree<short, bvpl_octree_sample<float> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
+deleted file mode 100644
+index fcc60090f2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-
+-typedef boct_tree<short, bvpl_pca_basis_sample<10> > tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
+deleted file mode 100644
+index d4d340f12d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_block.hxx>
+-#include <boxm/boxm_scene.hxx>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-#include <vbl/vbl_array_3d.hxx>
+-
+-typedef boct_tree<short, bvpl_taylor_basis2_sample> tree_type;
+-
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
+deleted file mode 100644
+index cafd0cfaf7..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
++++ /dev/null
+@@ -1,2 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
+-BVPL_GLOBAL_PCA(125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
+deleted file mode 100644
+index 9e815605e3..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl_octree/bvpl_global_taylor.hxx>
+-
+-BVPL_GLOBAL_TAYLOR_INSTANTIATE(double, 10);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
+deleted file mode 100644
+index b8312f8e7e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl_octree/bvpl_global_taylor.hxx>
+-
+-BVPL_GLOBAL_TAYLOR_INSTANTIATE(float, 3);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
+deleted file mode 100644
+index e32ee1303b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
+deleted file mode 100644
+index 1bf245a9f9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_global_corners);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
+deleted file mode 100644
+index ff5175103e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-typedef bvpl_global_pca<125> bvpl_global_pca_125;
+-VBL_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
+deleted file mode 100644
+index 254b91e81f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-typedef bvpl_global_taylor<double,10> gt;
+-VBL_SMART_PTR_INSTANTIATE(gt);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
+deleted file mode 100644
+index a13ebae610..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
+deleted file mode 100644
+index 07c500d5bb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <vbl/vbl_smart_ptr.hxx>
+-
+-VBL_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
+deleted file mode 100644
+index e15416cdba..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
++++ /dev/null
+@@ -1,2 +0,0 @@
+-#include <vnl/vnl_matrix_fixed.hxx>
+-VNL_MATRIX_FIXED_INSTANTIATE(double,125,125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
+deleted file mode 100644
+index ec59fe4893..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
++++ /dev/null
+@@ -1,134 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
+-#ifndef bvpl_block_kernel_operator_h
+-#define bvpl_block_kernel_operator_h
+-
+-//:
+-// \file
+-// \brief A class operates a kernel on a boxm_block
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  1-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boxm/boxm_scene.h>
+-#include "bvpl_octree_kernel_operator.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//: A class which operates a kernel on a boxm_block.
+-// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
+-// This class is useful to run multithreading processes
+-class bvpl_block_kernel_operator
+-{
+- public:
+-  //: "Convolves" kernel with an input octree, storing the output in an output octree.
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-               F functor,
+-               bvpl_kernel_sptr kernel,
+-               unsigned i, unsigned j, unsigned k,
+-               boxm_scene<boct_tree<short, T_data > > &scene_out,
+-               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
+-};
+-
+-//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data, class F>
+-void bvpl_block_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_sptr kernel,
+-                                         unsigned block_i, unsigned block_j, unsigned block_k,
+-                                         boxm_scene<boct_tree<short, T_data > > &scene_out,
+-                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  //scene_in.clone_blocks(scene_out, T_data());
+-
+-  // Load input and output blocks
+-  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
+-  scene_out.load_block(block_i,block_j,block_k);
+-  valid_scene.load_block(block_i,block_j,block_k);
+-
+-
+-  tree_type *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
+-  tree_type *tree_out = tree_in->clone();
+-  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<cell_type* > cells_out = tree_out->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  typename std::vector<cell_type* >::iterator it_out = cells_out.begin();
+-  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end())&& (valid_it!=valid_cells.end()); it_in++, it_out++, valid_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short,T_data> *out_center_cell = *it_out;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    bool valid = true;
+-
+-#ifdef DEBUG
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
+-
+-      if (this_cell) {
+-        bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val, d);
+-      }
+-      else {
+-        valid = false;
+-        break;
+-      }
+-
+-      ++kernel_iter;
+-    }
+-
+-    out_center_cell->set_data(functor.result());
+-    valid_center_cell->set_data(valid);
+-  }
+-
+-  //write the output block
+-  std::cout << "Writing scenes\n";
+-  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
+-  scene_out.write_active_block();
+-  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene.write_active_block();
+-}
+-
+-#endif // bvpl_block_kernel_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
+deleted file mode 100644
+index 7c772dbd2f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
++++ /dev/null
+@@ -1,146 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
+-#ifndef bvpl_block_vector_operator_h
+-#define bvpl_block_vector_operator_h
+-
+-//:
+-// \file
+-// \brief A class operates a kernel on a boxm_block
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  1-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boxm/boxm_scene.h>
+-#include "bvpl_octree_kernel_operator.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//:A class operates a kernel on a boxm_block.
+-// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
+-// This class is useful to run multathreding processes
+-class bvpl_block_vector_operator
+-{
+- public:
+-  //: "Convolves" kernel with an input octree, storing the output in an output octree.
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data_in, class T_data_out,class F, unsigned dim >
+-  void operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
+-               F functor,
+-               bvpl_kernel_vector_sptr kernel_vector,
+-               unsigned block_i, unsigned block_j, unsigned block_k,
+-               boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
+-               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
+-};
+-
+-//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data_in, class T_data_out,class F, unsigned dim >
+-void bvpl_block_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_vector_sptr kernel_vector,
+-                                         unsigned block_i, unsigned block_j, unsigned block_k,
+-                                         boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
+-                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
+-{
+-  if (kernel_vector->size()!=dim) {
+-    std::cout << "Error in bvpl_block_vector_operator::operate ---> size missmatch\n";
+-    return;
+-  }
+-
+-  typedef boct_tree<short, T_data_in> tree_type_in;
+-  typedef boct_tree_cell<short,T_data_in> cell_type_in;
+-
+-  typedef boct_tree<short, vnl_vector_fixed<T_data_out, dim> > tree_type_out;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<T_data_out, dim> > cell_type_out;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  // Load input and output blocks
+-  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
+-  scene_out.load_block(block_i,block_j,block_k);
+-  valid_scene.load_block(block_i,block_j,block_k);
+-
+-
+-  tree_type_in *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
+-  tree_type_out *tree_out = tree_in->template clone_to_type<vnl_vector_fixed<T_data_out, dim> >();
+-  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
+-
+-  std::vector<cell_type_in* > cells_in = tree_in->leaf_cells();
+-  std::vector<cell_type_out* > cells_out = tree_out->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type_in* >::iterator it_in = cells_in.begin();
+-  typename std::vector<cell_type_out* >::iterator it_out = cells_out.begin();
+-  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-
+-  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end() && (valid_it!=valid_cells.end())); ++it_in, ++it_out, ++valid_it)
+-  {
+-    cell_type_in *center_cell = *it_in;
+-    cell_type_out *out_center_cell = *it_out;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    bool valid = true;
+-
+-#ifdef DEBUG
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    vnl_vector_fixed<T_data_out, dim> responses;
+-
+-    for (unsigned k=0; k< kernel_vector->kernels_.size(); ++k)
+-    {
+-      bvpl_kernel_sptr kernel = kernel_vector->kernels_[k];
+-      bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-      kernel_iter.begin(); // reset the kernel iterator
+-      while (!kernel_iter.isDone())
+-      {
+-        vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
+-
+-        if (this_cell) {
+-          bvpl_kernel_dispatch d = *kernel_iter;
+-          T_data_in val =(T_data_in)this_cell->data();
+-          functor.apply(val, d);
+-        }
+-        else {
+-          valid = false;
+-          break;
+-        }
+-
+-        ++kernel_iter;
+-      }
+-      responses[k] = (T_data_out)(functor.result());
+-    }
+-
+-    out_center_cell->set_data(responses);
+-    valid_center_cell->set_data(valid);
+-  }
+-
+-  //write the output block
+-  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
+-  scene_out.write_active_block();
+-  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene.write_active_block();
+-}
+-
+-#endif // bvpl_block_vector_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
+deleted file mode 100644
+index 7f28fa9bef..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
++++ /dev/null
+@@ -1,34 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
+-#ifndef bvpl_cell_data_traits_h
+-#define bvpl_cell_data_traits_h
+-//:
+-// \file
+-// \brief  Set of accessors of cell's data, taking care of different datatypes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Dec 16, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <boct/boct_tree_cell.h>
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-
+-//: Float to float
+-template <class T_loc>
+-float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<float> >* cell)
+-{
+-  return cell->data().response_;
+-}
+-
+-//: Mixture of gaussians to float; return the mean
+-template <class T_loc>
+-float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > >* cell)
+-{
+-  return cell->data().response_.mean();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
+deleted file mode 100644
+index e3988f369f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
++++ /dev/null
+@@ -1,299 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
+-#ifndef bvpl_corner_detector_h
+-#define bvpl_corner_detector_h
+-//:
+-// \file
+-// \brief A class to detect 3d Harris corners, based on the 2nd moment matrix
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  20-Jul-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vnl/vnl_double_3x3.h>
+-#include <vnl/algo/vnl_determinant.h>
+-
+-class bvpl_corner_detector
+-{
+- public:
+-  //: Detects Harris features  kernel with an input octree
+-  //  However, features below the Harris threshold are set as invalid in the valid_scene (in place)
+-  //  The type of measure used, depends on the functor.
+-  template<class T_data, class F>
+-  void detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                             F harris_functor,
+-                             vgl_point_3d<int> min_neigborhood_idx,
+-                             vgl_point_3d<int> max_neigborhood_idx,
+-                             unsigned block_i, unsigned block_j, unsigned block_k,
+-                             boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                             boxm_scene<boct_tree<short, float> > *corner_scene,
+-                             double cell_length);
+-
+-  //: Computes the corner measure and stores it in "corner_scene"
+-  //  Input scene and auxiliary valid scene are not modified
+-  template<class T_data, class F>
+-  void compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                  F harris_functor,
+-                  vgl_point_3d<int> min_neigborhood_idx,
+-                  vgl_point_3d<int> max_neigborhood_idx,
+-                  unsigned block_i, unsigned block_j, unsigned block_k,
+-                  boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                  boxm_scene<boct_tree<short, float> > *corner_scene,
+-                  double cell_length);
+-
+-  //: Compute the determinant of the hessian
+-  template<class T_data>
+-  void compute_det_H(boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                     unsigned block_i, unsigned block_j, unsigned block_k,
+-                     boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                     boxm_scene<boct_tree<short, float> > *corner_scene);
+-};
+-
+-
+-template<class T_data, class F>
+-void bvpl_corner_detector::detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                                                 F harris_functor,
+-                                                 vgl_point_3d<int> min_neigborhood_idx,
+-                                                 vgl_point_3d<int> max_neigborhood_idx,
+-                                                 unsigned block_i, unsigned block_j, unsigned block_k,
+-                                                 boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                                                 boxm_scene<boct_tree<short, float> > *corner_scene,
+-                                                 double cell_length)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  // Load input and output blocks
+-  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-  corner_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
+-  corner_tree->init_cells(0.0f);
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
+-
+-  unsigned long n_fail = 0;
+-
+-  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
+-
+-    if (!valid_center_cell->data()) {
+-      continue;
+-    }
+-#if 0
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
+-      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
+-        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
+-        {
+-          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
+-
+-          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
+-                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
+-                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
+-
+-          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
+-
+-          if (this_cell) {
+-            harris_functor.apply(this_cell->data());
+-          }
+-          else
+-            break;
+-        }
+-
+-    double C = 0;
+-    if (!harris_functor.result(C)) {
+-      valid_center_cell->set_data(false);
+-      ++n_fail;
+-    }
+-    corner_center_cell->set_data(float(C));
+-  }
+-
+-  std::cout << "Number of Harris fails: " << n_fail << std::endl;
+-  //write the output block
+-  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene->write_active_block();
+-  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
+-  corner_scene->write_active_block();
+-}
+-
+-template<class T_data, class F>
+-void bvpl_corner_detector::compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                                      F harris_functor,
+-                                      vgl_point_3d<int> min_neigborhood_idx,
+-                                      vgl_point_3d<int> max_neigborhood_idx,
+-                                      unsigned block_i, unsigned block_j, unsigned block_k,
+-                                      boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                                      boxm_scene<boct_tree<short, float> > *corner_scene,
+-                                      double cell_length)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-
+-  // Load input and output blocks
+-  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-  corner_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
+-  corner_tree->init_cells(0.0f);
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
+-
+-  unsigned long n_fail = 0;
+-
+-  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
+-
+-    if (!valid_center_cell->data()) {
+-      continue;
+-    }
+-#if 0
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      continue;
+-    }
+-#endif
+-
+-    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
+-
+-    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
+-      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
+-        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
+-        {
+-          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
+-
+-          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
+-                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
+-                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
+-
+-          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
+-
+-          if (this_cell) {
+-            harris_functor.apply(this_cell->data());
+-          }
+-          else
+-            break;
+-        }
+-
+-    double C = 0;
+-    harris_functor.result(C);
+-    corner_center_cell->set_data(float(C));
+-  }
+-
+-  std::cout << "Number of Harris fails: " << n_fail << std::endl;
+-  //write the output block
+-  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
+-  corner_scene->write_active_block();
+-}
+-
+-
+-template<class T_data>
+-void bvpl_corner_detector::compute_det_H( boxm_scene<boct_tree<short, T_data > > *scene_in,
+-                                          unsigned block_i, unsigned block_j, unsigned block_k,
+-                                          boxm_scene<boct_tree<short, bool> > *valid_scene,
+-                                          boxm_scene<boct_tree<short, float> > *corner_scene)
+-{
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  // Load input and output blocks
+-  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-  corner_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
+-  corner_tree->init_cells(0.0f);
+-
+-  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
+-
+-  //iterators
+-  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
+-  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
+-
+-  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *it_in;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
+-
+-    if (!valid_center_cell->data()) {
+-      continue;
+-    }
+-
+-    vnl_vector_fixed<double,10> mean_coeff = center_cell->data();
+-
+-    vnl_double_3x3 H;
+-    H.put(0,0,mean_coeff[4]);
+-    H.put(0,1,mean_coeff[7]);
+-    H.put(0,2,mean_coeff[8]);
+-    H.put(1,0,mean_coeff[7]);
+-    H.put(1,1,mean_coeff[5]);
+-    H.put(1,2,mean_coeff[9]);
+-    H.put(2,0,mean_coeff[8]);
+-    H.put(2,1,mean_coeff[9]);
+-    H.put(2,2,mean_coeff[6]);
+-
+-    corner_center_cell->set_data(float(vnl_determinant(H)));
+-  }
+-
+-  //write the output block
+-  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
+-  corner_scene->write_active_block();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
+deleted file mode 100644
+index 85231de3e0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
++++ /dev/null
+@@ -1,68 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
+-#ifndef bvpl_corner_functors_h
+-#define bvpl_corner_functors_h
+-//:
+-// \file
+-// \brief Set of functors based on Harris measures
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  20-Jul-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vnl/vnl_double_3x3.h>
+-#include <vnl/algo/vnl_determinant.h>
+-
+-//  Functor to threshold on Harris corner measure proposed in:
+-//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107-123, 2005
+-class bvpl_harris_laptev_functor
+-{
+- public:
+-  bvpl_harris_laptev_functor(double k)
+-  {
+-    H_ = vnl_double_3x3(0.0);
+-    count_ = 0;
+-    k_ = k;
+-  }
+-
+-  //: Apply a given operation to value \p val, depending on the dispatch character
+-  void apply(vnl_vector_fixed<double,10> taylor_coeff)
+-  {
+-    vnl_double_3x3 temp_H;
+-    for (unsigned mi = 0; mi <3; mi++)
+-      for (unsigned mj = 0; mj <3; mj++)
+-        temp_H.put(mi,mj, taylor_coeff[mi+1] * taylor_coeff[mj+1]);
+-
+-    H_ = H_ + temp_H;
+-    count_++;
+-  }
+-
+-  //: Returns true if the harris threshold is passed, returns by reference the value of the harris ration
+-  bool result( double &C)
+-  {
+-    H_ /= (double)count_;
+-
+-    double trace_H = H_[0][0] + H_[1][1] + H_[2][2];
+-    bool pass = false;
+-
+-    C = vnl_determinant(H_) - k_*(trace_H * trace_H * trace_H);
+-
+-    if (C >= 1e-7)
+-      pass = true;
+-
+-    count_ = 0;
+-    H_.fill(0.0);
+-
+-    return pass;
+-  }
+-
+- protected:
+-
+-  vnl_double_3x3 H_;
+-  unsigned count_;
+-  double k_;
+-};
+-
+-#endif // bvpl_corner_functors_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
+deleted file mode 100644
+index a2aa13a8c6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
++++ /dev/null
+@@ -1,1028 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 8-Nov-2010
+-
+-#include "bvpl_discover_pca_kernels.h"
+-#include <vnl/algo/vnl_symmetric_eigensystem.h>
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-#include <boxm/boxm_scene_parser.h>
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bvpl_discover_pca_kernels::bvpl_discover_pca_kernels(const std::string &path)
+-{
+-  std::cout << "Loading pca info from xml-file" << std::endl;
+-
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-
+-  if (!xml_ifs)
+-    return;
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("pca_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cout << "bvpl_discover_pca_kernels - could not parse xml root\n";
+-  }
+-
+-  //Parse neighborhood bounding box - units are number of voxels
+-  bxml_element nbbox_query("neighborhood");
+-  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
+-  auto* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
+-  int min_x=0, min_y=0, min_z=0, max_x=0, max_y=0, max_z =0;
+-  nbbox_elm->get_attribute("min_x", min_x);
+-  nbbox_elm->get_attribute("min_y", min_y);
+-  nbbox_elm->get_attribute("min_z", min_z);
+-  nbbox_elm->get_attribute("max_x", max_x);
+-  nbbox_elm->get_attribute("max_y", max_y);
+-  nbbox_elm->get_attribute("max_z", max_z);
+-
+-  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
+-  std::cout << "Neighborhood: " << nbbox_ << std::endl;
+-
+-  //Parse Number of samples
+-  bxml_element nsamples_query("samples");
+-  bxml_data_sptr nsamples_data = bxml_find_by_name(root, nsamples_query);
+-  auto* nsamples_elm = dynamic_cast<bxml_element*>(nsamples_data.ptr());
+-  nsamples_elm->get_attribute("nsamples", nsamples_);
+-  std::cout << "Number of samples: " << nsamples_ << std::endl;
+-
+-  //Parse dimension
+-  bxml_element dim_query("dimension");
+-  bxml_data_sptr dim_data = bxml_find_by_name(root, dim_query);
+-  auto* dim_elm = dynamic_cast<bxml_element*>(dim_data.ptr());
+-  dim_elm->get_attribute("feature_dim", feature_dim_);
+-  std::cout << "Feature dimension: " << feature_dim_ << std::endl;
+-
+-  //Parse paths and set matrices
+-  bxml_element paths_query("paths");
+-  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
+-  auto* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
+-
+-  int valid = 0;
+-  std::string ifs_path;
+-
+-  path_elm->get_attribute("pc_path", ifs_path);
+-  if (ifs_path != pc_path())
+-    valid = -1;
+-  else{
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> pc_;
+-    if (pc_.size()!=feature_dim_*feature_dim_)
+-      valid = -2;
+-  }
+-
+-  path_elm->get_attribute("weights_path", ifs_path);
+-  if (ifs_path != weights_path())
+-    valid = -3;
+-  else{
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> weights_;
+-    if (weights_.size()!=feature_dim_)
+-      valid = -4;
+-  }
+-
+-  path_elm->get_attribute("sample_mean_path", ifs_path);
+-  if (ifs_path != sample_mean_path())
+-    valid = -5;
+-  else
+-  {
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> sample_mean_feature_ ;
+-    if (sample_mean_feature_.size()!=feature_dim_)
+-      valid = -6;
+-  }
+-
+-  path_elm->get_attribute("data_path", ifs_path);
+-  if (ifs_path != data_path())
+-    valid = -7;
+-
+-  path_elm->get_attribute("positions_path", ifs_path);
+-  if (ifs_path != pos_path())
+-    valid = -8;
+-
+-  path_elm->get_attribute("scene_path", scene_path_);
+-
+-  //load scene
+-  boxm_scene_parser parser;
+-  data_scene_base_=new boxm_scene_base();
+-  data_scene_base_->load_scene(scene_path_, parser);
+-
+-  //cast scene
+-  auto *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (data_scene_base_->appearence_model() == BOXM_FLOAT){
+-    scene->load_scene(parser);
+-    data_scene_base_ = scene;
+-  }
+-
+-  path_elm->get_attribute("data_mean_path", ifs_path);
+-  if (ifs_path != data_mean_path()){
+-    compute_mean_feature(scene);
+-    valid = -9;
+-    std::cout << "bvpl_discover_pca_kernels - errors parsing data_mean_feature.xml\n";
+-  }
+-  else
+-  {
+-    std::ifstream ifs(ifs_path.c_str());
+-    ifs >> data_mean_feature_ ;
+-    if (data_mean_feature_.size()!=feature_dim_)
+-      valid = -10;
+-  }
+-
+-  //Parse dimension
+-  bxml_element cell_length_query("finest_cell_length");
+-  bxml_data_sptr cell_length_data = bxml_find_by_name(root, cell_length_query);
+-  auto* cell_length_elm = dynamic_cast<bxml_element*>(cell_length_data.ptr());
+-  bool has_length = cell_length_elm->get_attribute("length", finest_cell_length_);
+-  if (!has_length || finest_cell_length_ < 0.0){
+-     std::cout << "Error: Finest cell length read from file: " << finest_cell_length_ << " has length " << has_length << std::endl;
+-     finest_cell_length_ = scene->finest_cell_length();
+-     valid = -11;
+-  }
+-  std::cout << "Finest cell length: " << finest_cell_length_ << std::endl;
+-
+-  if (valid<0){
+-    std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
+-    xml_write();
+-  }
+-}
+-
+-
+-//: Set Up the PCA matrix for the given scene
+-void bvpl_discover_pca_kernels::set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene)
+-{
+-  //zero-mean feature matrix
+-  vnl_matrix<double> M = this->compute_deviation_matrix(scene);
+-
+-  vnl_svd<double> A(M);
+-
+-  //columns of U contain principal components.
+-  pc_.set_size(feature_dim_, feature_dim_);
+-  A.U().extract(pc_);
+-  weights_.set_size(feature_dim_);
+-  weights_ = A.W().diagonal().extract(feature_dim_);
+-
+-  weights_ = element_product(weights_, weights_);
+-
+-#ifdef DEBUG
+-  std::cerr << "Scatter Matix svd" << M*M.transpose() << '\n'
+-           << "PC Matix SVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
+-           << "Evals SVD:\nSize: " << weights_.size() << '\n' << weights_ << '\n';
+-  bvpl_write_pca(path_out_ + "/pca_matrices", M, weights_, pc_);
+-#endif
+-}
+-
+-
+-//: Set Up the PCA matrix for the given scene
+-//  This method performs eigen value decomposition on the scatter matrix
+-//  Use this method when number of samples >> number of dimensions
+-void bvpl_discover_pca_kernels::set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene)
+-{
+-  //zero-mean feature matrix
+-  vnl_matrix<double> S = this->compute_scatter_matrix(scene);
+-
+-  // Compute eigenvectors(principal components) and values of S
+-  pc_.set_size(feature_dim_,feature_dim_);
+-  weights_.set_size(feature_dim_);
+-
+-  vnl_symmetric_eigensystem_compute(S, pc_, weights_);
+-
+-  pc_.fliplr();
+-  weights_.flip();
+-
+-#ifdef DEBUG
+-  std::cerr << "Scatter Matix" << S << '\n'
+-           << "PC Matix EVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
+-           << "EVals EVD:\n Size: " << weights_.size() << '\n' <<weights_ << '\n';
+-  bvpl_write_pca(path_out_ + "/pca_evd", S, weights_, pc_);
+-#endif
+-}
+-
+-
+-//: Ramndom samples according to octree structure.
+-//  Sampling is achieved by generating uniform random cell samples.
+-//  Since there are more cells where the resolution is finer, then these regions get sampled more often
+-vnl_matrix<double> bvpl_discover_pca_kernels::compute_scatter_matrix( boxm_scene<boct_tree<short, float> > *scene)
+-{
+-  //init variables
+-  double scene_ncells = scene->size();
+-  scene->unload_active_blocks();
+-  sample_mean_feature_.fill(0.0f);
+-  vnl_matrix<double> S(feature_dim_, feature_dim_, 0.0f);
+-  vnl_random rng;
+-  std::ofstream pos_ofs(pos_path().c_str());
+-  std::ofstream data_ofs(data_path().c_str());
+-  data_ofs.precision(15);
+-
+-  // 1. Traverse through the blocks/trees
+-  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
+-  unsigned long long nfeature = 1;
+-  for (it.begin(); !it.end(); ++it)
+-  {
+-    scene->load_block_and_neighbors(it.index());
+-    boct_tree<short, float>   *tree = (*it)->get_tree();
+-    assert(tree != nullptr);
+-
+-    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
+-    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
+-    int tree_ncells = leaf_cells.size();
+-    auto tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
+-#ifdef DEBUG
+-    std::cout <<"Tree nsamples is: " << tree_nsamples << '\n'
+-             <<" nsamples is: " << nsamples_ <<std::endl;
+-#endif
+-    for (unsigned i=0; i<tree_nsamples; ++i)
+-    {
+-      unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
+-      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-      //convert neighborhood box to scene coordinates
+-      vgl_point_3d<int> nmin = nbbox_.min_point();
+-      vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
+-                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
+-      roi.set_centroid(center_cell_centroid);
+-
+-      //if neighborhood is not inclusive we would have missing features
+-      if (!((scene->get_world_bbox()).contains(roi))){
+-        --i;
+-        continue;
+-      }
+-
+-      //3. Assemble neighborhood as a feature-vector
+-      vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-      unsigned curr_dim = 0;
+-      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-          {
+-            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
+-                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
+-                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
+-
+-            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-            assert(neighbor_cell !=nullptr);
+-            this_feature[curr_dim] = (double)neighbor_cell->data();
+-            ++curr_dim;
+-          }
+-
+-      assert(curr_dim == feature_dim_);
+-
+-      pos_ofs << center_cell_centroid <<'\n' ;
+-      data_ofs << this_feature << '\n';
+-
+-      //increment weights
+-      double rho = 1.0/(double)nfeature;
+-      double rho_comp = 1.0 - rho;
+-
+-      // the difference vector between the sample and the mean
+-      vnl_vector<double> diff = this_feature - sample_mean_feature_;
+-
+-      //update the covariance
+-      S += rho_comp*outer_product(diff,diff);
+-
+-      //update the mean
+-      sample_mean_feature_ += (rho*diff);
+-
+-      ++nfeature;
+-#ifdef DEBUG
+-      std::cerr << "Feature EVD: " <<this_feature << '\n'
+-               << "Mean Feature EVD: " <<mean_feature << '\n';
+-#endif
+-    }
+-  } //end of block-loop
+-
+-  pos_ofs.close();
+-  data_ofs.close();
+-  std::ofstream mean_ofs(sample_mean_path().c_str());
+-  mean_ofs.precision(15);
+-  mean_ofs << sample_mean_feature_;
+-  mean_ofs.close();
+-
+-  nsamples_ = nfeature-1;
+-
+-  return S;
+-}
+-
+-
+-//: Samples according to octree structure.
+-//  Sampling is achieved by generating uniform random cell samples.
+-//  Since there are more cells where the resolution is finer, then these regions get sampled more often
+-vnl_matrix<double> bvpl_discover_pca_kernels::compute_deviation_matrix( boxm_scene<boct_tree<short, float> > *scene)
+-{
+-  //init variables
+-  unsigned long scene_ncells = scene->size();
+-  sample_mean_feature_.fill(0.0f);
+-  vnl_matrix<double> M(feature_dim_, (unsigned int)nsamples_);
+-  vnl_random rng(9667566ul);
+-  std::ofstream pos_ofs(pos_path().c_str());
+-
+-  // 1. Traverse through the blocks/trees
+-  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
+-  unsigned long feature_col = 0;
+-  for (it.begin(); !it.end(); ++it)
+-  {
+-    scene->load_block_and_neighbors(it.index());
+-    boct_tree<short, float>   *tree = (*it)->get_tree();
+-    assert(tree != nullptr);
+-
+-    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
+-    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
+-    int tree_ncells = leaf_cells.size();
+-    auto tree_nsamples = (unsigned long)(tree_ncells*nsamples_/scene_ncells); // possible overflow ...
+-
+-    for (unsigned int i=0; i<tree_nsamples; ++i)
+-    {
+-      unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
+-      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-      //convert neighborhood box to scene coordinates
+-      vgl_point_3d<int> nmin = nbbox_.min_point();
+-      vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
+-                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
+-      roi.set_centroid(center_cell_centroid);
+-
+-      //if neighborhood is not inclusive we would have missing features
+-      if (!((scene->get_world_bbox()).contains(roi))){
+-        --i;
+-        continue;
+-      }
+-
+-      //3. Assemble neighborhood as a feature-vector
+-      vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-      unsigned curr_dim = 0;
+-      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-          {
+-            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
+-                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
+-                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
+-
+-            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-            assert(neighbor_cell !=nullptr);
+-            this_feature[curr_dim] = (double)neighbor_cell->data();
+-            ++curr_dim;
+-          }
+-
+-      assert(curr_dim == feature_dim_);
+-
+-      pos_ofs << center_cell_centroid <<'\n' ;
+-
+-      M.set_column(feature_col,this_feature);
+-      sample_mean_feature_+=this_feature;
+-      ++feature_col;
+-#ifdef DEBUG
+-      std::cerr << "Feature SVD: " <<this_feature << '\n'
+-               << "Mean Feature SVD: " <<mean_feature/(double)feature_col << '\n';
+-#endif
+-    }
+-  } //end of block-loop
+-
+-  //the actual number of samples is different from desired number of smaples because only integer samples are drawn from each tree
+-  vnl_matrix<double> F(feature_dim_, feature_col);
+-
+-  M.extract(F);
+-
+-  //4. Normalize feature vector
+-  sample_mean_feature_/=feature_col;
+-#ifdef DEBUG
+-  std::cerr << "Mean Feature SVD: " <<mean_feature << '\n';
+-#endif
+-  std::ofstream mean_ofs(sample_mean_path().c_str());
+-  mean_ofs.precision(15);
+-  mean_ofs << sample_mean_feature_;
+-  mean_ofs.close();
+-
+-  for (unsigned int j=0; j<feature_col; ++j)
+-    F.set_column(j,F.get_column(j) - sample_mean_feature_);
+-
+-  return F;
+-}
+-
+-
+-//: Project training samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::compute_training_error(vnl_vector<double> &proj_error)
+-{
+-  std::ifstream data_ifs(data_path().c_str());
+-  std::cerr << data_path() << '\n';
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond elemend, to error when projecting on frist 2 components and so on
+-  proj_error.set_size(feature_dim_);
+-  proj_error.fill(0.0);
+-
+-  //For all samples
+-  for (unsigned long i = 0; i < nsamples_; ++i)
+-  {
+-    if (data_ifs.eof())
+-      continue;
+-
+-    //retrieve the data from file
+-    vnl_vector<double> norm_feature(feature_dim_, 0.0);
+-    data_ifs >> norm_feature;
+-#ifdef DEBUG
+-    std::cerr << "Feature: " <<norm_feature << '\n';
+-#endif
+-    norm_feature-=sample_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (norm_feature);
+-
+-    //project as a function of number of components
+-    for (unsigned c = 0; c < feature_dim_; ++c)
+-    {
+-      //reconstruct
+-      vnl_vector<double> norm_feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
+-      vnl_vector<double> rec_feature = pc_*a;
+-      //compute error
+-      proj_error[c]+= (norm_feature - norm_feature_approx).squared_magnitude();
+-    }
+-  }
+-}
+-
+-
+-//: Project training samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::compute_normalized_training_error(vnl_vector<double> &proj_error)
+-{
+-  theoretical_training_error(proj_error);
+-  proj_error /= (double)nsamples_;
+-}
+-
+-//: Project training samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::theoretical_training_error(vnl_vector<double> &proj_error)
+-{
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond elemend, to error when projecting on frist 2 components and so on
+-  proj_error.set_size(feature_dim_);
+-  proj_error.fill(0.0);
+-
+-  for (unsigned i=0; i<weights_.size(); ++i)
+-  {
+-    double error = weights_.extract(weights_.size() - (i+1), i+1).sum(); // * 0.5
+-    proj_error[i] = error;
+-  }
+-}
+-
+-
+-//: Project test samples onto pca space and return error as a function of number of components used
+-void bvpl_discover_pca_kernels::compute_testing_error(vnl_vector<double> &proj_error)
+-{
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond element, to error when projecting on frist 2 components and so on
+-  proj_error.set_size(feature_dim_);
+-  proj_error.fill(0.0);
+-
+-  //cast scene
+-  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > > *> (data_scene_base_.as_pointer());
+-
+-  compute_mean_feature(scene);
+-
+-  //iterate through leaves and arrage as vectors.
+-  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
+-  cell_it.begin();
+-
+-  while (!(cell_it.end()))
+-  {
+-    //boct_tree_cell<short, float> *center_cell = *cell_it;
+-    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-    //convert neighborhood box to scene coordinates
+-    vgl_point_3d<int> nmin = nbbox_.min_point();
+-    vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-    vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
+-                           finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
+-    roi.set_centroid(center_cell_centroid);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if (!((scene->get_world_bbox()).contains(roi))){
+-      ++cell_it;
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
+-                                                 center_cell_centroid.y() + (double)y*finest_cell_length_,
+-                                                 center_cell_centroid.z() + (double)z*finest_cell_length_);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-          assert(neighbor_cell !=nullptr);
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    assert(curr_dim == feature_dim_);
+-
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-#ifdef DEBUG
+-    std::cout <<"This feature is " << this_feature <<std::endl;
+-#endif
+-
+-    //project as a function of number of components
+-    for (unsigned c = 0; c < feature_dim_; ++c)
+-    {
+-      //reconstruct
+-      vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
+-      vnl_vector<double> rec_feature = pc_*a;
+-#ifdef DEBUG
+-      std::cout <<"Feature approx at c = " << c << " is " <<  feature_approx <<std::endl;
+-#endif
+-      //compute error
+-      proj_error[c]+= (this_feature - feature_approx).squared_magnitude();
+-    }
+-
+-    ++cell_it;
+-  }
+-#if 0
+-  vnl_vector<double> training_error;
+-  this->theoretical_training_error(training_error);
+-  proj_error-=training_error;
+-#endif
+-}
+-
+-
+-//: Reconstructions error on testing samples. By block. Error is given as average error per sample
+-void bvpl_discover_pca_kernels::compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
+-                                                      int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  //cast the scenes
+-  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
+-  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  if (!(data_scene &&error_scene)){
+-    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
+-    return;
+-  }
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))){
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-  data_scene->unload_active_blocks();
+-  error_scene->unload_active_blocks();
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  error_tree->init_cells(-1.0f);
+-
+-  //get the leaves
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> min_point = nbbox_.min_point();
+-  vgl_point_3d<int> max_point = nbbox_.max_point();
+-
+-  for (unsigned i=0; i<data_leaves.size(); ++i)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
+-      continue;
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
+-                                                 centroid.y() + (double)y*finest_cell_length_,
+-                                                 centroid.z() + (double)z*finest_cell_length_);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell){
+-            std::cerr << "Error in compute_testing_error\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    if (curr_dim != feature_dim_){
+-      std::cerr << "Error in compute_testing_error\n";
+-      return;
+-    }
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-    //project as a function of number of components
+-    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
+-
+-    //compute error
+-    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
+-  error_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-  error_scene->unload_active_blocks();
+-}
+-
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-void bvpl_discover_pca_kernels::compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene,
+-                                                                  unsigned ncomponents,
+-                                                                  int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  //cast the scenes
+-  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
+-
+-  if (!(data_scene &&error_scene)){
+-    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
+-    return;
+-  }
+-
+-  if (!(data_scene->load_all_blocks() && error_scene->load_all_blocks())){
+-    std::cerr << "Must load all blocks into memory before using threads\n";
+-    return;
+-  }
+-  //get the cells for this block
+-  if (!error_scene->valid_index(block_i, block_j, block_k)){
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  //error_scene->load_block_thread_safe(block_i, block_j, block_k);
+-
+-  //get the trees
+-  boxm_block<float_tree_type> *data_block = data_scene->get_block(block_i, block_j, block_k);
+-  if (!data_block)
+-    return;
+-
+-  float_tree_type* data_tree = data_block->get_tree();
+-  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  // error_tree->init_cells(-1.0f);
+-
+-  //get the leaves
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  //std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> min_point = nbbox_.min_point();
+-  vgl_point_3d<int> max_point = nbbox_.max_point();
+-
+-  for (auto data_cell : data_leaves)
+-  {
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
+-      continue;
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
+-                                                 centroid.y() + (double)y*finest_cell_length_,
+-                                                 centroid.z() + (double)z*finest_cell_length_);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell){
+-            std::cerr << "Error in compute_testing_error\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    if (curr_dim != feature_dim_){
+-      std::cerr << "Error in compute_testing_error\n";
+-      return;
+-    }
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-    //project as a function of number of components
+-    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
+-
+-    //compute error
+-    //error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
+-  error_scene->write_block_thread_safe(block_i, block_j, block_k);
+-}
+-#endif // BVPL_OCTREE_HAS_PTHREADS
+-
+-
+-//: Compute mean feature of all "leaf-features" in a scene
+-void bvpl_discover_pca_kernels::compute_mean_feature(boxm_scene<boct_tree<short, float> > *scene)
+-{
+-  //a vector to keep projection error - first element refers to error when using only first pc,
+-  //the sencond element, to error when projecting on frist 2 components and so on
+-  data_mean_feature_.set_size(feature_dim_);
+-  data_mean_feature_.fill(0.0);
+-  unsigned long nfeatures = 0;
+-
+-  //iterate through leaves and arrage as vectors.
+-  double cell_length = scene->finest_cell_length();
+-
+-  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
+-  cell_it.begin();
+-
+-  while (!(cell_it.end()))
+-  {
+-    //boct_tree_cell<short, float> *center_cell = *cell_it;
+-    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-    //convert neighborhood box to scene coordinates
+-    vgl_point_3d<int> nmin = nbbox_.min_point();
+-    vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
+-                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
+-    roi.set_centroid(center_cell_centroid);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if (!((scene->get_world_bbox()).contains(roi))){
+-      ++cell_it;
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
+-                                                 center_cell_centroid.y() + (double)y*cell_length,
+-                                                 center_cell_centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
+-
+-          assert(neighbor_cell !=nullptr);
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          ++curr_dim;
+-        }
+-
+-    assert(curr_dim == feature_dim_);
+-
+-    data_mean_feature_+=this_feature;
+-    ++nfeatures;
+-    ++cell_it;
+-  }
+-  data_mean_feature_ = data_mean_feature_/(double)nfeatures;
+-
+-  std::ofstream mean_ofs(data_mean_path().c_str());
+-  mean_ofs.precision(15);
+-  mean_ofs << data_mean_feature_;
+-  mean_ofs.close();
+-}
+-
+-
+-#if 0 //too_slow
+-      //: Compute deviations i.e. zero-mean feature matrix
+-vnl_matrix<float>& bvpl_discover_pca_kernels::compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene)
+-{
+-  unsigned long max_nsamples = scene->size();
+-
+-  //iterate through leaves, keep random samples in memory and arrage as vectors.
+-  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
+-  cell_it.begin();
+-
+-  vnl_random rng(9667566ul);
+-  unsigned long pos_pre = 0;  //previous position on random samples array
+-
+-  for (unsigned i=1; i<nsamples_; ++i)
+-  {
+-    unsigned long sample = rng.lrand32(max_nsamples);
+-    vgl_box_3d<double> roi = nbbox_;
+-    for (unsigned u = 0; u + pos_pre < sample; ++u)
+-      ++cell_it;
+-    pos_pre = sample;
+-    roi.set_centroid(cell_it.global_centroid());
+-    if (!((scene->get_world_bbox()).contains(roi))){
+-      --i;
+-      continue;
+-    }
+-
+-    positions_.push_back(sample);
+-  }
+-
+-  //sort random numbers for easy access
+-  positions_.sort();
+-  if (nsamples_ != positions_.size())
+-  {
+-    std::cerr << "Error computing PCA features: Wrong number of random samples generated\n";
+-    return false;
+-  }
+-
+-  cell_it.begin();
+-
+-  //init cells array to first random element
+-  std::list<unsigned long>::const_iterator rand_it = positions_.begin();
+-  cell_it+=(*rand_it - pos_pre);
+-  pos_pre = *rand_it;
+-
+-  //init quantities for mean
+-  unsigned feature_dim = nbbox_.width()*nbbox_.height()* nbbox_.depth();
+-  vnl_vector<float> mean(feature_dim);
+-  M.set_size(feature_dim, nsamples_);
+-  unsigned i=0;
+-
+-  double cell_length = scene->finest_cell_length();
+-  while (!(cell_it.end()))
+-  {
+-    boct_tree_cell<short, float> *center_cell = *cell_it;
+-    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-    if (!center_cell){
+-      std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
+-      return false;
+-    }
+-
+-    //assemble neighborhood as a feature-vector
+-    vnl_vector<float> this_feature(feature_dim);
+-
+-    unsigned curr_dims = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_origin(center_cell_centroid.x() + (double)x*cell_length,
+-                                               center_cell_centroid.y() + (double)y*cell_length,
+-                                               center_cell_centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_origin);
+-
+-          if (!neighbor_cell){
+-            std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
+-            return false;
+-          }
+-
+-          this_feature[x + nbbox_.width()*y + nbbox_.width()*nbbox_.height()*z] = neighbor_cell->data();
+-          ++curr_dims;
+-        }
+-
+-    M.set_column(i,this_feature);
+-    mean+=this_feature;
+-
+-    //increment iterators
+-    cell_it+=(*rand_it - pos_pre);
+-    pos_pre = *rand_it;
+-    ++rand_it;
+-    ++i;
+-  }
+-
+-  mean/=nsamples_;
+-
+-  for (unsigned int j=0; j<nsamples_; ++j)
+-    M.set_column(j,M.get_column(j) - mean);
+-
+-  return true;
+-}
+-#endif
+-
+-void bvpl_discover_pca_kernels::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("pca_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  bxml_element* paths = new bxml_element("paths");
+-  paths->append_text("\n");
+-  paths->set_attribute("pc_path", pc_path() );
+-  paths->set_attribute("data_path", data_path() );
+-  paths->set_attribute("weights_path", weights_path() );
+-  paths->set_attribute("positions_path", pos_path()) ;
+-  paths->set_attribute("sample_mean_path", sample_mean_path());
+-  paths->set_attribute("data_mean_path", data_mean_path());
+-  paths->set_attribute("scene_path", scene_path_);
+-  root->append_data(paths);
+-  root->append_text("\n");
+-
+-  bxml_element* neighborhood = new bxml_element("neighborhood");
+-  neighborhood->append_text("\n");
+-  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
+-  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
+-  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
+-  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
+-  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
+-  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
+-  root->append_data(neighborhood);
+-  root->append_text("\n");
+-
+-  bxml_element* nsamples = new bxml_element("samples");
+-  nsamples->append_text("\n");
+-  nsamples->set_attribute("nsamples", nsamples_);
+-  root->append_data(nsamples);
+-  root->append_text("\n");
+-
+-  bxml_element* dim = new bxml_element("dimension");
+-  dim->append_text("\n");
+-  dim->set_attribute("feature_dim", feature_dim_);
+-  root->append_data(dim);
+-  root->append_text("\n");
+-
+-  bxml_element* cell_length = new bxml_element("finest_cell_length");
+-  cell_length->append_text("\n");
+-  cell_length->set_attribute("length", finest_cell_length_);
+-  root->append_data(cell_length);
+-  root->append_text("\n");
+-
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-
+-  //: Write pca main matrices -other matrices aren't class variables and should have been written during computation time
+-
+-  write_pca_matrices();
+-}
+-
+-
+-//: Write a PCA file
+-bool bvpl_discover_pca_kernels::write_pca_matrices()
+-{
+-  std::ofstream pc_ofs(pc_path().c_str());
+-  pc_ofs.precision(15);
+-  std::ofstream weights_ofs(weights_path().c_str());
+-  weights_ofs.precision(15);
+-
+-  pc_ofs << pc_;
+-  pc_ofs.close();
+-  weights_ofs << weights_;
+-  weights_ofs.close();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
+deleted file mode 100644
+index 875504affa..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
++++ /dev/null
+@@ -1,309 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
+-#ifndef bvpl_discover_pca_kernels_h
+-#define bvpl_discover_pca_kernels_h
+-//:
+-// \file
+-// \brief A class to discover those features that represent the data the best in a least square sense using PCA
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  8-Nov-2010.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <list>
+-#include <iostream>
+-#include <utility>
+-#include <vgl/vgl_box_3d.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bxml/bxml_document.h>
+-
+-#include <vnl/vnl_matrix.h>
+-#include <vnl/vnl_vector.h>
+-#include <vnl/algo/vnl_svd.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-#include <pthread.h>
+-#endif
+-
+-class bvpl_discover_pca_kernels;
+-
+-typedef vbl_smart_ptr<bvpl_discover_pca_kernels> bvpl_discover_pca_kernels_sptr;
+-
+-class bvpl_discover_pca_kernels: public vbl_ref_count
+-{
+- public:
+-  //: Constructor from neighborhood bounding boxm, number of samples to be drawn, scene and flag to indicate whether to use evd or svd
+-  bvpl_discover_pca_kernels(vgl_box_3d<int> nbbox, unsigned long long nsamples, boxm_scene<boct_tree<short,float> > *scene, std::string  path_out=".", bool use_evd = true):
+-  nbbox_(nbbox), nsamples_(nsamples), path_out_(std::move(path_out))
+-  {
+-    scene_path_ = scene->filename();
+-    std::cout << "Scene path: " << scene->filename()<< std::endl;;
+-    data_scene_base_=scene;
+-
+-    finest_cell_length_ = scene->finest_cell_length();
+-
+-    feature_dim_ = (nbbox_.width()+1)*(nbbox_.height()+1)* (nbbox_.depth()+1);
+-    compute_mean_feature(scene);
+-
+-    sample_mean_feature_.set_size(feature_dim_);
+-
+-    if (use_evd)
+-      set_up_pca_evd(scene);
+-    else
+-      set_up_pca_svd(scene);
+-
+-    scene->unload_active_blocks();
+-  }
+-
+-  //: Construct from xml file
+-  bvpl_discover_pca_kernels(const std::string &path);
+-
+-  //: Constructor from zero-mean matrix
+-  bvpl_discover_pca_kernels(const vnl_matrix<double>& M)
+-  {
+-    vnl_svd<double> A(M, -1e-8);
+-
+-    //columns of U contain principal components.
+-    pc_.set_size(A.rank(), M.rows());
+-    A.U().extract(pc_);
+-  }
+-
+-  //: Access the principal components
+-  const vnl_matrix<double>& principal_comps() { return pc_; }
+-
+-  //: Access the coefficients
+-  const vnl_vector<double>& weights() { return weights_; }
+-
+-  //: Access the mean of samples
+-  const vnl_vector<double>& mean()  { return sample_mean_feature_; }
+-
+-  //: Project training samples onto pca space and return error as a function of number of components used
+-  void compute_training_error(vnl_vector<double> &proj_error);
+-
+-  //: Project training samples onto pca space and return error as a function of number of components used
+-  void compute_normalized_training_error(vnl_vector<double> &proj_error);
+-
+-  //: Reconstrcution error on training samples. Same as above but it is not computed from samples.
+-  void theoretical_training_error(vnl_vector<double> &proj_error);
+-
+-  //: Reconstructions error on testing samples. All training samples are excuded!
+-  void compute_testing_error(vnl_vector<double> &proj_error);
+-
+-  //: Reconstructions error on testing samples. By block. Error is given as average error per sample
+-  void compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
+-                             int block_i, int block_j, int block_k);
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-
+-  void compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene, unsigned ncomponents,
+-                                         int block_i, int block_j, int block_k);
+-
+-//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
+-//  bool compute_testing_error_thread_safe(boxm_scene_base_sptr error_scene_base, unsigned ncomponents);
+-//
+-//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
+-//  friend void *compute_testing_error_thread( void *ptr);
+-
+-#endif
+-
+-  //: Computes pca projection at each voxel on the block and it save the specified number of dimensions (dim)
+-  template <unsigned DIM>
+-  void project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
+-               int block_i, int block_j, int block_k);
+-
+-  //: Compute the mean feature of all "leaf" samples in the data scene associated with this class
+-  void compute_mean_feature(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Return the number of samples used
+-  unsigned long long nsamples() const { return nsamples_; }
+-
+-  //: Return dimension of the features
+-  unsigned feature_dim() const { return feature_dim_; }
+-
+-  //: Return scene path
+-  std::string scene_path() const { return scene_path_; }
+-
+-  //: Return number of blocks in the data scene
+-  vgl_vector_3d<unsigned> data_scene_dim() const { return data_scene_base_->world_dim(); }
+-
+-  bool load_all_scene_blocks()
+-  {
+-    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
+-    return scene->read_all_blocks();
+-  }
+-
+-  void unload_all_scene_blocks()
+-  {
+-    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
+-    scene->unload_active_blocks();
+-  }
+-
+-  //: Compute deviations i.e. zero-mean feature matrix
+-  vnl_matrix<double> compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Compute the scatter matrix.
+-  vnl_matrix<double> compute_scatter_matrix(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  void xml_write();
+-
+- protected:
+-
+-  //: Set Up the PCA matrix for the given scene.
+-  //  This method computes the deviation matrix and performs SVD to find the principal components
+-  //  If the number of samples is very large use set_up_pca_evd
+-  void set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Set Up the PCA matrix for the given scene
+-  //  This method performs eigen value decomposition on the covariance matrix
+-  //  Use this method when number of samples >> number of dimensions
+-  void set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene);
+-
+-  //: Write a PCA file
+-  bool write_pca_matrices();
+-
+-  //: The size around the central feature to include in PCA vectors
+-  vgl_box_3d<int> nbbox_;
+-  //: Number of total samples(leaves) to be drawn
+-  unsigned long long nsamples_;
+-  //: Number of dimension of feature vector
+-  unsigned feature_dim_;
+-  //: Principal components - eigen vectors of the scatter matrix
+-  vnl_matrix<double> pc_;
+-  //: Weights - eigen values of the scatter matrix
+-  vnl_vector<double> weights_;
+-  //: The mean of sample data
+-  vnl_vector<double> sample_mean_feature_;
+-  //: The mean of all features in the scene data
+-  vnl_vector<double> data_mean_feature_;
+-  //: Pointer to data scene
+-  boxm_scene_base_sptr data_scene_base_;
+-  //: Finest cell length of data scene
+-  double finest_cell_length_;
+-
+-  //: Paths for i/o of matrices and vectors
+-  std::string path_out_;
+-  std::string scene_path_;
+-  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
+-  std::string data_path() const { return path_out_ + "/data.txt"; }
+-  std::string weights_path() const { return path_out_ + "/weights.txt"; }
+-  std::string pos_path() const { return path_out_ + "/positions.txt"; }
+-  std::string sample_mean_path() const { return  path_out_ + "/sample_mean.txt"; }
+-  std::string data_mean_path() const { return  path_out_ + "/data_mean.txt"; }
+-  std::string xml_path() const { return path_out_ + "/pca_info.xml"; }
+-
+-  //: Tolerance, retain eigenvalues above max(eigenVals)*tol
+-  double tol_;
+-};
+-
+-
+-//: Computes pca projection at each voxel on the block and it saves the specified number of coefficientes
+-template <unsigned DIM>
+-void bvpl_discover_pca_kernels::project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
+-                                        int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree<short,bvpl_pca_basis_sample<DIM> > pca_tree_type;
+-  typedef boct_tree_cell<short,bvpl_pca_basis_sample<DIM> > pca_cell_type;
+-
+-  //cast the scenes
+-  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
+-
+-  if (!(data_scene &&proj_scene)) {
+-    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
+-    return;
+-  }
+-
+-  double cell_length = data_scene->finest_cell_length();
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  proj_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  pca_tree_type* proj_tree = data_tree->template clone_to_type<bvpl_pca_basis_sample<DIM> >();
+-
+-  //get the leaves
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<pca_cell_type*> proj_leaves = proj_tree->leaf_cells();
+-
+-  //CAUTION: the neighborhood box was supposed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> min_point = nbbox_.min_point();
+-  vgl_point_3d<int> max_point = nbbox_.max_point();
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
+-      proj_leaves[i]->set_data(bvpl_pca_basis_sample<DIM>());
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector<double> this_feature(feature_dim_, 0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
+-                                                 centroid.y() + (double)y*cell_length,
+-                                                 centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell) {
+-            std::cerr << "Error in compute_testing_error\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    if (curr_dim != feature_dim_) {
+-      std::cerr << "Error in compute_testing_error\n";
+-      return;
+-    }
+-    this_feature-=data_mean_feature_;
+-
+-    //solve for the coefficients
+-    vnl_vector<double> a(feature_dim_, 0.0);
+-    a = pc_.transpose() * (this_feature);
+-
+-    //compute error
+-    bvpl_pca_basis_sample<DIM> sample(a.extract(DIM), 0);
+-    proj_leaves[i]->set_data(sample);
+-  }
+-
+-  // write and release memory
+-  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
+-  proj_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
+deleted file mode 100644
+index 978a9443de..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
++++ /dev/null
+@@ -1,512 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 12-Aug-2011
+-
+-#include "bvpl_gauss3D_steerable_filters.h"
+-#include <vgl/vgl_vector_3d.h>
+-
+-//: Constructor
+-//  Initializes the order separable filter tabs should be applied for eac bases
+-bvpl_gauss3D_steerable_filters::bvpl_gauss3D_steerable_filters()
+-{
+-  axis_.clear();
+-  axis_.emplace_back(1,0,0);
+-  axis_.emplace_back(0,1,0);
+-  axis_.emplace_back(0,0,1);
+-
+-  //Initialize from lists - waiting for VXL to support TR1!
+-  basis_.clear();
+-  basis_names_.clear();
+-
+-  //zerth order - that is gaussian functio
+-  std::string G0a[3] = {"f01", "f02", "f02"};
+-  basis_.emplace_back(&G0a[0], &G0a[3]);
+-  basis_names_.emplace_back("G0a");
+-
+-  //first order derivatives
+-  std::string G1a[3] = {"f11", "f12", "f12"};
+-  std::string G1b[3] = {"f12", "f11", "f12"};
+-  std::string G1c[3] = {"f12", "f12", "f11"};
+-  basis_.emplace_back(&G1a[0], &G1a[3]);
+-  basis_.emplace_back(&G1b[0], &G1b[3]);
+-  basis_.emplace_back(&G1c[0], &G1c[3]);
+-  basis_names_.emplace_back("G1a");
+-  basis_names_.emplace_back("G1b");
+-  basis_names_.emplace_back("G1c");
+-
+-  //second order derivatives
+-  std::string G2a[3] = {"f21", "f22", "f22"};
+-  std::string G2b[3] = {"f23", "f24", "f22"};
+-  std::string G2c[3] = {"f22", "f21", "f22"};
+-  std::string G2d[3] = {"f23", "f22", "f24"};
+-  std::string G2e[3] = {"f22", "f23", "f24"};
+-  std::string G2f[3] = {"f22", "f22", "f21"};
+-  basis_.emplace_back(&G2a[0], &G2a[3]);
+-  basis_.emplace_back(&G2b[0], &G2b[3]);
+-  basis_.emplace_back(&G2c[0], &G2c[3]);
+-  basis_.emplace_back(&G2d[0], &G2d[3]);
+-  basis_.emplace_back(&G2e[0], &G2e[3]);
+-  basis_.emplace_back(&G2f[0], &G2f[3]);
+-  basis_names_.emplace_back("G2a");
+-  basis_names_.emplace_back("G2b");
+-  basis_names_.emplace_back("G2c");
+-  basis_names_.emplace_back("G2d");
+-  basis_names_.emplace_back("G2e");
+-  basis_names_.emplace_back("G2f");
+-}
+-
+-//: Computes  the responses to separable filter taps.
+-//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
+-//  Each basis is made up of 3 1-d filter taps (x, y, z)
+-//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
+-//  the taps have size 5, this could be changed later on
+-bool bvpl_gauss3D_steerable_filters::basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                              boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
+-{
+-  this->assemble_basis_size_5();
+-
+-  bvpl_algebraic_functor  functor;
+-
+-  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
+-  unsigned max_ntaps = 3;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  // Load input and output blocks
+-  scene->clone_blocks_to_type(*valid_scene, true);
+-
+-  //create and init a temporary scene to hold the intermediate 1-d output.
+-  boxm_scene<tree_type> *temp_scene =
+-  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  temp_scene->set_paths(".", "temp_gsf_scene");
+-  temp_scene->set_appearance_model(VNL_FLOAT_10);
+-  temp_scene->write_scene("temp_gsf_scene.xml");
+-  scene->clone_blocks(*temp_scene);
+-
+-  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
+-  {
+-    //Assemple tabs into a map
+-    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
+-
+-    for (unsigned dim=0; dim< DIM_; dim++){
+-      std::string tap_name = basis_[dim][tap_i];
+-      one_d_taps.push_back(separable_taps_[tap_name]);
+-    }
+-
+-    //Traverse applying the appropriate 1-d taps
+-    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
+-    cell_it.begin();
+-
+-    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
+-    temp_cell_it.begin();
+-
+-    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
+-    valid_cell_it.begin();
+-
+-    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
+-    {
+-      cell_type *temp_center_cell = *temp_cell_it;
+-      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
+-
+-      if (!valid_center_cell->data())
+-      {
+-        ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-        continue;
+-      }
+-
+-      bool valid = true;
+-
+-      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-
+-      vnl_vector_fixed<float, DIM_> responses(0.0);
+-
+-      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
+-      {
+-        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
+-
+-        for (int i =-2; i<=2; i++)
+-        {
+-          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
+-
+-          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
+-
+-          if (this_cell) {
+-            bvpl_kernel_dispatch d(this_tap[i+2]);
+-            float val =(float)(this_cell->data()[response_dim]);
+-            functor.apply(val, d);
+-          }
+-          else {
+-            valid = false;
+-            break;
+-          }
+-        }
+-
+-        if (!valid)
+-          break;
+-
+-        responses[response_dim] = (float)(functor.result());
+-      }
+-
+-      temp_center_cell->set_data(responses);
+-      valid_center_cell->set_data(valid);
+-      ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-    }
+-
+-    //copy temp cells into cells
+-    cell_it.begin();
+-    temp_cell_it.begin();
+-
+-    while ( !(cell_it.end() || temp_cell_it.end()) )
+-    {
+-      (*cell_it)->set_data((*temp_cell_it)->data());
+-      ++cell_it; ++temp_cell_it;
+-    }
+- }
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  temp_scene->unload_active_blocks();
+-  delete temp_scene;
+-  return true;
+-}
+-
+-
+-//: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
+-bool bvpl_gauss3D_steerable_filters::multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                               boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level)
+-{
+-  this->assemble_basis_size_5();
+-
+-  bvpl_algebraic_functor  functor;
+-
+-  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
+-  unsigned max_ntaps = 3;
+-
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  // Load input and output blocks
+-  scene->clone_blocks_to_type(*valid_scene, true);
+-
+-  //create and init a temporary scene to hold the intermediate 1-d output.
+-  boxm_scene<tree_type> *temp_scene =
+-  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  temp_scene->set_paths(".", "temp_gsf_scene");
+-  temp_scene->set_appearance_model(VNL_FLOAT_10);
+-  temp_scene->write_scene("temp_gsf_scene.xml");
+-  scene->clone_blocks(*temp_scene);
+-
+-  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
+-  {
+-    //Assemple tabs into a map
+-    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
+-
+-    for (unsigned dim=0; dim< DIM_; dim++){
+-      std::string tap_name = basis_[dim][tap_i];
+-      one_d_taps.push_back(separable_taps_[tap_name]);
+-    }
+-
+-    //Traverse applying the appropriate 1-d taps
+-    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
+-    cell_it.begin(true);
+-
+-    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
+-    temp_cell_it.begin(true);
+-
+-    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
+-    valid_cell_it.begin(true);
+-
+-    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
+-    {
+-      cell_type *temp_center_cell = *temp_cell_it;
+-      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
+-
+-      if (!valid_center_cell->data())
+-      {
+-        ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-        continue;
+-      }
+-
+-      bool valid = true;
+-
+-      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
+-      double cell_length = cell_it.length();
+-
+-      vnl_vector_fixed<float, DIM_> responses(0.0);
+-
+-      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
+-      {
+-        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
+-
+-        for (int i =-2; i<=2; i++)
+-        {
+-          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
+-
+-          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid, resolution_level);
+-
+-          if (this_cell) {
+-            bvpl_kernel_dispatch d(this_tap[i+2]);
+-            float val =(float)(this_cell->data()[response_dim]);
+-            functor.apply(val, d);
+-          }
+-          else {
+-            valid = false;
+-            break;
+-          }
+-        }
+-
+-        if (!valid)
+-          break;
+-
+-        responses[response_dim] = (float)(functor.result());
+-      }
+-
+-      temp_center_cell->set_data(responses);
+-      valid_center_cell->set_data(valid);
+-      ++cell_it; ++temp_cell_it; ++valid_cell_it;
+-    }
+-
+-    //copy temp cells into cells
+-    cell_it.begin();
+-    temp_cell_it.begin();
+-
+-    while ( !(cell_it.end() || temp_cell_it.end()) )
+-    {
+-      (*cell_it)->set_data((*temp_cell_it)->data());
+-      ++cell_it; ++temp_cell_it;
+-    }
+-  }
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  temp_scene->unload_active_blocks();
+-  delete temp_scene;
+-  return true;
+-}
+-
+-#if 0
+-//: Computes  the responses to separable filter taps.
+-//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
+-//  Each basis is made up of 3 1-d filter taps (x, y, z)
+-//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
+-//  the taps have size 5, this could be changed later on
+-bool bvpl_gauss3D_steerable_filters::basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                    int block_i, int block_j, int block_k,
+-                                                    boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
+-{
+-  this->assemble_basis_size_5();
+-
+-  bvpl_algebraic_functor  functor;
+-
+-  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
+-  unsigned max_ntaps = 3;
+-
+-  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  // Load input and output blocks
+-  scene->load_block_and_neighbors(block_i,block_j,block_k);
+-  valid_scene->load_block(block_i,block_j,block_k);
+-
+-  tree_type *tree = scene->get_block(block_i, block_j, block_k)->get_tree();
+-  tree_type *temp_tree = tree->clone(); //a temporary tree to store partial results
+-  boct_tree<short, bool> *valid_tree = tree->clone_to_type<bool>();
+-  valid_tree->init_cells(true);
+-
+-  std::vector<cell_type* > cells = tree->leaf_cells();
+-  std::vector<cell_type* > temp_cells = temp_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
+-
+-  std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;
+-
+-  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
+-  {
+-    //Assemple tabs into a map
+-    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
+-
+-    for (unsigned dim=0; dim< DIM_; dim++){
+-      std::string tap_name = basis_[dim][tap_i];
+-      one_d_taps.push_back(separable_taps_[tap_name]);
+-    }
+-
+-    //Traverse applying the appropriate 1-d taps
+-    std::vector<cell_type* >::iterator cells_it = cells.begin();
+-    std::vector<cell_type* >::iterator temp_it = temp_cells.begin();
+-    std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
+-    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end())&&(valid_it!=valid_cells.end()); cells_it++, valid_it++, temp_it++)
+-    {
+-      cell_type *center_cell = *cells_it;
+-      cell_type *temp_center_cell = *temp_it;
+-      boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
+-
+-      if (!valid_center_cell->data())
+-        continue;
+-
+-      bool valid = true;
+-
+-      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-      vnl_vector_fixed<float, DIM_> responses(0.0);
+-
+-      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
+-      {
+-        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
+-
+-        for (int i =-2; i<=2; i++)
+-        {
+-          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
+-
+-          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
+-
+-          if (this_cell) {
+-            bvpl_kernel_dispatch d(this_tap[i+2]);
+-            float val =(float)(this_cell->data()[response_dim]);
+-            functor.apply(val, d);
+-          }
+-          else {
+-            valid = false;
+-            break;
+-          }
+-        }
+-
+-        if (!valid)
+-          break;
+-
+-        responses[response_dim] = (float)(functor.result());
+-      }
+-
+-      temp_center_cell->set_data(responses);
+-      valid_center_cell->set_data(valid);
+-    }
+-
+-    //copy temp cells into cells
+-    cells_it = cells.begin();
+-    temp_it = temp_cells.begin();
+-    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end()); cells_it++, temp_it++)
+-      (*cells_it)->set_data((*temp_it)->data());
+-
+-    std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;;
+-  }
+-
+-  //write the output block
+-  scene->get_block(block_i, block_j, block_k)->init_tree(tree);
+-  scene->write_active_block();
+-  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
+-  valid_scene->write_active_block();
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  delete temp_tree;
+-  return true;
+-}
+-#endif
+-
+-
+-bool bvpl_gauss3D_steerable_filters::rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                                                      boxm_scene<boct_tree<short, bool> > *valid_scene)
+-{
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
+-  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
+-
+-  //Traverse all cells
+-  boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block);
+-  cell_it.begin();
+-  boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block, true);
+-  valid_cell_it.begin();
+-
+-  while ( !(cell_it.end() || valid_cell_it.end()) )
+-  {
+-    cell_type *center_cell = *cell_it;
+-    boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
+-
+-    if (!valid_center_cell->data()){
+-      ++cell_it; ++valid_cell_it;
+-      continue;
+-    }
+-
+-    vnl_vector_fixed<float, DIM_> responses=center_cell->data();
+-
+-    vgl_vector_3d<float> grad(responses[1], responses[2],responses[3]);
+-    normalize(grad); //after normalizing the gradient the direction cosines are the cartesian coordinates of grad
+-
+-    //rotate the responses according to the gradient
+-    vnl_vector_fixed<float, DIM_> rotation_weigths(1.0f);
+-    rotation_weigths[0] = 1;
+-    rotation_weigths[1] = grad.x(); rotation_weigths[2] = grad.y();     rotation_weigths[3] = grad.z();
+-    rotation_weigths[4] = grad.x()* grad.x(); rotation_weigths[5] = 2.0f* grad.x()*grad.y();
+-    rotation_weigths[6] = grad.y()* grad.y(); rotation_weigths[7] = 2.0f* grad.x()*grad.z();
+-    rotation_weigths[8] = 2.0f * grad.y()* grad.z(); rotation_weigths[9] = grad.z()*grad.z();
+-
+-    responses = element_product(responses, rotation_weigths);
+-
+-    center_cell->set_data(responses);
+-    ++cell_it; ++valid_cell_it;
+-  }
+-
+-  //clear memory
+-  scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  return true;
+-}
+-
+-
+-void bvpl_gauss3D_steerable_filters::assemble_basis_size_5()
+-{
+-  separable_taps_.clear();
+-
+-  //Zeroth Derivative G0
+-  //Separable basis taps: f01, f02
+-  float f01_data[5] = {0.000402093f, 0.162216f, 1.19862f, 0.162216f, 0.000402093f};
+-  vnl_vector_fixed<float, 5> f01(f01_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f01", f01));
+-
+-  float f02_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
+-  vnl_vector_fixed<float,5> f02(f02_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f02", f02));
+-
+-  //First Derivative Basis: G1 = alpha*G1a + beta*G1b
+-  //Separable basis functions: f11, f12
+-  float f11_data[5] = {0.00227458f, 0.458816f, 0.0f, -0.458816f, -0.00227458f};
+-  vnl_vector_fixed<float,5> f11(f11_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f11", f11));
+-  float f12_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
+-  vnl_vector_fixed<float,5> f12(f12_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f12", f12));
+-
+-  //Second derivative basis G2 = alpha^2*G2a + 2*alpha*beta*G2b + beta^2*G2c + 2*alpha*gamma*G2d + 2*beta*gamma*G2e + gamma^2*G2f
+-  //Separable basis taps = f21, f22, f23, f24
+-  float f21_data[5] = {0.00696448f, 0.561934f, -1.38405f, 0.561934f, 0.00696448f};
+-  vnl_vector_fixed<float,5> f21(f21_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f21", f21));
+-
+-  float f22_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
+-  vnl_vector_fixed<float,5> f22(f22_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f22", f22));
+-
+-  float f23_data[5] = {-0.00643349f, -1.29773f, 0.0f, 1.29773f, 0.00643349f};
+-  vnl_vector_fixed<float,5> f23(f23_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f23", f23));
+-
+-  float f24_data[5] = {-0.000670925f, -0.135335f, 0.0f, 0.135335f, 0.000670925f};
+-  vnl_vector_fixed<float,5> f24(f24_data);
+-  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f24", f24));
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
+deleted file mode 100644
+index bda8905d49..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
++++ /dev/null
+@@ -1,61 +0,0 @@
+-// This is bvpl_gauss3D_steerable_filters.h
+-#ifndef bvpl_gauss3D_steerable_filters_h
+-#define bvpl_gauss3D_steerable_filters_h
+-
+-//:
+-// \file
+-// \brief 3-d Streerable filters implemented theough separable basis
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  12-Aug-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <vnl/vnl_vector_fixed.h>
+-#include <boxm/boxm_scene.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-
+-
+-class bvpl_gauss3D_steerable_filters{
+-
+-public:
+-  bvpl_gauss3D_steerable_filters();
+-
+-  //: The dimension of the filter response e.i. number of steerable filters
+-  enum { DIM_ = 10 };
+-
+-  //: Compute basis response at all leaf cells
+-  bool basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length);
+-
+-  //: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
+-  bool multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                 boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level);
+-
+-  //: Assemble basis for: -2 -1 0 1 2
+-  void assemble_basis_size_5();
+-
+-  std::vector<std::vector<std::string> > basis() {return basis_;}
+-  std::vector<std::string> basis_names() {return basis_names_;}
+-  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps(){return separable_taps_;}
+-
+-  bool rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
+-                                        boxm_scene<boct_tree<short, bool> > *valid_scene);
+-
+-protected:
+-
+-  //: lists of 1-d filter tap names needed for each basis
+-  std::vector<std::vector<std::string> > basis_;
+-
+-  //: list of basis identifying strings
+-  std::vector<std::string> basis_names_;
+-
+-  //: map containing the 1-d filter taps (actual values) and their identifying string
+-  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps_;
+-
+-  std::vector<vgl_vector_3d<int> > axis_;
+-};
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
+deleted file mode 100644
+index 391c7f157e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
++++ /dev/null
+@@ -1,475 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include <iostream>
+-#include <fstream>
+-#include "bvpl_global_corners.h"
+-
+-#include <bsta/bsta_histogram.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-#include <bvpl_octree/bvpl_corner_detector.h>
+-#include <bvpl_octree/bvpl_corner_functors.h>
+-
+-#include <vul/vul_file.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-
+-//: Constructor  from xml file
+-bvpl_global_corners::bvpl_global_corners(const std::string &path)
+-{
+-  std::cout << "Loading corners info from xml-file" << std::endl;
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-  if (!xml_ifs.is_open()){
+-    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
+-    throw;
+-  }
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("global_corners_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
+-    throw;
+-  }
+-
+-  //Parse scenes
+-  bxml_element scenes_query("scene");
+-  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
+-
+-  unsigned nscenes=scenes_data.size();
+-  std::cout << "Number of scenes: " << nscenes << std::endl;
+-
+-  aux_dirs_.clear();
+-  aux_dirs_.resize(nscenes);
+-
+-  finest_cell_length_.clear();
+-  finest_cell_length_.resize(nscenes);
+-
+-  for (unsigned si = 0; si < nscenes; si++)
+-  {
+-    auto* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
+-    int id = -1;
+-    scenes_elm->get_attribute("id", id);
+-    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
+-    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
+-
+-    if (!(vul_file::exists(aux_dirs_[id]) && vul_file::is_directory(aux_dirs_[id]))){
+-      vul_file::make_directory(aux_dirs_[id]);
+-    }
+-  }
+-
+-  //Parse kernels
+-  bxml_element params_query("parameters");
+-  bxml_data_sptr params_data = bxml_find_by_name(root, params_query);
+-  if (params_data)
+-  {
+-    auto* params_elm = dynamic_cast<bxml_element*>(params_data.ptr());
+-
+-    params_elm->get_attribute("harris_k", harris_k_);
+-    std::cout << "Harris_k is " << harris_k_ << '\n';
+-  }
+-  else {
+-    std::cerr << " In Gobal Corners: no parameters element\n";
+-  }
+-}
+-
+-
+-//: Compute Harris' measure extension to 3-d as proposed by:
+-//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
+-void bvpl_global_corners::compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-
+-  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, float> >* corner_scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  corner_scene->set_appearance_model(BOXM_FLOAT);
+-  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
+-  corner_scene->write_scene("harris_scene.xml");
+-
+-  if (!( proj_scene && valid_scene && corner_scene ))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_corner_detector corner_detector;
+-  bvpl_harris_laptev_functor harris_functor(harris_k_);
+-
+-  vgl_point_3d<int> max_neighborhood_idx = global_taylor->kernel_vector_->max();
+-  vgl_point_3d<int> min_neighborhood_idx = global_taylor->kernel_vector_->min();
+-
+-  std::cout << "Neighborhood for Harris threshold: " << min_neighborhood_idx << " , " << max_neighborhood_idx << std::endl;
+-
+-  corner_detector.compute_C(proj_scene, harris_functor, min_neighborhood_idx, max_neighborhood_idx, block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
+-
+-  //clean memory
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-
+-//: Compute corner measure extension to 3-d as proposed by:
+-// P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
+-void bvpl_global_corners::compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-
+-  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, float> >* corner_scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  corner_scene->set_appearance_model(BOXM_FLOAT);
+-  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
+-  corner_scene->write_scene("harris_scene.xml");
+-
+-  if (!( proj_scene && valid_scene && corner_scene ))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_corner_detector corner_detector;
+-
+-  corner_detector.compute_det_H(proj_scene, block_i, block_j, block_k, valid_scene, corner_scene);
+-
+-  //clean memory
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-
+-//: Threshold a percentage of corners, based of the Harris' measure extension to 3-d proposed by:
+-//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
+-void bvpl_global_corners::threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float harris_thresh, const std::string& output_path)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
+-
+-  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-
+-  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
+-
+-  if (!(vul_file::exists(output_path) && vul_file::is_directory(output_path)))
+-    vul_file::make_directory(output_path);
+-
+-  boxm_scene<boct_tree<short, bool> >* valid_corner_scene =
+-  new boxm_scene<boct_tree<short, bool> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  valid_corner_scene->set_appearance_model(BOXM_BOOL);
+-
+-  std::stringstream valid_ss;
+-  valid_ss << "valid_scene_" << scene_id ;
+-
+-  valid_corner_scene->set_paths(output_path, valid_ss.str());
+-  valid_corner_scene->write_scene(valid_ss.str() + ".xml");
+-  valid_scene->clone_blocks(*valid_corner_scene);
+-
+-  std::stringstream proj_ss;
+-  proj_ss << "proj_taylor_scene_" << scene_id ;
+-
+-  boxm_scene<taylor_tree_type >* copy_proj_scene =
+-  new boxm_scene<taylor_tree_type >(proj_scene->lvcs(), proj_scene->origin(), proj_scene->block_dim(), proj_scene->world_dim(), proj_scene->max_level(), proj_scene->init_level());
+-  copy_proj_scene->set_appearance_model(VNL_DOUBLE_10);
+-  copy_proj_scene->set_paths(proj_scene->path(), proj_scene->block_prefix());
+-  copy_proj_scene->write_scene(output_path, proj_ss.str() + ".xml");
+-
+-  delete copy_proj_scene;
+-
+-  if (!( valid_scene && corner_scene && valid_corner_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
+-  valid_it.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
+-  corners_it.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, bool > > valid_corners_it = valid_corner_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block);
+-  valid_corners_it.begin();
+-
+-  while ( !(valid_it.end() || corners_it.end() || valid_corners_it.end()) )
+-  {
+-    boct_tree_cell<short,bool> *valid_cell = *valid_it;
+-    boct_tree_cell<short,float> *corner_cell = *corners_it;
+-    boct_tree_cell<short,bool> *valid_corner_cell = *valid_corners_it;
+-
+-    boct_loc_code<short> valid_code = valid_cell->get_code();
+-    boct_loc_code<short> corner_code = corner_cell->get_code();
+-    boct_loc_code<short> valid_corner_code = valid_corner_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((valid_cell->level() != corner_cell->level()) || (valid_cell->level() != valid_corner_cell->level()) || !(valid_code.isequal(&corner_code)) || !(valid_code.isequal(&valid_corner_code))){
+-      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
+-      return;
+-    }
+-
+-    /*****CAUTION: Only looking at cells at level 0*/
+-    if (valid_cell->level()!=0) {
+-      ++valid_it;
+-      ++corners_it;
+-      valid_corner_cell->set_data(false);
+-      ++valid_corners_it;
+-      continue;
+-    }
+-
+-    if (corner_cell->data() < harris_thresh)
+-      valid_corner_cell->set_data(false);
+-    else
+-      valid_corner_cell->set_data(true);
+-
+-    ++valid_it;
+-    ++corners_it;
+-    ++valid_corners_it;
+-  }
+-
+-  //clean memory
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-  valid_corner_scene->unload_active_blocks();
+-
+-  delete valid_corner_scene;
+-}
+-
+-//: Take a histogram of corners and get different values for percentage of thresholds
+-void bvpl_global_corners::explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-
+-  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
+-  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
+-
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-
+-  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
+-
+-  if (!( valid_scene && corner_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::explore_corner_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-
+-  //compute scene statistics at valid cells only
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
+-  valid_it.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
+-  corners_it.begin();
+-
+-  float cell_count = 0;
+-  auto max = (float)(*corners_it)->data();
+-  float min = max;
+-  float this_val = max;
+-  while ( !(valid_it.end() || corners_it.end()) )
+-  {
+-    boct_tree_cell<short,bool> *valid_cell = *valid_it;
+-    boct_tree_cell<short,float> *corner_cell = *corners_it;
+-
+-    boct_loc_code<short> valid_code = valid_cell->get_code();
+-    boct_loc_code<short> corner_code = corner_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
+-      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
+-      return;
+-    }
+-
+-    /*****CAUTION: Only looking at cells at level 0*/
+-    if (valid_cell->level()!=0) {
+-      ++valid_it;
+-      ++corners_it;
+-      continue;
+-    }
+-
+-    cell_count++;
+-    this_val = (float)(*corners_it)->data();
+-    if ( this_val > max)  max = this_val;
+-    if ( this_val < min)  min = this_val;
+-
+-    ++valid_it;
+-    ++corners_it;
+-  }
+-
+-  auto nbins = (unsigned int)std::floor(std::sqrt(cell_count));
+-  bsta_histogram<float>  corner_hist(min, max, nbins);
+-  valid_it.begin();
+-  corners_it.begin();
+-  while ( !(valid_it.end() || corners_it.end()) )
+-  {
+-    boct_tree_cell<short,bool> *valid_cell = *valid_it;
+-    boct_tree_cell<short,float> *corner_cell = *corners_it;
+-
+-    boct_loc_code<short> valid_code = valid_cell->get_code();
+-    boct_loc_code<short> corner_code = corner_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
+-      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
+-      return;
+-    }
+-
+-    /*****CAUTION: Only looking at cells at level 0*/
+-    if (valid_cell->level()!=0) {
+-      ++valid_it;
+-      ++corners_it;
+-      continue;
+-    }
+-
+-    corner_hist.upcount((float)(*corners_it)->data(), 1.0f);
+-
+-    ++valid_it;
+-    ++corners_it;
+-  }
+-
+-  std::string file = aux_dirs_[scene_id] + "/corner_threshold_values.txt";
+-  float threshold[] = {0.01f, 0.02f, 0.05f, 0.1f, 0.2f, 0.5f, 0.8f};
+-  std::ofstream ofs(file.c_str());
+-  ofs.precision(7);
+-  for (float i : threshold) {
+-    ofs << i << ' ' << corner_hist.value_with_area_above(i) << '\n';
+-  }
+-
+-  //clean memory
+-  ofs.close();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-//: Load scene info
+-boxm_scene_base_sptr bvpl_global_corners::load_corner_scene(int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr scene_base = new boxm_scene_base();
+-  boxm_scene_parser scene_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/harris_scene.xml";
+-  scene_base->load_scene(aux_scene_ss.str(), scene_parser);
+-
+-  //cast scene
+-  auto *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (scene_base->appearence_model() == BOXM_FLOAT){
+-    scene->load_scene(scene_parser);
+-    scene_base = scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
+-boxm_scene_base_sptr bvpl_global_corners::load_valid_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_corners::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  auto *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL){
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_corners::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-//: Write this class to xml file
+-void bvpl_global_corners::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("global_corners_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  //write the scene elements
+-  for (unsigned i =0; i<aux_dirs_.size(); i++)
+-  {
+-    bxml_element* scenes_elm = new bxml_element("scene");
+-    scenes_elm->append_text("\n");
+-    scenes_elm->set_attribute("id", i);
+-    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
+-    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
+-    root->append_data(scenes_elm);
+-    root->append_text("\n");
+-  }
+-
+-  //write parameters for corner detection
+-  bxml_element* param_elm = new bxml_element("parameters");
+-  param_elm->append_text("\n");
+-  param_elm->set_attribute("harris_k", harris_k_);
+-  root->append_data(param_elm);
+-  root->append_text("\n");
+-
+-  //write to disk
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
+deleted file mode 100644
+index 0e7924fe1b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
++++ /dev/null
+@@ -1,71 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
+-#ifndef bvpl_global_corners_h
+-#define bvpl_global_corners_h
+-//:
+-// \file
+-// \brief A class to compute corner features across different boxm_scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  21-Jul-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-#include <bvpl_octree/bvpl_global_taylor.h>
+-
+-class bvpl_global_corners : public vbl_ref_count
+-{
+-
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  public:
+-
+-  //: Constructor  from xml file
+-  bvpl_global_corners(const std::string &path);
+-
+-  //: Compute Harris' measure extension to 3-d as proposed by:
+-  //  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
+-  void compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor, int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Compute corner measure extension to 3-d as proposed by:
+-  // P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
+-  void compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Threshold corners below a threshold
+-  void threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float thresh, const std::string& output_path);
+-
+-  //: Take a histogram of corners and get different values for percentage of thresholds
+-  void explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id);
+-
+-  //: Write to global_corners_info.xml
+-  void xml_write();
+-
+-  // Accessors
+-  std::string path_out() {return path_out_;}
+-  std::vector<std::string> aux_dirs() { return aux_dirs_; }
+-  std::string aux_dirs( unsigned i ) { return aux_dirs_[i]; }
+-  std::vector<double> cell_lengths() { return finest_cell_length_; }
+-
+-  boxm_scene_base_sptr load_corner_scene (int scene_id);
+-  boxm_scene_base_sptr load_valid_scene (int scene_id);
+-
+-  std::string xml_path() { return path_out_ + "/global_corners_info.xml"; }
+-
+- protected:
+-
+-  //: A vector to hold paths to keep taylor coefficient scenes and valid scenes
+-  std::vector<std::string> aux_dirs_;
+-  //: A vector to hold the finest cell length of the corresponding scene scene
+-  std::vector<double> finest_cell_length_;
+-  //: Path to xml info file
+-  std::string path_out_;
+-  //: The value of the parameter k for harris corners
+-  float harris_k_;
+-};
+-
+-typedef vbl_smart_ptr<bvpl_global_corners > bvpl_global_corners_sptr;
+-
+-
+-#endif // bvpl_global_corners_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
+deleted file mode 100644
+index 7b33da89da..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include "bvpl_global_pca.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Mar-2011
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
+deleted file mode 100644
+index 39ff106c20..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
++++ /dev/null
+@@ -1,153 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
+-#ifndef bvpl_global_pca_h
+-#define bvpl_global_pca_h
+-//:
+-// \file
+-// \brief A class to compute and learn pca features across different boxm_scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  14-Mar-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <utility>
+-#include <vnl/vnl_matrix_fixed.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-
+-template <unsigned feature_dim>
+-class bvpl_global_pca: public vbl_ref_count
+-{
+- public:
+-  //: Constructor
+-  bvpl_global_pca(std::vector<std::string> scenes, std::vector<std::string> aux_dirs, std::vector<double> finest_cell_length,
+-                  vgl_box_3d<int> nbbox,  double training_fraction = 0.1, std::string path_out = "./"):
+-  scenes_(std::move(scenes)), aux_dirs_(std::move(aux_dirs)), finest_cell_length_(std::move(finest_cell_length)), nbbox_(nbbox), training_fraction_(training_fraction),path_out_(std::move(path_out))
+-  {
+-    training_scenes_ = std::vector<bool>(scenes_.size(), true);
+-    nleaves_ =  std::vector<unsigned long>(scenes_.size(), 0);
+-    nsamples_ = 0;
+-    training_mean_.fill(0.0);
+-    pc_.fill(0.0);
+-    weights_.fill(0.0);
+-    scatter_.fill(0.0);
+-    this->xml_write();
+-  }
+-
+-  //:Create from xml file
+-  bvpl_global_pca(const std::string &path);
+-
+-  //: Init auxiliary scenes and smallest cell length values
+-  void init(unsigned scene_id);
+-
+-  //: Computes the scatter matrix and mean vector of a portion of random samples from a block
+-  bool sample_statistics( int scene_id, int block_i, int block_j, int block_k,
+-                          vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                          vnl_vector_fixed<double, feature_dim> &mean,
+-                          unsigned long &nfeature);
+-
+-  //: Update mean and scatter, given the mean and scatter of two sets.
+-  //  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
+-   static void combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim>  &mean1,
+-                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter1,
+-                                            double const n1,
+-                                            const vnl_vector_fixed<double,feature_dim>  &mean2,
+-                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter2,
+-                                            double const n2,
+-                                            vnl_vector_fixed<double,feature_dim> & mean_out,
+-                                            vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
+-                                            double &n_out );
+-
+-  //: Set total scatter matrix, mean, sample, principal components and weights for this class
+-  void set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                      const vnl_vector_fixed<double, feature_dim> &mean,
+-                      const double total_nsamples);
+-
+-  //: Access the principal components
+-  const vnl_matrix_fixed<double, feature_dim, feature_dim>& principal_comps() { return pc_; }
+-
+-  //: Access the coefficients
+-  const vnl_vector_fixed<double, feature_dim>& weights() { return weights_; }
+-
+-  //: Access the mean of samples
+-  const vnl_vector_fixed<double, feature_dim>& mean()  { return training_mean_; }
+-
+-  bool register_scene(std::string scene_path, std::string aux_path)
+-  {
+-    if (scenes_.size()!=aux_dirs_.size())
+-      return false;
+-    scenes_.push_back(scene_path);
+-    aux_dirs_.push_back(aux_path);
+-    return true;
+-  }
+-
+-  void xml_write();
+-
+-  //: Computes 10-dimensional pca projection at each voxel on the block and saves it
+-  void project(int scene_id, int block_i, int block_j, int block_k);
+-
+-  void projection_error(int scene_id, int block_i, int block_j, int block_k);
+-
+-
+-  std::string path_out() const { return path_out_; }
+-
+-  inline std::vector<std::string> scenes() const { return scenes_; }
+-  inline std::vector<std::string> aux_dirs() const { return aux_dirs_; }
+-  inline std::vector<double> cell_lengths() const { return finest_cell_length_; }
+-  inline std::vector<bool> training_scenes() const { return training_scenes_; }
+-  inline vgl_box_3d<int> nbbox() const { return nbbox_; }
+-  inline unsigned nscenes() const { return scenes_.size(); }
+- protected:
+-
+-  //: A vector to hold scene paths
+-  std::vector<std::string> scenes_;
+-  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
+-  std::vector<std::string> aux_dirs_;
+-  //: A vector to hold the finest cell length of the corresponding scene scene
+-  std::vector<double> finest_cell_length_;
+-  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
+-  std::vector<bool> training_scenes_;
+-  //: A vector to keep the size of each scene
+-  std::vector<unsigned long> nleaves_;
+-
+-  //: The size around the central feature to include in PCA vectors
+-  vgl_box_3d<int> nbbox_;
+-  //: Number of total samples(leaves) to be drawn
+-  unsigned long long nsamples_;
+-
+-  //: Principal components - eigen vectors of the scatter matrix
+-  vnl_matrix_fixed<double, feature_dim, feature_dim> pc_;
+-  //: Weights - eigen values of the scatter matrix
+-  vnl_vector_fixed<double, feature_dim> weights_;
+-  //: The mean of sample data
+-  vnl_vector_fixed<double, feature_dim> training_mean_;
+-  //: Scatter matrix used to compute pca
+-  vnl_matrix_fixed<double, feature_dim, feature_dim> scatter_;
+-  //: Fraction of cells used for learning
+-  double training_fraction_;
+-
+-  //: Paths for i/o of matrices and vectors
+-  std::string path_out_;
+-  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
+-  std::string weights_path() const { return path_out_ + "/weights.txt"; }
+-  std::string mean_path() const { return  path_out_ + "/mean.txt"; }
+-  std::string scatter_path() const { return  path_out_ + "/scatter.txt"; }
+-  std::string xml_path() const { return path_out_ + "/pca_global_info.xml"; }
+-
+-  void write_pca_matrices();
+-
+- public:
+-  boxm_scene_base_sptr load_scene (int scene_id);
+-  boxm_scene_base_sptr load_train_scene (int scene_id);
+-  boxm_scene_base_sptr load_valid_scene (int scene_id);
+-  boxm_scene_base_sptr load_projection_scene (int scene_id);
+-  boxm_scene_base_sptr load_error_scene (int scene_id);
+-};
+-
+-typedef vbl_smart_ptr<bvpl_global_pca<125> > bvpl_global_pca_125_sptr;
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
+deleted file mode 100644
+index 6877b12a34..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
++++ /dev/null
+@@ -1,1018 +0,0 @@
+-#ifndef bvpl_global_pca_hxx_
+-#define bvpl_global_pca_hxx_
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 14-Mar-2011
+-
+-#include "bvpl_global_pca.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-
+-
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <vnl/vnl_random.h>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_matrix_fixed.h>
+-#include <vnl/algo/vnl_symmetric_eigensystem.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <cassert>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//#define DEBUG_PROJ
+-
+-//: Create from xml_file
+-template <unsigned feature_dim>
+-bvpl_global_pca<feature_dim>::bvpl_global_pca(const std::string &path)
+-{
+-  std::cout << "Loading pca info from xml-file" << std::endl;
+-  int valid = 0;
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-  if (!xml_ifs.is_open()) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not open xml info file: " << xml_path() << '\n';
+-    throw;
+-  }
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("pca_global_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
+-    throw;
+-  }
+-
+-  //Parse neighborhood bounding box - units are number of voxels
+-  bxml_element nbbox_query("neighborhood");
+-  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
+-  bxml_element* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
+-  int min_x, min_y, min_z, max_x, max_y, max_z =0;
+-  nbbox_elm->get_attribute("min_x", min_x);
+-  nbbox_elm->get_attribute("min_y", min_y);
+-  nbbox_elm->get_attribute("min_z", min_z);
+-  nbbox_elm->get_attribute("max_x", max_x);
+-  nbbox_elm->get_attribute("max_y", max_y);
+-  nbbox_elm->get_attribute("max_z", max_z);
+-
+-  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
+-  std::cout << "Neighborhood: " << nbbox_ << std::endl;
+-
+-  //Parse Number of samples
+-  bxml_element properties_query("properties");
+-  bxml_data_sptr properties_data = bxml_find_by_name(root, properties_query);
+-  bxml_element* properties_elm = dynamic_cast<bxml_element*>(properties_data.ptr());
+-  properties_elm->get_attribute("nsamples", nsamples_);
+-  unsigned temp_dim;
+-  properties_elm->get_attribute("feature_dim", temp_dim);
+-  if (temp_dim!=feature_dim) {
+-    valid = -10;
+-  }
+-  properties_elm->get_attribute("training_fraction", training_fraction_);
+-
+-  unsigned nscenes = 0;
+-  properties_elm->get_attribute("nscenes", nscenes);
+-
+-  std::cout << "Number of samples: " << nsamples_ << '\n'
+-           << "Feature dimension: " << temp_dim << '\n'
+-           << "Number of scenes: " << nscenes <<std::endl;
+-
+-  //Parse scenes
+-  bxml_element scenes_query("scene");
+-  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
+-
+-  if (nscenes !=scenes_data.size()) {
+-    std::cerr<<"Wrong number of scenes\n";
+-    throw;
+-  }
+-
+-  scenes_.clear();
+-  scenes_.resize(nscenes);
+-
+-  aux_dirs_.clear();
+-  aux_dirs_.resize(nscenes);
+-
+-  finest_cell_length_.clear();
+-  finest_cell_length_.resize(nscenes);
+-
+-  nleaves_.clear();
+-  nleaves_.resize(nscenes);
+-
+-  for (unsigned si = 0; si < nscenes; si++)
+-  {
+-    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
+-    int id = -1;
+-    scenes_elm->get_attribute("id", id);
+-    scenes_elm->get_attribute("path", scenes_[id]);
+-    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
+-    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
+-    scenes_elm->get_attribute("nleaves", nleaves_[id]);
+-
+-    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
+-  }
+-
+-  //Parse training scenes
+-  bxml_element train_query("training_scenes");
+-  bxml_element* train_elm = dynamic_cast<bxml_element*>(bxml_find_by_name(root, train_query).ptr());
+-  unsigned n_train_scenes = 0;
+-  train_elm->get_attribute("nscenes", n_train_scenes);
+-  training_scenes_.clear();
+-  training_scenes_.resize(nscenes, false);
+-
+-  //read out the scenes
+-  for (bxml_element::const_data_iterator s_it = train_elm->data_begin(); s_it != train_elm->data_end(); s_it++) {
+-    if ((*s_it)->type() == bxml_data::TEXT) {
+-      bxml_text* t = dynamic_cast<bxml_text*>((*s_it).ptr());
+-      std::stringstream text_d(t->data()); std::string buf;
+-      std::vector<std::string> tokens;
+-      while (text_d >> buf) {
+-        tokens.push_back(buf);
+-      }
+-      if (tokens.size() != n_train_scenes)
+-        continue;
+-      for (unsigned i = 0; i < n_train_scenes; i++) {
+-        std::stringstream ss2(tokens[i]); int s_type_id;
+-        ss2 >> s_type_id;
+-        std::cout << "Scene: " << s_type_id << " is used for training\n";
+-        training_scenes_[s_type_id]=true;
+-      }
+-      break;
+-    }
+-  }
+-
+-  //Parse paths and set matrices
+-  bxml_element paths_query("paths");
+-  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
+-  if (paths_data)
+-  {
+-    bxml_element* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
+-
+-    std::string ifs_path;
+-
+-    path_elm->get_attribute("pc_path", ifs_path);
+-    if (ifs_path != pc_path())
+-      valid = -1;
+-    else{
+-      std::ifstream ifs(ifs_path.c_str());
+-      ifs >> pc_;
+-      ifs.close();
+-      if (pc_.size()!=feature_dim*feature_dim)
+-        valid = -2;
+-    }
+-
+-    path_elm->get_attribute("weights_path", ifs_path);
+-    if (ifs_path != weights_path())
+-      valid = -3;
+-    else{
+-      std::ifstream ifs(ifs_path.c_str());
+-      ifs >> weights_;
+-      ifs.close();
+-      if (weights_.size()!=feature_dim)
+-        valid = -4;
+-    }
+-
+-    path_elm->get_attribute("mean_path", ifs_path);
+-    if (ifs_path != mean_path())
+-      valid = -5;
+-    else
+-    {
+-      if ( vul_file::exists(ifs_path))
+-      {
+-        std::ifstream ifs(ifs_path.c_str());
+-        ifs >> training_mean_;
+-        ifs.close();
+-      }
+-      else{
+-        std::cerr << " Warning: Mean file is empty\n";
+-        training_mean_.fill(0.0);
+-      }
+-
+-      path_elm->get_attribute("scatter_path", ifs_path);
+-      if (ifs_path != scatter_path())
+-        valid = -6;
+-      else if (vul_file::exists(ifs_path)) {
+-        std::ifstream(ifs_path);
+-        ifs_path >> scatter_;
+-        ifs_path.close();
+-      }
+-      else{
+-        std::cerr << " Warning: Scatter file is empty\n";
+-        scatter_.fill(0.0);
+-      }
+-
+-      if (valid<0) {
+-        std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
+-        xml_write();
+-      }
+-    }
+-  }
+-
+-  xml_ifs.close();
+-}
+-
+-//: Init auxiliary scenes and smallest cell length values
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::init(unsigned scene_id)
+-{
+-  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  if (!data_scene) {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
+-    return;
+-  }
+-  double finest_cell_length = data_scene->finest_cell_length();
+-  finest_cell_length_[scene_id] = finest_cell_length;
+-  nleaves_[scene_id] = data_scene->size();
+-
+-  if (!(vul_file::exists(aux_dirs_[scene_id]) && vul_file::is_directory(aux_dirs_[scene_id]))) {
+-    vul_file::make_directory(aux_dirs_[scene_id]);
+-  }
+-
+-  {
+-    std::stringstream aux_scene_ss;
+-    aux_scene_ss << "train_scene_" << scene_id ;
+-    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-    if (!vul_file::exists(aux_scene_path)) {
+-      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-      boxm_scene<boct_tree<short, bool> > *aux_scene =
+-      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-      aux_scene->set_appearance_model(BOXM_BOOL);
+-      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-    }
+-  }
+-  {
+-    std::stringstream aux_scene_ss;
+-    aux_scene_ss << "valid_scene_" << scene_id ;
+-    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-    if (!vul_file::exists(aux_scene_path)) {
+-      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-      boxm_scene<boct_tree<short, bool> > *aux_scene =
+-      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-      aux_scene->set_appearance_model(BOXM_BOOL);
+-      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-    }
+-  }
+-
+-  {
+-    std::stringstream proj_scene_ss;
+-    proj_scene_ss << "proj_pca_scene_" << scene_id ;
+-    std::string proj_scene_path = aux_dirs_[scene_id] + "/" + proj_scene_ss.str() + ".xml";
+-    if (!vul_file::exists(proj_scene_path)) {
+-      std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
+-      typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-      boxm_scene<pca_tree_type > *proj_scene =
+-      new boxm_scene<pca_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-      proj_scene->set_appearance_model(VNL_DOUBLE_10);
+-      proj_scene->set_paths(aux_dirs_[scene_id], proj_scene_ss.str());
+-      proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
+-    }
+-  }
+-
+-  xml_write();
+-}
+-
+-//: Compute the scatter matrix of the specified block. A random number of cells are drawn for the calculation
+-//  The mask block indicates, whether a cell was used for learning the scatter matrix and mean
+-//  Ramndom samples according to octree structure.
+-//  Sampling is achieved by generating uniform random cell samples.
+-//  Since there are more cells where the resolution is finer, then these regions get sampled more often
+-template <unsigned feature_dim>
+-bool bvpl_global_pca<feature_dim>::sample_statistics( int scene_id, int block_i, int block_j, int block_k,
+-                                                      vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                                                      vnl_vector_fixed<double, feature_dim> &mean,
+-                                                      unsigned long &nfeature)
+-{
+-  if (!training_scenes_[scene_id]) {
+-    std::cout << "Skiping scene: " << scene_id <<", labeled for testing\n";
+-    return false;
+-  }
+-
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,bool> bool_tree_type;
+-  typedef boct_tree_cell<short,bool> bool_cell_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr mask_scene_base =load_train_scene(scene_id);
+-
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* mask_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*>(mask_scene_base.as_pointer());
+-
+-  if (!(data_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast data scenes\n";
+-    return false;
+-  }
+-  if (!(mask_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast mask scenes\n";
+-    return false;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  mask_scene->unload_active_blocks();
+-
+-  mean.fill(0.0);
+-  S.fill(0.0);
+-
+-  vnl_random rng;
+-  //vnl_random rng(9667566ul);
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && mask_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return false;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  mask_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  bool_tree_type* mask_tree = data_tree->template clone_to_type<bool>();
+-  mask_tree->init_cells(false);
+-
+-  nfeature = 1;
+-
+-  //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
+-  std::vector<float_cell_type *> leaf_cells = data_tree->leaf_cells();
+-  std::vector<bool_cell_type*> mask_leaves = mask_tree->leaf_cells();
+-
+-  int tree_ncells = leaf_cells.size();
+-  unsigned long tree_nsamples = (unsigned long)(tree_ncells*training_fraction_);
+-  double cell_length = finest_cell_length_[scene_id];
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> nmin = nbbox_.min_point();
+-  vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-  std::cout <<" In block (" << block_i <<", " << block_j << ", " << block_k << "), number of nsamples is: " << tree_nsamples << ", cell length is: " << cell_length << std::endl;
+-
+-  for (unsigned long i=0; i<tree_nsamples; i++)
+-  {
+-    unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-    boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
+-    vgl_point_3d<double> center_cell_centroid = data_tree->global_centroid(center_cell);
+-
+-    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
+-                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
+-    roi.set_centroid(center_cell_centroid);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if (!((data_scene->get_world_bbox()).contains(roi))) {
+-      i--;
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector_fixed<double, feature_dim> this_feature(0.0);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
+-                                                 center_cell_centroid.y() + (double)y*cell_length,
+-                                                 center_cell_centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          assert(neighbor_cell !=nullptr);
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    assert(curr_dim == feature_dim);
+-
+-    mask_leaves[sample]->set_data(true);
+-
+-    //increment weights
+-    double rho = 1.0/(double)nfeature;
+-    double rho_comp = 1.0 - rho;
+-
+-    // the difference vector between the sample and the mean
+-    vnl_vector_fixed<double, feature_dim> diff = this_feature - mean;
+-
+-    //update the covariance
+-    S += rho_comp*outer_product(diff,diff);
+-
+-    //update the mean
+-    mean += (rho*diff);
+-
+-    ++nfeature;
+-#if 0
+-    std::cerr << "Feature EVD: " <<this_feature << '\n'
+-             << "Mean Feature EVD: " <<mean_feature << '\n';
+-#endif
+-  }
+-
+-  --nfeature;
+-  // write and release memory
+-  mask_scene->get_block(block_i, block_j, block_k)->init_tree(mask_tree);
+-  mask_scene->write_active_block();
+-
+-  data_scene->unload_active_blocks();
+-  mask_scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-//: Update mean and scatter, given the mean and scatter of two sets.
+-//  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim> &mean1,
+-                                                                const vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter1,
+-                                                                double const n1,
+-                                                                const vnl_vector_fixed<double,feature_dim>  &mean2,
+-                                                                const  vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter2,
+-                                                                double const n2,
+-                                                                vnl_vector_fixed<double,feature_dim> & mean_out,
+-                                                                vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
+-                                                                double &n_out )
+-{
+-  n_out = n1+n2;
+-  mean_out = (n1*mean1 + n2*mean2)* (1.0/n_out);
+-  vnl_vector_fixed<double, feature_dim> d = mean2 - mean1;
+-  scatter_out = scatter1 + scatter2 + (n1*n2/n_out)*outer_product(d,d);
+-}
+-
+-//: Set total scatter matrix, mean, sample, principal components and weights for this class
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
+-                                                  const vnl_vector_fixed<double, feature_dim> &mean,
+-                                                  const double total_nsamples)
+-{
+-  scatter_ = S;
+-  training_mean_ = mean;
+-  nsamples_ = (long unsigned int)total_nsamples;
+-
+-  // Compute eigenvectors(principal components) and values of S
+-
+-  vnl_matrix<double> pc_temp;
+-  vnl_vector<double> w_temp;
+-
+-  vnl_symmetric_eigensystem_compute(scatter_.as_ref(), pc_temp, w_temp);
+-  pc_ = pc_temp.fliplr();
+-  weights_=w_temp.flip();
+-
+-  //save the newly set vaeiables
+-  this->xml_write();
+-}
+-
+-//: Computes 10-dimensional pca projection at each voxel on the block and saves it
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::project(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
+-  boxm_scene_base_sptr aux_scene_base = load_valid_scene(scene_id);
+-
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
+-  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* aux_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (aux_scene_base.as_pointer());
+-  if (!(data_scene && proj_scene && aux_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  aux_scene->unload_active_blocks();
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && aux_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  proj_scene->load_block(block_i, block_j, block_k);
+-  aux_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  pca_tree_type* proj_tree = data_tree->template clone_to_type<vnl_vector_fixed<double,10> >();
+-  boct_tree<short, bool>* aux_tree = data_tree->template clone_to_type<bool>();
+-  aux_tree->init_cells(true);
+-
+-  //get leaf cells
+-  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
+-  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short, bool> *> aux_leaves = aux_tree->leaf_cells();
+-
+-  double cell_length = finest_cell_length_[scene_id];
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> nmin = nbbox_.min_point();
+-  vgl_point_3d<int> nmax = nbbox_.max_point();
+-#ifdef DEBUG_PROJ
+-  double error = 0.0;
+-  unsigned long n_valid_cells= 0;
+-#endif
+-
+-  for (unsigned long i =0; i<data_leaves.size(); i++)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
+-      proj_leaves[i]->set_data(vnl_vector_fixed<double,10>(0.0));
+-      aux_leaves[i]->set_data(false);
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
+-                                                 centroid.y() + (double)y*cell_length,
+-                                                 centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell) {
+-            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    if (curr_dim != feature_dim) {
+-      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-      return;
+-    }
+-    this_feature-=training_mean_;
+-
+-    //solve for the coefficients
+-    vnl_vector_fixed<double, feature_dim> a(0.0);
+-    a = pc_.transpose() * (this_feature);
+-    vnl_vector_fixed<double,10> sample(a.extract(10));
+-    proj_leaves[i]->set_data(sample);
+-
+-#ifdef DEBUG_PROJ
+-    //project as a function of number of components
+-    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * sample;
+-
+-    //compute error
+-    error+=(float)((this_feature - feature_approx).squared_magnitude());
+-    n_valid_cells++;
+-#endif
+-  }
+-
+-  // write and release memory
+-  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
+-  proj_scene->write_active_block();
+-  proj_scene->unload_active_blocks();
+-  aux_scene->get_block(block_i, block_j, block_k)->init_tree(aux_tree);
+-  aux_scene->write_active_block();
+-  aux_scene->unload_active_blocks();
+-  data_scene->unload_active_blocks();
+-
+-#ifdef DEBUG_PROJ
+-  std::cout << "Total error in this block: " << error/(double)n_valid_cells << std::endl;
+-#endif
+-}
+-
+-//: Computes the projection error (as square magniture) given 10-dimensional pca projection at each voxel on the block
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::projection_error(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  if (training_scenes_[scene_id]) {
+-    std::cout << "Skipping training scene: " <<scene_id << std::endl;
+-    return;
+-  }
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
+-  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-
+-  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>*>(data_scene_base.as_pointer());
+-  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<float_tree_type >* error_scene = dynamic_cast<boxm_scene<float_tree_type >*>(error_scene_base.as_pointer());
+-
+-  if (!(data_scene && error_scene && proj_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  error_scene->unload_active_blocks();
+-
+-  //get the cells for this block
+-  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))) {
+-    std::cerr << "In compute_testing_error: Invalid block\n";
+-    return;
+-  }
+-
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  proj_scene->load_block(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the trees
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  pca_tree_type* proj_tree = proj_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-  error_tree->init_cells(-1.0f);
+-
+-  //get leaf cells
+-  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
+-  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
+-  std::vector<float_cell_type *> error_leaves = error_tree->leaf_cells();
+-
+-  double cell_length = finest_cell_length_[scene_id];
+-
+-  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
+-  //convert neighborhood box to scene coordinates
+-  vgl_point_3d<int> nmin = nbbox_.min_point();
+-  vgl_point_3d<int> nmax = nbbox_.max_point();
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++)
+-  {
+-    float_cell_type* data_cell = data_leaves[i];
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates aad test if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
+-      error_leaves[i]->set_data(-1.0f);
+-      continue;
+-    }
+-
+-    //3. Assemble neighborhood as a feature-vector
+-    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
+-
+-    unsigned curr_dim = 0;
+-    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
+-      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
+-        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
+-        {
+-          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
+-                                                 centroid.y() + (double)y*cell_length,
+-                                                 centroid.z() + (double)z*cell_length);
+-
+-          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
+-
+-          if (!neighbor_cell) {
+-            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-            return;
+-          }
+-
+-          this_feature[curr_dim] = (double)neighbor_cell->data();
+-          curr_dim++;
+-        }
+-
+-    if (curr_dim != feature_dim) {
+-      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
+-      return;
+-    }
+-    this_feature-=training_mean_;
+-
+-    //get the coefficients
+-    vnl_vector_fixed<double, 10> a = proj_leaves[i]->data();
+-
+-    //project
+-    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * a;
+-
+-    //compute error
+-    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
+-  error_scene->write_active_block();
+-  error_scene->unload_active_blocks();
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-}
+-
+-
+-//: Load scene info
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr scene_base = new boxm_scene_base();
+-  boxm_scene_parser scene_parser;
+-  scene_base->load_scene(scenes_[scene_id], scene_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (scene_base->appearence_model() == BOXM_FLOAT) {
+-    scene->load_scene(scene_parser);
+-    scene_base = scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_valid_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is should be used for training
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_train_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-
+-//: Load auxiliary scene info
+-template <unsigned feature_dim>
+-
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_projection_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_projection_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
+-  boxm_scene_parser proj_parser;
+-  std::stringstream proj_scene_ss;
+-  proj_scene_ss << aux_dirs_[scene_id] << "/proj_pca_scene_" << scene_id << ".xml";
+-  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
+-
+-  //cast scene
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
+-  boxm_scene<pca_tree_type > *proj_scene= new boxm_scene<pca_tree_type >();
+-  if (proj_scene_base->appearence_model() == VNL_DOUBLE_10) {
+-    proj_scene->load_scene(proj_parser);
+-    proj_scene_base = proj_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_proj_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return proj_scene_base;
+-}
+-
+-
+-//: Load auxiliary scene info
+-template <unsigned feature_dim>
+-boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_error_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-
+-  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  if (!data_scene) {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
+-    return nullptr;
+-  }
+-
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << "error_pca_scene_" << scene_id ;
+-  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-  if (!vul_file::exists(aux_scene_path)) {
+-    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-    boxm_scene<boct_tree<short, float> > *aux_scene =
+-    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-    aux_scene->set_appearance_model(BOXM_FLOAT);
+-    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-  }
+-
+-  //load scene
+-  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
+-  boxm_scene_parser error_parser;
+-  std::stringstream error_scene_ss;
+-  error_scene_ss << aux_dirs_[scene_id] << "/error_pca_scene_" << scene_id << ".xml";
+-  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
+-  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
+-    error_scene->load_scene(error_parser);
+-    error_scene_base = error_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return error_scene_base;
+-}
+-
+-
+-//: Write this class to xml file
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("pca_global_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  bxml_element* paths = new bxml_element("paths");
+-  paths->append_text("\n");
+-  paths->set_attribute("pc_path", pc_path() );
+-  paths->set_attribute("weights_path", weights_path() );
+-  paths->set_attribute("mean_path", mean_path());
+-  paths->set_attribute("scatter_path", scatter_path());
+-  root->append_data(paths);
+-  root->append_text("\n");
+-
+-  bxml_element* neighborhood = new bxml_element("neighborhood");
+-  neighborhood->append_text("\n");
+-  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
+-  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
+-  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
+-  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
+-  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
+-  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
+-  root->append_data(neighborhood);
+-  root->append_text("\n");
+-
+-  bxml_element* properties = new bxml_element("properties");
+-  properties->append_text("\n");
+-  properties->set_attribute("nsamples", nsamples_);
+-  properties->set_attribute("feature_dim", feature_dim);
+-  //properties->set_attribute("finest_cell_length", finest_cell_length_);
+-  properties->set_attribute("nscenes", scenes_.size());
+-  properties->set_attribute("training_fraction", training_fraction_);
+-
+-  root->append_data(properties);
+-  root->append_text("\n");
+-
+-  //write the scenes
+-  for (unsigned i =0; i<scenes_.size(); i++)
+-  {
+-    bxml_element* scenes_elm = new bxml_element("scene");
+-    scenes_elm->append_text("\n");
+-    scenes_elm->set_attribute("id", i);
+-    scenes_elm->set_attribute("path", scenes_[i]);
+-    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
+-    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
+-    scenes_elm->set_attribute("nleaves", nleaves_[i]);
+-    root->append_data(scenes_elm);
+-    root->append_text("\n");
+-  }
+-
+-  //write training scenes
+-  bxml_element* train_elm = new bxml_element("training_scenes");
+-  train_elm->append_text("\n");
+-
+-  std::stringstream ss;
+-  unsigned ts = 0;
+-
+-  for (unsigned i = 0; i< training_scenes_.size(); i++) {
+-    if (training_scenes_[i]) {
+-      ss << i << ' ';
+-      ts++;
+-    }
+-  }
+-
+-  train_elm->set_attribute("nscenes", ts);
+-  train_elm->append_text(ss.str());
+-  train_elm->append_text("\n");
+-  root->append_data(train_elm);
+-  root->append_text("\n");
+-
+-  //write to disk
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-
+-  // Write pca main matrices -other matrices aren't class variables and should have been written during computation time
+-  write_pca_matrices();
+-}
+-
+-//: Write a PCA file
+-template <unsigned feature_dim>
+-void bvpl_global_pca<feature_dim>::write_pca_matrices()
+-{
+-  std::ofstream pc_ofs(pc_path().c_str());
+-  pc_ofs.precision(15);
+-  std::ofstream weights_ofs(weights_path().c_str());
+-  weights_ofs.precision(15);
+-  std::ofstream mean_ofs(mean_path().c_str());
+-  mean_ofs.precision(15);
+-  std::ofstream scatter_ofs(scatter_path().c_str());
+-  scatter_ofs.precision(15);
+-
+-  pc_ofs << pc_;
+-  pc_ofs.close();
+-  weights_ofs << weights_;
+-  weights_ofs.close();
+-  mean_ofs << training_mean_;
+-  mean_ofs.close();
+-  scatter_ofs << scatter_;
+-  scatter_ofs.close();
+-}
+-
+-
+-#define BVPL_GLOBAL_PCA(feature_dim) \
+-template class bvpl_global_pca<feature_dim>;
+-
+-
+-#endif // bvpl_global_pca_hxx_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
+deleted file mode 100644
+index 40ca062045..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 11-Apr-2011
+-
+-#include "bvpl_global_taylor.h"
+-
+-template <>
+-boxm_apm_type bvpl_taylor_apm<double, 10>(){return VNL_DOUBLE_10;}
+-
+-template <>
+-boxm_apm_type bvpl_taylor_apm<float, 3>(){return VNL_FLOAT_3;}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
+deleted file mode 100644
+index 38c05600fb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
++++ /dev/null
+@@ -1,100 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
+-#ifndef bvpl_global_taylor_h
+-#define bvpl_global_taylor_h
+-//:
+-// \file
+-// \brief A class to compute taylor features across different boxm_scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  11-Apr-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <vbl/vbl_ref_count.h>
+-
+-//Forward declaration
+-class bvpl_global_corners;
+-
+-template <class T_data, unsigned DIM>
+-boxm_apm_type bvpl_taylor_apm();
+-
+-namespace bvpl_global_tylor_defaults
+-{
+-  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-;
+-}
+-
+-template<class T_data, unsigned DIM>
+-class bvpl_global_taylor : public vbl_ref_count
+-{
+- public:
+-
+-  //: Constructor  from xml file
+-  bvpl_global_taylor(const std::string &path, const std::string kernel_names[]);
+-
+-  //: Init auxiliary scenes and smallest cell length values
+-  void init();
+-
+-  //: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
+-  void compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Compute reconstruction error
+-  bool compute_approximation_error(int scene_id, int block_i, int block_j, int block_k);
+-
+-  //: Extract a particular coefficient scene
+-  void extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *coeff_scene);
+-
+-  //: Threshold non-salient features according to Harris' measure
+-  void threshold_corners(int scene_id, int block_i, int block_j, int block_k, double k);
+-
+-  //: Write to taylor_global_info.xml
+-  void xml_write();
+-
+-  // Accessors
+-  std::string path_out() const { return path_out_; }
+-  std::vector<std::string> scenes() const { return scenes_; }
+-  std::vector<std::string> aux_dirs() const { return aux_dirs_; }
+-  std::string aux_dirs( unsigned i ) const { return aux_dirs_[i]; }
+-  std::vector<double> cell_lengths() const { return finest_cell_length_; }
+-  //std::vector<bool> training_scenes() const { return training_scenes_; }
+-
+-  boxm_scene_base_sptr load_scene (int scene_id);
+-  boxm_scene_base_sptr load_error_scene (int scene_id);
+-  boxm_scene_base_sptr load_valid_scene (int scene_id);
+-  boxm_scene_base_sptr load_projection_scene (int scene_id);
+-
+-  std::string xml_path() { return path_out_ + "/taylor_global_info.xml"; }
+-
+-  friend class bvpl_global_corners;
+-
+- protected:
+-
+-  //: A vector to hold scene paths
+-  std::vector<std::string> scenes_;
+-  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
+-  std::vector<std::string> aux_dirs_;
+-  //: A vector to hold the finest cell length of the corresponding scene scene
+-  std::vector<double> finest_cell_length_;
+-  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
+-  //std::vector<bool> training_scenes_;
+-
+-  //: A vector to 2-degree taylor approximation kernels
+-  //  The order is I0, Ix, Iy, Iz, Ixx, Iyy, Izz, Ixy, Ixz, Iyz (therefore this class works for dimensions 1-10)
+-  bvpl_kernel_vector_sptr kernel_vector_;
+-
+-  //: Path to kernel files
+-  std::string kernels_path_;
+-  //: Path to xml info file
+-  std::string path_out_;
+-};
+-
+-#include <vbl/vbl_smart_ptr.h>
+-// This does not really seem like a good idea to me ... - PVr.
+-typedef vbl_smart_ptr<bvpl_global_taylor<double,10> > bvpl_global_taylor_sptr;
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
+deleted file mode 100644
+index d8bdd3f0e4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
++++ /dev/null
+@@ -1,645 +0,0 @@
+-#ifndef bvpl_global_taylor_hxx_
+-#define bvpl_global_taylor_hxx_
+-//:
+-// \file
+-#include "bvpl_global_taylor.h"
+-// \author Isabel Restrepo
+-// \date 11-Apr-2011
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <bxml/bxml_write.h>
+-#include <bxml/bxml_read.h>
+-#include <bxml/bxml_find.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <bvpl_octree/bvpl_corner_detector.h>
+-#include <bvpl_octree/bvpl_corner_functors.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <vnl/algo/vnl_matrix_inverse.h>
+-#include <vnl/vnl_double_3.h>
+-#include <vnl/vnl_double_3x3.h>
+-
+-//: Constructor  from xml file
+-template<class T_data, unsigned DIM>
+-bvpl_global_taylor<T_data, DIM>::bvpl_global_taylor(const std::string &path, const std::string kernel_names[])
+-{
+-  std::cout << "Loading taylor info from xml-file" << std::endl;
+-  path_out_ = path;
+-  std::ifstream xml_ifs(xml_path().c_str());
+-  if (!xml_ifs.is_open()) {
+-    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
+-    throw;
+-  }
+-  bxml_document doc = bxml_read(xml_ifs);
+-  bxml_element query("taylor_global_info");
+-  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
+-  if (!root) {
+-    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
+-    throw;
+-  }
+-
+-  //Parse scenes
+-  bxml_element scenes_query("scene");
+-  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
+-
+-  unsigned nscenes=scenes_data.size();
+-  std::cout << "Number of scenes: " << nscenes <<std::endl;
+-
+-  scenes_.clear();
+-  scenes_.resize(nscenes);
+-
+-  aux_dirs_.clear();
+-  aux_dirs_.resize(nscenes);
+-
+-  finest_cell_length_.clear();
+-  finest_cell_length_.resize(nscenes);
+-
+-  for (unsigned si = 0; si < nscenes; si++)
+-  {
+-    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
+-    int id = -1;
+-    scenes_elm->get_attribute("id", id);
+-    scenes_elm->get_attribute("path", scenes_[id]);
+-    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
+-    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
+-
+-    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
+-  }
+-
+-  //Parse kernels
+-  bxml_element kernels_query("kernels");
+-  bxml_data_sptr kernels_data = bxml_find_by_name(root, kernels_query);
+-  if (kernels_data)
+-  {
+-    bxml_element* kernels_elm = dynamic_cast<bxml_element*>(kernels_data.ptr());
+-
+-    kernels_elm->get_attribute("path", kernels_path_);
+-
+-    std::cout << "Kernels path is " << kernels_path_ << '\n';
+-    kernel_vector_ = new bvpl_kernel_vector;
+-
+-    if (vul_file::exists(kernels_path_) && vul_file::is_directory(kernels_path_)) {
+-      //read the kernels
+-
+-      kernel_vector_->kernels_.clear();
+-
+-      kernel_vector_->kernels_.resize(DIM, nullptr);
+-      //std::string kernel_names[]={"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz"};
+-      for (unsigned ki = 0; ki<DIM; ki++) {
+-        std::string filename = kernels_path_ + "/" + kernel_names[ki] + ".txt";
+-        std::cout << "Reading kernel file : " << filename << std::endl;
+-        bvpl_taylor_basis_factory factory(filename);
+-        bvpl_kernel_sptr kernel = new bvpl_kernel(factory.create());
+-        kernel_vector_->kernels_[ki] = kernel;
+-      }
+-    }
+-  }
+-  else {
+-    std::cerr << " In Gobal Taylor, path to kernels does not exist\n";
+-  }
+-}
+-
+-//: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
+-
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
+-  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  if (!(data_scene && proj_scene && valid_scene))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::sample_statistics: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_block_vector_operator block_oper;
+-  bvpl_algebraic_functor functor;
+-  block_oper.operate(*data_scene, functor, kernel_vector_, block_i, block_j, block_k, *proj_scene, *valid_scene, finest_cell_length_[scene_id]);
+-
+-  //clean memory
+-  data_scene->unload_active_blocks();
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-}
+-
+-template<class T_data, unsigned DIM>
+-bool bvpl_global_taylor<T_data, DIM>::compute_approximation_error(int scene_id, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
+-  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-
+-  //cast the scenes
+-  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
+-  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (proj_scene_base.as_pointer());
+-  boxm_scene<float_tree_type> * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  if (!data_scene || !basis_scene || !error_scene) {
+-    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
+-    return false;
+-  }
+-
+-  //load blocks of interest
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  basis_scene->load_block(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  error_tree->init_cells(-1.0f);
+-  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
+-
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
+-
+-  vgl_point_3d<int> min_point = kernel_vector_->min();
+-  vgl_point_3d<int> max_point = kernel_vector_->max();
+-  double cell_length = this->finest_cell_length_[scene_id];
+-  std::cout << "In computing taylor error, limits are: " <<min_point << " and " <<max_point <<std::endl;
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++)
+-  {
+-    //current cell is the center
+-    float_cell_type* data_cell = data_leaves[i];
+-    taylor_cell_type* basis_cell = basis_leaves[i];
+-
+-    boct_loc_code<short> data_code = data_cell->get_code();
+-    boct_loc_code<short> basis_code = basis_cell->get_code();
+-
+-    //check cells are at the same location
+-    if (! data_code.isequal(basis_code)) {
+-      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
+-               << "Data Code: " << data_code << '\n'
+-               << "Basis Code: " << basis_code << '\n';
+-
+-      return false;
+-    }
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length,
+-                                          centroid.y() + (double)min_point.y()*cell_length,
+-                                          centroid.z() + (double)min_point.z()*cell_length);
+-    if (! data_scene->locate_point_in_memory(min_point_global))
+-      continue;
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length,
+-                                          centroid.y() + (double)max_point.y()*cell_length,
+-                                          centroid.z() + (double)max_point.z()*cell_length);
+-    if (! data_scene->locate_point_in_memory(max_point_global))
+-      continue;
+-
+-    //assemble basis
+-//    double I0 = basis_cell->data().I0;
+-//    vnl_double_3 G= basis_cell->data().G;
+-//    vnl_double_3x3 H = basis_cell->data().H;
+-    vnl_vector_fixed<double,10> taylor_coeff = basis_cell->data();
+-
+-    //form basis
+-    double I0 = taylor_coeff[0];
+-    vnl_double_3 G(taylor_coeff[1], taylor_coeff[2], taylor_coeff[3]);
+-    vnl_double_3x3 H;
+-    H.put(0,0,taylor_coeff[4]);
+-    H.put(0,1,taylor_coeff[7]);
+-    H.put(0,2,taylor_coeff[8]);
+-    H.put(1,0,taylor_coeff[7]);
+-    H.put(1,1,taylor_coeff[5]);
+-    H.put(1,2,taylor_coeff[9]);
+-    H.put(2,0,taylor_coeff[8]);
+-    H.put(2,1,taylor_coeff[9]);
+-    H.put(2,2,taylor_coeff[6]);
+-
+-    double error = 0.0;
+-    for (int x = min_point.x(); x<= max_point.x(); x++) {
+-      for (int y = min_point.y(); y<=max_point.y(); y++) {
+-        for (int z = min_point.z(); z<=max_point.z(); z++) {
+-          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
+-          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
+-          if (this_cell) {
+-            vnl_double_3 X((double)x,(double)y, (double)z);
+-            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
+-            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
+-            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
+-            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
+-          }
+-        }
+-      }
+-    }
+-
+-    error_leaves[i]->set_data((float)error);
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
+-  error_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-  basis_scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-//: Threshold non-salient features according to Harris' measure
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::threshold_corners(int scene_id, int block_i, int block_j, int block_k, double harris_k)
+-{
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
+-
+-  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
+-  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
+-  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
+-
+-  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  boxm_scene<boct_tree<short, float> >* corner_scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  corner_scene->set_appearance_model(BOXM_FLOAT);
+-  corner_scene->set_paths(valid_scene->path(), "harris_scene");
+-  corner_scene->write_scene("/harris_scene.xml");
+-
+-  if (!( proj_scene && valid_scene && corner_scene ))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::threshold_corners: Could not cast input scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-
+-  //operate on scene
+-  bvpl_corner_detector corner_detector;
+-  bvpl_harris_laptev_functor harris_functor(harris_k);
+-
+-  vgl_point_3d<int> max_neigborhood_idx = kernel_vector_->max();
+-  vgl_point_3d<int> min_neigborhood_idx = kernel_vector_->min();
+-
+-  std::cout << "Neighborhood for harris threshhold: " << min_neigborhood_idx << " , " << max_neigborhood_idx << std::endl;
+-
+-  corner_detector.detect_and_threshold(proj_scene, harris_functor, min_neigborhood_idx, max_neigborhood_idx,
+-                                       block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
+-
+-  //clean memory
+-  proj_scene->unload_active_blocks();
+-  valid_scene->unload_active_blocks();
+-  corner_scene->unload_active_blocks();
+-}
+-
+-//: Init auxiliary scenes and smallest cell length values
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::init()
+-{
+-  for (unsigned i = 0; i < aux_dirs_.size(); i++)
+-  {
+-    boxm_scene_base_sptr data_scene_base = load_scene(i);
+-    boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-    if (!data_scene) {
+-      std::cerr << "Error in bvpl_global_taylor::init(): Could not cast data scene\n";
+-      return;
+-    }
+-    double finest_cell_length = data_scene->finest_cell_length();
+-    finest_cell_length_[i] = finest_cell_length;
+-
+-    if (!(vul_file::exists(aux_dirs_[i]) && vul_file::is_directory(aux_dirs_[i]))) {
+-      vul_file::make_directory(aux_dirs_[i]);
+-    }
+-
+-    {
+-      std::stringstream aux_scene_ss;
+-      aux_scene_ss << "valid_scene_" << i ;
+-      std::string aux_scene_path = aux_dirs_[i] + "/" + aux_scene_ss.str() + ".xml";
+-      if (!vul_file::exists(aux_scene_path)) {
+-        std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-        boxm_scene<boct_tree<short, bool> > *aux_scene =
+-        new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-        aux_scene->set_appearance_model(BOXM_BOOL);
+-        aux_scene->set_paths(aux_dirs_[i], aux_scene_ss.str());
+-        aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-      }
+-    }
+-
+-    {
+-      std::stringstream proj_scene_ss;
+-      proj_scene_ss << "proj_taylor_scene_" << i ;
+-      std::string proj_scene_path = aux_dirs_[i] + "/" + proj_scene_ss.str() + ".xml";
+-      if (!vul_file::exists(proj_scene_path)) {
+-        std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
+-        typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
+-        boxm_scene<taylor_tree_type > *proj_scene =
+-        new boxm_scene<taylor_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-        proj_scene->set_appearance_model(bvpl_taylor_apm<T_data,DIM>());
+-        proj_scene->set_paths(aux_dirs_[i], proj_scene_ss.str());
+-        proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
+-      }
+-    }
+-  }
+-
+-  xml_write();
+-}
+-
+-
+-//: Load scene info
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr scene_base = new boxm_scene_base();
+-  boxm_scene_parser scene_parser;
+-  scene_base->load_scene(scenes_[scene_id], scene_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
+-  if (scene_base->appearence_model() == BOXM_FLOAT) {
+-    scene->load_scene(scene_parser);
+-    scene_base = scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return scene_base;
+-}
+-
+-//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_valid_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return aux_scene_base;
+-}
+-
+-
+-//: Load auxiliary scene info
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_error_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>=(int)scenes_.size())
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-
+-  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
+-  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  if (!data_scene) {
+-    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
+-    return nullptr;
+-  }
+-
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << "error_taylor_scene_" << scene_id ;
+-  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
+-  if (!vul_file::exists(aux_scene_path)) {
+-    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
+-    boxm_scene<boct_tree<short, float> > *aux_scene =
+-    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-    aux_scene->set_appearance_model(BOXM_FLOAT);
+-    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
+-    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
+-  }
+-
+-  //load scene
+-  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
+-  boxm_scene_parser error_parser;
+-  std::stringstream error_scene_ss;
+-  error_scene_ss << aux_dirs_[scene_id] << "/error_taylor_scene_" << scene_id << ".xml";
+-  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
+-  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
+-    error_scene->load_scene(error_parser);
+-    error_scene_base = error_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return error_scene_base;
+-}
+-
+-
+-#if 0
+-//: Load auxiliary scene indicating if a cell is should be used for training
+-boxm_scene_base_sptr bvpl_global_taylor::load_train_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
+-    return NULL;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
+-  boxm_scene_parser aux_parser;
+-  std::stringstream aux_scene_ss;
+-  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
+-  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
+-
+-  //cast scene
+-  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
+-  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
+-    aux_scene->load_scene(aux_parser);
+-    aux_scene_base = aux_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
+-    return NULL;
+-  }
+-
+-  return aux_scene_base;
+-}
+-#endif
+-
+-
+-//: Load auxiliary scene info
+-template<class T_data, unsigned DIM>
+-boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_projection_scene (int scene_id)
+-{
+-  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
+-  {
+-    std::cerr << "Error in bvpl_global_taylor::load_projection_scene: Invalid scene id\n";
+-    return nullptr;
+-  }
+-  //load scene
+-  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
+-  boxm_scene_parser proj_parser;
+-  std::stringstream proj_scene_ss;
+-  proj_scene_ss << aux_dirs_[scene_id] << "/proj_taylor_scene_" << scene_id << ".xml";
+-  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
+-
+-  //cast scene
+-  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
+-  boxm_scene<taylor_tree_type > *proj_scene= new boxm_scene<taylor_tree_type >();
+-  if (proj_scene_base->appearence_model() == bvpl_taylor_apm<T_data,DIM>()) {
+-    proj_scene->load_scene(proj_parser);
+-    proj_scene_base = proj_scene;
+-  }
+-  else {
+-    std::cerr << "Error in bvpl_global_taylor::load_proj_scene: Invalid appearance model\n";
+-    return nullptr;
+-  }
+-
+-  return proj_scene_base;
+-}
+-
+-//: Write this class to xml file
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::xml_write()
+-{
+-  bxml_document doc;
+-  bxml_element *root = new bxml_element("taylor_global_info");
+-  doc.set_root_element(root);
+-  root->append_text("\n");
+-
+-  //write the scenes
+-  for (unsigned i =0; i<scenes_.size(); i++)
+-  {
+-    bxml_element* scenes_elm = new bxml_element("scene");
+-    scenes_elm->append_text("\n");
+-    scenes_elm->set_attribute("id", i);
+-    scenes_elm->set_attribute("path", scenes_[i]);
+-    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
+-    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
+-    root->append_data(scenes_elm);
+-    root->append_text("\n");
+-  }
+-
+-  //write path to kernels
+-  bxml_element* kernel_elm = new bxml_element("kernels");
+-  kernel_elm->append_text("\n");
+-  kernel_elm->set_attribute("path", kernels_path_);
+-  root->append_data(kernel_elm);
+-  root->append_text("\n");
+-
+-  //write to disk
+-  std::ofstream os(xml_path().c_str());
+-  bxml_write(os, doc);
+-  os.close();
+-}
+-
+-
+-//: Extract a particular coefficient scene
+-template<class T_data, unsigned DIM>
+-void bvpl_global_taylor<T_data, DIM>::extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *float_scene)
+-{
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree_cell<short, float> float_cell_type;
+-
+-  typedef boct_tree<short,vnl_vector_fixed<double,10> > projection_tree_type;
+-  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > projection_cell_type;
+-  std::vector<vnl_vector_fixed<double,10> > projections;
+-
+-  boxm_scene_base_sptr projection_scene_base = load_projection_scene(scene_id);
+-
+-  boxm_scene<projection_tree_type>* projection_scene = dynamic_cast<boxm_scene<projection_tree_type>* >(projection_scene_base.as_pointer());
+-
+-  if (!(projection_scene && float_scene))
+-  {
+-    std::cerr << "Error in bof_util::random_label_for_training: Could not cast scenes\n";
+-    return;
+-  }
+-
+-  //init variables
+-  projection_scene->unload_active_blocks();
+-  float_scene->unload_active_blocks();
+-
+-  //get the cells for these blocks
+-  boxm_block_iterator<projection_tree_type> it = projection_scene->iterator();
+-  for (it.begin(); !it.end(); ++it)
+-  {
+-    if (!(projection_scene->valid_index(it.index()) && float_scene->valid_index(it.index()))) {
+-      std::cerr << "In bof_util::random_label_for_training: invalid block\n";
+-      return;
+-    }
+-
+-    projection_scene->load_block(it.index());
+-    float_scene->load_block(it.index());
+-
+-    //get the trees
+-    projection_tree_type* projection_tree = projection_scene->get_block(it.index())->get_tree();
+-    float_tree_type* float_tree = projection_tree->clone_to_type<float>();
+-
+-    //get leaf cells
+-    std::vector<projection_cell_type *> projection_leaves = projection_tree->leaf_cells();
+-    std::vector<float_cell_type *> float_leaves = float_tree->leaf_cells();
+-
+-    unsigned int tree_ncells = projection_leaves.size();
+-
+-    for (unsigned int i =0; i<tree_ncells; ++i)
+-    {
+-      float_leaves[i]->set_data(float(projection_leaves[i]->data()[coefficient_id]));
+-    }
+-    float_scene->get_block(it.index())->init_tree(float_tree);
+-    float_scene->write_active_block();
+-  }
+-
+-  //release memory
+-  projection_scene->unload_active_blocks();
+-  float_scene->unload_active_blocks();
+-}
+-
+-
+-#define BVPL_GLOBAL_TAYLOR_INSTANTIATE(T1,T2) \
+-template class bvpl_global_taylor<T1,T2 >
+-
+-#endif // bvpl_global_taylor_hxx_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
+deleted file mode 100644
+index 6d3206a9c5..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
++++ /dev/null
+@@ -1,142 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
+-#ifndef bvpl_octree_kernel_operator_h
+-#define bvpl_octree_kernel_operator_h
+-//:
+-// \file
+-// \brief A class that operates a bvpl_kernel on an octree or boxm scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 13, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<class T_data>
+-class bvpl_octree_kernel_operator
+-{
+- public:
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  //Constructor from a bvpl functor
+-  bvpl_octree_kernel_operator(tree_type* tree_in): tree_in_(tree_in){}
+-
+-  // "Convolves" kernel with class tree, storing the output in an output octree.
+-  template<class F>
+-  void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
+-  {
+-    // get all (leaf) cells at given scale
+-    std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
+-    std::vector<cell_type* > out_cells = out_tree->leaf_cells_at_level(level);
+-
+-    bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-    // iterate, through all cells
+-    for (unsigned i = 0; i <  cells.size();i++)
+-    {
+-      // iterate through vector and compute result
+-      cell_type* center_cell = cells[i];
+-
+-      if (center_cell->level()!=level)
+-        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
+-
+-      if (!center_cell->is_leaf())
+-        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a leaf\n";
+-
+-      vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
+-
+-      // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
+-
+-      kernel_iter.begin(); // reset the kernel iterator
+-      while (!kernel_iter.isDone())
+-      {
+-        vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-        vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
+-                                           this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
+-                                           this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
+-
+-        cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
+-
+-        if (this_cell) {
+-          bvpl_kernel_dispatch d = *kernel_iter;
+-          T_data val = this_cell->data();
+-          functor.apply(val, d);
+-        }
+-        else
+-          break;
+-        ++kernel_iter;
+-      }
+-
+-      out_cells[i]->set_data(functor.result());
+-    }
+-  }
+-
+-  // "Convolves" kernel with class tree, storing the output in an output octree.
+-  template<class F>
+-  void operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length);
+-
+- private:
+-  tree_type * tree_in_;
+-};
+-
+-template <class T_data> template <class F>
+-void bvpl_octree_kernel_operator<T_data>::operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length)
+-{
+-  // get all (leaf) cells at given scale/tree level
+-  std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
+-
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  // iterate, through all cells
+-  for (unsigned i = 0; i <  cells.size();i++)
+-  {
+-    // iterate through vector and compute result
+-    cell_type* center_cell = cells[i];
+-
+-    if (center_cell->level()!=level)
+-      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
+-
+-    if (!center_cell->is_leaf())
+-      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a not a leaf\n";
+-
+-    vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
+-
+-    // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
+-                                         this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
+-                                         this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
+-
+-      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
+-
+-      if (this_cell) {
+-        bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val, d);
+-      }
+-      else
+-        break;
+-      ++kernel_iter;
+-    }
+-
+-    center_cell->set_data(functor.result());
+-  }
+-
+-}
+-
+-#endif // bvpl_octree_kernel_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
+deleted file mode 100644
+index be5efb6238..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
++++ /dev/null
+@@ -1,78 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
+-#ifndef bvpl_octree_neighbors_h
+-#define bvpl_octree_neighbors_h
+-//:
+-// \file
+-// \brief  A class that operates a bvpl_kernel on an octree or boxm scene to find all the neighbor cells that correspond to that kernel, and returns a list of pointers to those neighbors
+-// \author Gamze Tunali Gamze_Tunali@brown.edu
+-// \date   March 18, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boct/boct_tree.h>
+-#include <boxm/boxm_scene.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-template<class T_data>
+-class bvpl_octree_neighbors
+-{
+- public:
+-  typedef boct_tree<short, T_data> tree_type;
+-  typedef boct_tree_cell<short,T_data> cell_type;
+-
+-  //Constructor from a bvpl functor
+-  bvpl_octree_neighbors(tree_type* tree_in): tree_in_(tree_in){}
+-
+-  // "Convolves" kernel with class tree, storing the output in an output octree.
+-  void neighbors(bvpl_kernel_sptr kernel, cell_type* cell,
+-                 std::vector<cell_type *>& neighb_cells)
+-  {
+-    bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-    short level = cell->level();
+-    double cell_length = tree_in_->cell_length(cell);
+-    // iterate through vector and find the neighbors
+-    vgl_point_3d<double> cell_origin = tree_in_->local_origin(cell);
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-      vgl_point_3d<double> this_cell_idx(cell_origin.x() + (double)kernel_idx.x()*cell_length,
+-                                         cell_origin.y() + (double)kernel_idx.y()*cell_length,
+-                                         cell_origin.z() + (double)kernel_idx.z()*cell_length);
+-
+-      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
+-      if (this_cell) {
+-        // check if this cell is an internal node, if so get the children
+-        if (!this_cell->is_leaf()) {
+-          std::vector<cell_type *> children;
+-          this_cell->leaf_children(children);
+-          neighb_cells.insert(neighb_cells.end(), children.begin(), children.end());
+-        }
+-        else {
+-          // make sure that the same cell is not added more than once
+-          bool found=false;
+-          for (unsigned i=0; i<neighb_cells.size(); i++) {
+-            if (neighb_cells[i] == this_cell)
+-              found=true;
+-          }
+-          if (!found)
+-            neighb_cells.push_back(this_cell);
+-        }
+-      }
+-      ++kernel_iter;
+-    }
+-  }
+-
+- private:
+-  tree_type * tree_in_;
+-};
+-
+-#endif // bvpl_octree_neighbors_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
+deleted file mode 100644
+index c5067b597e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
++++ /dev/null
+@@ -1,84 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
+-#ifndef bvpl_octree_vector_operator_h
+-#define bvpl_octree_vector_operator_h
+-//:
+-// \file
+-// \brief An abstract class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 17, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include "bvpl_octree_kernel_operator.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/functors/bvpl_local_max_functor.h>
+-#include <boct/boct_tree.h>
+-
+-
+-//: A class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
+-//  The class also contains abstract methods to be specialized in the subclasses
+-template <class T_data>
+-class bvpl_octree_vector_operator
+-{
+- public:
+-
+-  //: Applies a vector of kernels and functor to a grid. Returns a grid that combines the responses of the kernels as specified in the subclass
+-  template <class F>
+-  bool operate(boct_tree<short ,T_data>* tree_in,
+-               F functor,
+-               bvpl_kernel_vector_sptr kernel_vector,
+-               boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
+-               short level, double cell_length)
+-  {
+-    bvpl_local_max_functor<T_data> func_max;
+-    boct_tree<short ,T_data>* temp_tree = tree_in->clone();
+-    bvpl_octree_kernel_operator<T_data> oper(tree_in);
+-    for (unsigned int id = 0; id < kernel_vector->kernels_.size(); ++id)
+-    {
+-      temp_tree->init_cells(func_max.min_response());
+-      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
+-      oper.operate(functor, kernel, temp_tree,level, cell_length);
+-      combine_kernel_responses(tree_out, temp_tree, id);
+-    }
+-
+-    return true;
+-  }
+-
+- protected:
+-  //: Abstract function to be implemented on children on how to combine current kernel response with output response
+-
+-  virtual void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
+-                                        int id_curr)=0;
+-
+-  //: Compares response grids and stores in out, the maximum responses. This function gets called in subclasses when implementing combine_kernel_responses
+-
+-  void keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* new_tree,
+-                              int new_id);
+-};
+-
+-
+-//: Compares response grids and stores in grid1, the wining responses.
+-template<class T_data>
+-void bvpl_octree_vector_operator<T_data>::keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
+-                                                                 boct_tree<short ,T_data>* new_tree,
+-                                                                 int new_id)
+-{
+-  bvpl_local_max_functor<T_data> func_max;
+-
+-  std::vector<boct_tree_cell<short,T_data>*> new_leaves = new_tree->leaf_cells();
+-  std::vector<boct_tree_cell<short,bvpl_octree_sample<T_data> >*> leaves_out = tree_out->leaf_cells();
+-
+-  for (unsigned i=0; i< new_leaves.size(); i++)
+-  {
+-    T_data val1 = new_leaves[i]->data();
+-    T_data val2 = leaves_out[i]->data().response_;
+-    if (func_max.greater_than(val1, val2))
+-      leaves_out[i]->set_data(bvpl_octree_sample<T_data>(new_leaves[i]->data(), new_id));
+-  }
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
+deleted file mode 100644
+index e01a23ca65..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
+-#ifndef bvpl_octree_vector_operator_impl_h
+-#define bvpl_octree_vector_operator_impl_h
+-//:
+-// \file
+-// \brief Subclasses that implement the abstract interface of bvpl_octree_vector_operator. They can be used to queue operations
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 30, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include "bvpl_octree_vector_operator.h"
+-
+-
+-//: Class to apply a vector of kernels and functor to a grid, returning a grid containing at each voxel the max response
+-template <class T_data>
+-class bvpl_max_vector_operator: public bvpl_octree_vector_operator<T_data>
+-{
+- public:
+-  void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample <T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
+-                                        int id_curr) override
+-  {
+-    this->keep_max_response_tree(tree_out, tree_curr, id_curr);
+-  }
+-};
+-
+-#endif // bvpl_octree_vector_operator_impl_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
+deleted file mode 100644
+index ec024dfe41..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
++++ /dev/null
+@@ -1,84 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
+-#ifndef bvpl_octree_vrml_util_h
+-#define bvpl_octree_vrml_util_h
+-//:
+-// \file
+-// \brief VRML utilities for scenes with bvpl_octree samples
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  December 10,  2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bvrml/bvrml_write.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class bvpl_octree_vrml_util
+-{
+- public:
+-   //: Writes direction of kernel and magnitude of the response as disks of different sizes
+-  template<class T_data>
+-  static void write_scene_as_disks(std::ofstream &vrml_os,
+-                                   boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > >  *scene,
+-                                   bvpl_kernel_vector_sptr kernel_vector);
+-};
+-
+-template<class T_data>
+-void bvpl_octree_vrml_util::write_scene_as_disks(std::ofstream &vrml_os,
+-                                                 boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > > *scene,
+-                                                 bvpl_kernel_vector_sptr kernel_vector)
+-{
+-  typedef boct_tree<short, bvpl_octree_sample<T_data> > tree_type;
+-  typedef boct_tree_cell<short, bvpl_octree_sample<T_data> > cell_type;
+-
+-  bvrml_write::write_vrml_header(vrml_os);
+-
+-  // iterate through the scene
+-  boxm_block_iterator<tree_type > iter= scene->iterator();
+-  iter.begin();
+-
+-  for (; !iter.end(); iter++)
+-  {
+-    scene->load_block(iter.index());
+-    tree_type  *tree = (*iter)->get_tree();
+-
+-    // iterate through the tree
+-    std::vector<cell_type*> cells = tree->leaf_cells();
+-    unsigned lines = 0;
+-    float max_response =bvpl_cell_to_float(cells[0]);
+-    for (unsigned i = 0; i < cells.size(); i+=10)
+-    {
+-      int id = cells[i]->data().id_;
+-      if (id < 0)
+-        continue;
+-      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
+-      float response = bvpl_cell_to_float(cells[i]);
+-      if (response > max_response) {
+-        max_response = response;
+-      }
+-      std::cout << "response " << response << std::endl;
+-      vgl_vector_3d<double> dir((kernel->axis())[0],(kernel->axis())[1],(kernel->axis())[2]);
+-      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
+-      if (response > 3.5f) {
+-        bvrml_write::write_vrml_line(vrml_os, coord, dir, .1f*response, 1, 0, 0);
+-        lines++;
+-      }
+-#ifdef DEBUG
+-      bvrml_write::write_vrml_disk(vrml_os, coord, dir, 2*response-.5f, 0, .5f, 0);
+-#endif
+-    }
+-    std::cout << "max response " << max_response << std::endl
+-             << "number of lines: " << lines << std::endl;
+-  }
+-}
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
+deleted file mode 100644
+index 1d72f41d58..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 18-Feb-2011
+-
+-#include <iostream>
+-#include <sstream>
+-#include "bvpl_pca_error_scenes.h"
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <vul/vul_file.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-bvpl_pca_error_scenes::bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& pca_path, unsigned dim)
+-{
+-  typedef boct_tree<short,float> tree_type;
+-  for (unsigned i =0; i<dim+1; i++)
+-    scenes_.push_back(new boxm_scene_base());
+-
+-  auto* data_scene= dynamic_cast<boxm_scene<tree_type>* > (data_scene_base.as_pointer());
+-  if (!data_scene)
+-    std::cerr << "In bvpl_pca_error_scenes: Null Scene\n";
+-
+-  for (unsigned i = 0; i<dim+1; i++)
+-  {
+-    //path to error scenes
+-    std::stringstream error_path_ss;
+-    error_path_ss << pca_path << "/error_" << i;
+-    std::string error_path = error_path_ss.str();
+-    if (!vul_file::is_directory(error_path))
+-      vul_file::make_directory(error_path);
+-
+-    boxm_scene<tree_type> *error_scene =
+-    new boxm_scene<tree_type>(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
+-    error_scene->set_appearance_model(BOXM_FLOAT);
+-
+-    std::string scene_name = "error_scene";
+-    error_scene->set_paths(error_path, scene_name);
+-
+-    if (!vul_file::exists(error_path + "/" + scene_name +  ".xml"))
+-      error_scene->write_scene("/" +scene_name +  ".xml");
+-
+-    //data_scene->clone_blocks(*error_scene, -1.0);
+-
+-    scenes_[i] = error_scene;
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
+deleted file mode 100644
+index a50c851c2f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
++++ /dev/null
+@@ -1,39 +0,0 @@
+-// This is bvpl_pca_error_scenes.h
+-#ifndef bvpl_pca_error_scenes_h
+-#define bvpl_pca_error_scenes_h
+-
+-//:
+-// \file
+-// \brief A class to hold the smartpointers to pca error scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-// Forward declarations
+-class bvpl_pca_error_scenes;
+-
+-typedef vbl_smart_ptr<bvpl_pca_error_scenes> bvpl_pca_error_scenes_sptr;
+-
+-//: A class to hold the smartpointers to response scenes and their corresponding names
+-class bvpl_pca_error_scenes : public vbl_ref_count
+-{
+-public:
+-
+-  bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& taylor_path, unsigned dim);
+-
+-  //: Return the error scene associated with a number of components used for reconstruction
+-  boxm_scene_base_sptr get_scene(unsigned ncomponent) {return scenes_[ncomponent];}
+-
+-private:
+-  std::vector<boxm_scene_base_sptr> scenes_;
+-
+-};
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
+deleted file mode 100644
+index 2217b22966..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
++++ /dev/null
+@@ -1,213 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
+-#ifndef bvpl_scene_kernel_operator_h
+-#define bvpl_scene_kernel_operator_h
+-//:
+-// \file
+-// \brief A class that operates a bvpl_kernel on a boxm_scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 18, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <boxm/boxm_scene.h>
+-#include "bvpl_octree_kernel_operator.h"
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class bvpl_scene_kernel_operator
+-{
+- public:
+-  //: "Convolves" kernel with an input octree, storing the output in an output octree.
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-               F functor,
+-               bvpl_kernel_sptr kernel,
+-               boxm_scene<boct_tree<short, T_data > > &scene_out);
+-
+-  //: Performs in-situ non-maxima suppression over the area occupied by the kernel
+-  template<class T_data, class F>
+-  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                    F functor,
+-                                    bvpl_kernel_sptr kernel);
+-
+-#if 0 //Depracated
+-  // "Convolves" kernel with an input octree, storing the output in an output octree.
+-  template<class T_data, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-               F functor,
+-               bvpl_kernel_sptr kernel,
+-               boxm_scene<boct_tree<short, T_data > > &scene_out,
+-               short level)
+-  {
+-    typedef boct_tree<short, T_data > tree_type;
+-    boxm_block_iterator<tree_type> iter_in = scene_in.iterator();
+-    boxm_block_iterator<tree_type> iter_out = scene_out.iterator();
+-    iter_in.begin();
+-    iter_out.begin();
+-    for (; !iter_in.end(); iter_in++, iter_out++) {
+-      //Isa: change to load block and neighbors
+-      scene_in.load_block(iter_in.index());
+-      scene_out.load_block(iter_out.index());
+-      tree_type *tree_in= (*iter_in)->get_tree();
+-      tree_type *tree_out = tree_in->clone();
+-
+-      // output tree has the same shape but is initialized to have response zero
+-      T_data zero_val = T_data();
+-      std::cout << "Response tree is initialized to: " << zero_val << std::endl;
+-      tree_out->init_cells(zero_val);
+-
+-      bvpl_octree_kernel_operator<T_data> oper(tree_in);
+-      double cell_length = 1.0/(double)(1<<(tree_in->root_level() -level));
+-      oper.operate(functor, kernel, tree_out, level, cell_length);
+-      (*iter_out)->init_tree(tree_out);
+-      scene_out.write_active_block();
+-    }
+-  }
+-#endif
+-};
+-
+-//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data, class F>
+-void bvpl_scene_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_sptr kernel,
+-                                         boxm_scene<boct_tree<short, T_data > > &scene_out)
+-{
+-  double cell_length = kernel->voxel_length();
+-  short finest_level = scene_in.finest_level();
+-  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
+-
+-  scene_in.clone_blocks(scene_out, T_data());
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, T_data > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block);
+-  out_iter.begin();
+-
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  while ( !(iterator.end() || out_iter.end()) )
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *iterator;
+-    boct_tree_cell<short,T_data> *out_center_cell = *out_iter;
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
+-      std::cerr << " Input and output cells don't have the same structure\n";
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    //we are only interested in finest resolution
+-    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()){
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    vgl_point_3d<double> center_cell_origin = iterator.global_origin();
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> kernel_cell_origin(center_cell_origin.x() + (double)kernel_idx.x()*cell_length + 1.0e-7,
+-                                              center_cell_origin.y() + (double)kernel_idx.y()*cell_length + 1.0e-7,
+-                                              center_cell_origin.z() + (double)kernel_idx.z()*cell_length + 1.0e-7);
+-
+-      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_origin);
+-
+-      if (this_cell) {
+-        bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val, d);
+-      }
+-      else {
+-        break;
+-      }
+-
+-      ++kernel_iter;
+-    }
+-
+-    out_center_cell->set_data(functor.result());
+-    ++iterator;
+-    ++out_iter;
+-  }
+-}
+-
+-//: Applies non-maxima suppression on the region occupied by the kernel. The output is stored in situ.
+-//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data, class F>
+-void bvpl_scene_kernel_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                                              F functor,
+-                                                              bvpl_kernel_sptr kernel)
+-{
+-  short finest_level = scene_in.finest_level();
+-  double cell_length = kernel->voxel_length();
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-
+-  while ( !(iterator.end()) )
+-  {
+-    boct_tree_cell<short,T_data> *center_cell = *iterator;
+-
+-    //we are only interested in finest resolution
+-    if (!center_cell->level() == finest_level || !center_cell->is_leaf()){
+-      ++iterator;
+-      continue;
+-    }
+-    T_data this_data = center_cell->data();
+-
+-    //vgl_point_3d<double> center_cell_origin = iterator.global_origin();
+-    vgl_point_3d<double> center_cell_center = this_data.location();
+-    if (!functor.init(this_data)){
+-      ++iterator;
+-      continue;
+-    }
+-
+-    kernel_iter.begin(); // reset the kernel iterator
+-    while (!kernel_iter.isDone())
+-    {
+-      vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-      vgl_point_3d<double> kernel_cell_center(center_cell_center.x() + (double)kernel_idx.x()*cell_length,
+-                                              center_cell_center.y() + (double)kernel_idx.y()*cell_length,
+-                                              center_cell_center.z() + (double)kernel_idx.z()*cell_length);
+-
+-      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_center);
+-
+-      if (this_cell) {
+-        //bvpl_kernel_dispatch d = *kernel_iter;
+-        T_data val = this_cell->data();
+-        functor.apply(val);
+-      }
+-      else {
+-        break;
+-      }
+-
+-      ++kernel_iter;
+-    }
+-
+-    center_cell->set_data(functor.result());
+-    ++iterator;
+-  }
+-}
+-
+-#endif // bvpl_scene_kernel_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
+deleted file mode 100644
+index c6fabe14e2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include "bvpl_scene_neighborhood_operator.h"
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
+deleted file mode 100644
+index 5f8e43f92f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
++++ /dev/null
+@@ -1,97 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
+-#ifndef bvpl_scene_neighborhood_operator_h
+-#define bvpl_scene_neighborhood_operator_h
+-//:
+-// \file
+-// \brief A class to perform neighborhood operations on a boxm_scene.
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  13-Aug-2010.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <vgl/vgl_box_3d.h>
+-
+-//: A class to perform neighborhood operations on a bvxm_scene.
+-// This class operates on all leaf cells within a region
+-class bvpl_scene_neighborhood_operator
+-{
+- public:
+-  bvpl_scene_neighborhood_operator()= default;
+-
+-  //: Applies the region-based functor on every leaf cell of the scene. The output is stored on a separate scene
+-  template <class T_data_in, class T_data_out, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data_in > > *scene_in,
+-               F functor,
+-               vgl_box_3d<double> roi,
+-               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
+-
+-  //: Applies the region-based functor on every leaf cell of the scene. The region is obtained from scen2.
+-  //  The output is stored on a separate scene
+-  template <class T_data_in1, class T_data_in2, class T_data_out, class F>
+-  void operate(boxm_scene<boct_tree<short, T_data_in1 > > *scene_in1,
+-               boxm_scene<boct_tree<short, T_data_in2 > > *scene_in2,
+-               F functor,
+-               vgl_box_3d<double> roi,
+-               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
+-
+-  //: Applies a non-maxima suppression functor on every leaf cell of the scene. The output is stored in situ
+-  template <class T_data, class F>
+-  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                    F functor,
+-                                    vgl_box_3d<double> &roi);
+-};
+-
+-
+-//: Applies the region-based functor on every leaf cell of the scene. The output is stored in situ. The ROI must be in scene-coordinates
+-//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template <class T_data, class F>
+-void bvpl_scene_neighborhood_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
+-                                                                    F functor,vgl_box_3d<double> &roi)
+-{
+-  short finest_level = scene_in.finest_level();
+-
+-  //(1) Traverse the scene
+-  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block_and_neighbors);
+-
+-  iterator.begin();
+-
+-  while (!iterator.end())
+-  {
+-    boct_tree_cell<short,T_data> *cell = *iterator;
+-    if ((!(cell->level() == finest_level)) || !cell->is_leaf()){
+-      ++iterator;
+-      continue;
+-    }
+-    // the region is located with subvoxel accuracy so datastructure should contain subvoxel localization
+-    roi.set_centroid((cell->data()).location());
+-
+-    T_data this_data= cell->data();
+-    functor.init(this_data, roi);
+-
+-    // get all cells that intersect a region
+-    std::vector<boct_tree_cell<short, T_data>* > cells_in_roi;
+-
+-    //Return all cells that intersec the region
+-    scene_in.leaves_in_region(roi,cells_in_roi);
+-
+-    for (unsigned i = 0; i<cells_in_roi.size(); i++)
+-    {
+-      boct_tree_cell<short, T_data> *this_cell = cells_in_roi[i];
+-      if (!this_cell)
+-        continue;
+-      T_data val = this_cell->data();
+-      functor.apply(val);
+-    }
+-
+-    cell->set_data(functor.result());
+-    ++iterator;
+-  }
+-}
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
+deleted file mode 100644
+index 5f43040cc0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 22-Sep-2010
+-
+-#include "bvpl_scene_statistics.h"
+-
+-
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
+-
+-  scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
+-  std::vector<float_cell_type*> leaves = tree->leaf_cells();
+-
+-  int tree_ncells = leaves.size();
+-  //unsigned long tree_nsamples = (tree_ncells/scene_ncells)*(float)nsamples_;
+-
+-  double avg_val = 0.0;
+-  vnl_random rng(9667566ul);
+-  for (unsigned i=0; i<tree_nsamples; i++)
+-  {
+-    unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-    boct_tree_cell<short, float> *center_cell = leaves[sample];
+-    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if ((double)center_cell->data()< -0.5) {
+-      i--;
+-      continue;
+-    }
+-    else {
+-      avg_val+=(double)center_cell->data();
+-    }
+-  }
+-
+-  return avg_val/tree_nsamples;
+-}
+-
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
+-  if (!scene) {
+-    std::cerr << "Error in bvpl_average_value: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
+-  std::vector<float_cell_type*> leaves = tree->leaf_cells();
+-
+-  double actual_samples = 0.0;
+-  double avg_val = 0.0;
+-  for (auto center_cell : leaves)
+-  {
+-    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if ((double)center_cell->data()< -0.5) {
+-      continue;
+-    }
+-    else {
+-      avg_val+=(double)center_cell->data();
+-      actual_samples = actual_samples +1.0;
+-    }
+-  }
+-
+-  std::cout << "Adding errors of : " << actual_samples << " samples" << std::endl;
+-
+-  return avg_val/actual_samples;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
+deleted file mode 100644
+index f14813bc74..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
++++ /dev/null
+@@ -1,102 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
+-#ifndef bvpl_scene_statistics_h
+-#define bvpl_scene_statistics_h
+-//:
+-// \file
+-// \brief A set of functions to provide statistics about response scenes
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  22-Sep-2010.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bsta/bsta_histogram.h>
+-#include <boxm/boxm_scene.h>
+-
+-template <unsigned DIM>
+-bool bvpl_compute_scene_statistics(boxm_scene< boct_tree<short, vnl_vector_fixed<float,DIM> > > *scene, bsta_histogram<float> &response_hist )
+-{
+-  typedef boct_tree<short, vnl_vector_fixed<float,DIM> > tree_type;
+-
+-  //(1) Traverse the leaves of the scene
+-  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
+-
+-  iterator.begin();
+-  float cell_count = 0;
+-  float max = (*iterator)->data().magnitude();
+-  float min = max;
+-  float mag = max;
+-  while (!iterator.end()) {
+-    cell_count++;
+-    mag = (*iterator)->data().magnitude();
+-    if ( mag > max)  max = mag;
+-    if ( mag < min)  min = mag;
+-    ++iterator;
+-  }
+-
+-  unsigned int nbins = (unsigned int)std::floor(std::sqrt(cell_count));
+-  response_hist = bsta_histogram<float>(min, max, nbins);
+-
+-  iterator.begin();
+-
+-  while (!iterator.end()) {
+-    response_hist.upcount(static_cast<float>((*iterator)->data().magnitude()), 1.0f);
+-    ++iterator;
+-  }
+-
+-  scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-template <class T_loc, class T_data>
+-bool bvpl_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist, unsigned int nbins = 0 )
+-                                   //, bsta_histogram<float>& level_hist, unsigned& n_leaves)
+-{
+-  typedef boct_tree<T_loc, T_data> tree_type;
+-  typedef boct_tree_cell<T_loc,T_data> cell_type;
+-
+-  //(1) Traverse the leaves of the scene
+-  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
+-
+-  iterator.begin();
+-  float cell_count = 0;
+-  T_data max = (*iterator)->data();
+-  T_data min = max;
+-  T_data this_val = max;
+-  while (!iterator.end()) {
+-    cell_count++;
+-    this_val = (*iterator)->data();
+-    if ( this_val > max)  max = this_val;
+-    if ( this_val < min)  min = this_val;
+-    ++iterator;
+-  }
+-
+-  if (nbins == 0)
+-    nbins = (unsigned int)std::floor(std::sqrt(cell_count));
+-  response_hist = bsta_histogram<float>(min, max, nbins);
+-  scene->unload_active_blocks();
+-  iterator.begin();
+-  while (!iterator.end()) {
+-    response_hist.upcount(static_cast<T_data>((*iterator)->data()), 1.0f);
+-    ++iterator;
+-  }
+-
+-  scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-//: Function that compute average value of a fraction of samples in the specified block.
+-//  Datatype is assumed to be float, but if could be templated to expand to other types
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples);
+-
+-//: Function that compute average value of all positive samples in the specified block.
+-//  Datatype is assumed to be float, but if could be templated to expand to other types
+-double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k);
+-
+-
+-#endif // bvpl_scene_statistics_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
+deleted file mode 100644
+index 49e7066a5c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
++++ /dev/null
+@@ -1,178 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
+-#ifndef bvpl_scene_vector_operator_h
+-#define bvpl_scene_vector_operator_h
+-//:
+-// \file
+-// \brief  A class that applies a vector of bvpl_kernels on a boxm_scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  November 30, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/functors/bvpl_local_max_functor.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <vnl/vnl_vector_fixed.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-class bvpl_scene_vector_operator
+-{
+- public:
+-
+-  //: "Convolves" a vector of kernel with an input octree, storing the output in an output octree.
+-  //  The shape of the output is determined by a templated function
+-  //  This function only iterate through leaf_cells at level 0;
+-  template<class T_data_in, class T_data_out, class F >
+-  void operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
+-               F functor,
+-               bvpl_kernel_vector_sptr kernel_vector,
+-               boxm_scene<boct_tree<short, T_data_out > > &scene_out);
+-
+- protected:
+-
+-  //:Function incharged of combining results
+-  template<class T_data>
+-  void combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out);
+-
+-  //:Function incharged of combining results
+-  template<class T_data>
+-  void combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out);
+-};
+-
+-
+-//: Operates a vector of kernels on a scene by : (1)Traversing input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
+-template<class T_data_in, class T_data_out,class F >
+-void bvpl_scene_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
+-                                         F functor,
+-                                         bvpl_kernel_vector_sptr kernel_vector,
+-                                         boxm_scene<boct_tree<short, T_data_out > > &scene_out)
+-{
+-  short finest_level = scene_in.finest_level();
+-  // CAUTION: kernel is run at finest resolution, but this may not always be desired
+-  double cell_length = scene_in.finest_cell_length();
+-
+-  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
+-
+-  T_data_out zero;
+-  scene_in.template clone_blocks_to_type<boct_tree<short, T_data_out > >(scene_out, zero);
+-  std::cout << "The initial zero-value for all cells is : " << zero << std::endl;
+-
+-  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
+-  boxm_cell_iterator<boct_tree<short, T_data_in > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data_in > >::load_block_and_neighbors);
+-  iterator.begin();
+-
+-  boxm_cell_iterator<boct_tree<short, T_data_out > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data_out > >::load_block);
+-  out_iter.begin();
+-
+-  while ( !(iterator.end() || out_iter.end()) )
+-  {
+-    boct_tree_cell<short,T_data_in> *center_cell = *iterator;
+-    boct_tree_cell<short,T_data_out> *out_center_cell = *out_iter;
+-    boct_loc_code<short> out_code = out_center_cell->get_code();
+-    boct_loc_code<short> in_code = center_cell->get_code();
+-
+-    //if level and location code of cells isn't the same then continue
+-    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
+-      std::cerr << " Input and output cells don't have the same structure " << std::endl;
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    //we are only interested in finest resolution
+-    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()) {
+-      ++iterator;
+-      ++out_iter;
+-      continue;
+-    }
+-
+-    vgl_point_3d<double> center_cell_centroid = iterator.global_centroid();
+-
+-    //(2) Run vector of kernels
+-
+-    std::vector<T_data_in> responses;
+-    for (auto kernel : kernel_vector->kernels_)
+-    {
+-      bvpl_kernel_iterator kernel_iter = kernel->iterator();
+-      kernel_iter.begin(); // reset the kernel iterator
+-      while (!kernel_iter.isDone())
+-      {
+-        vgl_point_3d<int> kernel_idx = kernel_iter.index();
+-
+-        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
+-                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
+-                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
+-
+-        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
+-
+-        if (this_cell) {
+-          bvpl_kernel_dispatch d = *kernel_iter;
+-          T_data_in val = this_cell->data();
+-          functor.apply(val, d);
+-        }
+-
+-        ++kernel_iter;
+-      }
+-
+-      responses.push_back(functor.result());
+-    }
+-
+-    T_data_out data_out;
+-    combine_kernel_responses(responses, data_out);
+-    out_center_cell->set_data(data_out);
+-    ++iterator;
+-    ++out_iter;
+-  }
+-  return;
+-}
+-
+-template <class T_data>
+-void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out)
+-{
+-  if (responses.size() != 3) {
+-    std::cerr << "Wrong number of responses" << std::endl;
+-    return;
+-  }
+-
+-  for (unsigned i = 0 ; i < 3; i++)
+-  {
+-    response_out[i] = responses[i];
+-  }
+-  return;
+-}
+-
+-template <class T_data>
+-void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out)
+-{
+-  if (responses.size() != 3) {
+-    std::cerr << "Wrong number of responses" << std::endl;
+-    return;
+-  }
+-
+-  bvpl_local_max_functor<T_data> func_max;
+-
+-  T_data max= responses[0];
+-  int max_id =0;
+-  for (unsigned i = 1 ; i < responses.size(); i++)
+-  {
+-    if (func_max.greater_than(max, responses[i])){
+-      max = responses[i];
+-      max_id = i;
+-    }
+-  }
+-  response_out.response_=max;
+-  response_out.id_ = max_id;
+-  return;
+-}
+-
+-#endif // bvpl_scene_vector_operator_h
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
+deleted file mode 100644
+index e8cac33615..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
++++ /dev/null
+@@ -1,258 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 31-Jan-2011
+-
+-#include "bvpl_taylor_basis.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-bool bvpl_taylor_basis::compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
+-                                                    const boxm_scene_base_sptr& basis_scene_base,
+-                                                    const boxm_scene_base_sptr& error_scene_base,
+-                                                    const bvpl_taylor_basis_loader& loader,
+-                                                    int block_i, int block_j, int block_k, double cell_length)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
+-  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
+-  //cast the scenes
+-  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
+-  auto* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (basis_scene_base.as_pointer());
+-  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  if (!(data_scene && basis_scene &&error_scene)){
+-    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
+-    return false;
+-  }
+-
+-  //load blocks of interest
+-  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
+-  basis_scene->load_block(block_i, block_j, block_k);
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  float_tree_type* error_tree = data_tree->clone();
+-
+-  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
+-  error_tree->init_cells(-1.0f);
+-  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
+-
+-  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
+-
+-  vgl_point_3d<int> min_point =  loader.min_point();
+-  vgl_point_3d<int> max_point =  loader.max_point();
+-
+-
+-  for (unsigned i =0; i<data_leaves.size(); i++) {
+-    //current cell is the center
+-    float_cell_type* data_cell = data_leaves[i];
+-    taylor_cell_type* basis_cell = basis_leaves[i];
+-
+-    boct_loc_code<short> data_code = data_cell->get_code();
+-    boct_loc_code<short> basis_code = basis_cell->get_code();
+-
+-    //check cells are at the same location
+-    if (! data_code.isequal(basis_code)){
+-      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
+-               << "Data Code: " << data_code << '\n'
+-               << "Basis Code: " << basis_code << '\n';
+-
+-      return false;
+-    }
+-
+-    //create a region around the center cell
+-    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
+-
+-    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
+-    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
+-    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
+-    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
+-      continue;
+-
+-    //retrieve basis
+-    double I0 = basis_cell->data().I0;
+-    vnl_double_3 G= basis_cell->data().G;
+-    vnl_double_3x3 H = basis_cell->data().H;
+-    double error = 0.0;
+-    for (int x = min_point.x(); x<= max_point.x(); x++) {
+-      for (int y = min_point.y(); y<=max_point.y(); y++) {
+-        for (int z = min_point.z(); z<=max_point.z(); z++) {
+-          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
+-          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
+-          if (this_cell) {
+-            vnl_double_3 X((double)x,(double)y, (double)z);
+-            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
+-            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
+-            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
+-            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
+-          }
+-        }
+-      }
+-    }
+-
+-    error_leaves[i]->set_data((float)error);
+-  }
+-
+-  // write and release memory
+-  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
+-  error_scene->write_active_block();
+-  data_scene->unload_active_blocks();
+-  basis_scene->unload_active_blocks();
+-
+-  return true;
+-}
+-
+-
+-double bvpl_taylor_basis::sum_errors(const boxm_scene_base_sptr& error_scene_base,
+-                                     int block_i, int block_j, int block_k, unsigned long tree_nsamples)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
+-
+-  error_scene->load_block(block_i, block_j, block_k);
+-
+-  //get the leaves
+-  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
+-
+-  int tree_ncells = error_leaves.size();
+-  //unsigned long tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
+-
+-  double error = 0.0;
+-  vnl_random rng(9667566ul);
+-  for (unsigned i=0; i<tree_nsamples; i++)
+-  {
+-    unsigned long sample = rng.lrand32(tree_ncells-1);
+-
+-    boct_tree_cell<short, float> *center_cell = error_leaves[sample];
+-    // vgl_point_3d<double> center_cell_centroid = error_tree->global_centroid(center_cell);
+-
+-    //if neighborhood is not inclusive we would have missing features
+-    if ((double)center_cell->data()< -0.5){
+-      i--;
+-      continue;
+-    }
+-    else {
+-      error+=(double)center_cell->data();
+-    }
+-  }
+-
+-  return error/tree_nsamples;
+-}
+-
+-//: Reads the values of basis responses and assembles them into matrices and vectors
+-bool bvpl_taylor_basis::assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k)
+-{
+-  typedef boct_tree<short,float> float_tree_type;
+-  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
+-  typedef boct_tree_cell<short,float> float_cell_type;
+-  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
+-
+-  std::cerr << "Caution: Using hardcoded size for taylor reconstruction\n";
+-
+-  //load output scene
+-  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (taylor_scenes->get_scene("basis").as_pointer());
+-  if (!basis_scene)
+-  {
+-    std::cerr << "Error in reconstruct: Faild to cast output scene\n";
+-    return false;
+-  }
+-
+-  //retieve basis scenes
+-  //zeroth derivative scene
+-  boxm_scene<float_tree_type>* I0_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("I0").as_pointer());
+-  boxm_scene<float_tree_type>* Ix_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ix").as_pointer());
+-  boxm_scene<float_tree_type>* Iy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iy").as_pointer());
+-  boxm_scene<float_tree_type>* Iz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iz").as_pointer());
+-  boxm_scene<float_tree_type>* Ixx_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixx").as_pointer());
+-  boxm_scene<float_tree_type>* Ixy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixy").as_pointer());
+-  boxm_scene<float_tree_type>* Ixz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixz").as_pointer());
+-  boxm_scene<float_tree_type>* Iyy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyy").as_pointer());
+-  boxm_scene<float_tree_type>* Iyz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyz").as_pointer());
+-  boxm_scene<float_tree_type>* Izz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Izz").as_pointer());
+-
+-
+-  if (!(I0_scene && Ix_scene && Iy_scene && Iz_scene && Ixx_scene && Iyy_scene && Izz_scene && Ixy_scene && Ixz_scene && Iyz_scene))
+-  {
+-    std::cerr << "Error in assemble_basis: Faild to load taylor scenes\n";
+-    return false;
+-  }
+-
+-  //load the blocks
+-  basis_scene->load_block(block_i, block_j,block_k);
+-  I0_scene->load_block(block_i, block_j,block_k);
+-  Ix_scene->load_block(block_i, block_j,block_k);
+-  Iy_scene->load_block(block_i, block_j,block_k);
+-  Iz_scene->load_block(block_i, block_j,block_k);
+-  Ixx_scene->load_block(block_i, block_j,block_k);
+-  Ixy_scene->load_block(block_i, block_j,block_k);
+-  Ixz_scene->load_block(block_i, block_j,block_k);
+-  Iyy_scene->load_block(block_i, block_j,block_k);
+-  Iyz_scene->load_block(block_i, block_j,block_k);
+-  Izz_scene->load_block(block_i, block_j,block_k);
+-
+-
+-  float_tree_type *treeI0 = I0_scene->get_block(block_i, block_j, block_k)->get_tree();
+-  taylor_tree_type *basis_tree = treeI0->clone_to_type<bvpl_taylor_basis2_sample>();
+-  basis_tree->init_cells(bvpl_taylor_basis2_sample());
+-  std::vector<taylor_cell_type*> leaves_basis = basis_tree->leaf_cells();
+-  std::vector<float_cell_type* > leaves_I0 = treeI0->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ix = Ix_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iy = Iy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iz = Iz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ixx =Ixx_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ixy =Ixy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Ixz =Ixz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iyy =Iyy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Iyz =Iyz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-  std::vector<float_cell_type* > leaves_Izz =Izz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
+-
+-
+-  //iterate gathering and assembling the data
+-  for (unsigned i=0; i<leaves_basis.size(); i++)
+-  {
+-    auto I0 = (double)leaves_I0[i]->data();
+-    vnl_double_3 G((double)leaves_Ix[i]->data(),(double)leaves_Iy[i]->data(),(double)leaves_Iz[i]->data());
+-
+-    vnl_double_3x3 H;
+-    H.put(0,0,(double)leaves_Ixx[i]->data());
+-    H.put(0,1,(double)leaves_Ixy[i]->data());
+-    H.put(0,2,(double)leaves_Ixz[i]->data());
+-    H.put(1,0,(double)leaves_Ixy[i]->data());
+-    H.put(1,1,(double)leaves_Iyy[i]->data());
+-    H.put(1,2,(double)leaves_Iyz[i]->data());
+-    H.put(2,0,(double)leaves_Ixz[i]->data());
+-    H.put(2,1,(double)leaves_Iyz[i]->data());
+-    H.put(2,2,(double)leaves_Izz[i]->data());
+-
+-    bvpl_taylor_basis2_sample sample(I0, G, H);
+-
+-    leaves_basis[i]->set_data(sample);
+-  }
+-
+-  //write basis block
+-  basis_scene->get_block(block_i, block_j, block_k)->set_tree(basis_tree);
+-  basis_scene->write_active_block();
+-
+-  //free up memory
+-  basis_scene->unload_active_blocks();
+-  I0_scene->unload_active_blocks();
+-  Ix_scene->unload_active_blocks();
+-  Iy_scene->unload_active_blocks();
+-  Iz_scene->unload_active_blocks();
+-  Ixx_scene->unload_active_blocks();
+-  Ixy_scene->unload_active_blocks();
+-  Ixz_scene->unload_active_blocks();
+-  Iyy_scene->unload_active_blocks();
+-  Iyz_scene->unload_active_blocks();
+-  Izz_scene->unload_active_blocks();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
+deleted file mode 100644
+index 6d35064025..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
++++ /dev/null
+@@ -1,50 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
+-#ifndef bvpl_taylor_basis_h
+-#define bvpl_taylor_basis_h
+-
+-//:
+-// \file
+-// \brief A class with utilities to apply taylor kernels to a scene
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  31-Jan-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include "bvpl_taylor_scenes_map.h"
+-#include <boxm/boxm_scene_base.h>
+-
+-
+-class bvpl_taylor_basis
+-{
+-
+-public:
+-  //  bvpl_taylor_basis(boxm_scene_base_sptr scene_base, bvpl_taylor_basis_loader loader, std::string path_out):
+-  //  kernel_loader_(loader), scene_base_(scene_base), path_out_(path_out){}
+-  //
+-  static bool assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k);
+-
+-  //: Computes the square errors between the scene and the taylor approximation at every voxel
+-  // This function operates on a block specified by an index
+-  static bool compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
+-                                          const boxm_scene_base_sptr& basis_scene_base,
+-                                          const boxm_scene_base_sptr& error_scene_base,
+-                                          const bvpl_taylor_basis_loader& loader,
+-                                          int block_i, int block_j, int block_k, double cell_length);
+-
+-  //: Sums the square errors for a percenatge of random samples
+-  static double sum_errors(const boxm_scene_base_sptr& error_scene_base,
+-                           int block_i, int block_j, int block_k, unsigned long tree_nsamples);
+-
+-protected:
+-
+-  //
+-  //  bvpl_taylor_basis_loader kernel_loader_;
+-  //  boxm_scene_base_sptr scene_base_;
+-  //  std::string path_out_;
+-};
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
+deleted file mode 100644
+index 92128f59d6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_taylor_scenes_map.h"
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-
+-#include <vul/vul_file.h>
+-
+-bvpl_taylor_scenes_map::bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader)
+-{
+-  loader_ = loader;
+-  typedef boct_tree<short,float> tree_type;
+-
+-  std::vector<std::string> kernel_names;
+-  loader.files(kernel_names);
+-
+-  //Load scenes one-by-one an insert them in the map
+-  for (auto & kernel_name : kernel_names)
+-  {
+-    std::string scene_in_file = loader.path() + '/' + kernel_name + "/float_response_scene.xml";
+-    boxm_scene_parser parser;
+-    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-    scene_ptr->load_scene(scene_in_file, parser);
+-
+-    if (scene_ptr->appearence_model() != BOXM_FLOAT) {
+-      std::cerr << " bvpl_taylor_scenes, scenes must be of type float\n";
+-    }
+-
+-    auto* scene = new boxm_scene<tree_type>();
+-    scene->load_scene(parser);
+-    scene_ptr = scene;
+-
+-    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( kernel_name, scene_ptr));
+-  }
+-
+-  // Create a scene to later save the taylor reconstruction (parameters of the  scene are the same as those of the input scene)
+-  auto* scene_in = static_cast<boxm_scene<tree_type>* > (scenes_[kernel_names[0]].as_pointer());
+-  {
+-    boxm_scene<tree_type> *scene_out =
+-    new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(loader.path(), "error");
+-    scene_out->set_appearance_model(BOXM_FLOAT);
+-    if (!vul_file::exists(loader.path() + "/error_scene.xml"))
+-      scene_out->write_scene("error_scene.xml");
+-    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "error", scene_out));
+-  }
+-
+-  {
+-    boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> > *scene_out =
+-    new boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(loader.path(), "basis");
+-    scene_out->set_appearance_model(BOXM_FLOAT);
+-    if (!vul_file::exists(loader.path() + "/basis_scene.xml"))
+-      scene_out->write_scene("basis_scene.xml");
+-    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "basis", scene_out));
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
+deleted file mode 100644
+index 51f783da43..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
++++ /dev/null
+@@ -1,41 +0,0 @@
+-// This is bvpl_taylor_scenes_map.h
+-#ifndef bvpl_taylor_scenes_map_h
+-#define bvpl_taylor_scenes_map_h
+-
+-//:
+-// \file
+-// \brief A class to hold the smartpointers to response scenes and their corresponding names
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <boxm/boxm_scene_base.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-// Forward declarations
+-class bvpl_taylor_scenes_map;
+-
+-typedef vbl_smart_ptr<bvpl_taylor_scenes_map> bvpl_taylor_scenes_map_sptr;
+-
+-//: A class to hold the smartpointers to response scenes and their corresponding names
+-class bvpl_taylor_scenes_map : public vbl_ref_count
+-{
+-public:
+-
+-  bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader);
+-
+-  boxm_scene_base_sptr get_scene(std::string basis) {return scenes_[basis];}
+-
+-  const bvpl_taylor_basis_loader& loader() {return loader_ ;}
+-
+-private:
+-  std::map<std::string, boxm_scene_base_sptr> scenes_;
+-  bvpl_taylor_basis_loader loader_;
+-
+-};
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
+deleted file mode 100644
+index e1264a0f5c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
++++ /dev/null
+@@ -1,20 +0,0 @@
+-# contrib/brl/bseg/bvpl/io/CMakeLists.txt
+-
+-set(bvpl_octree_io_sources
+-    bvpl_io_taylor_scenes_map.h       bvpl_io_taylor_scenes_map.cxx
+-    bvpl_io_pca_error_scenes.h        bvpl_io_pca_error_scenes.cxx
+-    bvpl_io_discover_pca_kernels.h    bvpl_io_discover_pca_kernels.cxx
+-    bvpl_io_global_pca.h              bvpl_io_global_pca.cxx
+-    bvpl_io_global_taylor.h
+-    bvpl_io_global_corners.h          bvpl_io_global_corners.cxx
+-
+-)
+-
+-aux_source_directory(Templates bvpl_octree_io_sources)
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_io LIBRARY_SOURCES ${bvpl_octree_io_sources})
+-target_link_libraries(bvpl_octree_io bvpl_octree ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vsl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
+deleted file mode 100644
+index 45954e1337..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
+deleted file mode 100644
+index ed29b40a54..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <bvpl_octree/io/bvpl_io_global_corners.h>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_corners);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
+deleted file mode 100644
+index fc4656672f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <bvpl_octree/io/bvpl_io_global_pca.h>
+-
+-typedef bvpl_global_pca<125> bvpl_global_pca_125;
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
+deleted file mode 100644
+index ff9d7dc465..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-#include <bvpl_octree/io/bvpl_io_global_taylor.h>
+-
+-typedef bvpl_global_taylor<double, 10> bvpl_global_taylor_double_10;
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_taylor_double_10);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
+deleted file mode 100644
+index 427e3937d4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+deleted file mode 100644
+index 25a60ca12c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
+deleted file mode 100644
+index 05fe44152d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_discover_pca_kernels.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_discover_pca_kernels const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_discover_pca_kernels & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_discover_pca_kernels & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_discover_pca_kernels*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_discover_pca_kernels* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
+deleted file mode 100644
+index b52e2355b2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// This is bvpl_io_discover_pca_kernels.h
+-#ifndef bvpl_io_discover_pca_kernels_h
+-#define bvpl_io_discover_pca_kernels_h
+-
+-//:
+-// \file
+-// \brief Binary IO for bvpl_discover_pca_kernels. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_discover_pca_kernels const &);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_discover_pca_kernels &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_discover_pca_kernels &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_discover_pca_kernels* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_discover_pca_kernels* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
+deleted file mode 100644
+index ef10f3ad61..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include "bvpl_io_global_corners.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_corners const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_corners & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_corners & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_corners*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_corners* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
+deleted file mode 100644
+index ac64d773d4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
++++ /dev/null
+@@ -1,44 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
+-#ifndef bvpl_io_global_cornerss_h
+-#define bvpl_io_global_cornerss_h
+-//:
+-// \file
+-// \brief Binary IO for bvpl_global_corners_125. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-typedef bvpl_global_corners bvpl_global_corners;
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_global_corners const &);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_global_corners &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_global_corners &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_global_corners* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_global_corners* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
+deleted file mode 100644
+index cac12cb25b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_global_pca.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_pca_125 const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_pca_125 & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_pca_125 & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_pca_125*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_pca_125* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
+deleted file mode 100644
+index 2858d03895..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
++++ /dev/null
+@@ -1,44 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
+-#ifndef bvpl_io_global_pca_h
+-#define bvpl_io_global_pca_h
+-//:
+-// \file
+-// \brief Binary IO for bvpl_global_pca_125. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-typedef bvpl_global_pca<125> bvpl_global_pca_125;
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_global_pca_125 const &);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_global_pca_125 &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_global_pca_125 &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_global_pca_125* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_global_pca_125* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
+deleted file mode 100644
+index 8c57308415..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
++++ /dev/null
+@@ -1,75 +0,0 @@
+-// This is bvpl_io_global_taylor.h
+-#ifndef bvpl_io_global_taylor_h
+-#define bvpl_io_global_taylor_h
+-
+-//:
+-// \file
+-// \brief Binary IO for bvpl_global_taylor. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-
+-//: Binary save parameters to stream.
+-template <class T, unsigned N>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_global_taylor<T,N> const &)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-//: Binary load parameters from stream.
+-template <class T, unsigned N>
+-void vsl_b_read(vsl_b_istream & is, bvpl_global_taylor<T,N> &p)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-template <class T, unsigned N>
+-void vsl_print_summary(std::ostream &os, const bvpl_global_taylor<T,N> &p)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-template <class T, unsigned N>
+-void vsl_b_read(vsl_b_istream& is, bvpl_global_taylor<T,N>* p)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-template <class T, unsigned N>
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_global_taylor<T,N>* &mp)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-template <class T, unsigned N>
+-void vsl_print_summary(std::ostream& os, const bvpl_global_taylor<T,N>* &p)
+-{
+-  if (p==0)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
+deleted file mode 100644
+index ff1de28596..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_pca_error_scenes.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_pca_error_scenes const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_pca_error_scenes & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_pca_error_scenes & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_pca_error_scenes*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_pca_error_scenes* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
+deleted file mode 100644
+index b0e98d6299..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// This is bvpl_io_pca_error_scenes.h
+-#ifndef bvpl_io_pca_error_scenes_h
+-#define bvpl_io_pca_error_scenes_h
+-
+-//:
+-// \file
+-// \brief Binary IO for bvpl_pca_error_scenes. Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_pca_error_scenes);
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_error_scenes &m);
+-
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_pca_error_scenes &m);
+-
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_pca_error_scenes* m);
+-
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_pca_error_scenes* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &m);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
+deleted file mode 100644
+index ba4155da13..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include "bvpl_io_taylor_scenes_map.h"
+-
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_taylor_scenes_map const & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & /*is*/, bvpl_taylor_scenes_map & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream & /*os*/, const bvpl_taylor_scenes_map & )
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_taylor_scenes_map*  /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_taylor_scenes_map* & /*p*/)
+-{
+-  std::cerr << "Error: Trying to save but binary io not implemented\n";
+-  return;
+-}
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &p)
+-{
+-  if (p==nullptr)
+-    os << "NULL PTR";
+-  else {
+-    os << "T: ";
+-    vsl_print_summary(os, *p);
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
+deleted file mode 100644
+index 3900318cd2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
++++ /dev/null
+@@ -1,38 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
+-#ifndef bvpl_io_taylor_scenes_map_h
+-#define bvpl_io_taylor_scenes_map_h
+-//:
+-// \file
+-// \brief Binary IO for bvpl_taylor_scenes_map.
+-//        Not implemented, only declared so it can be stored in the database
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  15-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-//: Binary save parameters to stream.
+-void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_taylor_scenes_map);
+-
+-//: Binary load parameters from stream.
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_scenes_map &m);
+-
+-void vsl_print_summary(std::ostream &os, const bvpl_taylor_scenes_map &m);
+-
+-void vsl_b_read(vsl_b_istream& is, bvpl_taylor_scenes_map* m);
+-
+-void vsl_b_write(vsl_b_ostream& os, const bvpl_taylor_scenes_map* &m);
+-
+-void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &m);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
+deleted file mode 100644
+index 8c8f573ab9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( bvpl_octree_io_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_io_test_include bvpl_octree_io)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
+deleted file mode 100644
+index 4ddefe5f48..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_global_corners.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_global_pca.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_global_taylor.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
+-#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+deleted file mode 100644
+index bbc90f7cea..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
++++ /dev/null
+@@ -1,31 +0,0 @@
+-# This is contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+-# bvxm's Process Library
+-
+-# bprb depends on expat and bvxm_pro depends on bprb primarily
+-FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-if(EXPAT_FOUND)
+-include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+-
+-set(bvpl_octree_pro_sources
+-    bvpl_octree_processes.h
+-    bvpl_octree_register.h    bvpl_octree_register.cxx
+-   )
+-
+-aux_source_directory(Templates bvpl_octree_pro_sources)
+-aux_source_directory(processes bvpl_octree_pro_sources)
+-aux_source_directory(processes/pca bvpl_octree_pro_sources)
+-aux_source_directory(processes/taylor bvpl_octree_pro_sources)
+-aux_source_directory(processes/corners bvpl_octree_pro_sources)
+-aux_source_directory(processes/steerable_filters bvpl_octree_pro_sources)
+-
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_pro LIBRARY_SOURCES ${bvpl_octree_pro_sources})
+-target_link_libraries(bvpl_octree_pro bvpl_octree_io bvpl_octree bvpl_kernels_io boxm boct boxm_algo_pro boxm_sample boxm_util bprb brdb ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+-
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
+deleted file mode 100644
+index 5de38b0662..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-#include <boxm/boxm_scene_base.h>
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
+deleted file mode 100644
+index 9cf83eebc4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_discover_pca_kernels_sptr, "bvpl_discover_pca_kernels_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
+deleted file mode 100644
+index b2e7fa3fed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_global_corners_sptr, "bvpl_global_corners_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
+deleted file mode 100644
+index f911ce4589..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_global_pca_125_sptr, "bvpl_global_pca_125_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
+deleted file mode 100644
+index 1a079ac413..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_pca_error_scenes_sptr, "bvpl_pca_error_scenes_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+deleted file mode 100644
+index ee1188aea5..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
+deleted file mode 100644
+index 600668ef3f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_global_taylor_sptr, "bvpl_global_taylor_sptr");
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
+deleted file mode 100644
+index 89d5581af3..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
++++ /dev/null
+@@ -1,61 +0,0 @@
+-#ifndef bvpl_octree_processes_h_
+-#define bvpl_octree_processes_h_
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_macros.h>
+-
+-DECLARE_FUNC_CONS(bvpl_scene_vector_operator_process);
+-DECLARE_FUNC_CONS(bvpl_scene_kernel_operator_process);
+-DECLARE_FUNC_CONS(bvpl_block_kernel_operator_process);
+-DECLARE_FUNC_CONS(bvpl_save_vrml_process);
+-DECLARE_FUNC_CONS(bvpl_create_scene_process);
+-DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
+-DECLARE_FUNC_CONS(bvpl_nonmax_supp_process);
+-DECLARE_FUNC_CONS(bvpl_compute_gauss_gradients);
+-DECLARE_FUNC_CONS(bvpl_scene_histogram_process);
+-DECLARE_FUNC_CONS(bvpl_block_avg_value_process);
+-DECLARE_FUNC_CONS(bvpl_grad_scene_to_bin_process);
+-
+-
+-//PCA related
+-DECLARE_FUNC_CONS(bvpl_discover_pca_features_process);
+-DECLARE_FUNC_CONS(bvpl_compute_pca_test_error_process);
+-DECLARE_FUNC_CONS(bvpl_compute_pca_error_scene_process);
+-DECLARE_FUNC_CONS(bvpl_compute_pca_error_block_process);
+-DECLARE_FUNC_CONS(bvpl_load_pca_error_scenes_process);
+-DECLARE_FUNC_CONS(bvpl_add_pca_errors_process);
+-DECLARE_FUNC_CONS(bvpl_load_pca_info_process);
+-DECLARE_FUNC_CONS(bvpl_pca_project_process);
+-DECLARE_FUNC_CONS(bvpl_normalize_pca_training_error_process);
+-DECLARE_FUNC_CONS(bvpl_pca_global_statistics_process);
+-DECLARE_FUNC_CONS(bvpl_combine_pairwise_statistics_process);
+-DECLARE_FUNC_CONS(bvpl_global_pca_process);
+-DECLARE_FUNC_CONS(bvpl_init_global_pca_process);
+-DECLARE_FUNC_CONS(bvpl_load_global_pca_125_process);
+-DECLARE_FUNC_CONS(bvpl_pca_global_proj_error_process);
+-DECLARE_FUNC_CONS(bvpl_pca_global_add_error_process);
+-
+-//Taylor related
+-DECLARE_FUNC_CONS(bvpl_load_taylor_scenes_process);
+-DECLARE_FUNC_CONS(bvpl_compute_taylor_error_process);
+-DECLARE_FUNC_CONS(bvpl_add_taylor_errors_process);
+-DECLARE_FUNC_CONS(bvpl_init_global_taylor_process);
+-DECLARE_FUNC_CONS(bvpl_compute_taylor_coefficients_process);
+-DECLARE_FUNC_CONS(bvpl_explore_coefficient_scene_process);
+-DECLARE_FUNC_CONS(bvpl_load_global_taylor_process);
+-DECLARE_FUNC_CONS(bvpl_taylor_global_proj_error_process);
+-DECLARE_FUNC_CONS(bvpl_taylor_global_add_error_process);
+-
+-//Corner related
+-DECLARE_FUNC_CONS(bvpl_compute_harris_measure_process);
+-DECLARE_FUNC_CONS(bvpl_load_global_corners_process);
+-DECLARE_FUNC_CONS(bvpl_corner_statistics_process);
+-DECLARE_FUNC_CONS(bvpl_threshold_corners_process);
+-DECLARE_FUNC_CONS(bvpl_compute_beaudet_measure_process);
+-
+-//Steerable filters
+-DECLARE_FUNC_CONS(bvpl_init_sf_response_scene_process);
+-DECLARE_FUNC_CONS(bvpl_compute_sf_raw_response_process);
+-
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
+deleted file mode 100644
+index 189cb04ae3..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
++++ /dev/null
+@@ -1,81 +0,0 @@
+-#include "bvpl_octree_register.h"
+-
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_func_process.h>
+-
+-#include "bvpl_octree_processes.h"
+-#include <bvpl_octree/bvpl_taylor_scenes_map.h>
+-#include <bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl_octree/bvpl_global_pca.h>
+-#include <bvpl_octree/bvpl_global_taylor.h>
+-#include <bvpl_octree/bvpl_global_corners.h>
+-
+-void bvpl_octree_register::register_datatype()
+-{
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  REGISTER_DATATYPE(bvpl_taylor_scenes_map_sptr);
+-  REGISTER_DATATYPE(bvpl_pca_error_scenes_sptr);
+-  REGISTER_DATATYPE(bvpl_discover_pca_kernels_sptr);
+-  REGISTER_DATATYPE(bvpl_global_pca_125_sptr);
+-  REGISTER_DATATYPE(bvpl_global_taylor_sptr);
+-  REGISTER_DATATYPE(bvpl_global_corners_sptr);
+-
+-}
+-
+-void bvpl_octree_register::register_process()
+-{
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_vector_operator_process, "bvplSceneVectorOperatorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_kernel_operator_process, "bvplSceneKernelOperatorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_kernel_operator_process, "bvplBlockKernelOperatorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_save_vrml_process, "bvplSaveVrmlProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_scene_process, "bvplCreateSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_nonmax_supp_process, "bvplNonmaxSuppProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_gauss_gradients, "bvplComputeGaussGradients");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_test_error_process, "bvplComputeTestErrorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_histogram_process, "bvplSceneHistorgramProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_grad_scene_to_bin_process, "bvplGradSceneToBinProcess");
+-
+-  //PCA related
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_discover_pca_features_process, "bvplDiscoverPCAFeaturesProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_scene_process, "bvplComputePCAErrorSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_block_process, "bvplComputePCAErrorBlockProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_error_scenes_process, "bvplLoadPCAErrorSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_avg_value_process, "bvplBlockAvgValueProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_pca_errors_process, "bvplAddPCAErrorsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_info_process, "bvplLoadPCAInfoProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_project_process, "bvplPCAProjectProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_normalize_pca_training_error_process, "bvplNormalizePCATrainingErrorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_global_statistics_process, "bvplPCAGlobalStatisticsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_combine_pairwise_statistics_process, "bvplCombinePairwiseStatisticsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_global_pca_process, "bvplGlobalPCAProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_pca_process, "bvplInitGlobalPCAProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_pca_125_process, "bvplLoadGlobalPCA125Process");
+-  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_proj_error_process);
+-  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_add_error_process);
+-
+-  //Taylor related
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_scenes_process, "bvplLoadTaylorScenesProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_error_process, "bvplComputeTaylorErrorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_taylor_errors_process, "bvplAddTaylorErrorsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_taylor_process, "bvplInitGlobalTaylorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_coefficients_process, "bvplComputeTaylorCoefficients");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_explore_coefficient_scene_process, "bvplExploreCoefficientSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_taylor_process, "bvplLoadGlobalTaylorProcess");
+-  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_proj_error_process);
+-  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_add_error_process);
+-
+-  //Corner related
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_threshold_corners_process, "bvplThresholdCornersProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_harris_measure_process, "bvplComputeHarrisMeasureProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_corners_process, "bvplLoadGlobalCornersProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_corner_statistics_process, "bvplCornerStatisticsProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_beaudet_measure_process, "bvplComputeBeaudetMeasureProcess");
+-
+-  //Steerable filters
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_sf_response_scene_process, "bvplInitSFResponseSceneProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_sf_raw_response_process, "bvplComputeSFRawResponseProcess");
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
+deleted file mode 100644
+index a72acdd9a2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#ifndef bvpl_octree_register_h_
+-#define bvpl_octree_register_h_
+-
+-class bvpl_octree_register
+-{
+- public:
+-  static void register_datatype();
+-  static void register_process();
+-};
+-
+-#endif // bvpl_octree_register_h_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
+deleted file mode 100644
+index 5a37180f2d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
++++ /dev/null
+@@ -1,81 +0,0 @@
+-//:
+-// \file
+-// \brief A process to add taylor error at a percentage of voxels in a block
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_block_avg_value_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_block_avg_value_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_avg_value_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_block_avg_value_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_avg_value_process_globals;
+-
+-  //get inputs
+-  unsigned i =0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto fraction_nsamples = pro.get_input<double>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!scene_base){
+-    std::cerr << "Error in bvpl_block_avg_value_process: Null error scene\n";
+-    return false;
+-  }
+-  auto* scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (scene_base.as_pointer());
+-  if (!scene){
+-    std::cerr << "Error in bvpl_block_avg_value_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  //sum errors within block
+-  auto scene_ncells = (double)scene->size();
+-  scene->load_block(block_i,block_j,block_k);
+-  auto tree_ncells = (double)scene->get_block(block_i,block_j,block_k)->get_tree()->size();
+-  double nsamples = scene_ncells * fraction_nsamples;
+-
+-  //number of samples - 10% of total number of leaf-cells
+-  auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
+-  std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
+-           << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
+-  double avg_value = bvpl_average_value(scene,block_i, block_j, block_k, tree_nsamples);
+-
+-  //store output
+-  pro.set_output_val<double>(0, avg_value);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
+deleted file mode 100644
+index 0602d6d2ed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
++++ /dev/null
+@@ -1,208 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 1-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
+-#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
+-#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-
+-#include <vul/vul_file.h>
+-
+-namespace bvpl_block_kernel_operator_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 8;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: process takes 6 inputs and has 1 output.
+-// * input[0]: The boxm_scene
+-// * input[1]: The kernels; bvpl_kernel_vector_sptr
+-// * input[2,3,4]: block index (i,j,k);
+-// * input[5]: String identifying functor type
+-// * input[6]: Output path to a dir where to store response blocks
+-
+-
+-bool bvpl_block_kernel_operator_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_kernel_operator_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i=0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "bvpl_kernel_sptr";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "vcl_string";
+-  input_types_[i++] = "vcl_string";
+-  input_types_[i++] = "double";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_block_kernel_operator_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_block_kernel_operator_process_globals;
+-
+-  if (pro.n_inputs() < n_inputs_)
+-  {
+-    std::cerr << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << '\n';
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  std::string functor_name = pro.get_input<std::string>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-  auto cell_length = pro.get_input<double>(i++);
+-  //short level = 0;
+-
+-  //print inputs
+-  std::cout << "In bvpl_block_kernel_operator:\n"
+-           << "Index(i,j,k) : (" << block_i << ',' << block_j << ',' << block_k << ")\n"
+-           << "Functor Name: " << functor_name << '\n'
+-           << "Output path: " << output_path  << '\n'
+-           << "Cell length" << cell_length << std::endl;
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cerr <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if (!kernel) {
+-    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
+-    return false;
+-  }
+-
+-
+-  switch (scene_base->appearence_model())
+-  {
+-    case BSTA_GAUSS_F1:
+-    {
+-      typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-      typedef boct_tree<short, gauss_type > tree_type;
+-      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-
+-      //parameters of the output scene are the same as those of the input scene
+-      boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      scene_out->set_paths(output_path, "gauss_response_scene");
+-      scene_out->set_appearance_model(BSTA_GAUSS_F1);
+-      if (!vul_file::exists(output_path + "/gauss_response_scene.xml"))
+-        scene_out->write_scene("/gauss_response_scene.xml");
+-
+-      //parameters of the output scene are the same as those of the input scene
+-      boxm_scene<boct_tree<short,bool> > *valid_scene =
+-      new boxm_scene<boct_tree<short,bool > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      valid_scene->set_paths(output_path, "valid_scene");
+-      valid_scene->set_appearance_model(BOXM_BOOL);
+-      if (!vul_file::exists(output_path + "/valid_scene.xml"))
+-        valid_scene->write_scene("/valid_scene.xml");
+-
+-      if (functor_name == "gauss_convolution") {
+-        bvpl_gauss_convolution_functor functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-
+-        return true;
+-      }
+-      else if (functor_name == "positive_gauss_convolution") {
+-        bvpl_positive_gauss_conv_functor functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-
+-        return true;
+-      }
+-      else
+-        return false;
+-
+-      break;
+-    }
+-    case BOXM_FLOAT:
+-    {
+-      typedef boct_tree<short, float > tree_type;
+-      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-      //parameters of the output scene are the same as those of the input scene
+-      boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      scene_out->set_paths(output_path, "response_scene");
+-      scene_out->set_appearance_model(BOXM_FLOAT);
+-      if (!vul_file::exists(output_path + "/float_response_scene.xml"))
+-        scene_out->write_scene("/float_response_scene.xml");
+-
+-      boxm_scene<boct_tree<short,bool> > *valid_scene =
+-      new boxm_scene<boct_tree<short,bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-      valid_scene->set_paths(output_path, "valid_scene");
+-      valid_scene->set_appearance_model(BOXM_BOOL);
+-      if (!vul_file::exists(output_path + "/valid_scene.xml"))
+-        valid_scene->write_scene("/valid_scene.xml");
+-
+-      if (functor_name == "edge_algebraic_mean")
+-      {
+-        bvpl_edge_algebraic_mean_functor<float> functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-        return true;
+-      }
+-      else if (functor_name == "algebraic")
+-      {
+-        bvpl_algebraic_functor functor;
+-        bvpl_block_kernel_operator block_oper;
+-        //operate on scene
+-        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
+-
+-        //clean memory
+-        scene_in->unload_active_blocks();
+-        scene_out->unload_active_blocks();
+-        return true;
+-      }
+-      else
+-        return false;
+-
+-      break;
+-    }
+-    default:
+-      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
+-      return false;
+-  }
+-  return false;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
+deleted file mode 100644
+index 126deb3ac8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
++++ /dev/null
+@@ -1,86 +0,0 @@
+-//:
+-// \file
+-// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
+-// \author Isabel Restrepo
+-// \date 13-Oct-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-#include <boxm/boxm_scene.h>
+-
+-//: global variables
+-namespace bvpl_compute_gauss_gradients_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_compute_gauss_gradients_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_gauss_gradients_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";  //input scene
+-  input_types_[1] = "vcl_string";            //output path
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";  //output scene
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_compute_gauss_gradients(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_gauss_gradients_globals;
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  //Create the factory and get the vector of kernels
+-  bvpl_gauss3d_x_kernel_factory factory(1.0f,1.0f,1.0f);
+-  bvpl_create_directions_xyz dir;
+-  bvpl_kernel_vector_sptr kernels = factory.create_kernel_vector(dir);
+-
+-  //get scene
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
+-  {
+-    boxm_scene<grad_tree_type> *scene_out =
+-    new boxm_scene<grad_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "float_gradient_scene");
+-    scene_out->set_appearance_model(VNL_FLOAT_3);
+-    scene_out->write_scene("float_gradient_scene.xml");
+-
+-    bvpl_algebraic_functor functor;
+-    bvpl_scene_vector_operator vector_oper;
+-    vector_oper.operate(*scene_in, functor, kernels, *scene_out);
+-    //store output
+-    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-    scene_ptr = scene_out;
+-    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-    bsta_histogram<float> magnitude_hist;
+-    bvpl_compute_scene_statistics(scene_out, magnitude_hist);
+-    std::cout << "Histogram:\n" << magnitude_hist << std::endl;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
+deleted file mode 100644
+index e175191e55..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
++++ /dev/null
+@@ -1,88 +0,0 @@
+-//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
+-#include <iostream>
+-#include <string>
+-#include <boxm/boxm_scene_base.h>
+-//:
+-// \file
+-// \brief A process loading xml parameters of a boxm_scene of types specific to bvpl_octree
+-//
+-// \author Isabel Restrepo
+-// \date Nov 15, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/boxm_scene_parser.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-//:global variables
+-namespace bvpl_create_scene_process_globals
+-{
+-  //this process takes no inputs
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//:sets input and output types
+-bool bvpl_create_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_create_scene_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-//:creates a scene from parameters
+-bool bvpl_create_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_create_scene_process_globals;
+-  std::string fname = pro.get_input<std::string>(0);
+-
+-  boxm_scene_parser parser;
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-  scene_ptr->load_scene(fname, parser);
+-  if (scene_ptr->appearence_model() == BVPL_SAMPLE_FLOAT) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bvpl_octree_sample<float> > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else if (scene_ptr->appearence_model() == BVPL_SAMPLE_BSTA_GAUSS_F1) {
+-    if (!scene_ptr->multi_bin())
+-    {
+-      typedef boct_tree<short,bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > tree_type;
+-      auto* scene = new boxm_scene<tree_type>();
+-      scene->load_scene(parser);
+-      scene_ptr = scene;
+-    }
+-  }
+-  else {
+-    std::cerr << "bvpl_create_scene_process: undefined datatype\n";
+-    return false;
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
+deleted file mode 100644
+index 39195ec048..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
++++ /dev/null
+@@ -1,136 +0,0 @@
+-//:
+-// \file
+-// \brief A process to save a gradient scene to a flat binary file
+-// \author Isabel Restrepo
+-// \date 3-Aug-2011
+-
+-#include <iostream>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <vnl/vnl_vector_fixed.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-//:global variables
+-namespace bvpl_grad_scene_to_bin_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_grad_scene_to_bin_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_grad_scene_to_bin_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "boxm_scene_base_sptr";  //alpha scene
+-  input_types_[i++] = "boxm_scene_base_sptr";  //gradient scene
+-  input_types_[i++] = "vcl_string";            //output binary file
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_grad_scene_to_bin_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_grad_scene_to_bin_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr alpha_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr grad_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string output_file = pro.get_input<std::string>(i++);
+-
+-  //get scene
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
+-
+-  std::ofstream os(output_file.c_str(), std::ios::out);
+-
+-  if (auto *alpha_scene = dynamic_cast<boxm_scene< float_tree_type >* >(alpha_scene_base.as_pointer()))
+-  {
+-    if (auto *grad_scene = dynamic_cast<boxm_scene< grad_tree_type >* >(grad_scene_base.as_pointer()))
+-    {
+-      double cell_length = alpha_scene->finest_cell_length();
+-      short finest_level = alpha_scene->finest_level();
+-
+-      bool read_only = true;
+-
+-      boxm_cell_iterator<float_tree_type > alpha_iter = alpha_scene->cell_iterator(&boxm_scene<float_tree_type >::load_block_and_neighbors, read_only);
+-      alpha_iter.begin();
+-
+-      boxm_cell_iterator<grad_tree_type > grad_iter = grad_scene->cell_iterator(&boxm_scene<grad_tree_type >::load_block, read_only);
+-      grad_iter.begin();
+-
+-      long unsigned n_grads = 0;
+-
+-      while ( !(alpha_iter.end() || grad_iter.end()) )
+-      {
+-        boct_tree_cell<short, float> *alpha_cell = *alpha_iter;
+-        boct_tree_cell<short, vnl_vector_fixed< float,3 > > *grad_cell = *grad_iter;
+-
+-        boct_loc_code<short> grad_code = grad_cell->get_code();
+-        boct_loc_code<short> alpha_code = alpha_cell->get_code();
+-
+-        //if level and location code of cells isn't the same then continue
+-        if ((alpha_cell->level() != grad_cell->level()) || !(alpha_code.isequal(&grad_code))) {
+-          std::cerr << " Input and output cells don't have the same structure\n";
+-          ++alpha_iter;
+-          ++grad_iter;
+-          continue;
+-        }
+-
+-        //we are only interested in finest resolution
+-        if ((!(alpha_cell->level() == finest_level)) || !alpha_cell->is_leaf()) {
+-          ++alpha_iter;
+-          ++grad_iter;
+-          continue;
+-        }
+-
+-        vgl_point_3d<double> centroid = alpha_iter.global_centroid();
+-        vnl_vector_fixed< float,3 > grad = grad_cell->data();
+-        float p_x = 1.0f - (float)std::exp(- (alpha_cell->data() * cell_length ));
+-#if 0
+-        vsl_b_write(os, (float)centroid.x());
+-        vsl_b_write(os, (float)centroid.y());
+-        vsl_b_write(os, (float)centroid.z());
+-        vsl_b_write(os, grad[0]);
+-        vsl_b_write(os, grad[1]);
+-        vsl_b_write(os, grad[2]);
+-        vsl_b_write(os, p_x);
+-#endif
+-
+-        os << (float)centroid.x() << ' '
+-           << (float)centroid.y() << ' '
+-           << (float)centroid.z() << ' '
+-           << grad[0] << ' '
+-           << grad[1] << ' '
+-           << grad[2] << ' '
+-           << p_x << '\n';
+-
+-        ++alpha_iter;
+-        ++grad_iter;
+-        n_grads++;
+-      }
+-
+-      grad_scene->unload_active_blocks();
+-      alpha_scene->unload_active_blocks();
+-      os.close();
+-      std::cout << "Wrote " << n_grads << " gradients\n";
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
+deleted file mode 100644
+index b53398692b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
++++ /dev/null
+@@ -1,178 +0,0 @@
+-//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for spreading the plane information of the cell to the neighbors
+-// \author Gamze Tunali
+-// \date   Mar 19, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_inf_line_sample.h>
+-
+-#include <bvpl/bvpl_neighb_operator.h>
+-#include <bvpl/kernels/bvpl_kernel_iterator.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
+-
+-namespace bvpl_nonmax_supp_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 4;
+-  constexpr unsigned int n_outputs_ = 1;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool bvpl_nonmax_supp_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_nonmax_supp_process_globals;
+-
+-  // process takes 4 inputs:
+-  //input[0]: The scene
+-  //input[1]: the scene path for the output scene
+-  //input[2]: block prefix for the output scene
+-  //input[3]: the filename for the new scene xml file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-
+-  // process has 1 output:
+-  // output[0]: the new scene with updated cell information
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool bvpl_nonmax_supp_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_nonmax_supp_process_globals;
+-
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string scene_path = pro.get_input<std::string>(1);
+-  std::string block_prefix = pro.get_input<std::string>(2);
+-  std::string scene_filename = pro.get_input<std::string>(3);
+-  boxm_scene_base_sptr output_scene_sptr;
+-
+-  // only applies to the edge_line type of scenes
+-  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
+-    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
+-    typedef boct_tree_cell<short,boxm_inf_line_sample<float> > cell_type;
+-    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-       return false;
+-    }
+-
+-    auto *output_scene=new boxm_scene<tree_type>(*scene);
+-    output_scene->set_paths(scene_path, block_prefix);
+-    output_scene_sptr = output_scene;
+-
+-    // create a kernel for 3x3 neighborhood
+-    bvpl_kernel_iterator k_iter;
+-    vgl_point_3d<int> min_pt(-1,-1,-1);
+-    vgl_point_3d<int> max_pt(1,1,1);
+-    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
+-      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
+-        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
+-          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
+-        }
+-      }
+-    }
+-    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
+-
+-    boxm_block_iterator<tree_type> iter(scene);
+-    boxm_block_iterator<tree_type> output_iter(output_scene);
+-    iter.begin();
+-    output_iter.begin();
+-
+-    while (!iter.end())
+-    {
+-      scene->load_block(iter.index());
+-      output_scene->load_block(iter.index());
+-      boxm_block<tree_type>* block = *iter;
+-      boxm_block<tree_type>* output_block = *output_iter;
+-
+-      tree_type* tree = block->get_tree();
+-      std::vector<cell_type *> cells = tree->leaf_cells();
+-
+-      tree_type* output_tree=tree->clone();
+-      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
+-
+-      bvpl_octree_neighbors<boxm_inf_line_sample<float> > oper(tree);
+-      for (unsigned i=0; i<cells.size(); i++) {
+-        cell_type *cell=cells[i];
+-        cell_type *output_cell=output_cells[i];
+-        std::vector<cell_type *> neighb_cells;
+-        oper.neighbors(kernel, cells[i], neighb_cells);
+-
+-        float residual = cell->data().residual_;
+-
+-        bool min=true;
+-        for (unsigned n=0; n<neighb_cells.size()&& min; n++) {
+-          cell_type *neighbor = neighb_cells[n];
+-          boct_loc_code<short> cell_code=cell->code_;
+-          boct_loc_code<short> n_code = neighbor->code_;
+-          bool itself = n_code.isequal(&cell_code);
+-          // do not include itself in the list
+-          if (!itself) {
+-            float r = neighbor->data().residual_;
+-            if ( r < residual)
+-              min=false;
+-          }
+-
+-          if (min) {
+-            boxm_inf_line_sample<float> data = cell->data();
+-            output_cell->set_data(data);
+-          }
+-        }
+-      }
+-      output_block->delete_tree();
+-      output_block->set_tree(output_tree);
+-      output_scene->write_active_block();
+-      iter++;
+-    }
+-    output_scene->write_scene(scene_filename);
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
+deleted file mode 100644
+index 2c503cdbf2..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
++++ /dev/null
+@@ -1,209 +0,0 @@
+-//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
+-#include <string>
+-#include <iostream>
+-#include <fstream>
+-#include <set>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for spreading the plane information of the cell to the neighbors
+-// \author Gamze Tunali
+-// \date   Mar 19, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//
+-// \endverbatim
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-#include <brdb/brdb_value.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene_base.h>
+-#include <boxm/boxm_scene.h>
+-
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-
+-#include <bvpl/bvpl_neighb_operator.h>
+-#include <bvpl/kernels/bvpl_kernel_iterator.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
+-
+-struct ltstr
+-{
+-  bool operator()(const boxm_plane_obs<float> & p1, const boxm_plane_obs<float> & p2) const
+-  {
+-      if(p1.plane_.a()<p2.plane_.a())
+-          return true;
+-      else if(p1.plane_.a()>p2.plane_.a())
+-          return false;
+-      else
+-      {
+-          if(p1.plane_.b()<p2.plane_.b())
+-              return true;
+-          else if(p1.plane_.b()>p2.plane_.b())
+-              return false;
+-          else
+-          {
+-              if(p1.plane_.c()<p2.plane_.c())
+-                  return true;
+-              else if(p1.plane_.c()>p2.plane_.c())
+-                  return false;
+-              else
+-              {
+-                  if(p1.plane_.d()<p2.plane_.d())
+-                      return true;
+-                  else
+-                      return false;
+-              }
+-          }
+-      }
+-  }
+-};
+-
+-namespace bvpl_plane_propagate_process_globals
+-{
+-  constexpr unsigned int n_inputs_ = 4;
+-  constexpr unsigned int n_outputs_ = 1;
+-  //Define parameters here
+-}
+-
+-
+-//: set input and output types
+-bool bvpl_plane_propagate_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_plane_propagate_process_globals;
+-
+-  // process takes 4 inputs:
+-  //input[0]: The scene
+-  //input[1]: the scene path for the output scene
+-  //input[2]: block prefix for the output scene
+-  //input[3]: the filename for the new scene xml file
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-
+-  // process has 1 output:
+-  // output[0]: the new scene with updated cell information
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  if (!pro.set_input_types(input_types_))
+-    return false;
+-
+-  if (!pro.set_output_types(output_types_))
+-    return false;
+-
+-  return true;
+-}
+-
+-//: Execute the process
+-bool bvpl_plane_propagate_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_plane_propagate_process_globals;
+-
+-
+-  // check number of inputs
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
+-    return false;
+-  }
+-
+-  // get the inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string scene_path = pro.get_input<std::string>(1);
+-  std::string block_prefix = pro.get_input<std::string>(2);
+-  std::string scene_filename = pro.get_input<std::string>(3);
+-  boxm_scene_base_sptr output_scene_sptr;
+-  // only applies to the edge_line type of scenes
+-  if (scene_base->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
+-    typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
+-    typedef boct_tree_cell<short,boxm_edge_tangent_sample<float> > cell_type;
+-    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
+-    if (!scene) {
+-       std::cerr << "error casting scene_base to scene\n";
+-       return false;
+-    }
+-
+-    auto *output_scene=new boxm_scene<tree_type>(*scene);
+-    output_scene->set_paths(scene_path, block_prefix);
+-    output_scene_sptr = output_scene;
+-    // create a kernel for 3x3 neighborhood
+-    bvpl_kernel_iterator k_iter;
+-    vgl_point_3d<int> min_pt(-1,-1,-1);
+-    vgl_point_3d<int> max_pt(1,1,1);
+-    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
+-      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
+-        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
+-          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
+-        }
+-      }
+-    }
+-    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
+-
+-    boxm_block_iterator<tree_type> iter(scene);
+-    boxm_block_iterator<tree_type> output_iter(output_scene);
+-    iter.begin();
+-    output_iter.begin();
+-
+-    while (!iter.end())
+-    {
+-      scene->load_block(iter.index());
+-      output_scene->load_block(iter.index());
+-      boxm_block<tree_type>* block = *iter;
+-      boxm_block<tree_type>* output_block = *output_iter;
+-
+-      tree_type* tree = block->get_tree();
+-      std::vector<cell_type *> cells = tree->leaf_cells();
+-
+-      tree_type* output_tree=tree->clone();
+-      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
+-
+-      bvpl_octree_neighbors<boxm_edge_tangent_sample<float> > oper(tree);
+-      for (unsigned i=0; i<cells.size(); i++) {
+-        cell_type *cell=cells[i];
+-        cell_type *output_cell=output_cells[i];
+-        std::vector<cell_type *> neighb_cells;
+-        oper.neighbors(kernel, cells[i], neighb_cells);
+-        std::set<boxm_plane_obs<float>,ltstr> planes;
+-
+-        for (auto neighbor : neighb_cells) {
+-          boct_loc_code<short> cell_code=cell->code_;
+-          boct_loc_code<short> n_code = neighbor->code_;
+-          bool itself = n_code.isequal(&cell_code);
+-         if (!itself) {
+-             std::vector<boxm_plane_obs<float> > observations = neighbor->data().obs_list();
+-             boxm_edge_tangent_sample<float> data=output_cell->data();
+-             data.insert(observations);
+-             output_cell->set_data(data);
+-            }
+-        }
+-      }
+-      //  std::set<boxm_plane_obs<float>,ltstr >::iterator iter1=planes.begin();
+-      //  boxm_edge_tangent_sample<float> data;
+-      //  for(;iter1!=planes.end();iter1++)
+-      //  {
+-      //      data.insert(*iter1);
+-      //  }
+-      //  output_cell->set_data(data);
+-      //}
+-      output_block->delete_tree();
+-      output_block->set_tree(output_tree);
+-      output_scene->write_active_block();
+-      iter++;
+-    }
+-    output_scene->write_scene(scene_filename);
+-  }
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
+deleted file mode 100644
+index 5adb8cc4ec..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
++++ /dev/null
+@@ -1,89 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief process saves a boxm_scene of kernel responses to a vrml file
+-//
+-// \author Isabel Restrepo
+-// \date December 10, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel.h>
+-
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-namespace bvpl_save_vrml_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-//: process takes 3 inputs and has no outputs.
+-// input[0]: The scene
+-// input[1]: The vector of kernels
+-// input[2]: Path to output vrml file
+-// No outputs
+-
+-bool bvpl_save_vrml_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_save_vrml_process_globals;
+-
+-  //process takes 3 inputs but has no outputs
+-  std::vector<std::string> output_types_(n_outputs_);
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "bvpl_kernel_vector_sptr";
+-  input_types_[2] = "vcl_string";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_save_vrml_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_save_vrml_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  bvpl_kernel_vector_sptr kernel_vector = pro.get_input<bvpl_kernel_vector_sptr>(1);
+-  std::string vrml_path = pro.get_input<std::string>(2);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
+-
+-  std::ofstream ofs(vrml_path.c_str());
+-
+-  if (auto *scene_in =
+-      dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >* > (scene_base.as_pointer()))
+-  {
+-    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
+-  }
+-  else if (auto *scene_in =
+-           dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > >* >(scene_base.as_pointer()))
+-  {
+-    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
+-  }
+-  else {
+-    std::cerr << "In bvpl_save_vrml_process: Unsupported scene type\n";
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
+deleted file mode 100644
+index f3d93180ba..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
++++ /dev/null
+@@ -1,66 +0,0 @@
+-//:
+-// \file
+-// \brief Process to explore the histogram of a scene
+-// \author Isabel Restrepo
+-// \date 18-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-//:global variables
+-namespace bvpl_scene_histogram_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_scene_histogram_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_histogram_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_scene_histogram_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_histogram_process_globals;
+-
+-  //get inputs
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-
+-  if (!scene_base){
+-    std::cerr << "Null scene\n";
+-    return false;
+-  }
+-
+-  switch (scene_base->appearence_model())
+-  {
+-    case BOXM_FLOAT:
+-    {
+-      typedef boct_tree<short, float > tree_type;
+-      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-      bsta_histogram<float> hist;
+-      bvpl_compute_scene_statistics(scene_in, hist);
+-      hist.pretty_print();
+-      break;
+-    }
+-    default:
+-      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
+-      return false;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
+deleted file mode 100644
+index 9d7c20ba2c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
++++ /dev/null
+@@ -1,179 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for running a kernel to a boxm_scene
+-// \author Isabel Restrepo
+-// \date January 29, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
+-#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
+-#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-
+-namespace bvpl_scene_kernel_operator_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 5 inputs and has 1 output.
+-// * input[0]: The boxm_scene
+-// * input[1]: The kernel
+-// * input[2]: The grid type:
+-//           - float
+-//           - opinion
+-//           - ...
+-// * input[3]: String identifying functor type
+-// * input[4]: Output path to a dir where to store, id octree and response octree
+-//
+-// * output[0]: Output scene with response and kernel id
+-
+-bool bvpl_scene_kernel_operator_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_kernel_operator_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "bvpl_kernel_sptr";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_scene_kernel_operator_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_kernel_operator_process_globals;
+-
+-  if (pro.n_inputs() < n_inputs_)
+-  {
+-    std::cerr << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << '\n';
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
+-  std::string datatype = pro.get_input<std::string>(i++);
+-  std::string functor_name = pro.get_input<std::string>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-  //short level = 0;
+-
+-  //print inputs
+-  std::cout << "In bvpl_scene_kernel_operator:\n"
+-           << "Datatype:     " << datatype << std::endl
+-           << "Functor Name: " << functor_name << std::endl;
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cerr <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if ( !kernel ) {
+-    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-
+-  if (datatype == "bsta_gauss_f1")
+-  {
+-    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-    typedef boct_tree<short, gauss_type > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-    double finest_cell_length = scene_in->finest_cell_length();
+-    kernel->set_voxel_length(finest_cell_length);
+-
+-    //parameters of the output scene are the same as those of the input scene
+-    boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "gauss_response_scene");
+-    scene_out->set_appearance_model(BSTA_GAUSS_F1);
+-    scene_out->write_scene("/gauss_response_scene.xml");
+-
+-    if (functor_name == "gauss_convolution") {
+-      bvpl_gauss_convolution_functor functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-      return true;
+-    }
+-    else if (functor_name == "positive_gauss_convolution") {
+-      bvpl_positive_gauss_conv_functor functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-
+-      //clean memory
+-      scene_in->unload_active_blocks();
+-      scene_out->unload_active_blocks();
+-
+-      return true;
+-    }
+-      return false;
+-  }
+-  else if (datatype == "float")
+-  {
+-    typedef boct_tree<short, float > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-    double finest_cell_length = scene_in->finest_cell_length();
+-    kernel->set_voxel_length(finest_cell_length);
+-    //parameters of the output scene are the same as those of the input scene
+-    boxm_scene<tree_type> *scene_out =
+-      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "response_scene");
+-    scene_out->set_appearance_model(BOXM_FLOAT);
+-    scene_out->write_scene("/float_response_scene.xml");
+-
+-    if (functor_name == "edge_algebraic_mean") {
+-      bvpl_edge_algebraic_mean_functor<float> functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-      return true;
+-    }
+-    else if (functor_name == "algebraic") {
+-      bvpl_algebraic_functor functor;
+-      bvpl_scene_kernel_operator scene_oper;
+-      //operate on scene
+-      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
+-      scene_ptr = scene_out;
+-      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-      return true;
+-    }
+-    else
+-      return false;
+-  }
+-  else
+-    return false;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
+deleted file mode 100644
+index 74762468c1..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
++++ /dev/null
+@@ -1,151 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief A class for successively running a kernel(of a vector), applying non-max suppression and combining with previous result
+-// \author Isabel Restrepo
+-// \date December 2, 2009
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/kernels/bvpl_kernel_factory.h>
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_attributes.h>
+-
+-namespace bvpl_scene_vector_operator_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 6 inputs and has 1 output.
+-// * input[0]: The boxm_scene
+-// * input[1]: The kernels; bvpl_kernel_vector_sptr
+-// * input[2]: The grid type:
+-//           - float
+-//           - opinion
+-//           - ...
+-// * input[3]: String identifying octree_vector_operator (e.g. max)
+-// * input[4]: String identifying functor type
+-// * input[5]: Output path to a dir where to store, id octree and response octree
+-//
+-// * output[0]: Output scene with response and kernel id
+-
+-
+-bool bvpl_scene_vector_operator_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_vector_operator_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "bvpl_kernel_vector_sptr";
+-  input_types_[2] = "vcl_string";
+-  input_types_[3] = "vcl_string";
+-  input_types_[4] = "vcl_string";
+-  input_types_[5] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool bvpl_scene_vector_operator_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_scene_vector_operator_process_globals;
+-
+-  if (pro.n_inputs() < n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_kernel_vector_sptr kernel_vec = pro.get_input<bvpl_kernel_vector_sptr>(i++);
+-  std::string datatype = pro.get_input<std::string>(i++);
+-  std::string operator_name = pro.get_input<std::string>(i++);
+-  std::string functor_name = pro.get_input<std::string>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Grid is not valid!\n";
+-    return false;
+-  }
+-
+-  if ( !kernel_vec ) {
+-    std::cout << pro.name() << " :-- Kernel is not valid!\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-
+-  if (datatype == "float")
+-  {
+-    typedef boct_tree<short, float > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-    //parameters of the output scene are the same as thos of the input scene
+-    boxm_scene<boct_tree<short, bvpl_octree_sample<float> > > *scene_out =
+-    new boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
+-    scene_out->set_paths(output_path, "response_scene");
+-    scene_out->set_appearance_model(BVPL_SAMPLE_FLOAT);
+-    scene_out->write_scene("/response_scene.xml");
+-    if (operator_name == "max_vector_operator")
+-    {
+-      bvpl_max_vector_operator<float> max_oper;
+-
+-      if (functor_name == "edge_geometric_mean") {
+-        bvpl_edge_geometric_mean_functor<float> functor;
+-        bvpl_scene_vector_operator scene_oper;
+-        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
+-        scene_ptr = scene_out;
+-        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-        return true;
+-      }
+-    }
+-  }
+-  if (datatype == "bsta_gauss_f1")
+-  {
+-    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-    typedef boct_tree<short, gauss_type > tree_type;
+-    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
+-
+-    //parameters of the output scene are the same as thos of the input scene
+-    boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > > *scene_out =
+-    new boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
+-    scene_out->set_paths(output_path, "response_scene");
+-    scene_out->set_appearance_model(BVPL_SAMPLE_BSTA_GAUSS_F1);
+-    scene_out->write_scene("/response_scene.xml");
+-    if (operator_name == "max_vector_operator")
+-    {
+-      bvpl_max_vector_operator<gauss_type> max_oper;
+-
+-      if (functor_name == "gauss_convolution") {
+-        bvpl_gauss_convolution_functor functor;
+-        bvpl_scene_vector_operator scene_oper;
+-        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
+-        scene_ptr = scene_out;
+-        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-        return true;
+-      }
+-    }
+-    return false;
+-  }
+-  else
+-    return false;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
+deleted file mode 100644
+index 93af3679c8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
++++ /dev/null
+@@ -1,64 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (beaudet)
+-// \author Isabel Restrepo
+-// \date 27-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_compute_beaudet_measure_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_beaudet_measure_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_beaudet_measure_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_beaudet_measure_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_beaudet_measure_process_globals;
+-
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->compute_beaudet_corners(global_taylor, scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
+deleted file mode 100644
+index 94d872196d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
++++ /dev/null
+@@ -1,65 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (Harris)
+-// \author Isabel Restrepo
+-// \date 20-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_compute_harris_measure_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_harris_measure_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_harris_measure_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_harris_measure_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_harris_measure_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->compute_laptev_corners(global_taylor, scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
+deleted file mode 100644
+index 16f6bd1cd0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
++++ /dev/null
+@@ -1,57 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (Harris)
+-// \author Isabel Restrepo
+-// \date 20-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_corner_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_corner_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_corner_statistics_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_corner_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_corner_statistics_process_globals;
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->explore_corner_statistics(global_taylor, scene_id);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
+deleted file mode 100644
+index 9c003728ca..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl_octree/bvpl_global_corners.h>
+-
+-//: global variables
+-namespace bvpl_load_global_corners_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_load_global_corners_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_corners_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_global_corners_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_load_global_corners_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_corners_process_globals;
+-
+-  // get inputs
+-  std::string corners_file = pro.get_input<std::string>(0);
+-  auto *global_corners = new bvpl_global_corners(corners_file);
+-
+-  // store output
+-  pro.set_output_val<bvpl_global_corners_sptr>(0, global_corners);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
+deleted file mode 100644
+index af283e13ec..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute corner measure (Harris)
+-// \author Isabel Restrepo
+-// \date 20-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-
+-//:global variables
+-namespace bvpl_threshold_corners_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_threshold_corners_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_threshold_corners_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ;
+-  input_types_[i++] = "bvpl_global_corners_sptr" ;
+-  input_types_[i++] = "int";  //scene id
+-  input_types_[i++] = "float"; //threshold
+-  input_types_[i++] = "vcl_string"; //output path for thresholded scenes
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_threshold_corners_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_threshold_corners_process_globals;
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  auto corner_thresh = pro.get_input<float>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  if (!(global_taylor && global_corners))
+-    return false;
+-
+-  global_corners->threshold_laptev_corners(global_taylor, scene_id, corner_thresh, output_path);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
+deleted file mode 100644
+index c4eebb2560..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
++++ /dev/null
+@@ -1,94 +0,0 @@
+-//:
+-// \file
+-// \brief A process to add Taylor error at a percentage of voxels in a block
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_add_pca_errors_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_add_pca_errors_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_pca_errors_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
+-  input_types_[i++] = "unsigned"; //dimension
+-  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_add_pca_errors_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_pca_errors_process_globals;
+-
+-  //get inputs
+-  unsigned i =0;
+-  bvpl_pca_error_scenes_sptr error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
+-  auto dim = pro.get_input<unsigned>(i++);
+-  auto fraction_nsamples = pro.get_input<double>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!error_scenes) {
+-    std::cerr << "Error in bvpl_add_pca_errors_process: Null error scene\n";
+-    return false;
+-  }
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scenes->get_scene(dim).as_pointer());
+-  if (!error_scene) {
+-    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  //sum errors within block
+-  double error = 0;
+-  if (fraction_nsamples < 0.95)
+-  {
+-    auto scene_ncells = (double)error_scene->size();
+-    error_scene->load_block(block_i,block_j,block_k);
+-    auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
+-    double nsamples = scene_ncells * fraction_nsamples;
+-
+-    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
+-    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
+-             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << '\n';
+-    error = bvpl_average_value(error_scene,block_i, block_j, block_k, tree_nsamples);
+-    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
+-  }
+-  else
+-  {
+-    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
+-    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
+-  }
+-
+-  //store output
+-  pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
+deleted file mode 100644
+index f6fb2f5d0a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
++++ /dev/null
+@@ -1,95 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 17-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_matrix_fixed.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_combine_pairwise_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_combine_pairwise_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_combine_pairwise_statistics_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i=0;
+-  input_types_[i++] = "vcl_string" ; //stats_file1
+-  input_types_[i++] = "vcl_string" ; //stats_file2
+-  input_types_[i++] = "vcl_string" ; //stats_file_out
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_combine_pairwise_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_combine_pairwise_statistics_process_globals;
+-
+-  //get inputs
+-  unsigned i= 0;
+-  std::string stats_file1 = pro.get_input<std::string>(i++);
+-  std::string stats_file2 = pro.get_input<std::string>(i++);
+-  std::string stats_file_out = pro.get_input<std::string>(i++);
+-
+-  //load files
+-  vnl_matrix_fixed<double, 125, 125> S1(0.0);
+-  vnl_vector_fixed<double, 125> mean1(0.0);
+-  unsigned long nfeatures1 =0;
+-  {
+-    std::ifstream stats_ifs(stats_file1.c_str());
+-    if (!stats_ifs.is_open()) {
+-      std::cerr << "Error: Failed to open file1\n";
+-      return false;
+-    }
+-    stats_ifs >> nfeatures1 >> mean1 >> S1;
+-    stats_ifs.close();
+-
+-  }
+-
+-  vnl_matrix_fixed<double, 125, 125> S2(0.0);
+-  vnl_vector_fixed<double, 125> mean2(0.0);
+-  unsigned long nfeatures2 =0;
+-
+-  {
+-    std::ifstream stats_ifs(stats_file2.c_str());
+-    if (!stats_ifs.is_open()) {
+-      std::cerr << "Warning: Failed to open file2 - output file will be identical to file1\n";
+-      std::ofstream stats_ofs(stats_file_out.c_str());
+-      stats_ofs.precision(15);
+-      stats_ofs << nfeatures1 << '\n' << mean1 << '\n' << S1;
+-      return true;
+-    }
+-    stats_ifs >> nfeatures2 >> mean2 >> S2;
+-    stats_ifs.close();
+-  }
+-
+-  vnl_matrix_fixed<double, 125, 125> S_out(0.0);
+-  vnl_vector_fixed<double, 125> mean_out(0.0);
+-  double nfeatures_out =0.0;
+-  bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
+-
+-  std::ofstream stats_ofs(stats_file_out.c_str());
+-  stats_ofs.precision(15);
+-  stats_ofs << nfeatures_out << '\n' << mean_out << '\n' << S_out;
+-  stats_ofs.close();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
+deleted file mode 100644
+index e6acd1accd..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
++++ /dev/null
+@@ -1,69 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute reconstruction error over all samples in a scene (test + train)
+-// \author Isabel Restrepo
+-// \date 13-Jan-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-//:global variables
+-namespace bvpl_compute_pca_error_block_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;        //directory path, where pca_info.xml is
+-  constexpr unsigned n_outputs_ = 0;       //error file
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_pca_error_block_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_block_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_discover_pca_kernels_sptr" ;  //directory path
+-  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
+-  input_types_[i++] = "int";   //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "unsigned";  //num_components
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_pca_error_block_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_block_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_discover_pca_kernels_sptr pca_extractor = pro.get_input<bvpl_discover_pca_kernels_sptr>(i++);
+-  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  auto num_components = pro.get_input<unsigned>(i++);
+-
+-  if (!pca_extractor)
+-    return false;
+-
+-  if (!pca_error_scenes)
+-    return false;
+-
+-  //bvpl_discover_pca_kernels pca_extractor(pca_dir);
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
+-  pca_extractor->compute_testing_error(error_scene, num_components, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
+deleted file mode 100644
+index 70d9cf1a4b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
++++ /dev/null
+@@ -1,132 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute reconstruction error over all samples in a scene (test + train)
+-// \author Isabel Restrepo
+-// \date 13-Jan-2011
+-
+-#include <iostream>
+-#include <cstdlib>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-#include <vul/vul_file.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-// global variables
+-namespace bvpl_compute_pca_error_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;        //directory path, where pca_info.xml is
+-  constexpr unsigned n_outputs_ = 0;       //error file
+-}
+-
+-
+-// sets input and output types
+-bool bvpl_compute_pca_error_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string" ;  //directory path
+-  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
+-  input_types_[i++] = "unsigned";  //num_components
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-// helper code to launch and manage pthreads
+-namespace {
+-  struct pthread_data
+-  {
+-    bvpl_discover_pca_kernels* pca_extractor;
+-    boxm_scene<boct_tree<short,float> > * error_scene;
+-    vgl_point_3d<int> block_idx;
+-    unsigned num_components;
+-  };
+-
+-  void* pthread_launcher(void *arg)
+-  {
+-    pthread_data *pd = reinterpret_cast<pthread_data*>(arg);
+-    vgl_point_3d<int> block_idx = pd->block_idx;
+-    pd->pca_extractor->compute_testing_error_thread_safe(pd->error_scene, pd->num_components, block_idx.x(), block_idx.y(), block_idx.z());
+-    //delete pd;
+-    return arg;
+-  }
+-}
+-#endif
+-
+-// the process
+-bool bvpl_compute_pca_error_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_error_scene_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  std::string pca_dir = pro.get_input<std::string>(i++);
+-  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
+-  auto num_components = pro.get_input<unsigned>(i++);
+-
+-  if (!vul_file::is_directory(pca_dir))
+-    return false;
+-
+-  if (!pca_error_scenes)
+-    return false;
+-
+-  auto *pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
+-  vgl_vector_3d<unsigned int> num_blocks = pca_extractor->data_scene_dim();
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
+-
+-#if BVPL_OCTREE_HAS_PTHREADS
+-  pca_extractor->load_all_scene_blocks();
+-  error_scene->read_all_blocks();
+-  unsigned num_threads = 0;
+-  std::vector<vgl_point_3d<int> > block_indices;
+-  for (unsigned block_i = 0; block_i < num_blocks.x(); ++block_i) {
+-    for (unsigned block_j = 0; block_j < num_blocks.y(); ++block_j) {
+-      for (unsigned block_k = 0; block_k < num_blocks.z(); ++block_k) {
+-        block_indices.push_back(vgl_point_3d<int>(block_i,block_j,block_k));
+-        ++num_threads;
+-      }
+-    }
+-  }
+-
+-  pthread_t* thread_id = new pthread_t[num_threads]; // beware of memory leaks ...
+-
+-  for (unsigned i =0; i < num_threads; ++i)
+-  {
+-    pthread_data* pd = new pthread_data();
+-    pd->pca_extractor = pca_extractor;
+-    pd->error_scene = error_scene;
+-    pd->num_components = num_components;
+-    pd->block_idx= block_indices[i];
+-    int rc = pthread_create(&thread_id[i], NULL, pthread_launcher, (void*) pd );
+-    //pthread_detach(thread_id[i]);
+-    if (rc)
+-    {
+-      std::cerr << "Error creating pthread, return code: "<<rc<<'\n';
+-      std::exit(-1);
+-    }
+-  }
+-#if 0
+-  for (unsigned i =0; i < num_threads; ++i)
+-  {
+-    pca_extractor.compute_testing_error_thread_safe(error_scene, num_components, block_indices[i].x(), block_indices[i].y(), block_indices[i].z());
+-  }
+-  pca_extractor.unload_all_scene_blocks();
+-#endif
+-
+-#endif // PTHREADS
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
+deleted file mode 100644
+index 775dc4cb23..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
++++ /dev/null
+@@ -1,59 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute reconstruction error over all samples in a scene (test + train)
+-// \author Isabel Restrepo
+-// \date 13-Jan-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-
+-//:global variables
+-namespace bvpl_compute_pca_test_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;        //directory path, where pca_info.xml is
+-  constexpr unsigned n_outputs_ = 1;       //error file
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_pca_test_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_test_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string" ;
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "vcl_string";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_pca_test_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_pca_test_error_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-
+-  bvpl_discover_pca_kernels pca_extractor(pca_dir);
+-
+-  vnl_vector<double> t_error;
+-  pca_extractor.compute_testing_error(t_error);
+-  std::ofstream error_ofs((pca_dir+ "/test_error.txt").c_str());
+-
+-  if (error_ofs)
+-    error_ofs << t_error;
+-
+-  //store output
+-  pro.set_output_val<std::string>(0, pca_dir+ "/test_error.txt");
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
+deleted file mode 100644
+index e76b7b5d98..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
++++ /dev/null
+@@ -1,98 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 17-Nov-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-//:global variables
+-namespace bvpl_discover_pca_features_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 9;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_discover_pca_features_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_discover_pca_features_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "vcl_string";   //directory to save PCA matrices
+-  input_types_[i++] = "double";   //fraction of the total number of leaves
+-  input_types_[i++] = "int";    // min and max of kernel
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-
+-  return pro.set_input_types(input_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_discover_pca_features_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_discover_pca_features_process_globals;
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cout << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs
+-  unsigned i =0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string pca_dir = pro.get_input<std::string>(i++);
+-  auto frac = pro.get_input<double>(i++);
+-  int min_x = pro.get_input<int>(i++);
+-  int min_y = pro.get_input<int>(i++);
+-  int min_z = pro.get_input<int>(i++);
+-  int max_x = pro.get_input<int>(i++);
+-  int max_y = pro.get_input<int>(i++);
+-  int max_z = pro.get_input<int>(i++);
+-
+-
+-  //check input's validity
+-  if (!scene_base.ptr()) {
+-    std::cout <<  " :-- Base Scene is not valid!\n";
+-    return false;
+-  }
+-
+-  //neighborhood box for volume "patches" 5x5x5 for now - this could be an input to the process
+-  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
+-
+-  //cast scene
+-  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > >* > (scene_base.as_pointer());
+-  if (!scene) {
+-    std::cout <<  " :-- Input Scene is not of supported type\n";
+-    return false;
+-  }
+-  std::cout << "Scene path: " << scene->filename()<< std::endl;;
+-
+-
+-  //number of samples - 10% of total number of leaf-cells
+-  auto nsamples = (unsigned long)((double)scene->size() * frac);
+-  std::cout << "Number of samples: " << nsamples << std::endl;
+-
+-  //bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene);
+-  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, pca_dir);
+-
+-  //write matrices to disk
+-  pca_extractor.xml_write();
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
+deleted file mode 100644
+index 365a0eb791..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
++++ /dev/null
+@@ -1,64 +0,0 @@
+-//:
+-// \file
+-// \brief A process that performs PCA analysis given the statistics collected from various scenes using bvpl_pca_global
+-// \author Isabel Restrepo
+-// \date 23-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_global_pca_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_global_pca_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_global_pca_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";   //path pca_global_info file
+-  input_types_[1] = "vcl_string";   //path to statistics file
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_global_pca_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_global_pca_process_globals;
+-
+-  //get inputs
+-  std::string pca_file = pro.get_input<std::string>(0);
+-  std::string stats_file = pro.get_input<std::string>(1);
+-
+-  //load file into matrices
+-  vnl_matrix_fixed<double, 125, 125> S(0.0);
+-  vnl_vector_fixed<double, 125> mean(0.0);
+-  unsigned long nfeatures =0;
+-  {
+-    std::ifstream stats_ifs(stats_file.c_str());
+-    if (!stats_ifs.is_open()) {
+-      std::cerr << "Error: Failed to open stats file\n";
+-      return false;
+-    }
+-    stats_ifs >> nfeatures >> mean >> S;
+-  }
+-
+-  bvpl_global_pca<125> global_pca(pca_file);
+-
+-  global_pca.set_up_pca_evd(S,mean,nfeatures);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
+deleted file mode 100644
+index 10e35faddb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \brief A process to init auxiliary scenes and other variables
+-// \author Isabel Restrepo
+-// \date 23-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_init_global_pca_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_init_global_pca_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_pca_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; // path to pca_global_info file
+-  input_types_[1] = "unsigned"; //id of the scene to initialize
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_init_global_pca_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_pca_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-  auto scene_id = pro.get_input<unsigned>(1);
+-
+-  bvpl_global_pca<125> global_pca(pca_dir);
+-  global_pca.init(scene_id);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
+deleted file mode 100644
+index 8b2070e215..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
++++ /dev/null
+@@ -1,50 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 15-May-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl_octree/bvpl_global_pca.h>
+-
+-//: global variables
+-namespace bvpl_load_global_pca_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_load_global_pca_125_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_pca_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_global_pca_125_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_load_global_pca_125_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_pca_process_globals;
+-
+-  // get inputs
+-  std::string pca_file = pro.get_input<std::string>(0);
+-  auto *global_pca = new bvpl_global_pca<125>(pca_file);
+-
+-  // store output
+-  pro.set_output_val<bvpl_global_pca_125_sptr>(0, global_pca);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
+deleted file mode 100644
+index 39161edf02..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
++++ /dev/null
+@@ -1,58 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 21-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-
+-//:global variables
+-namespace bvpl_load_pca_error_scenes_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_pca_error_scenes_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_error_scenes_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "boxm_scene_base_sptr";  //data scene
+-  input_types_[i++] = "vcl_string";   //pca path
+-  input_types_[i++] = "unsigned";   //dimension pca feture
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_pca_error_scenes_sptr" ;
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_pca_error_scenes_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_error_scenes_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string pca_path = pro.get_input<std::string>(i++);
+-  auto feature_dim = pro.get_input<unsigned>(i++);
+-
+-  if (!data_scene_base)
+-    return false;
+-
+-  bvpl_pca_error_scenes *error_scenes = new bvpl_pca_error_scenes(data_scene_base, pca_path, feature_dim);
+-  //store output
+-  pro.set_output_val<bvpl_pca_error_scenes_sptr>(0, error_scenes);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
+deleted file mode 100644
+index 48082ecb75..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
++++ /dev/null
+@@ -1,55 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 3-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-//:global variables
+-namespace bvpl_load_pca_info_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_pca_info_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_info_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string" ;  //directory path
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_discover_pca_kernels_sptr";  //pca info
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_pca_info_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_pca_info_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-
+-  if (!vul_file::is_directory(pca_dir))
+-    return false;
+-
+-  bvpl_discover_pca_kernels_sptr pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
+-
+-  //store output
+-  pro.set_output_val<bvpl_discover_pca_kernels_sptr>(0, pca_extractor);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
+deleted file mode 100644
+index fb29aeaa8c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 4-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-
+-#include <vul/vul_file.h>
+-
+-//:global variables
+-namespace bvpl_normalize_pca_training_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;  //directory path
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_normalize_pca_training_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_normalize_pca_training_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_normalize_pca_training_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_normalize_pca_training_error_process_globals;
+-
+-  //get inputs
+-  std::string pca_dir = pro.get_input<std::string>(0);
+-
+-  if (!vul_file::is_directory(pca_dir)){
+-    std::cerr << " Invalid pca directory\n";
+-    return false;
+-  }
+-
+-
+-  bvpl_discover_pca_kernels pca_extractor(pca_dir);
+-
+-  vnl_vector<double> error;
+-  pca_extractor.compute_normalized_training_error(error);
+-
+-  std::ofstream ofs((pca_dir + "/normalized_training_error.txt").c_str());
+-  ofs.precision(15);
+-  ofs << error;
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
+deleted file mode 100644
+index 40149c3411..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
++++ /dev/null
+@@ -1,77 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute pca projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-//:global variables
+-namespace bvpl_pca_global_add_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_global_add_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_add_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_global_add_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_add_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr error_scene_base = global_pca->load_error_scene(scene_id);
+-  if (!error_scene_base) {
+-    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-
+-  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
+-  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
+-
+-  //store output
+-    pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
+deleted file mode 100644
+index 0e127a6a1c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute pca projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_pca_global_proj_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_global_proj_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_proj_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_global_proj_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_proj_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL\n";
+-    return false;
+-  }
+-
+-  global_pca->projection_error(scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
+deleted file mode 100644
+index fc2e46ff3e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
++++ /dev/null
+@@ -1,75 +0,0 @@
+-//:
+-// \file
+-// \brief  A process that computes pca statistics (scatter matrix and mean) on a per block basis
+-// \author Isabel Restrepo
+-// \date 14-Mar-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_pca_global_statistics_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_global_statistics_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_statistics_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i =0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene_id (this can be confirmed in xml file pca_info.xml)
+-  input_types_[i++] = "int";   //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "vcl_string"; //path to file to hold statistics of this block
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_global_statistics_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_global_statistics_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  std::string stats_file = pro.get_input<std::string>(i++);
+-
+-  if(!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL \n";
+-    return false;
+-  }
+-  vnl_matrix_fixed<double, 125, 125> S(0.0);
+-  vnl_vector_fixed<double, 125> mean(0.0);
+-  unsigned long nfeatures = 0;
+-
+-
+-  if(global_pca->sample_statistics(scene_id, block_i, block_j, block_k, S, mean, nfeatures))
+-  {
+-    std::ofstream stats_ofs(stats_file.c_str());
+-    stats_ofs.precision(15);
+-    stats_ofs << nfeatures << '\n' << mean << '\n' << S;
+-    stats_ofs.close();
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
+deleted file mode 100644
+index 341a8e76ac..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute pca projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-
+-//:global variables
+-namespace bvpl_pca_project_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_pca_project_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_project_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_pca_project_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_pca_project_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_pca)
+-  {
+-    std::cerr << "Global PCA is NULL\n";
+-    return false;
+-  }
+-
+-  global_pca->project(scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
+deleted file mode 100644
+index 3f4d2adf17..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
++++ /dev/null
+@@ -1,70 +0,0 @@
+-//:
+-// \file
+-// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
+-// \author Isabel Restrepo
+-// \date 13-Oct-2010
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
+-
+-
+-#include <boxm/boxm_scene.h>
+-
+-//: global variables
+-namespace bvpl_compute_sf_raw_response_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_compute_sf_raw_response_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_sf_raw_response_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";  //input/response scene
+-  input_types_[i++] = "boxm_scene_base_sptr";  //valid scene
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_compute_sf_raw_response_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_sf_raw_response_process_globals;
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  boxm_scene_base_sptr valid_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-
+-  //get scene
+-  typedef boct_tree<short, vnl_vector_fixed< float,10 > > response_tree_type;
+-  typedef boct_tree<short, bool > valid_tree_type;
+-
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene< response_tree_type >* >(scene_base.as_pointer()))
+-  {
+-    double cell_length = scene_in->finest_cell_length();
+-
+-    if (auto *valid_scene = dynamic_cast<boxm_scene< valid_tree_type >* >(valid_scene_base.as_pointer()))
+-    {
+-      bvpl_gauss3D_steerable_filters sf;
+-      sf.basis_response_at_leaves(scene_in,valid_scene, cell_length);
+-    }
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
+deleted file mode 100644
+index 3ceffbbc47..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
++++ /dev/null
+@@ -1,87 +0,0 @@
+-//:
+-// \file
+-// \brief A process to initialize the response scene for steerable filter bank
+-// \author Isabel Restrepo
+-// \date 22-Aug-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-#include <bvpl/functors/bvpl_algebraic_functor.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-#include <boxm/boxm_scene.h>
+-
+-//: global variables
+-namespace bvpl_init_sf_response_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 2;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_init_sf_response_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_sf_response_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";  //input scene
+-  input_types_[1] = "vcl_string";            //output path
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";  //response scene
+-  output_types_[1] = "boxm_scene_base_sptr";  //valid scene
+-
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_init_sf_response_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_sf_response_scene_process_globals;
+-
+-  //get inputs:
+-  unsigned i = 0;
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  std::string output_path = pro.get_input<std::string>(i++);
+-
+-  //get scene
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
+-
+-  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
+-  {
+-    boxm_scene<out_tree_type> *scene_out =
+-    new boxm_scene<out_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    scene_out->set_paths(output_path, "steerable_gauss_3d_scene");
+-    scene_out->set_appearance_model(VNL_FLOAT_10);
+-    scene_out->write_scene("steerable_gauss_3d_scene.xml");
+-    scene_in->clone_blocks_to_vector<10>(*scene_out);
+-
+-    boxm_scene<boct_tree<short, bool> > *valid_scene =
+-    new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
+-    valid_scene->set_paths(output_path, "valid_scene");
+-    valid_scene->set_appearance_model(BOXM_BOOL);
+-    valid_scene->write_scene("valid_scene.xml");
+-
+-
+-    //store output
+-    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
+-    scene_ptr = scene_out;
+-    boxm_scene_base_sptr valid_scene_ptr=new boxm_scene_base();
+-    valid_scene_ptr = valid_scene;
+-    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
+-    pro.set_output_val<boxm_scene_base_sptr>(1, valid_scene_ptr);
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
+deleted file mode 100644
+index c1b1c309c0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
++++ /dev/null
+@@ -1,90 +0,0 @@
+-//:
+-// \file
+-// \brief A process to add Taylor error at a percentage of voxels in a block
+-// \author Isabel Restrepo
+-// \date 15-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_add_taylor_errors_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_add_taylor_errors_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_taylor_errors_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr";
+-  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_add_taylor_errors_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_add_taylor_errors_process_globals;
+-
+-  //get inputs
+-  unsigned i =0;
+-  boxm_scene_base_sptr error_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  auto fraction_nsamples = pro.get_input<double>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!error_scene_base) {
+-    std::cerr << "Error in bvpl_add_taylor_errors_process: Null error scene\n";
+-    return false;
+-  }
+-  auto* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scene_base.as_pointer());
+-  if (!error_scene) {
+-    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-  //sum errors within block
+-  auto scene_ncells = (double)error_scene->size();
+-  error_scene->load_block(block_i,block_j,block_k);
+-  auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
+-  double nsamples = scene_ncells * fraction_nsamples;
+-
+-  //number of samples - 10% of total number of leaf-cells
+-  double error = 0.0;
+-  if (fraction_nsamples < 0.95) {
+-    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
+-    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
+-             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
+-    error = bvpl_taylor_basis::sum_errors(error_scene,block_i, block_j, block_k, tree_nsamples);
+-  }
+-  else {
+-    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
+-    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << std::endl;
+-  }
+-
+-  //store output
+-  pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
+deleted file mode 100644
+index 50c28a393e..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
++++ /dev/null
+@@ -1,80 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 12-Apr-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-#include <vul/vul_file.h>
+-
+-//:global variables
+-namespace bvpl_compute_taylor_coefficients_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_taylor_coefficients_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_coefficients_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string" ;  //path of taylor_global_info.xml
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_taylor_coefficients_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_coefficients_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  std::string taylor_dir = pro.get_input<std::string>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  int dim = pro.get_input<int>(i++);
+-
+-  if (!vul_file::is_directory(taylor_dir))
+-    return false;
+-
+-  switch (dim) {
+-    case 3:
+-    {
+-      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
+-      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
+-      break;
+-    }
+-    case 10:
+-    {
+-      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
+-      break;
+-    }
+-    default:
+-      break;
+-  }
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
+deleted file mode 100644
+index b992c1b5ae..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
++++ /dev/null
+@@ -1,78 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute the Taylor reconstruction error of a block (Assumes, basis has been applied)
+-// \author Isabel Restrepo
+-// \date 9-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <boxm/boxm_scene.h>
+-
+-//:global variables
+-namespace bvpl_compute_taylor_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_compute_taylor_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "boxm_scene_base_sptr"; //the original data scene
+-  input_types_[i++] = "bvpl_taylor_scenes_map_sptr" ; //scenes needed for Taylor operations
+-  input_types_[i++] = "int" ; //block index in x-dimension
+-  input_types_[i++] = "int" ; //block index in y-dimension
+-  input_types_[i++] = "int" ; //block index in z-dimension
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  i=0;
+-  output_types_[i++] = "boxm_scene_base_sptr"; //the error for this block
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_compute_taylor_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_compute_taylor_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
+-  bvpl_taylor_scenes_map_sptr taylor_scenes = pro.get_input<bvpl_taylor_scenes_map_sptr>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-  if (!data_scene_base) {
+-    std::cerr << "Error in bvpl_compute_taylor_error_process: Null data scene\n";
+-    return false;
+-  }
+-  if (!taylor_scenes) {
+-    std::cerr << "Error in bvpl_compute_taylor_error_process: Null scenes map\n";
+-    return false;
+-  }
+-
+-  //assemble the Taylor basis
+-  bvpl_taylor_basis::assemble_basis(taylor_scenes, block_i, block_j, block_k);
+-
+-  //compute the error block
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
+-  auto* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
+-  double cell_length = data_scene->finest_cell_length();
+-  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),
+-                                                 error_scene,taylor_scenes->loader(),
+-                                                 block_i, block_j, block_k, cell_length);
+-
+-  pro.set_output_val<boxm_scene_base_sptr>(0, error_scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
+deleted file mode 100644
+index 0b57bb488d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
++++ /dev/null
+@@ -1,77 +0,0 @@
+-//:
+-// \file
+-// \brief A process to extract a Taylor coefficient from the 10-d vector
+-// \author Isabel Restrepo
+-// \date 12-Apr-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-//:global variables
+-namespace bvpl_explore_coefficient_scene_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 3;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_explore_coefficient_scene_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_explore_coefficient_scene_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string"; //path to Taylor info file
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int"; //coefficient
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "boxm_scene_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_explore_coefficient_scene_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_explore_coefficient_scene_process_globals;
+-
+-  //get inputs
+-  std::string taylor_dir = pro.get_input<std::string>(0);
+-  int scene_id = pro.get_input<int>(1);
+-  int coeff_id = pro.get_input<int>(2);
+-
+-  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-  bvpl_global_taylor<double, 10> taylor(taylor_dir, kernel_names);
+-
+-  boxm_scene_base_sptr valid_scene_base = taylor.load_valid_scene(scene_id);
+-  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
+-  if (!valid_scene) {
+-    std::cerr << "Error in bvpl_explore_coefficient_scene_process: Could not cast valid scene\n";
+-    return false;
+-  }
+-
+-  std::stringstream scene_ss;
+-  scene_ss << "coefficient_" << coeff_id << "_scene_" << scene_id ;
+-  std::string scene_path = taylor.aux_dirs(scene_id) + "/" + scene_ss.str() + ".xml";
+-
+-  std::cout << "Initializing " << scene_path << '\n'
+-           << "Scene: " << scene_path << " does not exist, initializing xml" << std::endl;
+-  boxm_scene<boct_tree<short, float> > *scene =
+-  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->set_paths(taylor.aux_dirs(scene_id), scene_ss.str());
+-  scene->write_scene("/" + scene_ss.str() +  ".xml");
+-  taylor.extract_coefficient_scene(scene_id,  coeff_id, scene);
+-
+-  //store output
+-  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
+deleted file mode 100644
+index c900aeef5d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
++++ /dev/null
+@@ -1,68 +0,0 @@
+-//:
+-// \file
+-// \brief A process to init auxiliary scenes and other variables
+-// \author Isabel Restrepo
+-// \date 12-Apr-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-//:global variables
+-namespace bvpl_init_global_taylor_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 2;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_init_global_taylor_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_taylor_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; // path to taylor_global_info file
+-  input_types_[1] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_init_global_taylor_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_init_global_taylor_process_globals;
+-
+-  //get inputs
+-  std::string taylor_dir = pro.get_input<std::string>(0);
+-  int dim = pro.get_input<int>(1);
+-
+-  switch (dim) {
+-    case 3:
+-    {
+-      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
+-      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.init();
+-      break;
+-    }
+-    case 10:
+-    {
+-      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
+-      global_taylor.init();
+-      break;
+-    }
+-    default:
+-      break;
+-  }
+-
+-
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
+deleted file mode 100644
+index 0e5713c4dc..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
++++ /dev/null
+@@ -1,52 +0,0 @@
+-//:
+-// \file
+-// \brief
+-// \author Isabel Restrepo
+-// \date 21-Jul-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl_octree/bvpl_global_taylor.h>
+-
+-//: global variables
+-namespace bvpl_load_global_taylor_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//: sets input and output types
+-bool bvpl_load_global_taylor_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_global_taylor_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_global_taylor_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//: the process
+-bool bvpl_load_global_taylor_process(bprb_func_process& pro)
+-{
+-  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
+-  using namespace bvpl_load_global_taylor_process_globals;
+-
+-  // get inputs
+-  std::string taylor_file = pro.get_input<std::string>(0);
+-  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
+-  auto *global_taylor = new bvpl_global_taylor<double, 10>(taylor_file, kernel_names);
+-
+-  // store output
+-  pro.set_output_val<bvpl_global_taylor_sptr>(0, global_taylor);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
+deleted file mode 100644
+index 0b405689b0..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-//:
+-// \file
+-// \brief A process to load to memory all smart pointers of scenes needed for Taylor reconstruction
+-// \author Isabel Restrepo
+-// \date 14-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <vul/vul_file.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-//:global variables
+-namespace bvpl_load_taylor_scenes_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 7;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_taylor_scenes_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_scenes_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "vcl_string";  //dir to Taylor scenes
+-  input_types_[i++] = "int";         // min and max of Taylor kernel
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-  std::vector<std::string> output_types_(n_outputs_);
+-  i = 0;
+-  output_types_[i++] = "bvpl_taylor_scenes_map_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_taylor_scenes_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_scenes_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  std::string taylor_dir = pro.get_input<std::string>(i++);
+-  int min_x = pro.get_input<int>(i++);
+-  int min_y = pro.get_input<int>(i++);
+-  int min_z = pro.get_input<int>(i++);
+-  int max_x = pro.get_input<int>(i++);
+-  int max_y = pro.get_input<int>(i++);
+-  int max_z = pro.get_input<int>(i++);
+-
+-  if (!vul_file::is_directory(taylor_dir)) {
+-    std::cerr<<"Error in bvpl_load_taylor_scenes_process_process: Taylor directory doesn't exist\n";
+-  }
+-
+-  bvpl_taylor_basis_loader loader(taylor_dir, vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
+-  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
+-
+-  //store output
+-  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
+deleted file mode 100644
+index 6fe31b4168..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
++++ /dev/null
+@@ -1,77 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute taylor projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-
+-
+-//:global variables
+-namespace bvpl_taylor_global_add_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_taylor_global_add_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_add_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "double";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_taylor_global_add_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_add_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_taylor)
+-  {
+-    std::cerr << "Global taylor is NULL\n";
+-    return false;
+-  }
+-
+-  boxm_scene_base_sptr error_scene_base = global_taylor->load_error_scene(scene_id);
+-  if (!error_scene_base) {
+-    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
+-    return false;
+-  }
+-
+-  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
+-  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
+-
+-  //store output
+-    pro.set_output_val<double>(0, error);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
+deleted file mode 100644
+index 3f3ca0a701..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//:
+-// \file
+-// \brief A process to compute taylor projection coeffiecients
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-
+-//:global variables
+-namespace bvpl_taylor_global_proj_error_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 5;
+-  constexpr unsigned n_outputs_ = 0;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_taylor_global_proj_error_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_proj_error_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  unsigned i = 0;
+-  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
+-  input_types_[i++] = "int"; //scene id
+-  input_types_[i++] = "int";  //block Indices
+-  input_types_[i++] = "int";
+-  input_types_[i++] = "int";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_taylor_global_proj_error_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_taylor_global_proj_error_process_globals;
+-
+-  //get inputs
+-  unsigned i = 0;
+-  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
+-  int scene_id = pro.get_input<int>(i++);
+-  int block_i = pro.get_input<int>(i++);
+-  int block_j = pro.get_input<int>(i++);
+-  int block_k = pro.get_input<int>(i++);
+-
+-  if (!global_taylor)
+-  {
+-    std::cerr << "Global taylor is NULL\n";
+-    return false;
+-  }
+-
+-  global_taylor->compute_approximation_error(scene_id, block_i, block_j, block_k);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
+deleted file mode 100644
+index 320399fb72..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree )
+-include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree/pro)
+-
+-add_executable( bvpl_octree_pro_test_all
+-  test_driver.cxx
+-  test_bvpl_plane_propagation_process.cxx
+-)
+-
+-target_link_libraries( bvpl_octree_pro_test_all ${VXL_LIB_PREFIX}testlib bvpl_octree_pro bvpl_octree boxm boxm_pro boxm_sample boxm_util boct bvpl bprb brdb sdet ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+-
+-if(SEGFAULT_FIXED)
+-add_test( NAME bvpl_octree_pro_plane_propagation_process COMMAND $<TARGET_FILE:bvpl_octree_pro_test_all> test_bvpl_plane_propagation_process)
+-endif()
+-
+-add_executable( bvpl_octree_pro_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_pro_test_include bvpl_octree_pro sdet )
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
+deleted file mode 100644
+index 1073b2e437..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
++++ /dev/null
+@@ -1,144 +0,0 @@
+-#include <iostream>
+-#include <vector>
+-#include <testlib/testlib_test.h>
+-//:
+-// \file
+-// \brief  This test creates a tree with 8 leaf cells and inserts only one plane to each
+-//         After the boxm_plane_propagation_process is applied, each cell will insert their
+-//         neighbors' observation planes and insert into itself. At the end each cell should
+-//         have 8 planes in the observation list since each cell has 7 neighbors (all the
+-//         other cells in the tree)
+-//
+-// \author Gamze Tunali
+-// \date   March 24, 2010
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <brdb/brdb_value.h>
+-#include <brdb/brdb_query.h>
+-#include <brdb/brdb_selection.h>
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_parameters_sptr.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <boct/boct_tree_cell.h>
+-#include <boct/boct_tree.h>
+-
+-#include <boxm/boxm_scene.h>
+-#include <boxm/sample/boxm_edge_tangent_sample.h>
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
+-#include <vul/vul_file.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-
+-static void test_bvpl_plane_propagation_process()
+-{
+-  typedef boxm_edge_tangent_sample<float> data_type;
+-  typedef boct_tree<short,data_type > tree_type;
+-  typedef boxm_scene<boct_tree<short,data_type > > scene_type;
+-
+-  // create the main scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-  vgl_vector_3d<double> block_dim(10,10,10);
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  scene_type scene(lvcs, origin, block_dim, world_dim);
+-  scene.set_octree_levels(3,2);
+-  scene.set_paths("./boxm_scene", "block");
+-  scene.set_appearance_model(BOXM_EDGE_LINE);
+-  x_write(std::cout, scene, "scene");
+-  vul_file::make_directory("./boxm_scene");
+-  scene.write_scene();
+-
+-  boxm_block_iterator<boct_tree<short,data_type > > iter(&scene);
+-  while (!iter.end())
+-  {
+-    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
+-    boxm_block<boct_tree<short,data_type > > * block=scene.get_active_block();
+-    boct_tree<short,data_type > * tree= block->get_tree();
+-
+-    // get the leaf nodes and insert one plane to each
+-    std::vector<boct_tree_cell<short,data_type >*> cells=tree->leaf_cells();
+-    for (unsigned i=0; i<cells.size(); i++) {
+-      boxm_plane_obs<float> p(vgl_homg_plane_3d<float>(float(i+1),0.f,0.f,1.f), 1.0f);
+-      data_type data = cells[i]->data();
+-      data.insert(p);
+-      cells[i]->set_data(data);
+-    }
+-    block->init_tree(tree);
+-    block->get_tree()->print();
+-    scene.write_active_block();
+-    iter++;
+-  }
+-
+-  DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
+-  REGISTER_DATATYPE(boxm_scene_base_sptr);
+-
+-  //: set the inputs
+-  brdb_value_sptr v0 = new brdb_value_t<boxm_scene_base_sptr>(new boxm_scene<boct_tree<short,data_type > >(scene));
+-  brdb_value_sptr v1 = new brdb_value_t<std::string>(scene.path());
+-  brdb_value_sptr v2 = new brdb_value_t<std::string>("new_scene");
+-  brdb_value_sptr v3 = new brdb_value_t<std::string>("new_scene.xml");
+-
+-  //: inits with the default params
+-  bool good = bprb_batch_process_manager::instance()->init_process("bvplPlanePropagateProcess");
+-  good = good && bprb_batch_process_manager::instance()->set_input(0, v0);
+-  good = good && bprb_batch_process_manager::instance()->set_input(1, v1);
+-  good = good && bprb_batch_process_manager::instance()->set_input(2, v2);
+-  good = good && bprb_batch_process_manager::instance()->set_input(3, v3);
+-  good = good && bprb_batch_process_manager::instance()->run_process();
+-
+-  unsigned id;
+-  good = good && bprb_batch_process_manager::instance()->commit_output(0, id);
+-  TEST("process commits output", good, true);
+-
+-  // check if the results are in DB
+-  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
+-  brdb_selection_sptr S = DATABASE->select("boxm_scene_base_sptr_data", std::move(Q));
+-  if (S->size()!=1){
+-    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
+-             << " no selections\n";
+-  }
+-  brdb_value_sptr value;
+-  if (!S->get_value(std::string("value"), value)) {
+-    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
+-             << " didn't get value\n";
+-  }
+-  bool non_null = (value != nullptr);
+-  TEST("the output scene non-null", non_null, true);
+-
+-  auto* result=static_cast<brdb_value_t<boxm_scene_base_sptr>* >(value.ptr());
+-  boxm_scene_base_sptr scene_sptr = result->value();
+-
+-  // get the new scene with updated cells
+-  auto *scene2 = static_cast<scene_type *>(scene_sptr.as_pointer());
+-  boxm_block_iterator<boct_tree<short,data_type > > iter2(scene2);
+-
+-  bool obs_num_ok=true;
+-  while (!iter2.end())
+-  {
+-    scene2->load_block(iter2.index().x(),iter2.index().y(),iter2.index().z());
+-    boxm_block<tree_type > * block=scene2->get_active_block();
+-    tree_type * tree= block->get_tree();
+-
+-    // get the leaf nodes and insert one plane to each
+-    std::vector<boct_tree_cell<short,data_type >*> nodes=tree->leaf_cells();
+-    for (auto & node : nodes) {
+-      unsigned num=node->data().num_obs();
+-      // each node has 8 neighbors in the 3x3 neighborhood including itself
+-      if (num != 8)
+-        obs_num_ok = false;
+-    }
+-    iter2++;
+-  }
+-  TEST("The number of expected observations at each cell", obs_num_ok, true);
+-}
+-
+-TESTMAIN(test_bvpl_plane_propagation_process);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
+deleted file mode 100644
+index 9fae26da90..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_bvpl_plane_propagation_process );
+-
+-void register_tests()
+-{
+-  REGISTER( test_bvpl_plane_propagation_process );
+-}
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
+deleted file mode 100644
+index 407d98e94a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
+deleted file mode 100644
+index 79b3a2bcb4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-Each of the subfolders contains scripts for different experiments:
+-
+-reconstruction error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed fraction of training samples and varying number of dimensions.
+-
+-training error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed dimension and varying number of training samples
+-
+-Note: *.sh calls the python scripts with appropriate inputs. You only need to adjust *.sh for your system
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
+deleted file mode 100644
+index 133a5822ed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
++++ /dev/null
+@@ -1,193 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 21, 2011
+-
+-@author:Isabel Restrepo
+-
+-Adds the error of a portion of voxels. Each block is processed in a separate thread.
+-This script assumes that the reconstruction error at each voxel has been computed
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class pca_error_job():
+-
+-    def __init__(self, pca_scenes, dim, fraction, block_i, block_j, block_k):
+-        self.pca_scenes = pca_scenes
+-        self.dim = dim
+-        self.fraction = fraction
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    # load up work queue
+-    work_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    # create a queue to pass to workers to store the results
+-    result_queue = multiprocessing.Queue()
+-
+-    # spawn workers
+-    for i in range(num_procs):
+-        worker = pca_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-       # collect the results off the queue
+-    # all_results=[];
+-#    results = []
+-#    while len(results) < len(jobs):
+-#        result = result_queue.get()
+-#        results.append(result)
+-#        all_results[job.dim].append(result);
+-#
+-#    return all_results;
+-
+-    # collect the results off the queue
+-    results = []
+-    while len(results) < len(jobs):
+-        result = result_queue.get()
+-        results.append(result)
+-
+-    return results
+-
+-
+-class pca_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Adding Errors")
+-            batch.init_process("bvplAddPCAErrorsProcess")
+-            batch.set_input_from_db(0, job.pca_scenes)
+-            batch.set_input_unsigned(1, job.dim)
+-            batch.set_input_double(2, job.fraction)
+-            batch.set_input_int(3, job.block_i)
+-            batch.set_input_int(4, job.block_j)
+-            batch.set_input_int(5, job.block_k)
+-            batch.run_process()
+-            (id, type) = batch.commit_output(0)
+-            error_val = dbvalue(id, type)
+-            error = batch.get_output_double(id)
+-
+-            self.result_queue.put(error)
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#***************** The Main Algorithm ************************#
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA Error Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--fraction', action="store",
+-                      dest="fraction", type="float", default=0.0)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-    parser.add_option('--dimension', action="store",
+-                      dest="dimension", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    fraction = options.fraction
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-    dimension = options.dimension
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        print "Invalid PCA Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Data Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    data_scene = dbvalue(scene_id, scene_type)
+-
+-    # Load PCA scenes
+-    pca_feature_dim = 125
+-    print("Loading PCA Error Scenes")
+-    batch.init_process("bvplLoadPCAErrorSceneProcess")
+-    batch.set_input_from_db(0, data_scene)
+-    batch.set_input_string(1, pca_dir)
+-    batch.set_input_unsigned(
+-        2, pca_feature_dim)  # dimension pca feature
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    pca_scenes = dbvalue(id, type)
+-
+-    # Begin multiprocessing
+-    # Enqueue jobs
+-    job_list = []
+-    # for dim in range(0, pca_feature_dim):
+-    for block_i in range(0, nblocks_x):
+-        for block_j in range(0, nblocks_y):
+-            for block_k in range(0, nblocks_z):
+-                current_job = pca_error_job(
+-                    pca_scenes, dimension, fraction, block_i, block_j, block_k)
+-                job_list.append(current_job)
+-
+-    # run
+-    results = execute_jobs(job_list, num_cores)
+-
+-    # dump results
+-    total_error = 0
+-    for r in results:
+-        total_error = total_error + r
+-
+-    int_frac = int(fraction * 100)
+-    error_file = pca_dir + "/error_" + str(dimension) + "/error.txt"
+-    fd = open(error_file, "w")
+-    print >>fd, total_error / len(results)
+-    print >>fd, results
+-    fd.close()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
+deleted file mode 100644
+index c8ede20327..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
++++ /dev/null
+@@ -1,164 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-Compuets PCA reconstruction error. Each block is processed in a separate thread.
+-This script assumes that the pca basis has been computed as gone by extract_pca_kernels.py
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-import sys
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class pca_error_job():
+-
+-    def __init__(self, pca_info, pca_error_scenes, block_i, block_j, block_k, dim):
+-        self.pca_info = pca_info
+-        self.pca_error_scenes = pca_error_scenes
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-        self.dim = dim
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = pca_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class pca_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Computing Error Scene")
+-            batch.init_process("bvplComputePCAErrorBlockProcess")
+-            batch.set_input_from_db(0, job.pca_info)
+-            batch.set_input_from_db(1, job.pca_error_scenes)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.set_input_unsigned(5, job.dim)
+-            batch.run_process()
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-#*******************The Main Algorithm ************************#
+-if __name__ == "__main__":
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA Error Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-    parser.add_option('--dimension', action="store",
+-                      dest="dimension", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-    dimension = options.dimension
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        print "Invalid PCA Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Data Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    data_scene = dbvalue(scene_id, scene_type)
+-
+-    # Load pca scenes
+-    pca_feature_dim = 125
+-    print("Loading PCA Error Scenes")
+-    batch.init_process("bvplLoadPCAErrorSceneProcess")
+-    batch.set_input_from_db(0, data_scene)
+-    batch.set_input_string(1, pca_dir)
+-    batch.set_input_unsigned(
+-        2, pca_feature_dim)  # dimension pca feature
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    pca_scenes = dbvalue(id, type)
+-
+-    print("Loading PCA Info")
+-    batch.init_process("bvplLoadPCAInfoProcess")
+-    batch.set_input_string(0, pca_dir)
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    pca_info = dbvalue(id, type)
+-
+-    # Begin multiprocessing
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-    all_indices = []
+-    for block_i in range(0, nblocks_x):
+-        for block_j in range(0, nblocks_y):
+-            for block_k in range(0, nblocks_z):
+-                idx = [block_i, block_j, block_k]
+-                all_indices.append(idx)
+-
+-    random.shuffle(all_indices)
+-
+-    for i in range(0, len(all_indices)):
+-        idx = all_indices[i]
+-        current_job = pca_error_job(pca_info, pca_scenes, idx[
+-            0], idx[1], idx[2], dimension)
+-        job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
+deleted file mode 100644
+index 5d8b2b7910..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
++++ /dev/null
+@@ -1,61 +0,0 @@
+-# Computes the gaussian gradients on a boxm_alpha_scene
+-
+-import os
+-import optparse
+-import time
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA basis')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--train_fraction', action="store",
+-                      dest="train_fraction", type="float", default=0.0)
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    train_fraction = options.train_fraction
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    print("Extracting Principal Components patches")
+-
+-    print("Creating a Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    scene = dbvalue(scene_id, scene_type)
+-
+-    start_time = time.time()
+-
+-    print("Extract PC")
+-    batch.init_process("bvplDiscoverPCAFeaturesProcess")
+-    batch.set_input_from_db(0, scene)
+-    batch.set_input_string(1,  pca_dir)
+-    batch.set_input_double(2,  train_fraction)
+-    batch.set_input_int(3, -2)  # min and max points of the kernel
+-    batch.set_input_int(4, -2)
+-    batch.set_input_int(5, -2)
+-    batch.set_input_int(6, 2)
+-    batch.set_input_int(7, 2)
+-    batch.set_input_int(8, 2)
+-    batch.run_process()
+-
+-    print("Runing time forbvplDiscoverPCAFeaturesProcess:")
+-    print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
+deleted file mode 100755
+index 61f3346338..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
++++ /dev/null
+@@ -1,68 +0,0 @@
+-#!/bin/bash
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-A script that encapsulates all steps needed to computer pca reconstruction error as a function of number of components used
+-"""
+-
+-if [ $1 = "-r" ] ; then
+-  export PYTHONPATH=/Projects/vxl/bin/release/lib
+-else
+-  if [ $1 = "-d" ] ; then
+-    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
+-  else
+-    echo "Need a flag, either -d or -r";
+-  fi
+-fi
+-
+-echo "PYTHONPATH=" $PYTHONPATH
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
+-#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall/10";
+-#nblocks_x=1;
+-#nblocks_y=1;
+-#nblocks_z=1;
+-
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
+-#model_name="capitol_scene";
+-#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXM_6_4_4/10";
+-#nblocks_x=6;
+-#nblocks_y=4;
+-#nblocks_z=4;
+-
+-
+-model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
+-model_name="downtown_scene";
+-pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1/10";
+-nblocks_x=3;
+-nblocks_y=3;
+-nblocks_z=1;
+-
+-train_fraction=0.1;
+-test_fraction=1.0;
+-num_cores=5;
+-
+-
+-##************Compute Expected Color Scene
+-#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
+-
+-#Compute PCA basis
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $train_fraction
+-
+-#Compute reconstruction at each voxel in the scene
+-for ((dim = 45; dim <125; dim++))
+-do
+-  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/compute_pca_error_scene.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --dimension $dim
+-
+-  #Add error of fraction of voxels
+-
+-  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/add_pca_error.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $test_fraction --dimension $dim
+-done
+-
+-# #Save all scenes to drishti raw file
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/save_pca_raw.py --pca_dir $pca_dir --num_cores $num_cores
+-
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/reconstruction_error/explore_histogram.py --pca_dir $pca_dir --num_cores $num_cores
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
+deleted file mode 100644
+index 15d23e5ebf..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
++++ /dev/null
+@@ -1,108 +0,0 @@
+-import multiprocessing
+-import Queue
+-import time
+-import os
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class save_scene_job():
+-
+-    def __init__(self, input_scene_path, output_scene_path):
+-        self.input_scene_path = input_scene_path
+-        self.output_scene_path = output_scene_path
+-
+-
+-def execute_jobs(jobs, num_procs=5):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = save_scene_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class save_scene_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating a Scene")
+-            batch.init_process("boxmCreateSceneProcess")
+-            batch.set_input_string(0, job.input_scene_path)
+-            batch.run_process()
+-            (scene_id, scene_type) = batch.commit_output(0)
+-            scene = dbvalue(scene_id, scene_type)
+-
+-            print("Save Scene")
+-            batch.init_process("boxmSaveSceneRawProcess")
+-            batch.set_input_from_db(0, scene)
+-            batch.set_input_string(1, job.output_scene_path)
+-            batch.set_input_unsigned(2, 0)
+-            batch.set_input_unsigned(3, 1)
+-            batch.run_process()
+-
+-            print ("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#*********************The Main Algorithm ****************************#
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    parser = optparse.OptionParser(
+-        description='Save taylor responses to raw file')
+-
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-
+-    options, args = parser.parse_args()
+-
+-    pca_dir = options.pca_dir
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-    pca_feature_dim = 125
+-    for dim in range(0, pca_feature_dim):
+-
+-        scene_in_path = pca_dir + "/error_" + str(dim) + "/error_scene.xml"
+-        scene_out_path = pca_dir + "/error_" + str(dim) + "/error_scene"
+-
+-        current_job = save_scene_job(scene_in_path, scene_out_path)
+-
+-        job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
+deleted file mode 100644
+index 1616b7850a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
++++ /dev/null
+@@ -1,66 +0,0 @@
+-# Computes the gaussian gradients on a boxm_alpha_scene
+-
+-import os
+-import optparse
+-import time
+-import sys
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA basis')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--train_fraction', action="store",
+-                      dest="train_fraction", type="float", default=0.0)
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    pca_dir = options.pca_dir
+-    train_fraction = (options.train_fraction) / 10
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    print("Extracting Principal Components patches")
+-
+-    print("Creating a Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    scene = dbvalue(scene_id, scene_type)
+-
+-    start_time = time.time()
+-
+-    print("Extract PC")
+-    batch.init_process("bvplDiscoverPCAFeaturesProcess")
+-    batch.set_input_from_db(0, scene)
+-    batch.set_input_string(1,  pca_dir)
+-    batch.set_input_double(2,  train_fraction)
+-    batch.set_input_int(3, -2)  # min and max points of the kernel
+-    batch.set_input_int(4, -2)
+-    batch.set_input_int(5, -2)
+-    batch.set_input_int(6, 2)
+-    batch.set_input_int(7, 2)
+-    batch.set_input_int(8, 2)
+-    batch.run_process()
+-
+-    print ("Runing time for bvplDiscoverPCAFeaturesProcess:")
+-    print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
+deleted file mode 100644
+index e151f95144..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
++++ /dev/null
+@@ -1,42 +0,0 @@
+-# Computes normalized pca training error
+-
+-import os
+-import optparse
+-import time
+-import sys
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute PCA basis')
+-
+-    parser.add_option('--pca_dir', action="store", dest="pca_dir")
+-    parser.add_option('--train_fraction', action="store",
+-                      dest="train_fraction", type="float", default=0.0)
+-    options, args = parser.parse_args()
+-
+-    pca_dir = options.pca_dir
+-    train_fraction = (options.train_fraction) / 10
+-
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
+-    if not os.path.isdir(pca_dir + "/"):
+-        os.makedirs(pca_dir + "/")
+-
+-    start_time = time.time()
+-
+-    batch.init_process("bvplNormalizePCATrainingErrorProcess")
+-    batch.set_input_string(0,  pca_dir)
+-    batch.run_process()
+-
+-    print ("Runing time for bvplNormalizePCATrainingErrorProcess:")
+-    print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
+deleted file mode 100755
+index 82b0a516d8..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#!/bin/bash
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-A script that encapsulates all steps needed to computer pca training error as a the number of training samples varies
+-"""
+-
+-if [ $1 = "-r" ] ; then
+-  export PYTHONPATH=/projects/vxl/bin/release/lib
+-else
+-  if [ $1 = "-d" ] ; then
+-     export PYTHONPATH=/projects/vxl/bin/Debug/lib
+-  else
+-    echo "Need a flag, either -d or -r";
+-  fi
+-fi
+-
+-echo "PYTHONPATH=" $PYTHONPATH
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
+-#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall";
+-
+-model_dir="/homelocal/isa/Experiments/CapitolBOXM_6_4_4";
+-pca_dir="/homelocal/isa/Experiments/PCA/CapitolBOXM_6_4_4";
+-
+-
+-#model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
+-#pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1";
+-
+-
+-##Compute Expected Color Scene
+-#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
+-
+-#Compute reconstruction at each voxel in the scene
+-for ((dim = 2; dim <11; dim++))
+-do
+-  #Compute PCA basis
+-  python extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $dim
+-done
+-
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
+deleted file mode 100644
+index 5030ca4508..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-This folder contains Python scripts that use the main processes of bvpl_octree
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
+deleted file mode 100644
+index a7084e3cbe..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
++++ /dev/null
+@@ -1,183 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-Adds the error of a portion of voxels. Each block is processed in a separate thread.
+-This script assumes that the reconstruction error at each voxel has been computed
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class taylor_error_job():
+-
+-    def __init__(self, error_scene, fraction, block_i, block_j, block_k):
+-        self.error_scene = error_scene
+-        self.fraction = fraction
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    # load up work queue
+-    work_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    # create a queue to pass to workers to store the results
+-    result_queue = multiprocessing.Queue()
+-
+-    # spawn workers
+-    for i in range(num_procs):
+-        worker = taylor_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-       # collect the results off the queue
+-    results = []
+-    while len(results) < len(jobs):
+-        result = result_queue.get()
+-        results.append(result)
+-
+-    return results
+-
+-
+-class taylor_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Adding Errors")
+-            batch.init_process("bvplAddTaylorErrorsProcess")
+-            batch.set_input_from_db(0, job.error_scene)
+-            batch.set_input_double(1, job.fraction)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.run_process()
+-            (id, type) = batch.commit_output(0)
+-            error_val = dbvalue(id, type)
+-            error = batch.get_output_double(id)
+-
+-            self.result_queue.put(error)
+-
+-            print("error")
+-            print(error)
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#***************** The Main Algorithm ************************#
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Add Taylor Errors in a Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--fraction', action="store",
+-                      dest="fraction", type="float", default=0.0)
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int", default=1)
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int", default=1)
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int", default=1)
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    taylor_dir = options.taylor_dir
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-    fraction = options.fraction
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Error Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  taylor_dir + "/error_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    error_scene = dbvalue(scene_id, scene_type)
+-
+-    # Begin multiprocessing
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    blocks_x = [i for i in range(0, nblocks_x)]
+-    blocks_y = [i for i in range(0, nblocks_y)]
+-    blocks_z = [i for i in range(0, nblocks_z)]
+-
+-    random.shuffle(blocks_x)
+-    random.shuffle(blocks_y)
+-    random.shuffle(blocks_y)
+-
+-    # Enqueue jobs
+-    for i in range(0, len(blocks_x)):
+-        for j in range(0, len(blocks_y)):
+-            for k in range(0, len(blocks_z)):
+-                block_i = blocks_x[i]
+-                block_j = blocks_y[j]
+-                block_k = blocks_z[k]
+-                current_job = taylor_error_job(
+-                    error_scene, fraction, block_i, block_j, block_k)
+-                job_list.append(current_job)
+-
+-    # run
+-    results = execute_jobs(job_list, num_cores)
+-
+-    # dump results
+-    total_error = 0
+-    for r in results:
+-        print(r)
+-        total_error = total_error + r
+-
+-    # write schedule file
+-    int_frac = int(fraction * 100)
+-    error_file = taylor_dir + "/error_" + str(int_frac) + ".txt"
+-    fd = open(error_file, "w")
+-    print >>fd, total_error / len(results)
+-    print >>fd, results
+-    fd.close()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
+deleted file mode 100644
+index 11386b774c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
++++ /dev/null
+@@ -1,156 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-Compuets Taylor reconstruction error. Each block is processed in a separate thread.
+-This script assumes that the taylor kernels have been run on the data scene as done in run_taylor_kernels.py
+-"""
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class taylor_error_job():
+-
+-    def __init__(self, data_scene, taylor_scenes, block_i, block_j, block_k):
+-        self.data_scene = data_scene
+-        self.taylor_scenes = taylor_scenes
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = taylor_error_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class taylor_error_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Computing Error Scene")
+-            batch.init_process("bvplComputeTaylorErrorProcess")
+-            batch.set_input_from_db(0, job.data_scene)
+-            batch.set_input_from_db(1, job.taylor_scenes)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.run_process()
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-#*******************The Main Algorithm ************************#
+-if __name__ == "__main__":
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    # Parse inputs
+-    parser = optparse.OptionParser(description='Compute Taylor Error Scene')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    taylor_dir = options.taylor_dir
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    print("Loading Data Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    data_scene = dbvalue(scene_id, scene_type)
+-
+-    # Load taylor scenes
+-    print("Loading Taylor Scenes")
+-    batch.init_process("bvplLoadTaylorScenesProcess")
+-    batch.set_input_string(0, taylor_dir)
+-    batch.set_input_int(1, -2)  # min and max points of the kernel
+-    batch.set_input_int(2, -2)
+-    batch.set_input_int(3, -2)
+-    batch.set_input_int(4, 2)
+-    batch.set_input_int(5, 2)
+-    batch.set_input_int(6, 2)
+-    batch.run_process()
+-    (id, type) = batch.commit_output(0)
+-    taylor_scenes = dbvalue(id, type)
+-
+-    # Begin multiprocessing
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    blocks_x = [i for i in range(0, nblocks_x)]
+-    blocks_y = [i for i in range(0, nblocks_y)]
+-    blocks_z = [i for i in range(0, nblocks_z)]
+-
+-    random.shuffle(blocks_x)
+-    random.shuffle(blocks_y)
+-    random.shuffle(blocks_y)
+-
+-    # Enqueue jobs
+-    for i in range(0, len(blocks_x)):
+-        for j in range(0, len(blocks_y)):
+-            for k in range(0, len(blocks_z)):
+-                block_i = blocks_x[i]
+-                block_j = blocks_y[j]
+-                block_k = blocks_z[k]
+-                current_job = taylor_error_job(
+-                    data_scene, taylor_scenes, block_i, block_j, block_k)
+-                job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
+deleted file mode 100644
+index 40fcac4910..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
++++ /dev/null
+@@ -1,113 +0,0 @@
+-import os
+-import multiprocessing
+-import Queue
+-import time
+-import random
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class histogram_job():
+-
+-    def __init__(self, scene_path):
+-        self.scene_path = scene_path
+-
+-
+-def execute_jobs(jobs, num_procs=4):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = histogram_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class histogram_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating a Scene")
+-            batch.init_process("boxmCreateSceneProcess")
+-            batch.set_input_string(0,  job.scene_path)
+-            batch.run_process()
+-            (scene_id, scene_type) = batch.commit_output(0)
+-            scene = dbvalue(scene_id, scene_type)
+-
+-            print("Explore Histogram")
+-            batch.init_process("bvplSceneHistorgramProcess")
+-            batch.set_input_from_db(0, scene)
+-            batch.run_process()
+-
+-            print("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-#*******************The Main Algorithm ************************#
+-
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    parser = optparse.OptionParser(description='Run Taylor Kernels')
+-
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-
+-    options, args = parser.parse_args()
+-
+-    taylor_dir = options.taylor_dir
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    # Kernel names for 2-degree approximation
+-    kernel_list = []
+-    kernel_list.append("I0")
+-    kernel_list.append("Ix")
+-    kernel_list.append("Iy")
+-    kernel_list.append("Iz")
+-    kernel_list.append("Ixx")
+-    kernel_list.append("Iyy")
+-    kernel_list.append("Izz")
+-    kernel_list.append("Ixy")
+-    kernel_list.append("Ixz")
+-    kernel_list.append("Iyz")
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-    for curr_kernel in range(0, len(kernel_list)):
+-        scene_path = taylor_dir + "/" + \
+-            kernel_list[curr_kernel] + "/float_response_scene.xml"
+-        current_job = histogram_job(scene_path)
+-        job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
+deleted file mode 100644
+index 76a0beacab..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
++++ /dev/null
+@@ -1,98 +0,0 @@
+-import os
+-from multiprocessing import Queue
+-from taylor_kernel_threads import taylor_kernel_job, execute_jobs
+-import time
+-import optparse
+-import random
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-if __name__ == "__main__":
+-    parser = optparse.OptionParser(description='Run Taylor Kernels')
+-
+-    parser.add_option('--model_dir', action="store", dest="model_dir")
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--kernel_path', action="store", dest="kernel_path")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-    parser.add_option('--nblocks_x', action="store",
+-                      dest="nblocks_x", type="int")
+-    parser.add_option('--nblocks_y', action="store",
+-                      dest="nblocks_y", type="int")
+-    parser.add_option('--nblocks_z', action="store",
+-                      dest="nblocks_z", type="int")
+-
+-    options, args = parser.parse_args()
+-
+-    model_dir = options.model_dir
+-    taylor_dir = options.taylor_dir
+-    kernel_path = options.kernel_path
+-    nblocks_x = options.nblocks_x
+-    nblocks_y = options.nblocks_y
+-    nblocks_z = options.nblocks_z
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Model Dir"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(model_dir + "/"):
+-        print "Invalid Kernel Path"
+-        sys.exit(-1)
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        os.mkdir(taylor_dir + "/")
+-
+-    # Kernel names for 2-degree approximation
+-    kernel_list = []
+-    kernel_list.append("I0")
+-    kernel_list.append("Ix")
+-    kernel_list.append("Iy")
+-    kernel_list.append("Iz")
+-    kernel_list.append("Ixx")
+-    kernel_list.append("Iyy")
+-    kernel_list.append("Izz")
+-    kernel_list.append("Ixy")
+-    kernel_list.append("Ixz")
+-    kernel_list.append("Iyz")
+-
+-    print("Creating a Scene")
+-    batch.init_process("boxmCreateSceneProcess")
+-    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
+-    batch.run_process()
+-    (scene_id, scene_type) = batch.commit_output(0)
+-    scene = dbvalue(scene_id, scene_type)
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = Queue()
+-    job_list = []
+-
+-    blocks_x = [i for i in range(0, nblocks_x)]
+-    blocks_y = [i for i in range(0, nblocks_y)]
+-    blocks_z = [i for i in range(0, nblocks_z)]
+-
+-    random.shuffle(blocks_x)
+-    random.shuffle(blocks_y)
+-    random.shuffle(blocks_y)
+-
+-    # Enqueue jobs
+-    for curr_kernel in range(0, len(kernel_list)):
+-        for i in range(0, len(blocks_x)):
+-            for j in range(0, len(blocks_y)):
+-                for k in range(0, len(blocks_z)):
+-                    block_i = blocks_x[i]
+-                    block_j = blocks_y[j]
+-                    block_k = blocks_z[k]
+-                    curr_kernel_path = kernel_path + "/" + \
+-                        kernel_list[curr_kernel] + ".txt"
+-                    output_path = taylor_dir + "/" + kernel_list[curr_kernel]
+-                    if not os.path.isdir(output_path + "/"):
+-                        os.mkdir(output_path + "/")
+-                    current_job = taylor_kernel_job(
+-                        scene, curr_kernel_path, block_i, block_j, block_k, output_path)
+-                    job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
+deleted file mode 100644
+index 1694729229..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
++++ /dev/null
+@@ -1,146 +0,0 @@
+-import multiprocessing
+-import Queue
+-import time
+-import os
+-import optparse
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class save_scene_job():
+-
+-    def __init__(self, input_scene_path, output_scene_path):
+-        self.input_scene_path = input_scene_path
+-        self.output_scene_path = output_scene_path
+-
+-
+-def execute_jobs(jobs, num_procs=5):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = save_scene_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class save_scene_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating a Scene")
+-            batch.init_process("boxmCreateSceneProcess")
+-            batch.set_input_string(0, job.input_scene_path)
+-            batch.run_process()
+-            (scene_id, scene_type) = batch.commit_output(0)
+-            scene = dbvalue(scene_id, scene_type)
+-
+-            print("Save Scene")
+-            batch.init_process("boxmSaveSceneRawProcess")
+-            batch.set_input_from_db(0, scene)
+-            batch.set_input_string(
+-                1, job.output_scene_path + "_float")
+-            batch.set_input_unsigned(2, 0)
+-            batch.set_input_unsigned(3, 1)
+-            batch.run_process()
+-
+-#            resolution = 0;
+-#            enforce_level = 1;
+-
+-#            print("Convert to regular grid");
+-#            batch.init_process("boxmSceneToBvxmGridProcess");
+-#            batch.set_input_from_db(0,scene);
+-#            batch.set_input_string(1, job.output_scene_path + ".vox");
+-#            batch.set_input_unsigned(2, resolution);
+-#            batch.set_input_bool(3, enforce_level);
+-#            batch.run_process();
+-#            (grid_id, grid_type) = batch.commit_output(0);
+-#            grid = dbvalue(grid_id, grid_type);
+-#
+-#            print("Save Grid");
+-#            batch.init_process("bvxmSaveGridRawProcess");
+-#            batch.set_input_from_db(0,grid);
+-#            batch.set_input_string(1,job.output_scene_path + ".raw");
+-#            batch.run_process();
+-
+-            print ("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+-
+-
+-#*********************The Main Algorithm ****************************#
+-if __name__ == "__main__":
+-
+-    batch.register_processes()
+-    batch.register_datatypes()
+-
+-    parser = optparse.OptionParser(
+-        description='Save taylor responses to raw file')
+-
+-    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
+-    parser.add_option('--num_cores', action="store",
+-                      dest="num_cores", type="int", default=4)
+-
+-    options, args = parser.parse_args()
+-
+-    taylor_dir = options.taylor_dir
+-    num_cores = options.num_cores
+-
+-    if not os.path.isdir(taylor_dir + "/"):
+-        print "Invalid Taylor Dir"
+-        sys.exit(-1)
+-
+-    kernel_list = []
+-
+-    kernel_list.append("I0")
+-    kernel_list.append("Ix")
+-    kernel_list.append("Iy")
+-    kernel_list.append("Iz")
+-    kernel_list.append("Ixx")
+-    kernel_list.append("Iyy")
+-    kernel_list.append("Izz")
+-    kernel_list.append("Ixy")
+-    kernel_list.append("Ixz")
+-    kernel_list.append("Iyz")
+-
+-    # Begin multiprocessing
+-    t1 = time.time()
+-    work_queue = multiprocessing.Queue()
+-    job_list = []
+-
+-    # Enqueue jobs
+-#  for i in range(0, len(kernel_list)):
+-#
+-#      scene_in_path = taylor_dir + "/" + kernel_list[i] + "/float_response_scene.xml";
+-#      scene_out_path = taylor_dir + "/" + kernel_list[i]+ "/float_response_scene";
+-#
+-#      current_job = save_scene_job(scene_in_path, scene_out_path);
+-#
+-#      job_list.append(current_job);
+-
+-    # append error scene
+-    scene_in_path = taylor_dir + "/error_scene.xml"
+-    scene_out_path = taylor_dir + "/error_scene"
+-    current_job = save_scene_job(scene_in_path, scene_out_path)
+-    job_list.append(current_job)
+-
+-    execute_jobs(job_list, num_cores)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
+deleted file mode 100755
+index db27ee1939..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
++++ /dev/null
+@@ -1,67 +0,0 @@
+-#!/bin/bash
+-"""
+-Created on Mon Feb 14, 2011
+-
+-@author:Isabel Restrepo
+-
+-A script that encapsulates all steps needed to computer taylor reconstruction error
+-"""
+-
+-if [ $1 = "-r" ] ; then
+-  export PYTHONPATH=/Projects/vxl/bin/Release/lib
+-else
+-  if [ $1 = "-d" ] ; then
+-    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
+-  else
+-    echo "Need a flag, either -d or -r";
+-  fi
+-fi
+-
+-echo "PYTHONPATH=" $PYTHONPATH
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
+-#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXMSmall_test";
+-#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
+-#nblocks_x=1;
+-#nblocks_y=1;
+-#nblocks_z=1;
+-
+-
+-#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
+-#model_name="capitol_scene";
+-#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXM_6_4_4";
+-#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
+-#nblocks_x=6;
+-#nblocks_y=4;
+-#nblocks_z=4;
+-
+-
+-model_dir="/Users/isa/Experiments/DowntownBOXM_12_12_4";
+-model_name="downtown_scene";
+-taylor_dir="/Users/isa/Experiments/Taylor/DowntownBOXM_12_12_4";
+-kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
+-nblocks_x=12;
+-nblocks_y=12;
+-nblocks_z=4;
+-
+-fraction=1.0;
+-num_cores=10;
+-
+-cd "/Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor"
+-
+-# #Compute Expected Color Scene
+-#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
+-#
+-# #Compute Responses to Taylor Kernels
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/run_taylor_kernels.py --model_dir $model_dir --taylor_dir $taylor_dir --kernel_path $kernel_path --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
+-#
+-# #Compute reconstruction at each voxel in the scene
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/compute_taylor_error_scene.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
+-#
+-# #Add error of fraction of voxels
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/add_taylor_error.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $fraction
+-#
+-# #Save all scenes to drishti raw file
+-python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/save_taylor_raw.py --taylor_dir $taylor_dir --num_cores $num_cores
+-
+-#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/explore_histogram.py --taylor_dir $taylor_dir --num_cores $num_cores
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
+deleted file mode 100644
+index 029ce9315d..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
++++ /dev/null
+@@ -1,72 +0,0 @@
+-import multiprocessing
+-import Queue
+-import time
+-
+-import brl_init
+-import bvpl_octree_batch as batch
+-dbvalue = brl_init.register_batch(batch)
+-
+-
+-class taylor_kernel_job():
+-
+-    def __init__(self, scene, kernel_path, block_i, block_j, block_k, output_path):
+-        self.scene = scene
+-        self.kernel_path = kernel_path
+-        self.block_i = block_i
+-        self.block_j = block_j
+-        self.block_k = block_k
+-        self.output_path = output_path
+-
+-
+-def execute_jobs(jobs, num_procs=5):
+-    work_queue = multiprocessing.Queue()
+-    result_queue = multiprocessing.Queue()
+-    for job in jobs:
+-        work_queue.put(job)
+-
+-    for i in range(num_procs):
+-        worker = taylor_kernel_worker(work_queue, result_queue)
+-        worker.start()
+-        print("worker with name ", worker.name, " started!")
+-
+-
+-class taylor_kernel_worker(multiprocessing.Process):
+-
+-    def __init__(self, work_queue, result_queue):
+-        # base class initialization
+-        multiprocessing.Process.__init__(self)
+-        # job management stuff
+-        self.work_queue = work_queue
+-        self.result_queue = result_queue
+-        self.kill_received = False
+-
+-    def run(self):
+-        while not self.kill_received:
+-           # get a task
+-            try:
+-                job = self.work_queue.get_nowait()
+-            except Queue.Empty:
+-                break
+-
+-            start_time = time.time()
+-
+-            print("Creating taylor kernel")
+-            batch.init_process("bvplLoadTaylorKernelProcess")
+-            batch.set_input_string(0, job.kernel_path)
+-            batch.run_process()
+-            (kernel_id, kernel_type) = batch.commit_output(0)
+-            kernel = dbvalue(kernel_id, kernel_type)
+-
+-            print("Running Kernel")
+-            batch.init_process("bvplBlockKernelOperatorProcess")
+-            batch.set_input_from_db(0, job.scene)
+-            batch.set_input_from_db(1, kernel)
+-            batch.set_input_int(2, job.block_i)
+-            batch.set_input_int(3, job.block_j)
+-            batch.set_input_int(4, job.block_k)
+-            batch.set_input_string(5, "algebraic")
+-            batch.set_input_string(6, job.output_path)
+-            batch.run_process()
+-
+-            print ("Runing time for worker:", self.name)
+-            print(time.time() - start_time)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
+deleted file mode 100644
+index 0784ff8eea..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
+-
+-set(bvpl_octree_sample_sources
+-    bvpl_octree_sample.h           bvpl_octree_sample.hxx
+-    bvpl_taylor_basis_sample.h     bvpl_taylor_basis_sample.cxx
+-    bvpl_pca_basis_sample.h        bvpl_pca_basis_sample.hxx
+-   )
+-
+-aux_source_directory(Templates bvpl_octree_sample_sources)
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_sample LIBRARY_SOURCES ${bvpl_octree_sample_sources})
+-target_link_libraries(bvpl_octree_sample ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl)
+-
+-if( BUILD_TESTING )
+-  add_subdirectory(tests)
+-endif()
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
+deleted file mode 100644
+index 8cdbd4476b..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bsta/bsta_gaussian_sphere.hxx>
+-
+-BSTA_GAUSSIAN_SPHERE_INSTANTIATE(float, 1);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
+deleted file mode 100644
+index da403deee4..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/io/bsta_io_attributes.h>
+-#include <bsta/io/bsta_io_gaussian_sphere.h>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-BVPL_OCTREE_SAMPLE_INSTANTIATE(gauss_type);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
+deleted file mode 100644
+index f88db3342c..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-
+-BVPL_OCTREE_SAMPLE_INSTANTIATE(float);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
+deleted file mode 100644
+index fcaa1db057..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
+-
+-BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(10);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
+deleted file mode 100644
+index 8f1cc33b1f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
++++ /dev/null
+@@ -1,57 +0,0 @@
+-// This is brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
+-#ifndef bvpl_octree_sample_h
+-#define bvpl_octree_sample_h
+-//:
+-// \file
+-// \brief  A data structure to contain bvpl_kernel response, and id corresponding to axis of rotations and rotation around axis
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  December 9, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-template<class T_data>
+-class bvpl_octree_sample
+-{
+- public:
+-  //: Default Constructor. Be careful when using default constructor, the value of response may be nonsense
+-  //  This is indicated by the negative id.
+-  bvpl_octree_sample():response_(),id_(-1){}
+-
+-  //: Constructor from response and id
+-  bvpl_octree_sample(const T_data& response, const int& id):
+-  response_(response),id_(id){}
+-
+-  short version_no() const{ return 1; }
+-
+-  void  print(std::ostream& os) const;
+-
+-  //Member variables
+-  T_data response_;
+-  int id_;
+-};
+-
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample);
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample);
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample);
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample);
+-
+-template<class T_data>
+-std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample);
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
+deleted file mode 100644
+index fdc4d34d4a..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
++++ /dev/null
+@@ -1,70 +0,0 @@
+-#ifndef bvpl_octree_sample_hxx_
+-#define bvpl_octree_sample_hxx_
+-
+-#include "bvpl_octree_sample.h"
+-
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.response_);
+-}
+-
+-template<class T_data>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.response_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template<class T_data>
+-void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-
+-template<class T_data>
+-void bvpl_octree_sample<T_data>::print(std::ostream& os) const
+-{
+-  os << "(response=" << response_ << " id=" << id_ <<')';
+-}
+-
+-template<class T_data>
+-std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample)
+-{
+-  sample.print(os);
+-  return os;
+-}
+-
+-#define BVPL_OCTREE_SAMPLE_INSTANTIATE(T) \
+-template class bvpl_octree_sample<T >; \
+-template std::ostream& operator << (std::ostream&, const bvpl_octree_sample<T >&); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > *&)
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
+deleted file mode 100644
+index 64e29dd1fd..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
++++ /dev/null
+@@ -1,57 +0,0 @@
+-// This is bvpl_pca_basis_sample.h
+-#ifndef bvpl_pca_basis_sample_h
+-#define bvpl_pca_basis_sample_h
+-
+-//:
+-// \file
+-// \brief A data structure that contains the vector of projections on pca space
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  28-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vnl/vnl_vector_fixed.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-template <unsigned dim>
+-class bvpl_pca_basis_sample{
+-
+-public:
+-  bvpl_pca_basis_sample(){
+-    pca_projections_.fill(0);
+-  }
+-
+-  bvpl_pca_basis_sample(vnl_vector_fixed<double,dim> pp){
+-    pca_projections_ = pp;
+-  }
+-  inline short version_no() const{ return 1; }
+-
+-  //: Vector of projections on pca space
+-  vnl_vector_fixed<double,dim> pca_projections_;
+-
+-};
+-
+-
+-template <unsigned dim>
+-std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample);
+-
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample);
+-
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample);
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample);
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
+deleted file mode 100644
+index 93769db3f7..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
++++ /dev/null
+@@ -1,72 +0,0 @@
+-#ifndef bvpl_pca_basis_sample_hxx_
+-#define bvpl_pca_basis_sample_hxx_
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 28-Feb-2011
+-
+-#include "bvpl_pca_basis_sample.h"
+-
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-#include <vsl/vsl_binary_io.h>
+-
+-
+-template <unsigned dim>
+-std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample)
+-{
+-  os << "PCA projection = " << sample.pca_projections_ << std::endl;
+-  return os;
+-}
+-
+-//I/O
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.pca_projections_);
+-}
+-
+-template <unsigned dim>
+-void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.pca_projections_);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-               << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-}
+-
+-template <unsigned dim>
+-void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+-
+-
+-#define BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(T) \
+-template class bvpl_pca_basis_sample<T >; \
+-template std::ostream& operator << (std::ostream&, const bvpl_pca_basis_sample<T >&); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const &); \
+-template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const *&); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > &); \
+-template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > *&)
+-
+-#endif // bvpl_pca_basis_sample_hxx_
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
+deleted file mode 100644
+index f2d0372181..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
++++ /dev/null
+@@ -1,58 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 10-Feb-2011
+-
+-#include "bvpl_taylor_basis_sample.h"
+-#include <vnl/io/vnl_io_matrix_fixed.h>
+-#include <vnl/io/vnl_io_vector_fixed.h>
+-
+-std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample)
+-{
+-  os << "I0 = " << sample.I0 << ", G= " <<sample.G<< ", H=" << sample.H << std::endl;
+-  return os;
+-}
+-
+-//I/O
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample)
+-{
+-  vsl_b_write(os, sample.version_no());
+-  vsl_b_write(os, sample.I0);
+-  vsl_b_write(os, sample.G);
+-  vsl_b_write(os, sample.H);
+-
+-}
+-
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample)
+-{
+-  if (sample) {
+-    vsl_b_write(os, *sample);
+-  }
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample)
+-{
+-  if (!is) return;
+-
+-  short version;
+-  vsl_b_read(is,version);
+-  switch (version)
+-  {
+-    case 1:
+-      vsl_b_read(is, sample.I0);
+-      vsl_b_read(is, sample.G);
+-      vsl_b_read(is, sample.H);
+-      break;
+-    default:
+-      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
+-      << "           Unknown version number "<< version << '\n';
+-      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
+-      break;
+-  }
+-
+-}
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample)
+-{
+-  vsl_b_read(is, *sample);
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
+deleted file mode 100644
+index a10ece861f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
++++ /dev/null
+@@ -1,59 +0,0 @@
+-// This is bvpl_taylor_basis_sample.h
+-#ifndef bvpl_taylor_basis_sample_h
+-#define bvpl_taylor_basis_sample_h
+-
+-//:
+-// \file
+-// \brief A data structure that contains vectors and matrices needed for taylor approximation
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  10-Feb-2011.
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vnl/vnl_double_3.h>
+-#include <vnl/vnl_double_3x3.h>
+-
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vsl/vsl_binary_io.h>
+-
+-
+-//: Data structure needed for 2-degree taylor approximation of 3-dimesional volumes
+-class bvpl_taylor_basis2_sample
+-{
+-public:
+-  bvpl_taylor_basis2_sample()
+-  {
+-    I0 = 0.0f;
+-    //empty - to save space
+-    G = vnl_double_3(0.0,0.0,0.0);
+-    H = vnl_double_3x3(0.0);
+-  }
+-
+-  bvpl_taylor_basis2_sample(double zeroth_dev, vnl_double_3 grad, vnl_double_3x3 hess): I0(zeroth_dev), G(grad), H(hess){}
+-
+-  short version_no() const{ return 1; }
+-  //: Approximation to zeroth derivative
+-  double I0;
+-  //: Approximation to the Gradient Vector
+-  vnl_double_3 G;
+-  //: Approximation to the Hessian
+-  vnl_double_3x3 H;
+-};
+-
+-std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample);
+-
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample);
+-
+-void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample);
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample);
+-
+-void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
+deleted file mode 100644
+index a5ca7c7bdf..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,4 +0,0 @@
+-add_executable( bvpl_octree_sample_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_sample_test_include bvpl_octree_sample)
+-add_executable( bvpl_octree_sample_test_template_include test_template_include.cxx )
+-target_link_libraries( bvpl_octree_sample_test_template_include bvpl_octree_sample)
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
+deleted file mode 100644
+index df8d03d364..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
+deleted file mode 100644
+index 075d4723fb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
+-#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
+deleted file mode 100644
+index 5781fd45ca..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,35 +0,0 @@
+-include_directories( ${MUL_INCLUDE_DIR} )
+-
+-add_executable( bvpl_octree_test_all
+-  test_driver.cxx
+-  test_octree_kernel_operator.cxx
+-  test_octree_neighbors.cxx
+-#Test EXHIBITS PATH ERRORS --  FIX_ME
+-#  test_pca_kernels.cxx
+-#Test FAILS --  FIX_ME
+-#  test_taylor_basis.cxx
+-# Test FAILS FIX_ME
+-#  test_gauss3D_steerable_filters.cxx
+- )
+-
+-set(bvpl_octree_test_all_sources
+-    test_utils.h    test_utils.cxx
+-   )
+-
+-vxl_add_library(LIBRARY_NAME bvpl_octree_tests_util LIBRARY_SOURCES  ${bvpl_octree_test_all_sources})
+-
+-target_link_libraries( bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
+-target_link_libraries( bvpl_octree_test_all bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
+-
+-add_test( NAME bvpl_octree_test_kernel_operator COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_kernel_operator  )
+-add_test( NAME bvpl_octree_test_neighbors COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_neighbors  )
+-#add_test( NAME bvpl_octree_test_pca COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_pca_kernels )
+-#add_test( NAME bvpl_octree_test_taylor_basis COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_taylor_basis )
+-#add_test( NAME test_gauss3D_steerable_filters COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_gauss3D_steerable_filters )
+-
+-add_executable( bvpl_octree_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_test_include bvpl_octree)
+-
+-add_executable( bvpl_octree_test_template_include test_template_include.cxx )
+-target_link_libraries( bvpl_octree_test_template_include bvpl_octree)
+-
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
+deleted file mode 100644
+index b1b39e0bed..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#include <testlib/testlib_register.h>
+-
+-DECLARE( test_octree_kernel_operator );
+-DECLARE( test_octree_neighbors );
+-//DECLARE( test_pca_kernels );//TEST EXHIBITS PATH ERRORS
+-//DECLARE( test_taylor_basis );//TEST FAILS FIX_ME
+-//DECLARE( test_gauss3D_steerable_filters );//TEST FAILS FIX_ME
+-
+-void register_tests()
+-{
+-  REGISTER( test_octree_kernel_operator );
+-  REGISTER( test_octree_neighbors );
+-  //  REGISTER( test_pca_kernels );
+-  //  REGISTER( test_taylor_basis );
+-  //  REGISTER( test_gauss3D_steerable_filters );
+-}
+-
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
+deleted file mode 100644
+index 47ec04a8ef..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
++++ /dev/null
+@@ -1,127 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 24-Aug-2011
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-#include <bvpl_octree/bvpl_gauss3D_steerable_filters.h>
+-
+-void test_gauss3D_steerable_filters()
+-{
+-  typedef boct_tree<short, float> float_tree_type;
+-  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
+-
+-  clean_up();
+-
+-  //create scene
+-  boxm_scene<boct_tree<short, float > > *mean_scene = create_scene(2,2,2);
+-
+-  //Explore mean scene
+-  std::cout << "Exploring mean scene \n";
+-  {
+-    boxm_cell_iterator<boct_tree<short,float > > iterator = mean_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short,float > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  //create the output scenes
+-  boxm_scene<out_tree_type> *scene_out =
+-  new boxm_scene<out_tree_type>(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
+-  scene_out->set_paths(".", "steerable_gauss_3d_scene");
+-  scene_out->set_appearance_model(VNL_FLOAT_10);
+-  scene_out->write_scene("steerable_gauss_3d_scene.xml");
+-  mean_scene->clone_blocks_to_vector<10>(*scene_out);
+-
+-  //Explore Initial Response scene
+-  std::cout << "Exploring initial response scene \n";
+-  {
+-    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  boxm_scene<boct_tree<short, bool> > *valid_scene =
+-  new boxm_scene<boct_tree<short, bool> >(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
+-  valid_scene->set_paths(".", "valid_scene");
+-  valid_scene->set_appearance_model(BOXM_BOOL);
+-  valid_scene->write_scene("valid_scene.xml");
+-
+-  //operate on scene
+-  double cell_length = scene_out->finest_cell_length();
+-  bvpl_gauss3D_steerable_filters sf;
+-
+-  sf.basis_response_at_leaves(scene_out, valid_scene, cell_length);
+-
+-
+-  //Explore Response scene
+-  std::cout << "Exploring response scene \n";
+-  {
+-    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  //rotate features according to gradient
+-  sf.rotation_invariant_interpolation(scene_out, valid_scene);
+-
+-  //Explore Invariant Response scene
+-  std::cout << "Exploring rotation invariant response scene \n";
+-  {
+-    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
+-    iterator.begin();
+-
+-    while (!iterator.end()) {
+-      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
+-      //if(cell->data().mean() > 0.6)
+-      {
+-        boct_loc_code<short> code =cell->get_code();
+-        std::cout << " Code: " <<code<< std::endl;
+-        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
+-
+-      }
+-      ++iterator;
+-    }
+-  }
+-
+-  bool result = true;
+-  TEST("Valid Test", result, true);
+-}
+-
+-
+-TESTMAIN(test_gauss3D_steerable_filters);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
+deleted file mode 100644
+index a3b8a060e7..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
+-#include <bvpl/bvpl_octree/bvpl_corner_detector.h>
+-#include <bvpl/bvpl_octree/bvpl_corner_functors.h>
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
+-#include <bvpl/bvpl_octree/bvpl_global_corners.h>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_kernel_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
+-#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
+-#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
+-#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
+deleted file mode 100644
+index 73b0ddef0f..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
++++ /dev/null
+@@ -1,352 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov. 16, 2009.
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "../bvpl_octree_kernel_operator.h"
+-#include "../bvpl_scene_kernel_operator.h"
+-#include "../bvpl_octree_vector_operator_impl.h"
+-#include "../bvpl_scene_vector_operator.h"
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-
+-#include <boct/boct_loc_code.h>
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-static bool debug = false;
+-typedef boct_tree<short, float> tree_type;
+-typedef boct_tree_cell<short, float> cell_type;
+-
+-
+-void fill_sample_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-    tree->split();
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5);
+-    if (debug)
+-      for (auto & leave : leaves) {
+-        std::cout<< leave->get_code().x_loc_ << ','
+-                << leave->get_code().y_loc_ << ','
+-                << leave->get_code().z_loc_ << ','
+-                << leave->data() << std::endl;
+-      }
+-
+-    leaves[1]->split();
+-    //leaves[1]->set_data(0.6);
+-  }
+-
+-#if 0
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      std::cout<< leaves[i]->get_code().x_loc_ << ','
+-              << leaves[i]->get_code().y_loc_ << ','
+-              << leaves[i]->get_code().z_loc_ << ','
+-              << tree->local_origin(leaves[i]) << ','
+-              << leaves[i]->get_code().level << ','
+-              << tree->cell_size(leaves[i]) << ','
+-              << leaves[i]->data() << std::endl;
+-    }
+-  }
+-#endif
+-}
+-
+-void fill_edge3d_tree(boct_tree<short,float>* tree)
+-{
+-  tree-> split();
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  for (unsigned i= 0; i<4; i++)
+-  {
+-    leaves[i]->set_data(0.2f);
+-    leaves[i]->split();
+-    {
+-      boct_tree_cell<short,float>* cc =leaves[i]->children();
+-      for (unsigned j1=0; j1<8; j1++)
+-        cc[j1].split();
+-    }
+-    leaves[i+4]->set_data(0.9f);
+-    leaves[i+4]->split();
+-    {
+-      boct_tree_cell<short,float>* cc =leaves[i+4]->children();
+-      for (unsigned j1=0; j1<8; j1++)
+-        cc[j1].split();
+-    }
+-    //split children
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  }
+-}
+-
+-void octree_kernel()
+-{
+-  //Create kernel
+-  bvpl_edge3d_kernel_factory edge_factory(-1,1,-1,0,-1,0);
+-  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
+-#ifdef DEBUG
+-  kernel->print();
+-#endif
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-  //Create the octree
+-  auto *tree = new boct_tree<short,float>(3);
+-  fill_sample_octree(tree);
+-
+-  //operate kernel on octree
+-  bvpl_octree_kernel_operator<float> oper(tree);
+-
+-  boct_tree<short,float> *tree_out = tree->clone();
+-#ifdef DEBUG
+-  tree_out->print();
+-#endif
+-  oper.operate(functor, kernel, tree_out, 1, 0.5);
+-#ifdef DEBUG
+-  tree_out->print();
+-#endif
+-
+-  TEST("Octree kernel", true, true);
+-  delete tree;
+-  delete tree_out;
+-}
+-
+-void scene_kernel_operator()
+-{
+-  //Create kernel
+-  bvpl_edge3d_kernel_factory edge_factory(-1,0,-1,0,-1,0);
+-  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
+-
+-  //kernel->print();
+-
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-
+-  /***********Part1 operate on tree*******************/
+-
+-  //Create tree
+-  typedef boct_tree<short,float > tree_type;
+-  auto *tree = new boct_tree<short,float>(3);
+-
+-  fill_sample_octree(tree);
+-
+-  //operate on octree
+-  bvpl_octree_kernel_operator<float> oper(tree);
+-
+-
+-  //Create output trees
+-  boct_tree<short,float > *tree_out = tree->clone();
+-  tree_out->init_cells(0.0f);
+-  short level = 0;
+-  double cell_length = 1.0/(double)(1<<(tree->root_level() -level));
+-
+-  // void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
+-  oper.operate(functor,kernel, tree_out, level, cell_length);
+-
+-
+-  /***********Part2 operate on scene*******************/
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(1,1,1);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path="./";
+-  scene.set_paths(scene_path, "in_block");
+-
+-  boxm_block_iterator<tree_type>  iter =scene.iterator();
+-  iter.begin();
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type> *block = scene.get_active_block();
+-    block->init_tree(tree->clone());
+-    scene.write_active_block();
+-  }
+-
+-  //Create the output scenes
+-  boxm_scene<boct_tree<short,float> > scene_out(lvcs, origin, block_dim, world_dim);
+-  scene_out.set_paths(scene_path, "response_scene");
+-
+-  //operate on scene
+-  bvpl_scene_kernel_operator scene_oper;
+-  scene_oper.operate(scene,functor, kernel, scene_out);
+-
+-  //compare blocks of scene with single tree, result should be the same
+-  std::vector<boct_tree_cell<short,float>* > leaves_out = tree_out->leaf_cells();
+-  boxm_block_iterator<tree_type>  iter2 =scene_out.iterator();
+-  bool eq=true;
+-  iter2.begin();
+-  for (; !iter2.end(); iter2++) {
+-    scene_out.load_block(iter2.index());
+-    boxm_block<tree_type> *block = scene_out.get_active_block();
+-    tree_type *temp_tree = block->get_tree();
+-    std::vector<boct_tree_cell<short,float>* > temp_leaves = temp_tree->leaf_cells();
+-    // compare tree values
+-    for (unsigned i=0; i<temp_leaves.size(); i++) {
+-      if (!((temp_leaves[i]->data() == leaves_out[i]->data())))
+-      {
+-        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
+-        eq = false;
+-      }
+-    }
+-  }
+-  TEST("tree operator == scene operator", eq, true);
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());//file_it() is deleted here
+-   // vul_file::delete_file_glob(file_it());
+-  }
+-}
+-
+-void octree_vector_operator()
+-{
+-  //Create the vector of kernels
+-  bvpl_edge3d_kernel_factory kernels_3d(-3,2, -3,2,-3,2);
+-  bvpl_create_directions_a dir;
+-  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
+-
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-  //Create tree. this tree is initialized with 4 leves as a regular grid
+-  auto *tree = new boct_tree<short,float>(4);
+-
+-  fill_edge3d_tree(tree);
+-
+-  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
+-  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
+-  short level = 0;
+-  double cell_length = 1.0/(double)(1<<(3 -level));
+-
+-  bvpl_max_vector_operator<float> vector_op;
+-
+-  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
+-
+-  //test response at the center is correct
+-  boct_loc_code<short> loc_code;
+-
+-  bool result = true;
+-  for (short x=3; x<5; x++)
+-    for (short y=3; y<5; y++)
+-      for (short z=3; z<5; z++)
+-      {
+-        loc_code.set_code(x,y,z);
+-        loc_code.set_level(0);
+-        result = result && tree_out->get_cell(loc_code)->data().id_ == 0;
+-      }
+-  TEST("Octree vector operator", result, true);
+-}
+-
+-void scene_vector_operator()
+-{
+-  //Create the vector of kernels
+-  bvpl_edge3d_kernel_factory kernels_3d(-3,2,-3,2,-3,2);
+-  bvpl_create_directions_a dir;
+-  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
+-
+-  //Create functor
+-  bvpl_edge_geometric_mean_functor<float> functor;
+-
+-  /***********Part1 operate on tree*******************/
+-
+-  //Create tree. this tree is initialized with 4 leves as a regular grid
+-  auto *tree = new boct_tree<short,float>(4);
+-  fill_edge3d_tree(tree);
+-
+-  //Create output trees
+-  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
+-  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
+-  short level = 0;
+-  double cell_length = 1.0/(double)(1<<(3 -level));
+-
+-  //operate vector on tree
+-  bvpl_max_vector_operator<float> vector_op;
+-
+-  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
+-
+-  /***********Part2 operate on scene*******************/
+-
+-  //Crete the input scene
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(10,10,20);
+-
+-  vgl_vector_3d<double> block_dim(1,1,1); //world coordinate dimensions of a block
+-  vgl_vector_3d<unsigned> world_dim(2,2,2); //number of blocks in a scene
+-
+-  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
+-  std::string scene_path("./");
+-  scene.set_paths(scene_path, "scene_in");
+-
+-  boxm_block_iterator<tree_type>  iter =scene.iterator();
+-  iter.begin();
+-  for (; !iter.end(); iter++) {
+-    scene.load_block(iter.index());
+-    boxm_block<tree_type> *block = scene.get_active_block();
+-    block->init_tree(tree->clone());
+-    scene.write_active_block();
+-  }
+-
+-  //Create the output scenes
+-  boxm_scene<boct_tree<short,bvpl_octree_sample<float> > > scene_out(lvcs, origin, block_dim, world_dim);
+-  scene_out.set_paths(scene_path, "response_scene");
+-
+-  //operate on scene
+-  bvpl_scene_vector_operator scene_oper;
+-  scene_oper.operate(scene, functor, kernel_vec, scene_out);
+-
+-  //compare blocks of scene with single tree, result should be the same
+-  std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > leaves_out = tree_out->leaf_cells();
+-  boxm_block_iterator<boct_tree<short,bvpl_octree_sample<float> > >  iter2 =scene_out.iterator();
+-  bool eq = true;
+-  iter2.begin();
+-  for (; !iter2.end(); iter2++) {
+-    scene_out.load_block(iter2.index());
+-    boxm_block<boct_tree<short,bvpl_octree_sample<float> > > *block = scene_out.get_active_block();
+-    boct_tree<short,bvpl_octree_sample<float> > *temp_tree = block->get_tree();
+-    std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > temp_leaves = temp_tree->leaf_cells();
+-    // compare tree values
+-    for (unsigned i=0; i<temp_leaves.size(); i++)
+-      if (!((temp_leaves[i]->data().response_ == leaves_out[i]->data().response_)||
+-            (temp_leaves[i]->data().id_ == leaves_out[i]->data().id_)))
+-      {
+-        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
+-        eq = false;
+-      }
+-  }
+-
+-  TEST("tree operator == scene operator", eq, true);
+-
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());//Already deletes file_it()
+-  //  vul_file::delete_file_glob(file_it());
+-  }
+-}
+-
+-
+-static void test_octree_kernel_operator()
+-{
+-  octree_kernel();
+- // octree_vector_operator(); //TEST FAIL FIX_ME
+- // scene_kernel_operator();
+- // scene_vector_operator();
+- }
+-
+-TESTMAIN(test_octree_kernel_operator);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
+deleted file mode 100644
+index 20a062b9f9..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
++++ /dev/null
+@@ -1,92 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Nov. 16, 2009.
+-
+-#include <testlib/testlib_test.h>
+-
+-#include "../bvpl_octree_neighbors.h"
+-#include "../bvpl_scene_kernel_operator.h"
+-#include "../bvpl_octree_vector_operator_impl.h"
+-#include "../bvpl_scene_vector_operator.h"
+-#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
+-#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
+-#include <bvpl/kernels/bvpl_create_directions.h>
+-
+-#include <boct/boct_loc_code.h>
+-
+-static bool debug = false;
+-typedef boct_tree<short, float> tree_type;
+-typedef boct_tree_cell<short, float> cell_type;
+-
+-
+-void fill_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-    //tree->split();
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5);
+-    if (debug)
+-      for (auto & leave : leaves) {
+-        std::cout<< leave->get_code().x_loc_ << ','
+-                << leave->get_code().y_loc_ << ','
+-                << leave->get_code().z_loc_ << ','
+-                << leave->data() << std::endl;
+-      }
+-
+-    leaves[0]->split();
+-    //leaves[1]->set_data(0.6);
+-  }
+-
+-#if 0
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      std::cout<< leaves[i]->get_code().x_loc_ << ','
+-              << leaves[i]->get_code().y_loc_ << ','
+-              << leaves[i]->get_code().z_loc_ << ','
+-              << tree->local_origin(leaves[i]) << ','
+-              << leaves[i]->get_code().level << ','
+-              << tree->cell_size(leaves[i]) << ','
+-              << leaves[i]->data() << std::endl;
+-    }
+-  }
+-#endif
+-}
+-
+-static void test_octree_neighbors()
+-{
+-  auto* tree = new boct_tree<short,float>(4,3);
+-  fill_octree(tree);
+-  bvpl_kernel_iterator iter;
+-  vgl_point_3d<int> min_pt(-1,-1,-1);
+-  vgl_point_3d<int> max_pt(1,1,1);
+-  for (int i=min_pt.x(); i<=max_pt.x(); i++) {
+-    for (int j=min_pt.y(); j<=max_pt.y(); j++) {
+-      for (int k=min_pt.z(); k<=max_pt.z(); k++) {
+-        iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
+-      }
+-    }
+-  }
+-  bvpl_kernel_sptr kernel= new bvpl_kernel(iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0),0.0f, vgl_vector_3d<int>(3,3,3), min_pt,max_pt);
+-
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  bvpl_octree_neighbors<float> neighb(tree);
+-  for (auto cell : leaves) {
+-    std::cout << cell->code_
+-             << "THIS   " << tree->local_origin(cell) << std::endl;
+-    std::vector<boct_tree_cell<short,float> *> neighb_cells;
+-    neighb.neighbors(kernel, cell, neighb_cells);
+-    std::cout << "Number of neighbors: " << neighb_cells.size() << std::endl;
+-    for (auto & neighb_cell : neighb_cells) {
+-      std::cout << "  " << tree->local_origin(neighb_cell) << std::endl;
+-    }
+-  }
+-}
+-
+-TESTMAIN(test_octree_neighbors);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
+deleted file mode 100644
+index 602b9b14c6..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
++++ /dev/null
+@@ -1,304 +0,0 @@
+-//:
+-// \file
+-// \brief : Tests bvpl/PCA operations
+-// \author Isabel Restrepo
+-// \date 17-Nov-2010
+-
+-#include <testlib/testlib_test.h>
+-
+-#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
+-#include <bvpl/bvpl_octree/bvpl_global_pca.h>
+-#include "test_utils.h"
+-
+-#include <vnl/vnl_vector.h>
+-#include <vnl/vnl_vector_fixed.h>
+-#include <vnl/vnl_matrix.h>
+-#include <vnl/vnl_matrix_fixed.h>
+-
+-#include <vul/vul_file.h>
+-#include <vpl/vpl.h>
+-
+-void test_kernel_set_up()
+-{
+-  bool result=true;;
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
+-  //neighborhood box for volume "patches" 3x3x3
+-   vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-1,-1,-1), vgl_point_3d<int>(1,1,1));
+-  //number of samples - 10% of total number of leaf-cells
+-  unsigned long nsamples = (unsigned long)((double)scene->size() * 0.1);
+-
+-  clean_up("./evd", "*.txt");
+-  vpl_mkdir("./evd",0777);
+-  clean_up("./svd", "*.txt");
+-  vpl_mkdir("./svd",0777);
+-
+-  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, "./evd");
+-  bvpl_discover_pca_kernels pca_extractor_svd(neighborhood, nsamples, scene, "./svd", false);
+-
+-
+-  //XML write
+-  pca_extractor.xml_write();
+-  pca_extractor_svd.xml_write();
+-
+-  //training errorr
+-  vnl_vector<double> verror;
+-  vnl_vector<double> t_verror;
+-  vnl_vector<double> testing_error;
+-  pca_extractor.compute_training_error(verror);
+-  pca_extractor.theoretical_training_error(t_verror);
+-  pca_extractor.compute_testing_error(testing_error);
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_pca_kernels - 1 " << boct_tree_cell<short, float >::nleaks() << '\n';
+-#endif
+-
+-  result = verror[verror.size()-1] < 1.0e-7;
+-  TEST("Test training error:", result, true);
+-
+-  bvpl_discover_pca_kernels pca_extractor2("./evd");
+-  vnl_vector<double> verror2;
+-  pca_extractor2.compute_training_error(verror2);
+-  vnl_vector<double> test_error2;
+-  pca_extractor2.compute_testing_error(test_error2);
+-
+-  //Load from XML file - and check that clases are the same
+-  result = pca_extractor.principal_comps().is_equal(pca_extractor2.principal_comps(), 1.0e-9);
+-  TEST("Test xml_write PC:", result, true);
+-
+-  result = pca_extractor.weights().is_equal(pca_extractor2.weights(), 1.0e-9);
+-  TEST("Test xml_write weights:", result, true);
+-
+-  result = pca_extractor.mean().is_equal(pca_extractor2.mean(), 1.0e-9);
+-  TEST("Test xml_write mean:", result, true);
+-
+-  result = pca_extractor.feature_dim()== pca_extractor2.feature_dim();
+-  TEST("Test xml_write feature dim:", result, true);
+-
+-  result = pca_extractor.nsamples()== pca_extractor2.nsamples();
+-  TEST("Test xml_write nsamples :", result, true);
+-
+-  result = verror.is_equal(t_verror, 1.0e-9);
+-  TEST("Test training errors agrees with theoretical value:", result, true);
+-
+-  result = testing_error.squared_magnitude() > t_verror.squared_magnitude();
+-  TEST("Test testing error > training error:", result, true);
+-
+-  result = testing_error.is_equal(test_error2, 1.0e-9);
+-  TEST("Testing errors are equal:", result, true);
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks at test_pca_kernels - 2 " << boct_tree_cell<short, float >::nleaks() << '\n';
+-#endif
+-
+-#if 0
+-  std::cout<< "error : " << verror << '\n'
+-          << "t_error : " << t_verror << '\n'
+-          << "weights : " << pca_extractor.weights() << '\n'
+-
+-          << "error 1: " << verror << '\n'
+-          << "error 2: " << verror2 << '\n'
+-
+-          << "mean 1: " << pca_extractor.mean() << '\n'
+-          << "mean 2: " << pca_extractor2.mean() << '\n'
+-
+-          << "path 1: " << pca_extractor.scene_path() << '\n'
+-          << "path 2: " << pca_extractor2.scene_path() << std::endl;
+-#endif
+-}
+-
+-void test_global()
+-{
+-  //create scene
+-  boxm_scene<boct_tree<short, float> > *scene = create_scene(3,3,3);
+-  //neighborhood box for volume "patches" 5x5x5
+-  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-2,-2,-2), vgl_point_3d<int>(2,2,2));
+-  //number of samples - 10% of total number of leaf-cells
+-  double training_fraction = 1.0;
+-  unsigned long nsamples = (unsigned long)((double)scene->size() * training_fraction);
+-  double finest_cell_length = scene->finest_cell_length();
+-
+-  clean_up("./pca_info", "*.txt");
+-  vpl_mkdir("./pca_info",0777);
+-  clean_up("./pca_global_info", "*.txt");
+-  vpl_mkdir("./pca_global_info",0777);
+-
+-  bvpl_discover_pca_kernels pca_info(neighborhood, nsamples, scene, "./pca_info");
+-  pca_info.xml_write();
+-
+-  std::vector<std::string> scenes;
+-  std::vector<std::string> aux_paths;
+-  std::vector<double> cell_lengths;
+-  scenes.push_back("./test_scene.xml");
+-  aux_paths.push_back(".");
+-  cell_lengths.push_back(finest_cell_length);
+-
+-  boxm_scene<boct_tree<short, int> > *aux_scene =
+-  new boxm_scene<boct_tree<short, int> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
+-  aux_scene->set_appearance_model(BOXM_INT);
+-
+-  std::string scene_name = "test_aux_scene";
+-  std::string scene_path(vul_file::get_cwd());
+-  aux_scene->set_paths(scene_path, scene_name);
+-  aux_scene->write_scene("./test_aux_scene.xml");
+-
+-  bvpl_global_pca<125> pca_global_info(scenes, aux_paths,cell_lengths, neighborhood,training_fraction, "./pca_global_info");
+-  pca_global_info.xml_write();
+-
+-  vnl_matrix<double> s1 = pca_info.compute_scatter_matrix(scene);
+-
+-  unsigned file =0;
+-  for (unsigned i = 0; i < 3; i++)
+-    for (unsigned j = 0; j < 3; j++)
+-      for (unsigned k = 0; k < 3; k++) {
+-        vnl_matrix_fixed<double, 125, 125> S;
+-        vnl_vector_fixed<double, 125> mean;
+-        unsigned long nfeature =0L;
+-        pca_global_info.sample_statistics(0, i, j, k, S, mean, nfeature);
+-
+-        std::stringstream scatter_ss;
+-        scatter_ss << pca_global_info.path_out() << "/S_" << 0 << '_' <<file<< ".txt";
+-        std::ofstream scatter_ofs(scatter_ss.str().c_str());
+-        scatter_ofs.precision(15);
+-        scatter_ofs << S;
+-
+-        std::stringstream mean_ss;
+-        mean_ss <<  pca_global_info.path_out() << "/mean_" << 0 << '_'  <<file << ".txt";
+-        std::ofstream mean_ofs ( mean_ss.str().c_str() );
+-        mean_ofs.precision(15);
+-        mean_ofs << nfeature << '\n' << mean;
+-        file++;
+-      }
+-
+-  //read pairwise
+-
+-  unsigned nrepeat = 0; // will become ceil(log_2(file)) after this iteration
+-  unsigned orig_file = file;
+-  for (unsigned pow_of_2 = 1; pow_of_2 < orig_file; pow_of_2*=2,++nrepeat) // i.e.: ceil(log_2(file)) iterations
+-  {
+-    unsigned file_p = 0;
+-    unsigned nfiles = 0;
+-    for (; file_p < file; file_p+=2, ++nfiles)
+-    {
+-      vnl_matrix_fixed<double, 125, 125> S1(0.0);
+-      vnl_vector_fixed<double, 125> mean1(0.0);
+-      unsigned long nfeatures1 =0;
+-
+-      {
+-        std::stringstream scatter_ss;
+-        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p << ".txt";
+-        std::ifstream scatter_ifs(scatter_ss.str().c_str());
+-        scatter_ifs >> S1;
+-        std::stringstream mean_ss;
+-        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << file_p << ".txt";
+-        std::ifstream mean_ifs ( mean_ss.str().c_str() );
+-        mean_ifs >> nfeatures1;
+-        mean_ifs >> mean1;
+-#if 0
+-        vul_file::delete(scatter_ss.str());
+-        vul_file::delete(mean_ss.str());
+-#endif
+-      }
+-
+-      vnl_matrix_fixed<double, 125, 125> S2(0.0);
+-      vnl_vector_fixed<double, 125> mean2(0.0);
+-      unsigned long nfeatures2 =0;
+-
+-      {
+-        std::stringstream scatter_ss;
+-        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p + 1  << ".txt";
+-        std::ifstream scatter_ifs(scatter_ss.str().c_str());
+-        scatter_ifs >> S2;
+-        std::stringstream mean_ss;
+-        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_' << file_p + 1 << ".txt";
+-        std::ifstream mean_ifs ( mean_ss.str().c_str() );
+-        mean_ifs >> nfeatures2;
+-        mean_ifs >> mean2;
+-      }
+-
+-      vnl_matrix_fixed<double, 125, 125> S_out(0.0);
+-      vnl_vector_fixed<double, 125> mean_out(0.0);
+-      double nfeatures_out =0.0;
+-      bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
+-
+-      std::stringstream scatter_ss;
+-      scatter_ss <<pca_global_info.path_out()  << "/S_" << (nrepeat+1) << '_' << file_p/2  << ".txt";
+-      std::ofstream scatter_ofs(scatter_ss.str().c_str());
+-      scatter_ofs.precision(15);
+-      scatter_ofs << S_out;
+-
+-      std::stringstream mean_ss;
+-      mean_ss << pca_global_info.path_out() << "/mean_" <<  (nrepeat+1) << '_' << file_p/2<< ".txt";
+-      std::ofstream mean_ofs ( mean_ss.str().c_str() );
+-      mean_ofs.precision(15);
+-      mean_ofs << nfeatures_out << '\n' << mean_out;
+-    }
+-    file = nfiles;
+-  }
+-
+-  //load final mean and scatter
+-  vnl_matrix_fixed<double, 125, 125> S_total(0.0);
+-  vnl_vector_fixed<double, 125> mean_total(0.0);
+-  unsigned long nfeatures_total =0;
+-
+-
+-  std::stringstream scatter_ss;
+-  scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat<< '_' << 0 << ".txt";
+-  std::ifstream scatter_ifs(scatter_ss.str().c_str());
+-  scatter_ifs >> S_total;
+-  std::stringstream mean_ss;
+-  mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << 0 << ".txt";
+-  std::ifstream mean_ifs ( mean_ss.str().c_str() );
+-  mean_ifs >> nfeatures_total;
+-  mean_ifs >> mean_total;
+-
+-
+-  std::cout << "Scatter diff:\n " << ((s1  - S_total).array_two_norm()) << '\n'
+-           << "Mean diff:\n " << (pca_info.mean()  - mean_total).two_norm() << '\n';
+-
+-  clean_up("./pca_info", "*.txt");
+-  clean_up("./pca_global_info", "*.txt");
+-#if 0
+-  pca_global_info.compute_statistics();
+-#endif
+-  //compare results
+-}
+-
+-
+-void test_pca_kernels()
+-{
+-  clean_up();
+-
+-  //make up a matrix
+-  vnl_matrix<double> data(2, 10);
+-  unsigned i =0;
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.69f, 0.49f));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-1.31f, -1.21f));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.39, 0.99));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.09, 0.29));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(1.29, 1.09));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.49, 0.79));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(0.19, -0.31));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.81, -0.81));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.31, -0.31));
+-  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.71, -1.01));
+-
+-  bvpl_discover_pca_kernels pca_extractor(data);
+-
+-  vnl_matrix<double> pc = pca_extractor.principal_comps();
+-
+-  vnl_matrix<double> true_pc(2,2);
+-  i =0;
+-  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.677873, -0.735179));
+-  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.735179, 0.677873));
+-
+-  bool result = true_pc.is_equal(pc, 0.001);
+-  TEST("Test pc equals true_pc", result, true);
+-
+-  test_kernel_set_up();
+-  test_global();
+-  clean_up();
+-}
+-
+-
+-TESTMAIN(test_pca_kernels);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
+deleted file mode 100644
+index 4e5a30d980..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
++++ /dev/null
+@@ -1,143 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 11-Feb-2011
+-
+-#include <iostream>
+-#include <map>
+-#include <testlib/testlib_test.h>
+-
+-#include "test_utils.h"
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
+-
+-#include <vul/vul_file.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vnl/vnl_sym_matrix.h>
+-
+-void create_basis(std::string test_dir, std::map<std::string, float> &values)
+-{
+-  //generate basis paths
+-  if (!vul_file::is_directory(test_dir))
+-    vul_file::make_directory(test_dir);
+-
+-  vul_file::change_directory(test_dir);
+-
+-  bvpl_taylor_basis_loader loader(test_dir);
+-
+-  std::vector<std::string> basis_names;
+-  loader.files(basis_names);
+-
+-  //make the basis directories
+-  for (unsigned i= 0; i<basis_names.size(); i++)
+-  {
+-    std::string basis_dir = vul_file::get_cwd()+ "/" + basis_names[i];
+-    if (!vul_file::is_directory(basis_dir))
+-      vul_file::make_directory(basis_dir);
+-
+-    vul_file::change_directory(basis_dir);
+-
+-    create_scene(1,1,1, true, float(i), "float_response_scene");
+-
+-    vul_file::change_directory("..");
+-
+-    values.insert(std::pair<std::string, float>(basis_names[i], float(i)));
+-  }
+-}
+-
+-void test_assemble_basis(bvpl_taylor_scenes_map_sptr taylor_scenes, std::map<std::string, float> &values)
+-{
+-  bvpl_taylor_basis::assemble_basis(taylor_scenes, 0, 0, 0);
+-
+-  //retieve the basis seen and check vectors and matrices
+-  double I0 = values["I0"];
+-
+-  vnl_vector<double> G(3);
+-  G[0] = values["Ix"];
+-  G[1] = values["Iy"];
+-  G[2] = values["Iz"];
+-
+-  double H_as_vector[6];
+-  H_as_vector[0] = values["Ixx"];
+-  H_as_vector[1] = values["Ixy"];
+-  H_as_vector[2] = values["Iyy"];
+-  H_as_vector[3] = values["Ixz"];
+-  H_as_vector[4] = values["Iyz"];
+-  H_as_vector[5] = values["Izz"];
+-  vnl_sym_matrix<double> H(H_as_vector, 3);
+-
+-  std::cout << "IO: " << I0 << "\nG: " << G <<"\nH: " << H.as_matrix() << std::endl;
+-
+-  boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* basis_scene = dynamic_cast<boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* > (taylor_scenes->get_scene("basis").as_pointer());
+-  basis_scene->load_block(0, 0, 0);
+-
+-  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* > basis_leaves = basis_scene->get_block(0, 0, 0)->get_tree()->leaf_cells();
+-
+-  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* >::iterator it = basis_leaves.begin();
+-  bool result = true;
+-  for (; it!= basis_leaves.end(); it++)
+-  {
+-    bvpl_taylor_basis2_sample sample = (*it)->data();
+-    if (sample.I0!=I0){
+-      result = false;
+-      std::cout << sample << std::endl;
+-    }
+-
+-    if (!((sample.G.as_vector()).is_equal(G, 1e-7))){
+-      result = false;
+-      std::cout << sample << std::endl;
+-    }
+-
+-    if (!((sample.H.as_matrix()).is_equal(H.as_matrix(), 1e-7))){
+-      result = false;
+-      std::cout << sample << std::endl;
+-    }
+-  }
+-
+-  TEST("Test assemble basis", result, true);
+-}
+-
+-
+-void test_taylor_basis()
+-{
+-  //generate basis
+-  std::string basis_dir = "./taylor_basis";
+-  std::map<std::string, float> values;
+-  create_basis(basis_dir, values);
+-
+-  //load map of scenes into memory
+-  bvpl_taylor_basis_loader loader(vul_file::get_cwd());
+-  std::cout << vul_file::get_cwd() << std::endl;
+-  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
+-
+-
+-  //test assembling
+-  test_assemble_basis(taylor_scenes, values);
+-
+-  //test computing error
+-  boxm_scene<boct_tree<short, float> >* data_scene = create_scene(2,2,2, true, 1.0f, "data_scene");
+-  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
+-  double cell_length = data_scene->finest_cell_length();
+-  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),error_scene,loader,0,0,0, cell_length);
+-
+-  error_scene->load_block(0,0,0);
+-  std::cout.precision(15);
+-  error_scene->get_block(0,0,0)->get_tree()->print();
+-
+-  unsigned long tree_ncells = error_scene->get_block(0,0,0)->get_tree()->size();
+-  unsigned long scene_ncells = error_scene->size();
+-  unsigned long nsamples = scene_ncells*100L;
+-
+-  //number of samples - 10% of total number of leaf cells
+-  unsigned long tree_nsamples = (unsigned long)(float(tree_ncells)/scene_ncells*nsamples);
+-  double error = bvpl_taylor_basis::sum_errors(error_scene,0,0,0, tree_nsamples);
+-
+-  TEST_NEAR("Test average error", error, 131737.5, 1e-7);
+-}
+-
+-
+-TESTMAIN(test_taylor_basis);
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
+deleted file mode 100644
+index 2932c2a301..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
+-#include <bvpl/bvpl_octree/bvpl_global_taylor.hxx>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
+deleted file mode 100644
+index 39bffed911..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
++++ /dev/null
+@@ -1,94 +0,0 @@
+-#include "test_utils.h"
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date 15-Aug-2010
+-
+-#include <vul/vul_file.h>
+-#include <vul/vul_file_iterator.h>
+-#include <vpl/vpl.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val)
+-{
+-  tree-> split(); //now we have 8 cells
+-  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-  leaves[i]->set_data(init_val);
+-  leaves[i]->split();
+-
+-  boct_loc_code<short> code = leaves[i]->get_code() ;
+-  std::cerr<< "Create Scene Code: " << code << std::endl;
+-}
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz,
+-                                                   bool uniform, float val, const std::string& scene_prefix)
+-{
+-  float init_val = 0.5f;
+-
+-  if (uniform)
+-    init_val = val;
+-
+-  //crete the input scene
+-  unsigned int max_tree_level = 3;
+-  unsigned int init_level = 1;
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0,0,0);
+-
+-  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
+-
+-  vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
+-
+-  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim, max_tree_level, init_level );
+-  std::string scene_path(vul_file::get_cwd());
+-  scene->set_paths(scene_path, scene_prefix);
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->write_scene(scene_prefix + ".xml");
+-  unsigned cell_index = 7;
+-  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
+-  iter.begin();
+-  while (!iter.end())
+-  {
+-    scene->load_block(iter.index());
+-    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
+-    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
+-    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
+-    //tree->print();
+-    if (uniform)
+-      init_tree(tree, cell_index, init_val);
+-    else
+-      init_tree(tree, cell_index);
+-    //tree->print();
+-    block->init_tree(tree);
+-    scene->write_active_block();
+-    if (cell_index == 0) cell_index = 7;
+-    cell_index--;
+-    ++iter;
+-  }
+-
+-#ifdef DEBUG_LEAKS
+-  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << std::endl;
+-#endif
+-  return scene;
+-}
+-
+-
+-void clean_up()
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it("./*.bin");
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());// this deletes the file at file_it()
+-    //    vul_file::delete_file_glob(file_it());
+-  }
+-}
+-
+-void clean_up(const std::string& dir, const std::string& ext)
+-{
+-  //clean temporary files
+-  vul_file_iterator file_it(dir+"/"+ext);
+-  for (; file_it; ++file_it)
+-  {
+-    vpl_unlink(file_it());
+-    vul_file::delete_file_glob(file_it());
+-  }
+-}
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
+deleted file mode 100644
+index f2c915a5cb..0000000000
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#ifndef bvpl_octree_test_utils_h_
+-#define bvpl_octree_test_utils_h_
+-//:
+-// \file
+-// \brief  A file containing utility functions for other tests
+-// \author Isabel Restrepo
+-// \date 13-Aug-2010
+-
+-#include <boxm/boxm_scene.h>
+-
+-void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val = 0.8);
+-
+-boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
+-                                                   bool uniform = false, float val = 0.5, const std::string& scene_prefix = "test_scene");
+-
+-void clean_up();
+-
+-void clean_up(const std::string& dir, const std::string& ext);
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+index 4279f1e47d..3e7108103d 100644
+--- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+@@ -19,7 +19,7 @@ if(EXPAT_FOUND)
+ 
+   vxl_add_library(LIBRARY_NAME bvpl_kernels_pro LIBRARY_SOURCES ${bvpl_kernels_pro_sources})
+ 
+-  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io bvpl_octree bvpl_octree_io bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
++  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io  bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
+ 
+   if( BUILD_TESTING )
+     add_subdirectory(tests)
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
+deleted file mode 100644
+index ee1188aea5..0000000000
+--- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#include <brdb/brdb_value.hxx>
+-
+-#include <vbl/io/vbl_io_smart_ptr.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
+deleted file mode 100644
+index 25a60ca12c..0000000000
+--- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
+-#include <vbl/io/vbl_io_smart_ptr.hxx>
+-
+-VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
+index 71a463d5d7..cb9febce0d 100644
+--- a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
++++ b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
+@@ -25,7 +25,6 @@ void bvpl_kernels_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_corner2d_kernel_process, "bvplCreateCorner2dKernelProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_gauss3d_xx_kernel_vector_process, "bvplCreateGauss3dXXKernelVectorProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_wc_kernel_vector_process, "bvplCreateWCKernelVectorProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_kernel_process, "bvplLoadTaylorKernelProcess");
+   REG_PROCESS_FUNC_CONS2(bvpl_create_gauss3d_kernel_process);
+   REG_PROCESS_FUNC_CONS2(bvpl_create_generic_kernel_vector_process);
+   REG_PROCESS_FUNC_CONS2(bvpl_write_generic_kernel_vector_process);
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx b/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
+deleted file mode 100644
+index c56d9cdb15..0000000000
+--- a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
++++ /dev/null
+@@ -1,53 +0,0 @@
+-//:
+-// \file
+-// \brief A process to load taylor response scenes into memory
+-// \author Isabel Restrepo
+-// \date 9-Feb-2011
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-
+-#include <brdb/brdb_value.h>
+-
+-#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
+-#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
+-
+-//:global variables
+-namespace bvpl_load_taylor_responses_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-
+-//:sets input and output types
+-bool bvpl_load_taylor_responses_process_cons(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_responses_process_globals ;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "vcl_string"; //parent dir of responses
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvpl_taylor_scenes_map_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-
+-//:the process
+-bool bvpl_load_taylor_responses_process(bprb_func_process& pro)
+-{
+-  using namespace bvpl_load_taylor_responses_process_globals;
+-
+-  //get inputs
+-  std::string parent_dir = pro.get_input<std::string>(0);
+-
+-  bvpl_taylor_basis_loader loader(parent_dir);
+-  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
+-
+-  //store output
+-  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
+-
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+deleted file mode 100644
+index 3bf956ba6c..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
++++ /dev/null
+@@ -1,44 +0,0 @@
+-# contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+-include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+-if( PYTHON_FOUND )
+-  FIND_PACKAGE(EXPAT REQUIRED)
+-FIND_PACKAGE(EXPATPP REQUIRED)
+-  if( EXPAT_FOUND )
+-    include_directories( ${PYTHON_INCLUDE_DIRS} )
+-    include_directories( ${BRL_INCLUDE_DIR} )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro )
+-    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree)
+-    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
+-
+-     set(bvpl_octree_batch_sources
+-       reg_bvpl_octree.h   reg_bvpl_octree.cxx
+-     )
+-    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
+-      vxl_add_library(LIBRARY_NAME bvpl_octree_batch LIBRARY_SOURCES SHARED ${bvpl_octree_batch_sources})
+-
+-      #In windows, library has to have different name depending on debug or release version.
+-      if(WIN32)
+-        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch DEBUG_POSTFIX _d SUFFIX .pyd)
+-      endif()
+-      if(APPLE) #This is because python only looks for .so
+-        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch SUFFIX .so)
+-      endif()
+-      set_target_properties(bvpl_octree_batch PROPERTIES PREFIX "")
+-
+-      target_link_libraries(bvpl_octree_batch bvpl_octree_pro bvpl_kernels_pro bpro_batch boxm_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro)
+-
+-      if(PYTHON_DEBUG_LIBRARIES)
+-        target_link_libraries( bvpl_octree_batch debug ${PYTHON_DEBUG_LIBRARY})
+-      endif()
+-
+-      if(PYTHON_LIBRARIES)
+-        target_link_libraries( bvpl_octree_batch optimized ${PYTHON_LIBRARY})
+-      endif()
+-
+-      if( BUILD_TESTING )
+-        add_subdirectory(tests)
+-      endif()
+-    endif()
+-  endif()
+-endif()
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
+deleted file mode 100644
+index d2df8b6752..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
++++ /dev/null
+@@ -1,61 +0,0 @@
+-#include "reg_bvpl_octree.h"
+-#include <bprb/bprb_macros.h>
+-#include <bprb/bprb_batch_process_manager.h>
+-
+-// processes
+-#include <bvpl/kernels/pro/bvpl_kernels_register.h>
+-#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
+-#include <boxm/pro/boxm_register.h>
+-#include <boxm/algo/pro/boxm_algo_register.h>
+-#include <vpgl_pro/vpgl_register.h>
+-
+-PyObject *
+-register_processes(PyObject *self, PyObject *args)
+-{
+-  bvpl_kernels_register::register_process();
+-  bvpl_octree_register::register_process();
+-  boxm_register::register_process();
+-  boxm_algo_register::register_process();
+-  vpgl_register::register_process();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-PyObject *
+-register_datatypes(PyObject *self, PyObject *args)
+-{
+-  register_basic_datatypes();
+-  bvpl_kernels_register::register_datatype();
+-  bvpl_octree_register::register_datatype();
+-  boxm_register::register_datatype();
+-  boxm_algo_register::register_datatype();
+-  vpgl_register::register_datatype();
+-  Py_INCREF(Py_None);
+-  return Py_None;
+-}
+-
+-PyMODINIT_FUNC
+-initbvpl_octree_batch(void)
+-{
+-  PyMethodDef reg_pro;
+-  reg_pro.ml_name = "register_processes";
+-  reg_pro.ml_meth = register_processes;
+-  reg_pro.ml_doc = "register_processes() create instances of each defined process";
+-  reg_pro.ml_flags = METH_VARARGS;
+-
+-
+-  PyMethodDef reg_data;
+-  reg_data.ml_name = "register_datatypes";
+-  reg_data.ml_meth = register_datatypes;
+-  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
+-  reg_data.ml_flags = METH_VARARGS;
+-
+-  bvpl_octree_batch_methods[0]=reg_pro;
+-  bvpl_octree_batch_methods[1]=reg_data;
+-
+-  for (int i=0; i<METHOD_NUM; ++i) {
+-    bvpl_octree_batch_methods[i+2]=batch_methods[i];
+-  }
+-
+-  Py_InitModule("bvpl_octree_batch", bvpl_octree_batch_methods);
+-}
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
+deleted file mode 100644
+index 4aad2e3dcb..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#ifndef reg_bvpl_octree_h_
+-#define reg_bvpl_octree_h_
+-
+-#include <bpro/bpro_batch/bpro_batch.h>
+-
+-static PyObject *register_processes(PyObject *self, PyObject *args);
+-static PyObject *register_datatypes(PyObject *self, PyObject *args);
+-static PyMethodDef bvpl_octree_batch_methods[METHOD_NUM+2];
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
+deleted file mode 100644
+index 1cc8664ce3..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( bvpl_octree_batch_test_include test_include.cxx )
+-target_link_libraries( bvpl_octree_batch_test_include bvpl_octree_batch)
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx b/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
+deleted file mode 100644
+index 292774691a..0000000000
+--- a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#include <bvpl_octree_batch/reg_bvpl_octree.h>
+-
+-int main() { return 0; }
+diff --git a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+index a387778a0c..0505293103 100644
+--- a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+@@ -5,14 +5,13 @@ include_directories( ${BRL_INCLUDE_DIR}/bseg/bvxm )
+ set(bvxm_algo_sources
+     bvxm_merge_mog.h     bvxm_merge_mog.cxx
+     bvxm_mog_norm.h      bvxm_mog_norm.hxx
+-    bvxm_boxm_convert.h
+    )
+ 
+ aux_source_directory(Templates bvxm_algo_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bvxm_algo LIBRARY_SOURCES ${bvxm_algo_sources})
+ 
+-target_link_libraries( bvxm_algo bsta bvxm_grid_io boxm_util ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
++target_link_libraries( bvxm_algo bsta ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
+ 
+ add_subdirectory(pro)
+ 
+diff --git a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h b/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
+deleted file mode 100644
+index d2b4e815e6..0000000000
+--- a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
++++ /dev/null
+@@ -1,152 +0,0 @@
+-// This is brl/bseg/bvxm/algo/bvxm_boxm_convert.h
+-#ifndef bvxm_boxm_convert_h
+-#define bvxm_boxm_convert_h
+-//:
+-// \file
+-// \brief Set of functions that convert a boxm_scene to a bvxm grid
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Jan 15, 2009
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <boxm/boxm_scene.h>
+-#include <bvxm/grid/bvxm_voxel_grid.h>
+-#include <bvxm/grid/bvxm_voxel_grid_basic_ops.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <boxm/util/boxm_cell_data_traits.h>
+-
+-template <class T_loc, class T_data>
+-bvxm_voxel_grid<T_data>* boxm_scene_to_bvxm_grid(boxm_scene<boct_tree<T_loc, T_data > > &scene,
+-                                                 std::string input_path,
+-                                                 unsigned int resolution_level,
+-                                                 bool enforce_level = false )
+-{
+-  //Print a little reminder that no inter/extra-polation happens in this function
+-  std::cout << "Convertion boxm_scene to bvxm_grid\n"
+-           << "Current resolution level: " << resolution_level << '\n'
+-           << "Enforcing only level cells ? " << enforce_level << '\n'
+-           << "Is grid saving internal nodes? " <<scene.save_internal_nodes() << std::endl;
+-
+-  typedef boct_tree<T_loc, T_data > tree_type;
+-
+-  // create an array for each block, and save in a binary file
+-  boxm_block_iterator<tree_type> iter(&scene);
+-
+-  unsigned int finest_level=100000;
+-  // find the finest levels in the blocks
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    tree_type* tree = block->get_tree();
+-    if (tree->finest_level() < int(finest_level)) {
+-      finest_level = tree->finest_level();
+-    }
+-    ++iter;
+-  }
+-
+-  // do not make the resolution smaller than finest level
+-  if (resolution_level < finest_level)
+-    resolution_level=finest_level;
+-
+-
+-  // make sure the resolution level for all trees is the same
+-  iter.begin();
+-  short root_level = 0;
+-  {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    tree_type* tree = block->get_tree();
+-    root_level = tree->root_level();
+-  }
+-
+-  // make sure root level is the same for all the trees
+-  while (!iter.end()) {
+-    vgl_point_3d<int> idx = iter.index();
+-    scene.load_block(idx);
+-    boxm_block<tree_type>* block = scene.get_block(idx);
+-    tree_type* tree = block->get_tree();
+-    if (tree->root_level() != root_level)
+-    {
+-      std::cerr << "Error converting boxm_scene to bvxm_grid: blocks have different root level\n";
+-    }
+-    iter++;
+-  }
+-
+-  // number of cells for each block should be the same, because they have the
+-  // same tree max_level definitions
+-  unsigned int ncells = 1 << (root_level - (int)resolution_level);
+-
+-  std::cout << "Number of cells per grid side: " << ncells << '\n';
+-
+-  //create the regular grid
+-  vgl_vector_3d<unsigned> dim = scene.world_dim(); //number of blocks in the scene
+-  unsigned dimx = dim.x()*ncells; // total number of cells in the scene x-dim
+-  unsigned dimy = dim.y()*ncells;
+-  unsigned dimz = dim.z()*ncells;
+-  bvxm_voxel_grid<T_data> *grid = new bvxm_voxel_grid<T_data>(input_path,vgl_vector_3d<unsigned>(dimx,dimy,dimz));
+-  T_data data_init(boxm_zero_val<T_loc, T_data>());
+-  grid->initialize_data(data_init);
+-
+-  std::cout << "Grid Size: " << vgl_vector_3d<unsigned>(dimx,dimy,dimz) << '\n'
+-           << "In boxm_scene_to_bxm_grid, default voxel value for the grid is: " << data_init << std::endl;
+-
+-  //iterate through grid, locate corresponding position in the octree
+-  typename bvxm_voxel_grid<T_data>::iterator grid_it=grid->begin();
+-
+-  //locate point in the tree, for now assume ONLY ONE BLOCK
+-  iter.begin();
+-  vgl_point_3d<int> idx = iter.index();
+-  scene.load_block(idx);
+-  boxm_block<tree_type>* block = scene.get_block(idx);
+-  tree_type* tree = block->get_tree();
+-#if 0
+-  vgl_box_3d<double> block_bb = block->bounding_box();
+-  // assume that bounding box is a cube
+-  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
+-#endif
+-
+-  for (unsigned z=0; z<dimz; ++grid_it, ++z)
+-  {
+-    bvxm_voxel_slab<T_data> slab = (*grid_it);
+-    std::cout << '.' <<std::flush ;
+-    for (unsigned y=0; y<dimy;++y)
+-    {
+-      for (unsigned x=0; x<dimx; ++x)
+-      {
+-        vgl_point_3d<double> p(((double)x/(double)dimx), ((double)y/(double)dimy), (0.99 - (double)z/(double)dimz));
+-        //locate the cell containing the point closest to the specified level
+-        boct_tree_cell<T_loc,T_data>* this_cell = tree->locate_point_at_level(p, resolution_level,true);
+-
+-        if (!this_cell) {
+-          std::cerr << "In boxm_scene_to_bvxm_grid: cell out of bounds\n";
+-          continue;
+-        }
+-
+-        unsigned int level = this_cell->get_code().level;
+-        T_data cell_val = this_cell->data();
+-
+-        if (level < resolution_level)
+-          std::cerr << "In boxm_scene_to_bvxm_grid: current level smaller than target level\n";
+-
+-        //if enfoce level is true, there is no iter/extrapolation
+-        if ((enforce_level)&& (level != resolution_level))
+-          continue;
+-
+-        // just copy value to output grid
+-        slab(x,y) = cell_val;
+-      }
+-    }
+-  }
+-  std::cout << '\n';
+-  return grid;
+-}
+-
+-#endif
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+index 4917b6eb59..3a0824d257 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+@@ -18,7 +18,8 @@ FIND_PACKAGE(EXPATPP REQUIRED)
+   aux_source_directory(processes bvxm_algo_pro_sources)
+ 
+   vxl_add_library(LIBRARY_NAME bvxm_algo_pro LIBRARY_SOURCES ${bvxm_algo_pro_sources} )
+-  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
++  #target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
++  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
+ 
+   if( BUILD_TESTING )
+     add_subdirectory(tests)
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
+index 69e97478e7..8b9ad6d7f6 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
++++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
+@@ -8,6 +8,6 @@
+ DECLARE_FUNC_CONS(bvxm_merge_mog_process);
+ DECLARE_FUNC_CONS(bvxm_mog_to_mpm_process);
+ DECLARE_FUNC_CONS(bvxm_mog_l2_distance);
+-DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
++//DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
+ 
+ #endif
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
+index a7b2141026..a4f1e49d9d 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
++++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
+@@ -19,5 +19,5 @@ void bvxm_algo_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_merge_mog_process, "bvxmMergeMogProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_to_mpm_process, "bvxmMogToMpmProcess");
+  // REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_l2_process, "bvxmMogL2Process");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
++  //  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
+ }
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx b/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
+deleted file mode 100644
+index cfc6175b03..0000000000
+--- a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
++++ /dev/null
+@@ -1,129 +0,0 @@
+-// This is brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
+-#include <bvxm/algo/bvxm_boxm_convert.h>
+-//:
+-// \file
+-// \brief  Process to convert a boxm_scene to a bvxm_voxel_grid
+-// \author Isabel Restrepo mir@lems.brown.edu
+-// \date  Jan 19, 2010
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <bprb/bprb_func_process.h>
+-#include <bprb/bprb_parameters.h>
+-#include <brdb/brdb_value.h>
+-
+-
+-#include <bsta/bsta_attributes.h>
+-#include <bsta/bsta_mixture_fixed.h>
+-#include <bsta/bsta_gauss_sf1.h>
+-#include <bsta/bsta_gauss_if3.h>
+-
+-
+-namespace boxm_scene_to_bvxm_grid_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-//: process takes 4 inputs and 1 output.
+-// input[0]: The scene
+-// input[1]: Path to output grid
+-// input[2]: Resolution level
+-// input[3]: Bool: Enforce only cells at the resolution leve?
+-//           If true, there is no interpolation
+-// output[0]: The output grid
+-
+-bool boxm_scene_to_bvxm_grid_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm_scene_to_bvxm_grid_process_globals;
+-
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[0] = "boxm_scene_base_sptr";
+-  input_types_[1] = "vcl_string";
+-  input_types_[2] = "unsigned";
+-  input_types_[3] = "bool";
+-
+-  std::vector<std::string> output_types_(n_outputs_);
+-  output_types_[0] = "bvxm_voxel_grid_base_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm_scene_to_bvxm_grid_process(bprb_func_process& pro)
+-{
+-  using namespace boxm_scene_to_bvxm_grid_process_globals;
+-
+-  if (pro.n_inputs() != n_inputs_)
+-  {
+-    std::cerr << pro.name() << ": the input number should be " << n_inputs_
+-             << " but instead it is " << pro.n_inputs() << std::endl;
+-    return false;
+-  }
+-
+-  //get inputs:
+-  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
+-  std::string filepath = pro.get_input<std::string>(1);
+-  unsigned resolution_level = pro.get_input<short>(2);
+-  bool enforce_level = pro.get_input<bool>(3);
+-
+-  static const unsigned int n_gaussian_modes_ = 3;
+-  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
+-  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
+-
+-  //check input's validity
+-  if (!scene_base.ptr())
+-  {
+-    std::cerr << pro.name() << ": -- Input scene is not valid!\n";
+-    return false;
+-  }
+-
+-  if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_base.as_pointer()))
+-  {
+-    bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level,enforce_level);
+-    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
+-    return true;
+-  }
+-  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_base.as_pointer()))
+-  {
+-    bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
+-    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
+-    return true;
+-  }
+-  else if ( auto *scene =
+-            dynamic_cast<boxm_scene< boct_tree<short, mix_gauss_sf1_type > > * >(scene_base.as_pointer()))
+-  {
+-    bvxm_voxel_grid<mix_gauss_sf1_type > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
+-    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
+-    return true;
+-  }
+-  else
+-  {
+-    std::cerr << "It's not possible to convert input scene to a bvxm grid\n";
+-    return false;
+-  }
+-}
+-
+-#include <boxm/boxm_scene.hxx>
+-#include <boxm/boxm_block.hxx>
+-#include <boct/boct_tree.hxx>
+-#include <boct/boct_tree_cell.hxx>
+-#include <vbl/vbl_array_3d.hxx>
+-
+-typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
+-typedef bsta_num_obs<bsta_mixture_fixed<gauss_type,3> > mixture_type;
+-typedef boct_tree<short,mixture_type> tree_type;
+-typedef boxm_block<tree_type> block_type;
+-
+-BOCT_TREE_INSTANTIATE(short,mixture_type);
+-BOCT_TREE_CELL_INSTANTIATE(short,mixture_type);
+-BOXM_SCENE_INSTANTIATE(tree_type);
+-BOXM_BLOCK_INSTANTIATE(tree_type);
+-VBL_ARRAY_3D_INSTANTIATE(block_type);
+-
+-void vsl_b_write(vsl_b_ostream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
+-void vsl_b_read(vsl_b_istream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
+-void vsl_b_read(vsl_b_istream&, bsta_gaussian_sphere<float,1>&) {}
+-//bool operator==(block_type const&, block_type const&) { return false; }
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
+index 1110054d05..d9d1c54305 100644
+--- a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
+@@ -2,15 +2,12 @@ add_executable( bvxm_algo_test_all
+   test_driver.cxx
+   test_merge_mog.cxx
+   test_mog_norm.cxx
+-# causes memory allocation errors (FIX_ME)
+-#  test_boxm_scene_to_bvxm_grid.cxx
+ )
+ 
+ target_link_libraries( bvxm_algo_test_all bvxm_algo bvxm_grid ${VXL_LIB_PREFIX}testlib bsta)
+ 
+ add_test( NAME bvxm_algo_test_merge_mog COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_merge_mog )
+ add_test( NAME bvxm_algo_test_mog_norm COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_mog_norm )
+-#add_test( NAME bvxm_algo_test_boxm_scene_to_bvxm_grid COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_boxm_scene_to_bvxm_grid)
+ 
+ add_executable( bvxm_algo_test_include test_include.cxx )
+ target_link_libraries( bvxm_algo_test_include bvxm_algo)
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
+deleted file mode 100644
+index cf5dfe2b40..0000000000
+--- a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
++++ /dev/null
+@@ -1,111 +0,0 @@
+-//:
+-// \file
+-// \author Isabel Restrepo
+-// \date Jan 19, 2010.
+-
+-#include <testlib/testlib_test.h>
+-#include <bvxm/algo/bvxm_boxm_convert.h>
+-#include <boxm/boxm_apm_traits.h>
+-
+-const bool debug = true;
+-
+-void fill_octree(boct_tree<short,float>* tree)
+-{
+-  std::cout << "Creating Octree" << std::endl;
+-
+-  //Create tree
+-  tree->init_cells(0.1f);
+-  tree->split();
+-  std::cout << "Level 1" << std::endl;
+-
+-  {
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
+-    tree->init_cells(0.1f);
+-    leaves[1]->set_data(0.5f);
+-    if (debug)
+-      for (unsigned i=0; i<leaves.size(); i++) {
+-        std::cout << leaves[i]->get_code().x_loc_ << ','
+-                 << leaves[i]->get_code().y_loc_ << ','
+-                 << leaves[i]->get_code().z_loc_ << ','
+-                 << leaves[i]->data() << std::endl;
+-      }
+-
+-    leaves[1]->split();
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "Level 0" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      leaves[i]->set_data(0.9f);
+-      std::cout << leaves[i]->get_code().x_loc_ << ','
+-               << leaves[i]->get_code().y_loc_ << ','
+-               << leaves[i]->get_code().z_loc_ << ','
+-               << leaves[i]->get_code().level << ','
+-               << leaves[i]->data() << std::endl;
+-    }
+-  }
+-
+-  if (debug)
+-  {
+-    std::cout << "All Levels" << std::endl;
+-    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
+-    for (unsigned i=0; i<leaves.size(); i++) {
+-      std::cout << leaves[i]->get_code().x_loc_ << ','
+-               << leaves[i]->get_code().y_loc_ << ','
+-               << leaves[i]->get_code().z_loc_ << ','
+-               << leaves[i]->get_code().level << ','
+-               << leaves[i]->data() << std::endl;
+-    }
+-  }
+-}
+-
+-static void test_boxm_scene_to_bvxm_grid()
+-{
+-  //Create a dummy scene
+-  typedef boct_tree<short,float > tree_type;
+-  boct_tree<short,float> *tree = new boct_tree<short,float>(3);
+-  fill_octree(tree);
+-
+-  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
+-  vgl_point_3d<double> origin(0.0,0.0,0.0);
+-
+-  //world coordinate dimensions of a block
+-  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
+-
+-  //number of blocks in a scene
+-  vgl_vector_3d<unsigned> world_dim(1,1,1);
+-
+-  boxm_scene<tree_type> *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
+-  std::string scene_path=".";
+-  scene->set_paths(scene_path, "in_block");
+-  scene->set_appearance_model(BOXM_FLOAT);
+-  scene->clean_scene();
+-
+-  boxm_block_iterator<tree_type >  iter =scene->iterator();
+-  iter.begin();
+-  scene->load_block(iter.index());
+-  boxm_block<tree_type> *block = scene->get_active_block();
+-  block->init_tree(tree);
+-  scene->write_active_block();
+-  std::string input_path("scene_to_grid.vox");
+-
+-  bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene,input_path, 0);
+-
+-  //Check the grid
+-  bvxm_voxel_grid<float>::iterator grid_it = grid->slab_iterator(0, grid->grid_size().z());
+-
+-  for (unsigned z = 0; z<grid->grid_size().z(); ++z)
+-    for (unsigned y = 0; y<grid->grid_size().y(); ++y)
+-      for (unsigned x= 0; x<grid->grid_size().x(); ++x)
+-      {
+-        std::cout << "Value at " << '(' << x << ',' << y <<',' <<z << ")= " << (*grid_it)(x,y,z) << std::endl;
+-      }
+-
+-  // TEST("Valid cropped tree", result, true);
+-
+-  scene->clean_scene();
+-}
+-
+-TESTMAIN(test_boxm_scene_to_bvxm_grid);
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
+index 73e5836b26..cdb72c7ec2 100644
+--- a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
++++ b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
+@@ -2,15 +2,13 @@
+ 
+ DECLARE( test_merge_mog );
+ DECLARE( test_mog_norm );
+-//DECLARE( test_boxm_scene_to_bvxm_grid);
++
+ 
+ 
+ void register_tests()
+ {
+   REGISTER( test_merge_mog );
+   REGISTER( test_mog_norm );
+-  // test causing memory allocation errors on dashboard build
+-  //REGISTER( test_boxm_scene_to_bvxm_grid );
+ 
+ }
+ 
+diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
+index b109456239..2c0b205311 100644
+--- a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
++++ b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
+@@ -1,4 +1,3 @@
+-#include <bvxm/algo/bvxm_boxm_convert.h>
+ #include <bvxm/algo/bvxm_merge_mog.h>
+ #include <bvxm/algo/bvxm_mog_norm.h>
+ 
+-- 
+2.21.0
+
diff --git a/vxl.spec b/vxl.spec
index 7c03fc0..fc0ce70 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    2.0.2
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -12,7 +12,7 @@ URL:        https://vxl.github.io/
 Source0:    %{name}-%{version}-clean.tar.gz
 
 # Patches generated from tree here:
-# https://github.com/sanjayankur31/vxl/tree/fedora-v2.0.2
+# https://github.com/sanjayankur31/vxl/tree/fedora-v2.0.2-f32
 # use system rply and don't use mpeg2
 Patch1:     0001-v2.0.2-unbundle-rply.patch
 Patch2:     0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
@@ -30,7 +30,7 @@ Patch9:     0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
 
 # Remove obsolete boxm library that fails to build on ARM
 # https://github.com/vxl/vxl/commit/cdf414000606af4bad322f7ff4c1fcdeaaa286ad
-Patch10:    0001-removed-the-obsolete-octree-library-boxm.patch
+Patch10:    0009-removed-the-obsolete-octree-library-boxm.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -137,6 +137,9 @@ for f in config contrib core scripts v3p vcl; do
     find $f -name "*.txx" -execdir chmod -x '{}' \;
 done
 
+# Do not use bundled minizip
+sed -i '/add_subdirectory(minizip)/ d' contrib/brl/b3p/CMakeLists.txt
+
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
     -DBUILD_SHARED_LIBS:BOOL=ON \
@@ -825,6 +828,9 @@ ctest . || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Sun Sep 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-6
+- Fix failing build: update patch to fix minizip include
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 5ff5dec47b0a9586bcfb26083ab6eb174bef14e6 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 16 Sep 2019 21:29:48 +0100
Subject: [PATCH 37/74] Remove renamed patch

---
 ...ved-the-obsolete-octree-library-boxm.patch | 53224 ----------------
 1 file changed, 53224 deletions(-)
 delete mode 100644 0001-removed-the-obsolete-octree-library-boxm.patch

diff --git a/0001-removed-the-obsolete-octree-library-boxm.patch b/0001-removed-the-obsolete-octree-library-boxm.patch
deleted file mode 100644
index 381131f..0000000
--- a/0001-removed-the-obsolete-octree-library-boxm.patch
+++ /dev/null
@@ -1,53224 +0,0 @@
-From 7d506bfca1762c2bb055df3a82d7eab928d98263 Mon Sep 17 00:00:00 2001
-From: Joseph Mundy <jlm@visionsystemsinc.com>
-Date: Sat, 2 Feb 2019 10:43:26 -0500
-Subject: [PATCH] removed the obsolete octree library boxm
-
----
- contrib/brl/bseg/CMakeLists.txt               |   12 -
- contrib/brl/bseg/boxm/CMakeLists.txt          |   52 -
- ...ee+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
- ...ree+short.vnl_vector_fixed+double.10--.cxx |    9 -
- ...tree+short.vnl_vector_fixed+float.10--.cxx |    9 -
- ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
- ...ll+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
- .../boxm_block+boct_tree+short.bool--.cxx     |    5 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    9 -
- .../boxm_block+boct_tree+short.char--.cxx     |    5 -
- .../boxm_block+boct_tree+short.float--.cxx    |    5 -
- .../boxm_block+boct_tree+short.int--.cxx      |    8 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...ee+short.vnl_vector_fixed+double.10---.cxx |   17 -
- ...ree+short.vnl_vector_fixed+float.10---.cxx |   17 -
- ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
- ..._block_iterator+boct_tree+short.bool--.cxx |    5 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
- ..._block_iterator+boct_tree+short.char--.cxx |    5 -
- ...block_iterator+boct_tree+short.float--.cxx |    5 -
- ...m_block_iterator+boct_tree+short.int--.cxx |    8 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- .../boxm_scene+boct_tree+short.bool--.cxx     |    5 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
- .../boxm_scene+boct_tree+short.char--.cxx     |    5 -
- .../boxm_scene+boct_tree+short.float--.cxx    |    5 -
- .../boxm_scene+boct_tree+short.int--.cxx      |    8 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
- ...3d+boxm_block+boct_tree+short.bool--~-.cxx |   11 -
- ...short.bsta_num_obs+bsta_gauss_sf1---~-.cxx |   10 -
- ...3d+boxm_block+boct_tree+short.char--~-.cxx |   11 -
- ...d+boxm_block+boct_tree+short.float--~-.cxx |   11 -
- ..._3d+boxm_block+boct_tree+short.int--~-.cxx |   14 -
- ...ct_tree+short.vgl_point_3d+double---~-.cxx |   12 -
- .../vbl_array_3d+vsl_b_ifstream~-.cxx         |    9 -
- .../vbl_io_smart_ptr+boxm_scene_base-.cxx     |    5 -
- .../vbl_smart_ptr+boxm_scene_base-.cxx        |    4 -
- contrib/brl/bseg/boxm/algo/CMakeLists.txt     |   38 -
- .../boxm/algo/boxm_compute_scene_difference.h |   98 -
- .../boxm/algo/boxm_compute_scene_statistics.h |  100 -
- contrib/brl/bseg/boxm/algo/boxm_crop_scene.h  |   95 -
- .../brl/bseg/boxm/algo/boxm_fill_in_mesh.h    |  316 ---
- .../bseg/boxm/algo/boxm_fill_internal_cells.h |   80 -
- contrib/brl/bseg/boxm/algo/boxm_init_scene.h  |   60 -
- .../bseg/boxm/algo/boxm_linear_operations.h   |   60 -
- contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx |  239 ---
- contrib/brl/bseg/boxm/algo/boxm_merge_mog.h   |   65 -
- contrib/brl/bseg/boxm/algo/boxm_refine.h      |  100 -
- .../brl/bseg/boxm/algo/boxm_save_block_raw.h  |  155 --
- .../brl/bseg/boxm/algo/boxm_save_scene_raw.h  |  277 ---
- .../boxm/algo/boxm_save_scene_raw_general.h   |  824 --------
- .../bseg/boxm/algo/boxm_scene_levels_utils.h  |   97 -
- .../brl/bseg/boxm/algo/boxm_split_sample.h    |  105 -
- contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h |  156 --
- contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |   40 -
- .../bseg/boxm/algo/pro/boxm_algo_processes.h  |   28 -
- .../bseg/boxm/algo/pro/boxm_algo_register.cxx |   35 -
- .../bseg/boxm/algo/pro/boxm_algo_register.h   |   11 -
- .../boxm_compute_entropy_process.cxx          |   83 -
- ...m_compute_expected_color_scene_process.cxx |   83 -
- .../boxm_compute_scene_difference_process.cxx |   91 -
- .../boxm_create_scene_from_ply_process.cxx    |  257 ---
- .../processes/boxm_describe_scene_process.cxx |  106 -
- .../boxm_explore_cells_at_level_process.cxx   |   61 -
- .../boxm_fill_internal_cells_process.cxx      |   72 -
- .../pro/processes/boxm_init_scene_process.cxx |  111 --
- .../boxm_line_backproject_process.cxx         |  259 ---
- .../boxm_linear_combination_process.cxx       |  102 -
- .../processes/boxm_merge_mixtures_process.cxx |   90 -
- .../processes/boxm_refine_scene_process.cxx   |  119 --
- .../processes/boxm_remove_level0_process.cxx  |   87 -
- ...boxm_render_expected_edge_vrml_process.cxx |  149 --
- .../boxm_replace_const_app_process.cxx        |   95 -
- .../pro/processes/boxm_roi_init_process.cxx   |  195 --
- .../boxm_roi_init_rational_camera_process.cxx |  310 ---
- .../boxm_save_occupancy_raw_process.cxx       |  229 ---
- .../processes/boxm_save_scene_raw_process.cxx |  140 --
- .../processes/boxm_split_scene_process.cxx    |   97 -
- .../bseg/boxm/algo/pro/tests/CMakeLists.txt   |    2 -
- .../bseg/boxm/algo/pro/tests/test_include.cxx |    4 -
- contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt  |   46 -
- ...dge_tangent_updater+short.float.float-.cxx |    4 -
- .../boxm_edge_updater+short.float.float-.cxx  |    3 -
- ....BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
- ...XM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
- ...t.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
- ...OXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
- ...OXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
- ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
- ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
- ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
- ...or+short.boxm_inf_line_sample+float---.cxx |    7 -
- .../boxm/algo/rt/boxm_change_3d_functor.h     |  100 -
- .../algo/rt/boxm_change_probability_functor.h |   83 -
- .../rt/boxm_compute_num_rays_statistics.h     |   65 -
- .../boxm/algo/rt/boxm_edge_tangent_updater.h  |   76 -
- .../algo/rt/boxm_edge_tangent_updater.hxx     |  291 ---
- .../brl/bseg/boxm/algo/rt/boxm_edge_updater.h |   34 -
- .../bseg/boxm/algo/rt/boxm_edge_updater.hxx   |  110 -
- .../boxm/algo/rt/boxm_expected_edge_functor.h |   53 -
- .../rt/boxm_generate_edge_sample_functor.h    |   65 -
- ...oxm_generate_edge_tangent_sample_functor.h |   78 -
- .../rt/boxm_generate_opt2_sample_functor.h    |  197 --
- .../rt/boxm_generate_opt3_sample_functor.h    |  219 --
- .../rt/boxm_generate_opt_sample_functor.h     |  164 --
- .../rt/boxm_generate_shadow_sample_functor.h  |  212 --
- .../bseg/boxm/algo/rt/boxm_opt2_optimizer.h   |   37 -
- .../bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx |  152 --
- .../bseg/boxm/algo/rt/boxm_opt3_optimizer.h   |   37 -
- .../bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx |  172 --
- .../algo/rt/boxm_opt_appearance_estimator.h   |   85 -
- .../algo/rt/boxm_opt_rt_bayesian_optimizer.h  |   36 -
- .../rt/boxm_opt_rt_bayesian_optimizer.hxx     |  151 --
- .../boxm/algo/rt/boxm_pre_infinity_functor.h  |   67 -
- .../rt/boxm_render_expected_depth_functor.h   |  109 -
- .../boxm_render_expected_edge_image_functor.h |  109 -
- ...nder_expected_edge_tangent_image_functor.h |  126 --
- .../rt/boxm_render_expected_image_functor.h   |  103 -
- ...oxm_render_expected_shadow_image_functor.h |  120 --
- .../bseg/boxm/algo/rt/boxm_rpc_registration.h |  447 -----
- .../algo/rt/boxm_shadow_app_initializer.h     |   45 -
- .../algo/rt/boxm_shadow_app_initializer.hxx   |  122 --
- .../rt/boxm_shadow_appearance_estimator.h     |  114 --
- .../algo/rt/boxm_shadow_bayes_optimizer.h     |   51 -
- .../algo/rt/boxm_shadow_bayes_optimizer.hxx   |  195 --
- .../boxm/algo/rt/boxm_sun_vis_prob_functor.h  |  103 -
- .../boxm/algo/rt/boxm_update_image_functor.h  |  172 --
- contrib/brl/bseg/boxm/algo/rt/dummy.cxx       |    0
- .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |   29 -
- .../boxm/algo/rt/pro/boxm_algo_rt_processes.h |   29 -
- .../algo/rt/pro/boxm_algo_rt_register.cxx     |   33 -
- .../boxm/algo/rt/pro/boxm_algo_rt_register.h  |   11 -
- .../boxm_change_probabilty_process.cxx        |  120 --
- .../processes/boxm_edge_update_process.cxx    |  280 ---
- .../boxm_estimate_camera_process.cxx          |  199 --
- .../boxm_generate_edge_samples_process.cxx    |  139 --
- .../boxm_generate_opt2_samples_process.cxx    |  142 --
- .../boxm_generate_opt3_samples_process.cxx    |  114 --
- .../boxm_generate_opt_samples_process.cxx     |  102 -
- .../processes/boxm_opt2_update_process.cxx    |  153 --
- .../processes/boxm_opt3_update_process.cxx    |  153 --
- .../boxm_opt_bayesian_update_process.cxx      |  145 --
- .../processes/boxm_ray_statistics_process.cxx |  107 -
- .../boxm_render_expected_depth_rt_process.cxx |  114 --
- .../boxm_render_expected_edge_process.cxx     |  162 --
- .../boxm_render_expected_rt_process.cxx       |  143 --
- .../boxm_rpc_registration_process.cxx         |  119 --
- .../pro/processes/boxm_update_rt_process.cxx  |  136 --
- .../boxm/algo/rt/pro/tests/CMakeLists.txt     |    2 -
- .../boxm/algo/rt/pro/tests/test_include.cxx   |    4 -
- .../bseg/boxm/algo/rt/tests/CMakeLists.txt    |   16 -
- .../algo/rt/tests/test_bayesian_optimizer.cxx |  102 -
- .../bseg/boxm/algo/rt/tests/test_driver.cxx   |   15 -
- .../bseg/boxm/algo/rt/tests/test_edges.cxx    |   26 -
- .../bseg/boxm/algo/rt/tests/test_include.cxx  |   30 -
- .../algo/rt/tests/test_shadow_appearance.cxx  |   72 -
- .../algo/rt/tests/test_template_include.cxx   |    9 -
- contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt  |   22 -
- .../algo/sp/boxm_compute_volume_visibility.h  |  172 --
- .../boxm/algo/sp/boxm_depth_image_triangle.h  |  127 --
- .../brl/bseg/boxm/algo/sp/boxm_render_image.h |  166 --
- .../boxm/algo/sp/boxm_render_image_triangle.h |  167 --
- contrib/brl/bseg/boxm/algo/sp/boxm_update.h   |  374 ----
- .../bseg/boxm/algo/sp/boxm_update_triangle.h  |  356 ----
- contrib/brl/bseg/boxm/algo/sp/dummy.cxx       |    0
- .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |   27 -
- ...brdb_value_t+vil_image_view_base_sptr-.cxx |   10 -
- .../boxm/algo/sp/pro/boxm_algo_sp_processes.h |   14 -
- .../algo/sp/pro/boxm_algo_sp_register.cxx     |   18 -
- .../boxm/algo/sp/pro/boxm_algo_sp_register.h  |   11 -
- .../boxm_render_expected_process.cxx          |  117 --
- .../sp/pro/processes/boxm_update_process.cxx  |  107 -
- .../boxm_volume_visibility_process.cxx        |  129 --
- .../boxm/algo/sp/pro/tests/CMakeLists.txt     |    2 -
- .../boxm/algo/sp/pro/tests/test_include.cxx   |    4 -
- .../bseg/boxm/algo/sp/tests/CMakeLists.txt    |   19 -
- .../algo/sp/tests/test_compute_visibility.cxx |   90 -
- .../bseg/boxm/algo/sp/tests/test_driver.cxx   |   17 -
- .../bseg/boxm/algo/sp/tests/test_include.cxx  |    8 -
- .../boxm/algo/sp/tests/test_render_image.cxx  |  103 -
- .../bseg/boxm/algo/sp/tests/test_update.cxx   |  259 ---
- .../algo/sp/tests/test_update_multi_bin.cxx   |  262 ---
- .../brl/bseg/boxm/algo/tests/CMakeLists.txt   |   31 -
- .../tests/test_boxm_fill_internal_cells.cxx   |  112 --
- .../boxm/algo/tests/test_boxm_scene_crop.cxx  |  129 --
- .../brl/bseg/boxm/algo/tests/test_driver.cxx  |   23 -
- .../boxm/algo/tests/test_fill_in_mesh.cxx     |  121 --
- .../brl/bseg/boxm/algo/tests/test_include.cxx |   17 -
- .../algo/tests/test_linear_operations.cxx     |   82 -
- .../boxm/algo/tests/test_remove_level0.cxx    |   54 -
- .../boxm/algo/tests/test_save_scene_raw.cxx   |  122 --
- .../bseg/boxm/algo/tests/test_upload_mesh.cxx |  127 --
- .../brl/bseg/boxm/algo/tests/test_utils.cxx   |   71 -
- contrib/brl/bseg/boxm/algo/tests/test_utils.h |   18 -
- contrib/brl/bseg/boxm/basic/CMakeLists.txt    |   21 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
- ...block_iterator+boct_tree+short.float--.cxx |    5 -
- ...m_block_iterator+boct_tree+short.int--.cxx |    5 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |    6 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |   13 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |    7 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...terator+short.boxm_edge_sample+float--.cxx |    7 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
- ...tor+short.boxm_inf_line_sample+float--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    6 -
- ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...h_iterator+short.vgl_point_3d+double--.cxx |    5 -
- ...brdb_value_t+boxm_array_1d_float_sptr-.cxx |    4 -
- .../vbl_io_smart_ptr+boxm_array_1d_float-.cxx |    4 -
- .../vbl_smart_ptr+boxm_array_1d_float-.cxx    |    4 -
- .../basic/boxm_block_vis_graph_iterator.h     |   53 -
- .../basic/boxm_block_vis_graph_iterator.hxx   |  173 --
- .../boxm/basic/boxm_block_vis_graph_node.h    |   52 -
- .../boxm/basic/boxm_cell_vis_graph_iterator.h |   54 -
- .../basic/boxm_cell_vis_graph_iterator.hxx    |  131 --
- .../bseg/boxm/basic/boxm_num_rays_functor.h   |   44 -
- .../bseg/boxm/basic/boxm_raytrace_function.h  |  618 ------
- .../bseg/boxm/basic/boxm_seg_length_functor.h |   46 -
- .../bseg/boxm/basic/boxm_util_data_types.cxx  |   17 -
- .../bseg/boxm/basic/boxm_util_data_types.h    |   30 -
- .../brl/bseg/boxm/basic/tests/CMakeLists.txt  |   15 -
- .../boxm/basic/tests/test_block_vis_graph.cxx |   48 -
- .../boxm/basic/tests/test_cell_vis_graph.cxx  |   54 -
- .../brl/bseg/boxm/basic/tests/test_driver.cxx |   13 -
- .../bseg/boxm/basic/tests/test_include.cxx    |    9 -
- .../basic/tests/test_template_include.cxx     |    4 -
- contrib/brl/bseg/boxm/boxm_apm_traits.cxx     |   86 -
- contrib/brl/bseg/boxm/boxm_apm_traits.h       |  206 --
- contrib/brl/bseg/boxm/boxm_aux_scene.h        |   54 -
- contrib/brl/bseg/boxm/boxm_aux_scene.hxx      |  121 --
- contrib/brl/bseg/boxm/boxm_aux_traits.h       |   74 -
- contrib/brl/bseg/boxm/boxm_block.h            |   58 -
- contrib/brl/bseg/boxm/boxm_block.hxx          |   80 -
- contrib/brl/bseg/boxm/boxm_export.h           |   23 -
- contrib/brl/bseg/boxm/boxm_io_scene_base.cxx  |   25 -
- contrib/brl/bseg/boxm/boxm_io_scene_base.h    |   21 -
- contrib/brl/bseg/boxm/boxm_scene.h            |  559 ------
- contrib/brl/bseg/boxm/boxm_scene.hxx          | 1764 -----------------
- contrib/brl/bseg/boxm/boxm_scene_base.cxx     |   35 -
- contrib/brl/bseg/boxm/boxm_scene_base.h       |   85 -
- contrib/brl/bseg/boxm/boxm_scene_parser.cxx   |  277 ---
- contrib/brl/bseg/boxm/boxm_scene_parser.h     |  108 -
- contrib/brl/bseg/boxm/pro/CMakeLists.txt      |   29 -
- ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
- ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
- ...tree+short.vnl_vector_fixed+float.3---.cxx |    6 -
- .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
- ...ee+short.vnl_vector_fixed+float.3---~-.cxx |   12 -
- contrib/brl/bseg/boxm/pro/boxm_processes.h    |   16 -
- contrib/brl/bseg/boxm/pro/boxm_register.cxx   |   27 -
- contrib/brl/bseg/boxm/pro/boxm_register.h     |   11 -
- .../boxm_camera_viewing_scene_process.cxx     |  131 --
- .../processes/boxm_clean_scene_process.cxx    |  102 -
- ...oxm_construct_scene_from_image_process.cxx |  219 --
- .../processes/boxm_create_scene_process.cxx   |  218 --
- .../boxm_force_write_blocks_process.cxx       |  102 -
- .../pro/processes/boxm_load_scene_process.cxx |   73 -
- .../processes/boxm_proj_local_cam_process.cxx |  103 -
- .../processes/boxm_upload_mesh_process.cxx    |  148 --
- .../brl/bseg/boxm/pro/tests/CMakeLists.txt    |    2 -
- .../brl/bseg/boxm/pro/tests/test_include.cxx  |    4 -
- contrib/brl/bseg/boxm/sample/CMakeLists.txt   |   29 -
- ...ct_tree+short.boxm_edge_sample+float--.cxx |    5 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
- ...ct_tree+short.boxm_opt2_sample+float--.cxx |    4 -
- ...boct_tree+short.boxm_rt_sample+float--.cxx |    4 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    5 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   12 -
- ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    9 -
- ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    5 -
- ..._tree+short.boxm_scalar_sample+float--.cxx |    4 -
- ...ee_cell+short.boxm_edge_sample+float--.cxx |    5 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
- ...ee_cell+short.boxm_opt2_sample+float--.cxx |    4 -
- ...tree_cell+short.boxm_rt_sample+float--.cxx |    4 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   11 -
- ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |   10 -
- ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
- ..._cell+short.boxm_scalar_sample+float--.cxx |    4 -
- ..._reader+short.boxm_edge_sample+float--.cxx |    8 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    5 -
- ...der+short.boxm_inf_line_sample+float--.cxx |    5 -
- ..._reader+short.boxm_opt2_sample+float--.cxx |    5 -
- ...ll_reader+short.boxm_rt_sample+float--.cxx |    5 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...eader+short.boxm_scalar_sample+float--.cxx |    5 -
- ...le+float-.boxm_aux_edge_sample+float--.cxx |    5 -
- ...loat-.boxm_edge_tangent_sample+float--.cxx |    7 -
- ...M_APM_MOB_GREY-.boxm_rt_sample+float--.cxx |    7 -
- ...APM_MOG_GREY-.boxm_opt2_sample+float--.cxx |    7 -
- ...M_APM_MOG_GREY-.boxm_rt_sample+float--.cxx |    7 -
- ....boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx |    7 -
- ..._SIMPLE_GREY-.boxm_opt2_sample+float--.cxx |    7 -
- ...PM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx |    7 -
- ...IMPLE_GREY-.boxm_scalar_sample+float--.cxx |    8 -
- ...xm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx |    7 -
- ...float.boxm_edge_tangent_sample+float--.cxx |    7 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |   13 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |    6 -
- ...ee+short.boxm_inf_line_sample+float---.cxx |    6 -
- ...t_tree+short.boxm_opt2_sample+float---.cxx |    9 -
- ...oct_tree+short.boxm_rt_sample+float---.cxx |    9 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   12 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...tree+short.boxm_scalar_sample+float---.cxx |    9 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   11 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
- .../Templates/boxm_edge_sample+float-.cxx     |    4 -
- .../boxm_edge_tangent_sample+float-.cxx       |    3 -
- .../Templates/boxm_inf_line_sample+float-.cxx |    3 -
- .../Templates/boxm_opt2_sample+float-.cxx     |    4 -
- .../Templates/boxm_plane_obs+float-.cxx       |    3 -
- .../Templates/boxm_rt_sample+float-.cxx       |    3 -
- .../boxm_sample+BOXM_APM_MOB_GREY-.cxx        |    7 -
- .../boxm_sample+BOXM_APM_MOG_GREY-.cxx        |    9 -
- .../boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx     |    4 -
- ...xm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx |    4 -
- .../Templates/boxm_scalar_sample+float-.cxx   |    4 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
- ...t_tree+short.boxm_opt2_sample+float---.cxx |    6 -
- ...oct_tree+short.boxm_rt_sample+float---.cxx |    6 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    6 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   11 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    6 -
- ...tree+short.boxm_scalar_sample+float---.cxx |    6 -
- .../boxm_scene+boct_tree+short.int--.cxx      |    5 -
- ...tree+short.boxm_edge_sample+float---~-.cxx |   16 -
- ...rt.boxm_edge_tangent_sample+float---~-.cxx |   17 -
- ...tree+short.boxm_opt2_sample+float---~-.cxx |   13 -
- ...t_tree+short.boxm_rt_sample+float---~-.cxx |   13 -
- ...ort.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx |   13 -
- ...ort.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx |   17 -
- ....boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx |   18 -
- ...ample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx |   13 -
- ...ee+short.boxm_scalar_sample+float---~-.cxx |   13 -
- ...mage_view+boxm_inf_line_sample+float--.cxx |    5 -
- .../brl/bseg/boxm/sample/algo/CMakeLists.txt  |   18 -
- ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
- ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
- ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
- ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
- ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
- .../boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx   |    3 -
- ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...oxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx |   14 -
- .../sample/algo/boxm_mob_grey_processor.cxx   |   83 -
- .../sample/algo/boxm_mob_grey_processor.h     |   35 -
- .../sample/algo/boxm_mog_grey_processor.cxx   |  286 ---
- .../sample/algo/boxm_mog_grey_processor.h     |   50 -
- .../sample/algo/boxm_sigma_normalizer.cxx     |  104 -
- .../boxm/sample/algo/boxm_sigma_normalizer.h  |   43 -
- .../algo/boxm_simple_grey_processor.cxx       |  437 ----
- .../sample/algo/boxm_simple_grey_processor.h  |   86 -
- .../boxm/sample/algo/tests/CMakeLists.txt     |   11 -
- .../boxm/sample/algo/tests/test_driver.cxx    |   11 -
- .../boxm/sample/algo/tests/test_include.cxx   |    6 -
- .../algo/tests/test_sigma_normalizer.cxx      |   59 -
- .../brl/bseg/boxm/sample/boxm_edge_sample.h   |   97 -
- .../brl/bseg/boxm/sample/boxm_edge_sample.hxx |  137 --
- .../boxm/sample/boxm_edge_tangent_sample.h    |   69 -
- .../boxm/sample/boxm_edge_tangent_sample.hxx  |   79 -
- .../bseg/boxm/sample/boxm_inf_line_sample.h   |   55 -
- .../bseg/boxm/sample/boxm_inf_line_sample.hxx |   79 -
- .../brl/bseg/boxm/sample/boxm_opt2_sample.h   |   72 -
- .../brl/bseg/boxm/sample/boxm_opt2_sample.hxx |   83 -
- .../brl/bseg/boxm/sample/boxm_opt3_sample.h   |   76 -
- .../brl/bseg/boxm/sample/boxm_opt3_sample.hxx |   92 -
- contrib/brl/bseg/boxm/sample/boxm_plane_obs.h |   45 -
- .../brl/bseg/boxm/sample/boxm_plane_obs.hxx   |   69 -
- contrib/brl/bseg/boxm/sample/boxm_rt_sample.h |   70 -
- .../brl/bseg/boxm/sample/boxm_rt_sample.hxx   |   81 -
- contrib/brl/bseg/boxm/sample/boxm_sample.h    |   68 -
- contrib/brl/bseg/boxm/sample/boxm_sample.hxx  |   71 -
- .../bseg/boxm/sample/boxm_sample_multi_bin.h  |   63 -
- .../boxm/sample/boxm_sample_multi_bin.hxx     |   98 -
- .../brl/bseg/boxm/sample/boxm_scalar_sample.h |   55 -
- .../bseg/boxm/sample/boxm_scalar_sample.hxx   |   70 -
- .../brl/bseg/boxm/sample/boxm_update_sample.h |   17 -
- .../boxm/sample/boxm_vis_implicit_sample.h    |   16 -
- contrib/brl/bseg/boxm/sample/dummy.cxx        |    0
- .../brl/bseg/boxm/sample/tests/CMakeLists.txt |    4 -
- .../bseg/boxm/sample/tests/test_include.cxx   |   14 -
- .../sample/tests/test_template_include.cxx    |   12 -
- contrib/brl/bseg/boxm/tests/CMakeLists.txt    |   32 -
- contrib/brl/bseg/boxm/tests/camera0.txt       |  104 -
- contrib/brl/bseg/boxm/tests/frame_00000.txt   |    7 -
- .../brl/bseg/boxm/tests/test_binary_io.cxx    |   75 -
- .../brl/bseg/boxm/tests/test_block_iter.cxx   |   47 -
- .../bseg/boxm/tests/test_cell_iterator.cxx    |   51 -
- contrib/brl/bseg/boxm/tests/test_driver.cxx   |   21 -
- contrib/brl/bseg/boxm/tests/test_include.cxx  |   10 -
- .../tests/test_load_neighboring_blocks.cxx    |   89 -
- .../bseg/boxm/tests/test_region_finder.cxx    |   80 -
- .../bseg/boxm/tests/test_template_include.cxx |    5 -
- contrib/brl/bseg/boxm/tests/test_utils.cxx    |   72 -
- contrib/brl/bseg/boxm/tests/test_utils.h      |   17 -
- contrib/brl/bseg/boxm/util/CMakeLists.txt     |   23 -
- ...triangle_interpolation_iterator+float-.cxx |    3 -
- .../bseg/boxm/util/boxm_cell_data_traits.cxx  |   25 -
- .../bseg/boxm/util/boxm_cell_data_traits.h    |   89 -
- .../brl/bseg/boxm/util/boxm_plane_ransac.h    |  126 --
- .../boxm/util/boxm_quad_scan_iterator.cxx     |  188 --
- .../bseg/boxm/util/boxm_quad_scan_iterator.h  |   66 -
- .../boxm/util/boxm_rational_camera_utils.cxx  |   36 -
- .../boxm/util/boxm_rational_camera_utils.h    |   30 -
- .../boxm/util/boxm_raytrace_operations.cxx    |  232 ---
- .../bseg/boxm/util/boxm_raytrace_operations.h |  452 -----
- contrib/brl/bseg/boxm/util/boxm_test_util.cxx |  141 --
- contrib/brl/bseg/boxm/util/boxm_test_util.h   |   37 -
- .../boxm_triangle_interpolation_iterator.h    |   53 -
- .../boxm_triangle_interpolation_iterator.hxx  |  100 -
- .../boxm/util/boxm_triangle_scan_iterator.cxx |   59 -
- .../boxm/util/boxm_triangle_scan_iterator.h   |   46 -
- contrib/brl/bseg/boxm/util/boxm_utils.cxx     | 1469 --------------
- contrib/brl/bseg/boxm/util/boxm_utils.h       |  168 --
- contrib/brl/bseg/boxm/util/boxm_vrml_util.h   |  214 --
- .../brl/bseg/boxm/util/tests/CMakeLists.txt   |   18 -
- contrib/brl/bseg/boxm/util/tests/camera0.txt  |  104 -
- .../brl/bseg/boxm/util/tests/frame_00000.txt  |    7 -
- .../util/tests/test_boxm_plane_ransac.cxx     |   79 -
- .../tests/test_boxm_rational_camera_utils.cxx |   24 -
- .../brl/bseg/boxm/util/tests/test_driver.cxx  |   15 -
- .../brl/bseg/boxm/util/tests/test_include.cxx |   12 -
- .../boxm/util/tests/test_quad_interpolate.cxx |  117 --
- .../boxm/util/tests/test_template_include.cxx |    3 -
- contrib/brl/bseg/boxm_batch/CMakeLists.txt    |   59 -
- contrib/brl/bseg/boxm_batch/reg_boxm.cxx      |  135 --
- contrib/brl/bseg/boxm_batch/reg_boxm.h        |   12 -
- .../brl/bseg/boxm_batch/tests/CMakeLists.txt  |    2 -
- .../bseg/boxm_batch/tests/test_include.cxx    |    3 -
- contrib/brl/bseg/boxm_bridge/CMakeLists.txt   |   25 -
- .../boxm_bridge/boxm2_normails_to_boxm.cxx    |  233 ---
- .../brl/bseg/boxm_bridge/boxm2_to_boxm.cxx    |  292 ---
- contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h  |   24 -
- .../boxm_bridge/boxm_normals_to_boxm2.cxx     |  326 ---
- .../brl/bseg/boxm_bridge/boxm_to_boxm2.cxx    |  262 ---
- contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h  |   30 -
- .../brl/bseg/boxm_bridge/tests/CMakeLists.txt |    2 -
- .../bseg/boxm_bridge/tests/test_include.cxx   |    4 -
- contrib/brl/bseg/bvpl/CMakeLists.txt          |    1 -
- .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |   71 -
- ..._sample+bsta_num_obs+bsta_gauss_sf1---.cxx |   11 -
- ..._tree+short.bvpl_octree_sample+float--.cxx |    6 -
- ..._tree+short.bvpl_pca_basis_sample+10--.cxx |    6 -
- ..._tree+short.bvpl_taylor_basis2_sample-.cxx |    6 -
- ...sample+bsta_num_obs+bsta_gauss_sf1----.cxx |   20 -
- ...tree+short.bvpl_octree_sample+float---.cxx |   17 -
- ...tree+short.bvpl_pca_basis_sample+10---.cxx |   11 -
- ...tree+short.bvpl_taylor_basis2_sample--.cxx |   12 -
- .../Templates/bvpl_global_pca+125-.cxx        |    2 -
- .../bvpl_global_taylor+double.10-.cxx         |    3 -
- .../Templates/bvpl_global_taylor+float.3-.cxx |    3 -
- ...l_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
- .../vbl_smart_ptr+bvpl_global_corners-.cxx    |    4 -
- .../vbl_smart_ptr+bvpl_global_pca+125--.cxx   |    5 -
- ...art_ptr+bvpl_global_taylor+double.10--.cxx |    5 -
- .../vbl_smart_ptr+bvpl_pca_error_scenes-.cxx  |    4 -
- .../vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
- .../vnl_matrix_fixed+double.125.125-.cxx      |    2 -
- .../bvpl_octree/bvpl_block_kernel_operator.h  |  134 --
- .../bvpl_octree/bvpl_block_vector_operator.h  |  146 --
- .../bvpl/bvpl_octree/bvpl_cell_data_traits.h  |   34 -
- .../bvpl/bvpl_octree/bvpl_corner_detector.h   |  299 ---
- .../bvpl/bvpl_octree/bvpl_corner_functors.h   |   68 -
- .../bvpl_octree/bvpl_discover_pca_kernels.cxx | 1028 ----------
- .../bvpl_octree/bvpl_discover_pca_kernels.h   |  309 ---
- .../bvpl_gauss3D_steerable_filters.cxx        |  512 -----
- .../bvpl_gauss3D_steerable_filters.h          |   61 -
- .../bvpl/bvpl_octree/bvpl_global_corners.cxx  |  475 -----
- .../bvpl/bvpl_octree/bvpl_global_corners.h    |   71 -
- .../bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx |    5 -
- .../bseg/bvpl/bvpl_octree/bvpl_global_pca.h   |  153 --
- .../bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx | 1018 ----------
- .../bvpl/bvpl_octree/bvpl_global_taylor.cxx   |   12 -
- .../bvpl/bvpl_octree/bvpl_global_taylor.h     |  100 -
- .../bvpl/bvpl_octree/bvpl_global_taylor.hxx   |  645 ------
- .../bvpl_octree/bvpl_octree_kernel_operator.h |  142 --
- .../bvpl/bvpl_octree/bvpl_octree_neighbors.h  |   78 -
- .../bvpl_octree/bvpl_octree_vector_operator.h |   84 -
- .../bvpl_octree_vector_operator_impl.h        |   30 -
- .../bvpl/bvpl_octree/bvpl_octree_vrml_util.h  |   84 -
- .../bvpl_octree/bvpl_pca_error_scenes.cxx     |   50 -
- .../bvpl/bvpl_octree/bvpl_pca_error_scenes.h  |   39 -
- .../bvpl_octree/bvpl_scene_kernel_operator.h  |  213 --
- .../bvpl_scene_neighborhood_operator.cxx      |    6 -
- .../bvpl_scene_neighborhood_operator.h        |   97 -
- .../bvpl_octree/bvpl_scene_statistics.cxx     |   80 -
- .../bvpl/bvpl_octree/bvpl_scene_statistics.h  |  102 -
- .../bvpl_octree/bvpl_scene_vector_operator.h  |  178 --
- .../bvpl/bvpl_octree/bvpl_taylor_basis.cxx    |  258 ---
- .../bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h |   50 -
- .../bvpl_octree/bvpl_taylor_scenes_map.cxx    |   61 -
- .../bvpl/bvpl_octree/bvpl_taylor_scenes_map.h |   41 -
- .../bseg/bvpl/bvpl_octree/io/CMakeLists.txt   |   20 -
- ...o_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
- .../vbl_io_smart_ptr+bvpl_global_corners-.cxx |    4 -
- ...vbl_io_smart_ptr+bvpl_global_pca+125--.cxx |    6 -
- ...art_ptr+bvpl_global_taylor+double.10--.cxx |    6 -
- ...bl_io_smart_ptr+bvpl_pca_error_scenes-.cxx |    4 -
- ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
- .../io/bvpl_io_discover_pca_kernels.cxx       |   50 -
- .../io/bvpl_io_discover_pca_kernels.h         |   43 -
- .../bvpl_octree/io/bvpl_io_global_corners.cxx |   50 -
- .../bvpl_octree/io/bvpl_io_global_corners.h   |   44 -
- .../bvpl_octree/io/bvpl_io_global_pca.cxx     |   50 -
- .../bvpl/bvpl_octree/io/bvpl_io_global_pca.h  |   44 -
- .../bvpl_octree/io/bvpl_io_global_taylor.h    |   75 -
- .../io/bvpl_io_pca_error_scenes.cxx           |   50 -
- .../bvpl_octree/io/bvpl_io_pca_error_scenes.h |   43 -
- .../io/bvpl_io_taylor_scenes_map.cxx          |   50 -
- .../io/bvpl_io_taylor_scenes_map.h            |   38 -
- .../bvpl/bvpl_octree/io/tests/CMakeLists.txt  |    2 -
- .../bvpl_octree/io/tests/test_include.cxx     |    8 -
- .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |   31 -
- .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
- ...alue_t+bvpl_discover_pca_kernels_sptr-.cxx |    6 -
- ...brdb_value_t+bvpl_global_corners_sptr-.cxx |    6 -
- ...brdb_value_t+bvpl_global_pca_125_sptr-.cxx |    6 -
- ...db_value_t+bvpl_pca_error_scenes_sptr-.cxx |    6 -
- ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
- ...rt_ptr+bvpl_global_taylor+double.10---.cxx |    8 -
- .../bvpl_octree/pro/bvpl_octree_processes.h   |   61 -
- .../bvpl_octree/pro/bvpl_octree_register.cxx  |   81 -
- .../bvpl_octree/pro/bvpl_octree_register.h    |   11 -
- .../bvpl_block_avg_value_process.cxx          |   81 -
- .../bvpl_block_kernel_operator_process.cxx    |  208 --
- .../bvpl_compute_gauss_gradients.cxx          |   86 -
- .../processes/bvpl_create_scene_process.cxx   |   88 -
- .../bvpl_grad_scene_to_bin_process.cxx        |  136 --
- .../processes/bvpl_nonmax_supp_process.cxx    |  178 --
- .../bvpl_plane_propagate_process.cxx          |  209 --
- .../pro/processes/bvpl_save_vrml_process.cxx  |   89 -
- .../bvpl_scene_histogram_process.cxx          |   66 -
- .../bvpl_scene_kernel_operator_process.cxx    |  179 --
- .../bvpl_scene_vector_operator_process.cxx    |  151 --
- .../bvpl_compute_beaudet_measure_process.cxx  |   64 -
- .../bvpl_compute_harris_measure_process.cxx   |   65 -
- .../bvpl_corner_statistics_process.cxx        |   57 -
- .../bvpl_load_global_corners_process.cxx      |   50 -
- .../bvpl_threshold_corners_process.cxx        |   61 -
- .../pca/bvpl_add_pca_errors_process.cxx       |   94 -
- ...pl_combine_pairwise_statistics_process.cxx |   95 -
- .../bvpl_compute_pca_error_block_process.cxx  |   69 -
- .../bvpl_compute_pca_error_scene_process.cxx  |  132 --
- .../bvpl_compute_pca_test_error_process.cxx   |   59 -
- .../bvpl_discover_pca_features_process.cxx    |   98 -
- .../processes/pca/bvpl_global_pca_process.cxx |   64 -
- .../pca/bvpl_init_global_pca_process.cxx      |   50 -
- .../pca/bvpl_load_global_pca_process.cxx      |   50 -
- .../bvpl_load_pca_error_scenes_process.cxx    |   58 -
- .../pca/bvpl_load_pca_info_process.cxx        |   55 -
- ...l_normalize_pca_training_error_process.cxx |   61 -
- .../pca/bvpl_pca_global_add_error_process.cxx |   77 -
- .../bvpl_pca_global_proj_error_process.cxx    |   63 -
- .../bvpl_pca_global_statistics_process.cxx    |   75 -
- .../pca/bvpl_pca_project_process.cxx          |   63 -
- .../bvpl_compute_sf_raw_response_process.cxx  |   70 -
- .../bvpl_init_sf_response_scene_process.cxx   |   87 -
- .../taylor/bvpl_add_taylor_errors_process.cxx |   90 -
- ...pl_compute_taylor_coefficients_process.cxx |   80 -
- .../bvpl_compute_taylor_error_process.cxx     |   78 -
- ...bvpl_explore_coefficient_scene_process.cxx |   77 -
- .../bvpl_init_global_taylor_process.cxx       |   68 -
- .../bvpl_load_global_taylor_process.cxx       |   52 -
- .../bvpl_load_taylor_scenes_process.cxx       |   72 -
- .../bvpl_taylor_global_add_error_process.cxx  |   77 -
- .../bvpl_taylor_global_proj_error_process.cxx |   63 -
- .../bvpl/bvpl_octree/pro/tests/CMakeLists.txt |   16 -
- .../test_bvpl_plane_propagation_process.cxx   |  144 --
- .../bvpl_octree/pro/tests/test_driver.cxx     |   10 -
- .../bvpl_octree/pro/tests/test_include.cxx    |    4 -
- .../bvpl/bvpl_octree/python/pca/readme.txt    |    7 -
- .../pca/reconstruction_error/add_pca_error.py |  193 --
- .../compute_pca_error_scene.py                |  164 --
- .../extract_pca_kernels.py                    |   61 -
- .../python/pca/reconstruction_error/pca.sh    |   68 -
- .../pca/reconstruction_error/save_pca_raw.py  |  108 -
- .../pca/training_error/extract_pca_kernels.py |   66 -
- .../normalized_training_error.py              |   42 -
- .../python/pca/training_error/pca.sh          |   42 -
- .../bseg/bvpl/bvpl_octree/python/readme.txt   |    1 -
- .../reconstruction_error/add_taylor_error.py  |  183 --
- .../compute_taylor_error_scene.py             |  156 --
- .../reconstruction_error/explore_histogram.py |  113 --
- .../run_taylor_kernels.py                     |   98 -
- .../reconstruction_error/save_taylor_raw.py   |  146 --
- .../taylor/reconstruction_error/taylor.sh     |   67 -
- .../taylor_kernel_threads.py                  |   72 -
- .../bvpl/bvpl_octree/sample/CMakeLists.txt    |   16 -
- .../bsta_gaussian_sphere+float.1-.cxx         |    3 -
- ...e_sample+bsta_num_obs+bsta_gauss_sf1--.cxx |    7 -
- .../Templates/bvpl_octree_sample+float-.cxx   |    3 -
- .../Templates/bvpl_pca_basis_sample+10-.cxx   |    3 -
- .../bvpl_octree/sample/bvpl_octree_sample.h   |   57 -
- .../bvpl_octree/sample/bvpl_octree_sample.hxx |   70 -
- .../sample/bvpl_pca_basis_sample.h            |   57 -
- .../sample/bvpl_pca_basis_sample.hxx          |   72 -
- .../sample/bvpl_taylor_basis_sample.cxx       |   58 -
- .../sample/bvpl_taylor_basis_sample.h         |   59 -
- .../bvpl_octree/sample/tests/CMakeLists.txt   |    4 -
- .../bvpl_octree/sample/tests/test_include.cxx |    5 -
- .../sample/tests/test_template_include.cxx    |    4 -
- .../bvpl/bvpl_octree/tests/CMakeLists.txt     |   35 -
- .../bvpl/bvpl_octree/tests/test_driver.cxx    |   19 -
- .../tests/test_gauss3D_steerable_filters.cxx  |  127 --
- .../bvpl/bvpl_octree/tests/test_include.cxx   |   24 -
- .../tests/test_octree_kernel_operator.cxx     |  352 ----
- .../tests/test_octree_neighbors.cxx           |   92 -
- .../bvpl_octree/tests/test_pca_kernels.cxx    |  304 ---
- .../bvpl_octree/tests/test_taylor_basis.cxx   |  143 --
- .../tests/test_template_include.cxx           |    4 -
- .../bvpl/bvpl_octree/tests/test_utils.cxx     |   94 -
- .../bseg/bvpl/bvpl_octree/tests/test_utils.h  |   20 -
- .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |    2 +-
- ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
- ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
- .../kernels/pro/bvpl_kernels_register.cxx     |    1 -
- .../bvpl_load_taylor_responses_process.cxx    |   53 -
- .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |   44 -
- .../bvpl_octree_batch/reg_bvpl_octree.cxx     |   61 -
- .../bseg/bvpl_octree_batch/reg_bvpl_octree.h  |   10 -
- .../bvpl_octree_batch/tests/CMakeLists.txt    |    2 -
- .../bvpl_octree_batch/tests/test_include.cxx  |    3 -
- contrib/brl/bseg/bvxm/algo/CMakeLists.txt     |    3 +-
- .../brl/bseg/bvxm/algo/bvxm_boxm_convert.h    |  152 --
- contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |    3 +-
- .../bseg/bvxm/algo/pro/bvxm_algo_processes.h  |    2 +-
- .../bseg/bvxm/algo/pro/bvxm_algo_register.cxx |    2 +-
- .../boxm_scene_to_bvxm_grid_process.cxx       |  129 --
- .../brl/bseg/bvxm/algo/tests/CMakeLists.txt   |    3 -
- .../tests/test_boxm_scene_to_bvxm_grid.cxx    |  111 --
- .../brl/bseg/bvxm/algo/tests/test_driver.cxx  |    4 +-
- .../brl/bseg/bvxm/algo/tests/test_include.cxx |    1 -
- 653 files changed, 7 insertions(+), 47919 deletions(-)
- delete mode 100644 contrib/brl/bseg/boxm/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_init_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_refine.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_split_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/dummy.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/dummy.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.hxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_traits.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_block.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_block.hxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_export.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.hxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.h
- delete mode 100644 contrib/brl/bseg/boxm/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.h
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_update_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/dummy.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/tests/camera0.txt
- delete mode 100644 contrib/brl/bseg/boxm/tests/frame_00000.txt
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_binary_io.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_block_iter.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_region_finder.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/util/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_vrml_util.h
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/camera0.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/frame_00000.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm_batch/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.cxx
- delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.h
- delete mode 100644 contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_batch/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
- delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
- delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
- delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
- delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
- delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
- delete mode 100644 contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
- delete mode 100644 contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
-
-diff --git a/contrib/brl/bseg/CMakeLists.txt b/contrib/brl/bseg/CMakeLists.txt
-index f2b53d63ae..0d20b12438 100644
---- a/contrib/brl/bseg/CMakeLists.txt
-+++ b/contrib/brl/bseg/CMakeLists.txt
-@@ -41,18 +41,12 @@ add_subdirectory(brec_batch)
- # octree
- add_subdirectory(boct)
- 
--# octree based modeling
--add_subdirectory(boxm)
--
- # updated, gpu compatible octree based modeling
- add_subdirectory(boxm2)
- 
- # updated, gpu compatible octree based modeling
- add_subdirectory(boxm2_batch)
- 
--# octree based modeling python interface
--add_subdirectory(boxm_batch)
--
- # semi-global matching
- add_subdirectory(bsgm)
- 
-@@ -62,15 +56,9 @@ add_subdirectory(bvpl)
- # voxel processing library python interface
- add_subdirectory(bvpl_batch)
- 
--# voxel processing library python interface for octrees
--add_subdirectory(bvpl_octree_batch)
--
- # Brown affine patch library, SIFT keypoint & descriptor
- add_subdirectory(bapl)
- 
--#the bridge lib to convert between boxm and boxm2 scenes
--add_subdirectory(boxm_bridge)
--
- #multi gpu library
- add_subdirectory(boxm2_multi)
- 
-diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
-deleted file mode 100644
-index 6a0e5159f4..0000000000
---- a/contrib/brl/bseg/boxm/CMakeLists.txt
-+++ /dev/null
-@@ -1,52 +0,0 @@
--# contrib/brl/bseg/boxm/CMakeLists.txt
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--
--include_directories( ${EXPAT_INCLUDE_DIR} )
--include_directories( ${GEL_INCLUDE_DIR} )
--include_directories( ${GEL_INCLUDE_DIR}/mrc )
--include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
--
--set(boxm_sources
--    boxm_export.h
--    boxm_block.hxx                         boxm_block.h
--    boxm_scene_base.cxx                    boxm_scene_base.h
--    boxm_scene.hxx                         boxm_scene.h
--    boxm_aux_scene.hxx                     boxm_aux_scene.h
--    boxm_scene_parser.cxx                  boxm_scene_parser.h
--    boxm_apm_traits.cxx                    boxm_apm_traits.h
--    boxm_aux_traits.h
--    boxm_io_scene_base.h                   boxm_io_scene_base.cxx
--)
--
--aux_source_directory(Templates boxm_sources)
--
--vxl_add_library(LIBRARY_NAME boxm LIBRARY_SOURCES  ${boxm_sources})
--
--target_link_libraries(boxm boct bsta brdb ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl_algo vsol expatpp ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vcl)
--
--#processes
--add_subdirectory(pro)
--
--#util
--add_subdirectory(util)
--
--#samples
--add_subdirectory(sample)
--
--#basic algorithms involving scenes
--add_subdirectory(algo)
--
--#basic structures
--add_subdirectory(basic)
--
--
--#tests
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--endif()
--
--#install the .h .hxx and libs
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-deleted file mode 100644
-index 3c4f37b302..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boct/boct_tree.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--BOCT_TREE_INSTANTIATE(short, gauss_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
-deleted file mode 100644
-index 7612eb4071..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<double,10> vector;
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
-deleted file mode 100644
-index 63921f9183..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<float,10> vector;
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-deleted file mode 100644
-index fb055c2df5..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<float,3> vector;
--
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-deleted file mode 100644
-index 1a7c7d6247..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boct/boct_tree_cell.hxx>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--BOCT_TREE_CELL_INSTANTIATE(short, gauss_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
-deleted file mode 100644
-index c104d2eed5..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,bool>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index e629c522cb..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
-deleted file mode 100644
-index 562247092f..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,char>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
-deleted file mode 100644
-index 3c0bdbf155..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,float>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 247d59847c..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,int>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
--
--typedef boct_tree<short,short int>  short_tree_type;
--BOXM_BLOCK_INSTANTIATE(short_tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 5bee916221..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
-deleted file mode 100644
-index 177fcfeeee..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<double,10> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
-deleted file mode 100644
-index 5f31529e08..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<float,10> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-deleted file mode 100644
-index ac40b5ec2d..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
-deleted file mode 100644
-index 5834cafab6..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,bool >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index b4bce045ed..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_scene.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
-deleted file mode 100644
-index 09f831722a..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,char >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-deleted file mode 100644
-index 4129f1a830..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,float >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 50ef71285a..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,int >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boct_tree<short,short int >  short_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(short_tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 2cd39a3534..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <vgl/vgl_point_3d.h>
--
--typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
-deleted file mode 100644
-index 02bbdc01a7..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,bool > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index 88886e65c2..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_scene.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_SCENE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
-deleted file mode 100644
-index 273a95c2a6..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,char > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
-deleted file mode 100644
-index cf8ef6a19e..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,float > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 234256af7c..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,int > tree;
--BOXM_SCENE_INSTANTIATE(tree);
--
--typedef boct_tree<short, short int > short_tree;
--BOXM_SCENE_INSTANTIATE(short_tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 4f9dff9071..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short,vgl_point_3d<double> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-deleted file mode 100644
-index 5de38b0662..0000000000
---- a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/boxm_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.h>
--BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
-deleted file mode 100644
-index 08145d2ca1..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, bool > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
-deleted file mode 100644
-index a84c7ef3e4..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_block.hxx>
--#include <vbl/vbl_array_3d.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
-deleted file mode 100644
-index 0464e1208e..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, char > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
-deleted file mode 100644
-index f3ea04b9df..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,float> tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
-deleted file mode 100644
-index 01b86c0776..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, int > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--typedef boct_tree<short, short > short_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<short_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
-deleted file mode 100644
-index ff3080df2c..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
-deleted file mode 100644
-index 912522b858..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vsl/vsl_binary_io.h>
--
--VBL_ARRAY_3D_INSTANTIATE(vsl_b_ifstream*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
-deleted file mode 100644
-index 7158d38f30..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_io_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(boxm_scene_base);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
-deleted file mode 100644
-index f9544ebe70..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/boxm_scene_base.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(boxm_scene_base);
-diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-deleted file mode 100644
-index 16694fbbc4..0000000000
---- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-+++ /dev/null
-@@ -1,38 +0,0 @@
--# brl/bseg/boxm/algo/CMakeLists.txt
--FIND_PACKAGE(RPLY REQUIRED)
--include_directories( ${MUL_INCLUDE_DIR} )
--include_directories( ${RPLY_INCLUDE_DIR} )
--set(boxm_algo_sources
--    boxm_compute_scene_statistics.h
--    boxm_crop_scene.h
--    boxm_fill_in_mesh.h
--    boxm_fill_internal_cells.h
--    boxm_init_scene.h
--    boxm_refine.h
--    boxm_save_block_raw.h
--    boxm_save_scene_raw.h
--    boxm_save_scene_raw_general.h
--    boxm_upload_mesh.h
--    boxm_merge_mog.h                        boxm_merge_mog.cxx
--    boxm_split_sample.h
--    boxm_compute_scene_difference.h
--    boxm_linear_operations.h
--    boxm_scene_levels_utils.h
--   )
--
--vxl_add_library(LIBRARY_NAME boxm_algo LIBRARY_SOURCES ${boxm_algo_sources})
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_algo boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--#raytracing algorithms
--add_subdirectory(rt)
--
--#splatting algorithms
--add_subdirectory(sp)
--
--#processes
--add_subdirectory(pro)
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
-deleted file mode 100644
-index 5043e4a2a3..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
-+++ /dev/null
-@@ -1,98 +0,0 @@
--#ifndef boxm_compute_scene_difference_h_
--#define boxm_compute_scene_difference_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_operations.h>
--#include <vgl/vgl_point_3d.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--void boxm_compute_block_difference(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block1,
--                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block2,
--                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * blockout,
--                                   float threshold)
--{
--  typedef boxm_sample<BOXM_APM_MOG_GREY> data_type;
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  typedef boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> > cell_type;
--
--  tree_type* tree1 = block1->get_tree();
--  tree_type* tree2 = block2->get_tree();
--  tree_type* treeout = blockout->get_tree();
--
--  std::vector<cell_type*> leaves=tree1->leaf_cells();
--  std::vector<cell_type*> leavesout=treeout->leaf_cells();
--
--  for (unsigned i=0;i<leaves.size();i++)
--  {
--    cell_type *cell1=leaves[i];
--    cell_type *cellout=leavesout[i];
--    vgl_point_3d<double> p=cell1->local_bounding_box(tree1->root_level()).centroid();
--    cell_type *cell2=tree2->locate_point(p);
--    if (cell2)
--    {
--      data_type data1=cell1->data();
--      double len1=tree1->cell_bounding_box(cell1).width();
--
--      data_type data2=cell2->data();
--      double len2=tree2->cell_bounding_box(cell2).width();
--
--      data_type dataout=cellout->data();
--
--      double p1=1-std::exp(-data1.alpha*len1);
--      double p2=1-std::exp(-data2.alpha*len2);
--
--      double p=p1+p2-2*p1*p2;
--
--      double alphaout=-std::log(1-p)/len1;
--      if (p<threshold)
--          alphaout=0.0;
--      dataout.alpha=(float)alphaout;
--      if (p1>p2)
--        dataout.appearance_=data1.appearance_;
--      else
--        dataout.appearance_=data2.appearance_;
--
--      cellout->set_data(dataout);
--    }
--  }
--}
--
--
--void boxm_compute_scene_difference(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene1,
--                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene2,
--                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&sceneout,
--                                   float threshold)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >tree_type;
--  boxm_block_iterator<tree_type> iter1(&scene1);
--  boxm_block_iterator<tree_type> iter2(&scene2);
--
--  // scene out is cloned as scene1.
--  scene1.clone_blocks(sceneout);
--  boxm_block_iterator<tree_type> iterout(&sceneout);
--
--  for (; !iter1.end(); iter1++,iter2++,iterout++) {
--    std::cout<<'.';
--    scene1.load_block(iter1.index());
--    scene2.load_block(iter2.index());
--    sceneout.load_block(iterout.index());
--
--    //boxm_block<tree_type>* block1 = *iter1;
--    //boxm_block<tree_type>* block2 = *iter2;
--    //boxm_block<tree_type>* blockout = *iterout;
--
--    boxm_compute_block_difference((*iter1),(*iter2),(*iterout), threshold);
--    sceneout.write_active_block();
--  }
--}
--
--#endif // boxm_compute_scene_difference_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
-deleted file mode 100644
-index c697a4e6b4..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_compute_scene_statistics_h
--#define boxm_compute_scene_statistics_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_histogram.h>
--
--//: Compute histogram of a simple-type scenes. e.g. T_data = float, double
--template <class T_loc, class T_data>
--bool boxm_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist )//, bsta_histogram<float>& level_hist, unsigned& n_leaves)
--{
--  std::cout << " Using compute_scene_statistics\n";
--
--  typedef boct_tree<T_loc, T_data> tree_type;
--
--  //(1) Traverse the leaves of the scene
--  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
--
--  iterator.begin();
--  float cell_count = 0;
--  float max = (float)(*iterator)->data();
--  float min = max;
--  float this_val = max;
--  while (!iterator.end()) {
--    cell_count++;
--    this_val = (float)(*iterator)->data();
--    if ( this_val > max)  max = this_val;
--    if ( this_val < min)  min = this_val;
--    ++iterator;
--  }
--
--  unsigned int nbins = (unsigned int)std::abs(max-min);// std::floor(std::sqrt(cell_count));
--  response_hist = bsta_histogram<float>(min, max, nbins);
--  scene->unload_active_blocks();
--  iterator.begin();
--  while (!iterator.end()) {
--    response_hist.upcount((float)(*iterator)->data(), 1.0f);
--    ++iterator;
--  }
--
--  scene->unload_active_blocks();
--
--  return true;
--}
--
--//: Compute histogram for appearance model scene - where alpha, omega etc are relevant
--template <class T_loc, class T_data>
--bool compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene, bsta_histogram<float>& omega_hist, bsta_histogram<float>& sigma_hist, bsta_histogram<float>& level_hist, unsigned& n_leaves)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc,T_data> cell_type;
--
--  omega_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
--  sigma_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
--  level_hist = bsta_histogram<float>(0.0f, 10.0f, 10);
--  boxm_block_iterator<tree_type> bit = scene.iterator();
--  for (;!bit.end(); ++bit)
--  {
--    vgl_point_3d<int> block_index = bit.index();
--    scene.load_block(block_index);
--    boxm_block<tree_type> * block = scene.get_active_block();
--    tree_type* tree=block->get_tree();
--    if (!tree) return false;
--    int n_levels = tree->number_levels();
--    int fin_level = tree->finest_level();
--    for (int level = n_levels-1; level>=fin_level; --level)
--    {
--      std::vector<cell_type *> cells_at_level =
--        tree->leaf_cells_at_level(static_cast<unsigned>(level));
--      level_hist.upcount(static_cast<float>(level),
--                         static_cast<float>(cells_at_level.size()));
--    }
--    std::vector<cell_type *> leaves = tree->leaf_cells();
--    n_leaves = leaves.size();
--    for (typename std::vector<cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
--    {
--      T_data data = (*cit)->data();
--      vgl_box_3d<double> bb = tree->cell_bounding_box(*cit);
--      double dx = bb.width(), dy = bb.height(), dz = bb.depth();
--      double diag = std::sqrt(dx*dx + dy*dy + dz*dz);
--      double alpha = data.alpha;
--      double omega = 1.0 - std::exp(-alpha*diag);
--      omega_hist.upcount(static_cast<float>(omega), 1.0f);
--
--      if (scene.appearence_model() == BOXM_APM_SIMPLE_GREY)
--      {
--        float sigma = data.appearance_.sigma();
--        sigma_hist.upcount(sigma, 1.0f);
--      }
--    }
--  }
--  return true;
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h b/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
-deleted file mode 100644
-index 63aa888efa..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
-+++ /dev/null
-@@ -1,95 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_crop_scene.h
--#ifndef boxm_crop_scene_h
--#define boxm_crop_scene_h
--
--//:
--// \file
--// \brief  Template functions to create a new scene that is a cropped portion of another
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  January 11, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <class T_data>
--boxm_scene<boct_tree<short, T_data> > *  boxm_crop_scene(boxm_scene<boct_tree<short,T_data> > *scene_in,vgl_box_3d<double> bbox)
--{
--  //only one-block scenes are supported for now
--  if (!(scene_in->world_dim().x() == 1 && scene_in->world_dim().y()==1 && scene_in->world_dim().z()==1))
--  {
--    std::cerr << "In bvxm_crop_scene -- Input scene has more than one block, which is not supported\n";
--    return nullptr;
--  }
--
--  //get the tree inside the block and locate region
--  boxm_block_iterator<boct_tree<short, T_data> > iter_in = scene_in->iterator();
--  iter_in.begin();
--
--  //there is no need to increase iterator, since there should only be one block in the scene
--  scene_in->load_block(iter_in.index());
--  boct_tree<short, T_data>  *tree_in= (*iter_in)->get_tree();
--
--  boct_tree_cell<short,T_data>* root = tree_in->locate_region_global(bbox, true);
--
--  //most parameters of the output scene are the same as those of the input scene,
--  //except the ROI which is determined by the root node
--  double cell_length = 1.0/(double)(1<<(tree_in->root_level() - root->level()));
--  double cell_origin_x = (double)(root->get_code().x_loc_)/(double)(1<<(tree_in->root_level()));
--  double cell_origin_y = (double)(root->get_code().y_loc_)/(double)(1<<(tree_in->root_level()));
--  double cell_origin_z = (double)(root->get_code().z_loc_)/(double)(1<<(tree_in->root_level()));
--
--  vgl_box_3d<double> global_bbox = tree_in->bounding_box();
--
--  vgl_point_3d<double> origin(cell_origin_x, cell_origin_y, cell_origin_z);
--
--  vgl_point_3d<double> min_point((global_bbox.min_x() + global_bbox.width()*origin.x()),
--                                 (global_bbox.min_y() + global_bbox.height()*origin.y()),
--                                 (global_bbox.min_z() + global_bbox.depth()*origin.z()));
--
--  vgl_vector_3d<double> block_dim(cell_length*global_bbox.width(),
--                                  cell_length*global_bbox.height(),
--                                  cell_length*global_bbox.depth());
--
--  boxm_scene<boct_tree<short, T_data> > *scene_out =
--  new boxm_scene<boct_tree<short, T_data> >(scene_in->lvcs(),min_point,block_dim,scene_in->world_dim(), scene_in->save_internal_nodes());
--
--  scene_out->set_paths(scene_in->path(), "cropped");
--  scene_out->set_appearance_model(scene_in->appearence_model());
--  scene_out->clean_scene();
--  boxm_block_iterator<boct_tree<short, T_data> > iter_out = scene_out->iterator();
--  iter_out.begin();
--  scene_out->load_block(iter_out.index());
--
--
--  //Region of interest in [0,1)x[0,1)x[0,1) coordinates
--  vgl_point_3d<double> norm_bbox_min((bbox.min_x()-global_bbox.min_x())/global_bbox.width(),
--                                     (bbox.min_y()-global_bbox.min_y())/global_bbox.height(),
--                                     (bbox.min_z()-global_bbox.min_z())/global_bbox.depth());
--  vgl_point_3d<double> norm_bbox_max((bbox.max_x()-global_bbox.min_x())/global_bbox.width(),
--                                     (bbox.max_y()-global_bbox.min_y())/global_bbox.height(),
--                                     (bbox.max_z()-global_bbox.min_z())/global_bbox.depth());
--
--
--  //output tree
--  boct_tree<short, T_data >  *tree_out = tree_in->clone_and_intersect(root, tree_in->root_level(), vgl_box_3d<double>(norm_bbox_min,norm_bbox_max));
--
--  //write the output tree
--  (*iter_out)->init_tree(tree_out);
--  scene_out->write_active_block();
--  scene_out->write_scene("/cropped_scene.xml");
--
--  return scene_out;
--}
--
--
--#endif // boxm_crop_scene_h
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
-deleted file mode 100644
-index f41af5bca8..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
-+++ /dev/null
-@@ -1,316 +0,0 @@
--#ifndef boxm_fill_in_mesh_h_
--#define boxm_fill_in_mesh_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_operations.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bool is_mesh_in_block(imesh_mesh & mesh, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
--{
--  imesh_face_array_base& fs = mesh.faces();
--  std::list<vgl_point_3d<double> > v_list;
--  vgl_box_3d<double> bb_global;
--
--  for (unsigned i=0; i < fs.size(); ++i)
--  {
--    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
--    for (unsigned j=0; j<fs.num_verts(i); ++j) {
--      unsigned int v_id = fs(i,j);
--      vgl_point_3d<double> v;
--      if (use_lvcs) {
--        double lx, ly, lz;
--        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                             vpgl_lvcs::wgs84,lx,ly,lz);
--        v=vgl_point_3d<double>(lx,ly,lz);
--      }
--      else
--        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--      bb_global.add(v);
--      v_list.push_back(v);
--    }
--  }
--
--  vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
--  if (inters.is_empty())
--    return false;
--
--  return true;
--}
--
--template <class T_loc, class T_data>
--bool are_meshes_in_block(std::vector<imesh_mesh>  meshes, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
--{
--  bool flag=false;
--  for (auto & meshe : meshes)
--  {
--    meshe.compute_face_normals(true);
--    imesh_face_array_base& fs = meshe.faces();
--    std::list<vgl_point_3d<double> > v_list;
--    vgl_box_3d<double> bb_global;
--
--    for (unsigned i=0; i < fs.size(); ++i)
--    {
--      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--      for (unsigned j=0; j<fs.num_verts(i); ++j) {
--        unsigned int v_id = fs(i,j);
--        vgl_point_3d<double> v;
--        if (use_lvcs) {
--          double lx, ly, lz;
--          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                               vpgl_lvcs::wgs84,lx,ly,lz);
--          v=vgl_point_3d<double>(lx,ly,lz);
--        }
--        else
--          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--        bb_global.add(v);
--        v_list.push_back(v);
--      }
--    }
--
--    vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
--    if (!inters.is_empty())
--      flag=true;
--  }
--  return flag;
--}
--
--template <class T_loc, class T_data>
--void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
--                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  for (auto & meshe : meshes)
--  {
--    imesh_face_array_base& fs = meshe.faces();
--    std::list<vgl_point_3d<double> > v_list;
--    vgl_box_3d<double> bb_scale, bb_global;
--    for (unsigned i=0; i < fs.size(); ++i)
--    {
--      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--      for (unsigned j=0; j<fs.num_verts(i); ++j) {
--        unsigned int v_id = fs(i,j);
--        vgl_point_3d<double> v;
--        if (use_lvcs) {
--          double lx, ly, lz;
--          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                               vpgl_lvcs::wgs84,lx,ly,lz);
--          v=vgl_point_3d<double>(lx,ly,lz);
--        }
--        else
--          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--        bb_global.add(v);
--        vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--        v.set(diff.x(), diff.y(), diff.z());
--        // the local coordinates inside the box region
--        v_list.push_back(v);
--        //convert the values into [0,1] range
--        v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--        bb_scale.add(v);
--      }
--    }
--    // check if polygon's bounding box intersects with the block
--    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--    if (inters.is_empty())
--      continue;
--
--    // locate the polygon bounding box in tree
--    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
--    if (region) {
--      // test all the children for intersection
--      std::vector<boct_tree_cell<T_loc,T_data>*> children;
--      if (!region->is_leaf())
--        region->leaf_children(children);
--      else // insert the node itself, if no children
--        children.push_back(region);
--      for (unsigned i=0; i<children.size(); i++) {
--        boct_tree_cell<T_loc,T_data>* cell=children[i];
--        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
--        if (contains_point(meshe,cell_bb.centroid())) {
--          cell->set_data(val);
--        }
--      }
--    }
--  }
--}
--
--//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
--template <>
--void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
--                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
--                                  bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  for (auto & meshe : meshes)
--  {
--    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
--    {
--      imesh_face_array_base& fs = meshe.faces();
--      std::list<vgl_point_3d<double> > v_list;
--      vgl_box_3d<double> bb_scale, bb_global;
--
--      for (unsigned i=0; i < fs.size(); ++i)
--      {
--        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--        for (unsigned j=0; j<fs.num_verts(i); ++j) {
--          unsigned int v_id = fs(i,j);
--          vgl_point_3d<double> v;
--          if (use_lvcs) {
--            double lx, ly, lz;
--            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                                 vpgl_lvcs::wgs84,lx,ly,lz);
--            v=vgl_point_3d<double>(lx,ly,lz);
--          }
--          else
--            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--          bb_global.add(v);
--          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--          v.set(diff.x(), diff.y(), diff.z());
--          // the local coordinates inside the box region
--          v_list.push_back(v);
--          //convert the values into [0,1] range
--          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--          bb_scale.add(v);
--        }
--      }
--
--      // check if polygon's bounding box intersects with the block
--      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--      if (inters.is_empty())
--        continue;
--
--      meshe.compute_face_normals();
--
--      // locate the polygon bounding box in tree
--      boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
--      if (region)
--      {
--        // test all the children for intersection
--        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
--        if (!region->is_leaf())
--          region->leaf_children(children);
--        else // insert the node itself, if no children
--          children.push_back(region);
--        for (auto cell : children) {
--          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
--
--          if (contains_point(meshe,cell_bb.centroid())) {
--            boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
--            tempdata.set_appearance(val.appearance());
--            tempdata.alpha*=val.alpha;
--            cell->set_data(tempdata);
--          }
--        }
--      }
--    }
--  }
--}
--
--template <>
--void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > > *block,
--                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
--                                  bool use_lvcs, boxm_sample<BOXM_APM_SIMPLE_GREY> val)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  for (auto & meshe : meshes)
--  {
--    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
--    {
--      imesh_face_array_base& fs = meshe.faces();
--      std::list<vgl_point_3d<double> > v_list;
--      vgl_box_3d<double> bb_scale, bb_global;
--
--      for (unsigned i=0; i < fs.size(); ++i)
--      {
--        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--        for (unsigned j=0; j<fs.num_verts(i); ++j) {
--          unsigned int v_id = fs(i,j);
--          vgl_point_3d<double> v;
--          if (use_lvcs) {
--            double lx, ly, lz;
--            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                                 vpgl_lvcs::wgs84,lx,ly,lz);
--            v=vgl_point_3d<double>(lx,ly,lz);
--          }
--          else
--            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--          bb_global.add(v);
--          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--          v.set(diff.x(), diff.y(), diff.z());
--          // the local coordinates inside the box region
--          v_list.push_back(v);
--          //convert the values into [0,1] range
--          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--          bb_scale.add(v);
--        }
--      }
--
--      // check if polygon's bounding box intersects with the block
--      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--      if (inters.is_empty())
--        continue;
--
--      meshe.compute_face_normals();
--
--      // locate the polygon bounding box in tree
--      boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >* region=tree->locate_region(inters);
--      if (region)
--      {
--        // test all the children for intersection
--        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >*> children;
--        if (!region->is_leaf())
--          region->leaf_children(children);
--        else // insert the node itself, if no children
--          children.push_back(region);
--        for (auto cell : children) {
--          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
--
--          if (contains_point(meshe,cell_bb.centroid())) {
--            boxm_sample<BOXM_APM_SIMPLE_GREY> tempdata=cell->data();
--            tempdata.set_appearance(val.appearance());
--            tempdata.alpha*=val.alpha;
--            cell->set_data(tempdata);
--          }
--        }
--      }
--    }
--  }
--}
--
--template <class T_loc, class T_data>
--void boxm_fill_in_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                  std::vector<imesh_mesh> meshes, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--  vpgl_lvcs lvcs=scene.lvcs();
--  boxm_block_iterator<tree_type> iter(&scene);
--  for (; !iter.end(); iter++) {
--    vgl_box_3d<double> block_bb=scene.get_block_bbox(iter.index().x(),iter.index().y(),iter.index().z());
--    if (are_meshes_in_block<T_loc, T_data >(meshes,block_bb,lvcs,use_lvcs))
--    {
--      scene.load_block(iter.index());
--      boxm_block<tree_type>* block = *iter;
--      boxm_fill_in_mesh_into_block(block, meshes, lvcs, use_lvcs, val);
--      scene.write_active_block();
--    }
--  }
--}
--
--#endif // boxm_fill_in_mesh_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h b/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
-deleted file mode 100644
-index 6d81beef0f..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
-+++ /dev/null
-@@ -1,80 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_fill_internal_cells.h
--#ifndef boxm_fill_internal_cells_h
--#define boxm_fill_internal_cells_h
--//:
--// \file
--// \brief Class in charged of filling the intermediate nodes of a tree.
--// \author Maria Isabel Restrepo mir@lems.brown.edu
--// \date  Feb 3, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: A class to combine children cells and fill intermediate nodes
--template <class T_data>
--class boxm_fill_internal_cells
--{
-- public:
--  typedef boct_tree<short,T_data> tree_type;
--
--  boxm_scene<boct_tree<short,T_data> > * traverse_and_fill(boxm_scene<boct_tree<short,T_data> > *scene_in)
--  {
--    // Most parameters of the output scene are the same as those of the input scene
--    // but we need to change the mode of the scene to be saving internal nodes
--    bool save_internal_nodes = true;
--    boxm_scene<tree_type> *scene_out = new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
--                                                                 scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
--                                                                 false, save_internal_nodes);
--    std::string block_pref = scene_in->block_prefix() + "_all_nodes";
--    scene_out->set_paths(scene_in->path(), block_pref);
--    scene_out->set_appearance_model(scene_in->appearence_model());
--
--    scene_out->write_scene(block_pref + ".xml");
--
--    //Iterate through the blocks
--    boxm_block_iterator<tree_type> iter_in = scene_in->iterator();
--    boxm_block_iterator<tree_type> iter_out = scene_out->iterator();
--
--    iter_in.begin();
--    iter_out.begin();
--
--    while (!iter_in.end() && !iter_out.end())
--    {
--      scene_in->load_block(iter_in.index());
--      scene_out->load_block(iter_out.index());
--
--      tree_type *tree_in= (*iter_in)->get_tree();
--      // Copy input tree into output tree and fill
--      tree_type *tree_out = tree_in->clone();
--      this->traverse_and_fill(tree_out);
--      (*iter_out)->init_tree(tree_out);
--      std::cout << "writing block: " << iter_out.index() <<std::endl;
--      scene_out->write_active_block();
--
--      iter_in++; iter_out++;
--    }
--
--    return scene_out;
--  }
--
-- protected:
--
--  //: Traverses a tree and fills intermediate cells with the average of the 8 children.
--  // If there is need to fill cells with something different to the average, this function can be made abstract and
--  // write specializations. As in the template method design pattern
--  void traverse_and_fill(tree_type *tree_to_fill)
--  {
--    tree_to_fill->fill_with_average();
--  }
--};
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h b/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
-deleted file mode 100644
-index 9325f47c46..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
-+++ /dev/null
-@@ -1,60 +0,0 @@
--#ifndef boxm_init_scene_h_
--#define boxm_init_scene_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: This method inits the blocks (octrees) of the scene of type boxm_sample
--template <boxm_apm_type APM_TYPE>
--void boxm_init_scene(boxm_scene<boct_tree<short, boxm_sample<APM_TYPE> > > &scene)
--{
--  typedef boct_tree<short, boxm_sample<APM_TYPE> > tree_type;
--  boxm_block_iterator<tree_type> iter(&scene);
--  float pinit=scene.pinit();
--  float dimx=(float)scene.block_dim().x();
--  float numbercells=(float)(1<<(scene.init_level()-1));
--
--  float alpha_init=-std::log(1-pinit)*numbercells/dimx;
--  for (; !iter.end(); iter++) {
--       vgl_point_3d<int> index=iter.index();
--    if (!scene.discover_block(index.x(),index.y(),index.z()))
--    {
--      boxm_sample<APM_TYPE> initsample(alpha_init);
--      tree_type* tree= new tree_type(initsample,scene.max_level(),scene.init_level());
--      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
--      scene.set_block(index,block);
--      scene.write_active_block();
--    }
--  }
--}
--
--//: Initializes a general scene
--template <class T_data>
--void boxm_init_scene(boxm_scene<boct_tree<short, T_data> > &scene)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  boxm_block_iterator<tree_type> iter(&scene);
--  float dimx=(float)scene.block_dim().x();
--
--  for (; !iter.end(); iter++) {
--    vgl_point_3d<int> index=iter.index();
--    if (!scene.discover_block(index.x(),index.y(),index.z()))
--    {
--      T_data initdata;
--      tree_type* tree= new tree_type(initdata,scene.max_level(),scene.init_level());
--      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
--      scene.set_block(index,block);
--      scene.write_active_block();
--    }
--  }
--}
--
--#endif // boxm_init_scene_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h b/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
-deleted file mode 100644
-index 01726ab977..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
-+++ /dev/null
-@@ -1,60 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_linear_operations.h
--#ifndef boxm_linear_operations_h
--#define boxm_linear_operations_h
--//:
--// \file
--// \brief Functions to perfoms linear operations on boxm scenes and/or blocks
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  2-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_block.h>
--#include <boct/boct_tree.h>
--#include <cassert>
--#ifdef DEBUG
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--//: Computes the linear combination of two blocks in place. i.e block1 = s1*block1 +  s2*block2
--template<class T_data>
--bool boxm_linear_combination(boxm_block<boct_tree<short, T_data> > *block1, boxm_block<boct_tree<short, T_data> > *block2, float s1, float s2)
--{
--  boct_tree<short, T_data> *tree1 = block1->get_tree();
--  boct_tree<short, T_data> *tree2 = block2->get_tree();
--
--  std::vector<boct_tree_cell<short, T_data>* > cells1 = tree1->leaf_cells();
--  std::vector<boct_tree_cell<short, T_data>* > cells2 = tree2->leaf_cells();
--
--  //iterators
--  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it1 = cells1.begin();
--  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it2 = cells2.begin();
--
--  for (; (it1!=cells1.end())&&(it2!= cells2.end()); it1++, it2++)
--  {
--    boct_tree_cell<short,T_data> *cell1 = *it1;
--    boct_tree_cell<short,T_data> *cell2 = *it2;
--
--#ifdef DEBUG
--    //if level and location code of cells isn't the same quit
--    boct_loc_code<short> code1 = cell1->get_code();
--    boct_loc_code<short> code2 = cell2->get_code();
--    if (!(code1.isequal(code2)))
--    {
--      std::cerr << "In boxm_linear_combination: Blocks must have the same structure\n";
--      return false;
--    }
--#endif
--
--    cell1->set_data(s1*cell1->data() + s2*cell2->data());
--  }
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
-deleted file mode 100644
-index e7e2f6585c..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
-+++ /dev/null
-@@ -1,239 +0,0 @@
--#include <vector>
--#include <iostream>
--#include <limits>
--#include "boxm_merge_mog.h"
--//:
--// \file
--
--#include <boxm/boxm_scene.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vnl/vnl_math.h> // for vnl_math::sqr()
--
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--
--void boxm_merge_mog::kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian)
--{
--  //When merging components of gaussian mixtures, we need to perform the following calculations
--  //1. find the normalizing weight of the new component.
--  //   In this case this value is 1 because we are merging all the components
--  //2. find the mean
--  //3. find the variance
--
--  float mean = 0.0f;
--  float var = 0.0f;
--
--  //CAUTION: only mixtures of 3 modes are supported for now.
--  assert(mixture.num_components() == 3);
--  unsigned num_components = mixture.num_components();
--
--  for (unsigned i = 0; i<num_components; ++i)
--  {
--    // note: these equations omit the weight of the final distribution
--    // only because in this case it is 1
--    mean += mixture.weight(i) * mixture.distribution(i).mean();
--    var  += mixture.weight(i) *(mixture.distribution(i).var() +
--                                vnl_math::sqr(mixture.distribution(i).mean()));
--  }
--  if (var <  vnl_math::sqr(mean))
--    std::cout<< "This should not happen: " << mixture << std::endl;
--  var -= vnl_math::sqr(mean);
--  assert(var >= 0);
--
--  gaussian.set_mean(mean);
--  gaussian.set_var(var);
--  return;
--}
--
--//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
--//  Thus the resulting grid contains unimodal gaussians
--bool boxm_merge_mog::kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &mog_scene,
--                                    boxm_scene<boct_tree<short, gauss_type> > &gauss_scene)
--{
--    // iterate through the scene
--    boxm_block_iterator<mog_tree_type > mog_iter = mog_scene.iterator();
--    boxm_block_iterator<gauss_tree_type > gauss_iter = gauss_scene.iterator();
--
--    for (mog_iter.begin(), gauss_iter.begin(); !mog_iter.end(); ++mog_iter, ++gauss_iter) {
--      mog_scene.load_block(mog_iter.index());
--      gauss_scene.load_block(gauss_iter.index());
--      mog_tree_type  *mog_tree = (*mog_iter)->get_tree();
--      gauss_tree_type  *gauss_tree = mog_tree->clone_to_type<gauss_type>();
--#if 0
--      gauss_tree->init_cells(func_max.min_response());
--#endif
--      this->kl_merge_octree(mog_tree,gauss_tree);
--      (*gauss_iter)->init_tree(gauss_tree);
--      gauss_scene.write_active_block();
--    }
--
--    return true;
--}
--
--//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
--//  Thus the resulting grid contains unimodal gaussians
--bool boxm_merge_mog::kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree,
--                                     boct_tree<short, gauss_type> *gauss_tree)
--{
--  // iterate through the trees
--  std::vector<mog_cell_type*> mog_cells = mog_tree->all_cells();
--  std::vector<gauss_cell_type*> gauss_cells = gauss_tree->all_cells();
--
--  if (mog_cells.size()!=gauss_cells.size() ) {
--    std::cerr << "Different size vectors in boxm_merge_mog::kl_merge_octree\n";
--    return false;
--  }
--
--
--  for (unsigned i = 0; i < mog_cells.size(); ++i)
--  {
--    gauss_type result_gauss;
--    this->kl_merge(mog_cells[i]->data(), result_gauss);
--    gauss_cells[i]->set_data(result_gauss);
--  }
--  return true;
--}
--
--/********************** Non-class functions************************************/
--
--//: Computes the differential entropy of a gaussian scene- only for leave cells
--bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene_in,boxm_scene<boct_tree<short, float> >& scene_out)
--{
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
--
--  //iterate through the leaf cells computing entropy
--  boxm_cell_iterator<boct_tree<short, gauss_type > > it_in =
--  scene_in.cell_iterator(&boxm_scene<boct_tree<short, gauss_type> >::load_block);
--
--  boxm_cell_iterator<boct_tree<short, float > > it_out =
--  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
--
--  it_in.begin();
--  it_out.begin();
--
--  while ( !(it_in.end() || it_out.end()) ) {
--    boct_tree_cell<short,gauss_type> *cell_in = *it_in;
--    boct_tree_cell<short,float> *cell_out = *it_out;
--
--    boct_loc_code<short> out_code = cell_in->get_code();
--    boct_loc_code<short> in_code = cell_out->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++it_in;
--      ++it_out;
--      continue;
--    }
--
--    double h = 0.5*std::log(vnl_math::pi*vnl_math::e*2*cell_in->data().var());
--    cell_out->set_data(float(h));
--    ++it_in;
--    ++it_out;
--  }
--
--  return true;
--}
--
--
--//: Compute expectation given that the voxel is occupied
--bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
--  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
--
--  //iterate through the leaf cells computing mean appearance
--  boxm_cell_iterator<scene_tree_type > it_in =
--  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
--
--  boxm_cell_iterator<boct_tree<short, float > > it_out =
--  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
--
--  it_in.begin();
--  it_out.begin();
--
--  while ( !(it_in.end() || it_out.end()) ) {
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
--    boct_tree_cell<short,float> *cell_out = *it_out;
--
--    boct_loc_code<short> out_code = cell_in->get_code();
--    boct_loc_code<short> in_code = cell_out->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++it_in;
--      ++it_out;
--      continue;
--    }
--
--    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
--    // update alpha integral
--    float vis_color = float(1.0 - std::exp(- cell_in->data().alpha * it_in.length()))*(mean_color+grey_offset);
--    cell_out->set_data(vis_color);
--    ++it_in;
--    ++it_out;
--  }
--
--  scene_in.unload_active_blocks();
--  scene_out.unload_active_blocks();
--
--  return true;
--}
--
--
--#if 0
--//: Compute total expectation E(I) = E(I| X \in S) P(X \in S) + E(I| X !\in S) P(X !\in S)
--//  Expected appearance of a non surface voxel is not defined. Every intensity is equally likely therefore E(I| X !\in S) = 127.5 for I in [0,255]
--bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
--  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
--
--  //iterate through the leaf cells computing mean appearance
--  boxm_cell_iterator<scene_tree_type > it_in =
--  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
--
--  boxm_cell_iterator<boct_tree<short, float > > it_out =
--  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
--
--  it_in.begin();
--  it_out.begin();
--
--  while ( !(it_in.end() || it_out.end()) )
--  {
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
--    boct_tree_cell<short,float> *cell_out = *it_out;
--
--    boct_loc_code<short> out_code = cell_in->get_code();
--    boct_loc_code<short> in_code = cell_out->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++it_in;
--      ++it_out;
--      continue;
--    }
--
--    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
--    //alpha integral
--    float vis = std::exp(- cell_in->data().alpha * it_in.length());
--    float vis_color = (1.0f - vis) *mean_color;
--    float invis_color = vis * 0.5f; // E(I| X !\in S) = 127.5/255
--    cell_out->set_data(vis_color + invis_color);
--    ++it_in;
--    ++it_out;
--  }
--
--  scene_in.unload_active_blocks();
--  scene_out.unload_active_blocks();
--
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
-deleted file mode 100644
-index 1c39b9e84c..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_merge_mog.h
--#ifndef boxm_merge_mog_h_
--#define boxm_merge_mog_h_
--//:
--// \file
--// \brief class with methods to merge gaussian mixtures.
--// \author Isabel Restrepo
--// \date April 20, 2009
--//
--// \verbatim
--//  Modifications
--//   Nov 7 2009 - Isabel Restrepo: Copied from bvxm
--// \endverbatim
--
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gaussian_indep.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <boxm/boxm_scene.h>
--
--//:
--// Only floating point are supported for now and mixtures with 3 components.
--// This class can be further templated if necessary
--class boxm_merge_mog
--{
-- private:
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef bsta_mixture_fixed<gauss_type, 3> mix_gauss;
--  typedef bsta_num_obs<mix_gauss> mix_gauss_type;
--  typedef boct_tree<short, mix_gauss_type> mog_tree_type;
--  typedef boct_tree<short, gauss_type> gauss_tree_type;
--  typedef boct_tree_cell<short, mix_gauss_type> mog_cell_type;
--  typedef boct_tree_cell<short, gauss_type> gauss_cell_type;
--
-- public:
--
--  // === Scene operations ===
--
--  //: Merges the components of the gaussian mixtures at each voxel into a single gaussian, that minimizes KL divergence.
--  //  The resulting scene contains unimodal Gaussians.
--  bool kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &app_scene,  boxm_scene<boct_tree<short, gauss_type> > &gauss_app);
--
--  bool kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree, boct_tree<short, gauss_type> *gauss_tree);
--
--#if 0
--  //: Converts a mixture of gaussians grid into an unimodal gaussian grid corresponding to the most probable mode
--  static bool mpm_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> app_scene,  boxm_scene<boct_tree<short, gauss_type> gauss_app);
--#endif
--
--  // === Distribution operations ===
--
--  //: Merges all the components in the mixture into one component that minimizes the KL divergence between the two distributions
--  static void kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian);
--};
--
--
--//: Computes the differential entropy of a gaussian scene- only for leave cells
--bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene,boxm_scene<boct_tree<short, float > >& scene_out);
--
--//: Computes expected color of a voxel as mean/occupancy
--bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset);
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_refine.h b/contrib/brl/bseg/boxm/algo/boxm_refine.h
-deleted file mode 100644
-index c3f464f906..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_refine.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_refine_h_
--#define boxm_refine_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--void boxm_refine_block(boxm_block<boct_tree<T_loc, T_data> > *block,
--                       float occlusion_prob_thresh, unsigned & num_split, bool reset_appearance = true)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  tree_type* tree = block->get_tree();
--  float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
--  // get the leaf nodes of the block
--  std::vector<boct_tree_cell<T_loc, T_data>*> leaf_nodes = tree->leaf_cells();
--#ifdef DEBUG
--  std::cout << "  NUMBER OF LEAF NODES=" << leaf_nodes.size();
--#endif
--  std::vector<boct_tree_cell<T_loc, T_data >*> split_list;
--  for (unsigned i=0; i<leaf_nodes.size(); i++) {
--    boct_tree_cell<T_loc, T_data>* cell = leaf_nodes[i];
--    T_data data = cell->data();
--
--    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
--    float alpha_int = data.alpha * side_len;
--
--    if ((alpha_int > max_alpha_int) && (cell->level() > 0)) {
--      split_list.push_back(cell);
--      // make sure neighbor cells are not already coarser than this cell
--      // get all the faces;
--#if 0
--      boct_face_idx faces = ALL;
--      std::vector<boct_tree_cell<T_loc, T_data >*> neighbors;
--      cell->find_neighbors(faces, neighbors, cell->level()+1);
--      split_list.insert(split_list.end(), neighbors.begin(), neighbors.end());
--#endif
--    }
--  }
--  num_split+=(int)split_list.size();
--#ifdef DEBUG
--  std::cout<<" Splitting "<<split_list.size()<<" cells" << std::endl;
--#endif
--  // splitting
--  for (unsigned i=0; i<split_list.size(); i++) {
--    boct_tree_cell<T_loc, T_data>* cell = split_list[i];
--    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
--    float new_alpha = max_alpha_int / side_len;
--
--    T_data old_sample = cell->data();
--    typename T_data::apm_datatype app;
--    if (!reset_appearance) {
--      // if it is not set, transfer the old appearance to the new sample
--      T_data new_sample = old_sample;
--      new_sample.alpha=new_alpha;
--      cell->split(new_sample);
--    }
--    else {
--      T_data new_sample = T_data();
--      new_sample.alpha = new_alpha;
--      cell->split(new_sample);
--    }
--  }
--}
--
--//: This method refines the blocks (octrees) of the scene
--// If there are some cells with big values they are spitted into new child cells;
--// the data of the cell is copied to the children's data. The purpose of this
--// method is to elaborate the octree at the areas where more details exist.
--// returns the number of leaf nodes in the refined octree
--template <class T_loc, class T_data>
--unsigned int boxm_refine_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                               float occlusion_prob_thresh,
--                               bool reset_appearance = true)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  unsigned int nleaves = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--  //float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boxm_refine_block(block, occlusion_prob_thresh,nleaves, reset_appearance);
--    //nleaves += block->size();
--    scene.write_active_block();
--  }
--  std::cout<<"Total No of leaves split "<<nleaves<<std::endl;
--  return nleaves;
--}
--
--#endif // boxm_refine_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
-deleted file mode 100644
-index 65c03397ce..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
-+++ /dev/null
-@@ -1,155 +0,0 @@
--#ifndef boxm_save_block_raw_h_
--#define boxm_save_block_raw_h_
--
--#include <vector>
--#include <new>
--#include <iostream>
--
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/util/boxm_cell_data_traits.h>
--
--#include <bsta/bsta_attributes.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--void boxm_save_block_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                         vgl_point_3d<int> block_idx,
--                         std::string filename,
--                         unsigned int resolution_level)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  scene.load_block(block_idx);
--  boxm_block<tree_type>* block = scene.get_block(block_idx);
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  tree_type* tree = block->get_tree();
--
--  // query the finest level of the tree and do not make the resolution smaller than that
--  if (tree->finest_level() > (int)resolution_level)
--    resolution_level = tree->finest_level();
--
--  // get origin of block
--  vgl_point_3d<double> min = block_bb.min_point();
--
--  const unsigned int ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--  // assume that bounding box is a cube
--  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--  // origin should specify center of first cell
--  vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--  int data_size = ncells*ncells*ncells;
--  int y_size = ncells*ncells;
--  float *data = nullptr;
--  data = new (std::nothrow)float[data_size];
--
--  if (data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--    return;
--  }
--  // init to zero
--  for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--    *dp = 0.0f;
--  }
--
--  double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--  out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--  std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--  for (unsigned i=0; i<cells.size(); i++)
--  {
--    vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--    float cell_val = boxm_cell_to_float(cells[i], step_len);
--
--    unsigned int level = cells[i]->get_code().level;
--
--    if (level == resolution_level) {
--      // just copy value to output array
--      int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
--      if (out_index >= data_size)
--        std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--      else
--        data[out_index] = cell_val;
--    }
--    else if (level > resolution_level) {
--      // cell is bigger than output cells.  copy value to all contained output cells.
--      const unsigned int us_factor = 1 << (level - resolution_level);
--      const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--      const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--      const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--      for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--        for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--          for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--            int out_index = z*y_size + y*ncells + x;
--            //std::cout << level << "  " << out_index << std::endl;
--            if (out_index >= data_size)
--              std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--            else
--              data[out_index] = cell_val;
--          }
--        }
--      }
--    }
--    else {
--      // cell is smaller than output cells. increment output cell value
--      unsigned int ds_factor = 1 << (resolution_level - level);
--      double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--      const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--      const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--      const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--      unsigned int out_index = static_cast<unsigned int>((node_z)*y_size + (node_y)*ncells + (node_x));
--      data[out_index] += float(cell_val*update_weight);
--    }
--  }
--  // convert float values to char
--
--  unsigned char *byte_data = nullptr;
--  byte_data = new (std::nothrow) unsigned char[data_size];
--  if (byte_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
--    return;
--  }
--
--  float* dp = data;
--  for (unsigned char* bdp = byte_data; dp < data + data_size; ++dp, ++bdp) {
--    //double P = 1.0 - std::exp(-*dp*step_len);
--    *bdp = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5)); // always positive so this is an ok way to round
--  }
--  delete[] data;
--
--  // write header
--  unsigned char data_type = 0; // 0 means unsigned byte
--
--  vxl_uint_32 nx = ncells;
--  vxl_uint_32 ny = ncells;
--  vxl_uint_32 nz = ncells;
--
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx),sizeof(nx));
--  os.write(reinterpret_cast<char*>(&ny),sizeof(ny));
--  os.write(reinterpret_cast<char*>(&nz),sizeof(nz));
--
--  os.write((char*)byte_data,data_size);
--  delete[] byte_data;
--
--  return;
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
-deleted file mode 100644
-index f3051e8f6e..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
-+++ /dev/null
-@@ -1,277 +0,0 @@
--#ifndef boxm_save_scene_raw_h_
--#define boxm_save_scene_raw_h_
--//:
--// \file
--// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
--//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
--//         And then these sets of data combined and saved in a raw file.
--//
--// \author Gamze Tunali
--// \date   September 9, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vector>
--#include <new>
--#include <iostream>
--#include <sstream>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_cell_data_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--
--#include <bsta/bsta_histogram.h>
--#include <vbl/vbl_array_3d.hxx>
--#include <vsl/vsl_binary_io.h>
--#include <vpl/vpl.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--template <class T_loc, class T_data>
--void boxm_save_scene_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                         std::string filename,
--                         unsigned int resolution_level)
--{
--  float minv = 1.0e10, maxv = 0.0;
--  bsta_histogram<float> h(0.0f, 1.0f, 20);
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  unsigned int finest_level=scene.finest_level();
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  if (resolution_level < finest_level)
--  resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    float *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)float[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--    // init to zero
--    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = 0.0f;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      float cell_val = boxm_cell_to_float(cells[i], step_len);
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              //int out_index=x*y_size + y*ncells + z;
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--              //////int out_index=z + y*ncells + x*ncells*ncells;
--              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
--
--        data[out_index] += float(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << fn << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    float* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      //double P = 1.0 - std::exp(-*dp*step_len);
--      // always positive so this is an ok way to round
--      float fv = *dp;
--      h.upcount(fv, 1.0f);
--      if (fv<minv) minv = fv;
--      if (fv>maxv) maxv = fv;
--      unsigned char c = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5));
--      vsl_b_write(os, (char) c);
--    }
--    delete[] data;
--    os.close();
--    iter++;
--  }
--  scene.unload_active_blocks();
--
--  assert(ncells > 0);
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  char* byte_data = new (std::nothrow) char[row_data_size];
--  if (byte_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type = 0; // 0 means unsigned byte
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read(byte_data, ncells);
--            os.write((char*)byte_data,ncells);
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] byte_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--  std::cout << "Volume Histogram(" << minv << ' ' << maxv << "):[0->1]20bins\n";
--  h.print();
--  return;
--}
--
--#endif // boxm_save_scene_raw_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
-deleted file mode 100644
-index 28753c4595..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
-+++ /dev/null
-@@ -1,824 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
--#ifndef boxm_save_scene_raw_general_h
--#define boxm_save_scene_raw_general_h
--
--//:
--// \file
--// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
--//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
--//         And then these sets of data combined and saved in a raw file.
--//
--// \author Gamze Tunali
--// \date   September 9, 2009
--// \verbatim
--//  Modifications
--//   February 17, 2011 Isabel Restrepo: Modified functions to use with more general scenes.
--//                                      Double, float values are not converted to byte, nor assumptions are made. Values are saves as they are
--// \endverbatim
--
--#include <vector>
--#include <new>
--#include <iostream>
--#include <sstream>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_cell_data_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <bsta/bsta_histogram.h>
--#include <vbl/vbl_array_3d.hxx>
--#include <vsl/vsl_binary_io.h>
--#include <vpl/vpl.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--#include <vul/vul_file.h>
--
--
--//: Traits for saving grids of different datatypes to Drishti .raw file
--template <class T>
--class boxm_dristhi_traits;
--
--//: Drishti datatypes for header:
--// * 0 : unsigned byte - 1 byte per voxel
--// * 1 : signed byte - 1 byte per voxel
--// * 2 : unsigned short - 2 bytes per voxel
--// * 3 : signed short - 2 bytes per voxel
--// * 4 : integer - 4 bytes per voxel
--// * 8 : float - 4 bytes per voxel
--
--//: Drishti traits specializations. Please extent as needed
--
--template <>
--class boxm_dristhi_traits<float>
--{
-- public:
--  static unsigned char dristhi_header() {return 8;}
--};
--
--
--template <>
--class boxm_dristhi_traits<unsigned char>
--{
-- public:
--  static unsigned char dristhi_header() {return 0;}
--};
--
--template <>
--class boxm_dristhi_traits<char>
--{
-- public:
--  static unsigned char dristhi_header() {return 1;}
--};
--
--template <>
--class boxm_dristhi_traits<short>
--{
-- public:
--  static unsigned char dristhi_header() {return 3;}
--};
--
--template <>
--class boxm_dristhi_traits<unsigned int>
--{
-- public:
--  static unsigned char dristhi_header() {return 4;}
--};
--
--template <>
--class boxm_dristhi_traits<bsta_num_obs<bsta_gauss_sf1> >
--{
-- public:
--  static unsigned char dristhi_header() {return 8;}
--};
--
--
--template <class T_loc>
--void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, bool > > &scene,
--                                 std::string filename,
--                                 unsigned int resolution_level)
--{
--  unsigned long n_zeros = 0;
--  unsigned long n_ones = 0;
--  unsigned long n_zeros_level0 = 0;
--  unsigned long n_ones_level0 = 0;
--
--  typedef boct_tree<T_loc, bool > tree_type;
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  unsigned int finest_level=scene.finest_level();
--
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end())
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    unsigned char *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)unsigned char[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--
--    // init to zero
--    for (unsigned char* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = (unsigned char)0.0;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, bool > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      unsigned char cell_val = (unsigned char)cells[i]->data()*255;
--      if (cells[i]->data()) {
--        n_ones++;
--        if (cells[i]->get_code().level ==0)
--          n_ones_level0++;
--      }
--      else {
--        n_zeros++;
--        if (cells[i]->get_code().level ==0)
--          n_zeros_level0++;
--      }
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--
--        data[out_index] += (unsigned char)(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << filename << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    unsigned char* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      unsigned char v = *dp;
--      vsl_b_write(os, (unsigned char)v);
--    }
--    delete[] data;
--    os.close();
--    iter++;
--  }
--
--  scene.unload_active_blocks();
--
--  assert(ncells > 0);
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  unsigned char* read_data = new (std::nothrow) unsigned char[row_data_size];
--  if (read_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type= 0;
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read(reinterpret_cast<char*>(read_data), ncells*sizeof(unsigned char));
--            os.write(reinterpret_cast<char*>(read_data),ncells*sizeof(unsigned char));
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] read_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--
--  std::cout << "Number of true cells : " << n_ones << "\n Number of false cells: " << n_zeros << std::endl;
--  std::cout << "Number of true cells at level 0 : " << n_ones_level0 << "\n Number of false cells at level 0: " << n_zeros_level0 << std::endl;
--
--  return;
--}
--
--
--template <class T_loc, class T_data>
--void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                 std::string filename,
--                                 unsigned int resolution_level)
--{
--  std::cout << " Using boxm_save_scene_raw_general\n";
--  bsta_histogram<float> hist;
--  boxm_compute_scene_statistics(&scene, hist);
--  hist.pretty_print();
--
--  std::stringstream ss;
--  ss << vul_file::strip_extension(filename) << "_hist_plot.txt" ;
--  std::ofstream hist_arrays_ofs((ss.str()).c_str());
--  hist.print_to_arrays(hist_arrays_ofs);
--  hist_arrays_ofs.close();
--
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  unsigned int finest_level=scene.finest_level();
--
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end())
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    T_data *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)T_data[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--
--    // init to zero
--    for (T_data* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = (T_data)0.0;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      T_data cell_val = cells[i]->data();
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--
--        data[out_index] += (T_data)(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << filename << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    T_data* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      T_data v = *dp;
--      if (v > 19 || v < -1)
--        std::cerr << "Error, v: " << v << '\n';
--      vsl_b_write(os, (T_data)v);
--    }
--    std::cerr << " Data Correct ? " << '\n';
--
--    delete[] data;
--    os.close();
--    iter++;
--  }
--
--  scene.unload_active_blocks();
--
--  assert(ncells > 0);
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  T_data* read_data = new (std::nothrow) T_data[row_data_size];
--  if (read_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type = boxm_dristhi_traits<T_data>::dristhi_header();
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read((char*)read_data, ncells*sizeof(T_data));
--            os.write((char*)read_data,ncells*sizeof(T_data));
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] read_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--  return;
--}
--
--
--template <class T_loc, class T_data>
--void boxm_save_scene_raw_general_to_byte(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                         std::string filename,
--                                         unsigned int resolution_level)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  std::cout << " Using boxm_save_scene_raw_general_to_byte\n";
--
--  bsta_histogram<float> hist;
--  boxm_compute_scene_statistics(&scene, hist);
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  unsigned int finest_level=scene.finest_level();
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end())
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    float *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)float[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--    // init to zero
--    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = 0.0f;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      float cell_val = boxm_cell_to_float(cells[i], step_len);
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              //int out_index=x*y_size + y*ncells + z;
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--              //////int out_index=z + y*ncells + x*ncells*ncells;
--              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
--
--        data[out_index] += float(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << filename << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    T_data minv = hist.min();
--    T_data maxv = hist.max();
--    T_data rangev = maxv-minv;
--
--    float* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      unsigned char c = (unsigned char)(std::floor((255.0f * float((*dp)-minv)/float(rangev)) + 0.5f));
--      vsl_b_write(os, (char) c);
--    }
--    delete[] data;
--    os.close();
--    iter++;
--  }
--  assert(ncells > 0);
--
--  scene.unload_active_blocks();
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  char* byte_data = new (std::nothrow) char[row_data_size];
--  if (byte_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type = 0; // 0 means unsigned byte
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read(byte_data, ncells);
--            os.write((char*)byte_data,ncells);
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] byte_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--  std::cout << "Volume Histogram\n";
--  hist.pretty_print();
--  return;
--}
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h b/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
-deleted file mode 100644
-index bdfb1db979..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_scene_levels_utils.h
--#ifndef boxm_scene_levels_utils_h
--#define boxm_scene_levels_utils_h
--//:
--// \file
--// \brief Functions to explore the levels of an octre
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Sep-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_data>
--boxm_scene<boct_tree<short, bool> >* boxm_explore_cells_at_level(boxm_scene<boct_tree<short, T_data> > *scene_in, short level)
--{
--  //parameters and structure of the output scene are the same as those of the input scene
--  boxm_scene<boct_tree<short, bool> > *scene_out = new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--  scene_out->set_paths(scene_in->path(), "level");
--  scene_out->set_appearance_model(BOXM_BOOL);
--  scene_out->write_scene("level.xml");
--
--  scene_in->template clone_blocks_to_type<boct_tree<short, bool> >(*scene_out, false);
--
--  //iterate through the leaf cells
--  boxm_cell_iterator<boct_tree<short, T_data> > it_in =
--    scene_in->cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block, true);
--  boxm_cell_iterator<boct_tree<short, bool> > it_out =
--    scene_out->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
--
--  for (it_in.begin(), it_out.begin(); !it_in.end() && !it_out.end(); ++it_in, ++it_out)
--  {
--    boct_tree_cell<short,T_data > *cell_in = *it_in;
--    boct_tree_cell<short,bool > *cell_out = *it_out;
--
--    //check for level
--    if ((cell_in->level() == level)) {
--      cell_out->set_data(true);
--    }
--  }
--
--  scene_in->unload_active_blocks();
--  scene_out->unload_active_blocks();
--
--  return scene_out;
--}
--
--
--template <class T_data>
--void boxm_remove_level_0_leaves(boxm_scene<boct_tree<short, T_data> > *scene_in)
--{
--  typedef boct_tree<short,T_data> tree_type;
--
--  //Iterate through the blocks
--  boxm_block_iterator<tree_type> it_in = scene_in->iterator();
--  for (it_in.begin(); !it_in.end(); ++it_in)
--  {
--    scene_in->load_block(it_in.index());
--    tree_type *tree_in= (*it_in)->get_tree();
--
--    std::vector<boct_tree_cell<short, T_data> * > all_cells =  tree_in->all_cells();
--    typename std::vector<boct_tree_cell<short, T_data> * >::iterator cells_it = all_cells.begin();
--
--    for (; cells_it!=all_cells.end(); cells_it++) {
--      boct_tree_cell<short, T_data> * cell_in = *cells_it;
--      //check for level
--      short level = cell_in->level();
--      if (level == 0) {
--        cell_in = nullptr;
--      }
--      else {
--        if (level == 1)
--          cell_in->set_children_null();
--        //shift loccode one space to the rigth
--        boct_loc_code<short> shift_code;
--        shift_code.set_code(cell_in->get_code().x_loc_ >> 1, cell_in->get_code().y_loc_ >> 1, cell_in->get_code().z_loc_ >> 1);
--        shift_code.set_level(level - 1);
--        cell_in->set_code(shift_code);
--      }
--    }
--
--    tree_in->reset_num_levels(tree_in->number_levels() - 1);
--    scene_in->write_active_block();
--    std::cout << '.';
--  }
--  std::cout << "\nCleaning\n";
--  scene_in->unload_active_blocks();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h b/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
-deleted file mode 100644
-index eb982606db..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
-+++ /dev/null
-@@ -1,105 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_split_sample.h
--#ifndef boxm_split_sample_h
--#define boxm_split_sample_h
--//:
--// \file
--// \brief  A class enclosing set of functions to split a boxm_sample scenes/trees into appearance and occupancy scenes/trees
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  December 3, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_apm_traits.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<boxm_apm_type APM_MODEL>
--class boxm_split_sample
--{
-- public:
--  typedef boct_tree<short, boxm_sample<APM_MODEL> > sample_tree_type;
--  typedef boct_tree_cell<short, boxm_sample<APM_MODEL> > sample_cell_type;
--
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
--  typedef boct_tree<short, apm_datatype> apm_tree_type;
--  typedef boct_tree_cell<short, apm_datatype> apm_cell_type;
--
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype alpha_datatype;
--  typedef boct_tree<short, alpha_datatype> alpha_tree_type;
--  typedef boct_tree_cell<short, alpha_datatype> alpha_cell_type;
--
--  //: A function to split an boxm_sample scene, into an appearance and an occupancy scene
--  void split_scene(boxm_scene<sample_tree_type> &scene_in, boxm_scene<apm_tree_type> &apm_scene, boxm_scene<alpha_tree_type > &alpha_scene);
--
--  //: A function to split an boxm_sample tree, into an appearance and an occupancy tree
--  void split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree);
--};
--
--
--//: A function to split an boxm_sample scene, into an appearance and an occupancy scene
--template<boxm_apm_type APM_MODEL>
--void boxm_split_sample<APM_MODEL>::split_scene(boxm_scene<sample_tree_type> &scene_in,
--                                               boxm_scene<apm_tree_type> &apm_scene,
--                                               boxm_scene<alpha_tree_type > &alpha_scene)
--{
--  //missing:check that dimensions of all scenes agree
--
--  //iterate through blocks in the scenes
--  boxm_block_iterator<sample_tree_type> iter_in = scene_in.iterator();
--  boxm_block_iterator<apm_tree_type> apm_iter = apm_scene.iterator();
--  boxm_block_iterator<alpha_tree_type> alpha_iter = alpha_scene.iterator();
--
--  iter_in.begin();
--  apm_iter.begin();
--  alpha_iter.begin();
--  while (!iter_in.end() || !apm_iter.end() ||!alpha_iter.end())
--  {
--    scene_in.load_block(iter_in.index());
--    apm_scene.load_block(apm_iter.index());
--    alpha_scene.load_block(alpha_iter.index());
--
--    sample_tree_type *tree_in= (*iter_in)->get_tree();
--    apm_tree_type *apm_tree = tree_in->template clone_to_type<apm_datatype>();
--    alpha_tree_type *alpha_tree = tree_in->template clone_to_type<alpha_datatype>();
--    this->split_tree(tree_in, apm_tree,alpha_tree);
--    (*apm_iter)->init_tree(apm_tree);
--    (*alpha_iter)->init_tree(alpha_tree);
--    apm_scene.write_active_block();
--    alpha_scene.write_active_block();
--
--    iter_in++; apm_iter++; alpha_iter++;
--  }
--}
--
--
--//: A function to split an boxm_sample tree, into an appearance and an occupancy tree
--template<boxm_apm_type APM_MODEL>
--void boxm_split_sample<APM_MODEL>::split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree)
--{
--  //iterate through the trees
--  std::vector<sample_cell_type*> sample_cells = tree_in->all_cells();
--  std::vector<apm_cell_type*> apm_cells = apm_tree->all_cells();
--  std::vector<alpha_cell_type*> alpha_cells = alpha_tree->all_cells();
--
--  if (sample_cells.size()!=apm_cells.size() || apm_cells.size()!=alpha_cells.size()){
--    std::cerr << "Different size vectors in split_sample_scene::split_tree\n";
--    return;
--  }
--
--  for (unsigned i = 0; i < sample_cells.size(); i++)
--  {
--    boxm_sample<APM_MODEL> sample = sample_cells[i]->data();
--    apm_cells[i]->set_data(sample.appearance_);
--    alpha_cells[i]->set_data(sample.alpha);
--  }
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
-deleted file mode 100644
-index 63fe2ff02b..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
-+++ /dev/null
-@@ -1,156 +0,0 @@
--#ifndef boxm_render_mesh_h_
--#define boxm_render_mesh_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <imesh/imesh_mesh.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--void boxm_upload_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
--                                 imesh_mesh& mesh, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  imesh_face_array_base& fs = mesh.faces();
--  for (unsigned i=0; i < fs.size(); ++i)
--  {
--    std::list<vgl_point_3d<double> > v_list;
--    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
--    vgl_box_3d<double> bb_scale, bb_global;
--    for (unsigned j=0; j<fs.num_verts(i); ++j) {
--      unsigned int v_id = fs(i,j);
--      vgl_point_3d<double> v;
--      if (use_lvcs) {
--        double lx, ly, lz;
--        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                             vpgl_lvcs::wgs84,lx,ly,lz);
--        v=vgl_point_3d<double>(lx,ly,lz);
--      }
--      else
--        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--      bb_global.add(v);
--      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--      v.set(diff.x(), diff.y(), diff.z());
--      // the local coordinates inside the box region
--      v_list.push_back(v);
--      //convert the values into [0,1] range
--      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--      bb_scale.add(v);
--    }
--    // check if polygon's bounding box intersects with the block
--    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--    if (inters.is_empty())
--      return;
--
--    // locate the polygon bounding box in tree
--    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
--    if (region) {
--      // test all the children for intersection
--      std::vector<boct_tree_cell<T_loc,T_data>*> children;
--      if (!region->is_leaf())
--        region->leaf_children(children);
--      else // insert the node itself, if no children
--        children.push_back(region);
--      for (unsigned i=0; i<children.size(); i++) {
--        boct_tree_cell<T_loc,T_data>* cell=children[i];
--        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
--        if (vgl_intersection<double>(cell_bb, v_list)) {
--          cell->set_data(val);
--        }
--      }
--    }
--  }
--}
--
--//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
--template <>
--void boxm_upload_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
--                                 imesh_mesh& mesh, vpgl_lvcs& lvcs,
--                                 bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  imesh_face_array_base& fs = mesh.faces();
--  for (unsigned i=0; i < fs.size(); ++i)
--  {
--    std::list<vgl_point_3d<double> > v_list;
--    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
--    vgl_box_3d<double> bb_scale, bb_global;
--    for (unsigned j=0; j<fs.num_verts(i); ++j) {
--      unsigned int v_id = fs(i,j);
--      vgl_point_3d<double> v;
--      if (use_lvcs) {
--        double lx, ly, lz;
--        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                             vpgl_lvcs::wgs84,lx,ly,lz);
--        v=vgl_point_3d<double>(lx,ly,lz);
--      }
--      else
--        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--      bb_global.add(v);
--      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--      v.set(diff.x(), diff.y(), diff.z());
--      // the local coordinates inside the box region
--      v_list.push_back(v);
--      //convert the values into [0,1] range
--      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--      bb_scale.add(v);
--    }
--    // check if polygon's bounding box intersects with the block
--    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,0.999,0.999,0.999), bb_scale);
--    if (inters.is_empty())
--      return;
--
--    // locate the polygon bounding box in tree
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
--    if (region) {
--      // test all the children for intersection
--      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
--      if (!region->is_leaf())
--        region->leaf_children(children);
--      else // insert the node itself, if no children
--        children.push_back(region);
--      for (auto cell : children) {
--        vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
--        if (vgl_intersection<double>(cell_bb, v_list)) {
--          boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
--          tempdata.set_appearance(val.appearance());
--          tempdata.alpha*=val.alpha;
--          cell->set_data(tempdata);
--        }
--      }
--    }
--  }
--}
--
--//: calls all the blocks for drawing meshes
--template <class T_loc, class T_data>
--void boxm_upload_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                 imesh_mesh& mesh, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--  vpgl_lvcs lvcs=scene.lvcs();
--  boxm_block_iterator<tree_type> iter(&scene);
--  mesh.compute_face_normals(true);
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boxm_upload_mesh_into_block(block, mesh, lvcs, use_lvcs, val);
--    scene.write_active_block();
--  }
--}
--
--#endif // boxm_render_mesh_h_
-diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-deleted file mode 100644
-index 2a41c2db1a..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and bvxm_pro depends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--FIND_PACKAGE(RPLY REQUIRED)
--if(RPLY_FOUND)
--  include_directories( ${RPLY_INCLUDE_DIR} )
--else()
--  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
--endif()
--
--  set(boxm_algo_pro_sources
--      boxm_algo_processes.h
--      boxm_algo_register.h   boxm_algo_register.cxx
--  )
--
--  #aux_source_directory(Templates boxm_algo_pro_sources)
--  aux_source_directory(processes boxm_algo_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_algo_pro LIBRARY_SOURCES ${boxm_algo_pro_sources} )
--
--  target_link_libraries(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil vsol ${VXL_LIB_PREFIX}vgl brip ${VXL_LIB_PREFIX}vcl rply)
--  # Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
--  # Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
--  # Need vil_pro  only for the instantiation of brdb_value_t<vil_smart_ptr<vil_image_view_base> >
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
-deleted file mode 100644
-index f22427eeed..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
-+++ /dev/null
-@@ -1,28 +0,0 @@
--#ifndef boxm_algo_processes_h_
--#define boxm_algo_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_describe_scene_process);
--DECLARE_FUNC_CONS(boxm_init_scene_process);
--DECLARE_FUNC_CONS(boxm_line_backproject_process);
--DECLARE_FUNC_CONS(boxm_refine_scene_process);
--DECLARE_FUNC_CONS(boxm_replace_const_app_process);
--DECLARE_FUNC_CONS(boxm_roi_init_process);
--DECLARE_FUNC_CONS(boxm_roi_init_rational_camera_process);
--DECLARE_FUNC_CONS(boxm_save_occupancy_raw_process);
--DECLARE_FUNC_CONS(boxm_save_scene_raw_process);
--DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
--DECLARE_FUNC_CONS(boxm_merge_mixtures_process);
--DECLARE_FUNC_CONS(boxm_split_scene_process);
--DECLARE_FUNC_CONS(boxm_compute_scene_difference_process);
--DECLARE_FUNC_CONS(boxm_compute_entropy_process);
--DECLARE_FUNC_CONS(boxm_compute_expected_color_scene_process);
--DECLARE_FUNC_CONS(boxm_linear_combination_process);
--DECLARE_FUNC_CONS(boxm_explore_cells_at_level_process);
--DECLARE_FUNC_CONS(boxm_fill_internal_cells_process);
--DECLARE_FUNC_CONS(boxm_remove_level0_process);
--DECLARE_FUNC_CONS(boxm_create_scene_from_ply_process);
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
-deleted file mode 100644
-index b883c164fa..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#include "boxm_algo_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "boxm_algo_processes.h"
--
--void boxm_algo_register::register_datatype()
--{
--}
--
--void boxm_algo_register::register_process()
--{
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_describe_scene_process,"boxmDescribeSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_init_scene_process,"boxmInitSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process,"boxmLineBackprojectProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_refine_scene_process, "boxmRefineSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_replace_const_app_process,"boxmReplaceConstAppProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_process, "boxmROIInitProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_rational_camera_process, "boxmROIInitRationalCameraProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_occupancy_raw_process, "boxmSaveOccupancyRawProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_scene_raw_process, "boxmSaveSceneRawProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_vrml_process, "boxmRenderExpectedEdgeVRMLProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_merge_mixtures_process, "boxmMergeMixturesProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_split_scene_process ,"boxmSplitSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_scene_difference_process, "boxmComputeSceneDifferenceProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_entropy_process, "boxmComputeEntropyProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_expected_color_scene_process, "boxmComputeExpectedColorSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_linear_combination_process, "boxmLinearCombinationProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_explore_cells_at_level_process, "boxmExploreCellsAtLevelProcess");
--  REG_PROCESS_FUNC_CONS2(boxm_fill_internal_cells_process);
--  REG_PROCESS_FUNC_CONS2(boxm_remove_level0_process);
--  REG_PROCESS_FUNC_CONS2(boxm_create_scene_from_ply_process);
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
-deleted file mode 100644
-index 3c21937894..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_algo_register_h_
--#define boxm_algo_register_h_
--
--class boxm_algo_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_algo_register_h_
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
-deleted file mode 100644
-index 1b8cf32459..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--//:
--// \file
--// \brief A process that outputs the differential entropy of the gaussian stored at every leave cell
--// \author Isabel Restrepo
--// \date 15-Nov-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/algo/boxm_merge_mog.h>
--
--
--//:global variables
--namespace boxm_compute_entropy_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_compute_entropy_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_compute_entropy_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_compute_entropy_process(bprb_func_process& pro)
--{
--  using namespace boxm_compute_entropy_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Scene is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef boct_tree<short, gauss_type> gauss_tree_type;
--
--  auto *gauss_scene = dynamic_cast<boxm_scene<gauss_tree_type>* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!gauss_scene) {
--    std::cout <<  " :-- Scene is not of valid type!\n";
--    return false;
--  }
--
--  //parameters and structure of the output scene are the same as those of the input scene
--  boxm_scene<boct_tree<short, float> > *entropy_scene = new boxm_scene<boct_tree<short, float> >(gauss_scene->lvcs(), gauss_scene->origin(), gauss_scene->block_dim(), gauss_scene->world_dim(), gauss_scene->max_level(), gauss_scene->init_level());
--  entropy_scene->set_paths(gauss_scene->path(), "entropy");
--  entropy_scene->set_appearance_model(BOXM_FLOAT);
--
--  compute_differential_entropy(*gauss_scene, *entropy_scene);
--  gauss_scene->write_scene("entropy_scene.xml");
--  pro.set_output_val<boxm_scene_base_sptr>(0, entropy_scene);
--  std::cout<<"Exiting" << std::endl;
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
-deleted file mode 100644
-index e99f978d28..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--//:
--// \file
--// \brief A process that computes the "expected visible color"  at each voxel
--// \author Isabel Restrepo
--// \date 17-Nov-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/algo/boxm_merge_mog.h>
--
--
--//:global variables
--namespace boxm_compute_expected_color_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_compute_expected_color_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_compute_expected_color_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float"; //offset for appearance values
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_compute_expected_color_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_compute_expected_color_scene_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  auto grey_offset = pro.get_input<float>(1);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Scene is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
--
--  auto *scene = dynamic_cast<boxm_scene<scene_tree_type>* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!scene) {
--    std::cout <<  " :-- Scene is not of valid type!\n";
--    return false;
--  }
--
--  //parameters and structure of the output scene are the same as those of the input scene
--  boxm_scene<boct_tree<short, float> > *mean_color_scene = new boxm_scene<boct_tree<short, float> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  mean_color_scene->set_paths(scene->path(), "mean_color");
--  mean_color_scene->set_appearance_model(BOXM_FLOAT);
--
--  compute_expected_color(*scene, *mean_color_scene, grey_offset);
--  mean_color_scene->write_scene("mean_color_scene.xml");
--  pro.set_output_val<boxm_scene_base_sptr>(0, mean_color_scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
-deleted file mode 100644
-index f7efed8c52..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
-+++ /dev/null
-@@ -1,91 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
--
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for computing the difference between two scenes.
--//
--// \author Vishal Jain
--// \date Sept 8, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_parser.h>
--#include <boxm/algo/boxm_compute_scene_difference.h>
--
--//: global variables
--namespace boxm_compute_scene_difference_process_globals
--{
--  //this process takes no outputs
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: sets input and output types
--bool boxm_compute_scene_difference_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_compute_scene_difference_process_globals;
--
--  // process takes 1 input and no outputs
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "boxm_scene_base_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "float";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//: creates a scene from parameters
--bool boxm_compute_scene_difference_process(bprb_func_process& pro)
--{
--  using namespace boxm_compute_scene_difference_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_compute_scene_difference_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene1_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr scene2_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr sceneout_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto t = pro.get_input<float>(i++);
--
--  if (scene1_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
--      scene2_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
--      sceneout_ptr->appearence_model() == BOXM_APM_MOG_GREY )
--  {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *scene1 = static_cast<boxm_scene<tree_type>*> (scene1_ptr.as_pointer());
--      auto *scene2 = static_cast<boxm_scene<tree_type>*> (scene2_ptr.as_pointer());
--      auto *sceneout = static_cast<boxm_scene<tree_type>*> (sceneout_ptr.as_pointer());
--
--    boxm_compute_scene_difference(*scene1,*scene2,*sceneout,t);
--  }
--  else {
--    std::cout << "boxm_compute_scene_difference_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
-deleted file mode 100644
-index fdf40edf0e..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
-+++ /dev/null
-@@ -1,257 +0,0 @@
--//:
--// \file
--// \brief A process that creates a boxm scene from a .ply file
--// \author Isabel Restrepo
--// \date 2-Jan-2012
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <rply.h>   //.ply parser
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boct/util/boct_construct_tree.h>
--#define DEBUG_PLY
--
--class boxm_vgl_point_3d_coord_compare
--{
-- public:
--  boxm_vgl_point_3d_coord_compare() = default;
--  ~boxm_vgl_point_3d_coord_compare() = default;
--
--  bool operator() ( vgl_point_3d<int> const& pa, vgl_point_3d<int> pb ) const
--  {
--    if      ( pa.x() != pb.x() ) return pa.x() < pb.x();
--    else if ( pa.y() != pb.y() ) return pa.y() < pb.y();
--    else                         return pa.z() < pb.z();
--  }
--};
--
--
--class boxm_apperace_fileio_parsed_ply_
--{
-- public:
--  double p[3];  //holds location
--  unsigned char color; //holds color
--  double grey_offset; //offset the floating point (0,1) color value
--  //accumulated data in the shape of leaf cells
--  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
--  boxm_scene<boct_tree<short, float> > *scene;
--};
--
--bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
--                         std::map<vgl_point_3d<int>,
--                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
--                         const float &grey_offset);
--
--//: Call-back function for a "vertex" element
--int boxm_plyio_vertex_cb_(p_ply_argument argument);
--
--//: global variables
--namespace boxm_create_scene_from_ply_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool boxm_create_scene_from_ply_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_from_ply_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; //path to .ply file
--  input_types_[1] = "boxm_scene_base_sptr"; //the scene to fill up
--  input_types_[2] = "float"; //offset for appearance values
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool boxm_create_scene_from_ply_process(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_from_ply_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  std::string ply_file = pro.get_input<std::string>(0);
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(1);
--  auto grey_offset = pro.get_input<float>(2);
--
--  // Note initial implementation is for fixed types, but this can be changed if more cases are needed
--  // cast input scene
--  auto *scene = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Scene is not valid!\n";
--    return false;
--  }
--
--  // Map to hold the index of block and the cell containing appearance (0,1)
--  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
--
--  boxm_block_iterator<boct_tree<short, float> > block_iter = scene->iterator();
--
--  for (block_iter.begin(); !block_iter.end(); ++block_iter)
--  {
--    data[block_iter.index()]= std::vector<boct_tree_cell<short, float> >();
--  }
--
--  if (!boxm_load_color_ply(ply_file, scene, data, grey_offset)){
--    pro.set_output_val<boxm_scene_base_sptr>(0, nullptr);
--    return false;
--  }
--
--
--  //construct trees
--  for (block_iter.begin(); !block_iter.end(); ++block_iter)
--  {
--    std::cout << "In block: " << block_iter.index() << "Number of leaves: " <<data[block_iter.index()].size() << std::endl;
--    boct_tree_cell<short, float>* root = boct_construct_tree(data[block_iter.index()], scene->max_level(), 0.0f );
--    auto* tree = new boct_tree<short,float>(root,  scene->max_level());
--    vgl_box_3d<double> tree_bbox= scene->get_block_bbox(block_iter.index());
--    tree->set_bbox(tree_bbox);
--
--    scene->load_block(block_iter.index());
--    (*block_iter)->init_tree(tree);
--    scene->write_active_block();
--    data[block_iter.index()].clear();
--  }
--
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
--
--  return true;
--}
--
--
--// ============================== PLY ==============================
--
--
--bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
--                         std::map<vgl_point_3d<int>,
--                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
--                         const float &grey_offset)
--{
--  long nvertices;
--
--  boxm_apperace_fileio_parsed_ply_ parsed_ply;
--  parsed_ply.grey_offset = grey_offset;
--  parsed_ply.data = data;
--  parsed_ply.scene = scene;
--
--
--  // OPEN file
--#ifdef DEBUG_PLY
--  std::cerr << " loading " << ply_file << " :\n";
--  std::cerr << " gray_offset " << parsed_ply.grey_offset << grey_offset << " :\n";
--
--#endif
--
--  p_ply ply = ply_open(ply_file.c_str(), nullptr, 0, nullptr);
--  if (!ply){
--    std::cerr << "Couldn't open ply file: " << ply_file << '\n';
--    return false;
--  }
--
--  // Read HEADER
--  if (!ply_read_header(ply)) return false;
--
--  // vertex
--  nvertices =
--  ply_set_read_cb(ply, "vertex", "x",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 0);
--  ply_set_read_cb(ply, "vertex", "y",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 1);
--  ply_set_read_cb(ply, "vertex", "z",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 2);
--  ply_set_read_cb(ply, "vertex", "diffuse_red",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 3);
--
--#ifdef DEBUG_PLY
--  std::cerr << nvertices << " points\n";
--#endif
--
--  // Read DATA
--  if (!ply_read(ply)) return false;
--
--  // CLOSE file
--  ply_close(ply);
--
--  data=parsed_ply.data;
--
--#ifdef DEBUG_PLY
--  std::cerr << "  done.\n";
--#endif
--
--  return true;
--}
--
--
--//: Call-back function for a "vertex" element
--int boxm_plyio_vertex_cb_(p_ply_argument argument)
--{
--  long index;
--  void* temp;
--  ply_get_argument_user_data(argument, &temp, &index);
--
--  auto* parsed_ply =  (boxm_apperace_fileio_parsed_ply_*) temp;
--  //std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
--
--  switch (index)
--  {
--    case 0: // "x" coordinate
--      parsed_ply->p[0] = ply_get_argument_value(argument);
--      break;
--    case 1: // "y" coordinate
--      parsed_ply->p[1] = ply_get_argument_value(argument);
--      break;
--    case 2: // "z" coordinate
--      parsed_ply->p[2] = ply_get_argument_value(argument);
--      break;
--    case 3:
--    {
--      parsed_ply->color = (unsigned char)ply_get_argument_value(argument);
--      //insert data
--      vgl_point_3d<int> block_index(-1,-1,-1);
--      if (parsed_ply->scene->get_block_index(vgl_point_3d<double>(parsed_ply->p), block_index))
--      {
--        //convert point into local(tree coordinates)
--        vgl_box_3d<double> global_bbox= parsed_ply->scene->get_block_bbox(block_index);
--        vgl_point_3d<double> norm_p((parsed_ply->p[0]-global_bbox.min_x())/global_bbox.width(),
--                                    (parsed_ply->p[1]-global_bbox.min_y())/global_bbox.height(),
--                                    (parsed_ply->p[2]-global_bbox.min_z())/global_bbox.depth());
--        // convert point to location code.
--        boct_loc_code<short> loc_code(norm_p, parsed_ply->scene->max_level()-1);
--        boct_tree_cell<short, float> leaf_cell(loc_code);
--        float expected_color = float(parsed_ply->color)/255.0f + float(parsed_ply->grey_offset);
--        if (expected_color > 2.0f || expected_color < 0.0f)
--          std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
--        leaf_cell.set_data(expected_color);
--        parsed_ply->data[block_index].push_back(leaf_cell);
--      }
--      break;
--    }
--    default:
--      assert(!"This should not happen: index out of range");
--      break;
--  }
--  return 1;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
-deleted file mode 100644
-index 2fb47d460f..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
-+++ /dev/null
-@@ -1,106 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A process for describing the attributes of a scene
--//
--// \author J.L. Mundy
--// \date January 24, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <boxm/boxm_apm_traits.h>
--#include <bsta/bsta_histogram_sptr.h>
--
--namespace boxm_describe_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 4;
--}
--
--bool boxm_describe_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_describe_scene_process_globals;
--
--  //process takes 1 input
--  //input[0]: scene binary file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  // process has 4 outputs:
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "bsta_histogram_sptr"; // Omega Histogram
--  output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
--  output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
--  output_types_[3] = "unsigned";            // Number of leaves
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--// This process produces four outputs
--//  1) The distribution of "Omega" values where Omega = 1-e^( alpha x length )
--//  2) The distribution of "Sigma" values where Sigma is the std_dev of
--//     the appearance model. (currently implemented only for simple grey)
--//  3) The histogram of levels for leaves in the octree
--//  4) The number of leaves in the tree
--//
--bool boxm_describe_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_describe_scene_process_globals;
--
--  if ( !pro.verify_inputs() ) {
--    std::cerr << pro.name() << ": invalid inputs\n";
--    return false;
--  }
--  unsigned n_leaves = 0;
--  //assign tree type
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      std::cerr<<"boxm_describe_scene_process not yet implemented for Gaussian mixture\n";
--      return false;//not implemented
--    }
--    else
--    {
--      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/Gaussian mixture\n";
--      return false;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
--  {
--    if (!scene_ptr->multi_bin()) {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
--
--      bsta_histogram<float> omega_hist, sigma_hist, level_hist;
--      if (!compute_scene_statistics(*scene, omega_hist, sigma_hist,
--                                    level_hist, n_leaves))
--        return false;
--      std::cout << "Omega Hist\n";
--      omega_hist.print_vals_prob();
--      std::cout << "Sigma Hist\n";
--      sigma_hist.print_vals_prob();
--      std::cout << "Level Hist\n";
--      level_hist.print_vals_prob();
--      std::cout << "Number of Leaves " << n_leaves << '\n';
--      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(omega_hist));
--      pro.set_output_val<bsta_histogram_sptr>(1, new bsta_histogram<float>(sigma_hist));
--      pro.set_output_val<bsta_histogram_sptr>(2, new bsta_histogram<float>(level_hist));
--      pro.set_output_val<unsigned>(3, n_leaves);
--    }
--    else {
--      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/simple_grey\n";
--      return false;
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
-deleted file mode 100644
-index 1dfc74a8ee..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \brief A process to label cells at a given leve
--// \author Isabel Restrepo
--// \date 15-Sep-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <boxm/algo/boxm_scene_levels_utils.h>
--
--
--//:global variables
--namespace boxm_explore_cells_at_level_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_explore_cells_at_level_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_explore_cells_at_level_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr"; //scene in
--  input_types_[1] = "unsigned"; //octree level
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr"; //label scene
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_explore_cells_at_level_process(bprb_func_process& pro)
--{
--  using namespace boxm_explore_cells_at_level_process_globals;
--
--  //get inputs
--  boxm_scene_base_sptr scene_in_base = pro.get_input<boxm_scene_base_sptr>(0);
--  auto level = pro.get_input<unsigned>(1);
--
--  if (scene_in_base->appearence_model() == BOXM_FLOAT)
--  {
--    typedef boct_tree<short, float > type;
--
--    auto* scene = dynamic_cast<boxm_scene<type>*>(scene_in_base.as_pointer());
--
--    if (!scene)
--      return false;
--
--    //store output
--    pro.set_output_val<boxm_scene_base_sptr>(0, boxm_explore_cells_at_level(scene,level));
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
-deleted file mode 100644
-index c222d74cd7..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
--//:
--// \file
--// \brief process fills the internal cells of the octrees in the scene
--//
--// \author Isabel Restrepo
--// \date December 3, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <boxm/algo/boxm_fill_internal_cells.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace boxm_fill_internal_cells_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 1 input and 1 output.
--// input[0]: The input scene
--// output[0]: The output scene
--
--bool boxm_fill_internal_cells_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_fill_internal_cells_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_fill_internal_cells_process(bprb_func_process& pro)
--{
--  using namespace boxm_fill_internal_cells_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
--  {
--    boxm_fill_internal_cells<float> filler;
--    pro.set_output_val<boxm_scene_base_sptr>(0, filler.traverse_and_fill(scene_in));
--    return true;
--  }
--
--  std::cerr << "In boxm_fill_internal_cells_process: Unsupportted scene type\n";
--  return false;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
-deleted file mode 100644
-index e023ca2500..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
-+++ /dev/null
-@@ -1,111 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
--
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for initializing a new boxm_scene when there is not a saved one.
--//        It receives the parameters from a parameter file in XML
--//
--// \author Vishal Jain
--// \date Feb 8, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene_parser.h>
--#include <boxm/algo/boxm_init_scene.h>
--
--//: global variables
--namespace boxm_init_scene_process_globals
--{
--  //this process takes no outputs
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: sets input and output types
--bool boxm_init_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_init_scene_process_globals;
--
--  // process takes 1 input and no outputs
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//: creates a scene from parameters
--bool boxm_init_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_init_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_init_scene_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_init_scene_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene->multi_bin()) {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_init_scene<BOXM_APM_MOG_GREY>(*s);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_init_scene<BOXM_APM_SIMPLE_GREY>(*s);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_init_scene<BOXM_APM_MOB_GREY >(*s);
--    }
--  }
--  else {
--    std::cout << "boxm_init_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
-deleted file mode 100644
-index b8767b24bc..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
-+++ /dev/null
-@@ -1,259 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
--#include <iostream>
--#include <cstdio>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for computing the backprojection of lines.
--//         Lines are represented as an image with 3 plane images (plane 0=a, plane1=b,
--//         plane2=c, line is defined as ax+by=c). The backprojection, which is a plane
--//         is stored as an other image with 4 planes (ax+by+cz=d) as the output.
--//
--// \author Gamze Tunali
--// \date   Feb 4, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <vpgl/vpgl_proj_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--#include <vpgl/algo/vpgl_ray.h>
--
--#include <vgl/vgl_plane_3d.h>
--
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: globals
--namespace boxm_line_backproject_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: set input and output types
--// process takes 2 inputs and has 1 output:
--// input[0]: The edge image (vil_image_view<float> with three planes for (a,b,c))
--// input[1]: camera
--// output[0]: The plane image
--bool boxm_line_backproject_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_line_backproject_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vil_image_view_base_sptr";
--  input_types_[i++] = "vpgl_camera_double_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j = 0;
--  output_types_[j++] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--vpgl_rational_camera<double>
--perspective_to_rational(vpgl_perspective_camera<double>&cam_pers)
--{
--  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
--  std::vector<double> neu_u,den_u,neu_v,den_v;
--  double x_scale = 1.0, x_off = 0.0, y_scale = 1.0, y_off = 0.0, z_scale = 1.0, z_off = 0.0, u_scale = 1.0, u_off = 0.0, v_scale = 1.0, v_off = 0.0;
--
--  for (int i=0; i<20; i++) {
--    neu_u.push_back(0.0);
--    neu_v.push_back(0.0);
--    den_u.push_back(0.0);
--    den_v.push_back(0.0);
--  }
--
--  int vector_map[] = {9,15,18,19};
--
--  for (int i=0; i<4; i++) {
--    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
--    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
--    den_u[vector_map[i]] = cam_pers_matrix(2,i);
--    den_v[vector_map[i]] = cam_pers_matrix(2,i);
--  }
--
--  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
--                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
--                                       u_scale,u_off,v_scale,v_off);
--  return cam_rat;
--}
--
--//: optimizes rpc camera parameters based on edges
--bool boxm_line_backproject_process(bprb_func_process& pro)
--{
--  using namespace boxm_line_backproject_process_globals;
--
--  // check number of inputs
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The number of inputs should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs
--  unsigned i = 0;
--
--  // image
--  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--
--  // make sure that image has 3 planes
--  if (edge_image_sptr->nplanes() != 3) {
--    std::cerr << "boxm_line_backproject_process: The edge image is expected to have 3 planes!\n";
--    return false;
--  }
--
--  vil_image_view<float> *plane_image;
--  if (edge_image_sptr->pixel_format() == VIL_PIXEL_FORMAT_FLOAT) {
--    vil_image_view<float> edge_image(edge_image_sptr);
--    unsigned ni=edge_image.ni();
--    unsigned nj=edge_image.nj();
--
--    // the output image
--    plane_image = new vil_image_view<float>(ni,nj,4);
--    float col, row, theta;
--
--    if (camera->type_name() == "vpgl_proj_camera") {
--      auto* cam = dynamic_cast<vpgl_proj_camera<double>*>(camera.ptr());
--
--      for (unsigned i=0; i<ni; i++) {
--        for (unsigned j=0; j<nj; j++) {
--          col =edge_image(i,j,0); // sub-pixel column
--          row =edge_image(i,j,1); // sub_pixel row
--          theta=edge_image(i,j,2); // orientation in radians
--
--          if (col<0 || row<0) // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
--            (*plane_image)(i,j) = 0.0f;
--          else {
--            // get two points on the line
--            vgl_point_2d<double> p1(col,row);
--
--            float x = col + 0.5f*std::cos(theta);
--            float y = row + 0.5f*std::sin(theta);
--            vgl_point_2d<double> p2(x,y);
--
--            vgl_line_2d<double> line(p1,p2);
--
--            //create a line and backproject it
--            vgl_homg_line_2d<double> image_line(line);
--            vgl_homg_plane_3d<double> plane = cam->backproject(image_line);
--            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
--            std::cout << "ZERO a,b,c,d" << std::endl;
--            (*plane_image)(i,j,0)=float(plane.a());
--            (*plane_image)(i,j,1)=float(plane.b());
--            (*plane_image)(i,j,2)=float(plane.c());
--            (*plane_image)(i,j,3)=float(plane.d());
--          }
--        }
--      }
--    }
--    else if (camera->type_name() == "vpgl_local_rational_camera") {
--      auto* cam = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
--      for (unsigned i=0; i<ni; i++) {
--        for (unsigned j=0; j<nj; j++) {
--          col =edge_image(i,j,0); // sub-pixel column
--          row =edge_image(i,j,1); // sub_pixel row
--          theta=edge_image(i,j,2); // orientation in radians
--
--          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
--            (*plane_image)(i,j,0) = 0.0f;
--            (*plane_image)(i,j,1) = 0.0f;
--            (*plane_image)(i,j,2) = 0.0f;
--            (*plane_image)(i,j,3) = 0.0f;
--          }
--          else {
--            // get two point on the line
--            vgl_point_2d<double> p1(col, row);
--
--            float x = col + 0.5f*std::cos(theta);
--            float y = row + 0.5f*std::sin(theta);
--            vgl_point_2d<double> p2(x,y);
--
--            //backproject it
--            vgl_plane_3d<double> plane;
--            if (vpgl_ray::plane_ray(*cam, p1, p2, plane)) {
--              (*plane_image)(i,j,0)=float(plane.a());
--              (*plane_image)(i,j,1)=float(plane.b());
--              (*plane_image)(i,j,2)=float(plane.c());
--              (*plane_image)(i,j,3)=float(plane.d());
--            }
--            else { // the backprojection was unsuccessful
--              std::cout << i << ',' << j << "NO PLANE!!!!!" << std::endl;
--              (*plane_image)(i,j,0) = 0.0f;
--              (*plane_image)(i,j,1) = 0.0f;
--              (*plane_image)(i,j,2) = 0.0f;
--              (*plane_image)(i,j,3) = 0.0f;
--            }
--          }
--        }
--      }
--    }
--    else if (camera->type_name() == "vpgl_perspective_camera") {
--      auto* cam = dynamic_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--      auto* proj_cam = static_cast<vpgl_proj_camera<double>*>(cam);
--      for (unsigned i=0; i<ni; i++) {
--        for (unsigned j=0; j<nj; j++) {
--          col =edge_image(i,j,0); // sub-pixel column
--          row =edge_image(i,j,1); // sub_pixel row
--          theta=edge_image(i,j,2); // orientation in radians
--
--          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
--            (*plane_image)(i,j,0) = 0.0f;
--            (*plane_image)(i,j,1) = 0.0f;
--            (*plane_image)(i,j,2) = 0.0f;
--            (*plane_image)(i,j,3) = 0.0f;
--          }
--          else {
--            // get two point on the line
--            vgl_point_2d<double> p1(col, row);
--
--            float x = col + 0.5f*std::cos(theta);
--            float y = row + 0.5f*std::sin(theta);
--            vgl_point_2d<double> p2(x,y);
--
--            vgl_line_2d<double> line(p1,p2);
--
--            //create a line and backproject it
--            vgl_homg_line_2d<double> image_line(line);
--
--            vgl_homg_plane_3d<double> plane = proj_cam->backproject(image_line);
--            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
--            std::cout << "ZERO a,b,c,d" << std::endl;
--            (*plane_image)(i,j,0)=float(plane.a());
--            (*plane_image)(i,j,1)=float(plane.b());
--            (*plane_image)(i,j,2)=float(plane.c());
--            (*plane_image)(i,j,3)=float(plane.d());
--          }
--        }
--      }
--    }
--    else {
--      std::cerr << "boxm_line_backproject_process: The camera type [" << camera->type_name() << "]is not defined yet!\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_line_backproject_process: This pixel format is not supported yet!\n";
--    return false;
--  }
--  // output
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<vil_image_view_base_sptr>(j++, plane_image);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
-deleted file mode 100644
-index 3cdbcbe8e4..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--//:
--// \file
--// \brief A process to perform linear combination of blocks in situ i.e block1 = s1*block1+ s2*block2
--// \author Isabel Restrepo
--// \date 2-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_linear_operations.h>
--
--//:global variables
--namespace boxm_linear_combination_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool boxm_linear_combination_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_linear_combination_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr" ; //scene1
--  input_types_[i++] = "boxm_scene_base_sptr" ; //scene2
--  input_types_[i++] = "float" ; //s1
--  input_types_[i++] = "float" ; //s2
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_linear_combination_process(bprb_func_process& pro)
--{
--  using namespace boxm_linear_combination_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base1 = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr scene_base2 = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto s1 = pro.get_input<float>(i++);
--  auto s2 = pro.get_input<float>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!(scene_base1 && scene_base2))
--  {
--    std::cerr << "In boxm_linear_combination_process: Null input scene\n";
--    return false;
--  }
--
--  switch (scene_base1->appearence_model())
--  {
--    case BOXM_FLOAT:
--    {
--      if (scene_base2->appearence_model()!= BOXM_FLOAT)
--      {
--        std::cerr << "In boxm_linear_combination_process, datatype not supported\n";
--        return false;
--      }
--      auto *scene1 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base1.as_pointer());
--      auto *scene2 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base2.as_pointer());
--
--      scene1->load_block(block_i,block_j,block_k);
--      scene2->load_block(block_i,block_j,block_k);
--
--      boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(block_i,block_j,block_k);
--      boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(block_i,block_j,block_k);
--
--      //The result is block1 = s1*block1+ s2*block2
--      boxm_linear_combination(block1, block2, s1, s2);
--
--      //make sure to write the block back to disk
--      scene1->write_active_block();
--
--      //clean memory
--      scene1->unload_active_blocks();
--      scene2->unload_active_blocks();
--
--      break;
--    }
--    default:
--      std::cerr << "In boxm_linear_combination_process: Invalid datatype\n";
--      return false;
--      break;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
-deleted file mode 100644
-index 700f8bba5c..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
-+++ /dev/null
-@@ -1,90 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief process that merges all gaussian mixtures in a  boxm_scene into unimodal gaussians
--//
--// \author Isabel Restrepo
--// \date December 8, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/algo/boxm_merge_mog.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace boxm_merge_mixtures_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 1 input and 1 output.
--// input[0]: The sample scene
--// output[0]: The appearance scene
--
--bool boxm_merge_mixtures_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_merge_mixtures_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_merge_mixtures_process(bprb_func_process& pro)
--{
--  using namespace boxm_merge_mixtures_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--  typedef boct_tree<short, apm_datatype> mog_tree_type;
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef boct_tree<short, gauss_type> gauss_tree_type;
--
--  auto *mog_scene = dynamic_cast<boxm_scene<mog_tree_type>* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!mog_scene) {
--    std::cout <<  " :-- Grid is not of valid type!\n";
--    return false;
--  }
--
--  //parameters of the output scene are the same as those of the input scene
--  boxm_scene<gauss_tree_type> *gauss_scene = new boxm_scene<gauss_tree_type>(mog_scene->lvcs(), mog_scene->origin(), mog_scene->block_dim(), mog_scene->world_dim());
--  gauss_scene->set_paths(mog_scene->path(), "bsta_gauss_sf1");
--  gauss_scene->set_appearance_model(BSTA_GAUSS_F1);
--
--  boxm_merge_mog merger;
--  merger.kl_merge_scene( *mog_scene, *gauss_scene);
--  gauss_scene->write_scene("gaussf1_scene.xml");
--  pro.set_output_val<boxm_scene_base_sptr>(0, gauss_scene);
--  std::cout<<"Exiting" << std::endl;
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
-deleted file mode 100644
-index 6b3f53a79c..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
-+++ /dev/null
-@@ -1,119 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to refine the block (octrees) of the scene
--//        If there are some cells with big values they are spit into
--//        new child cells; the data of the cell is copied to the
--//        children's data. The purpose of this process is to elaborate
--//        the octree at the areas where more details exist.
--//
--// \author Gamze Tunali
--// \date April 24, 2009
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--namespace boxm_refine_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_refine_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_refine_scene_process_globals;
--
--  //process takes 3 inputs
--  //input[0]: The scene
--  //input[1]: The threshold for splitting
--  //input[2]: bool for resetting the appearence model
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float";
--  input_types_[2] = "bool";
--
--  //process has 1 output
--  //output[0]: The number of leaf cells in the refined scene
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "int";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_refine_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_refine_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_refine_scene_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto thresh = pro.get_input<float>(i++);
--  bool reset = pro.get_input<bool>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_refine_scene_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  unsigned int ncells = 0;
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (scene->multi_bin()) {
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, thresh, reset);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, thresh, reset);
--    }
--  }
--  else {
--    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  // set output
--  pro.set_output_val<int>(0,ncells);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
-deleted file mode 100644
-index 67086ac142..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
-+++ /dev/null
-@@ -1,87 +0,0 @@
--//:
--// \file
--// \brief A process to remove level 0 of the octrees
--// \author Isabel Restrepo
--// \date Nov 23 2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_scene_levels_utils.h>
--
--//:global variables
--namespace boxm_remove_level0_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_remove_level0_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_remove_level0_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr"; //scene_in
--  input_types_[1] = "vcl_string"; //block_prefix for scene out
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr"; //scene_out
--
--  return pro.set_input_types(input_types_)
--      && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool boxm_remove_level0_process(bprb_func_process& pro)
--{
--  using namespace boxm_remove_level0_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string block_pref = pro.get_input<std::string>(1);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
--  {
--    //clone the input scene
--    boxm_scene<boct_tree<short, float> > *scene_out = new boxm_scene<boct_tree<short, float> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
--                                                                                               scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
--                                                                                               scene_in->load_all_blocks(), scene_in->save_internal_nodes());
--
--    scene_out->set_paths(scene_in->path(), block_pref);
--    scene_out->set_appearance_model(scene_in->appearence_model());
--    std::cout << "Cloning\n";
--    scene_in->clone_blocks(*scene_out);
--
--    std::cout << "Restructuring\n";
--    boxm_remove_level_0_leaves(scene_out);
--    std::cout << "Done\n";
--
--    //write the scene after the number of levels has been adjusted
--    scene_out->set_octree_levels(scene_in->max_level() - 1, scene_in->init_level());
--    scene_out->write_scene(block_pref + ".xml");
--
--    pro.set_output_val<boxm_scene_base_sptr>(0, scene_out);
--    return true;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
-deleted file mode 100644
-index c14dfbda09..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
-+++ /dev/null
-@@ -1,149 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <bvrml/bvrml_write.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_intersection.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--namespace boxm_render_expected_edge_vrml_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_render_expected_edge_vrml_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_vrml_process_globals;
--
--  // process takes 4 inputs and no output
--  //input[0]: scene binary file
--  //input[1]: the path for vrml file
--  //input[2]: threshold
--  //input[3]: s (to write every s cell)
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "float";
--  input_types_[3] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_edge_vrml_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_vrml_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< '\n';
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  //vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  std::string path = pro.get_input<std::string>(i++);
--  auto threshold = pro.get_input<float>(i++);
--  int s = pro.get_input<int>(i++); // FIXME - unused!
--
--  std::ofstream stream(path.c_str());
--
--  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE)
--  {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cout << "boxm_render_expected_edge_process: the scene is not of expected type" << std::endl;
--        return false;
--      }
--      bvrml_write::write_vrml_header(stream);
--#if 0
--      vgl_point_3d<double> origin(0.0,0.0,0.0);
--      vgl_vector_3d<double> dirx(1,0,0);
--      vgl_vector_3d<double> diry(0,1,0);
--      vgl_vector_3d<double> dirz(0,0,1);
--      bvrml_write::write_vrml_line(stream,origin,dirx,3,1,0,0);
--      bvrml_write::write_vrml_line(stream,origin,diry,3,0,1,0);
--      bvrml_write::write_vrml_line(stream,origin,dirz,3,0,0,1);
--#endif
--      // for each block
--      boxm_block_iterator<type> iter(scene);
--      iter.begin();
--      while (!iter.end())
--      {
--        scene->load_block(iter.index());
--        boxm_block<type>* block = *iter;
--        type* tree = block->get_tree();
--        std::vector<boct_tree_cell<short,boxm_inf_line_sample<float> >*> cells = tree->leaf_cells();
--
--        // iterate over cells
--        for (auto cell : cells)
--        {
--          boxm_inf_line_sample<float> data = cell->data();
--          vgl_infinite_line_3d<float> line = data.line_;
--          vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
--          // TODO: revise with segment length
--          if (!(line.x0().x()==0 && line.x0().y()==0)) {
--            //if (data.num_obs_ > threshold)
--            {
--              vgl_point_3d<double> p0,p1;
--              vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
--              // convert to line type (from float to double)
--              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
--
--              vgl_infinite_line_3d<double> dline(x0,dir);
--              if (vgl_intersection<double>(bb, dline, p0, p1)) {
--                vgl_vector_3d<double> dir(p1-p0);
--                double length=dir.length();
--                dir/=length;
--                std::cout<<data.residual_<<' ';
--                if (data.residual_<threshold)
--                {
--                  bvrml_write::write_vrml_line(stream, p0,dir,float(length),1.f,0.f,0.f);
--                  //bvrml_write::write_vrml_disk(stream,p0,dir,data.residual_,0.f,1.0f,0.f);
--                }
--              }
--            }
--          }
--        }
--        iter++;
--      }
--    }
--    else
--    {
--      std::cerr << "Ray tracing version not yet implemented\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_render_expected_edge_vrml_process: undefined APM type\n";
--    return false;
--  }
--
--  // no output
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
-deleted file mode 100644
-index 1ca0a383ac..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
-+++ /dev/null
-@@ -1,95 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to replace the appearance model for the whole scene by a constant appearance model
--// \author Vishal Jain
--// \date July 28, 2009
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/util/boxm_utils.h>
--
--void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean);
--
--namespace boxm_replace_const_app_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_replace_const_app_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_replace_const_app_process_globals;
--
--  //process takes 2 inputs and no output
--  //input[0]: The scene
--  //input[1]: mean value for appearance
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_replace_const_app_process(bprb_func_process& pro)
--{
--  using namespace boxm_replace_const_app_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_replace_const_app_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto meanval = pro.get_input<float>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_replace_const_app_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--    boxm_replace_constant_app(*s,meanval );
--  }
--  else {
--    std::cout << "boxm_replace_const_app_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
--
--void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean)
--{
--  boxm_block_iterator<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype app=boxm_utils::obtain_mog_grey_single_mode(mean);
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >* block = *iter;
--    boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >* tree = block->get_tree();
--
--    std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> leaf_cells=tree->leaf_cells();
--    for (auto & leaf_cell : leaf_cells)
--    {
--      boxm_sample<BOXM_APM_MOG_GREY> new_data(leaf_cell->data().alpha,app);
--      leaf_cell->set_data(new_data);
--    }
--    scene.write_active_block();
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
-deleted file mode 100644
-index ce50f795ba..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
-+++ /dev/null
-@@ -1,195 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for clipping and image based on a 3D bounding box.
--//        -  Input:
--//             - Image path (string)
--//             - boxm_voxel_world_sptr
--//
--//        -  Output:
--//             - modified rational camera "vpgl_camera_double_sptr"
--//             - clipped image area (NITF) "vil_image_view_base_sptr"
--//
--//        -  Params:
--//             -geographic uncertainty (error) in meters
--//
--// \author  Copied from boxm/pro
--// \date    May 5, 2008
--// \verbatim
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--
--#include <vsol/vsol_box_2d_sptr.h>
--#include <vsol/vsol_box_2d.h>
--
--#include <brip/brip_roi.h>
--
--#include <vil/vil_load.h>
--#include <vil/vil_crop.h>
--#include <vil/file_formats/vil_nitf2_image.h>
--#include <vil/vil_image_view_base.h>
--#include <vpgl/vpgl_camera.h>
--
--#include <bprb/bprb_parameters.h>
--
--//: globals variables and functions
--namespace boxm_roi_init_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 3;
--
--  //functions
--  bool roi_init(const std::string& img_path,
--                const vpgl_camera_double_sptr& camera,
--                vgl_box_3d<double> box,
--                vil_image_view<unsigned char> & roi_img);
--
--  //: projects the box on the image by taking the union of all the projected corners
--  vgl_box_2d<double>* project_box(const vpgl_camera_double_sptr& cam,
--                                  vgl_box_3d<double> box);
--}
--
--//: set input and output types
--bool boxm_roi_init_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_process_globals;
--
--  //this process takes 3 input:
--  //the filename of the image, the camera and the voxel world
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned  i=0;
--  input_types_[i++] = "vcl_string";                // image path
--  input_types_[i++] = "vpgl_camera_double_sptr";   //  camera
--  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
--
--  //output
--  unsigned j = 0;
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
--  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
--  output_types_[j++] = "float"; // uncertainty
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--bool boxm_roi_init_process(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_process_globals;
--  //static const parameters
--  static const std::string error = "error";
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs:
--  unsigned i = 0;
--  // image
--  std::string image_path = pro.get_input<std::string>(i++);
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  //voxel_world
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  vil_image_view_base_sptr img_ptr=vil_load(image_path.c_str());
--  auto *temp=new vil_image_view<unsigned char>();
--  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
--  {
--    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
--    {
--        vgl_box_2d<double>* roi_box = project_box(camera, scene->get_world_bbox());
--        brip_roi broi(img->ni(), img->nj());
--        vsol_box_2d_sptr bb = new vsol_box_2d();
--        bb->add_point(roi_box->min_x(), roi_box->min_y());
--        bb->add_point(roi_box->max_x(), roi_box->max_y());
--        bb = broi.clip_to_image_bounds(bb);
--        if (bb->width() <= 0 || bb->height() <= 0) {
--            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
--            return false;
--        }
--        temp->set_size(int(bb->width()),int(bb->height()));
--        temp->deep_copy(vil_crop(*img,(unsigned int)bb->get_min_x(),
--                            (unsigned int)bb->width(),
--                            (unsigned int)bb->get_min_y(),
--                            (unsigned int)bb->height()));
--    }
--  }
--  if (temp->ni() == 0 || temp->nj() == 0)
--    return false;
--
--  //Store outputs
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<vpgl_camera_double_sptr >(j++, camera);
--  // store image output
--  pro.set_output_val<vil_image_view_base_sptr>(j++, temp);
--  // store uncertainty
--  pro.set_output_val<float>(j++, 0);
--
--  return true;
--}
--
--//: roi_init function
--bool boxm_roi_init_process_globals::roi_init(const std::string&  img_path,
--                                             const vpgl_camera_double_sptr& camera,
--                                             vgl_box_3d<double> box,
--                                             vil_image_view<unsigned char> & roi_img)
--{
--  vil_image_view_base_sptr img_ptr=vil_load(img_path.c_str());
--  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
--  {
--    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
--    {
--        vgl_box_2d<double>* roi_box = project_box(camera, box);
--        brip_roi broi(img->ni(), img->nj());
--        vsol_box_2d_sptr bb = new vsol_box_2d();
--        bb->add_point(roi_box->min_x(), roi_box->min_y());
--        bb->add_point(roi_box->max_x(), roi_box->max_y());
--        bb = broi.clip_to_image_bounds(bb);
--        if (bb->width() <= 0 || bb->height() <= 0) {
--            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
--            return false;
--        }
--
--         vil_image_view<unsigned char> temp=vil_crop(*img,
--                                                     (unsigned int)bb->get_min_x(),
--                                                     (unsigned int)bb->width(),
--                                                     (unsigned int)bb->get_min_y(),
--                                                     (unsigned int)bb->height());
--        roi_img=temp;
--        return true;
--    }
--    else
--      return false;
--  }
--  else // non-supported pixel format
--    return false;
--}
--
--//: project_box function
--vgl_box_2d<double>* boxm_roi_init_process_globals::project_box( const vpgl_camera_double_sptr& cam,
--                                                                vgl_box_3d<double> box)
--{
--  // create a box with uncertainty
--  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
--
--  auto* roi = new vgl_box_2d<double>();
--
--  for (auto & box_corner : box_corners) {
--      double u,v;
--      cam->project(box_corner.x(),box_corner.y(),box_corner.z(),u,v);
--      vgl_point_2d<double> p2d(u,v);
--      std::cout<<u<<' '<<v<<'\n';
--      roi->add(p2d);
--  }
--  return roi;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
-deleted file mode 100644
-index fbfe3b9704..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
-+++ /dev/null
-@@ -1,310 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for clipping and image based on a 3D bounding box.
--// *  Input:
--//   - Image path (string)
--//   - boxm_voxel_world_sptr
--//
--// *  Output:
--//   - modified rational camera "vpgl_camera_double_sptr"
--//   - clipped image area (NITF) "vil_image_view_base_sptr"
--//
--// *  Params:
--//   - geographic uncertainty (error) in meters
--//
--// \author  Copied from boxm/pro
--// \date    May 5, 2008
--
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--
--#include <vsol/vsol_box_2d_sptr.h>
--#include <vsol/vsol_box_2d.h>
--
--#include <brip/brip_roi.h>
--
--#include <vil/vil_load.h>
--#include <vil/file_formats/vil_nitf2_image.h>
--#include <vil/vil_image_view_base.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--#include <vpgl/vpgl_lvcs.h>
--
--#include <bprb/bprb_parameters.h>
--
--//: globals variables and functions
--namespace boxm_roi_init_rational_camera_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 3;
--
--  // functions
--  bool roi_init(std::string const& image_path,
--                vpgl_rational_camera<double>* camera,
--                vgl_box_3d<double> box,
--                const vpgl_lvcs& lvcs,
--                float uncertainty,
--                vil_image_view<unsigned char>* nitf_image_unsigned_char,
--                vpgl_local_rational_camera<double>& local_camera);
--
--  //: projects the box on the image by taking the union of all the projected corners
--  vgl_box_2d<double>* project_box(vpgl_rational_camera<double>* cam,
--                                  vpgl_lvcs lvcs,
--                                  vgl_box_3d<double> box,
--                                  float r);
--}
--
--//:set input and output types
--bool boxm_roi_init_rational_camera_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_rational_camera_process_globals;
--
--  //this process takes 3 input:
--  //the filename of the image, the camera and the voxel world
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned  i=0;
--  input_types_[i++] = "vcl_string";                // NITF image path
--  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
--  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
--
--  //output
--  unsigned j = 0;
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
--  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
--  output_types_[j++] = "float"; // uncertainty
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--bool boxm_roi_init_rational_camera_process(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_rational_camera_process_globals;
--  //static const parameters
--  static const std::string error = "error";
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--  // uncertainty (meters) -- SHOULD BE A PARAM
--  float uncertainty=10.0;
--  if ( !pro.parameters()->get_value(error, uncertainty) ) {
--    std::cout << pro.name() << ": error in retrieving parameters\n";
--    return false;
--  }
--
--  // get the inputs:
--  unsigned i = 0;
--  // image
--  std::string image_path = pro.get_input<std::string>(i++);
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  //voxel_world
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  auto* img_ptr = new vil_image_view<unsigned char>();
--  auto* rat_camera =
--  dynamic_cast<vpgl_rational_camera<double>*> (camera.as_pointer());
--
--  if (!rat_camera) {
--    std::cerr << "The camera input is not a rational camera\n";
--    return false;
--  }
--
--  vpgl_local_rational_camera<double> local_camera;
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY ||
--      scene->appearence_model() == BOXM_EDGE_FLOAT ||
--      scene->appearence_model() == BOXM_EDGE_LINE) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--
--    if (!roi_init(image_path, rat_camera, s->get_world_bbox(),(s->lvcs()), uncertainty, img_ptr, local_camera)) {
--      std::cerr << "The process has failed!\n";
--      return false;
--    }
--
--    if (img_ptr->ni() == 0 || img_ptr->nj() == 0)
--      return false;
--
--    //Store outputs
--    unsigned j = 0;
--    // update the camera and store
--    pro.set_output_val<vpgl_camera_double_sptr >(j++, new vpgl_local_rational_camera<double> (local_camera));
--    // store image output
--    pro.set_output_val<vil_image_view_base_sptr>(j++, img_ptr);
--    // store uncertainty
--    pro.set_output_val<float>(j++, uncertainty);
--  }
--  else {
--    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
--
--//: roi_init function
--bool boxm_roi_init_rational_camera_process_globals::roi_init(std::string const& image_path,
--                                                             vpgl_rational_camera<double>* camera,
--                                                             vgl_box_3d<double> box,
--                                                             const vpgl_lvcs& lvcs,
--                                                             float uncertainty,
--                                                             vil_image_view<unsigned char>* nitf_image_unsigned_char,
--                                                             vpgl_local_rational_camera<double>& local_camera)
--{
--  // read the image and extract the camera
--  vil_image_resource_sptr img = vil_load_image_resource(image_path.c_str());
--  std::string format = img->file_format();
--  std::string prefix = format.substr(0,4);
--  if (prefix.compare("nitf") != 0) {
--    std::cerr << "boxm_roi_init_rational_camera_process::execute - The image should be an NITF\n";
--    return false;
--  }
--
--  auto* nitf =  static_cast<vil_nitf2_image*> (img.ptr());
--
--  vgl_box_2d<double>* roi_box = project_box(camera, lvcs, box, uncertainty);
--
--  brip_roi broi(nitf->ni(), nitf->nj());
--  vsol_box_2d_sptr bb = new vsol_box_2d();
--  bb->add_point(roi_box->min_x(), roi_box->min_y());
--  bb->add_point(roi_box->max_x(), roi_box->max_y());
--  bb = broi.clip_to_image_bounds(bb);
--
--  if (bb->width() <= 0 || bb->height() <= 0) {
--    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
--    return false;
--  }
--
--  vil_image_view_base_sptr roi = nitf->get_copy_view((unsigned int)bb->get_min_x(),
--                                                     (unsigned int)bb->width(),
--                                                     (unsigned int)bb->get_min_y(),
--                                                     (unsigned int)bb->height());
--  if (!roi) {
--    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
--    return false;
--  }
--
--  if (!roi.as_pointer())
--    return false;
--
--  if (roi->pixel_format() == VIL_PIXEL_FORMAT_UINT_16)
--  {
--    vil_image_view<vxl_uint_16> nitf_image_vxl_uint_16(roi);
--
--    *nitf_image_unsigned_char = vil_image_view<unsigned char> (roi->ni(),roi->nj(),roi->nplanes());
--
--    int bigendian = 0;
--    { union { unsigned int i; char c[4]; } u; u.i = 1; bigendian = u.c[0] == 0; }
--    for (unsigned m=0; m<nitf_image_unsigned_char->ni(); ++m)
--    {
--      for (unsigned n=0; n<nitf_image_unsigned_char->nj(); ++n)
--      {
--        for (unsigned p=0; p<nitf_image_unsigned_char->nplanes(); ++p)
--        {
--          // we will ignore the most significant 5 bits and less significant 3 bits
--          vxl_uint_16 curr_pixel_val = nitf_image_vxl_uint_16(m,n,p);
--
--          if (bigendian) {
--            auto* arr = (unsigned char*) &curr_pixel_val;
--            // [defgh3][5abc]
--            // --> [abcdefgh]
--            unsigned char big = *arr;
--            unsigned char small = *(++arr);
--            big >>= 3;
--            small <<= 5;
--            curr_pixel_val = big || small;
--          }
--          else { // little endian
--            // [5abc][defgh3]
--            // --> [abcdefgh]
--            curr_pixel_val <<= 5;
--            // [defgh3][5abc]
--            // --> [abcdefgh]
--            curr_pixel_val >>= 8;
--          }
--
--          auto pixel_val = static_cast<unsigned char> (curr_pixel_val);
--
--#if 0
--          //This is how Thom uses to get the region
--          int temp_pix_val = int(int(curr_pixel_val)*255.0/1500.0);
--          if (temp_pix_val > 255)
--            temp_pix_val =255;
--          unsigned char pixel_val = static_cast<unsigned char>(temp_pix_val);
--          //end hack
--#endif
--
--          (*nitf_image_unsigned_char)(m,n,p) = pixel_val;
--        }
--      }
--    }
--  }
--  else if (roi->pixel_format() == VIL_PIXEL_FORMAT_BYTE) {
--    *nitf_image_unsigned_char = vil_image_view<unsigned char>(roi);
--  }
--  else
--    std::cout << "boxm_roi_init_rational_camera_process - Unsupported Pixel Format = " << roi->pixel_format() << std::endl;
--
--  double u, v;
--  camera->image_offset(u, v);
--  double tu =  u - roi_box->min_x();
--  double tv =  v - roi_box->min_y();
--  camera->set_image_offset(tu, tv);
--  local_camera = vpgl_local_rational_camera<double> (lvcs, *camera);
--  delete roi_box;
--
--  return true;
--}
--
--//:project_box function
--vgl_box_2d<double>*boxm_roi_init_rational_camera_process_globals::project_box( vpgl_rational_camera<double>* cam,
--                                                                               vpgl_lvcs lvcs,
--                                                                               vgl_box_3d<double> box,
--                                                                               float r)
--{
--  double xoff, yoff, zoff;
--  xoff = cam->offset(vpgl_rational_camera<double>::X_INDX);
--  yoff = cam->offset(vpgl_rational_camera<double>::Y_INDX);
--  zoff = cam->offset(vpgl_rational_camera<double>::Z_INDX);
--
--  // global to local
--  double lx, ly, lz;
--  lvcs.global_to_local(xoff, yoff, zoff, vpgl_lvcs::wgs84, lx, ly, lz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  double center[3];
--  center[0] = lx;
--  center[1] = ly;
--  center[2] = lz;
--
--  // create a box with uncertainty
--  vgl_box_3d<double> cam_box(center, 2*r, 2*r, 2*r, vgl_box_3d<double>::centre);
--  std::vector<vgl_point_3d<double> > cam_corners = boxm_utils::corners_of_box_3d(cam_box);
--  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
--  auto* roi = new vgl_box_2d<double>();
--
--  double lon, lat, gz;
--  for (auto cam_corner : cam_corners) {
--    lvcs.local_to_global(cam_corner.x(), cam_corner.y(), cam_corner.z(),
--                         vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--    vpgl_rational_camera<double>* new_cam = cam->clone();
--    new_cam->set_offset(vpgl_rational_camera<double>::X_INDX, lon);
--    new_cam->set_offset(vpgl_rational_camera<double>::Y_INDX, lat);
--    new_cam->set_offset(vpgl_rational_camera<double>::Z_INDX, gz);
--
--    // project the box
--    for (auto & box_corner : box_corners) {
--      // convert the box corners to world coordinates
--      lvcs.local_to_global(box_corner.x(), box_corner.y(), box_corner.z(),
--                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--      vgl_point_2d<double> p2d = new_cam->project(vgl_point_3d<double>(lon, lat, gz));
--      roi->add(p2d);
--    }
--  }
--  return roi;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
-deleted file mode 100644
-index 8c8b260f04..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
-+++ /dev/null
-@@ -1,229 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
--#include <iostream>
--#include <fstream>
--#include <sstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for writing the occupancy probability of scenes to drishti raw files
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   Sep 11, 2009   Gamze Tunali
--//                  Added scene writing option, input number is increased to 4 and if 4th
--//                  input is 0, blocks saved as raw files separately, if 1, then blocks
--//                  combined to generate 1 raw file for the whole scene
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boxm/algo/boxm_save_scene_raw.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--namespace boxm_save_occupancy_raw_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_save_occupancy_raw_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_save_occupancy_raw_process_globals;
--
--  // process takes 4 inputs but has no outputs
--  //input[0]: scene binary file
--  //input[1]: output file (raw) path
--  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
--  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_save_occupancy_raw_process(bprb_func_process& pro)
--{
--  using namespace boxm_save_occupancy_raw_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string filepath = pro.get_input<std::string>(i++);
--  auto resolution =  pro.get_input<unsigned>(i++);
--  auto whole = pro.get_input<unsigned>(i++);
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
--      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if (!whole) {
--        boxm_block_iterator<type> it(scene);
--        it.begin();
--        while (!it.end()) {
--          std::stringstream strm;
--          vgl_point_3d<int> index = it.index();
--          strm << index.x() << '_' << index.y() << '_' << index.z();
--          std::string str(strm.str());
--          std::string s = filepath + str + ".raw";
--          boxm_save_block_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
--          it++;
--        }
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
--      }
--    }
--    else
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if (!whole) {
--        boxm_block_iterator<type> it(scene);
--        it.begin();
--        while (!it.end()) {
--          std::stringstream strm;
--          vgl_point_3d<int> index = it.index();
--          strm << index.x() << '_' << index.y() << '_' << index.z();
--          std::string str(strm.str());
--          std::string s = filepath + str + ".raw";
--          boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
--          it++;
--        }
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    if (!whole) {
--      boxm_block_iterator<type> it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_ptr.as_pointer())) {
--    if (!whole) {
--      boxm_block_iterator<boct_tree<short, float> > it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,float >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,float >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if (scene_ptr->appearence_model() == BSTA_MOG_F1){
--    if (!whole) {
--      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>* > (scene_ptr.as_pointer());
--      boxm_block_iterator<tree_type> it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      //boxm_save_scene_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_ptr.as_pointer())) {
--    if (!whole) {
--      boxm_block_iterator<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    if (!whole) {
--      boxm_block_iterator<type> it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
--    typedef boct_tree<short, boxm_edge_sample<float> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    boxm_save_scene_raw<short,boxm_edge_sample<float> >(*scene, filepath + ".raw", resolution);
--  }
--  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
--    typedef boct_tree<short, boxm_scalar_sample<float> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    boxm_save_scene_raw<short,boxm_scalar_sample<float> >(*scene, filepath + ".raw", resolution);
--  }
--  else {
--    std::cout << "boxm_save_occupancy_raw_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
-deleted file mode 100644
-index 5f4d68c008..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
-+++ /dev/null
-@@ -1,140 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
--#include <iostream>
--#include <fstream>
--#include <sstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for writing general scenes to drishti raw files. Values in voxels are saved as they are
--//
--// \author Isabel Restrepo
--// \date Feb 17, 2011
--// \verbatim
--//  Modifications
--//  <None>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_save_scene_raw_general.h>
--#include <boxm/boxm_apm_traits.h>
--
--namespace boxm_save_scene_raw_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_save_scene_raw_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_save_scene_raw_process_globals;
--
--  // process takes 4 inputs but has no outputs
--  //input[0]: scene binary file
--  //input[1]: output file (raw) path
--  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
--  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_save_scene_raw_process(bprb_func_process& pro)
--{
--  using namespace boxm_save_scene_raw_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string filepath = pro.get_input<std::string>(i++);
--  auto resolution =  pro.get_input<unsigned>(i++);
--  auto whole = pro.get_input<unsigned>(i++);
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_FLOAT)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
--      return false;
--    }
--    else
--    {
--      typedef boct_tree<short, float > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if(!scene)
--        return false;
--      if (!whole) {
--        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
--        return false;
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw_general_to_byte<short,float>(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  // check the scene's app model
--  else if (scene_ptr->appearence_model() == BOXM_CHAR)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
--      return false;
--    }
--    else
--    {
--      typedef boct_tree<short, char > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if(!scene)
--        return false;
--      if (!whole) {
--        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
--        return false;
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw_general<short,char>(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  // check the scene's app model
--  else if (scene_ptr->appearence_model() == BOXM_BOOL)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
--      return false;
--    }
--    else
--    {
--      typedef boct_tree<short, bool > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if(!scene)
--        return false;
--      if (!whole) {
--        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
--        return false;
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw_general<short>(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  else {
--    std::cout << "boxm_save_scene_raw_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
-deleted file mode 100644
-index d5b044d0db..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
--//:
--// \file
--// \brief process that splits a boxm_scene of boxm samples into an appearance and occupancy scene
--//
--// \author Isabel Restrepo
--// \date December 3, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <boxm/algo/boxm_split_sample.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace boxm_split_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--//: process takes 1 input and two outputs.
--// input[0]: The sample scene
--// output[0]: The appearance scene
--// output[1]: The alpha scene
--
--bool boxm_split_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_split_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--  output_types_[1] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_split_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_split_scene_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  //: Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > sample_tree_type;
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--  typedef boct_tree<short, apm_datatype> apm_tree_type;
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype alpha_type;
--  typedef boct_tree<short, alpha_type> alpha_tree_type;
--
--  auto *scene_in = static_cast<boxm_scene<sample_tree_type>* > (scene_base.as_pointer());
--
--  // parameters of the output scene are the same as those of the input scene
--  boxm_scene<apm_tree_type> *apm_scene = new boxm_scene<apm_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
--                                                                       scene_in->max_level(), scene_in->init_level());
--  apm_scene->set_paths(scene_in->path(), "apm_mog_grey");
--  apm_scene->set_appearance_model(BSTA_MOG_F1);
--  boxm_scene<alpha_tree_type > *alpha_scene = new boxm_scene<alpha_tree_type >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
--                                                                               scene_in->max_level(), scene_in->init_level());
--  alpha_scene->set_paths(scene_in->path(), "alpha");
--  alpha_scene->set_appearance_model(BOXM_FLOAT);
--  boxm_split_sample<BOXM_APM_MOG_GREY> splitter;
--
--  splitter.split_scene( *scene_in, *apm_scene, *alpha_scene);
--
--  apm_scene->write_scene("apm_scene.xml");
--  alpha_scene->write_scene("/alpha_scene.xml");
--
--  pro.set_output_val<boxm_scene_base_sptr>(0, apm_scene);
--  pro.set_output_val<boxm_scene_base_sptr>(1, alpha_scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index 2c499a1c2f..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_algo_pro_test_include test_include.cxx )
--target_link_libraries( boxm_algo_pro_test_include boxm_algo_pro)
-diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
-deleted file mode 100644
-index 8ee327ed5f..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/pro/boxm_algo_processes.h>
--#include <boxm/algo/pro/boxm_algo_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
-deleted file mode 100644
-index 6140bcbb4a..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
-+++ /dev/null
-@@ -1,46 +0,0 @@
--# brl/bseg/boxm/algo/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_algo_rt_sources
--    boxm_change_probability_functor.h
--    boxm_edge_tangent_updater.h             boxm_edge_tangent_updater.hxx
--    boxm_edge_updater.h                     boxm_edge_updater.hxx
--    boxm_generate_edge_sample_functor.h
--    boxm_generate_edge_tangent_sample_functor.h
--    boxm_generate_opt2_sample_functor.h
--    boxm_generate_opt3_sample_functor.h
--    boxm_generate_opt_sample_functor.h
--    boxm_opt2_optimizer.h                   boxm_opt2_optimizer.hxx
--    boxm_opt3_optimizer.h                   boxm_opt3_optimizer.hxx
--    boxm_opt_appearance_estimator.h
--    boxm_opt_rt_bayesian_optimizer.h        boxm_opt_rt_bayesian_optimizer.hxx
--    boxm_pre_infinity_functor.h
--    boxm_render_expected_depth_functor.h
--    boxm_render_expected_edge_image_functor.h
--    boxm_render_expected_edge_tangent_image_functor.h
--    boxm_render_expected_image_functor.h
--    boxm_render_expected_shadow_image_functor.h
--    boxm_rpc_registration.h
--    boxm_sun_vis_prob_functor.h
--    boxm_update_image_functor.h
--    boxm_compute_num_rays_statistics.h
--    boxm_expected_edge_functor.h
--    boxm_shadow_appearance_estimator.h
--    boxm_generate_shadow_sample_functor.h
--    boxm_shadow_app_initializer.h            boxm_shadow_app_initializer.hxx
--    boxm_shadow_bayes_optimizer.h            boxm_shadow_bayes_optimizer.hxx
--    dummy.cxx
--   )
--
--aux_source_directory(Templates boxm_algo_rt_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_algo_rt LIBRARY_SOURCES ${boxm_algo_rt_sources})
--
--#processes
--add_subdirectory(pro)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_algo_rt boxm boxm_sample boxm_sample_algo boxm_basic boxm_util ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vgl_algo bsta ${VXL_LIB_PREFIX}vnl sdet brip ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo )
--
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
-deleted file mode 100644
-index ef11ac6b96..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
--
--BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(short,float,float);
--BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(short,float,float);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
-deleted file mode 100644
-index 8d4e1a9f37..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/algo/rt/boxm_edge_updater.hxx>
--
--BOXM_EDGE_UPDATER_INSTANTIATE(short,float,float);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
-deleted file mode 100644
-index ca43ee5ebf..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT2_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
-deleted file mode 100644
-index fc93c9b10a..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT2_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index a9b24b175b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index 318336e55b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY, BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 89f46b6393..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 0c8a2da7d1..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 1cc6084872..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
--#include <boxm/boxm_apm_traits.h>
--BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 8a9638f4b1..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
-deleted file mode 100644
-index 71036d42a6..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <bpgl/bpgl_camera_estimator.hxx>
--#include <boxm/algo/rt/boxm_expected_edge_functor.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boxm_inf_line_sample<float> sample;
--typedef boxm_expected_edge_functor<short,sample > functor;
--BPGL_CAMERA_ESTIMATOR_INSTANTIATE(functor);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
-deleted file mode 100644
-index 5700690341..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_change_3d_functor_h
--#define boxm_change_3d_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM>
--class boxm_change_3d_functor
--{
-- public:
--  //: "default" constructor
--  boxm_change_3d_functor(vil_image_view<float> const& change_image, float prob_ratio)
--    : change_image_(change_image),
--      vis_img_(change_image.ni(),change_image.nj(), 1),
--      alpha_integral_(change_image.ni(),change_image.nj(), 1),
--      prob_ratio_(prob_ratio)
--  {
--    vis_img_.fill(1.0f);
--    alpha_integral_.fill(0.0f);
--
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM>& cell_value, boxm_scalar_sample<float>& scalar)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--
--    // update segment length sum
--    scalar.seg_len_ += seg_len;
--
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--
--    float back_prob = change_image_(i,j);
--    float fore_prob = 1.0f/(1.0f + prob_ratio_*back_prob);
--
--    // set change prob in auxiliary voxel
--    scalar.scalar_sum_ += Omega * fore_prob * seg_len;
--
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> change_image_;
--  vil_image_view<float> alpha_integral_;
--  vil_image_view<float> vis_img_;
--  float prob_ratio_;
--};
--
--template <class T_loc, class T_data>
--void boxm_change_3d(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                    vpgl_camera_double_sptr cam,
--                    vil_image_view<float> &change_image,
--                    std::string chng_name,
--                    float prob_ratio)
--{
--  typedef boxm_scalar_sample<float> sample_datatype;
--  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,chng_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--
--  std::cout<<"Chng visibility"<<std::endl;
--  // functor to compute 3-d change prob
--  typedef boxm_change_3d_functor<T_data::apm_type> change_functor;
--
--  // set up the raytrace function
--  boxm_raytrace_function<change_functor,T_loc, T_data, sample_datatype> raytracer_chng(scene,aux_scene,cam.ptr(),change_image.ni(),change_image.nj());
--
--  // construct the change probability functor
--  change_functor chng_func(change_image, prob_ratio);
--
--  // run the functor over the octree
--  raytracer_chng.run(chng_func);
--
--  std::cout<<"Change 3-d Done."<<std::endl;
--}
--
--#endif // boxm_change_3d_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
-deleted file mode 100644
-index a5d584f2c0..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#ifndef boxm_change_probability_functor_h
--#define boxm_change_probability_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <vil/vil_image_view.h>
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_change_probability_functor
--{
-- public:
--  //: "default" constructor
--  boxm_change_probability_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const & image, vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob,
--                                  vil_image_view<float> &mask_vis,
--                                  unsigned int ni,unsigned nj,
--                                  bool scene_read_only=false,bool is_aux=true)
--    : image_(image), change_prob_(change_prob),  vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
--  {
--    alpha_integral_.fill(0.0f);
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    change_prob_.fill(nil);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float prob_den  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), image_(i,j));
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    change_prob_(i,j) +=  prob_den* Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image_;
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_change_prob_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                         vil_image_view<typename T_data::obs_datatype> const& image,
--                         vpgl_camera_double_sptr cam,
--                         vil_image_view<typename T_data::obs_datatype> &change_prob,
--                         vil_image_view<float> & mask,
--                         int /*bin*/ = -1,
--                         bool /*use_black_background*/ = false)
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
--  typedef boxm_change_probability_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > chng_functor;
--  boxm_raytrace_function<chng_functor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),change_prob.ni(),change_prob.nj());
--  chng_functor functor(image, change_prob,mask,change_prob.ni(),change_prob.nj(),true,false);
--  raytracer.run(functor);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h b/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
-deleted file mode 100644
-index 144d5bd7bf..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--#ifndef boxm_compute_num_rays_statistics_h
--#define boxm_compute_num_rays_statistics_h
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_histogram.h>
--#include <boxm/basic/boxm_num_rays_functor.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--template <class T_loc, class T_data>
--bool compute_ray_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene,
--                            vpgl_camera_double_sptr cam,
--                            bsta_histogram<float>& num_rays_hist,
--                            unsigned ni, unsigned nj)
--{
--  typedef boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> >::CLONE);
--
--  typedef boxm_num_rays_functor<T_data::apm_type,boxm_scalar_sample<sample_datatype> > functor_type;
--  boxm_raytrace_function<functor_type,T_loc, T_data,boxm_scalar_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),ni,nj);
--  functor_type num_rays_functor;
--  raytracer.run(num_rays_functor);
--
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  typedef boct_tree<T_loc, boxm_scalar_sample<sample_datatype> > aux_tree_type;
--  typedef boct_tree_cell<T_loc,boxm_scalar_sample<sample_datatype> > aux_cell_type;
--
--  num_rays_hist = bsta_histogram<float>(0.0f, 80.0f, 40);
--  boxm_block_iterator<tree_type> bit = scene.iterator();
--  float avg_rays=0;
--  float num_cells=0;
--  for (; !bit.end(); ++bit)
--  {
--    vgl_point_3d<int> block_index = bit.index();
--    //aux_scene.load_block(block_index);
--    boxm_block<aux_tree_type> * block = aux_scene.get_block(block_index);
--    aux_tree_type* tree=block->get_tree();
--    if (!tree) return false;
--    std::vector<aux_cell_type *> leaves = tree->leaf_cells();
--    for (typename std::vector<aux_cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
--    {
--      boxm_scalar_sample<sample_datatype>  data = (*cit)->data();
--      num_rays_hist.upcount(static_cast<float>(data.scalar_sum_), 1.0f);
--      avg_rays+=data.scalar_sum_;
--      num_cells++;
--    }
--  }
--
--  //aux_scene.clean_scene();
--  std::cout<<"Avg num of rays per cell "<<avg_rays/num_cells<<std::endl
--          << "[#rays]=Frequency" << '\n';
--
--  for (unsigned int i=0; i<num_rays_hist.nbins(); i++)
--  {
--      std::cout<< '[' << num_rays_hist.avg_bin_value(i) << "]=" << num_rays_hist.counts(i) << '\n';
--  }
--
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
-deleted file mode 100644
-index 510fb1158d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--#ifndef boxm_edge_tangent_updater_h_
--#define boxm_edge_tangent_updater_h_
--//:
--// \file
--// \brief class to find the optimal intersecting 3D lines for each voxel in the scene
--//
--// \author G. Tunali
--//
--// \verbatim
--//  Modifications
--//    Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
--// \endverbatim
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <vil/vil_image_view.h>
--
--template<class T_loc, class APM, class AUX>
--class boxm_edge_tangent_updater
--{
-- public:
--
--  boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
--                            std::vector<std::string>  image_ids, bool use_ransac=true, float ransac_ortho_thres = 0.01f, float ransac_volume_ratio = 128.0f, int ransac_consensus_cnt = 3);
--
--  ~boxm_edge_tangent_updater()= default;
--
--  bool add_cells();
--
-- protected:
--  std::vector<std::string> image_ids_;
--  bool use_ransac_;
--
--  float ransac_ortho_thres_;
--  float ransac_volume_ratio_;
--  int ransac_consensus_cnt_;  // number of images that need to contribute planes to a hypothesis for a cell to be assigned a 3D edge
--                              // there should be at least ransac_consensus_cnt_+1 training images for some consensus to be met at any voxel, otherwise edge world will be empty
--
--  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
--};
--
--template<class T_loc, class APM, class AUX>
--class boxm_edge_tangent_refine_updates
--{
-- public:
--
--  boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene, int consensus_cnt,
--                                   std::vector<vil_image_view<float> >  edge_images,
--                                   std::vector<vpgl_camera_double_sptr>  cameras);
--
--  ~boxm_edge_tangent_refine_updates() = default;
--
--  bool refine_cells();
--
-- protected:
--  std::vector<vil_image_view<float> > edge_images_; // edge_img(ix, iy, 0) = static_cast<float>(x); subpixel location of edge
--                                                   // edge_img(ix, iy, 1) = static_cast<float>(y);
--                                                   // edge_img(ix, iy, 2) = static_cast<float>(dir); tangent direction of the edgel
--  std::vector<vpgl_camera_double_sptr> cameras_;
--
--  int consensus_cnt_;  // how many images need to be in agreement for an edgel to survive
--  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
-deleted file mode 100644
-index 5c3d68f321..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
-+++ /dev/null
-@@ -1,291 +0,0 @@
--#ifndef boxm_edge_tangent_updater_hxx_
--#define boxm_edge_tangent_updater_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_edge_tangent_updater.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/util/boxm_plane_ransac.h>
--#include <vpgl/vpgl_camera.h>
--
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <bsta/bsta_histogram.h>
--
--template <class T_loc, class APM, class AUX>
--boxm_edge_tangent_updater<T_loc,APM,AUX>::boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc,
--                                                                    boxm_inf_line_sample<APM> > > &scene,
--                                                                    std::vector<std::string>  image_ids,
--                                                                    bool use_ransac,
--                                                                    float ransac_ortho_thres,
--                                                                    float ransac_volume_ratio,
--                                                                    int ransac_concensus_cnt)
--: image_ids_(std::move(image_ids)), use_ransac_(use_ransac), ransac_ortho_thres_(ransac_ortho_thres), ransac_volume_ratio_(ransac_volume_ratio), ransac_consensus_cnt_(ransac_concensus_cnt), scene_(scene)
--{}
--
--
--template <class T_loc, class APM, class AUX>
--bool boxm_edge_tangent_updater<T_loc,APM,AUX>::add_cells()
--{
--  // get auxiliary scenes associated with each input image
--
--  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> > > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> >
--    aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>,
--              boxm_edge_tangent_sample<AUX> >::LOAD, BOXM_EDGE_TANGENT_LINE);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_edge_tangent_sample<APM> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
--    int nums=0;
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, boxm_edge_tangent_sample<AUX> > *> aux_readers(aux_scenes.size());
--    std::vector<unsigned> aux_samples_num(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--      aux_samples_num[i] = 0;
--    }
--    //int a;
--    //std::cin>>a;
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
--      // initialize the cell
--      boxm_inf_line_sample<AUX> data(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(0,0),vgl_vector_3d<AUX>(1,1,1)));
--      cell->set_data(data);
--
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, boxm_edge_tangent_sample<AUX> > temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().num_obs()>0)
--        {
--            aux_samples.push_back(temp_cell.data());
--            //aux_samples_num[j]++;
--        }
--      }
--
--      if (aux_samples.size() > 1)
--      {
--        std::vector<vgl_plane_3d<AUX> > planes;
--        std::vector<AUX> weights;
--
--        for (unsigned int k=0;k<aux_samples.size(); ++k) {
--          boxm_edge_tangent_sample<APM> s = aux_samples[k];
--          for (unsigned int j=0; j<s.num_obs(); j++) {
--            boxm_plane_obs<AUX> obs = s.obs(j);
--            weights.push_back(obs.seg_len_);
--            vgl_plane_3d<AUX> plane(obs.plane_);
--            planes.push_back(plane);
--          }
--        }
--        nums+=planes.size();
--        if (planes.size() > 1) {
--          if (use_ransac_) {
--            vgl_infinite_line_3d<AUX> line;
--            float residual=1e5;
--            vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
--
--            // ransac_consensus_cnt_ used to be hard-coded here to 5; made it into a parameter with a default value of 3
--            if (boxm_plane_ransac<AUX>(aux_samples, weights, line, residual,bb, ransac_consensus_cnt_, ransac_ortho_thres_, ransac_volume_ratio_)) {
--              boxm_inf_line_sample<AUX> data(line,aux_samples.size());
--              data.residual_=residual;
--
--              // now set the clipped line
--              // convert to type double
--              vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
--              vgl_point_3d<double> p0,p1;
--              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
--              vgl_infinite_line_3d<double> dline(x0,dir);
--              if (!vgl_intersection<double>(bb, dline, p0, p1))
--                data.residual_=0;
--              else {
--                // convert back to type AUX
--                vgl_point_3d<AUX> p0_t(AUX(p0.x()), AUX(p0.y()), AUX(p0.z()));
--                vgl_point_3d<AUX> p1_t(AUX(p1.x()), AUX(p1.y()), AUX(p1.z()));
--                vgl_line_3d_2_points<AUX> line_clipped(p0_t,p1_t);
--                data.line_clipped_ = line_clipped;
--              }
--
--              cell->set_data(data);
--            }
--            else
--            {
--              boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--              cell->set_data(sample);
--            }
--          }
--          else
--          {
--            boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--            cell->set_data(sample);
--          }
--        }
--        else
--        {
--          boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--          cell->set_data(sample);
--        }
--      }
--      else
--      {
--        boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--        cell->set_data(sample);
--      }
--    }
--    nums/=cells.size();
--
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--#if 0
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--#endif
--  return true;
--}
--
--template <class T_loc, class APM, class AUX>
--boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
--                                                                                  int consensus_cnt,
--                                                                                  std::vector<vil_image_view<float> >  edge_images,
--                                                                                  std::vector<vpgl_camera_double_sptr>  cameras)
--: edge_images_(std::move(edge_images)), cameras_(std::move(cameras)), consensus_cnt_(consensus_cnt), scene_(scene)
--{}
--
--template <class T_loc, class APM, class AUX>
--bool boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::refine_cells()
--{
--  std::cout << "using " << edge_images_.size() << " images to refine edge world!" << std::endl;
--
--  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
--
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
--      boxm_inf_line_sample<AUX> cell_value = cell->data();
--
--      // update residual of cell_value based on the visibility and support of this 3D line in all the images
--      if (cell_value.residual_<1.0)
--      {
--        // go through each image
--        int cnt = 0;
--        for (unsigned k = 0; k < edge_images_.size(); k++) {
--          int ni = edge_images_[k].ni();
--          int nj = edge_images_[k].nj();
--          // project this 3D line to the image
--          double u1,v1,u2,v2;
--          vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
--          vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
--          cameras_[k]->project(p1.x(),p1.y(),p1.z(),u1,v1);
--          cameras_[k]->project(p2.x(),p2.y(),p2.z(),u2,v2);
--
--          double line_angle = vnl_math::angle_0_to_2pi(std::atan2(v2-v1, -(u2-u1)));
--          double line_angle2 = vnl_math::angle_0_to_2pi(line_angle + vnl_math::pi); // line segment is symmetric
--
--          // find mid point of line seg
--          int cent_i = int(u1+(u2-u1)/2.0);
--          int cent_j = int(v1+(v2-v1)/2.0);
--
--          // check a neighborhood of 10x10 in the image to find the edgel that is nearest to this line segment
--          double angle_of_min = 0.0;
--          double dist = 10.0;
--          for (int ii = cent_i - 10; ii < cent_i + 10; ii++) {
--            if (ii < 0 || ii >= ni) continue;
--            for (int jj = cent_j - 10; jj < cent_j + 10; jj++) {
--              if (jj < 0 || jj >= nj) continue;
--              double ex = edge_images_[k](ii,jj,0);
--              double ey = edge_images_[k](ii,jj,1);
--              double dir = edge_images_[k](ii,jj,2);
--              double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, ex, ey);
--              if (dist_to_seg < dist) {
--                dist = dist_to_seg;
--                angle_of_min = dir;
--              }
--            }
--          }
--          if (dist < 10.0)
--            if (std::abs(angle_of_min - line_angle) < vnl_math::pi/16.0 || std::abs(angle_of_min - line_angle2) < vnl_math::pi/16.0)
--              cnt++;
--        }
--
--        if (cnt >= consensus_cnt_)
--          cell_value.residual_ = AUX(1.0)-AUX(cnt)/AUX(edge_images_.size());
--        else
--          cell_value.residual_ = AUX(1.0);
--        cell->set_data(cell_value);
--      }
--    }
--    scene_.write_active_block();
--    iter++;
--  }
--
--  return true;
--}
--
--
--#define BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(T1,T2,T3) \
--template class boxm_edge_tangent_updater<T1,T2,T3 >
--
--#define BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(T1,T2,T3) \
--template class boxm_edge_tangent_refine_updates<T1,T2,T3 >
--
--#endif // boxm_edge_tangent_updater_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
-deleted file mode 100644
-index 646f92a418..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
-+++ /dev/null
-@@ -1,34 +0,0 @@
--#ifndef boxm_edge_updater_h_
--#define boxm_edge_updater_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_edge_sample.h>
--
--template<class T_loc, class APM, class AUX>
--class boxm_edge_updater
--{
-- public:
--  boxm_edge_updater(boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene,
--                    std::vector<std::string>  image_ids);
--
--  ~boxm_edge_updater()= default;
--
--  bool add_cells();
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
-deleted file mode 100644
-index 029f503587..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
-+++ /dev/null
-@@ -1,110 +0,0 @@
--#ifndef boxm_edge_updater_hxx_
--#define boxm_edge_updater_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_edge_updater.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class APM, class AUX>
--boxm_edge_updater<T_loc,APM,AUX>::boxm_edge_updater(boxm_scene<boct_tree<T_loc,
--                                                    boxm_edge_sample<APM> > > &scene,
--                                                    std::vector<std::string>  image_ids)
--: image_ids_(std::move(image_ids)), scene_(scene)
--{}
--
--
--template <class T_loc, class APM, class AUX>
--bool boxm_edge_updater<T_loc,APM,AUX>::add_cells()
--{
--  // get auxiliary scenes associated with each input image
--  //typedef typename boxm_aux_traits<AUX>::sample_datatype AUX;
--
--  typedef boct_tree<T_loc, boxm_edge_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> >::LOAD);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_aux_edge_sample<APM> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_edge_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_edge_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, boxm_aux_edge_sample<AUX> > *> aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_edge_sample<APM> >* cell = cells[i];
--      boxm_edge_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, boxm_aux_edge_sample<AUX> > temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--
--      //std::vector<typename boxm_edge_sample<APM> > obs_vector(aux_samples.size());
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        data.edge_prob_ += aux_samples[s].obs_/aux_samples[s].seg_len_;
--      }
--      data.num_obs_ += 1;
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_EDGE_UPDATER_INSTANTIATE(T1,T2,T3) \
--template class boxm_edge_updater<T1,T2,T3 >
--
--#endif // boxm_edge_updater_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
-deleted file mode 100644
-index b0d443ca27..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
-+++ /dev/null
-@@ -1,53 +0,0 @@
--#ifndef boxm_expected_edge_functor_h_
--#define boxm_expected_edge_functor_h_
--//:
--// \file
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
--
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_transform.h>
--
--#include <brip/brip_vil_float_ops.h>
--
--//: Functor class to compute (1-x)
--// assumes that max range value is "1"
--// only sensible for real types
--class boxm_exp_edge_vil_not_functor
--{
-- public:
--  float operator()(float x)       const { return x<1.0f?(1.0f-x):0.0f; }
--  double operator()(double x)     const { return x<1.0?1.0-x:0.0; }
--};
--
--template <class T_loc, class T_data>
--class boxm_expected_edge_functor
--{
-- public:
--  boxm_expected_edge_functor(boxm_scene<boct_tree<T_loc, T_data > > &scene)
--    : scene_(scene) {}
--  ~boxm_expected_edge_functor() = default;
--
--  bool apply(const vpgl_camera_double_sptr& cam, vil_image_view<float> *img_eei)
--  {
--    boxm_render_edge_tangent_image_rt(scene_,cam,*img_eei);
--    // now take the inverse of this image, pixels which contain edges will have values closer to 1 and others will be zero
--    boxm_exp_edge_vil_not_functor nt;
--    vil_transform(*img_eei, nt);
--
--    // now blur this image
--    *img_eei = brip_vil_float_ops::gaussian(*img_eei, 1.0f);
--
--    return true;
--  }
--
-- private:
--  boxm_scene<boct_tree<T_loc, T_data > > scene_;
--};
--
--#undef BOXM_EXPECTED_EDGE_INSTANTIATE
--#define BOXM_EXPECTED_EDGE_INSTANTIATE(T1,T2) \
--template class boxm_expected_edge_functor<T1, T2 >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
-deleted file mode 100644
-index 756c0ca4a6..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--#ifndef boxm_generate_edge_sample_functor_h
--#define boxm_generate_edge_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T, class T_aux>
--class boxm_generate_edge_sample_functor
--{
-- public:
--  boxm_generate_edge_sample_functor(vil_image_view<float> &observation,
--                                    unsigned int /*ni*/=0,unsigned /*nj*/=0)
--    : obs_(observation)
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        T &cell_value, // FIXME: unused...
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--    aux_val.obs_ += obs_(i,j) * seg_len;
--    aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> &obs_;
--};
--
--template <class T_loc, class T_data>
--void boxm_generate_edge_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                  vpgl_camera_double_sptr cam,
--                                  vil_image_view<float> &obs,
--                                  std::string iname)
--{
--    typedef boxm_aux_edge_sample<float> aux_datatype;
--    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE);
--    typedef boxm_generate_edge_sample_functor<boxm_edge_sample<float>,aux_datatype> func;
--    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PROCESSING EDGE IMAGE\n";
--    func functor(obs,obs.ni(),obs.nj());
--    raytracer.run(functor);
--
--    //aux_scene.clean_scene();
--    std::cerr << "DONE.\n";
--}
--
--#endif // boxm_generate_edge_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
-deleted file mode 100644
-index 009e75228c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
-+++ /dev/null
-@@ -1,78 +0,0 @@
--#ifndef boxm_generate_edge_tangent_sample_functor_h
--#define boxm_generate_edge_tangent_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vgl/vgl_homg_plane_3d.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T, class T_aux>
--class boxm_generate_edge_tangent_sample_functor
--{
-- public:
--  boxm_generate_edge_tangent_sample_functor(vil_image_view<float> &observation,
--                                            unsigned int /*ni*/=0, unsigned /*nj*/=0)
--    : obs_(observation)
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--    // make sure that the image has 4 planes ((a,b,c,d) params of a plane ax+by+cz=d )
--    if (observation.nplanes() != 4)
--      std::cerr << "boxm_generate_edge_tangent_sample_functor: the image does not have 4 planes\n";
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        T &cell_value, // FIXME - unused
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--    float a = obs_(i,j,0);
--    float b = obs_(i,j,1);
--    float c = obs_(i,j,2);
--    float d = obs_(i,j,3);
--
--    if (a||b||c||d) {
--      vgl_homg_plane_3d<float> p(a,b,c,d);
--      boxm_plane_obs<float> observation(p,seg_len);
--      aux_val.insert(observation);
--    }
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> &obs_;
--};
--
--template <class T_loc, class T_data>
--void boxm_generate_edge_tangent_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                          vpgl_camera_double_sptr cam,
--                                          vil_image_view<float> &obs,
--                                          std::string iname)
--{
--    typedef boxm_edge_tangent_sample<float> aux_datatype;
--    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE, BOXM_EDGE_TANGENT_LINE);
--    typedef boxm_generate_edge_tangent_sample_functor<boxm_inf_line_sample<float>,aux_datatype> func;
--    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PROCESSING EDGE IMAGE\n";
--    func functor(obs,obs.ni(),obs.nj());
--    raytracer.run(functor);
--    //aux_scene.clean_scene();
--    std::cerr << "DONE.\n";
--}
--
--#endif // boxm_generate_edge_tangent_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
-deleted file mode 100644
-index 5cbaef86fc..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
-+++ /dev/null
-@@ -1,197 +0,0 @@
--#ifndef boxm_generate_opt2_sample_functor_h
--#define boxm_generate_opt2_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_opt2_sample_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_generate_opt2_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                           vil_image_view<float> const& beta_denom,
--                                           float model_prior,
--                                           vil_image_view<float> const& alt_prob_img)
--    : scene_read_only_(true) /*only reads info from the scene*/, is_aux_(true) /*needs to write aux*/,
--      model_prior_(model_prior), alt_prob_img_(alt_prob_img), obs_(image), beta_denom_(beta_denom),
--      vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    vis_img_.fill(1.0f);
--    pre_img_.fill(0.0f);
--    alpha_integral_.fill(0.0f);
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs = aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    // accumulate aux sample values
--    aux_val.pre_ += (pre * model_prior_ + alt_prob_img_(i,j)) * seg_len;
--    aux_val.vis_ += vis * model_prior_ * seg_len;
--
--    const float beta_num = pre + vis*PI;
--    const float beta_num_expanded = (beta_num  * model_prior_) + alt_prob_img_(i,j);
--    const float beta_denom = beta_denom_(i,j);
--    const float beta_denom_expanded = (beta_denom * model_prior_) + alt_prob_img_(i,j);
--
--    float beta = 1.0f;
--    if (beta_denom_expanded > 1e-5f) {
--      beta =  beta_num_expanded / beta_denom_expanded;
--    }
--    const float old_PQ = (float)(1.0 - std::exp(-cell_value.alpha*seg_len));
--    const float new_PQ = old_PQ * beta;
--    const float pass_prob_old = 1.0f - old_PQ;
--    float pass_prob = 1.0f - new_PQ;
--
--    // compute expected information gained from update
--    const float weight = new_PQ * std::log(new_PQ / old_PQ) + pass_prob * std::log(pass_prob / pass_prob_old);
--    // ensure log doesn't go to infinity
--    if (pass_prob < 1e-5f) {
--      pass_prob = 1e-5f;
--    }
--    aux_val.log_pass_prob_sum_ += std::log(pass_prob) * weight/seg_len;
--    aux_val.weighted_seg_len_sum_ += weight; // += seg_len * weight/seg_len;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  float model_prior_;
--  vil_image_view<float> const& alt_prob_img_;
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& beta_denom_;
--
--  //vil_image_view<float> const& pre_inf_;
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data, boxm_aux_type AUX_T>
--void boxm_generate_opt2_samples(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                vpgl_camera_double_sptr cam,
--                                vil_image_view<typename T_data::obs_datatype> &obs,
--                                std::string iname,
--                                std::vector<float> const& alt_appearance_priors,
--                                std::vector<typename T_data::apm_datatype> const& alt_appearance_models,
--                                bool black_background = false)
--{
--  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
--  //std::cout << "scene.save_platform_independent() = " << scene.save_platform_independent() << std::endl;
--  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 0"<<std::endl;
--  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--  raytracer_0.run(pass_0_functor);
--
--  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--  vil_image_view<float> inf_term(obs.ni(), obs.nj());
--
--  typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--  boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 1"<<std::endl;
--  pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--  raytracer_1.run(pass_1_functor);
--
--  // compute observation probability for "infinity" appearance model
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    // use single-mode gaussian centered at 0
--    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
--    typename T_data::obs_mathtype black(0);
--    const float black_std_dev = 8.0f/255;
--    const gauss_type appearance_dist(black, black_std_dev*black_std_dev);
--
--    //float peak=T_data::apm_processor::expected_color(background_apm);
--    //std::cout<<"Peak: "<<peak<<std::endl;
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--    for (; img_it != obs.end(); ++img_it, ++PI_it) {
--      *PI_it = appearance_dist.prob_density(*img_it);
--    }
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--  }
--  else {
--    // assume uniform prob. density on interval [0, 1]
--    //PI_inf.fill(1.0f);
--    // don't actually have to compute anything since multiplying by 1
--    inf_term = vis_inf;
--  }
--  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
--  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
--
--  // compute model prior
--  float model_prior = 1.0f;
--  for (float alt_appearance_prior : alt_appearance_priors) {
--    model_prior -= alt_appearance_prior;
--  }
--  // sanity check
--  if (model_prior <= 0.0f) {
--    std::cerr << "error: boxm_generate_opt2_samples : alt_appearance_priors sum to " << 1.0f - model_prior << " >= 1.0!\n";
--  }
--
--  // compute alternate appearance probability for each pixel in the image
--  vil_image_view<float> alt_prob_img(obs.ni(), obs.nj());
--  alt_prob_img.fill(0.0f);
--  const unsigned int n_alt = alt_appearance_priors.size();
--  if (n_alt > 0) {
--    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--    typename vil_image_view<float>::iterator alt_prob_it = alt_prob_img.begin();
--    for (; img_it != obs.end(); ++img_it, ++alt_prob_it) {
--      for (unsigned int a=0; a< n_alt; ++a) {
--        const float alt_prob_density = boxm_apm_traits<T_data::apm_type>::apm_processor::prob_density(alt_appearance_models[a],*img_it);
--        *alt_prob_it +=  alt_prob_density * alt_appearance_priors[a];
--      }
--    }
--  }
--
--  // run the raytrace function
--  std::cout<<"PASS 2"<<std::endl;
--  typedef boxm_generate_opt2_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
--  boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  pass_2 pass_2_functor(obs,beta_denom_img, model_prior, alt_prob_img);
--  raytracer_2.run(pass_2_functor);
--
--  //aux_scene.clean_scene();
--  std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_opt2_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
-deleted file mode 100644
-index 2447f5f483..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
-+++ /dev/null
-@@ -1,219 +0,0 @@
--#ifndef boxm_generate_opt3_sample_functor_h
--#define boxm_generate_opt3_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM>
--class pre_inf_functor
--{
--  typedef typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype aux_null_t;
-- public:
--  //: "default" constructor
--  pre_inf_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                  vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
--    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //no need to write aux
--    is_aux_=false;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value, aux_null_t & /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),obs_(i,j)); // aux_val.PI_;
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update pre
--    pre_img_(i,j) +=  PI * Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--  vil_image_view<float> alpha_integral_;
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> &pre_img_;
--};
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_opt3_sample_functor
--{
-- public:
--  //: "default" constructor
--  boxm_generate_opt3_sample_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                    vil_image_view<float> const& beta_denom)
--    : obs_(image), beta_denom_(beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux &aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), obs_(i,j));
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = (float)std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--
--    // update observation distribution
--    aux_val.update_obs_dist(obs_(i,j),vis);
--    aux_val.weighted_vis_sum_ += vis*seg_len;
--
--    const float old_PQ = 1.0f - (float)std::exp(-cell_value.alpha * seg_len);
--    float new_PQ = old_PQ;
--    const float beta_denom_val = beta_denom_(i,j);
--    const double epsilon = 1e-6;
--    if (beta_denom_val > epsilon) {
--      const float beta = (pre + vis*PI) / beta_denom_val;
--      new_PQ = old_PQ * beta;
--    }
--    double pass_prob = 1.0 - new_PQ;
--    if (pass_prob < epsilon) {
--      pass_prob = epsilon;
--    }
--    aux_val.log_pass_prob_sum_ += (float)std::log(pass_prob);
--    aux_val.seg_len_sum_ += seg_len;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& beta_denom_;
--
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data, boxm_aux_type AUX_T>
--void boxm_generate_opt3_sample(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                               vpgl_camera_double_sptr cam,
--                               vil_image_view<typename T_data::obs_datatype> &obs,
--                               std::string image_id,
--                               bool black_background = false)
--{
--  typedef boxm_opt3_sample<boxm_aux_traits<AUX_T>::APM_TYPE> aux_sample_datatype;
--  boxm_aux_scene<T_loc, T_data, aux_sample_datatype> aux_scene(&scene, image_id, boxm_aux_scene<T_loc, T_data, aux_sample_datatype>::CLONE);
--#if 0
--  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 0"<<std::endl;
--  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--  raytracer_0.run(pass_0_functor);
--#endif
--  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--  typedef pre_inf_functor<T_data::apm_type> pre_inf_functor_t;
--  boxm_raytrace_function<pre_inf_functor_t, T_loc, T_data> raytracer_1(scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 1"<<std::endl;
--  pre_inf_functor_t pass_1_functor(obs,pre_inf,vis_inf);
--  raytracer_1.run(pass_1_functor);
--
--  vil_image_view<float> inf_term(obs.ni(), obs.nj());
--  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
--
--  // compute observation probability for "infinity" appearance model
--  vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    // use single-mode gaussian centered at 0
--    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
--    typename T_data::obs_mathtype black(0);
--    const float black_std_dev = 8.0f/255;
--    const gauss_type appearance_dist(black, black_std_dev);
--#if 0
--    float peak=T_data::apm_processor::expected_color(background_apm);
--    std::cout<<"Peak: "<<peak<<std::endl;
--#endif
--    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--    for (; img_it != obs.end(); ++img_it, ++PI_it) {
--      *PI_it = appearance_dist.prob_density(*img_it);
--    }
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--  }
--  else {
--    // assume uniform prob. density on interval [0, 1]
--    //PI_inf.fill(1.0f);
--    // don't actually have to compute anything since multiplying by 1
--    inf_term = vis_inf;
--  }
--  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
--
--#ifdef DEBUG
--  vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
--  vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
--  vil_save(beta_denom_img, "E:/tests/capitol/beta_denom_img.tiff");
--  vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
--#endif
--
--  std::cout<<"PASS 2"<<std::endl;
--  typedef boxm_generate_opt3_sample_functor<T_data::apm_type, aux_sample_datatype> pass_2_functor_t;
--  boxm_raytrace_function<pass_2_functor_t, T_loc, T_data, aux_sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  pass_2_functor_t pass_2_functor(obs, beta_denom_img);
--  raytracer_2.run(pass_2_functor);
--#if 0
--  aux_scene.clean_scene();
--#endif
--  std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_opt3_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
-deleted file mode 100644
-index c23998293f..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
-+++ /dev/null
-@@ -1,164 +0,0 @@
--#ifndef boxm_generate_opt_sample_functor_h
--#define boxm_generate_opt_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_opt_sample_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_generate_opt_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                          vil_image_view<float> const& Beta_denom)
--  : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs= aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    // accumulate aux sample values
--    aux_val.pre_ += pre * seg_len;
--    aux_val.vis_ += vis * seg_len;
--
--    const float Beta_num = pre + vis*PI;
--    float Beta = 1.0f;
--    if (Beta_denom_(i,j) < 1e-6) {
--      if (Beta_num > 1e-5) {
--        Beta = 10.0f;
--      }
--    }
--    else {
--      Beta = Beta_num / Beta_denom_(i,j);
--    }
--    if (Beta < 0) {
--      if (Beta < -1e-5) {
--        std::cerr << " error: beta = " << Beta << "  setting to 0. " << '\n';
--      }
--      Beta = 0;
--    }
--    aux_val.Beta_ += Beta * seg_len;
--    //aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& Beta_denom_;
--
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data>
--void boxm_generate_opt_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                 vpgl_camera_double_sptr cam,
--                                 vil_image_view<typename T_data::obs_datatype> &obs,
--                                 std::string iname,
--                                 bool black_background = false)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 0"<<std::endl;
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--
--    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 1"<<std::endl;
--    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--    raytracer_1.run(pass_1_functor);
--
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--
--
--    if (black_background) {
--        std::cout << "using black background model" << std::endl;
--        typename T_data::obs_datatype black(0.0f);
--        float background_std_dev = 8.0f/255; // ???????????? 4/255 Vishal's
--        typename T_data::apm_datatype background_apm(black, background_std_dev*background_std_dev,1.0f);
--
--        float peak=T_data::apm_processor::expected_color(background_apm);
--        std::cout<<"Peak: "<<peak<<std::endl;
--        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--        for (; img_it != obs.end(); ++img_it, ++PI_it) {
--            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
--        }
--    }
--    else {
--        PI_inf.fill(1.0f);
--    }
--
--    vil_image_view<float> inf_term(obs.ni(), obs.nj());
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
--    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
--#ifdef DEBUG
--    vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
--    vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
--    vil_save(Beta_denom_img, "E:/tests/capitol/Beta_denom_img.tiff");
--    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
--#endif
--    std::cout<<"PASS 2"<<std::endl;
--    typedef boxm_generate_opt_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
--    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    pass_2 pass_2_functor(obs,Beta_denom_img);
--    raytracer_2.run(pass_2_functor);
--
--#if 0
--    aux_scene.clean_scene();
--#endif
--    std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_opt_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
-deleted file mode 100644
-index 551c049134..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
-+++ /dev/null
-@@ -1,212 +0,0 @@
--#ifndef boxm_generate_shadow_sample_functor_h
--#define boxm_generate_shadow_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_shadow_sample_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_generate_shadow_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                             vil_image_view<float> const& Beta_denom, float shadow_prior, vil_image_view<float> const& shadow_density)
--    : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1), shadow_prior_(shadow_prior), shadow_density_(shadow_density)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs= aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    float alpha_l = cell_value.alpha * seg_len; //change
--    alpha_integral_(i,j) += alpha_l;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    // accumulate aux sample values
--    aux_val.pre_ += pre * seg_len;
--    aux_val.vis_ += vis * seg_len;  //<<changed Feb 05, 2010
--    float Beta_num = pre + vis*PI;
--    Beta_num *=(1.0f - shadow_prior_);
--    Beta_num += shadow_density_(i,j);
--    float Beta = 1.0f;
--    if (Beta_denom_(i,j) < 1e-6) {
--      if (Beta_num > 1e-5) {
--        Beta = 10.0f;
--      }
--    }
--    else {
--      Beta = Beta_num / Beta_denom_(i,j);
--    }
--    if (Beta < 0) {
--      if (Beta < -1e-5) {
--        std::cerr << " error: beta = " << Beta << "  setting to 0.\n";
--      }
--      Beta = 0;
--    }
--#if 0
--    if (mean_obs == 0.0f){
--      std::cout << PI << ' ' << shadow_density_(i,j) << ' '
--               << pre << ' ' << vis << ' ' << Beta_denom_(i,j)
--               << ' ' << Beta << '\n';
--    }
--#endif
--    aux_val.Beta_ += Beta * seg_len;
--    //New discrete probability computations
--    float PQ_prior = 1.0f - std::exp(-alpha_l);
--    float PQ_post = Beta*PQ_prior;
--    if (PQ_post>=0.999f) PQ_post = 0.999f;
--    //         v------note minus sign
--    float lg = -std::log(1.0f-PQ_post);
--    aux_val.log_sum_ += lg;
--    //End of new discrete probability calculations
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--  float shadow_prior_;
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& Beta_denom_;
--
--  //vil_image_view<float> const& pre_inf_;
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--  vil_image_view<float> shadow_density_;
--};
--
--template <class T_loc, class T_data>
--void boxm_initial_shadow_sampler_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                    vpgl_camera_double_sptr cam,
--                                    vil_image_view<typename T_data::obs_datatype> &obs,
--                                    std::string iname)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"Collect Observations"<<std::endl;
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--    std::cout<<"Samples collected\n"<<std::endl;
--}
--
--template <class T_loc, class T_data>
--void boxm_generate_shadow_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                    vpgl_camera_double_sptr cam,
--                                    vil_image_view<typename T_data::obs_datatype> &obs,
--                                    std::string iname,
--                                    float shadow_prior,
--                                    float shadow_mean,
--                                    float shadow_sigma,
--                                    bool black_background = false)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 0"<<std::endl;
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--
--    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 1"<<std::endl;
--    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--    raytracer_1.run(pass_1_functor);
--
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--
--
--    if (black_background) {
--        std::cout << "using black background model" << std::endl;
--        typename T_data::obs_datatype black(0.0f);
--        float background_std_dev = 8.0f/255;//???????????? 4/255 Vishal's
--        typename T_data::apm_datatype background_apm(black, background_std_dev,1.0f);
--
--        float peak=T_data::apm_processor::expected_color(background_apm);
--        std::cout<<"Peak: "<<peak<<std::endl;
--        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--        for (; img_it != obs.end(); ++img_it, ++PI_it) {
--            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
--        }
--    }
--    else {
--        PI_inf.fill(1.0f);
--    }
--
--    vil_image_view<float> inf_term(obs.ni(), obs.nj());
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
--    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
--
--    boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
--    vil_image_view<float> shadow_density(obs.ni(), obs.nj());
--    for (unsigned j=0; j<obs.nj(); ++j)
--      for (unsigned i=0; i<obs.ni(); ++i)
--      {
--        float sh_density =
--          boxm_simple_grey_processor::prob_density(shadow_dist, obs(i,j));
--        sh_density *=2.0f;//if Gaussian centered at 0
--        shadow_density(i,j) = sh_density*shadow_prior;
--        Beta_denom_img(i,j) *= (1.0f-shadow_prior);
--        Beta_denom_img(i,j) += shadow_density(i,j);
--      }
--
--#if 0
--    vil_save(vis_inf, "E:/ShadowSite/vis_inf.tiff");
--    vil_save(pre_inf, "E:/ShadowSite/pre_inf.tiff");
--    vil_save(Beta_denom_img, "E:/ShadowSite/Beta_denom_img.tiff");
--    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
--#endif
--    std::cout<<"PASS 2"<<std::endl;
--    typedef boxm_generate_shadow_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
--    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    pass_2 pass_2_functor(obs,Beta_denom_img, shadow_prior, shadow_density);
--    raytracer_2.run(pass_2_functor);
--
--    //aux_scene.clean_scene();
--    std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_shadow_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
-deleted file mode 100644
-index 0b7a1f34f7..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#ifndef boxm_opt2_bayesian_optimizer_h_
--#define boxm_opt2_bayesian_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_opt2_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_opt2_optimizer
--{
-- public:
--  boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                      std::vector<std::string>  image_ids);
--
--  ~boxm_opt2_optimizer()= default;
--
--  bool update();
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
-deleted file mode 100644
-index ae00724692..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
-+++ /dev/null
-@@ -1,152 +0,0 @@
--#ifndef boxm_opt2_optimizer_hxx_
--#define boxm_opt2_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_opt2_optimizer.h"
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_opt2_optimizer<T_loc,APM,AUX>::boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                        std::vector<std::string>  image_ids)
--                                                        : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_opt2_optimizer<T_loc,APM,AUX>::update()
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_opt2_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--      std::vector<float> pre_vector;
--      std::vector<float> vis_vector;
--      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector;
--
--      // UPDATE METHOD #1 : "OR" of occlusion probabilities
--      double log_pass_prob_sum = 0.0;
--      double weighted_seg_len_sum = 0.0;
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        const float obs_seg_len = aux_samples[s].seg_len_;
--        const float obs_weighted_seg_len = aux_samples[s].weighted_seg_len_sum_;
--
--        if (obs_seg_len > 1e-6) {
--          if (obs_weighted_seg_len > 1e-6) {
--            log_pass_prob_sum += aux_samples[s].log_pass_prob_sum_;
--            weighted_seg_len_sum += obs_weighted_seg_len;
--          }
--          // add observation and vis,pre to list
--          obs_vector.push_back(aux_samples[s].obs_ / obs_seg_len);
--          pre_vector.push_back(aux_samples[s].pre_ / obs_seg_len);
--          vis_vector.push_back(aux_samples[s].vis_ / obs_seg_len);
--        }
--      }
--      // update the occlusion density
--      if (weighted_seg_len_sum > 1e-6) {
--        data.alpha = (float)(-log_pass_prob_sum / weighted_seg_len_sum);
--      }
--
--      // do bounds check on new alpha value
--      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--      const float cell_len = float(cell_bb.width());
--      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--      if (data.alpha > max_alpha) {
--        data.alpha = max_alpha;
--      }
--      if (data.alpha < min_alpha) {
--        data.alpha = min_alpha;
--      }
--      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
--        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n';
--        //std::cerr << " log_alpha_sum = " << log_alpha_sum << ", n_actual_samples = " << n_actual_samples << '\n';
--      }
--      // update with new appearance
--      const float min_sigma = 0.02f;
--      boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, pre_vector, vis_vector, data.appearance_, min_sigma);
--
--      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_OPT2_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--  template class boxm_opt2_optimizer<T1,T2,T3 >
--
--#endif // boxm_opt2_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
-deleted file mode 100644
-index d19ab2d9f4..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#ifndef boxm_opt3_optimizer_h_
--#define boxm_opt3_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
--class boxm_opt3_optimizer
--{
-- public:
--  boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                      std::vector<std::string>  image_ids);
--
--  ~boxm_opt3_optimizer()= default;
--
--  bool optimize_cells();
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
-deleted file mode 100644
-index da5f7ba0fb..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
-+++ /dev/null
-@@ -1,172 +0,0 @@
--#ifndef boxm_opt3_optimizer_hxx_
--#define boxm_opt3_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_opt3_optimizer.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--
--#include <vnl/vnl_random.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
--boxm_opt3_optimizer<T_loc,APM,AUX_APM>::boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                            std::vector<std::string>  image_ids)
--                                                            : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
--bool boxm_opt3_optimizer<T_loc,APM,AUX_APM>::optimize_cells()
--{
--  constexpr unsigned int n_samples_per_obs = 10;
--
--  // get auxiliary scenes associated with each input image
--  typedef boxm_opt3_sample<AUX_APM> aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  typedef typename boxm_apm_traits<APM>::obs_datatype obs_t;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<float> vis_vector;
--  std::vector<obs_t> obs_vector;
--  vnl_random rand_gen;
--  std::vector<boxm_opt3_sample<AUX_APM> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        aux_samples.push_back(temp_cell.data());
--      }
--
--      vis_vector.clear();
--      obs_vector.clear();
--
--      double log_alpha_sum = 0.0;
--      unsigned int n_actual_observations = 0;
--
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        double total_seg_len = aux_samples[s].seg_len_sum_;
--
--        if (total_seg_len > 1e-6) {
--          ++n_actual_observations;
--          // compute mean vis
--          float obs_vis = (float)(aux_samples[s].weighted_vis_sum_ / total_seg_len);
--          // draw samples from obs_dist
--
--          for (unsigned int n=0; n<n_samples_per_obs; ++n) {
--            obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::sample(aux_samples[s].obs_dist_, rand_gen);
--            //obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::expected_color(aux_samples[s].obs_dist_);
--            obs_vector.push_back(obs_sample);
--            vis_vector.push_back(obs_vis);
--          }
--          double alpha_s = -aux_samples[s].log_pass_prob_sum_ / total_seg_len;
--          log_alpha_sum += std::log(alpha_s);
--        }
--      }
--      float alpha_new = 0.0f;
--      if (n_actual_observations > 0) {
--        //std::cout << "cell IN " << data.alpha << ' ' << data.appearance_<< std::endl;
--        // compute new alpha value
--        alpha_new = (float)std::exp(log_alpha_sum / n_actual_observations);
--
--        // do bounds check on new alpha value
--        vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--        const float cell_len = float(cell_bb.width());
--        const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--        const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--        if (alpha_new > max_alpha) {
--          alpha_new = max_alpha;
--        }
--        if (alpha_new < min_alpha) {
--          alpha_new = min_alpha;
--        }
--        if (!((alpha_new >= min_alpha) && (alpha_new <= max_alpha)) ){
--          std::cerr << std::endl << "error: alpha_new = " << alpha_new << '\n'
--                   << "n_actual_observations = " << n_actual_observations << " log_alpha_sum = " << log_alpha_sum << '\n';
--          alpha_new = min_alpha;
--        }
--        else {
--          data.alpha = alpha_new;
--        }
--        // update with new appearance
--        //std::cout << obs_vector.size() << ' ' << std::endl;
--        if (obs_vector.size() != n_samples_per_obs * n_actual_observations) {
--          std::cerr << "error: n_samples_per_obs = " << n_samples_per_obs << " n_actual_observations = " << n_actual_observations << " obs_vector.size() " << obs_vector.size() << '\n';
--        }
--        boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, vis_vector, data.appearance_, 0.025f);
--        //std::cout << "cell OUT " << data.alpha << data.appearance_ << std::endl << std::endl;
--        cell->set_data(data);
--      }
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_OPT3_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--  template class boxm_opt3_optimizer<T1,T2,T3 >
--
--#endif // boxm_opt3_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
-deleted file mode 100644
-index c6f87c3817..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--#ifndef boxm_opt_appearance_estimator_h_
--#define boxm_opt_appearance_estimator_h_
--
--#include <vector>
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#if 0
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM>
--void boxm_opt_compute_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
--                                 std::vector<float> const& pre,
--                                 std::vector<float> const& vis,
--                                 typename boxm_apm_traits<APM>::apm_datatype &model)
--{
--  const float min_sigma=0.1f;
--  // initialize appearance model estimate using visibility probabilities as weights.
--  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,vis,model,min_sigma);
--#if 1
--  // use EM to refine estimate until convergence.
--  unsigned int nobs= obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  std::vector<float> obs_weights = vis;
--
--  const float epsilon = 1e-4f;
--  constexpr unsigned int max_its = 100;
--  const float min_weight_change = 1e-5f;
--  for (unsigned int i=0; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION
--    for (unsigned int n=0; n<nobs; ++n) {
--      // for each observation, assign probabilities to each of 3 possibilities
--      // P1: observation is generated by appearance model.
--      // P2: point is visible, but observation is generated by a point "behind" this one. (i.e. point is not on a surface)
--      // P3: point is not visible - observation is generated by a point "ahead" of this one.
--      const float P1 = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
--      const float P2 = 0.0f; //post_prob[n];
--      const float P3 = pre[n];
--      const float normalizing_factor = P1 + P2 + P3;
--      float new_obs_weight = 0;
--      if (normalizing_factor > epsilon) {
--        new_obs_weight = P1 / normalizing_factor;
--      }
--
--      // compute delta weight for convergence check
--      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
--      if (weight_delta > max_weight_change) {
--        max_weight_change = weight_delta;
--      }
--      obs_weights[n] = new_obs_weight;
--    }
--    // check for convergence
--    if (max_weight_change < min_weight_change) {
--#if 0
--    if (nobs > 1) {
--      std::cout << "EM converged in " << i << " iterations." << std::endl;
--      float total_prob = 0.0f;
--      for (unsigned int n=0; n<nobs; ++n) {
--        total_prob += obs_weights[n];
--      }
--      std::cout << "total prob for " << nobs << " observations = " << total_prob << std::endl
--               << "sigma = " << model.sigma() << ",  gauss_weight = " << model.gauss_weight() << std::endl;
--    }
--#endif
--      break;
--    }
--    // MAXIMIZATION
--    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_sigma);
--  }
--
--  // adjust model to account for small sample sizes.
--  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
--#endif
--  return;
--}
--
--#endif // boxm_opt_appearance_estimator_h_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
-deleted file mode 100644
-index 7275093568..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
-+++ /dev/null
-@@ -1,36 +0,0 @@
--#ifndef boxm_opt_rt_bayesian_optimizer_h_
--#define boxm_opt_rt_bayesian_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_opt_rt_bayesian_optimizer
--{
-- public:
--  boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                 std::vector<std::string>  image_ids);
--
--  ~boxm_opt_rt_bayesian_optimizer()= default;
--
--  bool optimize_cells(double damping_factor);
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
-deleted file mode 100644
-index 10f61e8572..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
-+++ /dev/null
-@@ -1,151 +0,0 @@
--#ifndef boxm_opt_rt_bayesian_optimizer_hxx_
--#define boxm_opt_rt_bayesian_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_opt_rt_bayesian_optimizer.h"
--#include "boxm_opt_appearance_estimator.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                                              std::vector<std::string>  image_ids)
--: image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--
--      //boxm_sample<APM> &cell_data = cell_it->data();
--      std::vector<float> pre_vector(aux_samples.size());
--      std::vector<float> vis_vector(aux_samples.size());
--      //std::vector<float> post_prob_vector(aux_samples.size());
--      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector(aux_samples.size());
--      double Beta = 1.0;
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        float seg_len = aux_samples[s].seg_len_;
--        if (seg_len > 1e-5) {
--          Beta *= (aux_samples[s].Beta_ / seg_len);
--          obs_vector[s] = aux_samples[s].obs_ / seg_len;
--          pre_vector[s] = aux_samples[s].pre_ / seg_len;
--          vis_vector[s] = aux_samples[s].vis_ / seg_len;
--          //post_prob_vector[s] = aux_samples[s].post_prob_ / seg_len;
--        }
--        else {
--          pre_vector[s] = 0.0f;
--          vis_vector[s] = 0.0f;
--          //post_prob_vector[s] = 0.0f;
--          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
--        }
--      }
--      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
--
--      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
--        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
--
--      data.alpha *= (float)damped_Beta;
--      // do bounds check on new alpha value
--      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--      const float cell_len = float(cell_bb.width());
--      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--      if (data.alpha > max_alpha) {
--        data.alpha = max_alpha;
--      }
--      if (data.alpha < min_alpha) {
--        data.alpha = min_alpha;
--      }
--      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
--        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n'
--                 << "damped_Beta = " << damped_Beta << '\n';
--      }
--      // update with new appearance
--      boxm_opt_compute_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_);
--      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--template class boxm_opt_rt_bayesian_optimizer<T1,T2,T3 >
--
--#endif // boxm_opt_rt_bayesian_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
-deleted file mode 100644
-index 0d50efd8a4..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
-+++ /dev/null
-@@ -1,67 +0,0 @@
--#ifndef boxm_pre_infinity_functor_h
--#define boxm_pre_infinity_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_pre_infinity_functor
--{
-- public:
--  //: "default" constructor
--  boxm_pre_infinity_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                            vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
--    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute average intensity for the cell
--    const float mean_obs_ =aux_val.obs_/aux_val.seg_len_;
--    // compute appearance probability of observation
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),mean_obs_); // aux_val.PI_;
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update pre
--    pre_img_(i,j) +=  PI * Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--  vil_image_view<float> alpha_integral_;
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> &pre_img_;
--};
--
--#endif // boxm_pre_infinity_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
-deleted file mode 100644
-index bfd4c3b08d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
-+++ /dev/null
-@@ -1,109 +0,0 @@
--#ifndef boxm_render_expected_depth_functor_h
--#define boxm_render_expected_depth_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--#include <vil/vil_transform.h>
--#include <vpgl/vpgl_camera.h>
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_depth_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_depth_functor(vil_image_view<float> &expected,
--                                     vil_image_view<float> &mask_vis,
--                                     vgl_point_3d<double> cam_center,
--                                     unsigned int ni,unsigned nj,
--                                     bool scene_read_only=false,
--                                     bool is_aux=true)
--  : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj,1), center_(cam_center)
--  {
--    alpha_integral_.fill(0.0f);
--    expected_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value, T_aux /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    const float depthexp = (float)(s1 - center_).length();
--#if 0
--    // compute appearance probability of observation
--    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
--#endif
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    expected_(i,j) += depthexp * Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> &expected_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--  vgl_point_3d<double> center_;
--};
--
--
--//: Functor class to normalize expected image
--class normalize_expected_functor_depth_rt
--{
-- public:
--  normalize_expected_functor_depth_rt(float depth_max):depth_max_(depth_max) {}
--
--  void operator()(float mask, float &pix) const
--  {
--    pix += mask*depth_max_;
--  }
--
-- private:
--  float depth_max_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_depth_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vpgl_camera_double_sptr cam,
--                          vil_image_view<float> &expected,
--                          vil_image_view<float> &mask,
--                          int bin = -1,                      // FIXME - unused
--                          bool use_black_background = false) // FIXME - unused
--{
--  if (vpgl_perspective_camera<double> *pcam=dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--  {
--    typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> >::LOAD);
--
--    typedef boxm_render_expected_depth_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
--    boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
--    expfunctor exp_functor(expected,mask,pcam->camera_center(),expected.ni(),expected.nj(),true,false);
--    raytracer.run(exp_functor);
--
--    float max_depth=(float)boxm_utils::max_point_to_box_dist(scene.get_world_bbox(),pcam->camera_center());
--
--    normalize_expected_functor_depth_rt norm_fn(max_depth);
--    vil_transform2<float,float, normalize_expected_functor_depth_rt >(mask,expected,norm_fn);
--  }
--}
--
--#endif // boxm_render_expected_depth_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
-deleted file mode 100644
-index c210b8d20f..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
-+++ /dev/null
-@@ -1,109 +0,0 @@
--#ifndef boxm_render_expected_edge_image_functor_h
--#define boxm_render_expected_edge_image_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <vnl/vnl_math.h>
--#include <vil/vil_transform.h>
--#include <sdet/sdet_img_edge.h>
--
--#ifdef DEBUG
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_edge_image_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_edge_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
--                                          vil_image_view<float> &mask_vis, // FIXME: unused...
--                                          unsigned int /*ni*/=0, unsigned /*nj*/=0,
--                                          bool scene_read_only=false,
--                                          bool is_aux=true)
--    : expected_(expected)
--  {
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    expected_.fill(nil);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> /*s0*/, // currently unused, see below
--                        vgl_point_3d<double> /*s1*/,
--                        boxm_edge_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    // compute segment length
--    //const float seg_len = (float)(s1-s0).length(); // FIXME: unused...
--
--    // TODO: revise with segment length
--    const float exp  = cell_value.edge_prob_;
--
--    // keep the max value in expected image
--    // if (expected_(i,j) < exp)
--    expected_(i,j) =  std::max(expected_(i,j), exp);
--
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
--};
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_expected_functor_edge
--{
-- public:
--  normalize_expected_functor_edge(float n_normal, unsigned int dof) : n_normal_(n_normal), dof_(dof)
--  {
--#ifdef DEBUG
--    std::cout << "Degrees of freedom: " << dof << std::endl;
--#endif
--  }
--
--  void operator()(float mask, float &pix) const
--  {
--    pix = sdet_img_edge::convert_edge_statistics_to_probability(pix,n_normal_,dof_);
--  }
--
--  float n_normal_;
--  unsigned int dof_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_edge_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                               vpgl_camera_double_sptr cam,
--                               vil_image_view<float> &expected,
--                               vil_image_view<float> & mask,
--                               float n_normal,
--                               unsigned int num_samples, //degrees of freedom
--                               int bin = -1) // FIXME - unused
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> >::LOAD);
--  typedef boxm_render_expected_edge_image_functor<BOXM_EDGE_FLOAT,sample_datatype > expfunctor;
--  boxm_raytrace_function<expfunctor,T_loc, T_data > raytracer(scene,cam.ptr(),expected.ni(),expected.nj());
--  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
--  raytracer.run(exp_functor);
--
--  normalize_expected_functor_edge<T_data> norm_fn(n_normal,num_samples-1);
--  vil_transform2<float,float, normalize_expected_functor_edge<T_data> >(mask,expected,norm_fn);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
-deleted file mode 100644
-index 17f8da724c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
-+++ /dev/null
-@@ -1,126 +0,0 @@
--#ifndef boxm_render_expected_edge_tangent_image_functor_h
--#define boxm_render_expected_edge_tangent_image_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <vnl/vnl_math.h>
--#include <vil/vil_image_view.h>
--#include <sdet/sdet_img_edge.h>
--#include <vgl/vgl_distance.h>
--#ifdef DEBUG
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_edge_tangent_image_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_edge_tangent_image_functor(vil_image_view<float > &expected,
--                                                  vpgl_camera_double_sptr cam,
--                                                  //float threshold,
--                                                  unsigned int /*ni*/=0, unsigned /*nj*/=0,
--                                                  bool scene_read_only=false,
--                                                  bool is_aux=true)
--  : expected_(expected), num_obs_(expected.ni(),expected.nj()), cam_(cam), residual(1.0)
--  {
--    expected_.fill(1.0);
--    num_obs_.fill(0);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> /*s0*/, // FIXME - unused
--                        vgl_point_3d<double> /*s1*/, // FIXME - unused
--                        boxm_inf_line_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    //std::cout<< cell_value.residual_<<' ';
--#if 0
--    if (cell_value.residual_<residual) {
--      if (expected_(i,j) > cell_value.residual_)
--        expected_(i,j) = cell_value.residual_;
--    }
--#endif
--    if (cell_value.residual_<residual) {
--      if (expected_(i,j) > cell_value.residual_) {
--        double u1,v1,u2,v2;
--        vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
--        vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
--        cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
--        cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
--        vgl_point_2d<double> img_p1(u1,v1);
--        vgl_point_2d<double> img_p2(u2,v2);
--        double dist = length(img_p1-img_p2);
--        if (dist > 1.0)  // for img lines shorter than a pixel don't bother
--        {
--          double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, i, j);
--          if (dist_to_seg <= 0.5) { // if the current pixel is less than 0.5 pixels closer to the projected line then mark it
--            expected_(i,j)=cell_value.residual_;
--          }
--        }
--      }
--    }
--#if 0
--    if (cell_value.num_obs_>2 && cell_value.residual_<residual && cell_value.num_obs_>num_obs_(i,j))
--    {
--      num_obs_(i,j)=cell_value.num_obs_;
--      double u1,v1,u2,v2;
--      vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
--      vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
--      cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
--      cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
--      if ((u1-u2)==0 && v1-v2==0)
--      {
--        expected_(i,j,0)=-1;
--        expected_(i,j,1)=-1;
--        expected_(i,j,2)=-1;
--      }
--      else
--      {
--        expected_(i,j,0)=float(u1+u2)/2;
--        expected_(i,j,1)=float(v1+v2)/2;
--        expected_(i,j,2)=float(vnl_math::angle_0_to_2pi(std::atan2(v2-v1,u2-u1)));
--      }
--    }
--#endif // 0
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float > &expected_;
--  vil_image_view<unsigned> num_obs_;
--  vpgl_camera_double_sptr cam_;
--  float residual;
--};
--
--template <class T_loc, class T_data>
--void boxm_render_edge_tangent_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                       vpgl_camera_double_sptr cam,
--                                       vil_image_view<float> &expected)
--                                     //  float n_normal, // FIXME - unused
--                                     //  unsigned int num_samples, // FIXME - unused
--                                     //  float threshold) // degrees of freedom
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> >::LOAD);
--  typedef boxm_render_expected_edge_tangent_image_functor<BOXM_EDGE_LINE,sample_datatype > expfunctor;
--  boxm_raytrace_function<expfunctor,T_loc, T_data> raytracer(scene, cam.ptr(),expected.ni(),expected.nj());
--  expfunctor exp_functor(expected,cam,/*threshold,*/expected.ni(),expected.nj(),true,false);
--  raytracer.run(exp_functor);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
-deleted file mode 100644
-index 51a2c930ce..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
-+++ /dev/null
-@@ -1,103 +0,0 @@
--#ifndef boxm_render_expected_image_functor_h
--#define boxm_render_expected_image_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <vil/vil_transform.h>
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_image_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
--                                     vil_image_view<float> &mask_vis,
--                                     unsigned int ni,unsigned nj,
--                                     bool scene_read_only=false,bool is_aux=true)
--    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
--  {
--    alpha_integral_.fill(0.0f);
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    expected_.fill(nil);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    expected_(i,j) +=  exp* Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_expected_functor_rt
--{
-- public:
--  normalize_expected_functor_rt(bool use_black_background) : use_black_background_(use_black_background) {}
--
--  void operator()(float mask, typename T_data::obs_datatype &pix) const
--  {
--    if (!use_black_background_) {
--      pix += mask*0.5f;
--    }
--  }
--  bool use_black_background_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vpgl_camera_double_sptr cam,
--                          vil_image_view<typename T_data::obs_datatype> &expected,
--                          vil_image_view<float> & mask,
--                          int /*bin*/ = -1,
--                          bool use_black_background = false)
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
--  typedef boxm_render_expected_image_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
--  boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
--  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
--  raytracer.run(exp_functor);
--
--  normalize_expected_functor_rt<T_data> norm_fn(use_black_background);
--  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_rt<T_data> >(mask,expected,norm_fn);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
-deleted file mode 100644
-index acbde275c3..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
-+++ /dev/null
-@@ -1,120 +0,0 @@
--#ifndef boxm_render_expected_shadow_image_functor_h
--#define boxm_render_expected_shadow_image_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_aux_scene.h>
--
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <vil/vil_transform.h>
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_render_expected_shadow_image_functor
--{
-- public:
--  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
--  //: "default" constructor
--  boxm_render_expected_shadow_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
--                                            vil_image_view<float> &mask_vis,
--                                            unsigned int ni,unsigned nj,
--                                            bool scene_read_only=false,bool is_aux=true)
--    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
--  {
--    alpha_integral_.fill(0.0f);
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    expected_.fill(nil);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value,
--                        T_aux& aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
--
--    //compute sun visibility
--    float length_sum = aux_val.seg_len_;
--    float avg_sun_vis = 1.0f;
--    if (length_sum>0.0f)
--      avg_sun_vis = aux_val.vis_/length_sum;
--
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    expected_(i,j) +=  exp * Omega * avg_sun_vis;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_shadow_functor
--{
-- public:
--
--  normalize_shadow_functor(bool use_black_background)
--    {use_black_background_ = use_black_background;}
--
--  void operator()(float mask, typename T_data::obs_datatype &pix) const
--  {
--    if (!use_black_background_) {
--      pix += mask*0.5f;
--    }
--  }
--  bool use_black_background_;
--};
--
--
--template <class T_loc, boxm_apm_type APM ,  boxm_aux_type AUX>
--void boxm_render_shadow_image_rt(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                 std::string const& aux_scene_id,
--                                 vpgl_camera_double_sptr cam,
--                                 vil_image_view<typename boxm_sample<APM>::obs_datatype> &expected,
--                                 vil_image_view<float> & mask,
--                                 bool use_black_background = false)
--{
--  typedef boxm_sample<APM> T_data;
--  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
--  boxm_aux_scene<T_loc, T_data, T_aux> aux_scene(&scene, aux_scene_id, boxm_aux_scene<T_loc, T_data, T_aux>::LOAD);
--
--  typedef boxm_render_expected_shadow_image_functor<T_loc, APM, AUX > exp_funct;
--
--  boxm_raytrace_function<exp_funct, T_loc, T_data, T_aux > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
--  exp_funct expf(expected,mask,expected.ni(),expected.nj(),true,true);
--  raytracer.run(expf);
--
--  normalize_shadow_functor<T_data> norm_fn(use_black_background);
--  vil_transform2<float,typename T_data::obs_datatype, normalize_shadow_functor<T_data> >(mask,expected,norm_fn);
--
--  //  aux_scene.clean_scene();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h b/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
-deleted file mode 100644
-index 78df79d9c4..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
-+++ /dev/null
-@@ -1,447 +0,0 @@
--#ifndef boxm_rpc_registration_h_
--#define boxm_rpc_registration_h_
--//:
--// \file
--// This part contains the correction rpc camera parameters using the expected
--// edge image obtained from the world (scene) and edge map of the current image.
--// if the camera parameters are manually corrected by the user, this part should
--// be omitted by setting the "rpc_correction_flag" parameter to 0 (false) in the
--// boxm_rpc_registration_process.
--//
--// \author Ibrahim Eden
--// \date   Jan, 2009
--//
--// \verbatim
--//  Modifications
--//     Feb 1st, 2010 Gamze Tunali
--//         This piece of code is moved from bvxm_rpc_registration process to this file
--//         as a standalone function to be used in boxm/opt/boxm_rpc_registration_process
--// \endverbatim
--
--
--#include <iostream>
--#include <fstream>
--#include <limits>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--#include <vpgl/algo/vpgl_backproject.h>
--#include <vpgl/vpgl_lvcs.h>
--
--#include <brip/brip_vil_float_ops.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vil/vil_image_view.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--int convert_uncertainty_from_meters_to_pixels(float uncertainty,
--                                              vpgl_lvcs lvcs,
--                                              vpgl_camera_double_sptr camera)
--{
--  // estimate the offset search size in the image space
--  vgl_box_3d<double> box_uncertainty(-uncertainty,-uncertainty,-uncertainty,uncertainty,uncertainty,uncertainty);
--  std::vector<vgl_point_3d<double> > box_uncertainty_corners = boxm_utils::corners_of_box_3d(box_uncertainty);
--  vgl_box_2d<double> roi_uncertainty;
--
--  for (auto curr_corner : box_uncertainty_corners) {
--    vgl_point_3d<double> curr_pt;
--    if (camera->type_name()=="vpgl_local_rational_camera") {
--      curr_pt.set(curr_corner.x(),curr_corner.y(),curr_corner.z());
--    }
--    else if (camera->type_name()=="vpgl_rational_camera") {
--      double lon, lat, gz;
--      lvcs.local_to_global(curr_corner.x(), curr_corner.y(), curr_corner.z(),
--                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--      curr_pt.set(lon, lat, gz);
--    }
--    else // dummy initialisation, to avoid compiler warning
--      curr_pt.set(-1e99, -1e99, -1.0);
--
--    double curr_u,curr_v;
--    camera->project(curr_pt.x(),curr_pt.y(),curr_pt.z(),curr_u,curr_v);
--    vgl_point_2d<double> p2d_uncertainty(curr_u,curr_v);
--    roi_uncertainty.add(p2d_uncertainty);
--  }
--
--  return vnl_math::ceil(0.5*std::max(roi_uncertainty.width(),roi_uncertainty.height()));
--}
--
--template<class T_loc, class T_data>
--bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
--                           vil_image_view<vxl_byte> edge_image,
--                           vil_image_view<vxl_byte> expected_edge_image,
--                           vpgl_camera_double_sptr camera,
--                           vpgl_camera_double_sptr camera_out,
--                           bool rpc_shift_3d_flag,
--                           float uncertainty,
--                           float n_normal, // FIXME - unused
--                           unsigned num_observations)
--{
--  double max_prob = std::numeric_limits<double>::min();
--  unsigned int best_offset_u = 0, best_offset_v = 0;
--
--  typedef boct_tree<T_loc,T_data> tree_type;
--  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--
--  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
--  int ni = edge_image.ni();
--  int nj = edge_image.nj();
--
--  // this is the two level offset search algorithm
--  int offset_lower_limit_u = -offset_search_size;
--  int offset_lower_limit_v = -offset_search_size;
--  int offset_upper_limit_u =  offset_search_size;
--  int offset_upper_limit_v =  offset_search_size;
--  std::cout << "Estimating image offsets:" << std::endl;
--  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
--    std::cout << '.';
--    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
--      // for each offset pair (u,v)
--      double prob = 0.0;
--      double norm = 0.0;
--      // find the total probability of the edge image given the expected edge image
--      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
--        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
--          if (edge_image(m,n)==255) {
--            prob += expected_edge_image(m-u,n-v);
--          }
--          norm += expected_edge_image(m-u,n-v);
--        }
--      }
--
--      if (norm>0.0)
--          prob/=norm;
--
--      // if maximum is found
--      if (prob > max_prob) {
--        max_prob = prob;
--        best_offset_u = u;
--        best_offset_v = v;
--      }
--    }
--  }
--  std::cout << std::endl;
--
--  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
--  // local variables
--  std::ifstream file_inp;
--  std::ofstream file_out;
--  file_out.clear();
--  file_out.open("offsets.txt",std::ofstream::app);
--  file_out << best_offset_u << ' ' << best_offset_v << '\n';
--  file_out.close();
--
--  double nlx=0.f,nly=0.f,nlz=0.f;
--  double motion_mult = 0.0;
--  if (rpc_shift_3d_flag)
--  {
--    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
--
--    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
--    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
--
--    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
--    vgl_point_3d<double> init_point(0.0,0.0,0.001);
--    vgl_point_3d<double> world_point;
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
--
--    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
--    motion_plane_normal = normalize(motion_plane_normal);
--    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
--
--    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
--    vgl_point_3d<double> moved_origin;
--    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
--
--    vgl_vector_3d<double> motion = moved_origin - origin_3d;
--
--    motion_mult = 1.0/((double)(num_observations+1));
--    motion = motion*motion_mult;
--
--    double lx,ly,lz;
--    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
--    lx = rpc_origin.x();
--    ly = rpc_origin.y();
--    lz = rpc_origin.z();
--
--    lx = lx*(1.0f-(double)motion_mult);
--    ly = ly*(1.0f-(double)motion_mult);
--    lz = lz*(1.0f-(double)motion_mult);
--
--    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
--    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
--
--    nlx = (double)pt_3d_updated.x();
--    nly = (double)pt_3d_updated.y();
--    nlz = (double)pt_3d_updated.z();
--
--    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
--    scene->set_rpc_origin(new_rpc_origin);
--  }
--
--  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
--  // the following block of code takes care of different input camera types
--  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
--  bool is_local_cam = true;
--  bool is_rational_cam = true;
--  vpgl_local_rational_camera<double> *cam_inp_local;
--  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
--    is_local_cam = false;
--  }
--  vpgl_rational_camera<double> *cam_inp_rational;
--  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
--    is_rational_cam = false;
--  }
--
--  if (is_local_cam) {
--    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
--    double offset_u,offset_v;
--    cam_out_local.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_local.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
--  }
--  else if (is_rational_cam) {
--    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
--    double offset_u,offset_v;
--    cam_out_rational.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_rational.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
--  }
--  else {
--    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
--    return false;
--  }
--
--  return true;
--}
--
--
--template<class T_loc, class T_data>
--bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
--                           vil_image_view<float> edge_image,
--                           vil_image_view<float > expected_edge_image,
--                           vpgl_camera_double_sptr camera,
--                           vpgl_camera_double_sptr camera_out,
--                           bool rpc_shift_3d_flag,
--                           float uncertainty,
--                           unsigned num_observations)
--{
--  double max_cost = std::numeric_limits<double>::max();
--  unsigned int best_offset_u = 0, best_offset_v = 0;
--  double subpixel_best_offset_u = 0.0, subpixel_best_offset_v = 0.0;
--
--  typedef boct_tree<T_loc,T_data> tree_type;
--  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--
--  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
--  int ni = edge_image.ni();
--  int nj = edge_image.nj();
--
--  std::cout<<ni<<','<<nj<<','<<expected_edge_image.ni()<<','<<expected_edge_image.nj();
--  // this is the two level offset search algorithm
--  int offset_lower_limit_u = -offset_search_size;
--  int offset_lower_limit_v = -offset_search_size;
--  int offset_upper_limit_u =  offset_search_size;
--  int offset_upper_limit_v =  offset_search_size;
--  std::cout << "Estimating image offsets:" << std::endl;
--  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
--    std::cout << '.';
--    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
--      // for each offset pair (u,v)
--      double cost = 0.0;
--      double norm = 0.0;
--      // find the total probability of the edge image given the expected edge image
--      for (int m=offset_search_size+1; m<ni-offset_search_size-1; m++) {
--        for (int n=offset_search_size+1; n<nj-offset_search_size-1; n++) {
--          if (edge_image(m,n,0)>-1 && edge_image(m,n,1)>-1 && edge_image(m,n,2)>-1) {
--            if (expected_edge_image(m-u,n-v,0)>0 && expected_edge_image(m-u,n-v,1)>0 && expected_edge_image(m-u,n-v,2)>0) {
--            //std::cout<<'.';
--            float sintheta1=std::sin(edge_image(m,n,2));
--            float costheta1=std::cos(edge_image(m,n,2));
--
--            float sintheta2=std::sin(expected_edge_image(m-u,n-v,2));
--            float costheta2=std::cos(expected_edge_image(m-u,n-v,2));
--#if 0
--            float dx=expected_edge_image(m-u,n-v,0)+u-edge_image(m,n,0);
--            float dy=expected_edge_image(m-u,n-v,1)+v-edge_image(m,n,1);
--
--            float dist=std::sqrt(dx*dx+dy*dy);
--            if (dist<min_dist)
--              min_dist=dist;
--
--            float dist1=std::sqrt((dx*sintheta1*sintheta1+dy*sintheta1*costheta1)*(dx*sintheta1*sintheta1+dy*sintheta1*costheta1)
--                                +(dy*costheta1*costheta1+dx*sintheta1*costheta1)*(dy*costheta1*costheta1+dx*sintheta1*costheta1));
--            float dist2=std::sqrt((dx*sintheta2*sintheta2+dy*sintheta2*costheta2)*(dx*sintheta2*sintheta2+dy*sintheta2*costheta2)
--                                +(dy*costheta2*costheta2+dx*sintheta2*costheta2)*(dy*costheta2*costheta2+dx*sintheta2*costheta2));
--            if ((dist1+dist2)/2<min_dist)
--              min_dist=(dist1+dist2)/2;
--#endif // 0
--            float dist=(1-std::fabs(sintheta1*sintheta2+costheta2*costheta1));//+std::sqrt(dx*dx+dy*dy);
--            cost += dist;//(dist1+dist2)/2;
--          }
--          else
--          {
--            cost+=0.5;
--          }
--          norm += 1;
--        }
--      }
--    }
--
--    if (norm>0.0)
--        cost/=norm;
--
--      //std::cout<<cost<<"u "<<u<<" v"<<v<<'\n';
--      // if maximum is found
--      if (cost < max_cost) {
--        max_cost = cost;
--        best_offset_u = u;
--        best_offset_v = v;
--      }
--    }
--  }
--  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
--  double subpixel_offset_limit=0.5;
--  max_cost = std::numeric_limits<double>::max();
--  for (double u=-subpixel_offset_limit; u<=subpixel_offset_limit; ) {
--    std::cout << '.';
--    for (double v=-subpixel_offset_limit; v<=subpixel_offset_limit; ) {
--      // for each offset pair (u,v)
--      double cost = 0.0;
--      // find the total probability of the edge image given the expected edge image
--      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
--        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
--          if (edge_image(m,n,0)!=-1 || edge_image(m,n,1)!=-1 || edge_image(m,n,2)!=-1) {
--            if (expected_edge_image(m-best_offset_u,n-best_offset_v,0)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,1)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,2)>0) {
--              double dx=expected_edge_image(m-best_offset_u,n-best_offset_v,0)+best_offset_u+u-edge_image(m,n,0);
--              double dy=expected_edge_image(m-best_offset_u,n-best_offset_v,1)+best_offset_v+v-edge_image(m,n,1);
--              double dist=std::sqrt(dx*dx+dy*dy);
--              cost += dist;
--            }
--          }
--        }
--      }
--      //std::cout<<cost<<' ';
--      if (cost < max_cost) {
--          max_cost = cost;
--          subpixel_best_offset_u = (double)u;
--          subpixel_best_offset_v = (double)v;
--      }
--
--      v=v+0.05;
--    }
--    u+=0.05;
--  }
--  std::cout << "Estimated changes in offsets (u,v)=(" << subpixel_best_offset_u << ',' << subpixel_best_offset_v << ')' << std::endl;
--
--  // local variables
--  std::ifstream file_inp;
--  std::ofstream file_out;
--  file_out.clear();
--  file_out.open("offsets.txt",std::ofstream::app);
--  file_out << best_offset_u +subpixel_best_offset_u<< ' ' << best_offset_v+subpixel_best_offset_v << '\n';
--  file_out.close();
--
--  double nlx=0.f,nly=0.f,nlz=0.f;
--  double motion_mult = 0.0;
--  if (rpc_shift_3d_flag)
--  {
--    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
--
--    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
--    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
--
--    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
--    vgl_point_3d<double> init_point(0.0,0.0,0.001);
--    vgl_point_3d<double> world_point;
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
--
--    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
--    motion_plane_normal = normalize(motion_plane_normal);
--    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
--
--    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
--    vgl_point_3d<double> moved_origin;
--    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
--
--    vgl_vector_3d<double> motion = moved_origin - origin_3d;
--
--    motion_mult = 1.0/((double)(num_observations+1));
--    motion = motion*motion_mult;
--
--    double lx,ly,lz;
--    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
--    lx = rpc_origin.x();
--    ly = rpc_origin.y();
--    lz = rpc_origin.z();
--
--    lx = lx*(1.0f-(double)motion_mult);
--    ly = ly*(1.0f-(double)motion_mult);
--    lz = lz*(1.0f-(double)motion_mult);
--
--    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
--    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
--
--    nlx = (double)pt_3d_updated.x();
--    nly = (double)pt_3d_updated.y();
--    nlz = (double)pt_3d_updated.z();
--
--    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
--    scene->set_rpc_origin(new_rpc_origin);
--  }
--
--  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
--  // the following block of code takes care of different input camera types
--  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
--  bool is_local_cam = true;
--  bool is_rational_cam = true;
--  vpgl_local_rational_camera<double> *cam_inp_local;
--  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
--    is_local_cam = false;
--  }
--  vpgl_rational_camera<double> *cam_inp_rational;
--  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
--    is_rational_cam = false;
--  }
--
--  if (is_local_cam) {
--    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
--    double offset_u,offset_v;
--    cam_out_local.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_local.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
--  }
--  else if (is_rational_cam) {
--    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
--    double offset_u,offset_v;
--    cam_out_rational.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_rational.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
--  }
--  else {
--    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
--    return false;
--  }
--
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
-deleted file mode 100644
-index 0d4d93d05d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
-+++ /dev/null
-@@ -1,45 +0,0 @@
--#ifndef boxm_shadow_app_initializer_h_
--#define boxm_shadow_app_initializer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_shadow_app_initializer
--{
--public:
--
--  boxm_shadow_app_initializer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                              std::vector<std::string>  image_ids,
--                              float min_app_sigma,
--                              float shadow_prior,
--                              float shadow_mean, float shadow_sigma,
--                              bool verbose=false);
--
--  ~boxm_shadow_app_initializer()= default;
--
--  bool initialize();
--
--protected:
--
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  float min_app_sigma_;
--  float shadow_prior_;
--  float shadow_mean_;
--  float shadow_sigma_;
--  bool verbose_;
--};
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
-deleted file mode 100644
-index 22c469ec72..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
-+++ /dev/null
-@@ -1,122 +0,0 @@
--#ifndef boxm_shadow_app_initializer_hxx_
--#define boxm_shadow_app_initializer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_shadow_app_initializer.h"
--#include "boxm_shadow_appearance_estimator.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_shadow_app_initializer<T_loc,APM,AUX>::boxm_shadow_app_initializer(
--            boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--            std::vector<std::string>  image_ids, float min_app_sigma,
--            float shadow_prior, float shadow_mean, float shadow_sigma,
--            bool verbose)
--  : image_ids_(std::move(image_ids)), scene_(scene), min_app_sigma_(min_app_sigma),
--    shadow_prior_(shadow_prior), shadow_mean_(shadow_mean),
--    shadow_sigma_(shadow_sigma),verbose_(verbose)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_shadow_app_initializer<T_loc,APM,AUX>::initialize()
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--            return false;
--        }
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
--      std::vector<obs_type> obs_vector;
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        float seg_len = aux_samples[s].seg_len_;
--        obs_type obs = aux_samples[s].obs_;
--        if ( seg_len > 1e-5 && (obs > obs_type(0)) ){
--          obs_vector.push_back(obs / seg_len);
--        }
--      }
--      unsigned n_obs = obs_vector.size();
--      if(n_obs>1){
--      std::vector<float> pre_vector(n_obs, 0.0f);
--      std::vector<float> vis_vector(n_obs, 1.0f);
--      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector,
--                                          vis_vector, data.appearance_,
--                                          min_app_sigma_, shadow_prior_,
--                                          shadow_mean_, shadow_sigma_,
--                                          verbose_);
--      cell->set_data(data);
--      }
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--  // clear the aux scenes
--  for (unsigned i=0; i<aux_scenes.size(); i++)
--    aux_scenes[i].clean_scene();
--  return true;
--}
--
--
--#define BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(T1,T2,T3) \
--template class boxm_shadow_app_initializer<T1,T2,T3 >
--
--#endif // boxm_shadow_app_initializer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
-deleted file mode 100644
-index 15dd5763ba..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
-+++ /dev/null
-@@ -1,114 +0,0 @@
--#ifndef boxm_shadow_appearance_estimator_h_
--#define boxm_shadow_appearance_estimator_h_
--
--#include <vector>
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#if 1
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM>
--void boxm_compute_shadow_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
--                                    std::vector<float> const& pre,
--                                    std::vector<float> const& vis,
--                                    typename boxm_apm_traits<APM>::apm_datatype &model,
--                                    float min_app_sigma,
--                                    float shadow_prior,
--                                    float shadow_mean, float shadow_sigma,
--                                    bool verbose = false)
--{
--  std::vector<float> obs_weights(vis.size(), 0.0f);
--  std::vector<float> sh_density(vis.size(), 0.0f);
--  //assume that the initial appearance distribution is uniform on [0 1]
--  //thus a reasonable initialization for weights is
--  //
--  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
--  //
--  //, where Psh is shadow_prior and psh(x) is the shadow density function,
--  // sh_density. vis is the visibilty probability
--  //
--  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
--  for(unsigned n = 0; n<obs.size(); ++n)
--    {
--      //2.0 x density since centered on zero
--      sh_density[n] =
--        2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
--      float neu = vis[n]*(1-shadow_prior);
--      float weight =
--        neu/(neu + sh_density[n]*shadow_prior);
--      obs_weights[n]=weight;
--    }
--  std::vector<float> initial_weights = obs_weights;
--  // initial estimate for the illuminated appearance model
--  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
--  double initial_mean = model.color();
--  double initial_sigma = model.sigma();
--#if 1
--  // use EM to refine estimate until convergence.
--  unsigned int nobs= obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  const float epsilon = 1e-4f;
--  constexpr unsigned int max_its = 100;
--  const float min_weight_change = 1e-5f;
--  unsigned int i=0;
--  for (; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION - determine the weights
--    for (unsigned int n=0; n<nobs; ++n) {
--
--      float PI = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
--      float neu = PI*(1-shadow_prior);
--      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
--      float new_obs_weight = 0;
--      if (den > epsilon) {
--        new_obs_weight = neu / den;
--      }
--      // compute delta weight for convergence check
--      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
--      if (weight_delta > max_weight_change) {
--        max_weight_change = weight_delta;
--      }
--      obs_weights[n] = new_obs_weight;
--    }
--    // check for convergence
--    if (max_weight_change < min_weight_change)
--      break;
--    // MAXIMIZATION - determine the parameters of the appearance distribution
--    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
--  }
--  if(verbose) {
--    bool print = false;
--    for(unsigned n = 0; n<obs.size(); ++n)
--      if(obs[n]>0) print = true;
--      if(i<max_its&&print){
--        std::cout << "converged after " << i << " iterations.\n";
--        std::cout << " initial mean = " << initial_mean << " final mean = "
--                 << model.color() << '\n';
--        std::cout << " initial sigma = " << initial_sigma << " final sigma = "
--                 << model.sigma() << '\n';
--      }else{ std::cout << "failed to converge\n";}
--
--      std::cout << "Initial (Observations, Weights):\n";
--      for(unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
--      std::cout << '\n';
--      std::cout << "Final (Observations, Weights):\n";
--      for(unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
--      std::cout << '\n';
--  }
--
--  // adjust model to account for small sample sizes.
--  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
--#endif
--  return;
--}
--
--#endif // boxm_shadow_appearance_estimator_h_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
-deleted file mode 100644
-index beaa3b2c7d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
-+++ /dev/null
-@@ -1,51 +0,0 @@
--#ifndef boxm_shadow_bayes_optimizer_h_
--#define boxm_shadow_bayes_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vgl/vgl_point_3d.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_shadow_bayes_optimizer
--{
--public:
--
--  boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                              std::vector<std::string>  image_ids,
--                              float min_app_sigma,
--                              float shadow_prior,
--                              float shadow_mean, float shadow_sigma,
--                              bool verbose=false,
--                              vgl_point_3d<double> debug_pt =
--                              vgl_point_3d<double>(0,0,0)
--                              );
--
--  ~boxm_shadow_bayes_optimizer()= default;
--
--  bool optimize_cells(double damping_factor);
--
--protected:
--
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--  float min_app_sigma_;
--  float shadow_prior_;
--  float shadow_mean_;
--  float shadow_sigma_;
--  bool verbose_;
--  vgl_point_3d<double> debug_pt_;
--};
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
-deleted file mode 100644
-index a2d24ee683..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
-+++ /dev/null
-@@ -1,195 +0,0 @@
--#ifndef boxm_shadow_bayes_optimizer_hxx_
--#define boxm_shadow_bayes_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_shadow_bayes_optimizer.h"
--#include "boxm_shadow_appearance_estimator.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                                        std::vector<std::string>  image_ids, float min_app_sigma,
--                                                                        float shadow_prior, float shadow_mean, float shadow_sigma,
--                                                                        bool verbose, vgl_point_3d<double> debug_pt)
--  : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f),
--    min_app_sigma_(min_app_sigma), shadow_prior_(shadow_prior),
--    shadow_mean_(shadow_mean), shadow_sigma_(shadow_sigma),
--    verbose_(verbose), debug_pt_(debug_pt)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    boct_tree_cell<T_loc,boxm_sample<APM> >* debug_cell  = nullptr;
--    if (verbose_)
--      debug_cell = tree->locate_point_global(debug_pt_);
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--      unsigned n_samp = aux_samples.size();
--      std::vector<float> pre_vector(n_samp);
--      std::vector<float> vis_vector(n_samp);
--      // new discrete probability code
--      float log_sum = 0.0f;
--      float total_length_sum = 0.0f;
--      //===
--      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
--      std::vector<obs_type> obs_vector(n_samp);
--//#if 0 // old beta calculation
--      double Beta = 1.0;
--//#endif
--      if (verbose_&&cell == debug_cell){
--        std::cout << "Contents of Debug Cell\n"
--                 << "s    vis[s]    pre[s]    beta[s]\n";
--      }
--      double vis_sum = 0;
--      for (unsigned int s=0; s<n_samp; ++s) {
--        float seg_len_sum = aux_samples[s].seg_len_;
--        obs_type obs = aux_samples[s].obs_;
--        if (seg_len_sum > 1e-5) {
--          obs_vector[s] = obs / seg_len_sum;
--          float pre = aux_samples[s].pre_ / seg_len_sum;
--          float vis = aux_samples[s].vis_ / seg_len_sum;
--          pre_vector[s] = pre;
--          vis_vector[s] = vis;
--
--//#if 0 // old beta calculation
--          double beta_s = (aux_samples[s].Beta_ / seg_len_sum);
--          Beta *= beta_s;
--//#else // New discrete prob code
--          log_sum += aux_samples[s].log_sum_;
--          total_length_sum += seg_len_sum;
--//#endif
--          // ====
--          if (cell == debug_cell)
--          {
--            std::cout << s << ' ' << vis << ' ' << pre << ' '
--                     << beta_s << '\n';
--          }
--        }
--        else {
--          pre_vector[s] = 0.0f;
--          vis_vector[s] = 0.0f;
--          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
--        }
--      }
--      vis_sum /= n_samp;
--
--#if 0 // old beta calculation
--      double damped_Beta = 1.0;
--      if (n_samp>1.0){
--        damped_Beta = std::pow(Beta, 1.0/n_samp);
--      }
--#else
--      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
--
--      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
--        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
--
--      data.alpha *= static_cast<float>(damped_Beta);
--
--      float alpha_post = data.alpha;
--      if (total_length_sum > 0.0f) alpha_post = log_sum/total_length_sum;
--      data.alpha = alpha_post;
--#endif
--      // do bounds check on new alpha value
--      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--      const float cell_len = float(cell_bb.width());
--      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--      if (data.alpha > max_alpha) {
--        data.alpha = max_alpha;
--      }
--      if (data.alpha < min_alpha) {
--        data.alpha = min_alpha;
--      }
--      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
--        std::cerr << "\nerror: data.alpha = " << data.alpha << std::endl;
--      }
--      // update with new appearance
--      bool print_p = false;
--      if (verbose_&&cell == debug_cell){
--        std::cout << "Cell Level = " << cell->level()
--                 << "  AlphaPosterior  = " << data.alpha << '\n';
--        print_p = true;
--      }
--      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_, min_app_sigma_, shadow_prior_, shadow_mean_, shadow_sigma_, print_p);
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    ++iter;
--  }
--
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--template class boxm_shadow_bayes_optimizer<T1,T2,T3 >
--
--#endif // boxm_shadow_bayes_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
-deleted file mode 100644
-index 798aac81a9..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
-+++ /dev/null
-@@ -1,103 +0,0 @@
--#ifndef boxm_sun_vis_prob_functor_h
--#define boxm_sun_vis_prob_functor_h
--//:
--//\file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <bpgl/algo/bpgl_camera_from_box.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_sun_vis_prob_functor
--{
-- public:
--  //: "default" constructor
--  boxm_sun_vis_prob_functor(unsigned sun_ni, unsigned sun_nj)
--  : sun_ni_(sun_ni), sun_nj_(sun_nj)
--  {
--    alpha_integral_ = vil_image_view<float>(sun_ni_, sun_nj_);
--    alpha_integral_.fill(0.0f);
--
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--
--    // accumulate segment length
--    aux_val.seg_len_ += seg_len;
--
--    // current sun visibility
--    const float sun_vis = std::exp(-alpha_integral_(i,j));
--
--    // update sun vis
--    aux_val.vis_ +=  sun_vis * seg_len;
--
--    // update alpha integral along sun ray i, j
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  unsigned sun_ni_;
--  unsigned sun_nj_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data, boxm_aux_type AUX_T>
--void boxm_sun_vis_prob(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                       vgl_vector_3d<double> sun_angle,
--                       std::string sun_occ_name)
--{
--  // scene bounding box
--  vgl_box_3d<double> world_bb = scene.get_world_bbox();
--  unsigned max_level = scene.max_level();
--  unsigned sun_ni = 1<<max_level;//twice as many
--  unsigned sun_nj = sun_ni;
--  vpgl_affine_camera<double> sun_cam =
--  bpgl_camera_from_box::affine_camera_from_box(world_bb, -sun_angle, sun_ni, sun_nj);
--
--  vpgl_camera_double_sptr cam = new vpgl_affine_camera<double> (sun_cam);
--
--  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,sun_occ_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--
--  std::cout<<"Sun visibility"<<std::endl;
--  // functor to accumulate sun visibility
--  typedef boxm_sun_vis_prob_functor<T_data::apm_type, sample_datatype> sun_vis;
--
--  // set up the raytrace function
--  boxm_raytrace_function<sun_vis,T_loc, T_data, sample_datatype> raytracer_vis(scene,aux_scene,cam.ptr(),sun_ni,sun_nj);
--
--  // construct the sun visibility functor need only sun ray space dimensions
--  sun_vis sun_vis_functor(sun_ni, sun_nj);
--
--  // run the functor over the octree
--  raytracer_vis.run(sun_vis_functor);
--  std::cout<<"Sun Occlusion Done."<<std::endl;
--}
--
--#endif // boxm_sun_vis_prob_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
-deleted file mode 100644
-index cc1567a545..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
-+++ /dev/null
-@@ -1,172 +0,0 @@
--#ifndef boxm_update_image_functor_h
--#define boxm_update_image_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
--#include <vil/vil_math.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_update_image_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_update_image_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                   vil_image_view<float> const& normalizing_img)
--  : obs_(image), norm_(normalizing_img), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs= aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    aux_val.vis_+=seg_len*vis_img_(i,j);
--
--    if(norm_(i,j)>1e-10f)
--        aux_val.updatefactor_+=(((pre_img_(i,j)+vis_img_(i,j)*PI)/norm_(i,j))* seg_len);
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& norm_;
--  //vil_image_view<float> const& pre_inf_;
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_update_image_functor_pass_3
--{
-- public:
--  //: default constructor
--  boxm_update_image_functor_pass_3()
--  {
--    //only reads info from the scene
--    scene_read_only_=false;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    if (aux_val.seg_len_>1e-10)
--    {
--      boxm_apm_traits<APM>::apm_processor::update(cell_value.appearance(),
--                                                  aux_val.obs_/aux_val.seg_len_,
--                                                  aux_val.vis_/aux_val.seg_len_);
--      cell_value.alpha*=(aux_val.updatefactor_/aux_val.seg_len_);
--      aux_val.seg_len_=0;
--      aux_val.obs_=0;
--      aux_val.vis_=0;
--      aux_val.updatefactor_=0.0;
--    }
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--};
--
--template <class T_loc, class T_data>
--void boxm_update_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vpgl_camera_double_sptr cam,
--                          vil_image_view<typename T_data::obs_datatype> &obs,
--                          bool black_background = false)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data, sample_datatype > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::storage_subdir(), boxm_aux_scene<T_loc, T_data, sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type, sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0, T_loc, T_data, sample_datatype> raytracer_0(scene, aux_scene, cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PASS 0\n";
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--
--    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--    boxm_raytrace_function<pass_1,T_loc, T_data,sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PASS 1\n";
--    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--    raytracer_1.run(pass_1_functor);
--
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--
--    typename T_data::apm_datatype background_apm;
--
--    if (black_background) {
--        std::cerr << "using black background model\n";
--        for (unsigned int i=0; i<4; ++i) {
--            T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
--            float peak=T_data::apm_processor::prob_density(background_apm,0.0f);
--            std::cout<<"Peak: "<<peak<<std::endl;
--        }
--        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--        for (; img_it != obs.end(); ++img_it, ++PI_it) {
--            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
--        }
--    }
--    else {
--        PI_inf.fill(0.5f);
--    }
--
--    vil_image_view<float> inf_term(obs.ni(), obs.nj());
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--    vil_image_view<float> norm_img(obs.ni(), obs.nj());
--    vil_math_image_sum<float,float,float>(pre_inf,inf_term,norm_img);
--    std::cerr << "PASS 2\n";
--    typedef boxm_update_image_functor_pass_2<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_2;
--    boxm_raytrace_function<pass_2,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    pass_2 pass_2_functor(obs,norm_img);
--    raytracer_2.run(pass_2_functor);
--    std::cerr << "PASS 3\n";
--    typedef boxm_update_image_functor_pass_3<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_3;
--    boxm_iterate_cells_function<pass_3,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> cell_tracer_3(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--
--    pass_3 pass_3_functor;
--    cell_tracer_3.run(pass_3_functor);
--
--    aux_scene.clean_scene();
--    std::cerr << "DONE.\n";
--}
--
--#endif // boxm_update_image_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/dummy.cxx b/contrib/brl/bseg/boxm/algo/rt/dummy.cxx
-deleted file mode 100644
-index e69de29bb2..0000000000
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-deleted file mode 100644
-index 112a19f789..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and boxm_pro depends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
-- # include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
-- # include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--  set(boxm_algo_rt_pro_sources
--      boxm_algo_rt_processes.h
--      boxm_algo_rt_register.h   boxm_algo_rt_register.cxx
--  )
--
--  #aux_source_directory(Templates boxm_algo_rt_pro_sources)
--  aux_source_directory(processes boxm_algo_rt_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_algo_rt_pro LIBRARY_SOURCES ${boxm_algo_rt_pro_sources} )
--
--  target_link_libraries(boxm_algo_rt_pro boxm_algo_rt boxm_algo_pro boxm boxm_sample boxm_sample_algo boct bprb brdb brip sdet ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
-deleted file mode 100644
-index 1ec223e9d5..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
-+++ /dev/null
-@@ -1,29 +0,0 @@
--#ifndef boxm_algo_rt_processes_h_
--#define boxm_algo_rt_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_opt_bayesian_update_process);
--DECLARE_FUNC_CONS(boxm_update_rt_process);
--DECLARE_FUNC_CONS(boxm_render_expected_rt_process);
--DECLARE_FUNC_CONS(boxm_render_expected_depth_rt_process);
--DECLARE_FUNC_CONS(boxm_generate_opt_samples_process);
--DECLARE_FUNC_CONS(boxm_generate_edge_samples_process);
--DECLARE_FUNC_CONS(boxm_edge_update_process);
--DECLARE_FUNC_CONS(boxm_render_expected_edge_process);
--DECLARE_FUNC_CONS(boxm_rpc_registration_process);
--DECLARE_FUNC_CONS(boxm_line_backproject_process);
--DECLARE_FUNC_CONS(boxm_generate_opt2_samples_process);
--DECLARE_FUNC_CONS(boxm_opt2_update_process);
--DECLARE_FUNC_CONS(boxm_generate_opt3_samples_process);
--DECLARE_FUNC_CONS(boxm_opt3_update_process);
--DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
--DECLARE_FUNC_CONS(boxm_ray_statistics_process);
--DECLARE_FUNC_CONS(boxm_change_probability_process);
--DECLARE_FUNC_CONS(boxm_estimate_camera_process);
--DECLARE_FUNC_CONS(boxm_edge_refine_updates_process);
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
-deleted file mode 100644
-index d0ebc7375e..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
-+++ /dev/null
-@@ -1,33 +0,0 @@
--#include "boxm_algo_rt_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "boxm_algo_rt_processes.h"
--
--void boxm_algo_rt_register::register_datatype()
--{
--}
--
--void boxm_algo_rt_register::register_process()
--{
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt_bayesian_update_process,"boxmOptBayesianUpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_rt_process,"boxmUpdateRTProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_rt_process, "boxmRenderExpectedRTProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_depth_rt_process, "boxmRenderExpectedDepthRTProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt_samples_process, "boxmGenerateOptSamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_edge_samples_process, "boxmGenerateEdgeSamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_update_process, "boxmEdgeUpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_process, "boxmRenderExpectedEdgeProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_rpc_registration_process, "boxmRPCRegistrationProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process, "boxmLineBackprojectProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt2_update_process,"boxmOpt2UpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt3_update_process,"boxmOpt3UpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt2_samples_process,"boxmGenerateOpt2SamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt3_samples_process,"boxmGenerateOpt3SamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_ray_statistics_process,"boxmRayStatisticsProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_change_probability_process,"boxmChangeProbabilityProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_estimate_camera_process,"boxmEstimateCameraProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_refine_updates_process, "boxmEdgeRefineUpdatesProcess");
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
-deleted file mode 100644
-index c060c1220f..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_algo_rt_register_h_
--#define boxm_algo_rt_register_h_
--
--class boxm_algo_rt_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_algo_rt_register_h_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
-deleted file mode 100644
-index d7d9002e0c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
-+++ /dev/null
-@@ -1,120 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining expected depth map for the world
--//
--// \author Vishal Jain
--// \date Aug 26, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_change_probability_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_convert.h>
--
--namespace boxm_change_probability_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_change_probability_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_change_probability_process_globals;
--
--  //process takes 4 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vil_image_view_base_sptr";
--  input_types_[2] = "vpgl_camera_double_sptr";
--  //input_types_[3] = "unsigned";
--  //input_types_[4] = "unsigned";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_change_probability_process(bprb_func_process& pro)
--{
--  using namespace boxm_change_probability_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vil_image_view_base_sptr input_img_ptr=pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--
--  unsigned ni=input_img_ptr->ni();
--  unsigned nj=input_img_ptr->nj();
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    vil_image_view<float> mask(ni,nj,1);
--    vil_image_view<float> expected(ni,nj,1);
--
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene,img_in, camera, expected, mask);
--    img_mask = new vil_image_view<float>(mask);
--    img = new vil_image_view<float>(expected);
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    vil_image_view<float> mask(ni,nj,1);
--    vil_image_view<float> expected(ni,nj,1);
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--
--    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene,img_in, camera, expected, mask);
--    img_mask = new vil_image_view<float>(mask);
--    img = new vil_image_view<float>(expected);
--  }
--  else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
-deleted file mode 100644
-index 1593ab6590..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
-+++ /dev/null
-@@ -1,280 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of edge images
--// \author Gamze Tunali
--// \date   Jan, 2010
--//
--// \verbatim
--//  Modifications
--//
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
--#include <boxm/algo/rt/boxm_edge_updater.h>
--
--#include <vil/vil_load.h>
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--
--namespace boxm_edge_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 6;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_edge_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_edge_update_process_globals;
--
--  // process takes 6 inputs:
--  //input[0]: The scene
--  //input[1]: Image list filename
--  //input[2]: Use ransac?
--  //input[3]: consensus cnt, param of ransac algo, value depends on number of training images
--  //          unless planes from this number of images agree at a voxel on a hypothesis, a 3D edge won't be formed,
--  //          there should be at least this number of training images during the update for any kind of consensus to be met at any voxel
--  //          (if consensus cnt < training img cnt --> edge world will be empty)
--  //input[4]: orthogonality threshold, a good value 0.01, param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
--  //input[5]: volume ratio denominator: a good value 128 , param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
--  //          algo checks whether a current plane is within cell_volume/denominator radius of current hypothesis
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "bool";
--  input_types_[3] = "int";
--  input_types_[4] = "float";
--  input_types_[5] = "float";
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_edge_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_edge_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string image_list_fname = pro.get_input<std::string>(1);
--  bool use_ransac=pro.get_input<bool>(2);
--  int consensus_cnt = pro.get_input<int>(3);
--  auto ortho_thres = pro.get_input<float>(4);
--  auto vol_ratio = pro.get_input<float>(5);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  std::cout << "using image ids: ";
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    std::cout << img_id << std::endl;
--    image_ids.push_back(img_id);
--    std::cout << img_id << ' ';
--  }
--  ifs.close();
--  std::cout << std::endl;
--
--  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
--    std::cout << "appearance model EDGE_FLOAT\n";
--    typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
--    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--        return false;
--    }
--    boxm_edge_updater<short,float,float> updater(*scene, image_ids);
--    updater.add_cells();
--  }
--  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
--    std::cout << "appearance model EDGE_LINE\n";
--    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--        return false;
--    }
--
--    boxm_edge_tangent_updater<short,float,float> updater(*scene, image_ids, use_ransac, ortho_thres, vol_ratio, consensus_cnt);
--    updater.add_cells();
--  }
--  //store output
--  // (none)
--
--  return true;
--}
--
--//: set input and output types
--bool boxm_edge_refine_updates_process_cons(bprb_func_process& pro)
--{
--  // process takes 3 inputs:
--  //input[0]: The scene
--  //input[1]: Image list filename
--  //input[2]: camera list filename
--  //input[3]: consensus cnt,
--  std::vector<std::string> input_types_(4);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "int";
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(0);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_edge_refine_updates_process(bprb_func_process& pro)
--{
--  using namespace boxm_edge_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != 4)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << 4 << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string image_list_fname = pro.get_input<std::string>(1);
--  std::string cam_list_fname = pro.get_input<std::string>(2);
--  int consensus_cnt = pro.get_input<int>(3);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<vil_image_view<float> > images;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  std::cout << "using image ids: ";
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    std::cout << "loading: " << img_id << std::endl;
--
--    vil_image_view_base_sptr loaded_image = vil_load(img_id.c_str() );
--    if ( !loaded_image || loaded_image->pixel_format() != VIL_PIXEL_FORMAT_FLOAT) {
--      std::cerr << "Failed to load image file: " << img_id << " or format is not FLOAT img!\n";
--      return false;
--    }
--    vil_image_view<float> img(loaded_image);
--    images.push_back(img);
--  }
--  ifs.close();
--
--  // extract list of image_ids from file
--  std::ifstream ifsc(cam_list_fname.c_str());
--  if (!ifsc.good()) {
--    std::cerr << "error opening file " << cam_list_fname << '\n';
--    return false;
--  }
--
--  std::vector<vpgl_camera_double_sptr> cameras;
--  unsigned int n_cameras = 0;
--  ifsc >> n_cameras;
--  if (n_cameras != n_images) {
--    std::cerr << "camera file and image file do not contain equal numbers of items!\n";
--    return false;
--  }
--
--  std::cout << "using cameras: ";
--  for (unsigned int i=0; i<n_cameras; ++i) {
--    std::string img_id;
--    ifsc >> img_id;
--    std::cout << "loading camera: " << img_id << std::endl;
--
--    vpgl_camera_double_sptr ratcam = read_local_rational_camera<double>(img_id);
--    if ( !ratcam.as_pointer() ) {
--      std::cerr << "Rational camera isn't local... trying global\n";
--      ratcam = read_rational_camera<double>(img_id);
--      if ( !ratcam.as_pointer() ) {
--        std::cout << " camera: " << img_id << " is not local or global rational camera, not supporting any other type for now!\n";
--        return false;
--      }
--    }
--
--    cameras.push_back(ratcam);
--  }
--  ifsc.close();
--  std::cout << std::endl;
--
--  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
--    std::cout << "appearance model EDGE_FLOAT\n";
--    std::cerr << "this process is not defined for this type of scene!\n";
--    return false;
--  }
--  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
--    std::cout << "appearance model EDGE_LINE\n";
--    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--        return false;
--    }
--
--    boxm_edge_tangent_refine_updates<short,float,float> refiner(*scene, consensus_cnt, images, cameras);
--    refiner.refine_cells();
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
-deleted file mode 100644
-index d1010864dd..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
-+++ /dev/null
-@@ -1,199 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
--//:
--// \file
--#include <iostream>
--#include <cstdio>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <brip/brip_vil_float_ops.h>
--
--#include <vnl/algo/vnl_amoeba.h>
--
--#include <vpgl/vpgl_perspective_camera.h>
--#include <bpgl/bpgl_camera_estimator.h>
--#include <bpgl/bpgl_camera_estimator_amoeba.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--#include <boxm/algo/rt/boxm_expected_edge_functor.h>
--
--//: globals
--namespace boxm_estimate_camera_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 3;
--
--  // parameter strings
--  const std::string theta_range_ =  "theta_range";
--  const std::string theta_step_ =  "theta_step";
--  const std::string phi_range_ =  "phi_range";
--  const std::string phi_step_ =  "phi_step";
--  const std::string rot_range_ =  "rot_range";
--  const std::string rot_step_ =  "rot_step";
--  const std::string max_iter_rot_angle_ =  "max_iter_rot_angle";
--  const std::string max_iter_cam_center_ =  "max_iter_cam_center";
--}
--
--//: set input and output types
--bool boxm_estimate_camera_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_estimate_camera_process_globals;
--
--  // process takes 3 inputs:
--  //input[0]: The scene
--  //input[1]: Initial camera
--  //input[2]: Edge image
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "vpgl_camera_double_sptr";
--  input_types_[i++] = "vil_image_view_base_sptr";
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  // process has 3 outputs:
--  // output[0]: The optimized camera
--  // output[1]: Expected edge image (after camera correction)
--  // output[2]: Expected edge image (before camera correction)
--
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j = 0;
--  output_types_[j++] = "vpgl_camera_double_sptr";
--  output_types_[j++] = "vil_image_view_base_sptr";
--  output_types_[j++] = "vil_image_view_base_sptr";
--  return pro.set_output_types(output_types_);
--}
--
--//:  optimizes camera parameters based on edges
--bool boxm_estimate_camera_process(bprb_func_process& pro)
--{
--  using namespace boxm_estimate_camera_process_globals;
--
--  //check number of inputs
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs
--  unsigned i = 0;
--
--  // scene
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // camera
--  vpgl_camera_double_sptr cam_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto *cam_init = dynamic_cast<vpgl_perspective_camera<double>*>(cam_inp.ptr());
--
--  // image
--  vil_image_view_base_sptr img_e_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--  vil_image_view<vxl_byte> img_e_vb(img_e_sptr);
--
--  vil_image_view<float> img_e;
--  brip_vil_float_ops::normalize_to_interval<vxl_byte,float>(img_e_vb,img_e,0.0f,1.0f);
--
--  unsigned ni = img_e.ni();
--  unsigned nj = img_e.nj();
--
--  double deg2rad = vnl_math::pi_over_180;
--
--  // parameters are in degrees
--  double theta_range = 12.0, theta_step = 0.05, phi_range = 12.0, phi_step = 0.05, rot_range = 10.0, rot_step = 1.0;
--  int max_iter_rot_angle = 5, max_iter_cam_center = 50;
--
--  pro.parameters()->get_value(theta_range_, theta_range);
--  pro.parameters()->get_value(theta_step_, theta_step);
--  pro.parameters()->get_value(phi_range_, phi_range);
--  pro.parameters()->get_value(phi_step_, phi_step);
--  pro.parameters()->get_value(rot_range_, rot_range);
--  pro.parameters()->get_value(rot_step_, rot_step);
--  pro.parameters()->get_value(max_iter_rot_angle_, max_iter_rot_angle);
--  pro.parameters()->get_value(max_iter_cam_center_, max_iter_cam_center);
--
--#if 0
--  std::cout << "printing boxm_estimate_camera_process parameters:\n"
--           << "theta_range: " << theta_range << '\n'
--           << "theta_step: " << theta_step << '\n'
--           << "phi_range: " << phi_range << '\n'
--           << "phi_step: " << phi_step << '\n'
--           << "rot_range: " << rot_range << '\n'
--           << "rot_step: " << rot_step << '\n'
--           << "max_iter_rot_angle: " << max_iter_rot_angle << '\n'
--           << "max_iter_cam_center: " << max_iter_cam_center << '\n';
--#endif
--
--  // change the parameters into radians
--  theta_range *= deg2rad; theta_step *= deg2rad; phi_range *= deg2rad; phi_step *= deg2rad; rot_range *= deg2rad; rot_step *= deg2rad;
--
--  auto *img_eei = new vil_image_view<float>(ni,nj,1);
--  img_eei->fill(0.0f);
--
--  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
--        return false;
--      }
--
--      // create the functor that finds edges
--      typedef boxm_expected_edge_functor<short, boxm_inf_line_sample<float> > func_type;
--      func_type func(*scene);
--      bpgl_camera_estimator<func_type > cam_estimator(func);
--      cam_estimator.set_estimation_params(theta_range,theta_step,phi_range,phi_step,rot_range,rot_step,max_iter_rot_angle);
--
--      func.apply(cam_inp,img_eei);
--
--      auto *img_eei_before_correction = new vil_image_view<vxl_byte>(ni,nj,1);
--      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_before_correction,0.0f,255.0f);
--
--      bpgl_camera_estimator_amoeba<func_type> cost_ftn(cam_estimator,img_e,cam_inp);
--      vnl_vector<double> x(2,1.0);
--      vnl_amoeba amoeba(cost_ftn);
--      amoeba.verbose = 1;
--      amoeba.default_verbose = true;
--      amoeba.set_relative_diameter(3.0);
--      amoeba.set_max_iterations(max_iter_cam_center);
--      amoeba.minimize(x);
--      auto *cam_est = new vpgl_perspective_camera<double>(*cam_init);
--      cost_ftn.get_result(x,cam_est);
--
--      vpgl_camera_double_sptr cam_ptr = new vpgl_perspective_camera<double>(*cam_est);
--      func.apply(cam_ptr,img_eei);
--
--      auto *img_eei_vb = new vil_image_view<vxl_byte>(ni,nj,1);
--      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_vb,0.0f,255.0f);
--
--      delete cam_est;
--      delete img_eei;
--
--      // output
--      unsigned j = 0;
--      // update the camera and store
--      pro.set_output_val<vpgl_camera_double_sptr>(j++, cam_ptr);
--      // update the edge image after update and store
--      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_vb);
--      // update the edge image before update and store
--      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_before_correction);
--
--      return true;
--    }
--    else
--    {
--      std::cerr << "boxm_estimate_camera_process: Multibin version not yet implemented\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_estimate_camera_process: undefined APM type\n";
--    return false;
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
-deleted file mode 100644
-index bb10974eef..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
-+++ /dev/null
-@@ -1,139 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Sep 15, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--
--#include <sdet/sdet_img_edge.h>
--
--namespace boxm_generate_edge_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_generate_edge_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_edge_samples_process_globals;
--
--  //process takes 5 inputs
--  //input[0]: The cropped edge image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: n_normal
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "float";
--
--  //output
--  unsigned j = 0;
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[j++] = "float"; // new n_normal value
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_edge_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_edge_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << "boxm_generate_edge_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr edge_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string img_name =  pro.get_input<std::string>(i++);
--  auto n_normal = pro.get_input<float>(i++);
--
--  // get parameters
--  int edge_prob_mask_size = 21;
--  pro.parameters()->get_value("edge_prob_mask_size",edge_prob_mask_size);
--  float edge_prob_mask_sigma = 1.0f;
--  pro.parameters()->get_value("edge_prob_mask_sigma",edge_prob_mask_sigma);
--
--  // check the input validity
--  if ((edge_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--     std::cout << "boxm_generate_edge_samples_process: null input value, cannot run" << std::endl;
--     return false;
--  }
--
--  float new_n_normal=0.0;
--
--
--  if (scene->appearence_model() == BOXM_EDGE_FLOAT) {
--    vil_image_view<float> edge_prob_image;
--    sdet_img_edge::estimate_edge_prob_image(edge_image, edge_prob_image, edge_prob_mask_size, edge_prob_mask_sigma);
--    float edge_prob_image_mean;
--    vil_math_mean(edge_prob_image_mean,edge_prob_image,0);
--    vil_image_view<float> img(edge_prob_image);
--    new_n_normal = n_normal + edge_prob_image_mean;
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_generate_edge_sample_rt<short,boxm_edge_sample<float> > (*s, camera, img, img_name);
--    }
--    else
--    {
--      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
--    }
--  }
--  if (scene->appearence_model() == BOXM_EDGE_LINE) {
--    // get the edges as an image with 3 planes (a,b,c)
--    if (!scene->multi_bin())
--    {
--      typedef boxm_inf_line_sample<float> sample_type;
--      typedef boct_tree<short, sample_type> tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      // for this case, the image should be with 4 planes, representing plane definitions
--      vil_image_view<float> img(edge_image);
--      boxm_generate_edge_tangent_sample_rt<short,sample_type> (*s, camera, img, img_name);
--    }
--    else
--    {
--      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
--    }
--  }
--  else {
--    std::cout << "boxm_generate_edge_samples_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  pro.set_output_val<float>(0, float(new_n_normal));
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
-deleted file mode 100644
-index 06261e8d44..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
-+++ /dev/null
-@@ -1,142 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
--//:
--// \file
--// \brief Process to generate samples needed for boxm_opt2_optimizer_process from a given image/camera pair
--//
--// \author Daniel Crispell
--// \date Feb 17, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_generate_opt2_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_generate_opt2_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt2_samples_process_globals;
--
--  // process takes 7 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: shadow prior
--  //input[5]: shadow sigma
--  //input[6]: use black background
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "float";
--  input_types_[5] = "float";
--  input_types_[6] = "bool";
--
--  std::vector<std::string>  output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_opt2_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt2_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_generate_opt2_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(0);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(1);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(2);
--  std::string img_name =  pro.get_input<std::string>(3); // TODO - unused!!
--  auto shadow_prior = pro.get_input<float>(4);
--  auto shadow_sigma = pro.get_input<float>(5);
--  bool use_black_background =  pro.get_input<bool>(6);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--    std::cout << "boxm_generate_opt2_samples_process: null input value, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      // create alternate appearance models
--      std::vector<float> alt_appearance_priors;
--      std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype> alt_appearance_models;
--      if (shadow_prior > 0.0f) {
--        boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype shadow_model(0.0f, shadow_sigma);
--        alt_appearance_priors.push_back(shadow_prior);
--        alt_appearance_models.push_back(shadow_model);
--      }
--      if (!scene->multi_bin()) {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
--      }
--      else {
--        std::cerr << "error: multi-bin scenes not supported\n";
--      }
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      // create alternate appearance models
--      std::vector<float> alt_appearance_priors;
--      std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype> alt_appearance_models;
--      if (shadow_prior > 0.0f) {
--        boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype shadow_model;
--        // insert a single mode with mean at 0
--        bsta_gauss_sf1 single_mode(0.0f, shadow_sigma*shadow_sigma);
--        shadow_model.insert(bsta_num_obs<bsta_gauss_sf1>(single_mode), 1.0f);
--        alt_appearance_priors.push_back(shadow_prior);
--        alt_appearance_models.push_back(shadow_model);
--      }
--      if (!scene->multi_bin()) {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
--      }
--      else {
--        std::cerr << "error: multi-bin scenes not supported\n";
--      }
--      break;
--    }
--   default:
--    std::cout << "boxm_generate_opt2_samples_process: unsupported APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
-deleted file mode 100644
-index 0eb591c79c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
-+++ /dev/null
-@@ -1,114 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
--//:
--// \file
--// \brief Process to generate samples needed for boxm_opt3_optimizer_process from a given image/camera pair
--//
--// \author Daniel Crispell
--// \date Feb 17, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_generate_opt3_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_generate_opt3_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt3_samples_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: use black background
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "bool";
--
--  std::vector<std::string>  output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_opt3_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt3_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_generate_opt3_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--    std::cout << "boxm_generate_opt3_samples_process: null input value, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      if (!scene->multi_bin())
--      {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
--      }
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      if (!scene->multi_bin())
--      {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
--      }
--      break;
--    }
--   default:
--    std::cout << "boxm_generate_opt3_samples_process: unsupported APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
-deleted file mode 100644
-index fac0d9d3ae..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Sep 15, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_generate_opt_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_generate_opt_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt_samples_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: use black background
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_opt_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_generate_opt_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--     std::cout << "boxm_generate_opt_samples_process: null input value, cannot run" << std::endl;
--     return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_generate_opt_sample_rt(*s, camera,img,img_name,use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  }
--  else {
--    std::cout << "boxm_generate_opt_samples_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
-deleted file mode 100644
-index 30a4014572..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
-+++ /dev/null
-@@ -1,153 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
--// \author Daniel Crispell
--// \date   February 17, 2010
--//
--// \verbatim
--//  Modifications
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/algo/rt/boxm_opt2_optimizer.h>
--
--namespace boxm_opt2_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 2;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_opt2_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_opt2_update_process_globals;
--
--  // process takes 2 inputs:
--  //input[0]: The scene
--  //input[1]: The filename of the text file containing list of image names
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_opt2_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_opt2_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  boxm_apm_type apm_type = scene_base->appearence_model();
--
--  std::string image_list_fname = pro.get_input<std::string>(1);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    image_ids.push_back(img_id);
--  }
--  ifs.close();
--
--  switch (apm_type)
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt2_optimizer<short,BOXM_APM_SIMPLE_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
--      optimizer.update();
--
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt2_optimizer<short,BOXM_APM_MOG_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
--      optimizer.update();
--
--      break;
--    }
--#if 0 // commented out
--   case BOXM_APM_SIMPLE_RGB:
--    {
--      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#endif // 0
--   default:
--    std::cerr << "error - boxm_opt2_update_process: unsupported appearance model type " << apm_type << '\n';
--    return false;
--  }
--
--  //store output
--  // (none)
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
-deleted file mode 100644
-index 47f40dd19a..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
-+++ /dev/null
-@@ -1,153 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
--// \author Daniel Crispell
--// \date   February 17, 2010
--//
--// \verbatim
--//  Modifications
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/algo/rt/boxm_opt3_optimizer.h>
--
--namespace boxm_opt3_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 2;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_opt3_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_opt3_update_process_globals;
--
--  // process takes 2 inputs:
--  //input[0]: The scene
--  //input[1]: The filename of the text file containing list of image names
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_opt3_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_opt3_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  boxm_apm_type apm_type = scene_base->appearence_model();
--
--  std::string image_list_fname = pro.get_input<std::string>(1);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    image_ids.push_back(img_id);
--  }
--  ifs.close();
--
--  switch (apm_type)
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt3_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
--      optimizer.optimize_cells();
--
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt3_optimizer<short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
--      optimizer.optimize_cells();
--
--      break;
--    }
--#if 0 // commented out
--   case BOXM_APM_SIMPLE_RGB:
--    {
--      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#endif // 0
--   default:
--    std::cerr << "error - boxm_opt3_update_process: unsupported appearance model type " << apm_type << '\n';
--    return false;
--  }
--
--  //store output
--  // (none)
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
-deleted file mode 100644
-index 56d4d9051d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
-+++ /dev/null
-@@ -1,145 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of images, using a damped version of Bayes' rule
--// \author Daniel Crispell
--// \date   April 2, 2009
--//
--// \verbatim
--//  Modifications
--//   Aug 3, 2009  Gamze Tunali - Moved from lemsvxl/psm_opt to vxl
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
--
--namespace boxm_opt_bayesian_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 3;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_opt_bayesian_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_opt_bayesian_update_process_globals;
--
--  // process takes 3 inputs:
--  //input[0]: The scene
--  //input[1]: The damping value
--  //input[2]: The filename of the text file containing list of image names
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float";
--  input_types_[2] = "vcl_string";
--
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_opt_bayesian_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_opt_bayesian_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  boxm_apm_type apm_type = scene_base->appearence_model();
--
--  auto damping_factor = pro.get_input<float>(1);
--
--  std::string image_list_fname = pro.get_input<std::string>(2);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << std::endl;
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    image_ids.push_back(img_id);
--  }
--  ifs.close();
--
--  switch (apm_type)
--  {
--    case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#if 0 // commented out
--    case BOXM_APM_SIMPLE_RGB:
--    {
--      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#endif // 0
--    default:
--      std::cerr << "error - boxm_opt_bayesian_update_process: unsupported appearance model type " << apm_type << std::endl;
--      return false;
--  }
--
--  //store output
--  // (none)
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
-deleted file mode 100644
-index 5507b5b55b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
-+++ /dev/null
-@@ -1,107 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A process for describing the attributes of a scene
--//
--// \author J.L. Mundy
--// \date January 24, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <boxm/boxm_apm_traits.h>
--#include <bsta/bsta_histogram_sptr.h>
--#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
--
--namespace boxm_ray_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_ray_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_ray_statistics_process_globals;
--
--  //process takes 2 input
--  //input[0]: scene binary file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";  //ni
--  input_types_[3] = "unsigned";  //nj
--
--  // process has 1 output:
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "bsta_histogram_sptr"; // No of rays per cell Histogram
--  //output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
--  //output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
--  //output_types_[3] = "unsigned";            // Number of leaves
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//: This process produces one output:
--//  * The distribution of "Omega" values where Omega = 1-e^( alpha x length )
--//  The following three outputs are no longer present:
--//  * The distribution of "Sigma" values where Sigma is the std_dev of
--//    the appearance model. (currently implemented only for simple grey)
--//  * The histogram of levels for leaves in the octree
--//  * The number of leaves in the tree
--//
--bool boxm_ray_statistics_process(bprb_func_process& pro)
--{
--  using namespace boxm_ray_statistics_process_globals;
--
--  if ( !pro.verify_inputs() ) {
--    std::cerr << pro.name() << ": invalid inputs\n";
--    return false;
--  }
--  // assign tree type
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
--  vpgl_camera_double_sptr cam_ptr = pro.get_input<vpgl_camera_double_sptr>(1);
--  auto ni = pro.get_input<unsigned>(2);
--  auto nj = pro.get_input<unsigned>(3);
--
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
--
--      bsta_histogram<float> num_rays_hist;
--      if (!compute_ray_statistics<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
--        return false;
--      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));    }
--    else
--    {
--      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/Gaussian mixture\n";
--      return false;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
--  {
--    if (!scene_ptr->multi_bin()) {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
--
--      bsta_histogram<float> num_rays_hist;
--      if (!compute_ray_statistics<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
--        return false;
--      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));
--    }
--    else {
--      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/simple_grey\n";
--      return false;
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
-deleted file mode 100644
-index 5af8acd7f8..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
-+++ /dev/null
-@@ -1,114 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining expected depth map for the world
--//
--// \author Vishal Jain
--// \date Aug 26, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_image_view.h>
--
--namespace boxm_render_expected_depth_rt_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_depth_rt_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_depth_rt_process_globals;
--
--  //process takes 4 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_depth_rt_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_depth_rt_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--      vil_image_view<float> mask(ni,nj,1);
--      vil_image_view<float> expected(ni,nj,1);
--
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask);
--      img_mask = new vil_image_view<float>(mask);
--      img = new vil_image_view<float>(expected);
--  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--      vil_image_view<float> mask(ni,nj,1);
--      vil_image_view<float> expected(ni,nj,1);
--
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask);
--      img_mask = new vil_image_view<float>(mask);
--      img = new vil_image_view<float>(expected);
--  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--      vil_image_view<float> mask(ni,nj,1);
--      vil_image_view<float> expected(ni,nj,1);
--
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask);
--      img_mask = new vil_image_view<float>(mask);
--      img = new vil_image_view<float>(expected);
--  } else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
-deleted file mode 100644
-index 74ee8c9a88..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
-+++ /dev/null
-@@ -1,162 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--namespace boxm_render_expected_edge_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_edge_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_process_globals;
--
--  //process takes 7 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4]: n_normal
--  //input[5]: num samples used for update
--  //input[6]: Threshold for edges
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "float";
--  input_types_[5] = "unsigned";
--  input_types_[6] = "float";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[1]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_edge_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--  auto n_normal = pro.get_input<float>(i++);
--  // number of updates
--  auto num_updates = pro.get_input<unsigned>(i++);
--  //float threshold = pro.get_input<float>(i++); // FIXME: unused; see line 138
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
--    vil_image_view<boxm_apm_traits<BOXM_EDGE_FLOAT>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_edge_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
--        return false;
--      }
--      boxm_render_edge_image_rt<short, boxm_edge_sample<float> >(*scene, camera, expected, mask,n_normal,num_updates);
--    }
--    else
--    {
--      std::cerr << "Ray tracing version not yet implemented\n";
--      return false;
--    }
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<vxl_byte>(ni,nj,expected.nplanes());
--    for (unsigned i=0; i<ni; i++) {
--      for (unsigned j=0; j<nj; j++) {
--        (*expected_byte)(i,j) = static_cast<unsigned char>(255.0*(expected(i,j)));
--      }
--    }
--    img = expected_byte;
--        img_mask = new vil_image_view<float>(mask);
--
--    auto *ex = new vil_image_view<float>(ni,nj,expected.nplanes());
--    for (unsigned i=0; i<ni; i++) {
--      for (unsigned j=0; j<nj; j++) {
--        (*ex)(i,j) = expected(i,j);//static_cast<unsigned char>(255.0*(expected(i,j)));
--      }
--    }
--    img = ex;
--      unsigned j = 0;
--    pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--    pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--    return true;
--  }
--
--  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
--    vil_image_view<float > expected(ni,nj,1);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
--        return false;
--      }
--      boxm_render_edge_tangent_image_rt<short, boxm_inf_line_sample<float> >(*scene, camera, expected);//, n_normal,num_updates, threshold);
--
--      auto *edge_image=new  vil_image_view<float >(ni,nj,1);
--      *edge_image=expected;
--
--      unsigned j = 0;
--      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
--      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
--      return true;
--    }
--    else
--    {
--      std::cerr << "Ray tracing version not yet implemented\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_render_expected_edge_process: undefined APM type\n";
--    return false;
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
-deleted file mode 100644
-index f92621784d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
-+++ /dev/null
-@@ -1,143 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for rendering an expected image of a given scene and camera.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--#include <vil/vil_convert.h>
--
--namespace boxm_render_expected_rt_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_rt_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_rt_process_globals;
--
--  //process takes 5 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4]: black background?
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "bool";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_rt_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_rt_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
--    }
--    else
--    {
--       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
--       return false;
--    }
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
--    }
--    else
--    {
--       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
--       return false;
--    }
--  //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
--    }
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  } else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
-deleted file mode 100644
-index b3c1ee031e..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
-+++ /dev/null
-@@ -1,119 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
--#include <iostream>
--#include <cstdio>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for registering the RPC camera based on the edges in the world
--// \author Gamze Tunali
--// \date   Feb 1st, 2010
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--#include <boxm/algo/rt/boxm_rpc_registration.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: globals
--namespace boxm_rpc_registration_process_globals
--{
--  constexpr unsigned n_inputs_ = 8;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: set input and output types
--bool boxm_rpc_registration_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_rpc_registration_process_globals;
--
--  // process takes 8 inputs:
--  // input[0]: The scene
--  // input[1]: The current camera
--  // input[2]: The current edge image
--  // input[3]: The expected edge image
--  // input[4]: The flag indicating whether to align the 3D voxel world along with image
--  // input[5]: Uncertainty in meters
--  // input[6]: n_normal
--  // input[7]: num_observation
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "vpgl_camera_double_sptr";
--  input_types_[i++] = "vil_image_view_base_sptr";
--  input_types_[i++] = "vil_image_view_base_sptr";
--  input_types_[i++] = "bool";
--  input_types_[i++] = "float";
--  input_types_[i++] = "float";
--  input_types_[i++] = "unsigned";
--
--  // process has 1 output:
--  // output[0]: The optimized camera
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j = 0;
--  output_types_[j++] = "vpgl_camera_double_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:  optimizes rpc camera parameters based on edges
--bool boxm_rpc_registration_process(bprb_func_process& pro)
--{
--  using namespace boxm_rpc_registration_process_globals;
--
--  //check number of inputs
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs
--  unsigned i = 0;
--
--  // scene
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // camera
--  vpgl_camera_double_sptr camera_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
--
--  // image
--  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--
--  vil_image_view_base_sptr expected_edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--
--  // boolean parameter specifying the voxel world alignment state
--  bool rpc_shift_3d_flag = pro.get_input<bool>(i++);
--
--  // uncertainty in meters
--  auto uncertainty = pro.get_input<float>(i++);
--
--  // n_normal
--  auto n_normal = pro.get_input<float>(i++);
--
--  // number of observations
--  auto num_observation = pro.get_input<unsigned>(i++);
--
--  std::string edge_type="subpixel";//pro.get_input<std::string>(i++);
--
--  vpgl_camera_double_sptr camera_out;
--
--  if (edge_type=="subpixel")
--  {
--    vil_image_view<float > expected_edge_image(expected_edge_image_sptr);
--    vil_image_view<float> edge_image(edge_image_sptr);
--    boxm_rpc_registration<short,boxm_inf_line_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty, num_observation);
--  }
--  else {
--    vil_image_view<vxl_byte> expected_edge_image(expected_edge_image_sptr);
--    vil_image_view<vxl_byte> edge_image(edge_image_sptr);
--    boxm_rpc_registration<short,boxm_edge_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty,n_normal, num_observation);
--  }
--
--  // output
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<vpgl_camera_double_sptr>(j++, camera_out);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
-deleted file mode 100644
-index 128496aee8..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
-+++ /dev/null
-@@ -1,136 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Apr 21, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_update_image_functor.h>
--#include <boxm/boxm_apm_traits.h> // for BOXM_APM_MOG_GREY
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_update_rt_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_update_rt_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_update_rt_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: The bin index to be updated
--  //input[4]: Use black background?
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_update_rt_process(bprb_func_process& pro)
--{
--  using namespace boxm_update_rt_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_update_rt_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  /* unsigned bin_index = */   pro.get_input<unsigned>(i++);
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--     std::cout << "boxm_update_rt_process: null input value, cannot run" << std::endl;
--     return false;
--  }
--
--  // Mixture of Gaussians
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, camera,img, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  // Mixture of Beta's
--  } else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, camera,img, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  } else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_image_rt(*s, camera,img, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  }
--  else {
--    std::cout << "boxm_update_rt_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index 1b63879e8e..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_algo_rt_pro_test_include test_include.cxx )
--target_link_libraries( boxm_algo_rt_pro_test_include boxm_algo_rt_pro)
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
-deleted file mode 100644
-index f43a3a7286..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/pro/boxm_algo_rt_processes.h>
--#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
-deleted file mode 100644
-index 73a8978f93..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,16 +0,0 @@
--add_executable( boxm_algo_rt_test_all
--  test_driver.cxx
--  test_bayesian_optimizer.cxx
--  test_edges.cxx
--  test_shadow_appearance.cxx
-- )
--
--target_link_libraries( boxm_algo_rt_test_all boxm_algo_rt boxm boxm_util boxm_sample boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME boxm_algo_rt_test_bayesian_optimizer COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_bayesian_optimizer  )
--add_test( NAME boxm_algo_rt_test_edges COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_edges  )
--add_test( NAME boxm_algo_rt_test_shadow_appearance COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_shadow_appearance  )
--add_executable( boxm_algo_rt_test_include test_include.cxx )
--target_link_libraries( boxm_algo_rt_test_include boxm_algo_rt)
--add_executable( boxm_algo_rt_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_algo_rt_test_template_include boxm_algo_rt)
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
-deleted file mode 100644
-index 5ec14a4181..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
--#include <boct/boct_tree.h>
--#include <vul/vul_file.h>
--
--static void test_bayesian_optimizer()
--{
--  typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
--  typedef boxm_rt_sample<float> aux_type;
--
--  // create the main scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_octree_levels(3,2);
--  scene.set_paths("./boxm_scene", "block");
--  scene.set_appearance_model(BOXM_APM_SIMPLE_GREY);
--  x_write(std::cout, scene, "scene");
--  vul_file::make_directory("./boxm_scene");
--  scene.write_scene();
--  //vsl_b_ofstream os("scene.bin");
--  //scene.b_write(os);
--  //os.close();
--
--  boxm_block_iterator<boct_tree<short,data_type> > iter(&scene);
--  // default model
--  boxm_simple_grey apm(0.3f, 0.4f, 0.5f);
--
--  boxm_sample<BOXM_APM_SIMPLE_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(apm);
--
--  // sample 1
--  boxm_sample<BOXM_APM_SIMPLE_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(apm);
--
--  // sample 2
--  boxm_sample<BOXM_APM_SIMPLE_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(apm);
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
--    boct_tree<short,data_type> * tree= block->get_tree();//new boct_tree<short,data_type>(3,2);
--    boct_tree_cell<short,data_type>* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,data_type>* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    block->get_tree()->print();
--    scene.write_active_block();
--    iter++;
--  }
--
--  // create the auxiliary scenes for each image
--  std::vector<std::string> image_names;
--  image_names.emplace_back("image1");
--  image_names.emplace_back("image2");
--  image_names.emplace_back("image3");
--  std::vector<boxm_scene<boct_tree<short,aux_type> >*> aux_scenes(image_names.size());
--
--  // create aux scenes
--  for (unsigned i=0; i<image_names.size(); i++) {
--    aux_scenes[i] = new boxm_scene<boct_tree<short,aux_type> >(scene.lvcs(), scene.origin(), scene.block_dim(), scene.world_dim());
--    aux_scenes[i]->set_path(scene.path(),  image_names[i]);
--    iter.begin();
--    while (!iter.end()) {
--      scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--      boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
--      boct_tree<short,data_type>* tree=block->get_tree();
--      boct_tree<short,aux_type>* aux_tree = tree->clone_to_type<aux_type>();
--      boct_tree_cell<short,aux_type>* cell1=aux_tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--      boxm_rt_sample<float> rt;
--      rt.seg_len_=1.0;
--      cell1->set_data(rt);
--      boct_tree_cell<short,aux_type>* cell2=aux_tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--      rt.seg_len_=0.5;
--      cell2->set_data(rt);
--      aux_scenes[i]->set_block(iter.index(), new boxm_block<boct_tree<short,aux_type> >(block->bounding_box(), aux_tree));
--      aux_scenes[i]->write_active_block();
--      ++iter;
--    }
--  }
--
--  boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> opt(scene, image_names);
--  opt.optimize_cells(0.01);
--
--  for (unsigned i=0; i<image_names.size(); i++) {
--    delete aux_scenes[i];
--  }
--}
--
--TESTMAIN(test_bayesian_optimizer);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
-deleted file mode 100644
-index 7473709bdf..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,15 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_bayesian_optimizer );
--DECLARE( test_edges );
--DECLARE( test_shadow_appearance );
--
--void register_tests()
--{
--  REGISTER( test_bayesian_optimizer );
--  REGISTER( test_edges );
--  REGISTER( test_shadow_appearance );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
-deleted file mode 100644
-index 6f6a62f9c6..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
-+++ /dev/null
-@@ -1,26 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boct/boct_tree.h>
--
--static void test_edges()
--{
--  typedef boxm_inf_line_sample<float> data_type;
--  // create the main scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
--  // create the auxiliary scenes for each image
--  std::vector<std::string> image_names;
--  image_names.emplace_back("image1");
--  image_names.emplace_back("image2");
--  image_names.emplace_back("image3");
--  //boxm_edge_tangent_updater<short, float, aux_type> u(scene,imgs);
--}
--
--TESTMAIN(test_edges);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
-deleted file mode 100644
-index 6b1edbffb5..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#include <boxm/algo/rt/boxm_change_3d_functor.h>
--#include <boxm/algo/rt/boxm_change_probability_functor.h>
--#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
--#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
--#include <boxm/algo/rt/boxm_edge_updater.h>
--#include <boxm/algo/rt/boxm_expected_edge_functor.h>
--#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_shadow_sample_functor.h>
--#include <boxm/algo/rt/boxm_opt2_optimizer.h>
--#include <boxm/algo/rt/boxm_opt3_optimizer.h>
--#include <boxm/algo/rt/boxm_opt_appearance_estimator.h>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
--#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_shadow_image_functor.h>
--#include <boxm/algo/rt/boxm_rpc_registration.h>
--#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
--#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
--#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.h>
--#include <boxm/algo/rt/boxm_sun_vis_prob_functor.h>
--#include <boxm/algo/rt/boxm_update_image_functor.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
-deleted file mode 100644
-index f97877bc43..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
--#include <boct/boct_tree.h>
--#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
--
--namespace test_shadow_appearance_globals
--{
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_type;
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype app_type;
--}
--
--
--static void test_shadow_appearance()
--{
--  using namespace test_shadow_appearance_globals;
--  //normalized observations square building (I-A)/(mu+ - A), partly in shadow
--  double obs_arr[] = {0.600555,0.7,0.061111,0.748335,0.77611,0.68611,
--                      0.148889,0.855555,0.664445,0.651665,0.101111,
--                      0.0272222,0.67278,0.70389,0.1733335,0.77111,
--                      0.701665,0.64778,0.65111,0.72611,0.82889,0.735,
--                      0.077222,0.0816665,0.051111,0.71722,0.61722,
--                      0.065,0.095,0.0866665,0.58611,0.665555};
--  std::vector<obs_type> obs;
--  std::vector<float> pre, vis;
--  for (double i : obs_arr) {
--    obs.push_back(static_cast<obs_type>(i));
--    pre.push_back(0.0f);
--    vis.push_back(1.0f);
--  }
--  float min_app_sigma = 0.05f;
--  float shadow_prior = 0.5f;
--  float shadow_mean = 0.0f;
--  float shadow_sigma = 0.05f;
--  bool verbose = true;
--  app_type model;
--  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(obs, pre, vis,
--                                                       model,
--                                                       min_app_sigma,
--                                                       shadow_prior,
--                                                       shadow_mean,
--                                                       shadow_sigma,
--                                                       verbose);
--  double er = std::fabs(0.70034355-model.color())+
--    std::fabs(model.sigma()- 1.0/11.954589);
--  TEST_NEAR("test shadow appearance EM", er, 0.0, 1e-6);
--  // normalized observations for dark road surface
--double dark_obs_arr[] ={0.0477778,0.0666665,0.0072222,0.175,0.12,
--                        0.162778,0.003333335,0.188889,0.233889,
--                        0.0605555,0.0077778,0.004444445,0.0883335,
--                        0.15,0.0716665,0.1233335,0.1983335,0.15,
--                        0.0883335,0.03944445,0.122222,0.125,0.25,
--                        0.005,0.0122222,0.1,0.1166665,0.03166665,
--                        0.015,0.01,0.1016665,0.167222};
--  std::vector<obs_type> dark_obs;
--  for (double i : dark_obs_arr)
--    dark_obs.push_back(static_cast<obs_type>(i));
--  app_type dark_model;
--  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(dark_obs, pre, vis,
--                                                       dark_model,
--                                                       min_app_sigma,
--                                                       shadow_prior,
--                                                       shadow_mean,
--                                                       shadow_sigma,
--                                                       verbose);
--  double dark_er = std::fabs(0.14765342-dark_model.color())
--                 + std::fabs(dark_model.sigma()- 1.0/16.097824);
--  TEST_NEAR("test dark surface shadow appearance EM", dark_er, 0.0, 1e-6);
--}
--
--TESTMAIN(test_shadow_appearance);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
-deleted file mode 100644
-index 03c12cb61b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
--#include <boxm/algo/rt/boxm_edge_updater.hxx>
--#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
--#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
--#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
--#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
-deleted file mode 100644
-index 16a9fc1839..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
-+++ /dev/null
-@@ -1,22 +0,0 @@
--# brl/bseg/boxm/algo/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_algo_sp_sources
--    boxm_compute_volume_visibility.h
--    boxm_depth_image_triangle.h
--    boxm_render_image.h
--    boxm_render_image_triangle.h
--    boxm_update.h
--    boxm_update_triangle.h
--    dummy.cxx
--   )
--
--vxl_add_library(LIBRARY_NAME boxm_algo_sp LIBRARY_SOURCES ${boxm_algo_sp_sources})
--
--#processes
--add_subdirectory(pro)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_algo_sp boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h b/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
-deleted file mode 100644
-index 1f1bbbd6c9..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
-+++ /dev/null
-@@ -1,172 +0,0 @@
--#ifndef boxm_compute_volume_visibility_h
--#define boxm_compute_volume_visibility_h
--#include <iostream>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--float boxm_compute_point_visibility(vgl_point_3d<double> point,
--                                    boxm_scene<boct_tree<T_loc, T_data > > & scene,
--                                    vpgl_camera_double_sptr & camera )
--{
--  typedef boct_tree<T_loc,T_data > tree_type;
--  // locate the cells corresponding to query volume.
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    // make a test for vertices for behind-front case
--    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--
--    std::cout<<"The point is "<<point;
--    if (cam->is_behind_camera(vgl_homg_point_3d<double>(point)))
--    return 1.0f;
--    // first block of intersection
--
--    // case 1 : when the camera lies inside the scene
--    vgl_homg_point_3d<double> cam_center_homg = cam->camera_center();
--    vgl_point_3d<double> cam_center(cam_center_homg);
--    vgl_point_3d<int> curr_block_index;
--
--    vgl_vector_3d<double> dir=(point-cam_center);
--    double lambda0=dir.length();
--    dir/=lambda0;
--
--    boxm_block<tree_type> * curr_block=scene.get_block(cam_center);
--    vgl_point_3d<double> entry_point=cam_center;
--    double lambda=0;
--
--    // case 2: camera lies outside the scene
--    if (!curr_block)
--    {
--      vgl_box_3d<double> world_bb=scene.get_world_bbox();
--      boct_face_idx face_id;
--      if (!boxm_utils::cube_entry_point(world_bb,cam_center,dir,entry_point,lambda,face_id))
--      return 1.0f;
--      if (!scene.get_block_index(entry_point,curr_block_index))
--      return 1.0f;
--    }
--    else
--    {
--      scene.get_block_index(cam_center,curr_block_index);
--    }
--
--    scene.load_block(curr_block_index);
--    curr_block=scene.get_active_block();
--    bool continue_flag=true;
--
--    tree_type * tree=curr_block->get_tree();
--
--    vgl_point_3d<double> exit_point;
--    boct_face_idx face_id=NONE;
--    double alpha_int=0;
--    boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(entry_point);
--    while (continue_flag)
--    {
--      // do processing in the block
--      if (curr_cell)
--      {
--        if (boxm_utils::cube_exit_point(tree->cell_bounding_box(curr_cell),
--        cam_center,dir,exit_point,lambda,face_id))
--        {
--          if (lambda>lambda0)
--          continue_flag=false;
--          else
--          {
--            std::vector<boct_tree_cell<T_loc,T_data > * > neighbors;
--            curr_cell->find_neighbors(face_id,neighbors,tree->root_level());
--
--            vgl_vector_3d<double> len(exit_point-entry_point);
--            T_data data=curr_cell->data();
--            alpha_int-=data.alpha*len.length();
--            curr_cell=nullptr;
--#if 0
--            std::cout<<"Lambda= "<<lambda<<" lambda0= "<<lambda0
--                    <<" exit_point="<<exit_point<<"# of neighbors"<< neighbors.size()<<std::endl;
--#endif
--            double min_dist=1e5;
--            int min_i=-1;
--            for (unsigned i=0;i<neighbors.size();++i)
--            {
--              vgl_box_3d<double> bbox=tree->cell_bounding_box(neighbors[i]);
--              double dist=0;
--              if (exit_point.x()<bbox.min_x())
--                dist+=std::fabs(exit_point.x()-bbox.min_x());
--              if (exit_point.x()>bbox.max_x())
--                dist+=std::fabs(exit_point.x()-bbox.max_x());
--              if (exit_point.y()<bbox.min_y())
--                dist+=std::fabs(exit_point.y()-bbox.min_y());
--              if (exit_point.y()>bbox.max_y())
--                dist+=std::fabs(exit_point.y()-bbox.max_y());
--              if (exit_point.z()<bbox.min_z())
--                dist+=std::fabs(exit_point.z()-bbox.min_z());
--              if (exit_point.z()>bbox.max_z())
--                dist+=std::fabs(exit_point.z()-bbox.max_z());
--
--              if (dist<min_dist)
--              {
--                min_dist=dist;
--                min_i=i;
--              }
--            }
--            if (min_i>=0)
--              curr_cell=neighbors[min_i];
--            else if (neighbors.size()>0)
--            {
--              std::cout<<"ERROR"<<std::endl;return -1.0f;
--            }
--            entry_point=exit_point;
--          }
--        }
--      }
--      // when the block is exhausted obtain a new block
--      else
--      {
--        if (face_id==X_LOW)
--          curr_block_index.set(curr_block_index.x()-1,curr_block_index.y(),curr_block_index.z());
--        if (face_id==X_HIGH)
--          curr_block_index.set(curr_block_index.x()+1,curr_block_index.y(),curr_block_index.z());
--        if (face_id==Y_LOW)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y()-1,curr_block_index.z());
--        if (face_id==Y_HIGH)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y()+1,curr_block_index.z());
--        if (face_id==Z_LOW)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()-1);
--        if (face_id==Z_HIGH)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()+1);
--
--        if (scene.valid_index(curr_block_index))
--        {
--          scene.load_block(curr_block_index);
--          curr_block=scene.get_active_block();
--          tree=curr_block->get_tree();
--          curr_cell=tree->locate_point_global(entry_point);
--        }
--        else
--        {
--          continue_flag=false;
--        }
--      }
--    }
--    return (float)std::exp(alpha_int);
--  }
--  else
--  {
--  std::cout<<"Not a perspective camera"<<std::endl;
--  return -1.0f;
--  }
--}
--
--
--template <class T_loc, class T_data>
--float boxm_compute_volume_visibility(vgl_box_3d<double> bbox,
--                                     boxm_scene<boct_tree<T_loc,T_data> > & scene,
--                                     vpgl_camera_double_sptr & cam )
--{
--  // locate the cells corresponding to query volume.
--  return boxm_compute_point_visibility<T_loc,T_data>(bbox.centroid(),scene,cam);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
-deleted file mode 100644
-index bb07d38325..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
-+++ /dev/null
-@@ -1,127 +0,0 @@
--#ifndef boxm_depth_image_triangle_h_
--#define boxm_depth_image_triangle_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include "boxm_render_image.h"
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vpgl/vpgl_camera.h>
--
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#include <vil/vil_transform.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vul/vul_timer.h>
--
--
--template <class T_loc, class T_data>
--void boxm_depth_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                         vpgl_camera_double_sptr cam,
--                                         vil_image_view<float> &expected,
--                                         vil_image_view<float> &mask)
--{
--  unsigned ni=expected.ni();
--  unsigned nj=expected.nj();
--  expected.fill(0.0f);
--  vgl_plane_3d<double> projection_plane;
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
--  vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
--  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
--  vul_timer t;
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
--  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
--
--  while (block_vis_iter.next())
--  {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) // code for each block
--    {
--      t.mark();
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      t.mark();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_depth(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
--      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
--      normalize_expected_functor norm_fn;
--
--      double xverts[8];
--      double yverts[8];
--      float vertdists[8];
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        vis_end.fill(0.0f);
--        temp_depth.fill(0.0f);
--        temp_weights.fill(0.0f);
--        alpha_img_.fill(0.0f);
--
--        std::cout<<'.';
--
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          //if (sample.alpha>0.001)
--          {
--            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--            // get  alpha
--            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--            boxm_depth_fill(xverts, yverts, vertdists, vis_face_ids,temp_depth);
--          }
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights_);
--
--        // scale cell expected image by weighting function..
--        vil_math_image_product( temp_depth,pix_weights_, temp_depth);
--        // ..and use result to update final expected image
--        vil_math_image_sum(temp_depth,expected,expected);
--
--        vis.deep_copy(vis_end);
--      }
--    }
--  }
--  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
-deleted file mode 100644
-index d6cd56258c..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
-+++ /dev/null
-@@ -1,166 +0,0 @@
--#ifndef boxm_render_image_h_
--#define boxm_render_image_h_
--
--#include <vector>
--#include <sstream>
--#include <iostream>
--
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#include <vil/vil_transform.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vul/vul_timer.h>
--
--class normalize_expected_functor
--{
-- public:
--  normalize_expected_functor() = default;
--
--  void operator()(float  norm, float & val) const
--  {
--    if (norm>0)
--      val/=norm;
--  }
--};
--
--class image_exp_functor
--{
-- public:
--  float operator()(float x) const { return x<0?std::exp(x):1.0f; }
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_image_splatting(boxm_scene<boct_tree<T_loc,T_data> >& scene,
--                                 vpgl_camera_double_sptr cam,
--                                 vil_image_view<typename T_data::obs_datatype>& expected,
--                                 vil_image_view<float>& /*mask*/,       // TODO: use this param
--                                 int bin=-1,
--                                 bool /*use_black_background*/ = false) // TODO: use this param
--{
--  unsigned ni=expected.ni();
--  unsigned nj=expected.nj();
--  expected.fill(0.0f);
--
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
--  vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
--
--  vul_timer t;
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
--  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
--
--  int cnt=0;
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--
--      t.mark();
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
--
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      std::cout<<"Block: "<<curr_block->bounding_box()<<std::endl
--              <<"Tree: "<<curr_block->get_tree()->number_levels()
--              << " #of leaf cells "<<curr_block->get_tree()->leaf_cells().size()<<std::endl;
--
--      t.mark();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(expected.ni(),expected.nj(),3);
--      vil_image_view<float> back_xyz(expected.ni(),expected.nj(),3);
--      vil_image_view<float> alphas(expected.ni(),expected.nj(),1);
--      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
--      normalize_expected_functor norm_fn;
--
--      double  xverts[8];
--      double  yverts[8];
--
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        front_xyz.fill(0.0f);
--        back_xyz.fill(0.0f);
--        alphas.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        temp_weights.fill(0.0f);
--        std::cout<<'.';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          //if (sample.alpha>0.001)
--          {
--            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--            boxm_utils::project_corners(corners,cam,xverts,yverts);
--            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--            boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
--            // get expected color of cell
--            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
--            // get  alpha
--            boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--            // fill expected value image
--            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
--            boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
--         }
--        }
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(expected.ni(),expected.nj(),1);
--
--        len_seg.fill(0.0f);
--        std::stringstream s,s1;
--
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,back_xyz);
--        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
--        vil_math_sqrt<float>(len_seg);
--        vil_math_image_product(len_seg,alphas, alphas);
--        vil_transform2(temp_weights,temp_expected,norm_fn);
--        ++cnt;
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,vis);
--        // scale cell expected image by weighting function..
--        vil_math_image_product( temp_expected,vis, temp_expected);
--        // ..and use result to update final expected image
--        vil_math_image_sum(temp_expected,expected,expected);
--
--        vis.deep_copy(vis_end);
--      }
--      scene.write_active_block();
--    }
--  }
--  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
-deleted file mode 100644
-index abcca0dbe5..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
-+++ /dev/null
-@@ -1,167 +0,0 @@
--#ifndef boxm_render_image_triangle_h_
--#define boxm_render_image_triangle_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include "boxm_render_image.h"
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vpgl/vpgl_perspective_camera.h>
--
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#include <vil/vil_transform.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vul/vul_timer.h>
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_expected_functor_splatting
--{
-- public:
--  normalize_expected_functor_splatting(bool use_black_background) : use_black_background_(use_black_background) {}
--
--  void operator()(float mask, typename T_data::obs_datatype &pix) const
--  {
--    if (!use_black_background_) {
--      pix += mask*0.5f;
--    }
--  }
--  bool use_black_background_;
--};
--
--template <class T_loc, class T_data>
--void boxm_render_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                          vpgl_camera_double_sptr cam,
--                                          vil_image_view<typename T_data::obs_datatype> &expected,
--                                          vil_image_view<float> &/*mask*/, // FIXME: use this param
--                                          int bin=-1,
--                                          bool use_black_background = false)
--{
--  unsigned ni=expected.ni();
--  unsigned nj=expected.nj();
--  expected.fill(0.0f);
--  vgl_plane_3d<double> projection_plane;
--  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
--    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
--    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,expected.ni(),expected.nj());
--  }
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
--  vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
--  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
--  vul_timer t;
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
--  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
--
--  while (block_vis_iter.next())
--  {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) // code for each block
--    {
--      t.mark();
--      //if (block_indices[i].x()!=2 || block_indices[i].z()!=0)
--      //  continue;
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      t.mark();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
--      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
--      normalize_expected_functor norm_fn;
--
--      double  xverts[8];
--      double  yverts[8];
--      float vertdists[8];
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        temp_weights.fill(0.0f);
--        alpha_img_.fill(0.0f);
--
--        std::cout<<'.';
--
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          //if (sample.alpha>0.001)
--          {
--            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--            {
--              boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--            }
--            else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--              boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--            }
--            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--            //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
--            // get expected color of cell
--            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
--            // get  alpha
--            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--
--            cube_fill_value(xverts, yverts, vis_face_ids, temp_expected,  cell_expected);            // fill expected value image
--            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
--            //boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
--          }
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights_);
--
--        // scale cell expected image by weighting function..
--        vil_math_image_product( temp_expected,pix_weights_, temp_expected);
--        // ..and use result to update final expected image
--        vil_math_image_sum(temp_expected,expected,expected);
--
--        vis.deep_copy(vis_end);
--      }
--    }
--  }
--  normalize_expected_functor_splatting<T_data> norm_fn(use_black_background);
--  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_splatting<T_data> >(vis,expected,norm_fn);
--
--  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
-deleted file mode 100644
-index 9642cdd4c1..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
-+++ /dev/null
-@@ -1,374 +0,0 @@
--#ifndef boxm_update_h_
--#define boxm_update_h_
--//:
--//\file
--#include <iostream>
--#include "boxm_render_image.h"
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_block.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#include <vul/vul_timer.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: functor used for normalizing cell_expected image
--template <class T_loc, class T_data>
--void boxm_update_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                       vpgl_camera_double_sptr cam,
--                       vil_image_view<typename T_data::obs_mathtype> &img,
--                       vil_image_view<float> &norm_img,
--                       typename T_data::apm_datatype background_model, int bin)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--
--  vil_image_view<float> pre(ni,nj,1); pre.fill(0.0f);
--  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
--  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
--
--#if 0 // TODO: vgl_plane_3d<double> has no constructor with 3 double params....???!!!
--  //       and projection_plane is unused ..!!
--  if (vpgl_rational_camera<double> const* rcam = dynamic_cast<vpgl_rational_camera<double> const*>(cam.as_pointer())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(bbox.min_x(),bbox.min_y(),bbox.max_z());
--    vgl_plane_3d<double> bottom(bbox.min_x(),bbox.min_y(),bbox.min_z());
--    vgl_plane_3d<double> projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
--  }
--#endif // 0
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(ni,nj,1);
--      vil_image_view<float> back_xyz(ni,nj,1);
--      vil_image_view<float> alphas(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      int cnt=0;
--      while (frontier_it.next())
--      {
--        ++cnt;
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        front_xyz.fill(0.0f);
--        back_xyz.fill(0.0f);
--        alphas.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--        std::cout<<cnt<<' ';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (vpgl_camera_double_sptr pcam = dynamic_cast<vpgl_perspective_camera<double>*>(cam.as_pointer()))
--          {
--            boxm_utils::project_corners(corners,pcam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double>* rcam = dynamic_cast<vpgl_rational_camera<double>*>(cam.as_pointer())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,vgl_plane_3d<double>(),xverts,yverts,vertdists);
--            // TODO: 3rd argument should most likely be a "real" plane!!!
--          }
--
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          // get  alpha
--          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--        }
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
--        //vil_math_sum_sqr<float,float>(back_xyz,len_seg);
--        //vil_math_sqrt<float>(len_seg);
--
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--
--          typename T_data::obs_datatype cell_mean_obs;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, img, len_seg,cell_mean_obs,xverts,yverts)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--            // fill obs probability density image
--            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,cell_PI, xverts,yverts);
--          }
--        }
--        vil_math_image_product(len_seg,alphas, alphas);
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,vis);
--        // scale cell expected image by weighting function..
--        vil_math_image_product( PI_img,vis, PI_img);
--        // ..and use result to update final expected image
--        vil_math_image_sum(PI_img,pre,pre);
--
--        vis.deep_copy(vis_end);
--#if 0
--        if (cnt == 70) {
--          std::cout << "saving debug images" << std::endl;
--          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
--          vil_save(len_seg,(output_dir + "len_seg.tiff").c_str());
--          vil_save(alphas,(output_dir + "alphas.tiff").c_str());
--          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
--          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
--          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
--          vil_save(vis,(output_dir + "vis.tiff").c_str());
--          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
--          vil_save(img,(output_dir + "obs.tiff").c_str());
--        }
--#endif
--      }
--
--      scene.write_active_block();
--    }
--  }
--  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
--  for (unsigned int j=0; j<img.nj(); ++j) {
--    for (unsigned int i=0; i<img.ni(); ++i) {
--      // this will have to be modified slightly when we deal with multi-plane images -dec
--      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
--    }
--  }
--
--  vil_math_image_product(PI_background, vis, norm_img);
--  vil_math_image_sum(pre,norm_img,norm_img);
--  safe_inverse_functor inv_func(1e-8f);
--  vil_transform(norm_img, inv_func);
--}
--
--
--template <class T_loc, class T_data>
--void boxm_update_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                       vpgl_camera_double_sptr cam,
--                       vil_image_view<typename T_data::obs_mathtype> &img,
--                       vil_image_view<float> &norm_img, int bin)
--{
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  typedef boct_tree<T_loc, T_data > tree_type;
--  typedef boct_tree_cell<T_loc, T_data > cell_type;
--  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
--  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
--  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
--  vil_image_view<float> pix_weights(ni,nj,1);
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--
--  vul_timer t;  t.mark();
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(ni,nj,1);
--      vil_image_view<float> back_xyz(ni,nj,1);
--      vil_image_view<float> alphas(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      vil_image_view<float> update_factor(ni,nj,1);
--      unsigned count=0;
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        front_xyz.fill(0.0f);
--        back_xyz.fill(0.0f);
--        alphas.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--
--        std::cout<<'.';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          // get  alpha
--          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--        }
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
--
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          //// get  alpha
--          //boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--          typename T_data::obs_datatype cell_mean_obs;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, img,len_seg, cell_mean_obs,xverts,yverts)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--#if 0
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--#endif // 0
--            // fill obs probability density image
--            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,(float)cell_PI, xverts,yverts);
--          }
--          float cell_mean_vis = 0.0f;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, vis, len_seg,cell_mean_vis,xverts,yverts)) {
--            // update appearance model
--            if (cell_mean_vis > 1e-6) {
--              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
--            }
--          }
--          (*cell_it)->set_data(sample);
--        }
--#if 0
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
--        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
--        vil_math_sqrt<float>(len_seg);
--#endif // 0
--        vil_math_image_product(len_seg,alphas, alphas);
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights);
--        // multiply PI by vis..
--        vil_math_image_product(PI_img, vis, update_factor);
--        // ..add preX to get numerator term for update..
--        vil_math_image_sum(pre_img, update_factor, update_factor);
--        //.. and normalize
--        vil_math_image_product(norm_img, update_factor, update_factor);
--
--        float max_cell_P=0.99f;
--        float min_cell_P=0.001f;
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
--          float mean_update_factor = 0.0f;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, update_factor,len_seg, mean_update_factor,xverts,yverts))
--          {  // update alpha value
--            sample.alpha *= mean_update_factor;
--            // do bounds check on new alpha value
--            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
--            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
--            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
--            if (sample.alpha > max_alpha)
--            sample.alpha = max_alpha;
--
--            if (sample.alpha < min_alpha)
--            sample.alpha = min_alpha;
--
--            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
--              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
--                       << "mean_update_factor = " << mean_update_factor << '\n';
--            }
--            (*cell_it)->set_data(sample);
--          }
--        }
--        // multiply cell_PI by cell weights
--        vil_math_image_product(pix_weights, PI_img, PI_img);
--        // update pre_img
--        vil_math_image_sum(PI_img, pre_img, pre_img);
--
--        vis.deep_copy(vis_end);
--      }
--      scene.write_active_block();
--    }
--  }
--}
--
--template <class T_loc, class T_data>
--void boxm_update(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                 vil_image_view<typename T_data::obs_datatype> &img,
--                 vpgl_camera_double_sptr cam, int bin=-1,
--                 bool black_background = false)
--{
--  typename T_data::apm_datatype background_apm;
--
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    for (unsigned int i=0; i<4; ++i) {
--      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
--      T_data::apm_processor::prob_density(background_apm,0.0f);
--    }
--  }
--  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
--  boxm_update_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
--  std::cout << "update: pass1 completed" << std::endl;
--  vil_save(norm_img,"D:/vj/scripts/boxm/exp1/norm.tiff");
--  boxm_update_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
--  std::cout << "update: pass2 completed" << std::endl;
--
--  return;
--}
--
--#endif // boxm_update_h_
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
-deleted file mode 100644
-index 723284ff3b..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
-+++ /dev/null
-@@ -1,356 +0,0 @@
--#ifndef boxm_update_triangle_h_
--#define boxm_update_triangle_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_block.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vil/vil_math.h>
--#include <vul/vul_timer.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: functor used for normalizing cell_expected image
--template <class T_loc, class T_data>
--void boxm_update_triangle_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                vpgl_camera_double_sptr cam,
--                                vil_image_view<typename T_data::obs_mathtype> &img,
--                                vil_image_view<float> &norm_img,
--                                typename T_data::apm_datatype background_model, int bin)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--
--  vil_image_view<float> pre(ni,nj,1);
--  vil_image_view<float> vis(ni,nj,1);
--  vil_image_view<float> alpha_integral(ni,nj,1);
--  vil_image_view<float> PI_img(ni,nj,1);
--  vil_image_view<float> pix_weights_(ni,nj,1);
--  vil_image_view<float> alpha_img_(ni,nj,1);
--
--  alpha_integral.fill(0.0f);
--  pre.fill(0.0f);
--  vis.fill(1.0f);
--
--  vgl_plane_3d<double> projection_plane;
--  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
--    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
--    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
--  }
--
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next())
--  {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) // code for each block
--    {
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(ni,nj,1);
--      vil_image_view<float> back_xyz(ni,nj,1);
--      vil_image_view<float> alphas(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      int cnt=0;
--
--      while (frontier_it.next())
--      {
--        ++cnt;
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        alpha_img_.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--          {
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--          }
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--
--
--          typename T_data::obs_datatype cell_mean_obs;
--          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--            // fill obs probability density image
--            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
--          }
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights_);
--        // scale cell expected image by weighting function..
--        vil_math_image_product( pix_weights_,PI_img, PI_img);
--        // ..and use result to update final expected image
--        vil_math_image_sum(PI_img,pre,pre);
--        vis.deep_copy(vis_end);
--#if 0
--        if (cnt == 10) {
--          std::cout << "saving debug images" << std::endl;
--          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
--          vil_save(alpha_img_,(output_dir + "alpha_img.tiff").c_str());
--          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
--          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
--          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
--          vil_save(vis,(output_dir + "vis.tiff").c_str());
--          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
--          vil_save(img,(output_dir + "obs.tiff").c_str());
--        }
--#endif
--      }
--      scene.write_active_block();
--    }
--  }
--  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
--  for (unsigned int j=0; j<img.nj(); ++j) {
--    for (unsigned int i=0; i<img.ni(); ++i) {
--      // this will have to be modified slightly when we deal with multi-plane images -dec
--      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
--    }
--  }
--
--  vil_math_image_product(PI_background, vis, norm_img);
--  vil_math_image_sum(pre,norm_img,norm_img);
--  safe_inverse_functor inv_func(1e-8f);
--  vil_transform(norm_img, inv_func);
--}
--
--
--template <class T_loc, class T_data>
--void boxm_update_triangle_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                vpgl_camera_double_sptr cam,
--                                vil_image_view<typename T_data::obs_mathtype> &img,
--                                vil_image_view<float> &norm_img, int bin)
--{
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  typedef boct_tree<T_loc, T_data > tree_type;
--  typedef boct_tree_cell<T_loc, T_data > cell_type;
--  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
--  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(ni,nj,1);
--  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
--  vil_image_view<float> pix_weights(ni,nj,1);
--  alpha_integral.fill(0.0f);
--  pre_img.fill(0.0f);
--  vis.fill(1.0f);
--
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--  vgl_plane_3d<double> projection_plane;
--  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
--    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
--    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
--  }
--  vul_timer t;  t.mark();
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> alpha_img_(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      vil_image_view<float> update_factor(ni,nj,1);
--
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--        alpha_img_.fill(0.0f);
--
--        std::cout<<'.';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--          {
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--          }
--
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--          typename T_data::obs_datatype cell_mean_obs;
--          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--#if 0
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--#endif // 0
--            // fill obs probability density image
--            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
--          }
--          float cell_mean_vis = 0.0f;
--          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,vis,cell_mean_vis)) {
--            // update appearance model
--            if (cell_mean_vis > 1e-6) {
--              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
--            }
--          }
--          (*cell_it)->set_data(sample);
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights);
--        // multiply PI by vis..
--        vil_math_image_product(PI_img, vis, update_factor);
--        // ..add preX to get numerator term for update..
--        vil_math_image_sum(pre_img, update_factor, update_factor);
--        //.. and normalize
--        vil_math_image_product(norm_img, update_factor, update_factor);
--
--
--        float max_cell_P=0.99f;
--        float min_cell_P=0.001f;
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--          {
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--          }
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--
--          float mean_update_factor = 0.0f;
--          if (cube_mean(xverts,yverts,vertdists,vis_face_ids, update_factor, mean_update_factor))
--          {
--            // update alpha value
--            sample.alpha *= mean_update_factor;
--            // do bounds check on new alpha value
--            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
--            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
--            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
--            if (sample.alpha > max_alpha)
--            sample.alpha = max_alpha;
--
--            if (sample.alpha < min_alpha)
--            sample.alpha = min_alpha;
--
--            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
--              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
--                       << "mean_update_factor = " << mean_update_factor << '\n';
--            }
--            (*cell_it)->set_data(sample);
--          }
--        }
--        // multiply cell_PI by cell weights
--        vil_math_image_product(pix_weights, PI_img, PI_img);
--        // update pre_img
--        vil_math_image_sum(PI_img, pre_img, pre_img);
--        vis.deep_copy(vis_end);
--      }
--      scene.write_active_block();
--    }
--  }
--}
--
--template <class T_loc, class T_data>
--void boxm_update_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vil_image_view<typename T_data::obs_datatype> &img,
--                          vpgl_camera_double_sptr cam, int bin=-1,
--                          bool black_background = false)
--{
--  typename T_data::apm_datatype background_apm;
--
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    for (unsigned int i=0; i<4; ++i) {
--      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
--      T_data::apm_processor::prob_density(background_apm,0.0f);
--    }
--  }
--  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
--  boxm_update_triangle_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
--  std::cout << "update: pass1 completed" << std::endl;
--  boxm_update_triangle_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
--  std::cout << "update: pass2 completed" << std::endl;
--
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/dummy.cxx b/contrib/brl/bseg/boxm/algo/sp/dummy.cxx
-deleted file mode 100644
-index e69de29bb2..0000000000
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-deleted file mode 100644
-index 41fe3f9dbd..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,27 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and bvxm_prodepends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--  set(boxm_algo_sp_pro_sources
--      boxm_algo_sp_processes.h
--      boxm_algo_sp_register.h   boxm_algo_sp_register.cxx
--     )
--  aux_source_directory(Templates boxm_algo_sp_pro_sources)
--  aux_source_directory(processes boxm_algo_sp_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_algo_sp_pro LIBRARY_SOURCES ${boxm_algo_sp_pro_sources} )
--  target_link_libraries(boxm_algo_sp_pro boxm boxm_algo_sp boxm_util bprb brdb brip sdet vsol vil_pro ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil)
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
-deleted file mode 100644
-index 5339909524..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vil/vil_image_view_base.h>
--#include <vil/io/vil_io_smart_ptr.h>
--
--#include <vil/io/vil_io_image_view_base.h>
--
--typedef vil_image_view_base_sptr img_sptr;
--
--BRDB_VALUE_INSTANTIATE(img_sptr, "vil_image_view_base_sptr");
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
-deleted file mode 100644
-index 24cdc3672a..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#ifndef boxm_algo_sp_processes_h_
--#define boxm_algo_sp_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_volume_visibility_process);
--DECLARE_FUNC_CONS(boxm_update_process);
--DECLARE_FUNC_CONS(boxm_render_expected_process);
--
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
-deleted file mode 100644
-index 8acaac16c3..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#include "boxm_algo_sp_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "boxm_algo_sp_processes.h"
--
--void boxm_algo_sp_register::register_datatype()
--{
--}
--
--void boxm_algo_sp_register::register_process()
--{
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_process,"boxmUpdateSPProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_process, "boxmRenderExpectedProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_volume_visibility_process, "boxmVolumeVisibilityProcess");
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
-deleted file mode 100644
-index 5b7f15d213..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_algo_sp_register_h_
--#define boxm_algo_sp_register_h_
--
--class boxm_algo_sp_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_algo_sp_register_h_
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
-deleted file mode 100644
-index 6ffd752df2..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
-+++ /dev/null
-@@ -1,117 +0,0 @@
--// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
--
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_convert.h>
--
--namespace boxm_render_expected_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_process_globals;
--
--  //process takes 5 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4]: bin number
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "unsigned";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_splatting_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,true);
--    }
--    else
--    {
--      auto bin = pro.get_input<unsigned>(i++);
--      std::cout<<"Multi Bin"<<std::endl;
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_splatting_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,bin,true);
--    }
--
--    //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  }
--  else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
-deleted file mode 100644
-index bf3d27ab6d..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
-+++ /dev/null
-@@ -1,107 +0,0 @@
--// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Apr 21, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--namespace boxm_update_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_update_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: The bin index to be updated
--  //input[4]: ???
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_update_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_update_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto bin_index =  pro.get_input<unsigned>(i++);
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--    std::cout << "boxm_update_process: null input value, cannot run" << std::endl;
--    return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      //boxm_update<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, false);
--      boxm_update_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Multi Bin Update"<<std::endl;
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, img, camera, bin_index,use_black_background);
--    }
--    //vil_image_view<float> image = *vil_convert_cast(float(), input_image);
--  }
--  else {
--    std::cout << "boxm_update_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
-deleted file mode 100644
-index 34ecc27c3f..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
--//:
--// \file
--// \brief A class for obtaining visibility of a volume
--//
--// \author Vishal Jain
--// \date Apr 30, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_convert.h>
--
--namespace boxm_volume_visibility_process_globals
--{
--  constexpr unsigned n_inputs_ = 10;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_volume_visibility_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_volume_visibility_process_globals;
--
--  //process takes 10 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4-9]: bounding box
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "float";
--  input_types_[5] = "float";
--  input_types_[6] = "float";
--  input_types_[7] = "float";
--  input_types_[8] = "float";
--  input_types_[9] = "float";
--
--  // process has 1 output:
--  // output[0]: rendered image
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_volume_visibility_process(bprb_func_process& pro)
--{
--  using namespace boxm_volume_visibility_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--
--  auto min_x=pro.get_input<float>(i++);
--  auto min_y=pro.get_input<float>(i++);
--  auto min_z=pro.get_input<float>(i++);
--
--  auto max_x=pro.get_input<float>(i++);
--  auto max_y=pro.get_input<float>(i++);
--  auto max_z=pro.get_input<float>(i++);
--
--  vgl_box_3d<double> query(min_x,min_y,min_z,
--                           max_x,max_y,max_z);
--
--  double xverts[8];
--  double yverts[8];
--
--  boxm_utils::project_corners(boxm_utils::corners_of_box_3d(query),camera,xverts,yverts);
--  boct_face_idx face_id=boxm_utils::visible_faces(query,camera,xverts,yverts);
--  vil_image_view_base_sptr img;
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    float val=1.0;
--
--    if (!scene_ptr->multi_bin()){
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      val=boxm_compute_volume_visibility<short, boxm_sample<BOXM_APM_MOG_GREY> >(query,*scene, camera);
--    }
--    else
--    {
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      val=boxm_compute_volume_visibility<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(query,*scene, camera);
--    }
--    vil_image_view<float> img_vol(ni,nj);img_vol.fill(0.0);
--    boxm_utils::project_cube_fill_val(face_id,img_vol,val,xverts,yverts);
--    auto *vol_vis = new vil_image_view<unsigned char>(img_vol.ni(),img_vol.nj(),img_vol.nplanes());
--    vil_convert_stretch_range_limited(img_vol,*vol_vis, 0.0f, 1.0f);
--    img = vol_vis;
--
--    std::cout<<"\n Visibility is "<<val;
--  }
--  else {
--    std::cout << "boxm_volume_visibility_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index bc15f419d9..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_algo_sp_pro_test_include test_include.cxx )
--target_link_libraries( boxm_algo_sp_pro_test_include boxm_algo_sp_pro)
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
-deleted file mode 100644
-index bfdbc4ffa3..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/sp/pro/boxm_algo_sp_processes.h>
--#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
-deleted file mode 100644
-index 99806c193d..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,19 +0,0 @@
--add_executable( boxm_algo_sp_test_all
--  test_driver.cxx
--  test_compute_visibility.cxx
--  test_render_image.cxx
--  test_update.cxx
--  test_update_multi_bin.cxx
-- )
--
--target_link_libraries( boxm_algo_sp_test_all boxm_algo_sp boxm_algo boxm boxm_util boxm_sample boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME boxm_algo_sp_test_compute_visibility COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_compute_visibility  )
--add_test( NAME boxm_algo_sp_test_render_image COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_render_image  )
--if( VXL_RUN_FAILING_TESTS )
--add_test( NAME boxm_algo_sp_test_update COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update  )
--endif()
--add_test( NAME boxm_algo_sp_test_update_multi_bin COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update_multi_bin  )
--
--add_executable( boxm_algo_sp_test_include test_include.cxx )
--target_link_libraries( boxm_algo_sp_test_include boxm_algo_sp)
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
-deleted file mode 100644
-index 69c019a479..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
-+++ /dev/null
-@@ -1,90 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_test_util.h>
--
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_compute_visibility()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,3);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("./boxm_scene1", "block");
--  vul_file::make_directory("./boxm_scene1");
--  std::ofstream os("scene1.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3> s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3> s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3> s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
--    if (iter.index().z()==1)
--    {
--      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells=tree->leaf_cells();
--      s1_sample.alpha=0.6f;
--
--      for (auto & leaf_cell : leaf_cells)
--      {
--        leaf_cell->set_data(s1_sample);
--      }
--      block->init_tree(tree);
--      scene.write_active_block();
--    }
--    else
--    {
--      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells= tree->leaf_cells();
--      s1_sample.alpha=0.01f;
--
--      for (auto & leaf_cell : leaf_cells)
--      {
--        leaf_cell->set_data(s1_sample);
--      }
--      block->init_tree(tree);
--      scene.write_active_block();
--    }
--
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--
--  double X=5,Y=5,Z;
--  for (Z=40; Z>-10; --Z)
--  {
--    boxm_compute_point_visibility<short,boxm_sample<BOXM_APM_MOG_GREY> >(vgl_point_3d<double>(X,Y,Z),scene, camera);
--  }
--  vpl_rmdir("./boxm_scene1");
--  vpl_unlink("./scene1.xml");
--}
--
--TESTMAIN(test_compute_visibility);
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
-deleted file mode 100644
-index 2ea0124c63..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_compute_visibility );
--DECLARE( test_render_image );
--DECLARE( test_update );
--DECLARE( test_update_multi_bin );
--
--void register_tests()
--{
--  REGISTER( test_compute_visibility );
--  REGISTER( test_render_image );
--  REGISTER( test_update );
--  REGISTER( test_update_multi_bin );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
-deleted file mode 100644
-index 85e7588707..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
--#include <boxm/algo/sp/boxm_depth_image_triangle.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <boxm/algo/sp/boxm_update.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
-deleted file mode 100644
-index c36e76f0dd..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
-+++ /dev/null
-@@ -1,103 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/util/boxm_test_util.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree_cell.h>
--#include <vpl/vpl.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--
--static void test_render_image()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,3);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("./boxm_scene1", "block");
--  vul_file::make_directory("./boxm_scene1");
--  std::ofstream os("scene1.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
--
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
--  expected.fill(0.0);
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
--  mask.fill(0.0);
--
--  boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,camera,expected,mask);
--  vpl_rmdir("boxm_scene1");
--  vpl_unlink("scene1.xml");
--}
--
--TESTMAIN(test_render_image);
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
-deleted file mode 100644
-index 9e530c4af6..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
-+++ /dev/null
-@@ -1,259 +0,0 @@
--#include <iostream>
--#include <sstream>
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_test_util.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_homg_point_3d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_load.h>
--#include <vil/vil_save.h>
--#include <vil/vil_convert.h>
--#if 0
--#include <vpl/vpl.h>
--#endif
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_z(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/36.;
--  std::vector<vgl_point_3d<double> > centers;
--  for (unsigned i=0; i<11; i++) {
--    // double x = boxm_camera_dist*std::cos(alpha)/10;
--    double z = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
--    std::cout << centers[i] << std::endl;
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
--    rat_cameras.push_back(rat_cam);
--
--    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--    for (auto c : corners) {
--      double u,v, u2, v2;
--      vpgl_perspective_camera<double> persp_cam;
--      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
--      bb.add(vgl_point_2d<double> (u,v));
--
--      if (verbose)
--      {
--        std::cout << "Perspective [" << u << ',' << v << "]\n"
--                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
--      }
--    }
--    std::cout << bb << std::endl;
--  }
--  return rat_cameras;
--}
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_yz(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  std::cout << "centroid: " << centroid << std::endl;
--  double alpha = (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/40.;
--  std::vector<vgl_point_3d<double> > centers;
--
--  for (unsigned i=0; i<num_train_images; i++) {
--    double x = boxm_camera_dist*std::cos(alpha);
--    double y = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
--  if (verbose)
--    std::cout << centers[i] << std::endl;
--
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> persp_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vgl_point_3d<double> camera_center  = centers[i];
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
--    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--
--    //save the camera to file
--    std::stringstream cam_file;
--    vul_file::make_directory("./cams");
--    cam_file << "./cams/cam_" << i << ".txt";
--    std::ofstream cam_out(cam_file.str().c_str());
--    cam_out << persp_cam;
--
--    if (verbose) {
--      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--      for (auto c : corners) {
--        double u,v;
--        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--        bb.add(vgl_point_2d<double> (u,v));
--        std::cout << "Perspective [" << u << ',' << v << "]\n"<< std::endl;
--      }
--      std::cout << bb << std::endl;
--    }
--  }
--  return persp_cameras;
--}
--
--
--static void test_update()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--#ifdef SET_APPEARENCE_MODEL_EXISTS
--  scene.set_appearence_model(BOXM_APM_MOG_GREY);
--#endif
--  scene.set_paths("boxm_scene2", "block");
--  vul_file::make_directory("boxm_scene2");
--  std::ofstream os("scene2.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
--
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(4,3);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--#if 0
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--#endif
--  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z(world);
--
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
--
--  for (unsigned i=0; i<cameras.size(); i++) {
--    expected.fill(0.0);
--    mask.fill(0.0);
--
--    boxm_render_image_splatting_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask);
--    std::stringstream ss;
--    ss << "./boxm_scene2/img" << i << ".tif";
--#if 0
--    vil_image_view<unsigned char> expected_byte(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,expected_byte, 0.0f, 1.0f);
--#endif
--
--    vil_save(expected, ss.str().data());
--  }
--#if 0
--  vpl_rmdir("./boxm_scene1");
--  vpl_unlink("./scene1.xml");
--#endif
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
--                                                                          block_dim, world_dim, 4U, 3U);
--  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene_new.set_paths("./boxm_scene_update", "block");
--  vul_file::make_directory("./boxm_scene_update");
--  std::ofstream os1("./boxm_scene_update/scene.xml");
--  x_write(os1, scene_new, "scene");
--  os1.close();
--
--  // update the world, with all the generated images and cameras
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss;
--    ss << "./boxm_scene2/img" << i << ".tif";
--    expected = vil_load(ss.str().data());
--    boxm_update_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i] );
--  }
--
--  // regenerate the images from world
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss; ss << "boxm_scene2/img_new" << i << ".tif";
--    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
--    boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask);
--    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
--    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
--
--    vil_save(expected_byte, ss.str().data());
--  }
--}
--
--TESTMAIN(test_update);
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
-deleted file mode 100644
-index 27c310aea1..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
-+++ /dev/null
-@@ -1,262 +0,0 @@
--#include <iostream>
--#include <sstream>
--#include <testlib/testlib_test.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_homg_point_3d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/util/boxm_test_util.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_load.h>
--#include <vil/vil_save.h>
--#include <vil/vil_convert.h>
--#ifdef CLEANUP
--#include <vpl/vpl.h>
--#endif
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_z_multi_bin(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/36.;
--  std::vector<vgl_point_3d<double> > centers;
--  for (unsigned i=0; i<11; i++) {
--    double z = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
--    std::cout << centers[i] << std::endl;
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
--    rat_cameras.push_back(rat_cam);
--
--    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--    for (auto c : corners) {
--      double u,v, u2, v2;
--      vpgl_perspective_camera<double> persp_cam;
--      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
--      bb.add(vgl_point_2d<double> (u,v));
--
--      if (verbose)
--      {
--        std::cout << "Perspective [" << u << ',' << v << "]\n"
--                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
--      }
--    }
--    std::cout << bb << std::endl;
--  }
--  return rat_cameras;
--}
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_yz_multi_bin(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  std::cout << "centroid: " << centroid << std::endl;
--  double alpha = (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/40.;
--  std::vector<vgl_point_3d<double> > centers;
--
--  for (unsigned i=0; i<num_train_images; i++) {
--    double x = boxm_camera_dist*std::cos(alpha);
--    double y = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
--  if (verbose)
--    std::cout << centers[i] << std::endl;
--
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> persp_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vgl_point_3d<double> camera_center  = centers[i];
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
--    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--
--    //save the camera to file
--    std::stringstream cam_file;
--    vul_file::make_directory("./cams");
--    cam_file << "./cams/cam_" << i << ".txt";
--    std::ofstream cam_out(cam_file.str().c_str());
--    cam_out << persp_cam;
--
--    if (verbose) {
--      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--      for (auto c : corners) {
--        double u,v;
--        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--        bb.add(vgl_point_2d<double> (u,v));
--        std::cout << "Perspective [" << u << ',' << v << ']' << std::endl << std::endl;
--      }
--      std::cout << bb << std::endl;
--    }
--  }
--  return persp_cameras;
--}
--
--
--static void test_update_multi_bin()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,1);
--  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--#ifdef SET_APPEARENCE_MODEL_EXISTS
--  scene.set_appearence_model(BOXM_APM_MOG_GREY);
--#endif
--  scene.set_paths("boxm_scene2_mb", "block");
--  vul_file::make_directory("boxm_scene2_mb");
--  std::ofstream os("scene2.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  boxm_block_iterator<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1,5);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1,5);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1,3);
--
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(4,3);
--    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--#if 0
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--#endif
--  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z_multi_bin(world);
--
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
--
--  for (unsigned i=0; i<cameras.size(); i++) {
--    expected.fill(0.0);
--    mask.fill(0.0);
--
--    boxm_render_image_splatting<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,3);
--    std::stringstream ss;
--    ss << "./boxm_scene2_mb/img3" << i << ".tif";
--    vil_save(expected, ss.str().data());
--
--    expected.fill(0.0);
--    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,5);
--    std::stringstream ss1;
--    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
--    vil_save(expected, ss1.str().data());
--  }
--#ifdef CLEANUP
--  vpl_rmdir("./boxm_scene1");
--  vpl_unlink("./scene1.xml");
--#endif
--  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
--                                                                                    block_dim, world_dim, 4U, 3U);
--  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene_new.set_paths("./boxm_scene_update", "block");
--  vul_file::make_directory("./boxm_scene_update");
--  std::ofstream os1("./boxm_scene_update/scene.xml");
--  x_write(os1, scene_new, "scene");
--  os1.close();
--
--  // update the world, with all the generated images and cameras
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss;
--    ss << "./boxm_scene2_mb/img3" << i << ".tif";
--    expected = vil_load(ss.str().data());
--    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],3 );
--    std::stringstream ss1;
--    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
--    expected = vil_load(ss1.str().data());
--    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],5 );
--  }
--
--  // regenerate the images from world
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss; ss << "boxm_scene2_mb/img_new" << i << ".tif";
--    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
--    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask,3);
--    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
--    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
--
--    vil_save(expected_byte, ss.str().data());
--  }
--}
--
--TESTMAIN(test_update_multi_bin);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
-deleted file mode 100644
-index 5e823166ae..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,31 +0,0 @@
--add_executable( boxm_algo_test_all
--  test_driver.cxx
--  test_fill_in_mesh.cxx
--  test_save_scene_raw.cxx
--  test_upload_mesh.cxx
--  test_boxm_fill_internal_cells.cxx
--  test_boxm_scene_crop.cxx
--  test_linear_operations.cxx
--  test_remove_level0.cxx
--
-- )
--
--set(boxm_algo_test_all_sources
--    test_utils.h    test_utils.cxx
--    )
--
--vxl_add_library(LIBRARY_NAME boxm_algo_tests LIBRARY_SOURCES  ${boxm_algo_test_all_sources})
--
--target_link_libraries( boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
--target_link_libraries( boxm_algo_test_all boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
--
--add_test( NAME boxm_algo_test_fill_in_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_fill_in_mesh  )
--add_test( NAME boxm_algo_test_save_scene_raw COMMAND $<TARGET_FILE:boxm_algo_test_all> test_save_scene_raw  )
--add_test( NAME boxm_algo_test_upload_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_upload_mesh  )
--add_test( NAME boxm_algo_test_fill_internal_cells COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_fill_internal_cells  )
--add_test( NAME boxm_algo_test_scene_crop COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_scene_crop  )
--add_test( NAME boxm_algo_test_linear_operations COMMAND $<TARGET_FILE:boxm_algo_test_all> test_linear_operations )
--add_test( NAME boxm_algo_remove_level0 COMMAND $<TARGET_FILE:boxm_algo_test_all> test_remove_level0 )
--
--add_executable( boxm_algo_test_include test_include.cxx )
--target_link_libraries( boxm_algo_test_include boxm_algo)
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
-deleted file mode 100644
-index 509f828fb6..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
-+++ /dev/null
-@@ -1,112 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date February 4, 2010
--
--#include <testlib/testlib_test.h>
--#include <boxm/algo/boxm_fill_internal_cells.h>
--#include <boxm/boxm_apm_traits.h>
--
--const bool debug = false;
--
--void build_tree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  // Create tree
--  tree->split();
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    leaves[1]->set_data(0.1f);
--    leaves[1]->split();
--    for (auto & leave : leaves)
--      leave->set_data(0.1f);
--  }
--
--  if (debug)
--  {
--    std::cout << "All Levels" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
--    for (auto & leave : leaves) {
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--}
--
--static void test_boxm_fill_internal_cells()
--{
--  //Create a dummy scene
--  typedef boct_tree<short,float > tree_type;
--  auto *tree = new boct_tree<short,float>(3);
--  build_tree(tree);
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--
--  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
--  std::string scene_path=".";
--  scene->set_paths(scene_path, "in_block");
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->clean_scene();
--
--  boxm_block_iterator<tree_type >  iter =scene->iterator();
--  iter.begin();
--  scene->load_block(iter.index());
--  boxm_block<tree_type> *block = scene->get_active_block();
--  block->init_tree(tree);
--  scene->write_active_block();
--
--  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
--
--  boxm_fill_internal_cells<float> filler;
--  boxm_scene<tree_type> *scene_out = filler.traverse_and_fill(scene);
--
--  //check that output scene is correct
--  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
--  iter_out.begin();
--  scene_out->load_block(iter_out.index());
--  boxm_block<tree_type> *block_out = scene_out->get_active_block();
--  boct_tree<short, float>  *tree_out= block_out->get_tree();
--  std::vector<boct_tree_cell<short,float>*> cells = tree_out->all_cells();
--  bool result = true;
--  for (auto & cell : cells)
--  {
--    if (!cell->is_leaf())
--    {
--      boct_tree_cell<short,float>* children = cell->children();
--      float avg =0;
--      for (unsigned c=0; c<8; c++)
--      {
--        avg+=children[c].data();
--      }
--      result = result && (cell->data()==(avg/8.f));
--    }
--  }
--  TEST("Valid average cells", result, true);
--
--  if (debug) {
--    std::cout << "Printing Output Tree" << std::endl;
--    for (auto & cell : cells) {
--      std::cout<< cell->get_code().x_loc_ << ','
--              << cell->get_code().y_loc_ << ','
--              << cell->get_code().z_loc_ << ','
--              << cell->get_code().level << ','
--              << cell->data() << std::endl;
--    }
--  }
--
--  scene->clean_scene();
--  scene_out->clean_scene();
--}
--
--TESTMAIN(test_boxm_fill_internal_cells);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
-deleted file mode 100644
-index 73eff00099..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov. 16, 2009.
--
--#include <testlib/testlib_test.h>
--#include <boxm/algo/boxm_crop_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--const bool debug = true;
--
--void fill_sample_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--  tree->init_cells(0.1f);
--  tree->split();
--  std::cout << "Level 1" << std::endl;
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5f);
--    if (debug)
--      for (auto & leave : leaves) {
--        std::cout<< leave->get_code().x_loc_ << ','
--                << leave->get_code().y_loc_ << ','
--                << leave->get_code().z_loc_ << ','
--                << leave->data() << std::endl;
--      }
--
--    leaves[1]->split();
--  }
--
--  if (debug)
--  {
--    std::cout << "Level 0" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (auto & leave : leaves) {
--      leave->set_data(0.9f);
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--
--  if (debug)
--  {
--    std::cout << "All Levels" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
--    for (auto & leave : leaves) {
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--}
--
--static void test_boxm_scene_crop()
--{
--  //Create a dummy scene
--  typedef boct_tree<short,float > tree_type;
--  auto *tree = new boct_tree<short,float>(3);
--  fill_sample_octree(tree);
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--
--  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
--  std::string scene_path=".";
--  scene->set_paths(scene_path, "in_block");
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->clean_scene();
--
--  boxm_block_iterator<tree_type >  iter =scene->iterator();
--  iter.begin();
--  scene->load_block(iter.index());
--  boxm_block<tree_type> *block = scene->get_active_block();
--  block->init_tree(tree);
--  scene->write_active_block();
--
--  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
--
--  boxm_scene<tree_type> *scene_out = boxm_crop_scene<float>(scene, bbox);
--
--  //check that output scene is correct
--  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
--  iter_out.begin();
--  scene_out->load_block(iter_out.index());
--  boxm_block<tree_type> *block_out = scene_out->get_active_block();
--  boct_tree<short, float>  *tree_out= block_out->get_tree();
--
--  std::vector<boct_tree_cell<short,float>*> leaves_out = tree_out->leaf_cells();
--  bool result = true;
--  for (auto & i : leaves_out)
--  {
--    result = result && (std::abs(i->data() - 0.9)< 1e-5);
--  }
--
--  TEST("Valid cropped tree", result, true);
--
--  std::vector<boct_tree_cell<short,float>*> leaves = tree_out->all_cells();
--  if (debug) {
--    std::cout << "Printing Output Tree" << std::endl;
--    for (auto & leave : leaves) {
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--
--  scene->clean_scene();
--  scene_out->clean_scene();
--}
--
--TESTMAIN(test_boxm_scene_crop);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
-deleted file mode 100644
-index 299ce36aab..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,23 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_fill_in_mesh );
--DECLARE( test_save_scene_raw );
--DECLARE( test_upload_mesh );
--DECLARE( test_boxm_fill_internal_cells );
--DECLARE( test_boxm_scene_crop );
--DECLARE( test_linear_operations );
--DECLARE( test_remove_level0 );
--
--void register_tests()
--{
--  REGISTER( test_fill_in_mesh );
--  REGISTER( test_save_scene_raw );
--  REGISTER( test_upload_mesh );
--  REGISTER( test_boxm_fill_internal_cells );
--  REGISTER( test_boxm_scene_crop );
--  REGISTER( test_linear_operations );
--  REGISTER( test_remove_level0 );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
-deleted file mode 100644
-index 564a5c4359..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
-+++ /dev/null
-@@ -1,121 +0,0 @@
--#include <iostream>
--#include <limits>
--#include <testlib/testlib_test.h>
--
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_fill_in_mesh.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boct/boct_tree_cell.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_fileio.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static void test_fill_in_mesh()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("./boxm_fill_in", "block");
--  vul_file::make_directory("./boxm_fill_in");
--  std::ofstream os("scene.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  //// create a mesh
--  unsigned int num_faces=6;
--  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(8));
--  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
--  imesh_vertex<3>& vert0 = (*verts)[0]; imesh_vertex<3>& vert4 = (*verts)[4];
--  vert0[0]=2;                           vert4[0]=2;
--  vert0[1]=2;                           vert4[1]=2;
--  vert0[2]=4;                           vert4[2]=8;
--  imesh_vertex<3>& vert1 = (*verts)[1]; imesh_vertex<3>& vert5 = (*verts)[5];
--  vert1[0]=4;                           vert5[0]=4;
--  vert1[1]=2;                           vert5[1]=2;
--  vert1[2]=4;                           vert5[2]=8;
--  imesh_vertex<3>& vert2 = (*verts)[2]; imesh_vertex<3>& vert6 = (*verts)[6];
--  vert2[0]=4;                           vert6[0]=4;
--  vert2[1]=4;                           vert6[1]=4;
--  vert2[2]=4;                           vert6[2]=8;
--
--  imesh_vertex<3>& vert3 = (*verts)[3]; imesh_vertex<3>& vert7 = (*verts)[7];
--  vert3[0]=2;                           vert7[0]=2;
--  vert3[1]=4;                           vert7[1]=4;
--  vert3[2]=4;                           vert7[2]=8;
--
--  std::vector<unsigned int> face(4,0);
--  face[0]=4;face[1]=5;face[2]=6;face[3]=7;
--  (*faces)[0]=face;
--  face[0]=3;face[1]=2;face[2]=1;face[3]=0;
--  (*faces)[1]=face;
--  face[0]=0;face[1]=4;face[2]=7;face[3]=3;
--  (*faces)[2]=face;
--  face[0]=1;face[1]=2;face[2]=6;face[3]=5;
--  (*faces)[3]=face;
--  face[0]=1;face[1]=5;face[2]=4;face[3]=0;
--  (*faces)[4]=face;
--  face[0]=3;face[1]=7;face[2]=6;face[3]=2;
--  (*faces)[5]=face;
--
--
--  imesh_mesh mesh;
--#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
--  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
--  mesh.set_vertices(std::move(tempv));
--  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
--  mesh.set_faces(std::move(tempf));
--#else
--  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
--  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
--#endif
--
--  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(7,6);
--    boxm_sample<BOXM_APM_MOG_GREY> s;
--    s.alpha=std::numeric_limits<float>::max();
--    tree->init_cells(s);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--
--  boxm_sample<BOXM_APM_MOG_GREY> val;
--  val.alpha=0;
--  std::vector<imesh_mesh> meshes; meshes.push_back(mesh);
--  boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, meshes, false, val);
--
--  std::vector<std::string> fnames;
--  boxm_block_iterator<tree_type> it(&scene);
--
--  // check the first block
--  scene.load_block(it.index().x(),it.index().y(),it.index().z());
--  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
--
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vgl_point_3d<double>(3,3,6));
--  TEST("Centroid of the mesh is in the octree", cell0->data().alpha, 0.0f);
--
--
--  vpl_rmdir("boxm_fill_in");
--  vpl_unlink("scene.xml");
--}
--
--TESTMAIN(test_fill_in_mesh);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
-deleted file mode 100644
-index c59d7e8540..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <boxm/algo/boxm_compute_scene_difference.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <boxm/algo/boxm_crop_scene.h>
--#include <boxm/algo/boxm_fill_in_mesh.h>
--#include <boxm/algo/boxm_fill_internal_cells.h>
--#include <boxm/algo/boxm_init_scene.h>
--#include <boxm/algo/boxm_linear_operations.h>
--#include <boxm/algo/boxm_merge_mog.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boxm/algo/boxm_save_scene_raw.h>
--#include <boxm/algo/boxm_save_scene_raw_general.h>
--#include <boxm/algo/boxm_scene_levels_utils.h>
--#include <boxm/algo/boxm_split_sample.h>
--#include <boxm/algo/boxm_upload_mesh.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx b/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
-deleted file mode 100644
-index 0e4fe4f91c..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
-+++ /dev/null
-@@ -1,82 +0,0 @@
--//:
--// \file
--// \brief Test linear combinations of blocks
--// \author Isabel Restrepo
--// \date 2-Feb-2011
--
--#include <testlib/testlib_test.h>
--#include <boxm/algo/boxm_linear_operations.h>
--#include "test_utils.h"
--
--void test_linear_operations()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
--  boxm_scene<boct_tree<short, float> > *scene2 = create_scene(2,2,2,true, "test_scene2");
--
--  float s1 = 2.0, s2=3.0;
--  for (unsigned i = 0; i< 2; i++)
--    for (unsigned j = 0; j < 2; j++)
--      for (unsigned k = 0; k< 2; k++)
--      {
--        scene1->load_block(i,j,k);
--        scene2->load_block(i,j,k);
--
--        boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(i,j,k);
--        boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(i,j,k);
--
--        //The result is block1 = s1*block1+ s2*block2
--        boxm_linear_combination(block1, block2, s1, s2);
--
--        //make sure to write the block back to disk
--        scene1->write_active_block();
--
--        //clean memory
--        scene1->unload_active_blocks();
--        scene2->unload_active_blocks();
--      }
--
--
--  //Test the output scene. Scene1 should contain the result i.e (2*0.8 + 3*0.8) and scene2 should be unchanged
--  boxm_cell_iterator<boct_tree<short, float> > it1 =
--  scene1->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
--
--  boxm_cell_iterator<boct_tree<short, float > > it2 =
--  scene2->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
--
--  it1.begin();
--  it2.begin();
--  bool result = true;
--
--  while ( !(it1.end() || it2.end()) ) {
--
--    boct_tree_cell<short,float > *cell1 = *it1;
--    boct_tree_cell<short,float > *cell2 = *it2;
--
--    if (std::abs(cell1->data()- 4.0f) > 1.0e-7){
--      std::cerr << "Data1 is incorrect: "<< cell1->data()  <<"Error: " << std::abs(cell1->data()- 4.0f) << '\n';
--      result = false;
--      break;
--    }
--
--    if (std::abs(cell2->data()- 0.8f) > 1.0e-7){
--      std::cerr << "Data2 is incorrect: " << cell2->data()<<'\n';
--      result = false;
--      break;
--    }
--
--    ++it1;
--    ++it2;
--  }
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_linear_operations " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  TEST("Output data is correct", result, true);
--  clean_up();
--}
--
--
--TESTMAIN(test_linear_operations);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx b/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
-deleted file mode 100644
-index 1243faf34f..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
-+++ /dev/null
-@@ -1,54 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov 23 2011
--
--#include <testlib/testlib_test.h>
--#include "test_utils.h"
--
--#include <boxm/algo/boxm_scene_levels_utils.h>
--
--
--void test_remove_level0()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
--
--  //clone the input scene
--  boxm_scene<boct_tree<short, float> > *scene2 = new boxm_scene<boct_tree<short, float> >(scene1->lvcs(), scene1->origin(), scene1->block_dim(),
--                                                                                          scene1->world_dim(), scene1->max_level(), scene1->init_level(),
--                                                                                          scene1->load_all_blocks(), scene1->save_internal_nodes());
--
--  std::stringstream block_pref;
--  block_pref << scene1->block_prefix() << "_max_level_"  << (scene1->max_level() - 1);
--  scene2->set_paths(scene1->path(), block_pref.str());
--  scene2->set_appearance_model(scene1->appearence_model());
--
--  std::cout << "Cloning\n";
--  scene1->clone_blocks(*scene2);
--  std::cout << "Restructuring\n";
--  boxm_remove_level_0_leaves(scene2);
--  std::cout << "Done\n";
--
--  //Show contents of the scenes scene
--  boxm_block_iterator<boct_tree<short, float> > it1 = scene1->iterator();
--  boxm_block_iterator<boct_tree<short, float> > it2 = scene2->iterator();
--  for (it1.begin(), it2.begin(); !it1.end() && !it2.end(); ++it1, ++it2)
--  {
--    scene1->load_block(it1.index());
--    scene2->load_block(it2.index());
--
--    boxm_block<boct_tree<short, float> > *block1 = scene1->get_active_block();
--    boxm_block<boct_tree<short, float> > *block2 = scene2->get_active_block();
--
--    block1->get_tree()->print();
--    block2->get_tree()->print();
--  }
--
--  scene1->unload_active_blocks();
--  scene2->unload_active_blocks();
--}
--
--
--TESTMAIN(test_remove_level0);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx b/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
-deleted file mode 100644
-index 62b425171a..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
-+++ /dev/null
-@@ -1,122 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_save_scene_raw.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boct/boct_tree_cell.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_lvcs.h>
--
--static int test_save_scene_raw()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(5,5,5);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("boxm_scene1", "block");
--  vul_file::make_directory("boxm_scene1");
--  std::ofstream os("scene1.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  unsigned max_level=10, init_level=3;
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
--
--
--  float count=0.1f;
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree;
--    if (iter.index().x()==0 && iter.index().y()==0 && iter.index().z()==0) {
--      tree = new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level);
--    }
--    else {
--      tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level-1);
--    }
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.9));
--    s2_sample.alpha=count;
--
--    cel11->set_data(s2_sample);
--    //boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.51));
--    //cell2->set_data(s2_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--    count+=0.1f;
--  }
--
--
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
--
--  float thresh=0.02f;
--  bool reset=false;
--  for (unsigned i=0; i<10; i++) {
--    boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, thresh, reset);
--    boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene, "scene.raw", 0);
--#ifdef DEBUG_LEAKS
--    std::cerr << "Leaks at test_save_scene_raw " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--  }
--
--  SUMMARY();
--}
--
--TESTMAIN(test_save_scene_raw);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
-deleted file mode 100644
-index ced456755e..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
-+++ /dev/null
-@@ -1,127 +0,0 @@
--#include <iostream>
--#include <limits>
--#include <testlib/testlib_test.h>
--
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_upload_mesh.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boct/boct_tree_cell.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_fileio.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static void test_upload_mesh()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--
--#if 0
--  if (vul_file_is_directory("./boxm_upload"))
--  {
--    vul_file_iterator fiter("./boxm_upload/*");
--    while (!fiter)
--    {
--      vpl_unlink(fiter());
--      fiter++;
--    }
--    vpl_rmdir("./boxm_upload");
--  }
--#endif // 0
--
--  scene.set_paths("./boxm_upload", "block");
--  vul_file::make_directory("./boxm_upload");
--  std::ofstream os("scene.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  // create a mesh
--  unsigned int num_faces=1;
--  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(3));
--  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
--  imesh_vertex<3>& vert0 = (*verts)[0];
--  vert0[0]=2;
--  vert0[1]=2;
--  vert0[2]=4;
--  imesh_vertex<3>& vert1 = (*verts)[1];
--  vert1[0]=8;
--  vert1[1]=2;
--  vert1[2]=4;
--  imesh_vertex<3>& vert2 = (*verts)[2];
--  vert2[0]=8;
--  vert2[1]=8;
--  vert2[2]=4;
--
--  for (unsigned int f=0; f<num_faces; ++f) {
--    std::vector<unsigned int>& face = (*faces)[f];
--    unsigned int cnt=3;
--    face.resize(cnt,0);
--    for (unsigned int v=0; v<cnt; ++v)
--      face[v]=v;
--  }
--  imesh_mesh mesh;
--#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
--  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
--  mesh.set_vertices(std::move(tempv));
--  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
--  mesh.set_faces(std::move(tempf));
--#else
--  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
--  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
--#endif
--
--  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(6,5);
--    boxm_sample<BOXM_APM_MOG_GREY> s;
--    s.alpha=std::numeric_limits<float>::max();
--    tree->init_cells(s);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--
--  boxm_sample<BOXM_APM_MOG_GREY> val;
--  val.alpha=0;
--  boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, mesh, false, val);
--
--  std::vector<std::string> fnames;
--  boxm_block_iterator<tree_type> it(&scene);
--  it.begin();
--  // check the first block
--  scene.load_block(it.index().x(),it.index().y(),it.index().z());
--  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vert0.operator vgl_point_3d<double>());
--  TEST("Vertex 0 is in the octree", cell0->data().alpha, 0.0f);
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell1 = tree->locate_point_global(vert1.operator vgl_point_3d<double>());
--  TEST("Vertex 1 is in the octree", cell1->data().alpha, 0.0f);
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2 = tree->locate_point_global(vert2.operator vgl_point_3d<double>());
--  TEST("Vertex 2 is in the octree", cell2->data().alpha, 0.0f);
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell = tree->locate_point_global(vgl_point_3d<double>(1,1,1));
--  TEST_NEAR("A non-polygon point should be non-zero", cell->data().alpha, std::numeric_limits<float>::max(), 1e-6);
--
--  vpl_rmdir("./boxm_upload");
--  vpl_unlink("./scene.xml");
--}
--
--TESTMAIN(test_upload_mesh);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx b/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
-deleted file mode 100644
-index f286501eee..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
-+++ /dev/null
-@@ -1,71 +0,0 @@
--#include "test_utils.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Aug-2010
--
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--#include <utility>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i)
--{
--  tree-> split(); //now we have 8 cells
--  //tree->print();
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  leaves[i]->set_data(0.8f);
--  leaves[i]->split();
--}
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz, bool uniform, std::string scene_name)
--{
--  //crete the input scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--
--  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
--
--    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
--
--  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
--  std::string scene_path("./");
--  scene->set_paths(scene_path,  std::move(scene_name));
--
--  unsigned cell_index = 7;
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  while (!iter.end())
--  {
--    scene->load_block(iter.index());
--    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
--    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
--
--    float init_val = 0.5f;
--    if (uniform)
--      init_val = 0.8f;
--
--    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
--    //tree->print();
--    init_tree(tree, cell_index);
--    //tree->print();
--    block->init_tree(tree);
--    scene->write_active_block();
--    if (cell_index == 0) cell_index = 7;
--    cell_index--;
--    ++iter;
--  }
--  return scene;
--}
--
--void clean_up()
--{
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());
--    vul_file::delete_file_glob(file_it());
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.h b/contrib/brl/bseg/boxm/algo/tests/test_utils.h
-deleted file mode 100644
-index f646d0b390..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_utils.h
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#ifndef boxm_algo_test_utils_h_
--#define boxm_algo_test_utils_h_
--//:
--// \file
--// \brief  A file containing utility functions for other tests
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <boxm/boxm_scene.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i);
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
--                                                   bool uniform = false, std::string scene_name = "test_scene");
--
--void clean_up();
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/CMakeLists.txt
-deleted file mode 100644
-index a5e13d6975..0000000000
---- a/contrib/brl/bseg/boxm/basic/CMakeLists.txt
-+++ /dev/null
-@@ -1,21 +0,0 @@
--# brl/bseg/boxm/basic/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_basic_sources
--    boxm_block_vis_graph_iterator.h     boxm_block_vis_graph_iterator.hxx
--    boxm_block_vis_graph_node.h
--    boxm_cell_vis_graph_iterator.h      boxm_cell_vis_graph_iterator.hxx
--    boxm_raytrace_function.h
--    boxm_seg_length_functor.h
--    boxm_num_rays_functor.h
--    boxm_util_data_types.h boxm_util_data_types.cxx
--   )
--
--aux_source_directory(Templates boxm_basic_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_basic LIBRARY_SOURCES ${boxm_basic_sources})
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_basic boxm boxm_util boxm_sample boxm_sample_algo boct ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index b4bce045ed..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_scene.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-deleted file mode 100644
-index 4129f1a830..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,float >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 450ee3e72c..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,int>  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 2cd39a3534..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <vgl/vgl_point_3d.h>
--
--typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index 60ef86952b..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index d4a5a0384f..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boct_tree<short, boxm_edge_tangent_sample<float> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boct_tree<short, boxm_inf_line_sample<float> > aux_tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type);
--
--typedef boct_tree<short, float > aux_tree_type2;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type2);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index 10b6aa91a5..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 72ebcd47fb..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index 0fcf5fd35c..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 3ad032ddf2..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 9ee11b98ea..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index c2743dff25..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_node.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index fb158b16d1..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_sample<float>);
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index b561f8e125..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_tangent_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
-deleted file mode 100644
-index 343941bf71..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_inf_line_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index 69a4394c0b..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 2bf0739edf..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-deleted file mode 100644
-index 29aadb8cb1..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index ed5b966521..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
-deleted file mode 100644
-index c961518029..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,vgl_point_3d<double>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx b/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
-deleted file mode 100644
-index 84a7a2e75f..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/basic/boxm_util_data_types.h>
--
--BRDB_VALUE_INSTANTIATE(boxm_array_1d_float_sptr,"boxm_array_1d_float_sptr");
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
-deleted file mode 100644
-index d887b99938..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <boxm/basic/boxm_util_data_types.h>
--
--VBL_IO_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
-deleted file mode 100644
-index 2a77fe6767..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <vbl/vbl_smart_ptr.hxx>
--#include <boxm/basic/boxm_util_data_types.h>
--
--VBL_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
-deleted file mode 100644
-index 70f36b1047..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
-+++ /dev/null
-@@ -1,53 +0,0 @@
--#ifndef boxm_block_vis_graph_iterator_h_
--#define boxm_block_vis_graph_iterator_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include <map>
--#include "boxm_block_vis_graph_node.h"
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T>
--class boxm_block_vis_graph_iterator
--{
-- public:
--  boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam, boxm_scene<T>* scene,
--                                unsigned img_ni, unsigned img_nj, bool rev_iter=false);
--
--  ~boxm_block_vis_graph_iterator()= default;
--
--  bool next();
--
--  std::vector<boxm_block<T>*> frontier_blocks();
--
--  std::vector<vgl_point_3d<int> > frontier_indices() const {return to_process_indices_; }
--
--  void set_reverse_iter(bool reverse) { reverse_it_ = reverse; }
--
-- private:
--
--  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
--
--  //: visibility graph, indexed by the block indices
--  vis_graph_type vis_graph_;
--
--  //: blocks that can be seen by the camera unoccluded
--  std::vector<typename vis_graph_type::iterator> curr_blocks_;
--
--  std::vector<vgl_point_3d<int> > to_process_indices_;
--
--  //: the camera
--  vpgl_camera_double_sptr camera_;
--
--  boxm_scene<T>* scene_;
--
--  bool reverse_it_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
-deleted file mode 100644
-index 4baa6d8992..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
-+++ /dev/null
-@@ -1,173 +0,0 @@
--#ifndef boxm_block_vis_graph_iterator_hxx_
--#define boxm_block_vis_graph_iterator_hxx_
--
--#include "boxm_block_vis_graph_iterator.h"
--#include "boxm_block_vis_graph_node.h"
--#include <boxm/util/boxm_utils.h>
--#include <boct/boct_tree_cell.h>
--
--template <class T>
--boxm_block_vis_graph_iterator<T>::boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam,
--                                                                boxm_scene<T>* scene,
--                                                                unsigned img_ni,
--                                                                unsigned img_nj,
--                                                                bool rev_iter)
--    : camera_(cam), scene_(scene), reverse_it_(rev_iter)
--{
--  // compute the visibility graph
--  boxm_block_iterator<T> iter = scene->iterator();
--  for (; !iter.end(); iter++) {
--    boxm_block<T>* block = *iter;
--    if (boxm_utils::is_visible(block->bounding_box(), cam, img_ni, img_nj))
--      vis_graph_.insert(std::make_pair<vgl_point_3d<int>,boxm_block_vis_graph_node<T> >(iter.index(),boxm_block_vis_graph_node<T>()));
--  }
--
--  typename vis_graph_type::iterator vis_iter;
--  for (vis_iter=vis_graph_.begin(); vis_iter!=vis_graph_.end(); vis_iter++) {
--    vgl_point_3d<int> idx = vis_iter->first;
--    boxm_block<T>* block = scene->get_block(idx);
--    boct_face_idx vis_faces = boxm_utils::visible_faces(block->bounding_box(), cam);
--
--    vgl_point_3d<int> neighbor_idx = vis_iter->first;
--    bool face_in = false;
--    if (vis_faces & X_HIGH) {
--      // check for neighbor on X_HIGH face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(1,0,0);
--      face_in = true;
--    } else if (vis_faces & X_LOW) {
--      // check for neighbor on X_LOW face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(1,0,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
--      face_in = true;
--    }
--
--    if (face_in) {
--      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
--      if (nit == vis_graph_.end()) {
--        vis_iter->second.in_count++;
--        curr_blocks_.push_back(vis_iter);
--      } else {
--        vis_iter->second.in_count++;
--        nit->second.out_links.push_back(vis_iter);
--      }
--    }
--
--    face_in = false;
--    neighbor_idx = vis_iter->first;
--    if (vis_faces & Y_HIGH) {
--      // check for neighbor on Y_HIGH face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,1,0);
--      face_in = true;
--    } else if (vis_faces & Y_LOW) {
--      // check for neighbor on Y_LOW face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,1,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
--      face_in = true;
--    }
--
--    if (face_in) {
--      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
--      if (nit == vis_graph_.end()) {
--        vis_iter->second.in_count++;
--        curr_blocks_.push_back(vis_iter);
--      } else {
--        vis_iter->second.in_count++;
--        nit->second.out_links.push_back(vis_iter);
--      }
--    }
--
--    face_in=false;
--    neighbor_idx = vis_iter->first;
--    if (vis_faces & Z_HIGH) {
--      // check for neighbor on Z_HIGH face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,0,1);
--      face_in = true;
--    }else if (vis_faces & Z_LOW) {
--      // check for neighbor on Y_LOW face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,0,1);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
--      face_in = true;
--     }
--
--    if (face_in) {
--      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
--      if (nit == vis_graph_.end()) {
--        vis_iter->second.in_count++;
--        curr_blocks_.push_back(vis_iter);
--      }
--      else {
--        vis_iter->second.in_count++;
--        nit->second.out_links.push_back(vis_iter);
--      }
--    }
--  }
--}
--
--template <class T>
--bool boxm_block_vis_graph_iterator<T>::next()
--{
--  typename std::vector<typename vis_graph_type::iterator>::iterator block_iter = curr_blocks_.begin();
--  std::vector<typename vis_graph_type::iterator> to_process;
--
--  for (; block_iter != curr_blocks_.end(); block_iter++) {
--    //std::cout << (*block_iter)->first;
--    //std::cout << (*block_iter)->second.in_count << std::endl;
--    if (--((*block_iter)->second.in_count) == 0)
--      to_process.push_back(*block_iter);
--  }
--
--  if (to_process.size() == 0) {
--    to_process_indices_.resize(0);
--    return false;
--  }
--  to_process_indices_.resize(to_process.size());
--
--  std::vector<vgl_point_3d<int> >::iterator to_proc_it = to_process_indices_.begin();
--  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter, ++to_proc_it) {
--    *to_proc_it = (*block_iter)->first;
--  }
--
--  // add linked blocks to list for next iteration
--  curr_blocks_.clear();
--  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter) {
--    std::vector<typename vis_graph_type::iterator > &links = (*block_iter)->second.out_links;
--    typename std::vector<typename vis_graph_type::iterator >::iterator neighbor_it = links.begin();
--    for (; neighbor_it != links.end(); ++neighbor_it) {
--      curr_blocks_.push_back(*neighbor_it);
--    }
--  }
--  return true;
--}
--
--template <class T>
--std::vector<boxm_block<T>*> boxm_block_vis_graph_iterator<T>::frontier_blocks()
--{
--  std::vector<boxm_block<T>*> frontier;
--
--  std::vector<vgl_point_3d<int> > blocks = to_process_indices_;
--  for (auto index : blocks) {
--    frontier.push_back(scene_->get_block(index)); //.x(), index.y(), index.z());
--  }
--
--  return frontier;
--}
--
--#define BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(T) \
--template class boxm_block_vis_graph_iterator<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
-deleted file mode 100644
-index 1d615b1477..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#ifndef boxm_block_vis_graph_node_h_
--#define boxm_block_vis_graph_node_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include <map>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vgl/vgl_point_3d.h>
--
--//: A comparison functor for vgl_point_3d's. Needed to create a std::set of vgl_point_3d<int>'s.
--template <class T>
--class vgl_point_3d_cmp
--{
-- public:
--  vgl_point_3d_cmp() = default;
--
--  bool operator()(vgl_point_3d<T> const& v0, vgl_point_3d<T> const& v1) const
--  {
--    if (v0.z() != v1.z())
--      return v0.z() < v1.z();
--    else if (v0.y() != v1.y())
--      return v0.y() < v1.y();
--    else
--      return v0.x() < v1.x();
--  }
--};
--
--template <class T>
--class boxm_block_vis_graph_node
--{
-- public:
--  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
--
--  boxm_block_vis_graph_node() : in_count(0) {}
--  ~boxm_block_vis_graph_node()= default;
--
--  int dec_in_count() { return --in_count; }
--
--  //: the number of incoming edges to this node
--  int in_count;
--
--  //: graph links to the outgoing blocks
--  std::vector<typename vis_graph_type::iterator> out_links;
--};
--
--#define BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(T) \
--template class boxm_block_vis_graph_node<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
-deleted file mode 100644
-index 6bc8372e16..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
-+++ /dev/null
-@@ -1,54 +0,0 @@
--#ifndef boxm_cell_vis_graph_iterator_h_
--#define boxm_cell_vis_graph_iterator_h_
--//:
--// \file
--#include <iostream>
--#include <vector>
--#include <boct/boct_tree_cell.h>
--#include <boct/boct_tree.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--class boxm_cell_vis_graph_iterator
--{
-- public:
--  boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
--                               boct_tree<T_loc,T_data>* tree,
--                               unsigned img_ni,
--                               unsigned img_nj);
--
--  ~boxm_cell_vis_graph_iterator() = default;
--
--  bool next();
--
--  std::vector<boct_tree_cell<T_loc,T_data>*> frontier() { return frontier_; }
--
--  void set_reverse_iter(bool reverse) { reverse_iter_ = reverse; }
--
-- private:
--  //: the camera
--  vpgl_camera_double_sptr camera_;
--
--  //: blocks that can be seen by the camera unoccluded
--  std::vector<boct_tree_cell<T_loc,T_data>*> frontier_;
--  std::vector<boct_tree_cell<T_loc,T_data>*> curr_cells_;
--  bool reverse_iter_;
--
--  unsigned img_ni_;
--  unsigned img_nj_;
--
--  //: recursive function
--  void check_cell_visibility(boct_tree<T_loc,T_data>* tree,
--                             boct_tree_cell<T_loc,T_data>* tree_cell);
--
--  void form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,
--                           boct_face_idx face_idx,
--                           boct_tree<T_loc,T_data>* tree);
--
--  std::vector<boct_tree_cell<T_loc,T_data>* > list_of_vis_nodes_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
-deleted file mode 100644
-index 4108982a68..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
-+++ /dev/null
-@@ -1,131 +0,0 @@
--#ifndef boxm_cell_vis_graph_iterator_hxx_
--#define boxm_cell_vis_graph_iterator_hxx_
--
--#include "boxm_cell_vis_graph_iterator.h"
--#include <boxm/util/boxm_utils.h>
--
--template <class T_loc,class T_data>
--boxm_cell_vis_graph_iterator<T_loc,T_data>::boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
--                                                                         boct_tree<T_loc,T_data>* tree,
--                                                                         unsigned img_ni,
--                                                                         unsigned img_nj) : camera_(cam),img_ni_(img_ni), img_nj_(img_nj)
--{
--  if (!tree)
--  {
--   std::cout<<"No Tree found"<<std::endl;
--  }
--  else
--  {
--    list_of_vis_nodes_.clear();
--    // check if each node is visible or notr
--    check_cell_visibility(tree,tree->root());
--    // compute the visibility graph
--    for (unsigned i=0;i<list_of_vis_nodes_.size();i++)
--    {
--      boct_face_idx vis_faces = boxm_utils::visible_faces(tree->cell_bounding_box(list_of_vis_nodes_[i]), cam);
--      if (vis_faces & ::X_HIGH) {
--        form_graph_per_cell(list_of_vis_nodes_[i],X_HIGH,tree);
--      }
--      else if (vis_faces & ::X_LOW) {
--        form_graph_per_cell(list_of_vis_nodes_[i],X_LOW,tree);
--      }
--      if (vis_faces & ::Y_HIGH) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Y_HIGH,tree);
--      }
--      else if (vis_faces & ::Y_LOW) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Y_LOW,tree);
--      }
--      if (vis_faces & ::Z_HIGH) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Z_HIGH,tree);
--      }
--      else if (vis_faces & ::Z_LOW) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Z_LOW,tree);
--      }
--    }
--    list_of_vis_nodes_.clear();
--  }
--}
--
--template <class T_loc,class T_data>
--bool boxm_cell_vis_graph_iterator<T_loc,T_data>::next()
--{
--  std::vector<boct_tree_cell<T_loc,T_data>* > to_process;
--  std::vector<boct_tree_cell<T_loc,T_data>* > to_process_refine;
--
--  typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator cell_it = curr_cells_.begin();
--  for (; cell_it != curr_cells_.end(); ++cell_it) {
--    // decrement each cell's count in list. if count == 0, add to list of nodes to process
--    if (--((*cell_it)->vis_node()->incoming_count) == 0) {
--      to_process.push_back(*cell_it);
--    }
--  }
--  if (to_process.size() == 0) {
--    return false;
--  }
--   frontier_.clear();
--
--  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
--    frontier_.push_back((*cell_it));
--  }
--  // add linked cells to list for next iteration
--  curr_cells_.clear();
--  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
--    std::vector<boct_tree_cell<T_loc,T_data>* > links = (*cell_it)->vis_node()->outgoing_links;
--    typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator neighbor_it = links.begin();
--    for (; neighbor_it != links.end(); ++neighbor_it) {
--      curr_cells_.push_back(*neighbor_it);
--    }
--  }
--  return true;
--}
--
--template<class T_loc,class T_data>
--void boxm_cell_vis_graph_iterator<T_loc,T_data>::check_cell_visibility(boct_tree<T_loc,T_data>* tree,
--                                                                       boct_tree_cell<T_loc,T_data>* tree_cell)
--{
--  vgl_box_3d<double> bbox=tree->cell_bounding_box(tree_cell);
--  if (boxm_utils::is_visible(bbox, camera_,img_ni_, img_nj_, true))
--  {
--    // base case for recursion
--    if (tree_cell->is_leaf())
--    {
--      boct_cell_vis_graph_node<T_loc,T_data> * node=new boct_cell_vis_graph_node<T_loc,T_data>();
--      node->visible=true;
--      tree_cell->set_vis_node(node);
--      list_of_vis_nodes_.push_back(tree_cell);
--    }
--    else
--    {
--      boct_tree_cell<T_loc,T_data>* children = tree_cell->children();
--      for (unsigned i=0; i<8; i++)
--      check_cell_visibility(tree,&children[i]);
--    }
--  }
--}
--
--template<class T_loc,class T_data>
--void boxm_cell_vis_graph_iterator<T_loc,T_data>::form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,boct_face_idx face_idx,boct_tree<T_loc,T_data>* tree)
--{
--  boct_cell_vis_graph_node<T_loc,T_data>* vis_node=cell->vis_node();
--  std::vector<boct_tree_cell<T_loc,T_data>*> neighbors;
--  cell->find_neighbors(face_idx, neighbors,tree->root_level());
--  typename std::vector<boct_tree_cell<T_loc,T_data>*>::iterator neighbor_it = neighbors.begin();
--  bool visible_neighbors=false;
--  for (; neighbor_it != neighbors.end(); ++neighbor_it) {
--    boct_cell_vis_graph_node<T_loc,T_data>* neighbor_vis_node=(*neighbor_it)->vis_node();
--    if (neighbor_vis_node) {
--      vis_node->incoming_count++;
--      neighbor_vis_node->outgoing_links.push_back(cell);
--      visible_neighbors=true;
--    }
--  }
--  if (!visible_neighbors) {
--    vis_node->incoming_count++;
--    curr_cells_.push_back(cell);
--  }
--}
--
--#define BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(T1,T2) \
--template class boxm_cell_vis_graph_iterator<T1,T2 >
--
--#endif // boxm_cell_vis_graph_iterator_hxx_
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h b/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
-deleted file mode 100644
-index 98703eec22..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--#ifndef boxm_num_rays_functor_h
--#define boxm_num_rays_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_histogram.h>
--#include <boxm/boxm_apm_traits.h>
--#include "boxm_raytrace_function.h"
--
--//: this functor is to compute no of rays passing through a cell
--// Works for boxm_scalar_sample
--template <boxm_apm_type APM, class T_aux>
--class boxm_num_rays_functor
--{
-- public:
--  boxm_num_rays_functor()
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int /*i*/, unsigned int /*j*/,  // FIXME: both unused!
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> & /*cell_value*/,       // FIXME: unused...
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--
--    aux_val.scalar_sum_+=1;
--    //std::cout<<aux_val.scalar_sum_<<' ';
--    aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h b/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
-deleted file mode 100644
-index 88897fd462..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
-+++ /dev/null
-@@ -1,618 +0,0 @@
--#ifndef boxm_raytrace_function_h_
--#define boxm_raytrace_function_h_
--//:
--// \file
--
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/boxm_aux_traits.h>
--
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vpgl/vpgl_affine_camera.h>
--#include <vpgl/algo/vpgl_backproject.h>
--#include <vpgl/algo/vpgl_ray.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/vgl_homg_point_2d.h>
--#include <vgl/vgl_line_3d_2_points.h>
--
--#include <vul/vul_timer.h>
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<class F, class T_loc, class T_data, class T_aux = typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype>
--class boxm_raytrace_function
--{
--  // null scene used as placeholder for operations that don't require an auxiliary scene
--  boxm_aux_scene<T_loc, T_data, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> null_scene_;
--
-- public:
--    typedef boct_tree<T_loc,T_data> tree_type;
--    typedef boct_tree<T_loc,T_aux> aux_tree_type;
--    typedef boct_tree_cell<T_loc,T_data> cell_type;
--
--    //: constructor for functions with no auxiliary scene needed
--    boxm_raytrace_function(boxm_scene<tree_type> &scene,
--                           vpgl_camera_double_sptr cam,
--                           unsigned int ni, unsigned int nj,
--                           bool reverse_traversal = false,
--                           unsigned int i0 = 0, unsigned int j0 = 0
--                          )
--    : scene_(scene), aux_scene_(null_scene_), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
--
--    //: constructor for functions using an auxiliary scene
--    boxm_raytrace_function(boxm_scene<tree_type> &scene,
--                           boxm_aux_scene<T_loc, T_data,  T_aux> &aux_scene,
--                           vpgl_camera_double_sptr cam,
--                           unsigned int ni, unsigned int nj,
--                           bool reverse_traversal = false,
--                           unsigned int i0 = 0, unsigned int j0 = 0)
--    : scene_(scene), aux_scene_(aux_scene), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
--
--    bool run_single_ray(F& step_functor,float i, float j)
--    {
--        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
--        continue_trace.fill(true);
--        // code to iterate over the blocks in order of visibility
--        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
--        while (block_vis_iter.next())
--        {
--            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--            for (unsigned i=0; i<block_indices.size(); i++) // code for each block
--            {
--                scene_.load_block(block_indices[i]);
--                boxm_block<tree_type> * curr_block=scene_.get_active_block();
--                boxm_block<aux_tree_type> * curr_aux_block=NULL;
--                if (step_functor.is_aux_)
--                    curr_aux_block=aux_scene_.get_block(block_indices[i]);
--
--                if (debug_lvl_ > 0)
--                    std::cout << "processing block at index (" <<block_indices[i] << ')' << std::endl;
--                // make sure block projects to inside of image
--                vgl_box_3d<double> block_bb = curr_block->bounding_box();
--
--                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
--                    continue;
--
--
--                vgl_box_2d<double> img_bb;
--
--                // initialize ray_origin() function for this block
--                if (!generate_ray_init(block_bb, img_bb)) {
--                    continue;
--                }
--                tree_type * tree=curr_block->get_tree();
--
--                aux_tree_type * aux_tree=NULL;
--                if (step_functor.is_aux_)
--                {
--                    aux_tree=curr_aux_block->get_tree();
--                }
--
--                 // get direction of vector and enter point - this depends on which camera type we have
--                vgl_point_3d<double> ray_origin;
--                vgl_vector_3d<double> direction;
--                vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
--                std::vector<vgl_point_3d<double> > plane_intersections(6);
--                // add 0.5 to get center of pixel
--                generate_ray(i , j, block_bb, ray_origin, direction);
--
--                // compute intersection of each plane with ray
--                double lambda[6];
--                lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
--                lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
--                lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
--                lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
--                lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
--                lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
--
--                if (block_bb.contains(ray_origin))
--                    enter_pt=ray_origin;
--                else
--                {
--                    for (unsigned int face=0; face<6; ++face) {
--                        plane_intersections[face] = ray_origin + (direction * lambda[face]);
--                    }
--
--                    // determine which point is the entrance point based on direction
--                    const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
--                    if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
--                        (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
--                        (direction.z() < -epsilon) )
--                    {
--                        // ray intersects the zmax plane
--                        // check zmax first since it is probably the most common
--                        enter_pt = plane_intersections[5];
--                    }
--                    else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
--                        (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
--                        (direction.x() > epsilon) )
--                    {
--                        // ray intersects the xmin plane
--                        enter_pt = plane_intersections[0];
--                    }
--                    else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
--                        (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
--                        (direction.x() < -epsilon) )
--                    {
--                        // ray intersects the xmax plane
--                        enter_pt = plane_intersections[1];
--                    }
--                    else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
--                        (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
--                        (direction.y() > epsilon) )
--                    {
--                        // ray intersects the ymin plane
--                        enter_pt = plane_intersections[2];
--                    }
--                    else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
--                        (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
--                        (direction.y() < -epsilon) )
--                    {
--                        // ray intersects the ymax plane
--                        enter_pt = plane_intersections[3];
--                    }
--                    else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
--                        (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
--                        (direction.z() > epsilon) )
--                    {
--                        // ray intersects the zmin plane
--                        enter_pt = plane_intersections[4];
--                    }
--                    else {
--                        // no entry point into this block found
--                        continue;
--                    }
--                }
--                boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(enter_pt);
--                while (true)
--                {
--                    boct_loc_code<T_loc> cell_code(curr_cell->get_code());
--
--                    boct_tree_cell<T_loc,T_aux > * curr_aux_cell=NULL;
--                    if (step_functor.is_aux_)
--                        curr_aux_cell=aux_tree->get_cell(cell_code);
--                    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
--                    // find exit point of cell
--                    vgl_point_3d<double> exit_pt;
--                    double lambda=0;
--                    boct_face_idx face_id=NONE;
--                    bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
--                    if (!found_exit) {
--                        std::cerr << "error: could not find cell exit point\n"
--                                 << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
--                                 << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
--                                 << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
--                                 << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
--                        assert(found_exit);
--                        break;
--                    }
--                    T_data cell_val=curr_cell->data();
--                    T_aux aux_val;
--                    if (step_functor.is_aux_)
--                        aux_val=curr_aux_cell->data();
--                    continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(enter_pt, exit_pt, cell_val,aux_val);
--                    curr_cell->set_data(cell_val);
--                    if (step_functor.is_aux_)
--                        curr_aux_cell->set_data(aux_val);
--                    // normalize the point to [0-1]to obtain the index.
--                    vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
--                                                      (exit_pt.y()-block_bb.min_y())/block_bb.height(),
--                                                      (exit_pt.z()-block_bb.min_z())/block_bb.depth());
--                    // obtain the code for the exit point
--                    boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level());
--                    cell_type *neighborcell=NULL;
--                    if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
--                        curr_cell=neighborcell->traverse_force(exit_loc_code);
--                    else
--                    {
--                        std::cerr << "NO NEIGHBORS FOUND!\n";
--                        break;
--                    }
--                    enter_pt=exit_pt;
--                }
--                if (!step_functor.scene_read_only_)
--                    scene_.write_active_block();
--                if (step_functor.is_aux_)
--                    aux_scene_.write_active_block();
--            }
--        }
--        scene_.unload_active_blocks();
--        aux_scene_.unload_active_blocks();
--        return true;
--    }
--
--    bool run(F& step_functor)
--    {
--        vul_timer timer;
--        float total_load_time = 0.0f;
--        float total_compute_time = 0.0f;
--        float total_save_time = 0.0f;
--        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
--        continue_trace.fill(true);
--        // code to iterate over the blocks in order of visibility
--        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
--        while (block_vis_iter.next())
--        {
--            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--            for (auto & block_indice : block_indices) // code for each block
--            {
--                timer.mark();
--                scene_.load_block(block_indice);
--                boxm_block<tree_type> * curr_block=scene_.get_active_block();
--
--                if (debug_lvl_ > 0)
--                    std::cout << "processing block at index (" <<block_indice << ')' << std::endl;
--                // make sure block projects to inside of image
--                vgl_box_3d<double> block_bb = curr_block->bounding_box();
--
--                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
--                    continue;
--                vgl_box_2d<double> img_bb;
--                // initialize ray_origin() function for this block
--                if (!generate_ray_init(block_bb, img_bb)) {
--                    continue;
--                }
--
--                tree_type * tree=curr_block->get_tree();
--
--                boxm_block<aux_tree_type> * curr_aux_block=nullptr;
--                aux_tree_type * aux_tree=nullptr;
--                if (step_functor.is_aux_)
--                {
--                   curr_aux_block=aux_scene_.get_block(block_indice);
--                   aux_tree=curr_aux_block->get_tree();
--                }
--                float load_time = (float)timer.all() / 1e3f;
--                total_load_time += load_time;
--                timer.mark();
--                // for each image pixel
--                for (unsigned int i = int(img_bb.min_x()+0.99); i <= img_bb.max_x(); ++i)
--                {
--                    if (debug_lvl_ > 1) {
--                        if (!(i % 10))
--                            std::cout << '.';
--                    }
--                    for (unsigned int j = int(img_bb.min_y()+0.99); j <= img_bb.max_y(); ++j)
--                    {
--                        if (!continue_trace(i - img_i0_ , j - img_j0_)) {
--                            continue;
--                        }
--                        // get direction of vector and enter point - this depends on which camera type we have
--                        vgl_point_3d<double> ray_origin;
--                        vgl_vector_3d<double>direction;
--                        vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
--                        vgl_point_3d<double> exit_pt;
--                        // add 0.5 to get center of pixel
--                        generate_ray((float)i + 0.5f, (float)j + 0.5f, block_bb, ray_origin, direction);
--                        if (!entry_point(block_bb,ray_origin,direction,enter_pt))
--                            continue;
--                        // normalize the entry point to [0,1]
--                        vgl_point_3d<double> enter_pt_norm((enter_pt.x()-block_bb.min_x())/block_bb.width(),
--                                                           (enter_pt.y()-block_bb.min_y())/block_bb.height(),
--                                                           (enter_pt.z()-block_bb.min_z())/block_bb.depth());
--                        boct_loc_code<T_loc> curr_cell_code(enter_pt_norm,tree->root_level());
--                        boct_tree_cell<T_loc,T_data > * curr_cell=tree->root()->traverse_force(curr_cell_code);
--
--                        boct_tree_cell<T_loc, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> aux_cell_null;
--
--                        while (continue_trace(i-img_i0_, j-img_j0_))
--                        {
--                            boct_tree_cell<T_loc,T_aux > *curr_aux_cell= reinterpret_cast<boct_tree_cell<T_loc,T_aux>*>(&aux_cell_null);
--                            if (step_functor.is_aux_)
--                            {
--                                boct_loc_code<T_loc> cell_code(curr_cell->get_code());
--                                curr_aux_cell=aux_tree->get_cell(cell_code);
--                            }
--                            // get the canonical bounding box
--                            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
--                            // find exit point of cell
--
--                            double lambda=0;
--                            boct_face_idx face_id=NONE;
--                            bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
--                            if (!found_exit) {
--                                std::cerr << "error: could not find cell exit point\n"
--                                         << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
--                                         << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
--                                         << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
--                                         << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
--                                assert(found_exit);
--                                break;
--                            }
--                            T_data cell_val=curr_cell->data();
--                            T_aux aux_val=curr_aux_cell->data();
--
--
--                            continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(i,j, enter_pt, exit_pt, cell_val,aux_val);
--
--                            curr_cell->set_data(cell_val);
--                            if (step_functor.is_aux_)
--                                curr_aux_cell->set_data(aux_val);
--                             vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
--                                                               (exit_pt.y()-block_bb.min_y())/block_bb.height(),
--                                                              (exit_pt.z()-block_bb.min_z())/block_bb.depth());
--
--                            // obtain the code for the exit point
--                            boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level(), tree->max_val());
--                            cell_type *neighborcell=nullptr;
--                            if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
--                                curr_cell=neighborcell->traverse_force(exit_loc_code);
--                            else
--                                break;
--                            enter_pt=exit_pt;
--                        }
--                    }
--                }
--                float compute_time = (float)timer.all() / 1e3f;
--                total_compute_time += compute_time;
--                timer.mark();
--
--                if (!step_functor.scene_read_only_)
--                    scene_.write_active_block();
--                if (step_functor.is_aux_)
--                    aux_scene_.write_active_block();
--
--                float save_time = (float)timer.all() /  1e3f;
--                total_save_time += save_time;
--                //std::cout << "load: " << load_time << "s  compute: " << compute_time << "s  save: " << save_time << 's' << std::endl;
--            }
--        }
--        scene_.unload_active_blocks();
--        aux_scene_.unload_active_blocks();
--
--        //std::cout << "total load: " << total_load_time << "s  total compute: " << total_compute_time << "s  total save: " << total_save_time << 's' << std::endl;
--        return true;
--    }
--
-- protected:
--
--    bool generate_ray_init(vgl_box_3d<double> const& block_bb, vgl_box_2d<double> &img_bb)
--    {
--        // determine intersection of block bounding box projection and image bounds
--        vgl_box_2d<double> img_bounds;
--        img_bounds.add(vgl_point_2d<double>(img_i0_,img_j0_));
--        img_bounds.add(vgl_point_2d<double>(img_i0_ + img_ni_ - 1, img_j0_ + img_nj_ - 1));
--
--        vgl_box_2d<double> block_projection;
--        double u,v;
--        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--
--        img_bb=vgl_intersection(img_bounds,block_projection);
--
--        if (img_bb.is_empty())
--            return false;
--        else
--            return true;
--    }
--
--    void generate_ray(float i, float j, vgl_box_3d<double> const& /*block_bb*/, vgl_point_3d<double> &ray_origin, vgl_vector_3d<double> &norm_direction)
--    {
--      if (cam_->type_name() == "vpgl_perspective_camera") {
--        vpgl_perspective_camera<double> const* pcam =
--          static_cast<vpgl_perspective_camera<double> const*>(cam_.ptr());
--        // backproject image point to a ray
--        ray_origin = pcam->camera_center();
--        vgl_line_3d_2_points<double> cam_ray = pcam->backproject(vgl_point_2d<double>((double)i,(double)j));
--        norm_direction=cam_ray.direction();
--        normalize(norm_direction);
--        return;
--      }
--      if (cam_->type_name() == "vpgl_proj_camera") {
--        vpgl_proj_camera<double> const* prcam =
--          static_cast<vpgl_proj_camera<double> const*>(cam_.ptr());
--        ray_origin = prcam->camera_center();
--        vgl_homg_line_3d_2_points<double>  cam_ray =
--          prcam->backproject(vgl_homg_point_2d<double>((double)i,(double)j));
--        vgl_homg_point_3d<double> hp = cam_ray.point_infinite();
--        vgl_vector_3d<double> direction(hp.x(), hp.y(), hp.z());
--        norm_direction=direction;
--        normalize(norm_direction);
--        return;
--      }
--      if (cam_->type_name() == "vpgl_affine_camera") {
--        vgl_homg_point_2d<double> ph(i, j);
--        vpgl_affine_camera<double> const * afcam =
--          static_cast<vpgl_affine_camera<double> const*>(cam_.ptr());
--        vgl_homg_line_3d_2_points<double>  cam_ray =
--          afcam->backproject(ph);
--        vgl_homg_point_3d<double> hpinf = cam_ray.point_infinite();
--        vgl_homg_point_3d<double> hpfin = cam_ray.point_finite();
--        vgl_vector_3d<double> direction(hpinf.x(), hpinf.y(), hpinf.z());
--        norm_direction=direction;
--        normalize(norm_direction);
--        vgl_point_3d<double> temp(hpfin);
--        ray_origin = temp;
--        return;
--      }
--      if (cam_->type_name() == "vpgl_local_rational_camera") {
--        vpgl_local_rational_camera<double> const* lrcam =
--          static_cast<vpgl_local_rational_camera<double> const*>(cam_.ptr());
--        vpgl_ray::ray(*lrcam,(double)i, (double)j, ray_origin, norm_direction);
--        return;
--      }
--      else {
--        std::cerr << "In boxm_raytrace_function: camera type not handled\n";
--        assert(false);
--      }
--    }
--
--    bool entry_point(vgl_box_3d<double> & block_bb, vgl_point_3d<double>  &ray_origin,
--                     vgl_vector_3d<double> &direction, vgl_point_3d<double> & enter_pt)
--    {
--      double lambda[6];
--      std::vector<vgl_point_3d<double> > plane_intersections(6);
--
--      lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
--      lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
--      lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
--      lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
--      lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
--      lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
--
--      if (block_bb.contains(ray_origin))
--          enter_pt=ray_origin;
--      else
--      {
--          for (unsigned int face=0; face<6; ++face) {
--              plane_intersections[face] = ray_origin + (direction * lambda[face]);
--          }
--
--          // determine which point is the entrance point based on direction
--          const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
--          if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
--              (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
--              (direction.z() < -epsilon) )
--          {
--              // ray intersects the zmax plane
--              // check zmax first since it is probably the most common
--              enter_pt = plane_intersections[5];
--          }
--          else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
--              (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
--              (direction.x() > epsilon) )
--          {
--              // ray intersects the xmin plane
--              enter_pt = plane_intersections[0];
--          }
--          else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
--              (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
--              (direction.x() < -epsilon) )
--          {
--              // ray intersects the xmax plane
--              enter_pt = plane_intersections[1];
--          }
--          else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
--              (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
--              (direction.y() > epsilon) )
--          {
--              // ray intersects the ymin plane
--              enter_pt = plane_intersections[2];
--          }
--          else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
--              (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
--              (direction.y() < -epsilon) )
--          {
--              // ray intersects the ymax plane
--              enter_pt = plane_intersections[3];
--          }
--          else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
--              (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
--              (direction.z() > epsilon) )
--          {
--              // ray intersects the zmin plane
--              enter_pt = plane_intersections[4];
--          }
--          else {
--              // no entry point into this block found
--              return false;;
--          }
--      }
--      return true;
--    }
--
--    boxm_scene<tree_type> &scene_;
--    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
--
--    bool reverse_traversal_;
--
--    const vpgl_camera_double_sptr cam_;
--    unsigned int img_i0_;
--    unsigned int img_j0_;
--    unsigned int img_ni_;
--    unsigned int img_nj_;
--
--    unsigned int debug_lvl_;
--};
--
--template<class F, class T_loc, class T_data, class T_aux>
--class boxm_iterate_cells_function
--{
-- public:
--    typedef boct_tree<T_loc,T_data> tree_type;
--    typedef boct_tree<T_loc,T_aux> aux_tree_type;
--    typedef boct_tree_cell<T_loc,T_data> cell_type;
--    typedef boct_tree_cell<T_loc,T_aux> aux_cell_type;
--    //: constructor
--    boxm_iterate_cells_function(boxm_scene<tree_type> &scene,
--                                boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene,
--                                vpgl_camera_double_sptr cam,
--                                unsigned int ni, unsigned int nj )
--    : scene_(scene), aux_scene_(aux_scene), img_ni_(ni), img_nj_(nj), cam_(cam)
--    {}
--
--
--    bool run(F& step_functor)
--    {
--        // code to iterate over the blocks in order of visibility
--        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
--        while (block_vis_iter.next())
--        {
--            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--            for (auto & block_indice : block_indices) // code for each block
--            {
--                scene_.load_block(block_indice);
--                boxm_block<tree_type> * curr_block=scene_.get_active_block();
--                boxm_block<aux_tree_type> * curr_aux_block=aux_scene_.get_block(block_indice);
--                tree_type * tree=curr_block->get_tree();
--                aux_tree_type * aux_tree=curr_aux_block->get_tree();
--
--                std::vector<cell_type*> leaves=tree->leaf_cells();
--                for (unsigned i=0;i<leaves.size();i++)
--                {
--                    T_data cell_val=leaves[i]->data();
--                    boct_loc_code<T_loc> cell_code(leaves[i]->get_code());
--                    aux_cell_type * aux_cell=aux_tree->get_cell(cell_code);
--                    T_aux aux_val=aux_cell->data();
--                    step_functor.step_cell(cell_val,aux_val);
--                    leaves[i]->set_data(cell_val);
--                    aux_cell->set_data(aux_val);
--                }
--                scene_.write_active_block();
--                aux_scene_.write_active_block();
--            }
--        }
--        return true;
--    }
--
-- protected:
--    boxm_scene<tree_type> &scene_;
--    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
--    bool reverse_traversal_;
--
--    unsigned img_ni_;
--    unsigned img_nj_;
--
--    const vpgl_camera_double_sptr cam_;
--};
--
--#endif // boxm_raytrace_function_h_
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h b/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
-deleted file mode 100644
-index ea44cd7eed..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
-+++ /dev/null
-@@ -1,46 +0,0 @@
--#ifndef boxm_seg_length_functor_h
--#define boxm_seg_length_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include "boxm_raytrace_function.h"
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_seg_length_functor
--{
-- public:
--  boxm_seg_length_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &observation,
--                          unsigned int /*ni*/=0, unsigned /*nj*/=0)
--    : obs_(observation)
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> & /*cell_value*/,    // FIXME: unused...
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--    aux_val.obs_ += obs_(i,j) * seg_len;
--    aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &obs_;
--};
--
--#endif // boxm_seg_length_functor_h
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
-deleted file mode 100644
-index a6f2af30f1..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include "boxm_util_data_types.h"
--
--// Binary write boxm_render_probe_manager scene to stream
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_write(vsl_b_ostream &, boxm_array_1d_float const&) {}
--
--// Binary load boxm_render_probe_manager scene from stream.
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_read(vsl_b_istream &, boxm_array_1d_float &) {}
--
--// Binary load boxm_render_probe_manager scene from stream.
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_read(vsl_b_istream&, boxm_array_1d_float*) {}
--
--// Binary write scene pointer to stream
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_write(vsl_b_ostream&, const boxm_array_1d_float* &) {}
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
-deleted file mode 100644
-index 827e172bbc..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#ifndef boxm_util_data_types_h
--#define boxm_util_data_types_h
--//:
--// \file
--#include <vbl/vbl_ref_count.h>
--#include <vbl/vbl_smart_ptr.h>
--#include <vbl/vbl_array_1d.h>
--#include <vsl/vsl_binary_io.h>
--
--class boxm_array_1d_float: public vbl_ref_count
--{
-- public:
--  boxm_array_1d_float(unsigned n):data_array(n,-1.0f){}
--  vbl_array_1d<float> data_array;
--};
--
--typedef vbl_smart_ptr<boxm_array_1d_float> boxm_array_1d_float_sptr;
--
--//: Binary write boxm_render_probe_manager scene to stream
--void vsl_b_write(vsl_b_ostream & os, boxm_array_1d_float const& a);
--
--//: Binary load boxm_render_probe_manager scene from stream.
--void vsl_b_read(vsl_b_istream & is, boxm_array_1d_float &a);
--
--void vsl_b_read(vsl_b_istream& is, boxm_array_1d_float* b);
--
--//: Binary write  scene pointer to stream
--void vsl_b_write(vsl_b_ostream& os, const boxm_array_1d_float* &b);
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
-deleted file mode 100644
-index 96c61fe483..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,15 +0,0 @@
--add_executable( boxm_basic_test_all
--  test_driver.cxx
--  test_block_vis_graph.cxx
--  test_cell_vis_graph.cxx
-- )
--
--target_link_libraries( boxm_basic_test_all boxm_basic boxm boxm_util ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME boxm_basic_test_block_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_block_vis_graph  )
--add_test( NAME boxm_basic_test_cell_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_cell_vis_graph  )
--
--add_executable( boxm_basic_test_include test_include.cxx )
--target_link_libraries( boxm_basic_test_include boxm_basic)
--add_executable( boxm_basic_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_basic_test_template_include boxm_basic)
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
-deleted file mode 100644
-index 70a87b0476..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
-+++ /dev/null
-@@ -1,48 +0,0 @@
--
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/util/boxm_test_util.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_block_vis_graph()
--{
--  // create scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,3);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  vul_file::make_directory("boxm_scene");
--  scene.set_paths("boxm_scene", "block");
--
--
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--  boxm_block_vis_graph_iterator<tree_type> block_vis_iter(camera, &scene, IMAGE_U, IMAGE_V);
--
--  int vis_count = -1;
--  std::vector<boxm_block<tree_type>*> blocks;
--  int counts[] = {4,4,4};
--  while (block_vis_iter.next()) {
--    int block_count = 0;
--    ++vis_count;
--    std::cout << "Frontier\n";
--    blocks = block_vis_iter.frontier_blocks();
--    for (unsigned i=0; i<blocks.size(); ++i) {
--      std::cout << i << "- " << blocks[i]->bounding_box() << std::endl;
--      ++block_count;
--    }
--    TEST("block count", block_count, counts[vis_count]);
--  }
--  vpl_rmdir("boxm_scene");
--  TEST("vis count", ++vis_count, 3);
--}
--
--TESTMAIN(test_block_vis_graph);
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
-deleted file mode 100644
-index d9e2da00f7..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
-+++ /dev/null
-@@ -1,54 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/util/boxm_test_util.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_cell_vis_graph()
--{
--  // create scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  scene.set_paths("boxm_scene_cell", "block");
--  vul_file::make_directory("boxm_scene_cell");
--
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--  boxm_block_iterator<boct_tree<short,vgl_point_3d<double> > > iter(&scene);
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,vgl_point_3d<double> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,vgl_point_3d<double> >(3,2);
--    block->init_tree(tree);
--    boxm_cell_vis_graph_iterator<short,vgl_point_3d<double> > cell_iterator(camera,tree,IMAGE_U, IMAGE_V);
--    double cnt=30;
--    while (cell_iterator.next()){
--      std::cout<<"Frontier\n";
--      std::vector<boct_tree_cell<short,vgl_point_3d<double> > *> vis_cells=cell_iterator.frontier();
--      for (auto & vis_cell : vis_cells)
--      {
--        vgl_box_3d<double> box=tree->cell_bounding_box(vis_cell);
--        TEST("Returns correct frontier",cnt,box.max_z());
--      }
--      cnt-=5;
--    }
--
--    scene.write_active_block();
--    iter++;
--  }
--  vpl_rmdir("boxm_scene_cell");
--}
--
--TESTMAIN(test_cell_vis_graph);
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx b/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
-deleted file mode 100644
-index 1e4f60a571..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_block_vis_graph );
--DECLARE( test_cell_vis_graph );
--
--void register_tests()
--{
--  REGISTER( test_block_vis_graph );
--  REGISTER( test_cell_vis_graph );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
-deleted file mode 100644
-index cbaeca0acc..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_block_vis_graph_node.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/basic/boxm_num_rays_functor.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/basic/boxm_util_data_types.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
-deleted file mode 100644
-index 131baa9347..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx b/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
-deleted file mode 100644
-index 1d3c646178..0000000000
---- a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
-+++ /dev/null
-@@ -1,86 +0,0 @@
--#include "boxm_apm_traits.h"
--
--const char* boxm_apm_types::app_model_strings[]  = { "apm_mog_grey",
--                                                     "apm_mog_rgb",
--                                                     "apm_simple_grey",
--                                                     "apm_simple_rgb",
--                                                     "apm_mob_grey",
--                                                     "float",
--                                                     "int",
--                                                     "short",
--                                                     "char",
--                                                     "bool",
--                                                     "vnl_double_10",
--                                                     "vnl_float_10",
--                                                     "vnl_float_3",
--                                                     "bsta_mog_f1",
--                                                     "bsta_gauss_f1",
--                                                     "bvpl_sample_float",
--                                                     "bvpl_sample_gauss_f1",
--                                                     "bvpl_pca_basis_sample_10",
--                                                     "edge_float",
--                                                     "edge_line",
--                                                     "edge_tangent_line",
--                                                     "scalar_float",
--                                                     "dbrec3d_part_instance",
--                                                     "dbrec3d_pair_composite_instance",
--                                                     "apm_na",
--                                                     "apm_unknown" };
--
--
--boxm_apm_type boxm_apm_types::str_to_enum(const char* s)
--{
--  for (int i=0; i < int(BOXM_APM_UNKNOWN); i++)
--  {
--    if (std::strcmp(s, boxm_apm_types::app_model_strings[i]) == 0)
--      return (boxm_apm_type) i;
--  }
--  return BOXM_APM_UNKNOWN;
--}
--
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.color_);
--  vsl_b_write(os, sample.one_over_sigma_);
--  //vsl_b_write(os, sample.gauss_weight_);
--}
--
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.color_);
--    vsl_b_read(is, sample.one_over_sigma_);
--    //vsl_b_read(is, sample.gauss_weight_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm)
--{
--  os << "color: " << apm.color() << ", one_over_sigma: " << apm.one_over_sigma() << std::endl;
--  return os;
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.h b/contrib/brl/bseg/boxm/boxm_apm_traits.h
-deleted file mode 100644
-index 17f80b5a70..0000000000
---- a/contrib/brl/bseg/boxm/boxm_apm_traits.h
-+++ /dev/null
-@@ -1,206 +0,0 @@
--#ifndef boxm_appearance_model_traits_h_
--#define boxm_appearance_model_traits_h_
--//:
--// \file
--// \brief A class for appearance model traits
--//
--// \author Daniel Crispell
--// \date April 03, 2009
--
--#include <iostream>
--#include <iosfwd>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_gauss_if3.h>
--#include <bsta/bsta_beta.h>
--#include <bsta/bsta_beta_f1.h>
--#include <vnl/vnl_vector_fixed.h>
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include "boxm_export.h"
--
--class boxm_mog_grey_processor;
--class boxm_mog_rgb_processor;
--class boxm_simple_grey_processor;
--class boxm_mob_grey_processor;
--
--enum boxm_apm_type
--{
--  BOXM_APM_MOG_GREY = 0,
--  BOXM_APM_MOG_RGB,
--  BOXM_APM_SIMPLE_GREY,
--  BOXM_APM_SIMPLE_RGB,
--  BOXM_APM_MOB_GREY,
--  BOXM_FLOAT,
--  BOXM_INT,
--  BOXM_SHORT,
--  BOXM_CHAR,
--  BOXM_BOOL,
--  VNL_DOUBLE_10,
--  VNL_FLOAT_10,
--  VNL_FLOAT_3,
--  BSTA_MOG_F1,
--  BSTA_GAUSS_F1,
--  BVPL_SAMPLE_FLOAT,
--  BVPL_SAMPLE_BSTA_GAUSS_F1,
--  BVPL_PCA_BASIS_SAMPLE_10,
--  BOXM_EDGE_FLOAT,
--  BOXM_EDGE_LINE,
--  BOXM_EDGE_TANGENT_LINE,
--  BOXM_SCALAR_FLOAT,
--  DBREC3D_PART_INSTANCE,
--  DBREC3D_PAIR_COMPOSITE_INSTANCE,
--  BOXM_APM_NA,
--  BOXM_APM_UNKNOWN
--};
--
--class boxm_apm_types
--{
-- public:
--  static boxm_EXPORT_DATA const char* app_model_strings[];
--  static boxm_apm_type str_to_enum(const char* s);
--};
--
--//: Pixel properties for templates.
--template <boxm_apm_type>
--class boxm_apm_traits;
--
--
--//: traits for a mixture of gaussian appearance model of gray-scale images
--template<>
--class boxm_apm_traits<BOXM_APM_MOG_GREY>
--{
-- public:
--  static const unsigned int n_gaussian_modes_ = 3;
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
--  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
--
-- public:
--  static const unsigned int obs_dim = 1;
--  typedef  mix_gauss_sf1_type apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_mog_grey_processor apm_processor;
--};
--
--
--//: traits for a mixture of gaussian appearance model of rgb images
--template<>
--class boxm_apm_traits<BOXM_APM_MOG_RGB>
--{
-- public:
--  static const unsigned int n_gaussian_modes_ = 3;
--
--  typedef bsta_num_obs<bsta_gauss_if3> gauss_type_if3;
--  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_if3, n_gaussian_modes_> > mix_gauss_if3_type;
--
-- public:
--  static const unsigned int obs_dim = 3;
--  typedef  mix_gauss_if3_type apm_datatype;
--  typedef vil_rgb<float> obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_mog_rgb_processor apm_processor;
--};
--
--
--//: traits for a simple one-valued appearance model of grey-scale images
--class boxm_simple_grey
--{
-- public:
--  boxm_simple_grey() : color_(0.5f), one_over_sigma_(1.0f),gauss_weight_(1.0f) {}
--  boxm_simple_grey(float colour, float std_dev, float gauss_wght=1.0f) : color_(colour), one_over_sigma_(1/std_dev), gauss_weight_(gauss_wght)  { check_vals(); }
--  boxm_simple_grey(vnl_vector_fixed<float,3> const& params) : color_(params[0]), one_over_sigma_(1.0f/params[1])  { check_vals(); }
--  static short version_no() { return 1; }
--  inline float color() const { return color_; }
--  inline float sigma() const { return 1.0f/one_over_sigma_; }
--  inline float gauss_weight() const { return gauss_weight_; }
--  inline float one_over_sigma() const { return one_over_sigma_; }
--
-- protected:
--  inline void check_vals()
--  {
--    if (!(color_ > 0.0f))
--      color_ = 0.0f;
--    if (!(color_ < 1.0f))
--      color_ = 1.0f;
--    if (!(one_over_sigma_ < 1e4))
--      one_over_sigma_ = 1e4f;
--    if (!(one_over_sigma_ > 1e-4))
--      one_over_sigma_ = 1e-4f;
--  }
--
-- public:
--  float color_;
--  float one_over_sigma_;
--  float gauss_weight_;
--};
--
--template<>
--class boxm_apm_traits<BOXM_APM_SIMPLE_GREY>
--{
-- public:
--  static const unsigned int n_gaussian_modes_ = 1;
--  static const unsigned int obs_dim = 1;
--  static const unsigned int n_params = 3;
--  typedef boxm_simple_grey apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_simple_grey_processor apm_processor;
--};
--
--template<>
--class boxm_apm_traits<BOXM_APM_MOB_GREY>
--{
-- public:
--  static const unsigned int n_beta_modes_ = 3;
--
--  typedef bsta_num_obs<bsta_beta_f1> beta_type;
--  typedef bsta_num_obs<bsta_mixture_fixed<beta_type, n_beta_modes_> > mix_beta_type;
--
-- public:
--  static const unsigned int obs_dim = 1;
--  typedef  mix_beta_type apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_mob_grey_processor apm_processor;
--};
--
--template<>
--class boxm_apm_traits<BOXM_EDGE_FLOAT>
--{
-- public:
--  static const unsigned int obs_dim = 1;
--  static const unsigned int n_params = 2;
--  typedef boxm_edge_sample<float> apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--#if 0
--  typedef boxm_edge_processor apm_processor;
--#endif
--};
--
--template<>
--class boxm_apm_traits<BOXM_EDGE_LINE>
--{
-- public:
--  static const unsigned int obs_dim = 1;
--  static const unsigned int n_params = 2;
--  typedef boxm_inf_line_sample<float> apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--};
--
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample);
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample);
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample);
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample);
--std::ostream& operator << (std::ostream& os, const boxm_simple_grey& sample);
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.h b/contrib/brl/bseg/boxm/boxm_aux_scene.h
-deleted file mode 100644
-index 40a2a56914..0000000000
---- a/contrib/brl/bseg/boxm/boxm_aux_scene.h
-+++ /dev/null
-@@ -1,54 +0,0 @@
--#ifndef boxm_aux_scene_h_
--#define boxm_aux_scene_h_
--//:
--// \file
--// \brief  an auxiliary scene keeps a set of octrees for a given main scene
--//
--// \author Gamze Tunali
--// \date   July 31, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell_reader.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_block.h>
--
--#include <vgl/vgl_point_3d.h>
--
--template <class T_loc, class T, class T_AUX>
--class boxm_aux_scene
--{
-- public:
--   typedef enum {EMPTY=0, CLONE, LOAD, UNDEFINED } tree_creation_type ;
--   typedef  boct_tree<T_loc, T> tree_type;
--   typedef  boct_tree<T_loc, T_AUX> aux_tree_type;
--   boxm_aux_scene() : aux_scene_(nullptr), aux_storage_dir_("") {}
--   boxm_aux_scene(boxm_scene<tree_type>* scene, std::string suffix,
--                  tree_creation_type type, boxm_apm_type app_model=BOXM_APM_UNKNOWN);
--
--   ~boxm_aux_scene(){ /*delete aux_scene_;*/ }
--
--   void init_scene(){}
--
--
--   boxm_block<boct_tree<T_loc,T_AUX> > * get_block(vgl_point_3d<int> index){
--       aux_scene_->load_block(index);
--       return aux_scene_->get_active_block();
--   }
--
--   //: get an incremental reader for a scene block
--   boct_tree_cell_reader<T_loc, T_AUX >* get_block_incremental(vgl_point_3d<int> block_idx);
--
--   void write_active_block() { aux_scene_->write_active_block(); }
--  void unload_active_blocks() { aux_scene_->unload_active_blocks(); }
--   void clean_scene();
--
-- private:
--  boxm_scene<aux_tree_type>* aux_scene_;
--  std::string aux_storage_dir_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx b/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
-deleted file mode 100644
-index d3ceaf9c84..0000000000
---- a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
-+++ /dev/null
-@@ -1,121 +0,0 @@
--#ifndef boxm_aux_scene_hxx_
--#define boxm_aux_scene_hxx_
--
--#include "boxm_aux_scene.h"
--#include <boxm/boxm_aux_traits.h>
--
--#include <vpl/vpl.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T, class T_AUX>
--boxm_aux_scene<T_loc,T,T_AUX>::boxm_aux_scene(boxm_scene<tree_type>* scene,
--                                              std::string storage_suffix,
--                                              tree_creation_type type,
--                                              boxm_apm_type app_model)
--: aux_scene_(nullptr)
--{
--  std::string aux_storage_dir;
--  aux_storage_dir_ = scene->path();
--  aux_scene_ = new boxm_scene<aux_tree_type >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->load_all_blocks(),scene->save_internal_nodes(), scene->save_platform_independent());
--  aux_scene_->set_path(aux_storage_dir_,  storage_suffix);
--  aux_scene_->set_appearance_model(app_model);
--  aux_scene_->set_octree_levels(scene->max_level(),scene->init_level());
--  if (type != EMPTY)
--  {
--    // loop through valid blocks and init same blocks in aux scene
--    boxm_block_iterator<tree_type > iter(scene);
--    iter.begin();
--    while (!iter.end()) {
--      if (scene->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--        if (type == LOAD) {
--          if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--#if 0
--            // auxiliary block file exist
--            aux_scene_->load_block(iter.index());
--            boxm_block<boct_tree<T_loc,T_AUX> > * block=aux_scene_->get_active_block();
--            assert(block->get_tree() != 0);
--#endif
--          }
--        }
--        else if (type==CLONE) {  //clone from the primary block
--          scene->load_block(iter.index().x(),iter.index().y(),iter.index().z());
--          boxm_block<boct_tree<T_loc,T> > * block=scene->get_active_block();
--          boct_tree<T_loc,T>* tree=block->get_tree();
--          aux_tree_type *aux_tree = tree->template clone_to_type<T_AUX>();
--          boxm_block<aux_tree_type >* aux_block = new boxm_block<aux_tree_type >(block->bounding_box(),aux_tree );
--          aux_scene_->set_block(iter.index(), aux_block);
--          aux_scene_->write_active_block();
--        }
--      }
--      ++iter;
--    }
--    aux_scene_->write_scene(storage_suffix+".xml");
--    scene->unload_active_blocks();
--    aux_scene_->unload_active_blocks();
--    }
--}
--
--
--template <class T_loc, class T, class T_AUX>
--boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::get_block_incremental(vgl_point_3d<int> block_idx)
--{
--  if (aux_scene_) {
--    std::string path=aux_scene_->gen_block_path(block_idx.x(), block_idx.y(), block_idx.z());
--    boct_tree_cell_reader<T_loc, T_AUX>* reader = new boct_tree_cell_reader<T_loc, T_AUX>(path);
--    reader->begin();
--    return reader;
--  }
--  else {
--    return nullptr;
--  }
--}
--
--template <class T_loc, class T, class T_AUX>
--void boxm_aux_scene<T_loc,T,T_AUX>::clean_scene()
--{
--  std::cout<<"Clean AUX scene "<<std::endl;
--  aux_scene_->unload_active_blocks();
--  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(aux_scene_);
--  iter.begin();
--  if (!aux_scene_->load_all_blocks())
--  {
--    while (!iter.end()) {
--      if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--        std::string filename=aux_scene_->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
--        vpl_unlink(filename.c_str());
--      }
--      iter++;
--    }
--  }
--  else
--  {
--    while (!iter.end()) {
--      if (iter->get_tree()!=nullptr)
--      {
--        iter->delete_tree();
--        iter->set_tree(nullptr);
--      }
--      iter++;
--    }
--  }
--}
--
--#if 0 // commented out
--template <class T_loc, class T, class T_AUX>
--boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::save_scene()
--{
--  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(&aux_scene);
--  iter.begin();
--  while (!iter.end()) {
--    // body
--  }
--}
--#endif // 0
--
--#define BOXM_AUX_SCENE_INSTANTIATE(T1,T2,T3) \
--template class boxm_aux_scene<T1,T2,T3 >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_aux_traits.h b/contrib/brl/bseg/boxm/boxm_aux_traits.h
-deleted file mode 100644
-index 4e4c5113da..0000000000
---- a/contrib/brl/bseg/boxm/boxm_aux_traits.h
-+++ /dev/null
-@@ -1,74 +0,0 @@
--#ifndef boxm_aux_traits_h_
--#define boxm_aux_traits_h_
--//:
--// \file
--
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/sample/boxm_vis_implicit_sample.h>
--#include <boxm/sample/boxm_update_sample.h>
--
--enum boxm_aux_type
--{
--  BOXM_AUX_VIS_IMPLICIT,
--  BOXM_AUX_UPDATE,
--  BOXM_AUX_OPT_GREY,
--  BOXM_AUX_OPT_RT_GREY,
--  BOXM_AUX_OPT_RGB,
--  BOXM_AUX_OPT_RT_RGB,
--  BOXM_AUX_NULL,
--  BOXM_AUX_UNKNOWN,
--  BOXM_AUX_OPT2_GREY,
--  BOXM_AUX_OPT2_RGB,
--  BOXM_AUX_OPT3_MOG_GREY,
--  BOXM_AUX_OPT3_MOG_RGB,
--  BOXM_AUX_SCALAR_SAMPLE
--};
--
--//: sample properties for templates.
--template <boxm_aux_type>
--class boxm_aux_traits;
--
--//: traits for a visibility-based implicit surface sample
--template<>
--class boxm_aux_traits<BOXM_AUX_VIS_IMPLICIT>
--{
-- public:
--  typedef boxm_vis_implicit_sample sample_datatype;
--
--  static std::string storage_subdir() { return "vis_implicit"; }
--};
--
--template<>
--class boxm_aux_traits<BOXM_AUX_UPDATE>
--{
-- public:
--  typedef boxm_update_sample sample_datatype;
--
--  static std::string storage_subdir() { return "update_work";}
--};
--
--//: traits for a null sample
--template<>
--class boxm_aux_traits<BOXM_AUX_NULL>
--{
-- public:
--  typedef float sample_datatype;
--
--  static std::string storage_subdir() { return "null"; }
--};
--template<>
--class boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>
--{
-- public:
--  typedef float sample_datatype;
--
--  static std::string storage_subdir() { return "scalar"; }
--};
--
--
--
--#endif // boxm_aux_traits_h_
-diff --git a/contrib/brl/bseg/boxm/boxm_block.h b/contrib/brl/bseg/boxm/boxm_block.h
-deleted file mode 100644
-index 6bda381539..0000000000
---- a/contrib/brl/bseg/boxm/boxm_block.h
-+++ /dev/null
-@@ -1,58 +0,0 @@
--#ifndef boxm_block_h_
--#define boxm_block_h_
--//:
--// \file
--// \brief  a block is a smallest area that is going to be processed with an octree
--//
--// \author Gamze Tunali
--// \date Apr 01, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vgl/vgl_box_3d.h>
--#include <vsl/vsl_binary_io.h>
--
--template <class T>
--class boxm_block
--{
-- public:
--  //: Default Constructor
--  boxm_block(): octree_(nullptr) {}
--  //: Destructor
--  ~boxm_block() { if (octree_) delete octree_; }
--  //: Constructor from boundinf box
--  boxm_block(vgl_box_3d<double> bbox): bbox_(bbox), octree_(nullptr) {}
--  //: Constructor from bounding box and octree
--  boxm_block(vgl_box_3d<double> bbox, T* tree) : bbox_(bbox), octree_(tree) {octree_->set_bbox(bbox_);}
--  //: Returns the number of leaf cells in the tree
--  unsigned int size();
--  //: Initializes octree and bounding-box
--  void init_tree(T * octree);
--  //: Sets the current octree
--  void set_tree(T * octree);
--
--  // Accessors
--  vgl_box_3d<double> bounding_box() const { return bbox_; }
--  T* get_tree() { return octree_; }
--
--  //: Releases memory
--  void delete_tree() { delete octree_; octree_ = nullptr; }
--
--  // IO
--  void b_read(vsl_b_istream &s);
--  void b_write(vsl_b_ostream &s, const bool save_internal_nodes_, const bool platform_independent = true);
--  static short version_no() { return 1; }
--
--  bool operator==(boxm_block<T> const& other) const {
--    return bbox_ == other.bounding_box()
--        && octree_ == other.octree_;
--  }
--
-- private:
--  vgl_box_3d<double> bbox_;
--  T* octree_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_block.hxx b/contrib/brl/bseg/boxm/boxm_block.hxx
-deleted file mode 100644
-index a8f27f2bfe..0000000000
---- a/contrib/brl/bseg/boxm/boxm_block.hxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--#ifndef boxm_block_hxx_
--#define boxm_block_hxx_
--
--#include <iostream>
--#include "boxm_block.h"
--
--#include <vgl/io/vgl_io_box_3d.h>
--template <class T>
--void boxm_block<T>::init_tree(T * octree)
--{
--  if(octree_){
--   //release old memory unless the same tree
--   if(octree!=octree_)
--     delete octree_;
--   }
--  octree_=octree;
--  octree->set_bbox(bbox_);
--}
--
--template <class T>
--void boxm_block<T>::set_tree(T * octree)
--{
--  if(octree_) //release old memory
--    delete octree_;
--  octree_=octree;
--}
--
--template <class T>
--unsigned int boxm_block<T>::size()
--{
--  if (octree_) {
--    return octree_->size();
--  }
--  else {
--    return 0;
--  }
--}
--
--template <class T>
--void boxm_block<T>::b_read(vsl_b_istream &is)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case (1):
--      vsl_b_read(is, bbox_);
--      // if already allocated, destroy it and read from the file
--      if (octree_ != nullptr) {
--        delete octree_;
--      }
--      octree_ = new T();
--      octree_->b_read(is);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_block<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      return;
--  }
--}
--
--
--template <class T>
--void boxm_block<T>::b_write(vsl_b_ostream &os, const bool save_internal_nodes, const bool platform_independent)
--{
--  vsl_b_write(os, version_no());
--  vsl_b_write(os, bbox_);
--#if 0
--  std::cout << "Internal Nodes 3: " << save_internal_nodes << std::endl;
--#endif
--  octree_->b_write(os, save_internal_nodes, platform_independent);
--}
--
--#define BOXM_BLOCK_INSTANTIATE(T) \
--template class boxm_block<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_export.h b/contrib/brl/bseg/boxm/boxm_export.h
-deleted file mode 100644
-index 7827178bdf..0000000000
---- a/contrib/brl/bseg/boxm/boxm_export.h
-+++ /dev/null
-@@ -1,23 +0,0 @@
--#ifndef BOXM_EXPORT_H
--#define BOXM_EXPORT_H
--
--#include <vxl_config.h> // get BUILD_SHARED_LIBS
--
--#ifndef BUILD_SHARED_LIBS  // if not a shared build
--# define boxm_EXPORT_DATA
--#else  // this is a shared build
--# ifdef boxm_EXPORTS  // if building this library
--#  if defined(_WIN32) || defined(WIN32)
--#   define boxm_EXPORT_DATA __declspec(dllexport)
--#  else
--#   define boxm_EXPORT_DATA
--#  endif
--# else // we are using this library and it is built shared
--#  if defined(_WIN32) || defined(WIN32)
--#   define boxm_EXPORT_DATA __declspec(dllimport)
--#  else
--#   define boxm_EXPORT_DATA
--#  endif
--# endif
--#endif
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
-deleted file mode 100644
-index b1415333d6..0000000000
---- a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
-+++ /dev/null
-@@ -1,25 +0,0 @@
--#include "boxm_io_scene_base.h"
--//:
--// \file
--
--
--//: Binary write boxm scene to stream
--void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base const& /*scene_base*/)
--{
--}
--
--
--//: Binary load boxm scene from stream.
--void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base& /*scene_base*/)
--{
--}
--
--//: Binary write boxm scene pointer to stream
--void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base* /*ph*/)
--{
--}
--
--//: Binary write boxm scene pointer to stream
--void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base* const& /*ph*/)
--{
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.h b/contrib/brl/bseg/boxm/boxm_io_scene_base.h
-deleted file mode 100644
-index 1abc4fa90c..0000000000
---- a/contrib/brl/bseg/boxm/boxm_io_scene_base.h
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#ifndef boxm_io_scene_base_h_
--#define boxm_io_scene_base_h_
--//:
--// \file
--#include <boxm/boxm_scene_base.h>
--#include <vsl/vsl_binary_io.h>
--
--//: Binary write boxm scene to stream
--void vsl_b_write(vsl_b_ostream & os, boxm_scene_base const& scene_base);
--
--//: Binary load boxm scene from stream.
--void vsl_b_read(vsl_b_istream & is, boxm_scene_base &scene_base);
--
--//: Binary load boxm scene pointer from stream.
--void vsl_b_read(vsl_b_istream& is, boxm_scene_base* p);
--
--//: Binary write boxm scene pointer to stream
--void vsl_b_write(vsl_b_ostream& os, const boxm_scene_base* &p);
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_scene.h b/contrib/brl/bseg/boxm/boxm_scene.h
-deleted file mode 100644
-index 8d1bd207d3..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene.h
-+++ /dev/null
-@@ -1,559 +0,0 @@
--#ifndef boxm_scene_h_
--#define boxm_scene_h_
--//:
--// \file
--// \brief  The main class to keep the 3D world data. It is a grid of boxm_blocks containing octrees.
--//
--// \author Gamze Tunali
--// \date Apr 03, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <string>
--#include <iostream>
--#include <iosfwd>
--#include <set>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_block.h>
--#include <boxm/sample/boxm_sample.h>
--#include <bvgl/bvgl_point_3d_cmp.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vbl/vbl_array_3d.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <boct/boct_tree.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--class boxm_scene_parser;
--template <class T> class boxm_block_iterator;
--template <class T> class boxm_cell_iterator;
--
--template <class T>
--class boxm_scene :public boxm_scene_base
--{
-- public:
--  typedef typename T::loc_type loc_type;
--  typedef typename T::datatype datatype;
--
--  //: Default constructor
--  boxm_scene() : active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
--
--  //: Constructor from lvcs, world origin, dimension of the block (in world coordinates) and number of blocks(world_dim)
--  boxm_scene(const vpgl_lvcs& lvcs,
--             const vgl_point_3d<double>& origin,
--             const vgl_vector_3d<double>& block_dim,
--             const vgl_vector_3d<unsigned>& world_dim,
--             const bool load_all_blocks=false,
--             const bool save_internal_nodes_ = false,
--             const bool save_platform_independent_ = true);
--
--  //: Constructor from lvcs, world origin, dimension of the block, number of blocks and initialization level
--  boxm_scene(const vpgl_lvcs& lvcs,
--             const vgl_point_3d<double>& origin,
--             const vgl_vector_3d<double>& block_dim,
--             const vgl_vector_3d<unsigned>& world_dim,
--             unsigned max_level, unsigned init_level,
--             const bool load_all_blocks=false,
--             const bool save_internal_nodes_ = false,
--             const bool save_platform_independent_ = true);
--
--  //: Constructor when lvcs is not available. World origin, block dimensions and number of blocks
--  boxm_scene( const vgl_point_3d<double>& origin,
--              const vgl_vector_3d<double>& block_dim,
--              const vgl_vector_3d<unsigned>& world_dim,
--              const bool load_all_blocks=false,
--              const bool save_internal_nodes_ = false,
--              const bool save_platform_independent_ = true);
--
--  //: Copy constructor
--  boxm_scene(const boxm_scene& scene);
--
--  //: Constructor from base_scene
--  boxm_scene(const boxm_scene_base& scene_base):
--  boxm_scene_base(scene_base),active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
--
--  //: Destructor
--  ~boxm_scene() override;
--
--  bool discover_block(vgl_point_3d<unsigned> index) { return discover_block(index.x(),index.y(),index.z()); }
--
--  bool discover_block(unsigned i, unsigned j, unsigned k);
--
--  //: Loads block into memory.
--  // Returns true if the block bin file is found on disc, otherwise returns false and creates a new tree for the block
--  bool load_block(unsigned i, unsigned j, unsigned k);
--
--  // Load block into memory without using global variables
--  bool load_block_thread_safe(unsigned i, unsigned j, unsigned k);
--
--  //: Loads block into memory.
--  bool load_block(vgl_point_3d<int> i) { return load_block(i.x(), i.y(), i.z()); }
--
--  //: Loads a block and all its neighboring(adjacent) blocks
--  bool load_block_and_neighbors(unsigned i, unsigned j, unsigned k);
--
--  //: Loads a block and all its neighboring(adjacent) blocks
--  bool load_block_and_neighbors(vgl_point_3d<int> i) { return load_block_and_neighbors(i.x(), i.y(), i.z()); }
--
--  //: Reads and loads all blocks into memorty
--  bool read_all_blocks();
--
--  //: Write the active block to disk
--  void write_active_block(bool unload_block=true);
--
--  //: Write the active block to disk
--  void write_active_block(bool unload_block=false) const;
--
--  //: Write the active blocks to disk
--  void write_active_blocks(bool unload_block=true);
--
--  //: Write the active blocks to disk
--  void write_active_blocks(bool unload_block=false) const;
--
--  //: Write the specified block to disk without changing global variables
--  void write_block_thread_safe(unsigned i, unsigned j, unsigned k);
--
--  //: Returns the active block(in memory)
--  boxm_block<T>* get_active_block();
--
--  //: Returns the index of active block
--  vgl_point_3d<int> active_block() const { return active_block_; }
--
--  //: Returns the indices of active neighbors;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >& active_blocks() { return active_blocks_; }
--
--  vpgl_lvcs lvcs() const { return lvcs_; }
--
--  vgl_point_3d<double> origin() const { return origin_; }
--
--  void set_origin(vgl_point_3d<double> o) { origin_=o; }
--
--  vgl_vector_3d<double> block_dim() const { return block_dim_; }
--
--  bool save_internal_nodes() const { return save_internal_nodes_; }
--
--  bool save_platform_independent() const { return save_platform_independent_; }
--
--  bool load_all_blocks() const { return load_all_blocks_; }
--
--  void block_num(int &x, int &y, int &z) const {
--    x=(int) blocks_.get_row1_count();
--    y=(int) blocks_.get_row2_count();
--    z=(int) blocks_.get_row3_count();
--  }
--
--  vgl_vector_3d<unsigned> world_dim() const override {
--    unsigned x=(unsigned) blocks_.get_row1_count();
--    unsigned y=(unsigned) blocks_.get_row2_count();
--    unsigned z=(unsigned) blocks_.get_row3_count();
--    return {x,y,z};
--  }
--
--  std::string path() const { return scene_path_; }
--
--  std::string block_prefix() const { return block_pref_; }
--
--  void set_path(std::string path, std::string block_prefix) { scene_path_=path; block_pref_= block_prefix; }
--
--  void b_read(vsl_b_istream & s);
--
--  void b_write(vsl_b_ostream& s) const;
--
--  //: Returns the block this point resides in
--  boxm_block<T>* get_block(vgl_point_3d<double> const& p) const;
--
--  //: Returns the index of the block containing this point
--  bool get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index);
--
--  //: Returns a block, assumes block is in memory - if not it returns null
--  boxm_block<T>* get_block(unsigned i, unsigned j, unsigned k) const { return blocks_(i,j,k); }
--
--  //: Returns a block, assumes block is in memory - if not it returns null
--  boxm_block<T>* get_block(const vgl_point_3d<int>& idx) { return blocks_(idx.x(), idx.y(), idx.z()); }
--
--  //: Returns a read-only block, assumes block is in memory - if not it returns null
--  const boxm_block<T>* get_block_read_only(unsigned i, unsigned j, unsigned k) { return blocks_(i,j,k); }
--
--  //: Return all leaf cells in a region
--  void leaves_in_region(vgl_box_3d<double>, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
--
--  //: Return the level of the smallest cell entirely containing the 3d region
--  short level_region(vgl_box_3d<double> box);
--
--  //: Return all leaf_data in a region - data is copied to new memory location
--  void leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data);
--
--  //: Returns the data of all cells at a given level, that are contained in the specified region
--  void cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level);
--
--  //: Return all leaf cells between an inner box and an outter box
--  void leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
--
--  //: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
--  void change_leaves_in_region(vgl_box_3d<double> box, const datatype &cell_data);
--  void change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<datatype> &all_data);
--
--  //: Locate point in scene coordinates. Assumes that the block containing the point is already loaded into memory
--  boct_tree_cell<loc_type, datatype>* locate_point_in_memory(vgl_point_3d<double> &p, unsigned level = 0);
--
--  void set_block(vgl_point_3d<int> const& idx, boxm_block<T>* block)
--  {
--    if (blocks_(idx.x(),idx.y(),idx.z())) // release memory
--      delete blocks_(idx.x(),idx.y(),idx.z());
--
--    blocks_(idx.x(),idx.y(),idx.z()) = block; active_block_=idx;
--  }
--
--  void set_block(int i, int j, int k , boxm_block<T>* block) { set_block(vgl_point_3d<int>(i,j,k), block); }
--
--  //: Write scene xml file at the scenes' path
--  void write_scene(std::string filename = "scene.xml");
--
--  //: Write scene xml file at the location indicated by path
--  void write_scene(std::string path, std::string filename);
--
--  void load_scene(std::string filename);
--
--  void load_scene(boxm_scene_parser& parser);
--
--  void force_write_blocks();
--
--  static short version_no() { return 1; }
--
--  boxm_block_iterator<T> iterator() { return boxm_block_iterator<T>(this); }
--
--  boxm_block_iterator<T> const_iterator() const { return boxm_block_iterator<T>(this); }
--
--  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned), bool read_only = false)
--  {
--    boxm_cell_iterator<T> cell_iter(this->iterator(), block_loading_func, read_only);
--    return cell_iter;
--  }
--
--  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned) const, bool read_only)
--  {
--    assert (read_only);
--    boxm_cell_iterator<T> cell_iter(this->const_iterator(), block_loading_func, read_only);
--    return cell_iter;
--  }
--
--  vgl_box_3d<double> get_world_bbox() const override;
--
--  //: Return the dimensions of the scene along each axis - this are equivalent to bbox width, length and depth
--  void axes_length(double &x_length,double &y_length, double &z_length) const;
--
--  //: Return true if the block index is valid
--  bool valid_index(vgl_point_3d<int> const& idx) const { return valid_index(idx.x(), idx.y(), idx.z()); }
--
--
--  //: Return true if the block index is valid
--  inline bool valid_index(int const& x, int const& y, int const& z) const {
--    return  x >= (int)0 && x < (int)blocks_.get_row1_count() &&
--            y >= (int)0 && y < (int)blocks_.get_row2_count() &&
--            z >= (int)0 && z < (int)blocks_.get_row3_count();
--   }
--
--  void set_pinit(float pinit) { pinit_=pinit; }
--
--  float pinit() const { return pinit_; }
--
--  vgl_box_3d<double> get_block_bbox(vgl_point_3d<int> const& idx) const { return get_block_bbox(idx.x(), idx.y(), idx.z()); }
--
--  vgl_box_3d<double> get_block_bbox(int x, int y, int z) const;
--
--  //: generates a name for the block binary file based on the 3D vector index
--  std::string gen_block_path(int x, int y, int z) const;
--
--  void clean_scene();
--
--  //: Returns a scene with the same structure and initialized with given value
--  void clone_blocks(boxm_scene<T> &scene_out, datatype data);
--
--  //: Returns a scene with the same structure and data
--  void clone_blocks(boxm_scene<T> &scene_out);
--
--  //: Returns a scene of a different type with the same structure  and initialized with given value
--  template <class T_out>
--  void clone_blocks_to_type(boxm_scene<T_out> &scene_out, typename boxm_scene<T_out>::datatype data )
--  {
--    std::cout << "Clone blocks to type\n";
--    boxm_block_iterator<T> iter(this);
--    boxm_block_iterator<T_out> iter_out = scene_out.iterator();
--    iter.begin();
--    iter_out.begin();
--    while (!iter.end())
--    {
--      load_block(iter.index());
--      scene_out.load_block(iter.index());
--      T_out  *tree_out =(*iter)->get_tree()->template clone_to_type<typename boxm_scene<T_out>::datatype>();
--      (*iter_out)->init_tree(tree_out);
--      tree_out->init_cells(data);
--      scene_out.write_active_block();
--      ++iter;
--      ++iter_out;
--    }
--  }
--
--  //: Returns a scene of a vector type with the same structure and vector initialized to the the same data
--  template <unsigned DIM>
--  void clone_blocks_to_vector(boxm_scene<boct_tree<short, vnl_vector_fixed<datatype, DIM> > > &scene_out)
--  {
--    typedef boct_tree<short, vnl_vector_fixed<datatype, DIM> > type_tree_out;
--    std::cout << "Clone blocks to type\n";
--    boxm_block_iterator<T> iter(this);
--    boxm_block_iterator<type_tree_out> iter_out = scene_out.iterator();
--    iter.begin();
--    iter_out.begin();
--    while (!iter.end())
--    {
--      load_block(iter.index());
--      scene_out.load_block(iter.index());
--      type_tree_out  *tree_out =(*iter)->get_tree()->template clone_to_vector<DIM>();
--      (*iter_out)->init_tree(tree_out);
--      scene_out.write_active_block();
--      ++iter;
--      ++iter_out;
--    }
--  }
--
--  //: Unload active blocks
--  void unload_active_blocks() const;
--
--  //: Print out the trees in the scene
--  void print();
--
--  //: Return the finest level in the scene
--  short finest_level();
--
--  //: Return the length of finest-level cell in the scene
--  double finest_cell_length();
--
--  //: Return the length of cells at a given level in the scene
--  double cell_length(unsigned level);
--
--  //: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
--  double finest_cell_length_in_memory() const;
--
--  //: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
--  short finest_level_in_memory() const;
--
--  //: Return the number of leaf nodes in the scene
--  unsigned long size();
--
--  vgl_point_3d<double> rpc_origin() const { return rpc_origin_; }
--
--  void set_rpc_origin(vgl_point_3d<double>& new_rpc_origin) {
--    vgl_point_3d<double> old_origin = origin();
--    vgl_point_3d<double> new_origin(
--      old_origin.x() + new_rpc_origin.x() - rpc_origin_.x(),
--      old_origin.y() + new_rpc_origin.y() - rpc_origin_.y(),
--      old_origin.z() + new_rpc_origin.z() - rpc_origin_.z());
--    set_origin(new_origin);
--    rpc_origin_ = new_rpc_origin;
--  }
--
-- protected:
--  vpgl_lvcs lvcs_;
--  vgl_point_3d<double> origin_;
--  vgl_point_3d<double> rpc_origin_;
--
--  //: World dimensions of a block .e.g 1 meter x 1 meter x 1 meter
--  vgl_vector_3d<double> block_dim_;
--
--  vbl_array_3d<boxm_block<T>*> blocks_;
--
--  //: index of the blocks (3D array) that is active; only one active block at a time
--  mutable vgl_point_3d<int> active_block_;
--
--  //: if neighbors of the active block are loaded into memory, their indices are stored in this set
--  mutable std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  active_blocks_;
--
--  float pinit_;
--
--  //: Flag that indicates whether internal nodes of the trees should be saved
--  bool save_internal_nodes_;
--
--  //: Flag that indicates whether the octree data should be saved in a platform-independent way (slower)
--  bool save_platform_independent_;
--
--  //: Flag to load all the blocks in the memory
--  bool load_all_blocks_;
--
--  // ************** private methods *******************
--
--  void create_block(unsigned i, unsigned j, unsigned k);
--
--  void create_blocks(const vgl_vector_3d<double>& block_dim, const vgl_vector_3d<unsigned>& world_dim);
--  bool parse_config(boxm_scene_parser& parser);
--
--  bool parse_xml_string(std::string xml, boxm_scene_parser& parser);
--
--  //: Load all blocks in between min-max indices. This method is private and the user needs to take care of unloading the blocks
--  bool load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
--
--  //: Unload all blocks in between min-max indices.
--  bool unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
--
--
--  //: A helper function to generate the indices of neighboring blocks
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  neighboring_blocks(vgl_point_3d<int> idx)
--  {
--    std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > neighbors;
--    for (int i = -1; i <= 1; i++)
--    {
--      int active_i = idx.x() + i;
--      if (active_i >= 0 && active_i < int(blocks_.get_row1_count()))
--        for (int j = -1; j <= 1; j++)
--        {
--          int active_j = idx.y() + j;
--          if (active_j >= 0 && active_j < int(blocks_.get_row2_count()) )
--            for (int k = -1; k <= 1; k++)
--            {
--              int active_k = idx.z() + k;
--              if (active_k >= 0 && active_k < int(blocks_.get_row3_count()))
--                neighbors.insert(vgl_point_3d<int>(active_i, active_j, active_k));
--            }
--        }
--    }
--    return neighbors;
--  }
--};
--
--template <class T>
--class boxm_block_iterator
--{
--  friend class boxm_cell_iterator<T>;
--
-- public:
--  boxm_block_iterator(boxm_scene<T> const* scene): i_(0), j_(0), k_(0), scene_(scene) {}
--
--  //: Copy constructor
--  boxm_block_iterator(boxm_block_iterator<T> const& other): i_(other.i_), j_(other.j_), k_(other.k_), scene_(other.scene_) {}
--
--  ~boxm_block_iterator() = default;
--
--  boxm_block_iterator<T>& begin();
--
--  bool end();
--
--  boxm_block_iterator<T>& operator=(const boxm_block_iterator<T>& that);
--
--  bool operator==(const boxm_block_iterator<T>& that);
--
--  bool operator!=(const boxm_block_iterator<T>& that);
--
--  boxm_block_iterator<T>& operator++();  // pre-inc
--
--  boxm_block_iterator<T> operator++(int); // post-inc
--
--  boxm_block_iterator<T>& operator--();
--
--  boxm_block<T>* operator*();
--
--  boxm_block<T>* operator->();
--
--  vgl_point_3d<int> index() const { return vgl_point_3d<int>(i_,j_,k_); }
--
-- private:
--  int i_;
--  int j_;
--  int k_;
--
--  boxm_scene<T> const* scene_;
--};
--
--
--//: A class to iterate through all -or only leaf- cells in a boxm_scene
--template <class T>
--class boxm_cell_iterator
--{
-- public:
--  typedef bool (boxm_scene<T>::*ptr2func)(unsigned, unsigned, unsigned);
--  typedef bool (boxm_scene<T>::*ptr2constfunc)(unsigned, unsigned, unsigned) const;
--  typedef typename T::loc_type loc_type;
--  typedef typename T::datatype datatype;
--
--  //: Copy constructor
--  boxm_cell_iterator(boxm_cell_iterator<T> const& other)
--   : block_iterator_(other.block_iterator_), cells_(other.cells_),
--     block_loading_func_(other.block_loading_func_), read_only_(other.read_only_) {}
--
--  //: Constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
--  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2func block_loading_func, bool read_only = false, bool use_internal_cells = false)
--    : block_iterator_(iter), block_loading_func_((ptr2constfunc)block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) {}
--
--  //: "Const" constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
--  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2constfunc block_loading_func, bool read_only, bool use_internal_cells = false)
--    : block_iterator_(iter), block_loading_func_(block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) { assert(read_only); }
--
--  //: Destructor
--  ~boxm_cell_iterator() = default;
--
--  //: Iterator begin
--  boxm_cell_iterator<T>& begin(bool use_internal_cells=false);
--
--  //: Iterator end
--  bool end();
--
--  /*************** Operators ****************/
--
--  boxm_cell_iterator<T>& operator=( const boxm_cell_iterator<T>& that);
--
--  bool operator==(const boxm_cell_iterator<T>& that);
--
--  bool operator!=(const boxm_cell_iterator<T>& that);
--
--  //: Prefix increment. When the end of the block is reached, it writes the block to disk and loads the next one
--  boxm_cell_iterator<T>& operator++();
--
--  //: Increment. When the end of the block is reached, it writes the block to disk and loads the next one
--  boxm_cell_iterator<T> operator+=(unsigned const &rhs);
--
--  boct_tree_cell<loc_type, datatype>* operator*();
--
--  boct_tree_cell<loc_type, datatype>* operator->();
--
--  /*************** Data accessor *************/
--  //: Return the global origin of the current cell
--  vgl_point_3d<double> global_origin();
--
--  //: Return the global centroid of the current cell - use only if cells are cubical
--  vgl_point_3d<double> global_centroid();
--
--  //: Return the global length of this cell
--  double length();
--
-- private:
--
--  boxm_block_iterator<T> block_iterator_;
--  std::vector<boct_tree_cell<loc_type ,datatype >* > cells_;
--  typename std::vector< boct_tree_cell<loc_type , datatype >* >::const_iterator cells_iterator_;
--  ptr2constfunc block_loading_func_;
--  bool read_only_;
--  bool use_internal_cells_;
--};
--
--
--//: generates an XML file from the member variables
--template <class T>
--void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name="boxm_scene");
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene);
--
--
--#endif // boxm_scene_h_
-diff --git a/contrib/brl/bseg/boxm/boxm_scene.hxx b/contrib/brl/bseg/boxm/boxm_scene.hxx
-deleted file mode 100644
-index b398bcc2ad..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene.hxx
-+++ /dev/null
-@@ -1,1764 +0,0 @@
--#ifndef boxm_scene_hxx_
--#define boxm_scene_hxx_
--//:
--// \file
--#include <cmath>
--#include <cstdio>
--#include <sstream>
--#include <iostream>
--#include <algorithm>
--#include <iterator>
--#include "boxm_scene.h"
--//
--#include "boxm_apm_traits.h"
--#include "boxm_scene_parser.h"
--
--#include <vgl/xio/vgl_xio_point_3d.h>
--#include <vgl/xio/vgl_xio_vector_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vsl/vsl_basic_xml_element.h>
--#include <vsl/vsl_binary_io.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <vpgl/xio/vpgl_xio_lvcs.h>
--
--#include <vpl/vpl.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--template <class T>
--boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
--                          const vgl_point_3d<double>& origin,
--                          const vgl_vector_3d<double>& block_dim,
--                          const vgl_vector_3d<unsigned>& world_dim,
--                          const bool load_all_blocks,
--                          const bool save_internal_nodes,
--                          const bool save_platform_independent)
--: lvcs_(lvcs),
--  origin_(origin),
--  block_dim_(block_dim),
--  active_block_(vgl_point_3d<int>(-1,-1,-1)),
--  save_internal_nodes_(save_internal_nodes),
--  save_platform_independent_(save_platform_independent),
--  load_all_blocks_(load_all_blocks)
--{
--  create_blocks(block_dim, world_dim);
--}
--
--template <class T>
--boxm_scene<T>::boxm_scene( const vgl_point_3d<double>& origin,
--                           const vgl_vector_3d<double>& block_dim,
--                           const vgl_vector_3d<unsigned>& world_dim,
--                           const bool load_all_blocks,
--                           const bool save_internal_nodes,
--                           const bool save_platform_independent)
--: origin_(origin),
--  block_dim_(block_dim),
--  active_block_(vgl_point_3d<int>(-1,-1,-1)),
--  save_internal_nodes_(save_internal_nodes),
--  save_platform_independent_(save_platform_independent),
--  load_all_blocks_(load_all_blocks)
--{
--  create_blocks(block_dim, world_dim);
--}
--
--template <class T>
--boxm_scene<T>::boxm_scene(const boxm_scene& scene)
--: boxm_scene_base(scene),
--  lvcs_(scene.lvcs()),
--  origin_(scene.origin()),
--  block_dim_(scene.block_dim()),
--  active_block_(vgl_point_3d<int>(-1,-1,-1)),
--  save_internal_nodes_(scene.save_internal_nodes()),
--  save_platform_independent_(scene.save_platform_independent()),
--  load_all_blocks_(scene.load_all_blocks())
--{
--  int x,y,z;
--  scene.block_num(x,y,z);
--  create_blocks(block_dim_, vgl_vector_3d<unsigned>(x,y,z));
--}
--
--
--template <class T>
--void boxm_scene<T>::create_blocks(const vgl_vector_3d<double>& /*block_dim*/,
--                                  const vgl_vector_3d<unsigned>& world_dim)
--{
--  // compute the dimensions of 3D array
--  unsigned x_dim = world_dim.x(); // = static_cast<int>(std::floor(world_dim.x()/block_dim.x()));
--  unsigned y_dim = world_dim.y(); // = static_cast<int>(std::floor(world_dim.y()/block_dim.y()));
--  unsigned z_dim = world_dim.z(); // = static_cast<int>(std::floor(world_dim.z()/block_dim.z()));
--
--  // pointers are initialized to NULL
--  blocks_ =  vbl_array_3d<boxm_block<T>*>(x_dim, y_dim, z_dim, (boxm_block<T>*)nullptr);
--  for (unsigned i=0; i<x_dim; ++i) {
--    for (unsigned j=0; j<y_dim; ++j) {
--      for (unsigned k=0; k<z_dim; ++k) {
--        create_block(i,j,k);
--      }
--    }
--  }
--}
--
--template <class T>
--boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
--                          const vgl_point_3d<double>& origin,
--                          const vgl_vector_3d<double>& block_dim,
--                          const vgl_vector_3d<unsigned>& world_dim,
--                          unsigned max_level, unsigned init_level,
--                          const bool load_all_blocks,
--                          const bool save_internal_nodes,
--                          const bool save_platform_independent)
--: lvcs_(lvcs),
--origin_(origin),
--block_dim_(block_dim),
--active_block_(vgl_point_3d<int>(-1,-1,-1)),
--save_internal_nodes_(save_internal_nodes),
--save_platform_independent_(save_platform_independent),
--load_all_blocks_(load_all_blocks)
--{
--  create_blocks(block_dim, world_dim);
--  set_octree_levels(max_level, init_level);
--}
--
--template <class T>
--void boxm_scene<T>::create_block(unsigned i, unsigned j, unsigned k)
--{
--  if (blocks_(i,j,k) == NULL) {
--    vgl_box_3d<double> bbox = get_block_bbox(i,j,k);
--    blocks_(i,j,k) = new boxm_block<T>(bbox);
--  }
--}
--
--template <class T>
--boxm_scene<T>::~boxm_scene()
--{
--  // delete the blocks
--  int x_dim, y_dim, z_dim;
--  block_num(x_dim, y_dim, z_dim);
--  for (int i=0; i<x_dim; i++) {
--    for (int j=0; j<y_dim; j++) {
--      for (int k=0; k<z_dim; k++) {
--        if (blocks_(i,j,k))
--          delete blocks_(i,j,k);
--      }
--    }
--  }
--}
--
--//: Returns a scene with the same structure and initialized with given value
--template<class T>
--void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out, datatype data)
--{
--  boxm_block_iterator<T> iter(this);
--  boxm_block_iterator<T> iter_out = scene_out.iterator();
--  iter.begin();
--  iter_out.begin();
--  while (!iter.end())
--  {
--    load_block(iter.index());
--    scene_out.load_block(iter_out.index());
--    T  *tree_out = (*iter)->get_tree()->clone_all();
--    tree_out->init_cells(data);
--    (*iter_out)->init_tree(tree_out);
--    scene_out.write_active_block();
--    ++iter;
--    ++iter_out;
--  }
--}
--
--//: Returns a scene with the same structure and data
--template<class T>
--void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out)
--{
--  boxm_block_iterator<T> iter(this);
--  boxm_block_iterator<T> iter_out = scene_out.iterator();
--  iter.begin();
--  iter_out.begin();
--  while (!iter.end())
--  {
--    load_block(iter.index());
--    T  *tree_out = (*iter)->get_tree()->clone_all();
--    (*iter_out)->init_tree(tree_out);
--    scene_out.write_active_block();
--    ++iter;
--    ++iter_out;
--  }
--}
--
--template <class T>
--void boxm_scene<T>::write_active_block(bool unload_block)
--{
--  if (valid_index(active_block_)&& (!load_all_blocks_))
--  {
--    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
--    std::string path = gen_block_path(x,y,z);
--    vsl_b_ofstream os(path);
--#ifdef DEBUG
--    std::cout << "block path: " << path << '\n'
--             << "Load All blocks " << load_all_blocks_ << '\n'
--             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--#endif
--    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--
--    // delete the block's data
--    if (unload_block)
--    {
--      boxm_block<T>* block = blocks_(x,y,z);
--      block->delete_tree();
--      block->set_tree(nullptr);
--      active_block_.set(-1,-1,-1);
--    }
--    os.close();
--  }
--}
--
--template <class T>
--void boxm_scene<T>::write_active_block(bool unload_block) const
--{
--  assert(!unload_block); // use the "non-const" method ::write_active_block if you want to delete the block's data
--
--  if (valid_index(active_block_)&& (!load_all_blocks_))
--  {
--    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
--    std::string path = gen_block_path(x,y,z);
--    vsl_b_ofstream os(path);
--#ifdef DEBUG
--    std::cout << "block path: " << path << '\n'
--             << "Load All blocks " << load_all_blocks_ << '\n'
--             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--#endif
--    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--    os.close();
--  }
--}
--
--
--template <class T>
--void boxm_scene<T>::write_active_blocks(bool unload_block)
--{
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
--  for (; it!=active_blocks_.end(); it++)
--  {
--    vgl_point_3d<int> bidx = *it;
--    if (valid_index(bidx)&& (!load_all_blocks_))
--    {
--      int x=bidx.x(), y=bidx.y(), z=bidx.z();
--      std::string path = gen_block_path(x,y,z);
--      vsl_b_ofstream os(path);
--  #ifdef DEBUG
--      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
--              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--  #endif
--      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--
--      // delete the block's data
--      if (unload_block)
--      {
--        boxm_block<T>* block = blocks_(x,y,z);
--        block->delete_tree();
--        block->set_tree(nullptr);
--        active_block_.set(-1,-1,-1);
--      }
--      os.close();
--    }
--  }
--}
--
--template <class T>
--void boxm_scene<T>::write_active_blocks(bool unload_block) const
--{
--  assert(!unload_block); // use the "non-const" method ::write_active_blocks if you want to delete the block's data
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
--  for (; it!=active_blocks_.end(); it++)
--  {
--    vgl_point_3d<int> bidx = *it;
--    if (valid_index(bidx)&& (!load_all_blocks_))
--    {
--      int x=bidx.x(), y=bidx.y(), z=bidx.z();
--      std::string path = gen_block_path(x,y,z);
--      vsl_b_ofstream os(path);
--  #ifdef DEBUG
--      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
--              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--  #endif
--      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--      os.close();
--    }
--  }
--}
--
--//: Writes and unloads the specified block. It doesn't modify global variables
--template <class T>
--void boxm_scene<T>::write_block_thread_safe(unsigned i, unsigned j, unsigned k)
--{
--  if (valid_index(i,j,k)&& (!load_all_blocks_))
--  {
--    std::string path = gen_block_path(i,j,k);
--    vsl_b_ofstream os(path);
--
--    if (blocks_(i,j,k))
--      blocks_(i,j,k)->b_write(os, save_internal_nodes_, save_platform_independent_);
--
--    // delete the block's data
--    boxm_block<T>* block = blocks_(i,j,k);
--    block->delete_tree();
--    block->set_tree(nullptr);
--
--    os.close();
--  }
--}
--
--template <class T>
--void boxm_scene<T>::force_write_blocks()
--{
--  boxm_block_iterator<T> iter(this);
--  iter.begin();
--  while (!iter.end())
--  {
--    int x=iter.index().x(), y=iter.index().y(), z=iter.index().z();
--    if (blocks_(x,y,z)->get_tree()!=nullptr)
--    {
--      std::cout<<" ? ";
--      std::string path = gen_block_path(x,y,z);
--      vsl_b_ofstream os(path);
--      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--      os.close();
--    }
--    iter++;
--  }
--}
--
--//: Returns the block this point resides in
--template <class T>
--boxm_block<T>* boxm_scene<T>::get_block(vgl_point_3d<double> const& p) const
--{
--  vgl_box_3d<double> world(get_world_bbox());
--  if (world.contains(p)) {
--    // find the block index
--    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
--    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
--    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
--    return blocks_(i,j,k);
--  }
--  else {
--#ifdef DEBUG
--    std::cerr << "Point " << p << " is out of world " << world << '\n';
--#endif
--    return nullptr;
--  }
--}
--
--
--//: Returns the index of the block containing this point
--template <class T>
--bool boxm_scene<T>::get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index)
--{
--  vgl_box_3d<double> world(get_world_bbox());
--  if (world.contains(p)) {
--    // find the block index
--    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
--    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
--    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
--    // boundary case
--    double tol = 1e-9;
--    if (std::abs(p.x()-world.max_x())<tol)
--      i-=1;
--    if (std::abs(p.y()-world.max_y())<tol)
--      j-=1;
--    if (std::abs(p.z()-world.max_z())<tol)
--      k-=1;
--
--    index=vgl_point_3d<int>(i,j,k);
--    return true;
--  }
--  else {
--#ifdef DEBUG
--    std::cerr << "Point " << p << " is out of world " << world << '\n';
--#endif
--    return false;
--  }
--}
--
--template <class T>
--boxm_block<T>* boxm_scene<T>::get_active_block()
--{
--  if (valid_index(active_block_)) {
--    boxm_block<T>* block = blocks_(active_block_.x(),active_block_.y(),active_block_.z());
--    if (block->get_tree() == nullptr)
--      load_block(active_block_.x(),active_block_.y(),active_block_.z());
--    return block;
--  }
--  else {
--    std::cerr << "index"<<active_block_<<"  is out of world\n";
--    return nullptr;
--  }
--}
--
--template <class T>
--vgl_box_3d<double> boxm_scene<T>::get_world_bbox() const
--{
--  vgl_point_3d<double> min_p(origin_.x(), origin_.y(), origin_.z());
--  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x()*blocks_.get_row1_count(),
--                             min_p.y()+block_dim_.y()*blocks_.get_row2_count(),
--                             min_p.z()+block_dim_.z()*blocks_.get_row3_count());
--
--  vgl_box_3d<double> bbox(min_p, max_p);
--  return bbox;
--}
--
--template <class T>
--void boxm_scene<T>::axes_length(double &x_length,double &y_length, double &z_length) const
--{
--  x_length = block_dim_.x()*blocks_.get_row1_count();
--  y_length = block_dim_.y()*blocks_.get_row2_count();
--  z_length = block_dim_.z()*blocks_.get_row3_count();
--}
--
--
--template <class T>
--vgl_box_3d<double> boxm_scene<T>::get_block_bbox(int x, int y, int z) const
--{
--  vgl_point_3d<double> min_p(block_dim_.x()*x+origin_.x(), block_dim_.y()*y+origin_.y(), block_dim_.z()*z+origin_.z());
--  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x(), min_p.y()+block_dim_.y(), min_p.z()+block_dim_.z());
--
--  vgl_box_3d<double> bbox(min_p, max_p);
--  return bbox;
--}
--
--template <class T>
--std::string boxm_scene<T>::gen_block_path(int x, int y, int z) const
--{
--  std::stringstream strm;
--
--  strm << scene_path_ << '/' << block_pref_ << '_' <<  x << '_' << y << '_' << z << ".bin";
--
--  return strm.str();
--}
--
--template <class T>
--bool boxm_scene<T>::discover_block(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--  std::string block_path = gen_block_path(i,j,k);
--  vsl_b_ifstream os(block_path);
--
--  // if the binary block file is not found, return "false"
--  return !os == false;
--}
--
--//: returns true if the block bin file is found on disc, false otherwise.
--// If false, a new tree is create for the block
--template <class T>
--bool boxm_scene<T>::load_block(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--
--  if (!load_all_blocks_)
--  {
--    // this does not save the active block so make sure to save it first
--    if (valid_index(active_block_)) {
--      if (!(active_block_ == vgl_point_3d<int>(i,j,k)))
--      {
--        int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
--        boxm_block<T>* block = blocks_(x,y,z);
--        block->delete_tree();
--        block->set_tree(nullptr);
--      }
--    }
--  }
--
--  active_block_.set(i,j,k);
--
--  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
--  {
--    std::string block_path = gen_block_path(i,j,k);
--    vsl_b_ifstream os(block_path);
--
--    // if the binary block file is not found
--    if (!os) {
--      if (blocks_(i,j,k)->get_tree()==nullptr) {
--        T* tree= new T(max_tree_level_,init_tree_level_);
--        blocks_(i,j,k)->init_tree(tree);
--      }
--      return false;
--    }
--    blocks_(i,j,k)->b_read(os);
--    os.close();
--  }
--
--  return true;
--}
--
--
--//: Load block into memory - this doesn't use global variables so user is responsible for unloading it
--template <class T>
--bool boxm_scene<T>::load_block_thread_safe(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--
--  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
--  {
--    std::string block_path = gen_block_path(i,j,k);
--    vsl_b_ifstream os(block_path);
--
--    // if the binary block file is not found
--    if (!os) {
--      if (blocks_(i,j,k)->get_tree()==nullptr) {
--        T* tree= new T(max_tree_level_,init_tree_level_);
--        blocks_(i,j,k)->init_tree(tree);
--      }
--      return false;
--    }
--    blocks_(i,j,k)->b_read(os);
--    os.close();
--  }
--
--  return true;
--}
--
--//: Reads and loads all blocks into memorty
--template <class T>
--bool boxm_scene<T>::read_all_blocks()
--{
--  load_all_blocks_ = true;
--  this->unload_active_blocks();
--
--  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
--    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
--      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
--        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) // read it from file
--        {
--          std::string block_path = gen_block_path(block_i,block_j,block_k);
--          vsl_b_ifstream os(block_path);
--
--          // if the binary block file is not found
--          if (!os) {
--            if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
--              T* tree= new T(max_tree_level_,init_tree_level_);
--              blocks_(block_i,block_j,block_k)->init_tree(tree);
--            }
--          }
--          else
--            blocks_(block_i,block_j,block_k)->b_read(os);
--
--          active_blocks_.insert(vgl_point_3d<int>(block_i, block_j, block_k));
--          os.close();
--        }
--      }
--    }
--  }
--
--  return true;
--}
--
--template <class T>
--bool boxm_scene<T>::load_block_and_neighbors(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--
--  active_block_.set(i,j,k);
--  // Set unused blocks to null and load new blocks
--  // this is to avoid rereading blocks that are already in memory
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks  = neighboring_blocks(vgl_point_3d<int>(i,j,k));
--  new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
--  bvgl_point_3d_cmp<int>  cmp;
--  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
--                     new_active_blocks.begin(), new_active_blocks.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
--                     cmp);
--
--  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
--                     active_blocks_.begin(), active_blocks_.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
--                     cmp);
--
--  active_blocks_.clear();
--  active_blocks_ = new_active_blocks;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
--
--  for (; unload_it!=blocks_to_unload.end(); unload_it++)
--  {
--    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--  }
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
--
--  for (; load_it!=blocks_to_load.end(); load_it++)
--  {
--    int block_i = (*load_it).x();
--    int block_j = (*load_it).y();
--    int block_k = (*load_it).z();
--
--    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
--    {
--      std::string block_path = gen_block_path(block_i,block_j,block_k);
--      vsl_b_ifstream os(block_path);
--
--      // if the binary block file is not found
--      if (!os) {
--        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
--          T* tree= new T(max_tree_level_,init_tree_level_);
--          blocks_(block_i,block_j,block_k)->init_tree(tree);
--        }
--        return false;
--      }
--      blocks_(block_i,block_j,block_k)->b_read(os);
--      assert(blocks_(block_i,block_j,block_k)!=NULL);
--      assert(blocks_(block_i,block_j,block_k)->get_tree()!=nullptr);
--
--      os.close();
--    }
--  }
--
--  return true;
--}
--
--//: Return the finest level in the scene
--template <class T>
--short boxm_scene<T>::finest_level()
--{
--  // iterate through the blocks requesting the finest level
--  boxm_block_iterator<T > iter=this->const_iterator();
--  iter.begin();
--  short finest_level = this->max_tree_level_;
--  while (!iter.end()) {
--    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--      short this_level = get_active_block()->get_tree()->finest_level();
--      if (this_level < finest_level)
--        finest_level = this_level;
--    }
--    iter++;
--  }
--
--  return finest_level;
--}
--
--
--//: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
--template <class T>
--short boxm_scene<T>::finest_level_in_memory() const
--{
--  if (!load_all_blocks_)
--    return -1;
--
-- // iterate through the blocks requesting the finest level
--  short finest_level = this->max_tree_level_;
--  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
--    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
--      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
--        if (blocks_(block_i,block_j,block_k)) {
--            short this_level = blocks_(block_i,block_j,block_k)->get_tree()->finest_level();
--            if (this_level < finest_level)
--              finest_level = this_level;
--          }
--      }
--    }
--  }
--
--  return finest_level;
--}
--
--//: Return the length of finest-level cell in the scene
--template <class T>
--double  boxm_scene<T>::finest_cell_length()
--{
--  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level()));
--
--  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
--    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
--             << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
--  }
--
--  return local_cell_length * block_dim_.x();
--}
--
--//: Return the length of cells at a given level in the scene
--template <class T>
--double  boxm_scene<T>::cell_length(unsigned level)
--{
--  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - level));
--
--  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
--    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
--    << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
--  }
--
--  return local_cell_length * block_dim_.x();
--}
--
--//: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
--template <class T>
--double  boxm_scene<T>::finest_cell_length_in_memory() const
--{
--  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level_in_memory()));
--
--  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7))
--    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n";
--
--  return local_cell_length * block_dim_.x();
--}
--
--//: Return the number of leaf nodes in the scene
--template <class T>
--unsigned long boxm_scene<T>::size()
--{
--  // iterate through the blocks requesting the finest level
--  boxm_block_iterator<T > iter=this->const_iterator();
--  iter.begin();
--  unsigned long size = 0;
--  while (!iter.end()) {
--    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z()))
--    {
--      size += get_active_block()->get_tree()->size();
--    }
--
--    iter++;
--  }
--
--  return size;
--}
--
--template <class T>
--void boxm_scene<T>::b_read(vsl_b_istream & is)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      std::string xml="";
--      vsl_b_read(is, xml);
--      std::cout << xml << std::endl;
--      boxm_scene_parser parser;
--      parse_xml_string(xml, parser);
--      break;
--#if 0
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scene<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      return;
--#endif
--  }
--}
--
--template <class T>
--void boxm_scene<T>::b_write(vsl_b_ostream & s) const
--{
--  // create an XML stream for the parameters
--  std::stringstream strm;
--  boxm_scene<T> scene(this->lvcs(), this->origin(), this->block_dim(), this->world_dim());
--  x_write(strm, scene, "scene");
--  std::string str(strm.str());
--
--  short v = boxm_scene<T>::version_no();
--  vsl_b_write(s, v);
--  // write the XML as char stream
--  vsl_b_write(s, str);
--}
--
--template <class T>
--void boxm_scene<T>::write_scene(std::string filename)
--{
--  std::string fullpath=scene_path_+ "/" + filename;
--  std::ofstream os(fullpath.c_str());
--  x_write(os, *this, "boxm_scene");
--  this->filename_ = fullpath;
--  os.close();
--}
--
--template <class T>
--void boxm_scene<T>::write_scene(std::string path, std::string filename)
--{
--  std::string fullpath= path+ "/" + filename;
--  std::ofstream os(fullpath.c_str());
--  x_write(os, *this, "boxm_scene");
--  this->filename_ = fullpath;
--  os.close();
--}
--
--template <class T>
--void boxm_scene<T>::load_scene(std::string filename)
--{
--  boxm_scene_parser parser;
--  boxm_scene_base::load_scene(filename, parser);
--  this->filename_ = filename;
--  parse_config(parser);
--}
--
--template <class T>
--void boxm_scene<T>::load_scene(boxm_scene_parser& parser)
--{
--  parse_config(parser);
--}
--
--template <class T>
--void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name)
--{
--  vsl_basic_xml_element scene_elm(name);
--  scene_elm.x_write_open(os);
--
--  vsl_basic_xml_element app_model(APP_MODEL_TAG);
--  app_model.add_attribute("type", boxm_apm_types::app_model_strings[scene.appearence_model()]);
--  app_model.x_write(os);
--
--  vsl_basic_xml_element bin(MULTI_BIN_TAG);
--  bin.add_attribute("value", scene.multi_bin()? 1 : 0);
--  bin.x_write(os);
--
--  vsl_basic_xml_element save_nodes(SAVE_INTERNAL_NODES_TAG);
--  save_nodes.add_attribute("value", scene.save_internal_nodes()? 1 : 0);
--  save_nodes.x_write(os);
--
--  vsl_basic_xml_element save_platform_independent(SAVE_PLATFORM_INDEPENDENT_TAG);
--  save_platform_independent.add_attribute("value", scene.save_platform_independent()? 1 : 0);
--  save_platform_independent.x_write(os);
--
--  vsl_basic_xml_element load_all_blocks(LOAD_ALL_BLOCKS_TAG);
--  load_all_blocks.add_attribute("value", scene.load_all_blocks()? 1 : 0);
--  load_all_blocks.x_write(os);
--
--  vpgl_lvcs lvcs=scene.lvcs();
--  x_write(os, lvcs, LVCS_TAG);
--  x_write(os, scene.origin(), LOCAL_ORIGIN_TAG);
--  x_write(os, scene.block_dim(), BLOCK_DIMENSIONS_TAG);
--
--  vsl_basic_xml_element blocks(BLOCK_NUM_TAG);
--  int x_dim, y_dim, z_dim;
--  scene.block_num(x_dim, y_dim, z_dim);
--  blocks.add_attribute("x_dimension", x_dim);
--  blocks.add_attribute("y_dimension", y_dim);
--  blocks.add_attribute("z_dimension", z_dim);
--  blocks.x_write(os);
--
--  vsl_basic_xml_element paths(SCENE_PATHS_TAG);
--  paths.add_attribute("path", scene.path());
--  paths.add_attribute("block_prefix", scene.block_prefix());
--  paths.x_write(os);
--
--  vsl_basic_xml_element tree(OCTREE_LEVELS_TAG);
--  tree.add_attribute("max", (int) scene.max_level());
--  tree.add_attribute("init", (int) scene.init_level());
--  tree.x_write(os);
--
--  scene_elm.x_write_close(os);
--}
--
--template <class T>
--bool boxm_scene<T>::parse_config(boxm_scene_parser& parser)
--{
--  vpgl_lvcs lvcs;
--  parser.lvcs(lvcs);
--  vgl_vector_3d<unsigned> dims = parser.block_nums();
--
--  lvcs_ = lvcs;
--  origin_ =  parser.origin();
--  block_dim_ = parser.block_dim();
--  create_blocks(block_dim_, dims);
--
--  parser.paths(scene_path_, block_pref_);
--  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
--  multi_bin_ = parser.multi_bin();
--  save_internal_nodes_ =parser.save_internal_nodes();
--  save_platform_independent_ = parser.save_platform_independent();
--  load_all_blocks_ = parser.load_all_blocks();
--  pinit_=parser.p_init();
--#if 0
--  std::cout << "Internal Nodes 1: " << save_internal_nodes_ << std::endl;
--#endif
--  parser.levels(max_tree_level_, init_tree_level_);
--  return true;
--}
--
--template <class T>
--bool boxm_scene<T>::parse_xml_string(std::string xml, boxm_scene_parser& parser)
--{
--  if (xml.size() == 0) {
--    std::cerr << "XML string is empty\n";
--    return false;
--  }
--  if (!parser.parseString(xml.data())) {
--    std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
--             << parser.XML_GetCurrentLineNumber() << '\n';
--
--    return false;
--  }
--
--  vpgl_lvcs lvcs;
--  parser.lvcs(lvcs);
--  vgl_vector_3d<unsigned> nums = parser.block_nums();
--
--  lvcs_ = lvcs;
--  origin_ =  parser.origin();
--  block_dim_ = parser.block_dim();
--  create_blocks(block_dim_, nums);
--
--  parser.paths(scene_path_, block_pref_);
--  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
--  multi_bin_ = parser.multi_bin();
--  pinit_=parser.p_init();
--  load_all_blocks_ = parser.load_all_blocks();
--
--  return true;
--}
--
--template <class T>
--void boxm_scene<T>::clean_scene()
--{
--  boxm_block_iterator<T > iter=this->iterator();
--  iter.begin();
--  while (!iter.end()) {
--    if (this->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--      std::string filename=this->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
--      vpl_unlink(filename.c_str());
--    }
--    iter++;
--  }
--}
--
--template <class T>
--void boxm_scene<T>::print()
--{
--  boxm_block_iterator<T > iter=this->const_iterator();
--  iter.begin();
--  while (!iter.end()) {
--    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--      std::cout << "Printing Block : " <<  iter.index() << std::endl;
--      get_active_block()->get_tree()->print();
--    }
--    ++iter;
--  }
--}
--
--//: Load all blocks in between min-max indices.
--template <class T>
--bool boxm_scene<T>::load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
--{
--  if (!valid_index(min_idx) || !valid_index(max_idx))
--    return false;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks;
--
--  for (int i = min_idx.x(); i <= max_idx.x(); i++)
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--      for (int k = min_idx.z(); k <= max_idx.z(); k++)
--        new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
--
--  // Set unused blocks to null and load new blocks
--  // this is to avoid rereading blocks that are already in memory
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
--  bvgl_point_3d_cmp<int>  cmp;
--  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
--                     new_active_blocks.begin(), new_active_blocks.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
--                     cmp);
--
--  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
--                     active_blocks_.begin(), active_blocks_.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
--                     cmp);
--
--  active_blocks_.clear();
--  active_blocks_ = new_active_blocks;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
--
--  for (; unload_it!=blocks_to_unload.end(); unload_it++)
--  {
--    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--  }
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
--
--  for (; load_it!=blocks_to_load.end(); load_it++)
--  {
--    int block_i = (*load_it).x();
--    int block_j = (*load_it).y();
--    int block_k = (*load_it).z();
--
--    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
--    {
--      std::string block_path = gen_block_path(block_i,block_j,block_k);
--      vsl_b_ifstream os(block_path);
--
--      // if the binary block file is not found
--      if (!os) {
--        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
--          T* tree= new T(max_tree_level_,init_tree_level_);
--          blocks_(block_i,block_j,block_k)->init_tree(tree);
--        }
--        return false;
--      }
--      blocks_(block_i,block_j,block_k)->b_read(os);
--      os.close();
--    }
--  }
--
--  return true;
--}
--
--//: Unload all blocks in between min-max indices.
--template <class T>
--bool boxm_scene<T>::unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
--{
--  if (!valid_index(min_idx) || !valid_index(max_idx))
--    return false;
--
--  for (int i = min_idx.x(); i <= max_idx.x(); i++)
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--      for (int k = min_idx.z(); k <= max_idx.z(); k++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        block->delete_tree();
--        block->set_tree(nullptr);
--      }
--  return true;
--}
--
--//: Unload active blocks.
--template <class T>
--void boxm_scene<T>::unload_active_blocks() const
--{
--  // unload active block
--  if (valid_index(active_block_))
--  {
--    boxm_block<T>* block = blocks_(active_block_.x(), active_block_.y(),active_block_.z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--    active_block_ = vgl_point_3d<int>(-1,-1,-1);
--  }
--
--  if (active_blocks_.size()==0)
--    return;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = active_blocks_.begin();
--
--  for (; unload_it!=active_blocks_.end(); unload_it++)
--  {
--    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--  }
--  active_blocks_.clear();
--
--  return;
--}
--
--
--//: Locate all cells within a 3d region, which coordinates are given in scene coordinates.
--//  Use with care --- blocks need to be unloaded by user to not create memory leaks
--template <class T>
--void boxm_scene<T>::leaves_in_region(vgl_box_3d<double> box, std::vector<boct_tree_cell<typename T::loc_type, typename T::datatype>* > &cells)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--  cells.clear();
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
--    return;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--#endif
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
--        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
--      }
--    }
--  }
--
--  // FIXME: I should unload the blocks
--  return;
--}
--
--//: Level of the cell containing a 3d region, which coordinates are given in scene coordinates.
--template <class T>
--short boxm_scene<T>::level_region(vgl_box_3d<double> box)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::level_region: Region does not intersect scene\n";
--    return -1;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--//#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--//#endif
--  if (!load_blocks(min_idx, max_idx))
--    return -1;
--
--  short level = -1;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        std::cout << ".....In tree with box dimension: " << get_block_bbox(i,j,k).width() << ", " << get_block_bbox(i,j,k).depth() << ", " << get_block_bbox(i,j,k).height()
--            << "looking for box with dim: " << box.width() << ", " << box.depth() << ", " <<box.height() <<std::endl;
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--
--        boct_tree_cell<loc_type, datatype>* region_cell = tree->locate_region_global(local_box_exclusive);
--        if (region_cell->level() > level)
--          level = region_cell->level();
--
--        std::cout << "level: " << level << box <<std::endl;
--
--      }
--    }
--  }
--  this->unload_active_blocks();
--  return level;
--}
--
--
--
--
--//: Return all leaf cells between an inner box and an outter box
--template <class T>
--void boxm_scene<T>::leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<typename T::loc_type, typename T::datatype> > &cell_data)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--  cell_data.clear();
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
--    return;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--#endif
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
--
--        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
--        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
--          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
--                                                                (*temp_cell_it)->level(), (*temp_cell_it)->data()));
--        }
--      }
--    }
--  }
--  unload_active_blocks();
--  return;
--}
--
--//: Returns the data of all cells at a given level, that are contained in the specified region
--template <class T>
--void boxm_scene<T>::cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--  cell_data.clear();
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
--    return;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--#endif
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_region_cells_global(local_box_exclusive, temp_cells, level);
--
--        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
--        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
--          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
--                                                                 (*temp_cell_it)->level(), (*temp_cell_it)->data()));
--        }
--      }
--    }
--  }
--  unload_active_blocks();
--  return;
--}
--
--//: Return all leaf cells between an inner box and an outter box. Use with care --- blocks need to be unloaded by user
--template <class T>
--void boxm_scene<T>::leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells)
--{
--  if (!outer_box.contains(inner_box))
--    return;
--
--  // load blocks intersecting the region
--  vgl_point_3d<double> min_point = outer_box.min_point();
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<double> max_point = outer_box.max_point();
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),outer_box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_outer_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                                     local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--
--        vgl_box_3d<double> local_inner_box_exclusive = vgl_intersection(local_outer_box_exclusive,inner_box);
--
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_leaves_in_hollow_region_global(local_outer_box_exclusive, local_inner_box_exclusive, temp_cells);
--        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
--      }
--    }
--  }
--
--  // FIXME: I should unload the blocks
--  return;
--}
--
--//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
--template <class T>
--void boxm_scene<T>::change_leaves_in_region(vgl_box_3d<double> box, const typename T::datatype &cell_data)
--{
--  // load blocks intersecting the region
--  vgl_point_3d<double> min_point = box.min_point();
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<double> max_point = box.max_point();
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--
--        tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
--
--        std::string path = gen_block_path(i,j,k);
--        vsl_b_ofstream os(path);
--        block->b_write(os, save_internal_nodes_, save_platform_independent_);
--      }
--    }
--  }
--
--  unload_active_blocks();
--  return;
--}
--
--//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
--template <class T>
--void boxm_scene<T>::change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<typename T::datatype> &all_data)
--{
--  if (boxes.size()!= all_data.size()) {
--    std::cerr << "Error in boxm_scene<T>::change_leaves_in_regions --> Input vectors don't have the same size\n";
--    return;
--  }
--
--  for (unsigned bi = 0; bi < boxes.size(); bi++)
--  {
--    const vgl_box_3d<double> &box = boxes[bi];
--    const datatype &cell_data=all_data[bi];
--    // load blocks intersecting the region
--    vgl_point_3d<double> min_point = box.min_point();
--    vgl_point_3d<int> min_idx;
--    get_block_index(min_point, min_idx);
--
--    vgl_point_3d<double> max_point = box.max_point();
--    vgl_point_3d<int> max_idx;
--    get_block_index(max_point, max_idx);
--
--    if (!load_blocks(min_idx, max_idx))
--      return;
--
--    // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--    for (int k = min_idx.z(); k <= max_idx.z(); k++)
--    {
--      for (int j = min_idx.y(); j <= max_idx.y(); j++)
--      {
--        for (int i = min_idx.x(); i <= max_idx.x();i++)
--        {
--          boxm_block<T>* block = blocks_(i,j,k);
--          vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--          // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--          // if this is not done, the endpoint may be out of bounds
--          vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                                 local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--          T *tree = block->get_tree();
--          if (!tree)
--            continue;
--
--          tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
--
--          std::string path = gen_block_path(i,j,k);
--          vsl_b_ofstream os(path);
--          block->b_write(os, save_internal_nodes_, save_platform_independent_);
--        }
--      }
--    }
--  }
--
--  unload_active_blocks();
--  return;
--}
--
--
--//: Locate point
--template <class T>
--boct_tree_cell<typename T::loc_type, typename T::datatype>* boxm_scene<T>::locate_point_in_memory(vgl_point_3d<double> &p, unsigned level)
--{
--  // get the indices for the block containing this point
--  vgl_point_3d<int> block_idx;
--  if (!get_block_index(p, block_idx))
--    return nullptr;
--
--#ifdef DEBUG
--  std::cout << "Requesting blocks : "<< block_idx<< '\n'
--           << "Active blocks :" << std::endl;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
--  for (; it!=active_blocks_.end(); it++) {
--    std::cout << *it << std::endl;
--    boxm_block<T > *block = get_block(*it);
--    if (!block)
--      std::cerr << " NULL block\n";
--    T *tree = block->get_tree();
--    if (!tree)
--      std::cerr << " NULL tree\n";
--  }
--#endif
--
--  // get the block, if block is not already in memory, return null
--  boxm_block<T>* block = blocks_(block_idx.x(), block_idx.y(), block_idx.z());
--  if (!block) {
--    std::cerr << "In locate_point_in_memory: NULL block\n";
--    return nullptr;
--  }
--  T *tree = block->get_tree();
--  if (!tree) {
--    std::cerr << "In locate_point_in_memory: NULL tree\n";
--    return nullptr;
--  }
--  return tree->locate_point_global(p, (short)level);
--}
--
--/************************************************ BOXM_BLOCK_ITERATOR *******************************************/
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::begin()
--{
--  i_=j_=k_=0;
--  return *this;
--}
--
--template <class T>
--bool boxm_block_iterator<T>::end()
--{
--  int x,y,z;
--  scene_->block_num(x,y,z);
--
--  // if ((i_==x-1) && (j_==y-1) && (k_==z-1))
--  bool end = (k_==z || k_ == -1);
--
--  //:If end, release memory
--  if (end)
--    scene_->unload_active_blocks();
--
--  return end;
--}
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::operator=(const boxm_block_iterator<T>& that)
--{
--  this->i_ = that.i_;
--  this->j_ = that.j_;
--  this->k_ = that.k_;
--  return *this;
--}
--
--template <class T>
--bool boxm_block_iterator<T>::operator==(const boxm_block_iterator<T>& that)
--{
--  return (this->i_ == that.i_) && (this->j_ == that.j_) && (this->k_ == that.k_) && (this->scene_ == that.scene_);
--}
--
--template <class T>
--bool boxm_block_iterator<T>::operator!=(const boxm_block_iterator<T>& that)
--{
--  return (this->i_ != that.i_) || (this->j_ != that.j_) == (this->k_ != that.k_) || (this->scene_ != that.scene_);
--}
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::operator++()
--{
--  int x,y,z;
--  scene_->block_num(x,y,z);
--
--  if (++i_==x) {
--    i_=0;
--    if (++j_==y) {
--      j_=0;
--      ++k_;
--    }
--  }
--  return *this;
--}
--
--template <class T>
--boxm_block_iterator<T> boxm_block_iterator<T>::operator++(int)
--{
--  boxm_block_iterator<T> old = *this;
--  ++*this;
--  return old;
--}
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::operator--()
--{
--  int x,y,z;
--
--  scene_->block_num(x,y,z);
--  if (--i_==-1) {
--    i_=0;
--    if (--j_==-1) {
--      j_=0;
--      k_--;
--    }
--  }
--  return *this;
--}
--
--template <class T>
--boxm_block<T>* boxm_block_iterator<T>::operator*()
--{
--  return scene_->get_block(i_,j_,k_);
--}
--
--template <class T>
--boxm_block<T>*  boxm_block_iterator<T>::operator->()
--{
--  return scene_->get_block(i_,j_,k_);
--}
--
--/************************************************ BOXM_CELL_ITERATOR *******************************************/
--template <class T>
--boxm_cell_iterator<T>& boxm_cell_iterator<T>::begin(bool use_internal_cells)
--{
--  use_internal_cells_= use_internal_cells;
--
--  // unload all blocks from memory
--  block_iterator_.scene_->unload_active_blocks();
--  block_iterator_.begin();
--
--  // load active block using function pointer, retrieve pointer to all cells
--  (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
--  T *tree = (*block_iterator_)->get_tree();
--  assert(tree != nullptr);
--  if(use_internal_cells_)
--    cells_=tree->all_cells();
--  else
--    cells_ = tree->leaf_cells();
--  cells_iterator_ = cells_.begin();
--
--  std::cout << "Cell iterator: # of cells: " << cells_.size() << std::endl;
--
--  return *this;
--}
--
--template <class T>
--bool boxm_cell_iterator<T>::end()
--{
--  bool end = false;
--
--  end = cells_.empty() || (block_iterator_.end() && (cells_iterator_ == cells_.end()));
--
--  if (end)
--    block_iterator_.scene_->unload_active_blocks();
--
--  return end;
--}
--
--template <class T>
--boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator=(const boxm_cell_iterator<T>& /*that*/)
--{
--  std::cerr << "assignment operator not yet implemented\n";
--  return *this;
--}
--
--template <class T>
--bool boxm_cell_iterator<T>::operator==(const boxm_cell_iterator<T>& that)
--{
--  return (this->block_iterator_ == that.block_iterator_) && (this->cells_iterator_ == that.cells_iterator_);
--}
--
--template <class T>
--bool boxm_cell_iterator<T>::operator!=(const boxm_cell_iterator<T>& that)
--{
--  return (this->block_iterator_ != that.block_iterator_) && (this->cells_iterator_ != that.cells_iterator_);
--}
--
--//: Prefix operator.
--//  When the end of the block is reached, it writes the block to disk and loads the next one, unless the read_only flag was set
--template <class T>
--boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator++()
--{
--  if (++cells_iterator_ == cells_.end())
--  {
--    if (!read_only_)
--      block_iterator_.scene_->write_active_block(false);
--
--    ++block_iterator_;
--
--    if (!block_iterator_.end())
--    {
--      // load active block using function pointer, retrieve pointer to all cells
--      (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
--      T *tree = (*block_iterator_)->get_tree();
--      assert(tree != nullptr);
--
--      if(use_internal_cells_)
--        cells_=tree->all_cells();
--      else
--        cells_ = tree->leaf_cells();
--
--      cells_iterator_ = cells_.begin();
--    }
--  }
--  return *this;
--}
--
--template <class T>
--boxm_cell_iterator<T> boxm_cell_iterator<T>::operator+=(unsigned const &rhs)
--{
--  // is there a more efficient way to do this whitout messing all the iterator up?
--  for (unsigned i =0; i<rhs; ++i)
--    ++(*this);
--
--  return *this;
--}
--
--
--template <class T>
--boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>* boxm_cell_iterator<T>::operator*()
--{
--  return *cells_iterator_;
--}
--
--template <class T>
--boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>*  boxm_cell_iterator<T>::operator->()
--{
--  return *cells_iterator_;
--}
--
--template<class T>
--vgl_point_3d<double> boxm_cell_iterator<T>::global_origin()
--{
--  return (*block_iterator_)->get_tree()->global_origin(*cells_iterator_);
--}
--
--template<class T>
--vgl_point_3d<double> boxm_cell_iterator<T>::global_centroid()
--{
--  return (*block_iterator_)->get_tree()->global_centroid(*cells_iterator_);
--}
--
--//: Return the global length of this cell
--template<class T>
--double boxm_cell_iterator<T>::length()
--{
--  return (*block_iterator_)->get_tree()->cell_length(*cells_iterator_)*(*block_iterator_)->bounding_box().width();
--}
--
--/******************************************* I/ O *******************************************************/
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene)
--{
--  scene.b_write(os);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene)
--{
--  scene->b_write(os);
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene)
--{
--  scene.b_read(is);
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene)
--{
--  scene->b_read(is);
--}
--
--#define BOXM_SCENE_INSTANTIATE(T) \
--template class boxm_scene<T >; \
--template void x_write(std::ostream&, boxm_scene<T >&, std::string); \
--template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const &scene); \
--template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const * &scene); \
--template void vsl_b_read(vsl_b_istream & is, boxm_scene<T >  &scene); \
--template void vsl_b_read(vsl_b_istream & is, boxm_scene<T > * &scene)
--
--#define BOXM_BLOCK_ITERATOR_INSTANTIATE(T) \
--template class boxm_block_iterator<T >; \
--template class boxm_cell_iterator<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_scene_base.cxx
-deleted file mode 100644
-index 11fb0faf88..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_base.cxx
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#include <iostream>
--#include <cstdio>
--#include "boxm_scene_base.h"
--#include "boxm_scene_parser.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bool boxm_scene_base::load_scene(const std::string& filename, boxm_scene_parser& parser)
--{
--
--  if (filename.size() > 0) {
--    std::FILE* xmlFile = std::fopen(filename.c_str(), "r");
--    if (!xmlFile){
--    std::cerr << filename.c_str() << " error on opening" << std::endl;
--    return false;
--    }
--    if (!parser.parseFile(xmlFile)) {
--      std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
--               << parser.XML_GetCurrentLineNumber() << '\n';
--      std::fclose(xmlFile);
--      return false;
--    }
--    std::fclose(xmlFile);
--  }
--  else
--    std::cerr << " Filename is empty" << std::endl;
--
--  parser.paths(scene_path_, block_pref_);
--  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
--  multi_bin_ = parser.multi_bin();
--  parser.levels(max_tree_level_, init_tree_level_);
--  filename_ = filename;
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.h b/contrib/brl/bseg/boxm/boxm_scene_base.h
-deleted file mode 100644
-index 5e52195ac3..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_base.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--#ifndef boxm_scene_base_h_
--#define boxm_scene_base_h_
--//:
--// \file
--// \brief  The main class to keep the 3D world data and pieces
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vbl/vbl_ref_count.h>
--#include <vsl/vsl_binary_io.h>
--#include <vbl/vbl_smart_ptr.h>
--#include <vgl/vgl_box_3d.h>
--
--#include <boxm/boxm_apm_traits.h>
--
--class boxm_scene_parser;
--
--class boxm_scene_base : public vbl_ref_count
--{
-- public:
--  boxm_scene_base()
--  : app_model_(BOXM_APM_UNKNOWN), multi_bin_(false), tree_level_set_(false),
--    scene_path_(""), filename_(""), block_pref_(""), max_tree_level_(0), init_tree_level_(0) {}
--
--  ~boxm_scene_base() override = default;
--
--  bool load_scene(const std::string& filename, boxm_scene_parser& parser);
--
--  boxm_apm_type appearence_model() { return app_model_; }
--
--  void set_appearance_model(boxm_apm_type model) { app_model_ = model; }
--
--  void set_bin_option(bool multi_bin) { multi_bin_ = multi_bin; }
--
--  void set_octree_levels(unsigned max, unsigned init, bool tree_level_set=true)
--  {
--    max_tree_level_=max;
--    init_tree_level_=init;
--    tree_level_set_=tree_level_set;
--  }
--
--  void set_paths(std::string scene_path, std::string block_prefix)
--  {
--    scene_path_ = scene_path;
--    block_pref_=block_prefix;
--  }
--
--  bool multi_bin() const { return multi_bin_; }
--
--  bool parse_config(std::string xml, boxm_scene_parser& parser, bool filename);
--
--  unsigned max_level() const { return max_tree_level_; }
--  unsigned init_level() const { return init_tree_level_; }
--  std::string filename() const { return filename_; }
--
--  virtual vgl_box_3d<double> get_world_bbox() const { return {}; }
--  virtual vgl_vector_3d<unsigned> world_dim() const { return {}; }
--
-- protected:
--  boxm_apm_type app_model_;
--
--  bool multi_bin_;
--
--  //: it is set to true when max and init tree levels are given
--  bool tree_level_set_;
--
--  std::string scene_path_;
--  std::string filename_;
--  std::string block_pref_;
--
--  //: maximum octree levels allowed
--  unsigned max_tree_level_;
--
--  //: number of initial octree levels created at the tree creation step
--  unsigned init_tree_level_;
--};
--
--typedef vbl_smart_ptr<boxm_scene_base> boxm_scene_base_sptr;
--
--#endif // boxm_scene_base_h_
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx b/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
-deleted file mode 100644
-index be04cb28ed..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
-+++ /dev/null
-@@ -1,277 +0,0 @@
--//:
--// \file
--// \brief Parses the configuration file for bwm tool.
--//
--#include <sstream>
--#include <cstring>
--#include <iostream>
--#include <cstdio>
--#include "boxm_scene_parser.h"
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--// --------------
--// --- PARSER ---
--// --------------
--template <typename T>
--void convert(const char* t, T& d)
--{
--  std::stringstream strm(t);
--  strm >> d;
--}
--
--boxm_scene_parser::boxm_scene_parser()
--{
--  init_params();
--}
--
--bool boxm_scene_parser::lvcs(vpgl_lvcs& lvcs) {
--  vpgl_lvcs::cs_names cs_name = vpgl_lvcs::str_to_enum(lvcs_cs_name_.data());
--  vpgl_lvcs::LenUnits len_unit;
--  vpgl_lvcs::AngUnits geo_unit;
--   if (std::strcmp(lvcs_XYZ_unit_.data(), "feet")==0) {
--     len_unit = vpgl_lvcs::FEET;
--   }
--   else if (std::strcmp(lvcs_XYZ_unit_.data(), "meters")==0) {
--     len_unit = vpgl_lvcs::METERS;
--   }
--   else {
--     std::cout << "LVCS Length Unit " << lvcs_XYZ_unit_ << " is not valid\n";
--     return false;
--   }
--
--   if (std::strcmp(lvcs_geo_angle_unit_.data(), "radians")==0) {
--     geo_unit = vpgl_lvcs::RADIANS;
--   }
--   else if (std::strcmp(lvcs_geo_angle_unit_.data(), "degrees")==0) {
--     geo_unit = vpgl_lvcs::DEG;
--   }
--   else {
--     std::cout << "LVCS Geo Angle Unit " << lvcs_geo_angle_unit_ << " is not valid\n";
--     return false;
--   }
--
--   lvcs = vpgl_lvcs(lvcs_origin_lat_,lvcs_origin_lon_,lvcs_origin_elev_, cs_name,
--                  lvcs_lat_scale_, lvcs_lon_scale_, geo_unit, len_unit,
--                  lvcs_local_origin_x_, lvcs_local_origin_y_, lvcs_theta_);
--  return true;
--}
--
--void boxm_scene_parser::init_params()
--{
--  lvcs_cs_name_="";
--  lvcs_origin_lon_=0;
--  lvcs_origin_lat_=0;
--  lvcs_origin_elev_=0;
--  lvcs_lon_scale_=0;
--  lvcs_lat_scale_=0;
--  lvcs_XYZ_unit_="";
--  lvcs_geo_angle_unit_="";
--  lvcs_local_origin_x_=0;
--  lvcs_local_origin_y_=0;
--  lvcs_theta_=0;
--
--  // world origin
--  local_orig_x_=0;
--  local_orig_y_=0;
--  local_orig_z_=0;
--
--  // block dimensions
--  block_dim_x_=0;
--  block_dim_y_=0;
--  block_dim_z_=0;
--
--  // block numbers
--  block_num_x_=0;
--  block_num_y_=0;
--  block_num_z_=0;
--
--  path_="";
--  block_pref_="";
--  save_internal_nodes_ = false;
--  save_platform_independent_ = true;
--  load_all_blocks_=false;
--  p_init_=0.01f;
--  num_buffers_init_ = 0;
--  size_buffer_init_ = 0;
--}
--
--void
--boxm_scene_parser::startElement(const char* name, const char** atts)
--{
--#if 0
--  std::cout<< "element=" << name << std::endl;
--#endif
--  if (std::strcmp(name, LVCS_TAG) == 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--        if (std::strcmp(atts[i], "cs_name") == 0)
--        convert(atts[i+1], lvcs_cs_name_);
--      else if (std::strcmp(atts[i], "origin_lon") == 0)
--        convert(atts[i+1], lvcs_origin_lon_);
--      else if (std::strcmp(atts[i], "origin_lat") == 0)
--        convert(atts[i+1], lvcs_origin_lat_);
--      else if (std::strcmp(atts[i], "origin_elev") == 0)
--        convert(atts[i+1], lvcs_origin_elev_);
--      else if (std::strcmp(atts[i], "lon_scale") == 0)
--        convert(atts[i+1], lvcs_lon_scale_);
--      else if (std::strcmp(atts[i], "lat_scale") == 0)
--        convert(atts[i+1], lvcs_lat_scale_);
--      else if (std::strcmp(atts[i], "local_XYZ_unit") == 0)
--        convert(atts[i+1], lvcs_XYZ_unit_);
--      else if (std::strcmp(atts[i], "geo_angle_unit") == 0)
--        convert(atts[i+1], lvcs_geo_angle_unit_);
--      else if (std::strcmp(atts[i], "local_origin_x") == 0)
--        convert(atts[i+1], lvcs_local_origin_x_);
--      else if (std::strcmp(atts[i], "local_origin_y") == 0)
--        convert(atts[i+1], lvcs_local_origin_y_);
--      else if (std::strcmp(atts[i], "theta_") == 0)
--        convert(atts[i+1], lvcs_theta_);
--    }
--  }
--  else if (std::strcmp(name,LOCAL_ORIGIN_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--        if (std::strcmp(atts[i], "x") == 0)
--        convert(atts[i+1], local_orig_x_);
--      else if (std::strcmp(atts[i], "y") == 0)
--        convert(atts[i+1], local_orig_y_);
--      else if (std::strcmp(atts[i], "z") == 0)
--        convert(atts[i+1], local_orig_z_);
--    }
--  }
--  else if (std::strcmp(name,BLOCK_DIMENSIONS_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--        if (std::strcmp(atts[i], "x") == 0)
--        convert(atts[i+1], block_dim_x_);
--      else if (std::strcmp(atts[i], "y") == 0)
--        convert(atts[i+1], block_dim_y_);
--      else if (std::strcmp(atts[i], "z") == 0)
--        convert(atts[i+1], block_dim_z_);
--    }
--  }
--  else if (std::strcmp(name,BLOCK_NUM_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "x_dimension") == 0)
--        convert(atts[i+1], block_num_x_);
--      else if (std::strcmp(atts[i], "y_dimension") == 0)
--        convert(atts[i+1], block_num_y_);
--      else if (std::strcmp(atts[i], "z_dimension") == 0)
--        convert(atts[i+1], block_num_z_);
--    }
--  }
--  else if (std::strcmp(name,SCENE_PATHS_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "path") == 0)
--        convert(atts[i+1], path_);
--      else if (std::strcmp(atts[i], "block_prefix") == 0)
--        convert(atts[i+1], block_pref_);
--    }
--  }
--  else if (std::strcmp(name,APP_MODEL_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "type") == 0)
--        convert(atts[i+1], app_model_);
--    }
--  }
--  else if (std::strcmp(name,MULTI_BIN_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], multi_bin_);
--    }
--  }
--  else if (std::strcmp(name,SAVE_INTERNAL_NODES_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], save_internal_nodes_);
--    }
--  }
--  else if (std::strcmp(name,SAVE_PLATFORM_INDEPENDENT_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], save_platform_independent_);
--    }
--    //std::cout << "parser: save_platform_independent_ = " << save_platform_independent_ << std::endl;
--  }
--  else if (std::strcmp(name,LOAD_ALL_BLOCKS_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], load_all_blocks_);
--    }
--    //std::cout << "parser: load_all_blocks_ = " << load_all_blocks_ << std::endl;
--  }
--
--  else if (std::strcmp(name, "octree_level")==0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "max") == 0)
--        convert(atts[i+1], max_tree_level_);
--      else if (std::strcmp(atts[i], "init") == 0)
--        convert(atts[i+1], init_tree_level_);
--    }
--  }
--  else if (std::strcmp(name, "p_init")==0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--    if (std::strcmp(atts[i], "val") == 0)
--        convert(atts[i+1], p_init_);
--    }
--  }
--
--  else if (std::strcmp(name, "tree_init") == 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "num_buffers")==0)
--        convert(atts[i+1], num_buffers_init_);
--      if (std::strcmp(atts[i], "buff_size")==0)
--        convert(atts[i+1], size_buffer_init_);
--    }
--  }
--
--  else if (std::strcmp(name, "max_mb") == 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "mb") == 0)
--        convert(atts[i+1], max_mb_);
--    }
--  }
--
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.h b/contrib/brl/bseg/boxm/boxm_scene_parser.h
-deleted file mode 100644
-index cbda358d2d..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_parser.h
-+++ /dev/null
-@@ -1,108 +0,0 @@
--#ifndef boxm_scene_parser_h_
--#define boxm_scene_parser_h_
--
--#include <iostream>
--#include <string>
--#include <boxm/boxm_scene.h>
--
--#ifdef WIN32
-- #define _LIB
--#endif
--#include <expatpp.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vpgl/vpgl_lvcs.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--
--#define LVCS_TAG "lvcs"
--#define LOCAL_ORIGIN_TAG "local_origin"
--#define BLOCK_DIMENSIONS_TAG "block_dimensions"
--#define BLOCK_NUM_TAG "blocks"
--#define SCENE_PATHS_TAG "scene_paths"
--#define APP_MODEL_TAG "appearence_model"
--#define MULTI_BIN_TAG "multi_bin"
--#define SAVE_INTERNAL_NODES_TAG "save_internal_nodes"
--#define SAVE_PLATFORM_INDEPENDENT_TAG "save_platform_independent"
--#define LOAD_ALL_BLOCKS_TAG "load_all_blocks"
--#define OCTREE_LEVELS_TAG "octree_level"
--#define P_INIT_TAG "p_init"
--#define TREE_INIT_TAG "tree_init"
--#define MAX_MB_TAG "max_mb"
--
--class boxm_scene_parser : public expatpp
--{
-- public:
--  boxm_scene_parser();
--
--  ~boxm_scene_parser(void) override = default;
--
--   bool lvcs(vpgl_lvcs& lvcs);
--   vgl_point_3d<double> origin() const { return {local_orig_x_,local_orig_y_,local_orig_z_}; }
--   vgl_vector_3d<double> block_dim() const { return {block_dim_x_,block_dim_y_,block_dim_z_}; }
--   vgl_vector_3d<unsigned> block_nums() const { return {block_num_x_,block_num_y_,block_num_z_}; }
--   void paths(std::string& scene_path, std::string& block_pref) { scene_path=path_; block_pref=block_pref_; }
--   std::string app_model() const { return app_model_; }
--   bool multi_bin() const { return multi_bin_; }
--   void levels(unsigned& max, unsigned& init) { max = max_tree_level_; init=init_tree_level_; }
--   bool save_internal_nodes() const { return save_internal_nodes_; }
--   bool save_platform_independent() const { return save_platform_independent_; }
--   bool load_all_blocks() const { return load_all_blocks_; }
--   void tree_buffer_shape(int &num_buffers, int &buff_size) { num_buffers = num_buffers_init_; buff_size = size_buffer_init_; }
--   int max_mb() const { return max_mb_; }
--
--   float p_init() const { return p_init_; }
--
-- private:
--  void startElement(const XML_Char* name, const XML_Char** atts) override;
--  void endElement(const XML_Char* /*name*/) override {}
--  void charData(const XML_Char* /*s*/, int /*len*/) override {}
--
--  void init_params();
--
--  // temporary values
--  //lvcs
--  std::string lvcs_cs_name_;
--  double lvcs_origin_lon_;
--  double lvcs_origin_lat_;
--  double lvcs_origin_elev_;
--  double lvcs_lon_scale_;
--  double lvcs_lat_scale_;
--  std::string lvcs_XYZ_unit_;
--  std::string lvcs_geo_angle_unit_;
--  double lvcs_local_origin_x_;
--  double lvcs_local_origin_y_;
--  double lvcs_theta_;
--
--  // world origin
--  double local_orig_x_;
--  double local_orig_y_;
--  double local_orig_z_;
--
--  // block dimensions
--  double block_dim_x_;
--  double block_dim_y_;
--  double block_dim_z_;
--
--  // block numbers
--  unsigned block_num_x_;
--  unsigned block_num_y_;
--  unsigned block_num_z_;
--
--  std::string path_;
--  std::string block_pref_;
--  std::string app_model_;
--  bool multi_bin_;
--  unsigned max_tree_level_;
--  unsigned init_tree_level_;
--  bool save_internal_nodes_;
--  bool save_platform_independent_;
--  bool load_all_blocks_;
--  float p_init_;
--  int num_buffers_init_, size_buffer_init_;
--  int max_mb_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-deleted file mode 100644
-index 4c0cd29038..0000000000
---- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and bvxm_prodepends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--  set(boxm_pro_sources
--      boxm_processes.h
--      boxm_register.h   boxm_register.cxx
--     )
--
--  aux_source_directory(Templates boxm_pro_sources)
--  aux_source_directory(processes boxm_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_pro LIBRARY_SOURCES ${boxm_pro_sources})
--
--  target_link_libraries(boxm_pro boxm boxm_util boxm_sample_algo boxm_sample vpgl_pro imesh bprb brdb brip vsol bsta bsta_pro ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-deleted file mode 100644
-index fb055c2df5..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<float,3> vector;
--
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-deleted file mode 100644
-index ac40b5ec2d..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-deleted file mode 100644
-index 24334a0ce4..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <vnl/vnl_vector_fixed.h>
--
--typedef boct_tree<short,vnl_vector_fixed<float,3> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-deleted file mode 100644
-index 5de38b0662..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/boxm_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.h>
--BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx b/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
-deleted file mode 100644
-index d1cce77af7..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.h>
--#include <boct/boct_tree.h>
--#include <vnl/vnl_vector_fixed.h>
--
--typedef boct_tree<short,vnl_vector_fixed<float,3> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/pro/boxm_processes.h b/contrib/brl/bseg/boxm/pro/boxm_processes.h
-deleted file mode 100644
-index 4466447bb1..0000000000
---- a/contrib/brl/bseg/boxm/pro/boxm_processes.h
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#ifndef boxm_processes_h_
--#define boxm_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_load_scene_process);
--DECLARE_FUNC_CONS(boxm_create_scene_process);
--DECLARE_FUNC_CONS(boxm_construct_scene_from_image_process);
--DECLARE_FUNC_CONS(boxm_proj_local_cam_process);
--DECLARE_FUNC_CONS(boxm_camera_viewing_scene_process);
--DECLARE_FUNC_CONS(boxm_upload_mesh_process);
--DECLARE_FUNC_CONS(boxm_clean_scene_process);
--DECLARE_FUNC_CONS(boxm_force_write_blocks_process);
--#endif
-diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.cxx b/contrib/brl/bseg/boxm/pro/boxm_register.cxx
-deleted file mode 100644
-index 631b5beadc..0000000000
---- a/contrib/brl/bseg/boxm/pro/boxm_register.cxx
-+++ /dev/null
-@@ -1,27 +0,0 @@
--#include "boxm_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include <boxm/boxm_scene_base.h>
--
--#include "boxm_processes.h"
--
--void boxm_register::register_datatype()
--{
--  REGISTER_DATATYPE( boxm_scene_base_sptr );
--}
--
--void boxm_register::register_process()
--{
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_load_scene_process, "boxmLoadSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_create_scene_process, "boxmCreateSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_proj_local_cam_process,"boxmProjLocalCamProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_camera_viewing_scene_process,"boxmCameraViewingSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_construct_scene_from_image_process, "boxmConstructSceneFromImageProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_upload_mesh_process,"boxmUploadMeshProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_clean_scene_process,"boxmCleanSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_force_write_blocks_process,"boxmForceWriteBlocksProcess");
--
--}
-diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.h b/contrib/brl/bseg/boxm/pro/boxm_register.h
-deleted file mode 100644
-index 784df08bde..0000000000
---- a/contrib/brl/bseg/boxm/pro/boxm_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_register_h_
--#define boxm_register_h_
--
--class boxm_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_register_h_
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
-deleted file mode 100644
-index 799958429f..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
-+++ /dev/null
-@@ -1,131 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
--#include <string>
--#include <iostream>
--#include <cmath>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for generating cameras that view a scene
--//
--// \author J.L. Mundy
--// \date January 23, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vpgl/vpgl_perspective_camera.h>
--#include <bpgl/algo/bpgl_project.h>
--#include <vnl/vnl_math.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--//:global variables
--namespace boxm_camera_viewing_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//:sets input and output types
--bool boxm_camera_viewing_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_camera_viewing_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";// the scene
--  input_types_[1] = "vcl_string";//the camera type, e.g. perspective
--  input_types_[2] = "double";//camera elevation degrees
--  input_types_[3] = "double";//camera azimuth degrees
--  input_types_[4] = "double";//radius
--
--  input_types_[5] = "unsigned";//image ni
--  input_types_[6] = "unsigned";//image nj
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "vpgl_camera_double_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:creates a scene from parameters
--bool boxm_camera_viewing_scene_process(bprb_func_process& pro)
--{
--  if ( !pro.verify_inputs()) {
--    std::cout << pro.name() << "boxm_camera_viewing_scene_process: invalid inputs" << std::endl;
--    return false;
--  }
--  using namespace boxm_camera_viewing_scene_process_globals;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
--  std::cout<<"h";
--  if (!scene_ptr) return false;
--  std::cout<<"hi";
--  vgl_box_3d<double> bb =  scene_ptr->get_world_bbox();
--
--  std::string cam_type = pro.get_input<std::string>(1);
--  if (cam_type!="vpgl_perspective_camera")
--    return false; //later other camera types
--  auto elevation = pro.get_input<double>(2);
--  auto azimuth = pro.get_input<double>(3);
--  auto radius = pro.get_input<double>(4);
--
--  auto ni = pro.get_input<unsigned>(5);
--  auto nj = pro.get_input<unsigned>(6);
--  auto dni = static_cast<double>(ni), dnj = static_cast<double>(nj);
--  //
--  //find a camera that will project the scene bounding box
--  //entirely inside the image
--  //
--  // 1) determine the stare point (center of bounding box)
--  vgl_point_3d<double> cn = bb.centroid();
--  vgl_homg_point_3d<double> stpt(cn.x(), cn.y(), cn.z());
--
--  // 2) determine camera center
--  // the viewsphere radius is set to 10x the bounding box diameter
--  //double w = bb.width(), h = bb.height(), d = bb.depth();
--  double r = radius;//std::sqrt(w*w + h*h + d*d);
--  //r *=10;
--  double deg_to_rad = vnl_math::pi_over_180;
--  double el = elevation*deg_to_rad, az = azimuth*deg_to_rad;
--  double cx = r*std::sin(el)*std::cos(az);
--  double cy = r*std::sin(el)*std::sin(az);
--  double cz = r*std::cos(el);
--  vgl_point_3d<double> cent(cx+cn.x(), cy+cn.y(), cz);
--
--  // 3) start with a unit focal length and position the camera
--  vpgl_calibration_matrix<double> K(1.0, vgl_point_2d<double>(ni/2, nj/2));
--  vgl_rotation_3d<double> R;
--  auto* cam =
--    new vpgl_perspective_camera<double>(K, cent, R);
--
--  //stare at the center of the scene
--  vgl_vector_3d<double> up(0.0, 1.0, 0.0);
--  if (std::fabs(el)<1.0e-3)
--    cam->look_at(stpt, up);
--  else
--    cam->look_at(stpt);
--
--  //4) Adjust the focal length so that the box projects into the image
--  // project the bounding box
--  vgl_box_2d<double> image_bb = bpgl_project::project_bounding_box(*cam, bb);
--  // get 2-d box diameter and image diameter
--  double bw = image_bb.width(), bh = image_bb.height();
--  double bd = std::sqrt(bw*bw + bh*bh);
--  double id = std::sqrt(dni*dni + dnj*dnj);
--  //find the adjusted focal length
--  double f = id/bd;
--  K.set_focal_length(f);
--  cam->set_calibration(K);
--
--  std::cout<<"Camera  :" <<*cam<<std::endl;
--  pro.set_output_val<vpgl_camera_double_sptr>(0, cam);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
-deleted file mode 100644
-index 82051affab..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for removing any previously created scene data from disk
--//
--// \author Daniel Crispell
--// \date Feb 18, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene_parser.h>
--
--//:global variables
--namespace boxm_clean_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned int n_inputs_ = 1;
--  constexpr unsigned int n_outputs_ = 0;
--}
--
--//:sets input and output types
--bool boxm_clean_scene_process_cons(bprb_func_process& pro)
--{
--  //set output types
--  using namespace boxm_clean_scene_process_globals;
--  //process takes 1 input
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  return true;
--}
--
--//: removes data previously associated with scene
--bool boxm_clean_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_clean_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_clean_scene_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_clean_scene_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->clean_scene();
--      break;
--    }
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->clean_scene();
--      break;
--    }
--   case BOXM_APM_MOB_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->clean_scene();
--      break;
--    }
--   default:
--    std::cout << "boxm_clean_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
-deleted file mode 100644
-index 0129877c53..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
-+++ /dev/null
-@@ -1,219 +0,0 @@
--// This is brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to construct an ideal scene for testing
--//
--// \author J.L. Mundy
--// \date January 23, 2010
--// \verbatim
--//  Modifications
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/boxm_sample.h>
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <vgl/vgl_box_3d.h>
--
--namespace boxm_construct_scene_from_image_process_globals
--{
--  // The image area should be a multiple of area unit, e.g. 64.
--  // This granularity is useful for parallel implementation
--  template <class T>
--  void tree_from_image(vil_image_view<float> const& image,
--                       unsigned area_unit,
--                       unsigned& base_ni, unsigned& base_nj,
--                       boct_tree<short, T >*& tree)
--  {
--    tree = nullptr;
--    unsigned ni = image.ni(), nj = image.nj();
--    // find a square arrangement consistent with area unit
--    auto gsize = static_cast<double>(area_unit);
--    auto gwidth = static_cast<unsigned>(std::sqrt(gsize));
--    unsigned gheight = area_unit/gwidth;
--    if (gwidth*gheight!=gsize)
--      return;//maybe fixup later to handle all situations
--    unsigned mni = (ni/gwidth)*gwidth, mnj = (nj/gheight)*gheight;
--    double min_dim = mni;
--    if (mnj<min_dim)
--      min_dim = mnj;
--    double dlev = std::log(min_dim)/std::log(2.0);
--    auto n_levels = static_cast<unsigned>(dlev+1.0);
--
--    //note that tree is being constructed in local coordinates
--    float rni = 1.0f/static_cast<float>(mni), rnj =1.0f/static_cast<float>(mnj);
--    base_ni = mni; base_nj = mnj;
--    std::vector<boct_loc_code<short> > leaf_codes;
--    std::vector<float> image_int;
--    float upper_v=float(mnj-1)*rnj;
--    for (unsigned j=0; j<mnj; ++j)
--      for (unsigned i=0; i<mni; ++i)
--      {
--        float u = static_cast<float>(i)*rni;
--        float v = upper_v-static_cast<float>(j)*rnj;
--        vgl_point_3d<double> p(u, v, 0.0f);
--        boct_loc_code<short> loc(p, n_levels-1);
--        leaf_codes.push_back(loc);
--        image_int.push_back(image(i,j));
--      }
--    //construct leaves
--    std::vector<boct_tree_cell<short, T > > leaves;
--    for (auto & leaf_code : leaf_codes) {
--      boct_tree_cell<short, T > leaf(leaf_code);
--      leaves.push_back(leaf);
--    }
--
--    //construct tree from leaves
--    auto *init_tree =
--      new boct_tree<short, T >(n_levels, 0);
--    boct_tree_cell<short, T > *root =
--      init_tree->construct_tree(leaves, init_tree->number_levels());
--
--    // construct full tree with leaves and root
--    //set the global bounding box, assuming a box with depth ni
--    vgl_box_3d<double> box;
--    vgl_point_3d<double> p0(0,0,0);
--    vgl_point_3d<double> p1(mni, mnj, mni);
--    box.add(p0); box.add(p1);
--    tree = new boct_tree<short, T >(root, init_tree->number_levels());
--    tree->set_bbox(box);
--    delete init_tree;
--
--    // fill the leaves with data
--    std::vector<boct_tree_cell<short, T >* > tleaves;
--    tleaves = tree->leaf_cells();
--    std::size_t i = 0;
--    auto lit =
--      tleaves.begin();
--    for (; lit!= tleaves.end(); ++lit, ++i)
--    {
--      boct_loc_code<short> code = (*lit)->get_code();
--      bool found = false;
--      unsigned found_k = 0;
--      for (unsigned k = 0; k<leaf_codes.size()&&!found; ++k)
--        if (code == leaf_codes[k]) {
--          found = true;
--          found_k = k;
--        }
--      if (auto * cell_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >* >(*lit))
--      {
--        if (found) {
--          boxm_sample<BOXM_APM_SIMPLE_GREY> data(1.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(image_int[found_k],0.0008f));
--          cell_grey_ptr->set_data(data);
--        }
--        else {
--          boxm_sample<BOXM_APM_SIMPLE_GREY> data(0.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.0f,0.0008f));
--          cell_grey_ptr->set_data(data);
--        }
--      }
--      else if (auto * cell_mog_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> >* >(*lit))
--      {
--        if (found) {
--          boxm_sample<BOXM_APM_MOG_GREY> data(1.0f);
--          typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_processor aproc;
--          aproc::update(data.appearance(),image_int[found_k],1.0);
--          cell_mog_grey_ptr->set_data(data);
--        }
--        else {
--          boxm_sample<BOXM_APM_MOG_GREY> data(0.0f);
--          cell_mog_grey_ptr->set_data(data);
--        }
--      }
--      else if (auto * cell_float_ptr
--               =reinterpret_cast<boct_tree_cell<short, float >* >(*lit))
--      {
--        if (found) {
--          float data(1.0f);
--          cell_float_ptr->set_data(data);
--        }
--      }
--    }
--  }
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_construct_scene_from_image_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_construct_scene_from_image_process_globals;
--
--  //input[0]: The image view
--  //input[1]: appearance model type
--  //input[2]: scene directory
--  //input[3]: scene xml path
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--
--  //output[0]: The scene
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0]=  "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_construct_scene_from_image_process(bprb_func_process& pro)
--{
--  using namespace boxm_construct_scene_from_image_process_globals;
--
--  if ( !pro.verify_inputs()){
--    std::cerr << pro.name() << "boxm_construct_scene_from_image_process: invalid inputs\n";
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr image = pro.get_input<vil_image_view_base_sptr>(i++);
--  std::string app_type =  pro.get_input<std::string>(i++);
--  std::string scene_dir =  pro.get_input<std::string>(i++);
--  std::string xml_path =  pro.get_input<std::string>(i++);
--  if (image == nullptr) {
--    std::cerr << "boxm_construct_scene_from_image_process: null image value, cannot run\n";
--    return false;
--  }
--
--  vil_image_view<float> img = *vil_convert_cast(float(), image);
--  if (image->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
--    vil_math_scale_values(img,1.0/255.0);
--
--  unsigned base_ni =0, base_nj=0;
--  std::string block_prefix = "ideal";
--  boxm_scene_base_sptr scene_base = nullptr;
--  if (app_type == "simple_grey")
--  {
--    typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
--    boct_tree<short, data_type>* tree = nullptr;
--    tree_from_image<data_type>(img, 16, base_ni, base_nj,tree);
--    if (tree == nullptr) return false;
--    boxm_block<boct_tree<short, data_type> >* blk =
--      new boxm_block<boct_tree<short, data_type> >(tree->bounding_box(), tree);
--    vgl_box_3d<double> bb = blk->bounding_box();
--    vgl_point_3d<double> origin(0,0,0);
--    vgl_vector_3d<double> block_dim(bb.width(),bb.height(),bb.depth());
--    vgl_vector_3d<unsigned> world_dim(1,1,1);
--    auto* scene
-- = new boxm_scene<boct_tree<short, data_type> >(origin, block_dim, world_dim);
--    scene->set_appearance_model(BOXM_APM_SIMPLE_GREY);
--    scene->set_block(vgl_point_3d<int>(0,0,0), blk);
--    scene->set_path(scene_dir, block_prefix);
--    scene->write_scene(xml_path);
--    scene->write_active_block();
--    scene_base = scene;
--  }
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene_base);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
-deleted file mode 100644
-index d2abb94b67..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
-+++ /dev/null
-@@ -1,218 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for creating a new boxm_scene when there is not a saved one.
--//        It receives the parameters from a parameter file in XML
--//
--// \author Gamze Tunali
--// \date Apr 21, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_parser.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--//:global variables
--namespace boxm_create_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//:sets input and output types
--bool boxm_create_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:creates a scene from parameters
--bool boxm_create_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_process_globals;
--  std::string fname = pro.get_input<std::string>(0);
--
--  boxm_scene_parser parser;
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--  scene_ptr->load_scene(fname, parser);
--  std::cout << "Scene path: " << scene_ptr->filename()<< '\n'
--           << "Scene appearance: " <<scene_ptr->appearence_model()<< std::endl;
--
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--    else {
--      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      std::cout<<"Multi Bin set"<<std::endl;
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--    else {
--      std::cout<<"Multi Bin for BOXM_APM_MOB_GREY is not defined yet"<<std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--#if 0
--    else {
--      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_SIMPLE_GREY> > tree_type;
--      boxm_scene<tree_type>* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      std::cout<<"Multi Bin set"<<std::endl;
--      scene_ptr = scene;
--    }
--#endif
--  }
--  else if (scene_ptr->appearence_model() == BOXM_FLOAT) {
--      if (!scene_ptr->multi_bin())
--      {
--        typedef boct_tree<short,float> tree_type;
--        auto* scene = new boxm_scene<tree_type>();
--        scene->load_scene(fname);
--        scene_ptr = scene;
--        std::cout << "Scene path: " << scene->filename()<< std::endl;
--      }
--  }
--  else if (scene_ptr->appearence_model() == VNL_FLOAT_3) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,vnl_vector_fixed<float, 3> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      scene_ptr = scene;
--      std::cout << "Loading scene of type vnl_float_3" << '\n'
--               << "Scene path: " << scene->filename()<< std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == VNL_FLOAT_10) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,vnl_vector_fixed<float, 10> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      scene_ptr = scene;
--      std::cout << "Loading scene of type vnl_float_10" << '\n'
--               << "Scene path: " << scene->filename()<< std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_BOOL) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bool> tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      scene_ptr = scene;
--      std::cout << "Scene path: " << scene->filename()<< std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BSTA_MOG_F1) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BSTA_GAUSS_F1) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bsta_num_obs<bsta_gauss_sf1> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
--    typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
--    auto* scene = new boxm_scene<tree_type>();
--    scene->load_scene(parser);
--    scene_ptr = scene;
--  }
--  else {
--    std::cerr << "boxm_create_scene_process: undefined APM type\n";
--    return false;
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
-deleted file mode 100644
-index dba8e9687e..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for removing any previously created scene data from disk
--//
--// \author Daniel Crispell
--// \date Feb 18, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene_parser.h>
--
--//:global variables
--namespace boxm_force_write_blocks_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned int n_inputs_ = 1;
--  constexpr unsigned int n_outputs_ = 0;
--}
--
--//:sets input and output types
--bool boxm_force_write_blocks_process_cons(bprb_func_process& pro)
--{
--  //set output types
--  using namespace boxm_force_write_blocks_process_globals;
--  //process takes 1 input
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  return true;
--}
--
--//: removes data previously associated with scene
--bool boxm_force_write_blocks_process(bprb_func_process& pro)
--{
--  using namespace boxm_force_write_blocks_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_force_write_blocks_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_force_write_blocks_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->force_write_blocks();
--      break;
--    }
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->force_write_blocks();
--      break;
--    }
--   case BOXM_APM_MOB_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->force_write_blocks();
--      break;
--    }
--   default:
--    std::cout << "boxm_force_write_blocks_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
-deleted file mode 100644
-index 59808debc7..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
-+++ /dev/null
-@@ -1,73 +0,0 @@
--// This is brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date April 14, 2009
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--namespace boxm_load_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_load_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_load_scene_process_globals;
--
--  //process takes 1 input
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  // process has 1 output:
--  // output[0]: scene sptr
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_load_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_load_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  std::string scene_file = pro.get_input<std::string>(i++);
--
--  boxm_scene_base_sptr scene= new boxm_scene_base();
--  boxm_scene_parser parser;
--  scene->load_scene(scene_file, parser);
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--    auto *s = new boxm_scene<tree_type>();
--    s->load_scene(parser);
--   // scene.unref(scene);
--    scene = s;
--  } else {
--    std::cout << "boxm_load_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  // store scene smaprt pointer
--  pro.set_output_val<boxm_scene_base_sptr>(j++, scene);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
-deleted file mode 100644
-index b250a33a61..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
-+++ /dev/null
-@@ -1,103 +0,0 @@
--// This is brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for clipping and image based on a 3D bounding box.
--//        -  Input:
--//             - Image path (string)
--//             - boxm_voxel_world_sptr
--//
--//        -  Output:
--//             - modified rational camera "vpgl_camera_double_sptr"
--//             - clipped image area (NITF) "vil_image_view_base_sptr"
--//
--//        -  Params:
--//             -geographic uncertainty (error) in meters
--//
--// \author  Gamze D. Tunali
--// \date    Feb 19, 2008
--// \verbatim
--//  Modifications
--//   Brandon Mayer - Jan 28, 2009 - converted process-class to function to conform with new boxm_process architecture.
--// \endverbatim
--
--
--#include <brip/brip_roi.h>
--
--//#include <vil/file_formats/vil_nitf2_image.h> // unused?
--//#include <vil/vil_image_view_base.h> // unused?
--#include <vpgl/vpgl_local_rational_camera.h>
--
--#include <bprb/bprb_parameters.h>
--
--//: globals variables and functions
--namespace boxm_proj_local_cam_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--//: set input and output types
--// this process takes 4 inputs:
--// the camera and the (x,y,z) input coordinates
--// this process takes 2 outputs:
--// the (u,v) output coordinates
--bool boxm_proj_local_cam_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_proj_local_cam_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned  i=0;
--  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
--  input_types_[i++] = "float";   // x
--  input_types_[i++] = "float";   // y
--  input_types_[i++] = "float";   // z
--
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j=0;
--  output_types_[j++] = "float"; // u
--  output_types_[j++] = "float"; // v
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--bool boxm_proj_local_cam_process(bprb_func_process& pro)
--{
--  using namespace boxm_proj_local_cam_process_globals;
--  //static const parameters
--  static const std::string error = "error";
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs:
--  unsigned i = 0;
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  float X=0.0,Y=0.0,Z=0.0;
--  //voxel_world
--  X = pro.get_input<float>(i++);
--  Y = pro.get_input<float>(i++);
--  Z = pro.get_input<float>(i++);
--
--  auto* rat_camera =
--    dynamic_cast<vpgl_local_rational_camera<double>*> (camera.as_pointer());
--  if (!rat_camera) {
--    std::cerr << "The camera input is not a rational camera\n";
--    return false;
--  }
--
--  double u=0,v=0;
--  rat_camera->project((double)X,(double)Y,(double)Z,u,v);
--  //Store outputs
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<float>(j++, float(u));
--  pro.set_output_val<float>(j++, float(v));
--
--  std::cout<<"(u,v):"<<u<<','<<v<<std::endl;
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
-deleted file mode 100644
-index 0488a2cbdb..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
-+++ /dev/null
-@@ -1,148 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
--#include <string>
--#include <iostream>
--#include <sstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for populating the octree with meshes.
--//         Meshes are in ply format and the grid will be filled with 0's at the faces
--//         of the meshes.
--// \author Gamze D. Tunali
--// \date   July 14, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_parameters.h>
--
--#include <boxm/boxm_apm_traits.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/algo/boxm_upload_mesh.h>
--#include <boxm/algo/boxm_fill_in_mesh.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree.h>
--#include <vul/vul_file_iterator.h>
--#include <vul/vul_file.h>
--#include <vul/vul_string.h>
--
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_fileio.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--namespace boxm_upload_mesh_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//: set input and output types
--bool boxm_upload_mesh_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_upload_mesh_process_globals;
--
--  // process takes 4 inputs and no output
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i=0;
--  input_types_[i++]="vcl_string";           //the directory for ply files
--  input_types_[i++]="boxm_scene_base_sptr"; //scene to be uploaded
--  input_types_[i++]="bool";                 //true, if mesh vertices are in geo coordinates
--  input_types_[i++]="vcl_string";                 //true, if mesh vertices are in geo coordinates
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: Execute the process
--bool boxm_upload_mesh_process(bprb_func_process& pro)
--{
--  using namespace boxm_upload_mesh_process_globals;
--  // check number of inputs
--  if (pro.input_types().size() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  unsigned i=0;
--  std::string input_path = pro.get_input<std::string>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  bool use_lvcs = pro.get_input<bool>(i++);
--  std::string draw_or_fill = pro.get_input<std::string>(i++);
--
--  if (!vul_file::is_directory(input_path)) {
--    std::cerr << "In boxm_upload_mesh_process -- input path " << input_path<< "is not valid!\n";
--    return false;
--  }
--
--  // get all the files in the directory
--  std::stringstream glob;
--  glob << input_path << "/*.ply*";
--
--  std::vector<imesh_mesh> meshes;
--  for (vul_file_iterator file_it = glob.str().c_str(); file_it; ++file_it)
--  {
--    std::string file(file_it());
--    std::string file_format = vul_file::extension(file);
--    vul_string_upcase(file_format);
--
--
--    std::cout << "format = " << file_format << '\n'
--             << "file = " << file << '\n';
--    // call appropriate load functions to load the M
--    imesh_mesh mesh;
--    if (file_format == ".PLY")
--      imesh_read(file, mesh);
--    else if (file_format == ".PLY2")
--      imesh_read_ply2(file, mesh);
--
--    meshes.push_back(mesh);
--  }
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--
--      boxm_sample<BOXM_APM_MOG_GREY> val(0,boxm_utils::obtain_mog_grey_unit_mode());
--      if (draw_or_fill=="draw")
--        std::cout<<"Not yet";
--        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
--      else if (draw_or_fill=="fill")
--        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, meshes, use_lvcs, val);
--    }
--    else
--      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
--  }
--  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_simple_grey simplegrey(1.0f,0.1f,1.0f);
--      boxm_sample<BOXM_APM_SIMPLE_GREY> val(1,simplegrey);
--      if (draw_or_fill=="draw")
--        std::cout<<"Not yet";
--        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
--      else if (draw_or_fill=="fill")
--        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, meshes, use_lvcs, val);
--    }
--    else
--      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
--  }
--  else {
--    std::cout << "boxm_upload_mesh_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index f37ad237ce..0000000000
---- a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_pro_test_include test_include.cxx )
--target_link_libraries( boxm_pro_test_include boxm_pro)
-diff --git a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
-deleted file mode 100644
-index 7a3d47df60..0000000000
---- a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/pro/boxm_processes.h>
--#include <boxm/pro/boxm_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/sample/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/CMakeLists.txt
-deleted file mode 100644
-index 42618cc7ca..0000000000
---- a/contrib/brl/bseg/boxm/sample/CMakeLists.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--# brl/bseg/boxm/sample/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_sample_sources
--    boxm_edge_sample.h                        boxm_edge_sample.hxx
--    boxm_edge_tangent_sample.h                boxm_edge_tangent_sample.hxx
--    boxm_inf_line_sample.h                    boxm_inf_line_sample.hxx
--    boxm_opt2_sample.h                        boxm_opt2_sample.hxx
--    boxm_opt3_sample.h                        boxm_opt3_sample.hxx
--    boxm_plane_obs.h                          boxm_plane_obs.hxx
--    boxm_rt_sample.h                          boxm_rt_sample.hxx
--    boxm_sample.h                             boxm_sample.hxx
--    boxm_sample_multi_bin.h                   boxm_sample_multi_bin.hxx
--    boxm_scalar_sample.h                      boxm_scalar_sample.hxx
--    boxm_vis_implicit_sample.h
--    boxm_update_sample.h
--    dummy.cxx
--   )
--
--aux_source_directory(Templates boxm_sample_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_sample LIBRARY_SOURCES ${boxm_sample_sources})
--target_link_libraries(boxm_sample boxm ${VXL_LIB_PREFIX}vgl_io bsta ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--#processors for the samples
--add_subdirectory(algo)
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index a08cc93e31..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_edge_sample<float>);
--BOCT_TREE_INSTANTIATE(short,boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index 130866a26d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
--BOCT_TREE_INSTANTIATE(short,boxm_inf_line_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 8d3ee3d65a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index ca506845c1..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index c1d7480b1c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOB_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 5eaa3da056..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--// tree with alpha and appearance combined
--BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOG_GREY>);
--
--// tree with appearance
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_INSTANTIATE(short, apm_datatype);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-deleted file mode 100644
-index ef07d67c7a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_SIMPLE_GREY>);
--
--// tree with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_INSTANTIATE(short, apm_datatype);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index b45fc2a401..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--BOCT_TREE_INSTANTIATE(short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 7c93436b6a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_scalar_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index 8c4d0a0f82..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_sample<float>);
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index 55b487a7aa..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_inf_line_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 39216280e0..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 3d0b6e71a5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index 9a5432b934..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mob_grey );
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 58cc1cfacf..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_CELL_INSTANTIATE(short,apm_datatype );
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-deleted file mode 100644
-index 28198f869f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_SIMPLE_GREY> boxm_sample_simple_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_simple_grey );
--
--// tree with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_CELL_INSTANTIATE(short, apm_datatype);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 1b9ee1e0de..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample_multi_bin.h"
--
--typedef boxm_sample_multi_bin<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 78c61bf35e..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_scalar_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index 13ae4934e9..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boxm_edge_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
--
--typedef boxm_aux_edge_sample<float> aux_sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index 3744b8ee6f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--
--typedef boxm_edge_tangent_sample<float> aux_sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
-deleted file mode 100644
-index 08ad36f2ea..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boxm_inf_line_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 18262443a5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--typedef boxm_opt2_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 1784facefe..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--
--typedef boxm_rt_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index 83cf840aa8..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mob_grey);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 68c063579f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mog_grey);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 81c19507f9..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--typedef boxm_scalar_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
-deleted file mode 100644
-index 5e771c97e2..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_edge_sample<float>,boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index a73d09d6f5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_inf_line_sample<float>,boxm_edge_tangent_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index c134345620..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index b8aa7777ee..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 918a3be765..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
-deleted file mode 100644
-index 70bf413567..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 6a0f7d745c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 03014e67ab..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 1b75036c3b..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_scalar_sample<float>);
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_scalar_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
-deleted file mode 100644
-index a27805ad73..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index dc6a48e38b..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,float,boxm_edge_tangent_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index c814f6a8fe..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boct_tree<short,boxm_edge_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
--BOXM_BLOCK_INSTANTIATE(aux_tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index 802a8ca615..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--
--typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
-deleted file mode 100644
-index 9ef6e210dd..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
-deleted file mode 100644
-index dc6e57af68..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--typedef boct_tree<short,boxm_opt2_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
-deleted file mode 100644
-index ef11cd85a7..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--typedef boct_tree<short,boxm_rt_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index 647e553d5e..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index b5e4f8cce0..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--
--BOXM_BLOCK_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index 5a2482adbc..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
--
--// block with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_BLOCK_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 6e13f9977a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
-deleted file mode 100644
-index 0348b21996..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--typedef boct_tree<short,boxm_scalar_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index 0b79668c5f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_edge_sample<float> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boct_tree<short,boxm_aux_edge_sample<float> >  aux_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index ea335e591d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_edge_tangent_sample<float> >  aux_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
--
--typedef boct_tree<short,boxm_inf_line_sample<float> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index 7c96bfeeee..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 052fa82c04..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index a9d55be913..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--// block iterator with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 25f9ca6e61..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
-deleted file mode 100644
-index d68f374c40..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/sample/boxm_edge_sample.hxx>
--
--BOXM_EDGE_SAMPLE_INSTANTIATE(float);
--BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
-deleted file mode 100644
-index a00d2268b5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_edge_tangent_sample.hxx>
--
--BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
-deleted file mode 100644
-index f957308804..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_inf_line_sample.hxx>
--
--BOXM_INF_LINE_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
-deleted file mode 100644
-index 66ceeacd2d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/sample/boxm_opt2_sample.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT2_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
-deleted file mode 100644
-index c6e45bdcca..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_plane_obs.hxx>
--
--BOXM_PLANE_OBS_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
-deleted file mode 100644
-index 1fc6db3c56..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_rt_sample.hxx>
--
--BOXM_RT_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
-deleted file mode 100644
-index 4ee2f52816..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_beta.h>
--
--BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOB_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index d1054422d9..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <bsta/io/bsta_io_mixture.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--
--BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
-deleted file mode 100644
-index e3c225ae4d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.hxx>
--
--BOXM_SAMPLE_INSTANTIATE(BOXM_APM_SIMPLE_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index 4e2b56c696..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.hxx>
--
--BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
-deleted file mode 100644
-index a9552e4b00..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/sample/boxm_scalar_sample.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_SCALAR_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index 4fd83d2d66..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boct_tree<short,boxm_edge_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
--
--typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
--BOXM_SCENE_INSTANTIATE(aux_tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index 882f421e87..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boct_tree<short,boxm_edge_tangent_sample<float> > aux_tree;
--BOXM_SCENE_INSTANTIATE(aux_tree);
--
--typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
-deleted file mode 100644
-index dfec334150..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--typedef boct_tree<short,boxm_opt2_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
-deleted file mode 100644
-index cd3c475545..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--typedef boct_tree<short,boxm_rt_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index db72e7c8ea..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 6d21678187..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_SCENE_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index 52e5afb01c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
--
--// scene with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_SCENE_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 262d6e4f89..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
-deleted file mode 100644
-index 4a2c0c7437..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--typedef boct_tree<short,boxm_scalar_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
-deleted file mode 100644
-index b727cb7d12..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,int > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
-deleted file mode 100644
-index fc06a01419..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--typedef boct_tree<short, boxm_aux_edge_sample<float> > aux_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
-deleted file mode 100644
-index 0b4f55a413..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_edge_tangent_sample<float> > aux_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
--
--typedef boct_tree<short, boxm_inf_line_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
-deleted file mode 100644
-index 1372664c8c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_opt2_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
-deleted file mode 100644
-index 5409ed1d26..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_rt_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
-deleted file mode 100644
-index 3508b23e74..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
-deleted file mode 100644
-index 9676fc11a4..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
-deleted file mode 100644
-index e8c9902c7e..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--// scene with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
-deleted file mode 100644
-index 4cadf24760..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
-deleted file mode 100644
-index f013383f50..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
-deleted file mode 100644
-index 116b748109..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <vil/vil_image_view.hxx>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boxm_inf_line_sample<float> sample;
--VIL_IMAGE_VIEW_INSTANTIATE(sample);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
-deleted file mode 100644
-index c758e9f2a4..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
-+++ /dev/null
-@@ -1,18 +0,0 @@
--# brl/bseg/boxm/util/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_sample_algo_sources
--    boxm_mob_grey_processor.h        boxm_mob_grey_processor.cxx
--    boxm_mog_grey_processor.h        boxm_mog_grey_processor.cxx
--    boxm_simple_grey_processor.h     boxm_simple_grey_processor.cxx
--    boxm_sigma_normalizer.h          boxm_sigma_normalizer.cxx
--   )
--
--aux_source_directory(Templates boxm_sample_algo_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_sample_algo LIBRARY_SOURCES ${boxm_sample_algo_sources})
--
--target_link_libraries(boxm_sample_algo boxm_sample boxm boxm_util bsta bsta_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vbl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 994d8628d9..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 10fc203f38..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index b5be45d2b1..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boxm_opt3_sample<BOXM_APM_MOG_GREY> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 0772000b0d..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 00af986d6d..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index b4aef87f19..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index c67fd5c479..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_opt3_sample.hxx>
--
--BOXM_OPT3_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index e0c8931986..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
-deleted file mode 100644
-index 0bf4864b81..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boct_tree<short, boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
-deleted file mode 100644
-index e93ea9b17a..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#include "boxm_mob_grey_processor.h"
--//:
--// \file
--#include <bsta/algo/bsta_beta_updater.h>
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_beta.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_beta_f1.h>
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: Expected value
--boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype
--boxm_mob_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype const& appear)
--{
--  float total_weight= 0;
--  obs_datatype c = 0;
--  obs_datatype expected = 0;
--
--  //should be components used
--  for (unsigned i = 0; i< appear.num_components(); ++i)
--  {
--    total_weight += appear.weight(i);
--    c += appear.distribution(i).mean() * appear.weight(i);
--  }
--  if (total_weight > 0.0f) {
--    expected = c/total_weight;
--  }
--
--  return expected;
--}
--//: Return probability density of observing pixel values
--float boxm_mob_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
--{
--  if (appear.num_components() ==0) {
--    return 1.00f;
--  }
--  else {
--    return appear.prob_density(obs);
--  }
--}
--
--//: Update with a new sample image
--bool boxm_mob_grey_processor::update( apm_datatype &appear,
--                                      obs_datatype const& obs,
--                                      float const& weight)
--{
--  // the model
--  float init_variance = 0.008f;
--  float g_thresh = 0.025f; // number of std devs from mean sample must be
--
--  //float t_l_u = float(std::sqrt(1-4*init_variance)*0.5);
--  //float lower = 0.5f-t_l_u;
--  //float upper = 0.5f+t_l_u;
--
--  obs_datatype val = obs;
--  //if (obs < lower)
--  //  val = lower+0.000001f;
--  //else if (obs > upper)
--  //  val = upper-0.000001f;
--
--  float alpha, beta;
--  bsta_beta<float>::bsta_beta_from_moments(val, init_variance,alpha,beta);
--  bsta_beta_f1 this_beta(alpha,beta);
--
--  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOB_GREY>::n_beta_modes_;
--
--  typedef bsta_num_obs<bsta_beta_f1> beta_type;
--  typedef bsta_mixture_fixed<beta_type, nmodes> mix_beta;
--
--  // the updater
--  bsta_mix_beta_updater<mix_beta> updater(this_beta, g_thresh, init_variance, nmodes );
--
--  if (weight > 0) {
--    updater(appear, obs);
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
-deleted file mode 100644
-index 8c6c4b46d8..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--// This is brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
--#ifndef boxm_mob_grey_processor_h_
--#define boxm_mob_grey_processor_h_
--//:
--// \file
--// \brief A class for a grey-scale-mixture-of-beta processor
--//
--// \author Gamze Tunali
--// \date   Nov 24, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <boxm/boxm_apm_traits.h>
--
--
--class  boxm_mob_grey_processor
--{
-- protected:
--  // convenience typedefs
--  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype apm_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype obs_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_mathtype obs_mathtype;
--
-- public:
--  static obs_datatype expected_color(apm_datatype const& appear);
--  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
--  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
--};
--
--#endif // boxm_mob_grey_processor_h_
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
-deleted file mode 100644
-index 7c7e011b07..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
-+++ /dev/null
-@@ -1,286 +0,0 @@
--#include "boxm_mog_grey_processor.h"
--//:
--// \file
--#include <bsta/algo/bsta_adaptive_updater.h>
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gaussian_indep.h>
--#include <bsta/algo/bsta_fit_gaussian.h>
--
--#include <vnl/vnl_random.h>
--
--#include "boxm_sigma_normalizer.h"
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: Expected value
--boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
--boxm_mog_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear)
--{
--  float total_weight= 0;
--  obs_datatype c = 0;
--  obs_datatype expected = 0;
--
--  //should be components used
--  for (unsigned i = 0; i< appear.num_components(); ++i)
--  {
--    total_weight += appear.weight(i);
--    c += appear.distribution(i).mean() * appear.weight(i);
--  }
--  if (total_weight > 0.0f) {
--    expected = c/total_weight;
--  }
--
--  return expected;
--}
--
--//: Return a random sample from the appearance distribution
--boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
--boxm_mog_grey_processor::sample(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear, vnl_random &rand_gen)
--{
--  return appear.sample(rand_gen);
--}
--
--
--//: Return probability density of observing pixel values
--float boxm_mog_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
--{
--  if (appear.num_components() ==0) {
--    return 1.00f;
--  }
--  else {
--    return appear.prob_density(obs);
--  }
--}
--
--//: Update with a new sample image
--bool boxm_mog_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& weight)
--{
--  // the model
--  float init_variance = 0.008f;
--  float min_stddev = 0.030f; //TO UNDERSTAND: changed from 0.02 for dinoRing dataset -dec
--  float g_thresh = 2.5; // number of std devs from mean sample must be
--  bsta_gauss_sf1 this_gauss(0.0f, init_variance);
--
--  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef bsta_mixture_fixed<gauss_type, nmodes> mix_gauss;
--
--  // the updater
--  bsta_mg_grimson_weighted_updater<mix_gauss> updater(this_gauss, nmodes ,g_thresh,min_stddev);
--
--  if (weight > 0) {
--    updater(appear, obs, weight);
--  }
--
--  return true;
--}
--
--void boxm_mog_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
--{
--  std::vector<float> pre(obs.size(),0.0f);
--  compute_appearance(obs,pre,obs_weights,model,min_sigma);
--  return;
--}
--
--void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
--{
--  std::vector<float> pre(obs.size(),0.0f);
--  compute_appearance(obs,pre,obs_weights,model,min_sigma);
--  return;
--}
--
--void boxm_mog_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs,
--                                                  std::vector<float> const&  /*obs_weights*/, // FIXME - unused
--                                                  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model,
--                                                  float min_sigma)
--{
--  static const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
--  const auto nobs = (unsigned int)obs.size();
--  const float min_var = min_sigma*min_sigma;
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--  const float big_var = big_sigma * big_sigma;
--
--  static boxm_sigma_normalizer sigma_norm(0.1f);
--  for (unsigned int m=0; m<nmodes; ++m) {
--    //float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
--    float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
--
--    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
--    float mode_var = model.distribution(m).var();
--    mode_var *= (unbias_factor*unbias_factor);
--
--    // make sure variance does not get too big
--    if (!(mode_var < big_var)) {
--      mode_var = big_var;
--    }
--    // or too small
--    if (!(mode_var > min_var)) {
--      mode_var = min_var;
--    }
--    model.distribution(m).set_var(mode_var);
--  }
--  return;
--}
--
--void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
--{
--  static const unsigned int max_nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
--  const float min_var = min_sigma*min_sigma;
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--  const float big_var = big_sigma * big_sigma;
--
--  auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  if (nobs == 1) {
--    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
--    bsta_gauss_sf1 mode(obs[0], big_sigma*big_sigma);
--    model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), 1.0f);
--    return;
--  }
--
--  unsigned int nmodes = model.num_components();
--
--  if (nmodes == 0) {
--    // if initial model is "blank", create an arbitrary starting point for the optimization with max number of modes
--    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
--    nmodes = max_nmodes;
--    // no need for model to have more modes than observations
--    if (nobs < nmodes) {
--      nmodes = nobs;
--    }
--    // initialize parameters
--    for (unsigned int m=0; m<nmodes; ++m) {
--      float mean = (float(m) + 0.5f) / float(nmodes);
--      float sigma = 0.3f;
--      float mode_weight = 1.0f / float(nmodes);
--      bsta_gauss_sf1 mode(mean, sigma*sigma);
--      model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), mode_weight);
--    }
--  }
--
--  std::vector<std::vector<float> > mode_probs(nobs);
--  for (unsigned int n=0; n<nobs; ++n) {
--    for (unsigned int m=0; m<nmodes; ++m) {
--      mode_probs[n].push_back(0.0f);
--    }
--  }
--  std::vector<float> mode_weight_sum(nmodes,0.0f);
--
--  // run EM algorithm to maximize expected probability of observations
--  constexpr unsigned int max_its = 50;
--  const float max_converged_weight_change = 1e-3f;
--
--  for (unsigned int i=0; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION
--    for (unsigned int n=0; n<nobs; ++n) {
--      // for each observation, assign probabilities to each mode of appearance model (and to a "previous cell")
--      float total_prob = 0.0f;
--      std::vector<float> new_mode_probs(nmodes);
--      for (unsigned int m=0; m<nmodes; ++m) {
--        // compute probability that nth data point was produced by mth mode
--        const float new_mode_prob = vis[n] * model.distribution(m).prob_density(obs[n]) * model.weight(m);
--        new_mode_probs[m] = new_mode_prob;
--        total_prob += new_mode_prob;
--      }
--      // compute the probability the observation came from an occluding cell
--      const float prev_prob = pre[n];
--      total_prob += prev_prob;
--      if (total_prob > 1e-6) {
--        for (unsigned int m=0; m<nmodes; ++m) {
--          new_mode_probs[m] /= total_prob;
--          const float weight_change = std::fabs(new_mode_probs[m] - mode_probs[n][m]);
--          if (weight_change > max_weight_change) {
--            max_weight_change = weight_change;
--          }
--          mode_probs[n][m] = new_mode_probs[m];
--        }
--      }
--    }
--    // check for convergence
--    if (max_weight_change < max_converged_weight_change) {
--      break;
--    }
--    // MAXIMIZATION
--    // computed the weighted means and variances for each mode based on the probabilities
--    float total_weight_sum = 0.0f;
--
--    // update the mode parameters
--    for (unsigned int m=0; m<nmodes; ++m) {
--      mode_weight_sum[m] = 0.0f;
--      std::vector<float> obs_weights(nobs);
--      for (unsigned int n=0; n<nobs; ++n) {
--        obs_weights[n] = mode_probs[n][m];
--        mode_weight_sum[m] += obs_weights[n];
--      }
--      total_weight_sum += mode_weight_sum[m];
--      float mode_mean(0.5f);
--      float mode_var(1.0f);
--      bsta_gauss_sf1 single_gauss(mode_mean,mode_var);
--      bsta_fit_gaussian(obs, obs_weights, single_gauss);
--      mode_mean = single_gauss.mean();
--      mode_var = single_gauss.var();
--
--      // unbias variance based on number of observations
--      //float unbias_factor = sigma_norm_factor(mode_weight_sum[m]);
--      // mode_var *= (unbias_factor*unbias_factor);
--
--      // make sure variance does not get too big
--      if (!(mode_var < big_var)) {
--        mode_var = big_var;
--      }
--      // or too small
--      if (!(mode_var > min_var)) {
--        mode_var = min_var;
--      }
--
--      // update mode parameters
--      model.distribution(m).set_mean(mode_mean);
--      model.distribution(m).set_var(mode_var);
--    }
--    // update mode probabilities
--    if (total_weight_sum > 1e-6) {
--      for (unsigned int m=0; m<nmodes; ++m) {
--        const float mode_weight = mode_weight_sum[m] / total_weight_sum;
--        // update mode weight
--        model.set_weight(m, mode_weight);
--      }
--    }
--  }
--
--  // unbias variance based on number of observations
--  static const boxm_sigma_normalizer sigma_norm(0.20f);
--  for (unsigned int m=0; m<nmodes; ++m) {
--    float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
--    //float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
--    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
--
--    float mode_var = model.distribution(m).var();
--    mode_var *= (unbias_factor*unbias_factor);
--
--    // make sure variance does not get too big
--    if (!(mode_var < big_var)) {
--      mode_var = big_var;
--    }
--    // or too small
--    if (!(mode_var > min_var)) {
--      mode_var = min_var;
--    }
--    model.distribution(m).set_var(mode_var);
--  }
--
--  // sort the modes based on weight
--  model.sort();
--
--  return;
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
-deleted file mode 100644
-index b4d64bc6ad..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
-+++ /dev/null
-@@ -1,50 +0,0 @@
--// This is brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
--#ifndef boxm_mog_grey_processor_h_
--#define boxm_mog_grey_processor_h_
--//:
--// \file
--// \brief A class for a grey-scale-mixture-of-gaussian processor
--//
--// \author Gamze Tunali
--// \date   Apr 03, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bsta/algo/bsta_adaptive_updater.h>
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gaussian_indep.h>
--
--#include <vnl/vnl_random.h>
--
--#include <boxm/boxm_apm_traits.h>
--
--
--class  boxm_mog_grey_processor
--{
-- protected:
--  // convienance typedefs
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype obs_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype obs_mathtype;
--
-- public:
--  static obs_datatype expected_color(apm_datatype const& appear);
--
--  static obs_datatype sample(apm_datatype const& appear, vnl_random &rand_gen);
--
--  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
--
--  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
--
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--};
--
--#endif // boxm_mog_grey_processor_h_
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
-deleted file mode 100644
-index b88fd5c03d..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
-+++ /dev/null
-@@ -1,104 +0,0 @@
--#include <iostream>
--#include "boxm_sigma_normalizer.h"
--//:
--// \file
--// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_gamma.h>
--#include <vnl/vnl_least_squares_function.h>
--#include <vnl/algo/vnl_levenberg_marquardt.h>
--
--boxm_sigma_normalizer::boxm_sigma_normalizer(float under_estimation_probability) : unbias_const_(N_PRECOMPUTED_+1, 0.0f)
--{
--  class gammainc_error_fn : public vnl_least_squares_function
--  {
--   public:
--    gammainc_error_fn(unsigned int ndof, float under_estimation_prob) : vnl_least_squares_function(1,1,no_gradient), ndof_(ndof), p_(under_estimation_prob) {}
--
--    void f(vnl_vector<double> const& x, vnl_vector<double>& fx) override
--    {
--      // don't allow x to become negative
--      if (x[0] < 0.0f) {
--        fx[0] = x[0] - p_; // so error function is c0 continuous at x=0
--        return;
--      }
--      double cdf_prob = vnl_cum_prob_chi2(ndof_, x[0]);
--      fx[0] = cdf_prob - p_;
--      return;
--    }
--   private:
--    unsigned int ndof_;
--    float p_;
--  };
--
--  // sanity check on probability
--  if (under_estimation_probability < 1e-4) {
--    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too low" << std::endl;
--    return;
--  }
--  if (under_estimation_probability > (1 - 1e-4)) {
--    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too high" << std::endl;
--    return;
--  }
--
--  // populate array of normalization factors for easy lookup
--  vnl_vector_fixed<double,1> x(1.0);
--
--  for (unsigned int n=2; n<= N_PRECOMPUTED_; ++n) {
--    gammainc_error_fn f(n-1, under_estimation_probability);
--    vnl_levenberg_marquardt minimizer(f);
--    minimizer.set_f_tolerance(1e-8);
--    minimizer.set_x_tolerance(1e-8);
--
--    minimizer.minimize(x);
--    //minimizer.diagnose_outcome();
--    double end_error = minimizer.get_end_error();
--    if (end_error > 1e-3) {
--      std::cerr << "error: boxm_sigma_normalizer: levenberg_marquardt final error = " << end_error << '\n';
--    }
--    auto unbias_constant = (float)std::sqrt((float)(n-1) / x[0]);
--
--    unbias_const_[n] = unbias_constant;
--  }
--  // sigma is undefined for samples sizes of 0 and 1, but we can linearly interpolate to get values anyway
--  unbias_const_[1] = unbias_const_[2] - (unbias_const_[3] - unbias_const_[2]);
--  unbias_const_[0] = unbias_const_[1] - (unbias_const_[2] - unbias_const_[1]);
--}
--
--
--float boxm_sigma_normalizer::normalization_factor(float number_of_observations) const
--{
--  if (number_of_observations <= 1.0f) {
--    return normalization_factor_int((unsigned int)1);
--  }
--
--  // linearly interpolate between integer values
--  float nobs_floor = std::floor(number_of_observations);
--  float nobs_ceil = std::ceil(number_of_observations);
--  float floor_weight = nobs_ceil - number_of_observations;
--  float norm_factor = (normalization_factor_int((unsigned int)nobs_floor) * floor_weight) + (normalization_factor_int((unsigned int)nobs_ceil) * (1.0f - floor_weight));
--
--  return norm_factor;
--}
--
--
--float boxm_sigma_normalizer::normalization_factor_int(unsigned int number_of_observations) const
--{
--  if (number_of_observations < 2) {
--    return unbias_const_[1];
--  }
--
--  if (number_of_observations <= N_PRECOMPUTED_) {
--    return unbias_const_[number_of_observations];
--  }
--  // else nobs >= N_PRECOMPUTED_
--  // approximate for big n with function a = m /nobs + b
--  static const float m = (unbias_const_[N_PRECOMPUTED_] - unbias_const_[N_PRECOMPUTED_ - 5])/(1.0f/N_PRECOMPUTED_ - 1.0f/(N_PRECOMPUTED_ - 5));
--  static const float b = unbias_const_[N_PRECOMPUTED_]  - m*(1.0f/N_PRECOMPUTED_);
--  return m/number_of_observations + b;
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
-deleted file mode 100644
-index aafb71a2c2..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// this is brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
--#ifndef boxm_sigma_normalizer_h_
--#define boxm_sigma_normalizer_h_
--//:
--// \file
--// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
--//
--// \author Daniel Crispell
--// \date   Feb. 18, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class boxm_sigma_normalizer
--{
-- public:
--  //: create a sigma_normalizer object.
--  boxm_sigma_normalizer(float under_estimation_probability);
--
--  //: compute the normalization factor for a sample distribution computing with N observations
--  // \a sigma_norm = sample_sigma * normalization_factor(N);
--  float normalization_factor(float number_of_observations) const;
--
--  //: compute the normalization factor for a sample distribution computed with N observations
--  // \a sigma_norm = sample_sigma * normalization_factor(N);
--  float normalization_factor_int(unsigned int number_of_observations) const;
--
-- private:
--  // do not allow default constructor - under-estimation param is necessary
--  boxm_sigma_normalizer()= default;
--
--  static const unsigned int N_PRECOMPUTED_ = 40;
--  std::vector<float> unbias_const_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
-deleted file mode 100644
-index b1d9e4639b..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
-+++ /dev/null
-@@ -1,437 +0,0 @@
--#include "boxm_simple_grey_processor.h"
--//:
--// \file
--
--#include <vnl/vnl_erf.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/algo/bsta_fit_gaussian.h>
--
--#include "boxm_sigma_normalizer.h"
--
--//const float boxm_simple_grey_processor::one_over_sigma_ = 25.0f;
--const static bool USE_UNIFORM_COMPONENT = false;
--
--//: Return probability density of observing pixel values
--float boxm_simple_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
--{
--  const auto norm =  float(appear.one_over_sigma() * vnl_math::one_over_sqrt2pi);
--  const float diff = obs - appear.color();
--  const float p = norm * std::exp(-(diff*diff)*appear.one_over_sigma()*appear.one_over_sigma()*0.5f);
--  // normalize by area of distribution between 0 and 1
--  //return p / total_prob(appear);
--  return p * appear.gauss_weight() + (1.0f - appear.gauss_weight());
--}
--
--//: Return probabilities that pixels are in range [min,max]
--float boxm_simple_grey_processor::prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max)
--{
--  // make sure obs_min and obs_max are within bounds
--  const float obs_min_n = obs_min >= 0 ? obs_min : 0.0f;
--  const float obs_max_n = obs_max <= 1.0? obs_max : 1.0f;
--
--  const float diff_low = obs_min_n - appear.color();
--  const float diff_high = obs_max_n - appear.color();
--  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
--
--  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
--  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
--  const float P = (0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1));
--  //return P / total_prob(appear);
--  return P * appear.gauss_weight() + (1.0f - appear.gauss_weight())*(obs_max - obs_min);
--}
--
--//: Return probabilities that pixels are in range [0,1] - used for normalizing
--float boxm_simple_grey_processor::total_prob(apm_datatype const& appear)
--{
--  const float diff_low =  -appear.color();
--  const float diff_high = 1.0f - appear.color();
--  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
--  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
--  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
--  return 0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1);
--}
--
--
--//: Update with a new sample image
--bool boxm_simple_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& /*weight*/)
--{
--  appear = boxm_simple_grey(vnl_vector_fixed<float,3>(obs, appear.sigma(), appear.gauss_weight()));
--  return true;
--}
--
--
--//: Expected value
--boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype boxm_simple_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear)
--{
--  return appear.color() * appear.gauss_weight() + 0.5f * (1.0f - appear.gauss_weight());
--}
--
--//: color of the most probable mode in the mixtures in the slab
--boxm_simple_grey_processor::obs_datatype boxm_simple_grey_processor::most_probable_color(apm_datatype const& appear)
--{
--  return appear.color();
--}
--
--void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
--{
--  bsta_gauss_sf1 model_bsta(model.color(),model.sigma()*model.sigma());
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--  auto nobs = (unsigned int)obs.size();
--  // check for some simple cases first
--  if (nobs == 0) {
--    // zero observations. nothing to do here.
--    model = boxm_simple_grey(0.5f, big_sigma);
--    return;
--  }
--  if (nobs == 1) {
--    // one observation: Just return the value as the mean, and a big sigma.
--    model = boxm_simple_grey(obs[0], big_sigma);
--    return;
--  }
--  //std::cout << "nobs = " << obs.size() << std::endl;
--  //for (unsigned int i=0; i<obs.size(); ++i) {
--  //  std::cout << "obs=" << obs[i] << " vis=" << vis[i] << "pre=" << pre[i] << std::endl;
--  //}
--  const float min_var_EM = 1.5e-5f; // to prevent degenerate solution (corresponds roughly to sigma = 1/255)
--  bsta_fit_gaussian(obs,vis,pre,model_bsta,min_var_EM);
--  // compute expected number of observations
--  float expected_nobs = 0.0f;
--  for (float vi : vis) {
--    expected_nobs += vi;
--  }
--  // normalize sigma
--  static const boxm_sigma_normalizer sigma_norm(0.20f);
--  const float norm_factor = sigma_norm.normalization_factor(expected_nobs);
--  //const float norm_factor = 1.0f;
--  float sigma = std::sqrt(model_bsta.var()) * norm_factor;
--
--  // bounds check on std. deviation value
--  if (sigma < min_sigma) {
--    sigma = min_sigma;
--  }
--  if (sigma > big_sigma) {
--    sigma = big_sigma;
--  }
--  if (!(sigma < big_sigma) && !(sigma > min_sigma)) {
--    std::cerr << "error: sigma = " << sigma << " model_bsta.var() = " << model_bsta.var() << std::endl;
--    sigma = big_sigma;
--  }
--  // convert back to a boxm_simple_grey model
--  model = boxm_simple_grey(model_bsta.mean(),sigma);
--  return;
--}
--
--void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
--{
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--
--  const auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // zero observations. nothing to do here.
--    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.5f, 1.0f, 0.0f);
--    return;
--  }
--  if (nobs == 1) {
--    // one observation: Just return the value as the mean, and a big sigma.
--    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma, weights[0]);
--    return;
--  }
--  else {
--    // compute estimate of gaussian parameters
--    // Initialize the estimates
--    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
--    float sigma_est = 0.0f;
--
--    compute_gaussian_params(obs, weights, mean_est, sigma_est);
--    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype gauss_model(mean_est, sigma_est, 1.0f);
--
--    sigma_est *= sigma_norm_factor(nobs);
--
--    // make sure standard deviation is not too small
--    if (sigma_est < min_sigma) {
--      sigma_est = min_sigma;
--    }
--    // or too big
--    if (sigma_est > big_sigma) {
--      sigma_est = big_sigma;
--    }
--
--    // compute estimate of gaussian weight by summing probabilities
--    float gauss_weight = 0.0f;
--    if (USE_UNIFORM_COMPONENT) {
--      float weight_sum = 0.0f;
--      for (unsigned int n=0; n<nobs; ++n) {
--        const float p_gauss = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(gauss_model,obs[n]);
--        const float p_uniform = 1.0f;
--        gauss_weight += weights[n] * p_gauss / (p_gauss + p_uniform);
--        weight_sum += weights[n];
--      }
--      if (weight_sum > 0.0f) {
--        gauss_weight /= weight_sum;
--      }
--    }
--    else {
--      gauss_weight = 1.0f;
--    }
--
--    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
--  }
--}
--
--
--void boxm_simple_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
--{
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--
--  const auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // zero observations. nothing to do here.
--    return;
--  }
--  if (nobs == 1) {
--    // one observation: Just return the value as the mean, and a big sigma.
--    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma);
--    return;
--  }
--  else {
--    // compute estimate of gaussian weight by summing probabilities
--    std::vector<float> obs_gauss_weights = weights;
--    float gauss_weight = 0.0f;
--    float expected_nobs = 0.0f;
--    if (USE_UNIFORM_COMPONENT) {
--      float weight_sum = 0.0f;
--
--      for (unsigned int n=0; n<nobs; ++n) {
--        const float p_total = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(model,obs[n]);
--        const float p_uniform = 1.0f - model.gauss_weight();
--        const float p_gauss = p_total - p_uniform;
--        if (p_total > 0.0f) {
--          obs_gauss_weights[n] = weights[n] * p_gauss / p_total;
--        }
--        else {
--          obs_gauss_weights[n] = 0.0f;
--        }
--        gauss_weight += obs_gauss_weights[n];
--        weight_sum += weights[n];
--      }
--      if (weight_sum > 0.0f) {
--        gauss_weight /= weight_sum;
--      }
--      expected_nobs = weight_sum;
--    }
--    else {
--      auto wit = weights.begin();
--      for (; wit != weights.end(); ++wit) {
--        expected_nobs += *wit;
--      }
--      gauss_weight = 1.0f;
--    }
--    // Initialize the estimates
--    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
--    float sigma_est = 0.0f;
--
--    compute_gaussian_params(obs, obs_gauss_weights, mean_est, sigma_est);
--
--    //sigma_est *= sigma_norm_factor(nobs);
--
--    // make sure standard deviation is not too small
--    if (sigma_est < min_sigma) {
--      sigma_est = min_sigma;
--    }
--    // or too big
--    if (sigma_est > big_sigma) {
--      sigma_est = big_sigma;
--    }
--
--    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
--  }
--  return;
--}
--
--void boxm_simple_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
--                                                     std::vector<float> const& weights,
--                                                     boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model)
--{
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--
--  float expected_nobs = 0.0f;
--    const auto nobs = (unsigned int)obs.size();
--
--  auto wit = weights.begin();
--  for (; wit != weights.end(); ++wit) {
--    expected_nobs += *wit;
--  }
--
--  //float unbiased_sigma = model.sigma() * sigma_norm_factor(expected_nobs);
--  float unbiased_sigma = model.sigma() * sigma_norm_factor(nobs);
--  if (unbiased_sigma > big_sigma) {
--    unbiased_sigma = big_sigma;
--  }
--
--
--  model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(model.color(), unbiased_sigma, model.gauss_weight());
--}
--
--
--void boxm_simple_grey_processor::compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma)
--{
--  const auto nobs = (unsigned int)obs.size();
--  double w_sum = 0.0;
--  double w2_sum = 0.0;
--  double obs_sum = 0.0;
--
--  for (unsigned int i=0; i<nobs; ++i) {
--    w_sum += weights[i];
--    w2_sum += weights[i]*weights[i];
--    obs_sum += obs[i] * weights[i];
--  }
--  double mean_obs = 0.5f;
--  if (w_sum > 0) {
--    mean_obs = obs_sum / w_sum;
--  }
--
--  double var_sum = 0.0;
--  for (unsigned int i=0; i<nobs; ++i) {
--    const double diff = obs[i] - mean_obs;
--    var_sum += diff*diff*weights[i];
--  }
--  double var = 1.0f;
--  if (w_sum > 0) {
--    var = var_sum / (w_sum - (w2_sum/w_sum));
--  }
--
--  mean = (float)mean_obs;
--  sigma = (float)std::sqrt(var);
--}
--
--float boxm_simple_grey_processor::sigma_norm_factor(float nobs)
--{
--  if (nobs <= 1.0f) {
--    return sigma_norm_factor((unsigned int)1);
--  }
--
--  // linearly interpolate between integer values
--  float nobs_floor = std::floor(nobs);
--  float nobs_ceil = std::ceil(nobs);
--  float floor_weight = nobs_ceil - nobs;
--  float norm_factor = (sigma_norm_factor((unsigned int)nobs_floor) * floor_weight) + (sigma_norm_factor((unsigned int)nobs_ceil) * (1.0f - floor_weight));
--
--  return norm_factor;
--}
--
--float boxm_simple_grey_processor::sigma_norm_factor(unsigned int nobs)
--{
--  static const float unbias_const[] = {0, 1e3f, 7.9057f, 3.0787f, 2.2646f, 1.9389f, 1.7617f, 1.6496f, 1.5716f, 1.5140f, 1.4693f, 1.4336f, 1.4043f, 1.3797f, 1.3587f, 1.3406f, 1.3248f, 1.3107f, 1.2983f, 1.2871f, 1.2770f, 1.2678f, 1.2594f, 1.2517f, 1.2446f, 1.2380f, 1.2319f, 1.2262f, 1.2209f, 1.2159f, 1.2112f, 1.2068f, 1.2026f, 1.1987f, 1.1949f, 1.1914f };
--
--  if (nobs < 2) {
--    return unbias_const[1];
--  }
--
--  if (nobs < 36) {
--    return unbias_const[nobs];
--  }
--  // else nobs >= 36
--  // approximate for big n with function a = m /nobs + b
--  static const float m = (unbias_const[35] - unbias_const[30])/(1.0f/35.0f - 1.0f/30.0f);
--  static const float b = unbias_const[35]  - m*(1.0f/35.0f);
--  return m/nobs + b;
--}
--
--void boxm_simple_grey_processor::
--boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
--                               std::vector<float> const& pre,
--                               std::vector<float> const& vis,
--                               boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
--                               float min_app_sigma,
--                               float shadow_prior,
--                               float shadow_mean,
--                               float shadow_sigma,
--                               bool verbose )
--{
--  std::vector<float> obs_weights(vis.size(), 0.0f);
--  std::vector<float> sh_density(vis.size(), 0.0f);
--  //assume that the initial appearance distribution is uniform on [0 1]
--  //thus a reasonable initialization for weights is
--  //
--  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
--  //
--  //, where Psh is shadow_prior and psh(x) is the shadow density function,
--  // sh_density. vis is the visibilty probability
--  //
--  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
--  for (unsigned n = 0; n<obs.size(); ++n)
--  {
--    //2.0 x density since centered on zero
--    sh_density[n] =
--      2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
--    float neu = vis[n]*(1-shadow_prior);
--    float weight =
--      neu/(neu + sh_density[n]*shadow_prior);
--    obs_weights[n]=weight;
--  }
--  std::vector<float> initial_weights = obs_weights;
--  // initial estimate for the illuminated appearance model
--  boxm_simple_grey_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
--  double initial_mean = model.color();
--  double initial_sigma = model.sigma();
--
--  // use EM to refine estimate until convergence.
--  auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  const float epsilon = 1e-4f;
--  constexpr unsigned int max_its = 100;
--  const float min_weight_change = 1e-5f;
--  unsigned int i=0;
--  for (; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION - determine the weights
--    for (unsigned int n=0; n<nobs; ++n) {
--      float PI = vis[n] * boxm_simple_grey_processor::prob_density(model,obs[n]);
--      float neu = PI*(1-shadow_prior);
--      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
--      float new_obs_weight = 0;
--      if (den > epsilon) {
--        new_obs_weight = neu / den;
--      }
--      // compute delta weight for convergence check
--      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
--      if (weight_delta > max_weight_change) {
--        max_weight_change = weight_delta;
--      }
--      obs_weights[n] = new_obs_weight;
--    }
--    // check for convergence
--    if (max_weight_change < min_weight_change)
--      break;
--    // MAXIMIZATION - determine the parameters of the appearance distribution
--    boxm_simple_grey_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
--  }
--  if (verbose) {
--    bool print = false;
--    for (unsigned n = 0; n<obs.size(); ++n) {
--      if (obs[n]>0) print = true;
--      if (i<max_its&&print) {
--        std::cout << "converged after " << i << " iterations.\n"
--                 << " initial mean = " << initial_mean << " final mean = "
--                 << model.color() << '\n'
--                 << " initial sigma = " << initial_sigma << " final sigma = "
--                 << model.sigma() << '\n';
--      }
--      else { std::cout << "failed to converge\n"; }
--
--      std::cout << "Initial (Observations, Weights):\n";
--      for (unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
--      std::cout << "\nFinal (Observations, Weights):\n";
--      for (unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
--      std::cout << '\n';
--    }
--  }
--
--  // adjust model to account for small sample sizes.
--  boxm_simple_grey_processor::finalize_appearance(obs,obs_weights,model);
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
-deleted file mode 100644
-index 076213bd46..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
-+++ /dev/null
-@@ -1,86 +0,0 @@
--// This is brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
--#ifndef boxm_simple_grey_processor_h_
--#define boxm_simple_grey_processor_h_
--//:
--// \file
--// \brief A class for processing simple, single valued grey-scale appearance models.
--//  The represented distribution can be thought of as a delta function centered on the value.
--//
--// \author Daniel Crispell
--// \date Sept 29, 2008
--// \verbatim
--//  Modifications
--//  <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <iosfwd>
--#include <boxm/boxm_apm_traits.h>
--#if 0 // operator<< in commented-out section
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--class  boxm_simple_grey_processor
--{
-- protected:
--  // convienance typedefs
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_datatype;
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype obs_mathtype;
--
--  // all methods are static - no constructor needed
-- private:
--  boxm_simple_grey_processor() = default;
--
--#if 0  // one_over_sigma is now a member of apm_datatype
--  static const float one_over_sigma_;
--#endif
--
-- public:
--
--  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
--
--  static float prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max);
--
--  static float total_prob(apm_datatype const& appear);
--
--  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
--
--  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
--
--  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype most_probable_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
--
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma=0.01f);
--
--  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--
--  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model);
--
--  //: includes a shadow density component to the single gaussian scalar appearance model, defined by a fixed shadow mean and sigma.
--  // The shadow prior defines the probability that an observation is in shadow.
--  // The function updates the "model" mean and sigma.
--  static void boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
--                                             std::vector<float> const& pre,
--                                             std::vector<float> const& vis,
--                                             boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
--                                             float min_app_sigma,
--                                             float shadow_prior,
--                                             float shadow_mean,
--                                             float shadow_sigma,
--                                             bool verbose = false);
-- private:
--  static void compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma);
--
--  static float sigma_norm_factor(unsigned int nobs);
--
--  static float sigma_norm_factor(float nobs);
--};
--
--#if 0
--std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm);
--#endif
--
--#endif // boxm_simple_grey_processor_h_
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
-deleted file mode 100644
-index 4390b597bc..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,11 +0,0 @@
--add_executable( boxm_sample_algo_test_all
--  test_driver.cxx
--  test_sigma_normalizer.cxx
-- )
--
--target_link_libraries( boxm_sample_algo_test_all boxm_sample_algo boxm_sample boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vbl bsta bsta_algo)
--
--add_test( NAME boxm_sample_test_sigma_normalizer COMMAND $<TARGET_FILE:boxm_sample_algo_test_all> test_sigma_normalizer  )
--
--add_executable( boxm_sample_algo_test_include test_include.cxx )
--target_link_libraries( boxm_sample_algo_test_include boxm_sample_algo)
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
-deleted file mode 100644
-index 1258c5dc63..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_sigma_normalizer );
--
--void register_tests()
--{
--  REGISTER( test_sigma_normalizer );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
-deleted file mode 100644
-index 3c7fc60db6..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_sigma_normalizer.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
-deleted file mode 100644
-index 7231ca0b24..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
-+++ /dev/null
-@@ -1,59 +0,0 @@
--
--#include <testlib/testlib_test.h>
--#include <vnl/vnl_random.h>
--#include <boxm/sample/algo/boxm_sigma_normalizer.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/algo/bsta_fit_gaussian.h>
--
--
--static void test_sigma_normalizer()
--{
--  START("boxm_sigma_normalizer test");
--
--  // generate random sets of samples from a normal distribution and compare sigma estimate to true value
--  {
--    vnl_random rand_gen;
--    unsigned int n_trials = 5000;
--
--    unsigned int n_observations = 6;
--    float true_sigma = 0.5f;
--    float true_mean = 2.5f;
--    float under_estimation_prob = 0.4f;
--    unsigned int under_estimates = 0;
--
--    boxm_sigma_normalizer normalizer(under_estimation_prob);
--
--    for (unsigned int t=0; t<n_trials; ++t) {
--      std::vector<float> samples;
--      std::vector<float> weights;
--      for (unsigned int n=0; n<n_observations; ++n) {
--        float sample = true_mean + true_sigma*(float)rand_gen.normal();
--        samples.push_back(sample);
--        weights.push_back(1.0f);
--      }
--      // compute the sample mean and variance
--      bsta_gauss_sf1 gauss_model;
--      bsta_fit_gaussian(samples, weights, gauss_model);
--      float normalized_sigma = std::sqrt(gauss_model.var()) * normalizer.normalization_factor_int(n_observations);
--      if (normalized_sigma < true_sigma) {
--        ++under_estimates;
--      }
--    }
--    float under_estimate_ratio = (float)under_estimates / n_trials;
--
--    TEST_NEAR("correct ratio of sigma under-estimates", under_estimate_ratio, under_estimation_prob, 0.05);
--  }
--
--  // make sure normalization factor approaches 1 for large sample sizes
--  {
--    boxm_sigma_normalizer sigma_norm(0.10f);
--    float norm_factor_f = sigma_norm.normalization_factor(10000.0f);
--    float norm_factor_i = sigma_norm.normalization_factor_int(10000);
--
--    TEST_NEAR("normalization factor (float) approaches 1 for large N",norm_factor_f, 1.0, 0.1);
--    TEST_NEAR("normalization factor (int) approaches 1 for large N",norm_factor_i, 1.0, 0.1);
--  }
--  return;
--}
--
--TESTMAIN(test_sigma_normalizer);
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
-deleted file mode 100644
-index ae46c03fd6..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
-+++ /dev/null
-@@ -1,97 +0,0 @@
--#ifndef boxm_edge_sample_h_
--#define boxm_edge_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_aux_traits.h>
--
--template<class OBS_T>
--class boxm_edge_sample
--{
-- public:
--  boxm_edge_sample(): edge_prob_(0), num_obs_(0.0f) {}
--  ~boxm_edge_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val() const { return edge_prob_; }
--  OBS_T edge_prob_;
--  float num_obs_;
--};
--
--template<class OBS_T>
--class boxm_aux_edge_sample
--{
-- public:
--  boxm_aux_edge_sample(): obs_(0), seg_len_(0.0f) { }
--  ~boxm_aux_edge_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  OBS_T obs_;
--  float seg_len_;
--};
--
--#if 0 // two classes commented out
--
--//: traits for a grey optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
--{
-- public:
--  typedef boxm_edge_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_grey_work"; }
--};
--
--//: traits for an rgb optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
--{
-- public:
--  typedef boxm_edge_sample<vil_rgb<float> > sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
--};
--
--#endif // 0
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample);
--
--
--#endif // boxm_edge_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
-deleted file mode 100644
-index d2e60dc175..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
-+++ /dev/null
-@@ -1,137 +0,0 @@
--#ifndef boxm_edge_sample_hxx_
--#define boxm_edge_sample_hxx_
--
--#include "boxm_edge_sample.h"
--
--
--// Edge Sample Methods
--template <class OBS_T>
--void boxm_edge_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(edge_prob=" << edge_prob_ << " num_obs=" << num_obs_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.edge_prob_);
--  vsl_b_write(os, sample.num_obs_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.edge_prob_);
--      vsl_b_read(is, sample.num_obs_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--// Auxiliary Edge Sample Methods
--template <class OBS_T>
--void boxm_aux_edge_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(obs=" << obs_ << " seg_len=" << seg_len_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.obs_);
--  vsl_b_write(os, sample.seg_len_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.obs_);
--      vsl_b_read(is, sample.seg_len_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_aux_edge_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_EDGE_SAMPLE_INSTANTIATE(T) \
--template class boxm_edge_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_edge_sample<T >&)
--
--#define BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(T) \
--template class boxm_aux_edge_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_aux_edge_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
-deleted file mode 100644
-index a92ae0e38e..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
-+++ /dev/null
-@@ -1,69 +0,0 @@
--#ifndef boxm_edge_tangent_sample_h_
--#define boxm_edge_tangent_sample_h_
--//:
--// \file
--
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include "boxm_plane_obs.h"
--#include <boxm/boxm_aux_traits.h>
--
--
--template <class T>
--class boxm_edge_tangent_sample
--{
-- public:
--  boxm_edge_tangent_sample() = default;
--  ~boxm_edge_tangent_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  //: adds observations
--  void insert(boxm_plane_obs<T> const& obs) { obs_.push_back(obs); }
--
--  //: insert a lis of observations
--  void insert(std::vector<boxm_plane_obs<T> > const& obs) {obs_.insert(obs_.end(),obs.begin(),obs.end()); }
--
--  //: returns the number of observations
--  unsigned num_obs() const { return obs_.size(); }
--
--  boxm_plane_obs<T> obs(unsigned int i) const {
--    if (i < obs_.size()) return obs_[i];
--    std::cerr << "boxm_edge_tangent_sample: " << i << " is out of index - size is " << obs_.size() << std::endl;
--    return boxm_plane_obs<T>();
--  }
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val(unsigned int i) {
--    if (i < obs_.size()) return obs_[i].seg_len_;
--    std::cerr << "boxm_edge_tangent_sample: " << i << "is out of index - size is " << obs_.size() << std::endl;
--    return -1.0f;
--  }
--
--  std::vector<boxm_plane_obs<T> > obs_list() { return obs_; }
--
-- private:
--  std::vector<boxm_plane_obs<T> > obs_;
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample);
--
--template <class T>
--std::ostream&operator << (std::ostream& os, boxm_edge_tangent_sample<T>& sample);
--
--
--#endif // boxm_edge_tangent_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
-deleted file mode 100644
-index bb96baa1e0..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
-+++ /dev/null
-@@ -1,79 +0,0 @@
--#ifndef boxm_edge_tangent_sample_hxx_
--#define boxm_edge_tangent_sample_hxx_
--
--#include "boxm_edge_tangent_sample.h"
--#include "boxm_plane_obs.h"
--
--template <class OBS_T>
--void boxm_edge_tangent_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << " num_obs=" << this->num_obs() << std::endl;
--  for (unsigned i=0; i<obs_.size(); i++)
--    os << "    " << i << "- (obs=" << this->obs(i) << ")\n" ;
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const & sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.num_obs());
--  for (unsigned i=0; i<sample.num_obs(); i++)
--    vsl_b_write(os, sample.obs(i));
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--     { unsigned num;
--      vsl_b_read(is, num);
--      boxm_plane_obs<T> o;
--      for (unsigned i=0; i<num; i++) {
--        vsl_b_read(is, o);
--        sample.insert(o);
--      }}
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, boxm_edge_tangent_sample<T> &sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(T) \
--template class boxm_edge_tangent_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, boxm_edge_tangent_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
-deleted file mode 100644
-index 953c9f286f..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
-+++ /dev/null
-@@ -1,55 +0,0 @@
--#ifndef boxm_inf_line_sample_h_
--#define boxm_inf_line_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vgl/vgl_line_3d_2_points.h>
--
--#include <boxm/boxm_aux_traits.h>
--#include <bsta/bsta_kent.h>
--
--template<class T>
--class boxm_inf_line_sample
--{
-- public:
--  //: initially the residual is very big, it means the solution to this inf line is not found yet
--  boxm_inf_line_sample() :
--       residual_(1e6), line_(vgl_infinite_line_3d<T>(vgl_vector_2d<T>(0,0),
--       vgl_vector_3d<T>(10,10,10))), num_obs_(0){}
--
--  boxm_inf_line_sample(vgl_infinite_line_3d<T> line,unsigned num_obs=0) : residual_(1e6),line_(line),num_obs_(num_obs) {}
--  ~boxm_inf_line_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) { os << "(line=" << line_ << ')';  }
--  bool operator==(const boxm_inf_line_sample &rhs) const;
--  typedef boxm_inf_line_sample<T> value_type;
--  // public members
--  T residual_;
--  vgl_infinite_line_3d<T> line_;
--  vgl_line_3d_2_points<T> line_clipped_;
--  unsigned num_obs_;
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample);
--
--
--#endif // boxm_inf_line_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
-deleted file mode 100644
-index 1206b4a5f3..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
-+++ /dev/null
-@@ -1,79 +0,0 @@
--#ifndef boxm_inf_line_sample_hxx_
--#define boxm_inf_line_sample_hxx_
--
--#include "boxm_inf_line_sample.h"
--#include <vgl/io/vgl_io_infinite_line_3d.h> // for vsl_b_write(os, sample.line_);
--#include <vgl/io/vgl_io_line_3d_2_points.h> // for vsl_b_write(os, sample.line_clipped_);
--
--template <class T>
--bool boxm_inf_line_sample<T>::operator==(const boxm_inf_line_sample<T> &rhs) const
--{
--  if ((this==&rhs) || (line_==rhs.line_ && line_clipped_==rhs.line_clipped_ && num_obs_==rhs.num_obs_))
--    return true;
--  else
--    return false;
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.num_obs_);
--  vsl_b_write(os, sample.residual_);
--  vsl_b_write(os, sample.line_);
--  vsl_b_write(os, sample.line_clipped_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.num_obs_);
--      vsl_b_read(is, sample.residual_);
--      vsl_b_read(is, sample.line_);
--      vsl_b_read(is, sample.line_clipped_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_inf_line_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_INF_LINE_SAMPLE_INSTANTIATE(T) \
--template class boxm_inf_line_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > *&);\
--template std::ostream& operator << (std::ostream&, boxm_inf_line_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
-deleted file mode 100644
-index 56ac1825d9..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#ifndef boxm_opt2_sample_h_
--#define boxm_opt2_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_aux_traits.h>
--
--
--template <class OBS_T>
--class boxm_opt2_sample
--{
-- public:
--  boxm_opt2_sample()
--  : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), log_pass_prob_sum_(0.0f), weighted_seg_len_sum_(0.0f)
--  {}
--
--  ~boxm_opt2_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  OBS_T obs_;
--  float pre_;
--  float vis_;
--  float PI_;
--  float seg_len_;
--
--  float log_pass_prob_sum_;
--  float weighted_seg_len_sum_;
--};
--
--//:traits for a grey optimization sample
--template <>
--class boxm_aux_traits<BOXM_AUX_OPT2_GREY>
--{
-- public:
--  typedef boxm_opt2_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "opt2_grey_work"; }
--};
--
--//:traits for an rgb optimization sample
--template <>
--class boxm_aux_traits<BOXM_AUX_OPT2_RGB>
--{
-- public:
--  typedef boxm_opt2_sample<vil_rgb<float> > sample_datatype;
--
--  static std::string storage_subdir() { return "opt2_rgb_work"; }
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator<< (std::ostream& os, const boxm_opt2_sample<T>& sample);
--
--#endif // boxm_opt2_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
-deleted file mode 100644
-index 44300e3bf7..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#ifndef boxm_opt2_sample_hxx_
--#define boxm_opt2_sample_hxx_
--
--#include "boxm_opt2_sample.h"
--
--
--template <class OBS_T>
--void boxm_opt2_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_
--     << " seg_len=" << seg_len_ << " log_pass_prob_sum=" << log_pass_prob_sum_
--     << " weighted_seg_len_sum=" << weighted_seg_len_sum_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.obs_);
--  vsl_b_write(os, sample.pre_);
--  vsl_b_write(os, sample.vis_);
--  vsl_b_write(os, sample.PI_);
--  vsl_b_write(os, sample.seg_len_);
--  vsl_b_write(os, sample.log_pass_prob_sum_);
--  vsl_b_write(os, sample.weighted_seg_len_sum_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.obs_);
--    vsl_b_read(is, sample.pre_);
--    vsl_b_read(is, sample.vis_);
--    vsl_b_read(is, sample.PI_);
--    vsl_b_read(is, sample.seg_len_);
--    vsl_b_read(is, sample.log_pass_prob_sum_);
--    vsl_b_read(is, sample.weighted_seg_len_sum_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt2_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template<class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_opt2_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_OPT2_SAMPLE_INSTANTIATE(T) \
--template class boxm_opt2_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_opt2_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
-deleted file mode 100644
-index 3b8d162774..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--#ifndef boxm_opt3_sample_h_
--#define boxm_opt3_sample_h_
--//:
--// \file
--
--#include <vector>
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--
--//: class for holding auxiliary information for opt3 process.
--// Note that APM is not necessarily appearance model type of world,
--// but observation types of the two models should be the same.
--template<boxm_apm_type APM>
--class boxm_opt3_sample
--{
-- public:
--  typedef typename boxm_apm_traits<APM>::obs_datatype obs_datatype;
--  typedef typename boxm_apm_traits<APM>::apm_datatype apm_datatype;
--
--  boxm_opt3_sample()
--    : weighted_vis_sum_(0.0f), seg_len_sum_(0.0f), log_pass_prob_sum_(0.0f) { }
--  ~boxm_opt3_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  void update_obs_dist(obs_datatype obs, float obs_prob);
--
--  apm_datatype obs_dist_; // distribution of samples from this observation
--  float weighted_vis_sum_; // sum of visibility probabilities * corresponding seg_lens
--  float seg_len_sum_; // sum of sample segment lengths
--  float log_pass_prob_sum_; // sum of log of updated (1 - PQ)
--};
--
--//: traits for a grey optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT3_MOG_GREY>
--{
-- public:
--   typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype sample_datatype;
--   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_GREY;
--
--  static std::string storage_subdir() { return "opt3_mog_grey"; }
--};
--
--//: traits for an rgb optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT3_MOG_RGB>
--{
-- public:
--   typedef boxm_apm_traits<BOXM_APM_MOG_RGB>::obs_datatype sample_datatype;
--   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_RGB;
--
--  static std::string storage_subdir() { return "opt3_mog_rgb"; }
--};
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample);
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample);
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample);
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample);
--
--template <boxm_apm_type APM>
--std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample);
--
--#endif // boxm_opt3_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
-deleted file mode 100644
-index 85f2e954dc..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
-+++ /dev/null
-@@ -1,92 +0,0 @@
--#ifndef boxm_opt3_sample_hxx_
--#define boxm_opt3_sample_hxx_
--
--#include "boxm_opt3_sample.h"
--
--#include <vsl/vsl_vector_io.h>
--#include <vsl/vsl_binary_io.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_mixture_fixed.h> // for binary io functions
--#include <bsta/io/bsta_io_gaussian_indep.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--//#include <boxm/boxm_mog_rgb_processor.h>
--
--template <boxm_apm_type APM>
--void boxm_opt3_sample<APM>::print(std::ostream& os) const
--{
--  os << "(log_pass_prob_sum=" << log_pass_prob_sum_ << " seg_len_sum_=" << seg_len_sum_
--     << "weighted_vis_sum_=" << weighted_vis_sum_ << " obs_dist=" << obs_dist_ << ')';
--}
--
--template <boxm_apm_type APM>
--void boxm_opt3_sample<APM>::update_obs_dist(typename boxm_opt3_sample<APM>::obs_datatype obs, float obs_prob)
--{
--  boxm_apm_traits<APM>::apm_processor::update(obs_dist_, obs, obs_prob);
--}
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.log_pass_prob_sum_);
--  vsl_b_write(os, sample.seg_len_sum_);
--  vsl_b_write(os, sample.weighted_vis_sum_);
--  vsl_b_write(os, sample.obs_dist_);
--}
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.log_pass_prob_sum_);
--    vsl_b_read(is, sample.seg_len_sum_);
--    vsl_b_read(is, sample.weighted_vis_sum_);
--    vsl_b_read(is, sample.obs_dist_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt3_sample<APM>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <boxm_apm_type APM>
--std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_OPT3_SAMPLE_INSTANTIATE(T) \
--template class boxm_opt3_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_opt3_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
-deleted file mode 100644
-index 417c0ccc98..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
-+++ /dev/null
-@@ -1,45 +0,0 @@
--#ifndef boxm_plane_obs_h_
--#define boxm_plane_obs_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <vgl/vgl_homg_plane_3d.h>
--#include <boxm/boxm_aux_traits.h>
--
--template<class T>
--class boxm_plane_obs
--{
-- public:
--  boxm_plane_obs() : seg_len_(0.0f), plane_(vgl_homg_plane_3d<T>()) {}
--  boxm_plane_obs(vgl_homg_plane_3d<T> plane, float seg_len) : seg_len_(seg_len), plane_(plane) {}
--  ~boxm_plane_obs() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const { os << "(plane=" << plane_ << " seg_len=" << seg_len_ << ')'; }
--
--  // public members
--  float seg_len_;
--  vgl_homg_plane_3d<T> plane_;
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_plane_obs<T>& sample);
--
--
--#endif // boxm_plane_obs_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
-deleted file mode 100644
-index 5d2d8b4535..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
-+++ /dev/null
-@@ -1,69 +0,0 @@
--#ifndef boxm_plane_obs_hxx_
--#define boxm_plane_obs_hxx_
--
--#include "boxm_plane_obs.h"
--
--#include "boxm_edge_tangent_sample.h"
--#include "boxm_inf_line_sample.h"
--
--#include <vgl/io/vgl_io_homg_plane_3d.h> // for vsl_b_write(os, sample.plane_);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.seg_len_);
--  vsl_b_write(os, sample.plane_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.seg_len_);
--      vsl_b_read(is, sample.plane_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator<< (std::ostream& os, boxm_plane_obs<T> const& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_PLANE_OBS_INSTANTIATE(T) \
--template class boxm_plane_obs<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > *&);\
--template std::ostream& operator << (std::ostream&, boxm_plane_obs<T > const&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
-deleted file mode 100644
-index e51d415ce8..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
-+++ /dev/null
-@@ -1,70 +0,0 @@
--#ifndef boxm_rt_sample_h_
--#define boxm_rt_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_aux_traits.h>
--
--template<class OBS_T>
--class boxm_rt_sample
--{
-- public:
--  boxm_rt_sample()
--    : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), Beta_(0.0f),
--    updatefactor_(0.0f), log_sum_(0.0f) {}
--  ~boxm_rt_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  OBS_T obs_;
--  float pre_;
--  float vis_;
--  float PI_;
--  float seg_len_;
--  float Beta_;
--  float updatefactor_;
--  float log_sum_;
--};
--
--
--//: traits for a grey optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
--{
-- public:
--  typedef boxm_rt_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_grey_work"; }
--};
--
--//: traits for an rgb optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
--{
-- public:
--  typedef boxm_rt_sample<vil_rgb<float> > sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
--};
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_rt_sample<T>& sample);
--
--#endif // boxm_rt_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
-deleted file mode 100644
-index 4202653363..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
-+++ /dev/null
-@@ -1,81 +0,0 @@
--#ifndef boxm_rt_sample_hxx_
--#define boxm_rt_sample_hxx_
--
--#include "boxm_rt_sample.h"
--
--
--template <class OBS_T>
--void boxm_rt_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_ << " seg_len=" << seg_len_ << " Beta=" << Beta_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.obs_);
--  vsl_b_write(os, sample.pre_);
--  vsl_b_write(os, sample.vis_);
--  vsl_b_write(os, sample.PI_);
--  vsl_b_write(os, sample.seg_len_);
--  vsl_b_write(os, sample.updatefactor_);
--  vsl_b_write(os, sample.Beta_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.obs_);
--    vsl_b_read(is, sample.pre_);
--    vsl_b_read(is, sample.vis_);
--    vsl_b_read(is, sample.PI_);
--    vsl_b_read(is, sample.seg_len_);
--    vsl_b_read(is, sample.updatefactor_);
--    vsl_b_read(is, sample.Beta_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_rt_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream &operator << (std::ostream& os, const boxm_rt_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_RT_SAMPLE_INSTANTIATE(T) \
--template class boxm_rt_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_rt_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.h b/contrib/brl/bseg/boxm/sample/boxm_sample.h
-deleted file mode 100644
-index 4d2312ae98..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample.h
-+++ /dev/null
-@@ -1,68 +0,0 @@
--#ifndef boxm_sample_h_
--#define boxm_sample_h_
--//:
--// \file
--#include <iostream>
--#include <utility>
--#include <boxm/boxm_apm_traits.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <bsta/io/bsta_io_attributes.h>
--
--template <boxm_apm_type APM_MODEL>
--class boxm_sample
--{
-- public:
--  static const boxm_apm_type apm_type = APM_MODEL;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
--  static const unsigned int obs_dim = boxm_apm_traits<APM_MODEL>::obs_dim;
--
--  //: default constructor: alpha is set to 0.0015.
--  boxm_sample() : alpha(0.0015f), appearance_() {}
--
--  boxm_sample(float alpha_val): alpha(alpha_val), appearance_() {}
--  //: constructor
--  boxm_sample(float alpha_val, apm_datatype apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
--
--  virtual ~boxm_sample() = default;
--
--  static short version_no() { return 1; }
--
--  //: bin is to imitate the bin number of multiple_bin case
--  apm_datatype & appearance(int /*bin*/=-1) { return appearance_; }
--
--  void set_appearance(apm_datatype  app,int /*bin*/=-1) { appearance_=app; }
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val() const { return alpha; }
--
--  //: the occlusion density at the sample point
--  float alpha;
--
--  //: the appearance model at the sample point
--  typename boxm_apm_traits<APM_MODEL>::apm_datatype appearance_;
--
--  void  print(std::ostream& os) const;
--};
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample);
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample);
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
-deleted file mode 100644
-index e644739f43..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
-+++ /dev/null
-@@ -1,71 +0,0 @@
--#ifndef boxm_sample_hxx_
--#define boxm_sample_hxx_
--
--#include "boxm_sample.h"
--#include <bsta/bsta_mixture_fixed.h>
--
--template <boxm_apm_type APM_MODEL>
--void boxm_sample<APM_MODEL>::print(std::ostream& os) const
--{
--  os << "(alpha=" << alpha << " appearence=" << appearance_ << ')';
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.alpha);
--  vsl_b_write(os, sample.appearance_);
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.alpha);
--      vsl_b_read(is, sample.appearance_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_SAMPLE_INSTANTIATE(T) \
--template class boxm_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
-deleted file mode 100644
-index 838637e49f..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
-+++ /dev/null
-@@ -1,63 +0,0 @@
--#ifndef boxm_sample_multi_bin_h_
--#define boxm_sample_multi_bin_h_
--//:
--// \file
--#include <iostream>
--#include <utility>
--#include <boxm/boxm_apm_traits.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <bsta/bsta_attributes.h>
--
--template <boxm_apm_type APM_MODEL>
--class boxm_sample_multi_bin
--{
-- public:
--  static const boxm_apm_type apm_type = APM_MODEL;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
--
--  //: default constructor
--  boxm_sample_multi_bin() : alpha(0.001f) {}
--  //: constructor
--  boxm_sample_multi_bin(float alpha_val,std::map<int,apm_datatype> apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
--
--  static short version_no() { return 1; }
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val() const { return alpha; }
--
--  //: the occlusion density at the sample point
--  float alpha;
--  apm_datatype & appearance(int bin=0);
--
--  void set_appearance(apm_datatype  app,int bin=0);
--
--  std::map<int,apm_datatype> appearance_;
--
--  void  print(std::ostream& os) const;
-- private:
--  //: the appearance model at the sample point
--};
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample);
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample);
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
-deleted file mode 100644
-index 714b493eec..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
-+++ /dev/null
-@@ -1,98 +0,0 @@
--#ifndef boxm_sample_multi_bin_hxx_
--#define boxm_sample_multi_bin_hxx_
--
--#include "boxm_sample_multi_bin.h"
--#include <bsta/bsta_mixture_fixed.h>
--#include <vsl/vsl_map_io.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <bsta/io/bsta_io_mixture.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_indep.h>
--
--template <boxm_apm_type APM_MODEL>
--typename boxm_sample_multi_bin<APM_MODEL>::apm_datatype & boxm_sample_multi_bin<APM_MODEL>::appearance(int bin)
--{
--  if (appearance_.find(bin)==appearance_.end())
--  {
--    appearance_[bin]=apm_datatype();
--    return appearance_[bin];
--  }
--  else
--    return appearance_[bin];
--}
--
--template <boxm_apm_type APM_MODEL>
--void boxm_sample_multi_bin<APM_MODEL>::set_appearance(apm_datatype  app,int bin)
--{
--  appearance_[bin]=app;
--}
--
--template <boxm_apm_type APM_MODEL>
--void boxm_sample_multi_bin<APM_MODEL>::print(std::ostream& os) const
--{
--  os << "(alpha=" << alpha << " appearence=" ;
--  for (typename std::map<int,apm_datatype>::const_iterator iter=appearance_.begin();
--       iter!=appearance_.end(); ++iter)
--    os << "bin#= " << iter->first << ' ' << iter->second;
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.alpha);
--  vsl_b_write(os, sample.appearance_);
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.alpha);
--      vsl_b_read(is, sample.appearance_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample_multi_bin<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(T) \
--template class boxm_sample_multi_bin<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_sample_multi_bin<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
-deleted file mode 100644
-index ba4cd770ad..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
-+++ /dev/null
-@@ -1,55 +0,0 @@
--#ifndef boxm_scalar_sample_h_
--#define boxm_scalar_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_apm_traits.h>
--
--
--template <class T>
--class boxm_scalar_sample
--{
-- public:
--  boxm_scalar_sample() : scalar_sum_(0), seg_len_(0.0f) { }
--
--  ~boxm_scalar_sample() = default;
--  T basic_val() { if (seg_len_>0) return scalar_sum_/seg_len_; else return (T)0; }
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  T scalar_sum_;
--  float seg_len_;
--};
--
--//: traits for a scalar sample
--template <>
--class boxm_apm_traits<BOXM_SCALAR_FLOAT>
--{
-- public:
--  typedef boxm_scalar_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "scalar_subdir"; }
--};
--
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const* &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T>* &sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample);
--
--#endif // boxm_scalar_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
-deleted file mode 100644
-index 6eb0d37aef..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
-+++ /dev/null
-@@ -1,70 +0,0 @@
--#ifndef boxm_scalar_sample_hxx_
--#define boxm_scalar_sample_hxx_
--
--#include "boxm_scalar_sample.h"
--
--template <class OBS_T>
--void boxm_scalar_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(scalar=" << scalar_sum_ << " seg_len=" << seg_len_ << ")\n";
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.scalar_sum_);
--  vsl_b_write(os, sample.seg_len_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.scalar_sum_);
--    vsl_b_read(is, sample.seg_len_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scalar_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_SCALAR_SAMPLE_INSTANTIATE(T) \
--  template class boxm_scalar_sample<T >; \
--  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const &); \
--  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const *&); \
--  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > &); \
--  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > *&); \
--  template std::ostream& operator << (std::ostream&, const boxm_scalar_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h b/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
-deleted file mode 100644
-index 666c4a3ac5..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#ifndef boxm_update_sample_h_
--#define boxm_update_sample_h_
--//:
--// \file
--
--class boxm_update_sample
--{
-- public:
--  //: default constructor
--  boxm_update_sample() : update_multiplier(0.0f), do_update(false) {}
--
--  //: the (unnormalized) update multiplier
--  float update_multiplier;
--  bool do_update;
--};
--
--#endif // boxm_update_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h b/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
-deleted file mode 100644
-index 3ff4ed3ad5..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#ifndef boxm_vis_implicit_sample_h_
--#define boxm_vis_implicit_sample_h_
--//:
--// \file
--
--class boxm_vis_implicit_sample
--{
-- public:
--  //: default constructor
--  boxm_vis_implicit_sample() : max_vis(0.0f), n_obs(0) {}
--
--  float max_vis;
--  unsigned int n_obs;
--};
--
--#endif // boxm_vis_implicit_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/dummy.cxx b/contrib/brl/bseg/boxm/sample/dummy.cxx
-deleted file mode 100644
-index e69de29bb2..0000000000
-diff --git a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
-deleted file mode 100644
-index ed11dfb489..0000000000
---- a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,4 +0,0 @@
--add_executable( boxm_sample_test_include test_include.cxx )
--target_link_libraries( boxm_sample_test_include boxm_sample)
--add_executable( boxm_sample_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_sample_test_template_include boxm_sample)
-diff --git a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
-deleted file mode 100644
-index 17e8b789dd..0000000000
---- a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--#include <boxm/sample/boxm_update_sample.h>
--#include <boxm/sample/boxm_vis_implicit_sample.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
-deleted file mode 100644
-index d1f741b32f..0000000000
---- a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/sample/boxm_edge_sample.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.hxx>
--#include <boxm/sample/boxm_inf_line_sample.hxx>
--#include <boxm/sample/boxm_opt2_sample.hxx>
--#include <boxm/sample/boxm_opt3_sample.hxx>
--#include <boxm/sample/boxm_plane_obs.hxx>
--#include <boxm/sample/boxm_rt_sample.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.hxx>
--#include <boxm/sample/boxm_scalar_sample.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/tests/CMakeLists.txt
-deleted file mode 100644
-index eb0d974b9f..0000000000
---- a/contrib/brl/bseg/boxm/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,32 +0,0 @@
--add_executable( boxm_test_all
--  test_driver.cxx
--  test_binary_io.cxx
--  test_block_iter.cxx
--# FAILS on DASHBOARD FIX_ME
--#  test_region_finder.cxx
--  test_cell_iterator.cxx
--  test_load_neighboring_blocks.cxx
-- )
--
--set(boxm_test_all_sources
--    test_utils.h    test_utils.cxx
--    )
--
--vxl_add_library(LIBRARY_NAME boxm_tests LIBRARY_SOURCES  ${boxm_test_all_sources})
--target_link_libraries(boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--target_link_libraries( boxm_test_all boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
--
--add_test( NAME boxm_test_binary_io COMMAND $<TARGET_FILE:boxm_test_all>    test_binary_io  )
--add_test( NAME boxm_test_block_iter COMMAND $<TARGET_FILE:boxm_test_all>    test_block_iter  )
--#add_test( NAME boxm_test_region_finder COMMAND $<TARGET_FILE:boxm_test_all>    test_region_finder )
--if( VXL_RUN_FAILING_TESTS ) ## SEGFAULT when testing with ctest -j16 (perhaps files are shared between tests)
--add_test( NAME boxm_test_cell_iterator COMMAND $<TARGET_FILE:boxm_test_all>    test_cell_iterator )
--endif()
--add_test( NAME boxm_test_load_neighboring_blocks COMMAND $<TARGET_FILE:boxm_test_all>    test_load_neighboring_blocks )
--
--add_executable( boxm_test_include test_include.cxx )
--target_link_libraries( boxm_test_include boxm)
--add_executable( boxm_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_test_template_include boxm)
-diff --git a/contrib/brl/bseg/boxm/tests/camera0.txt b/contrib/brl/bseg/boxm/tests/camera0.txt
-deleted file mode 100644
-index cf11c57707..0000000000
---- a/contrib/brl/bseg/boxm/tests/camera0.txt
-+++ /dev/null
-@@ -1,104 +0,0 @@
--satId = "????";
--bandId = "RGB";
--SpecId = "RPC00B";
--BEGIN_GROUP = IMAGE
--
--
--  lineOffset = 0.0
--  sampOffset = 0.0
--  latOffset = 0.0
--  longOffset = 0.0
--  heightOffset = 0.0
--  lineScale = 1.0
--  sampScale = 1.0
--  latScale = 1.0
--  longScale = 1.0
--  heightScale = 1.0
--  lineNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  lineDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--END_GROUP = IMAGE
--END;
--lvcs
--47.550493 35.395931 664.186757
-diff --git a/contrib/brl/bseg/boxm/tests/frame_00000.txt b/contrib/brl/bseg/boxm/tests/frame_00000.txt
-deleted file mode 100644
-index a66e2014bd..0000000000
---- a/contrib/brl/bseg/boxm/tests/frame_00000.txt
-+++ /dev/null
-@@ -1,7 +0,0 @@
--1 0 0
--0 1 0
--0 0 1
--1 0 0
--0 1 0
--0 0 1
--0 0 0
-diff --git a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx b/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
-deleted file mode 100644
-index 7dc2da196e..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
-+++ /dev/null
-@@ -1,75 +0,0 @@
--
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_binary_io()
--{
--#ifdef DEBUG
--  short nlevels=5;
--  typedef vgl_point_3d<double> point_type;
--  boct_tree<short,point_type > * block = new boct_tree<short,point_type >(nlevels);
--  TEST("No of Max levels of tree",nlevels, block->num_levels());
--
--  block->split(); //block->print();
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<double> world_dim(30,30,30);
--  boxm_scene<boct_tree<short,point_type > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_paths("./boxm_scene", "block");
--  x_write(std::cout, scene, "scene");
--
--  vsl_b_ofstream os("scene.bin");
--  scene.b_write(os);
--  os.close();
--  vul_file::make_directory("./boxm_scene");
--
--  boxm_scene<boct_tree<short,vgl_point_3d<double> > > scene_out;
--  vsl_b_ifstream is("scene.bin", std::ios::binary);
--  scene_out.b_read(is);
--  vpl_rmdir("./boxm_scene");
--  vpl_unlink("./scene.bin");
--
--  // writing the binary file for a scene with grey MOG
--  vgl_point_3d<double>  mog_origin(0,0,0);
--  vgl_vector_3d<double> mog_block_dim(1,1,1);
--  vgl_vector_3d<double> mog_world_dim(3,3,1);
--
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > mog_scene( mog_origin, mog_block_dim, mog_world_dim);
--  mog_scene.set_paths("./boxm_scene", "block");
--  vul_file::make_directory("./boxm_scene");
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&mog_scene);
--
--  while (!iter.end())
--  {
--    mog_scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=mog_scene.get_active_block();
--    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(10,6);
--    block->init_tree(tree);
--    mog_scene.write_active_block();
--    iter++;
--  }
--  mog_scene.write_scene();
--  // writing the binary file for a scene with grey MOG
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_mog_scene;
--  read_mog_scene.load_scene("./boxm_scene/scene.xml");
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_iter(&read_mog_scene);
--  while (!read_iter.end())
--  {
--    read_mog_scene.load_block(read_iter.index().x(),read_iter.index().y(),read_iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=read_mog_scene.get_active_block();
--    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
--    read_iter++;
--  }
--  vpl_rmdir("./boxm_scene");
--  vpl_unlink("./scene.bin");
--#endif // DEBUG
--}
--
--TESTMAIN(test_binary_io);
-diff --git a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx b/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
-deleted file mode 100644
-index 376ee2d9b4..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
-+++ /dev/null
-@@ -1,47 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree.h>
--
--#include "test_utils.h"
--
--typedef boct_tree<short,vgl_point_3d<double> > tree_type;
--
--static void test_block_iter()
--{
--  clean_up();
--  short nlevels=5;
--  auto * block = new tree_type(nlevels);
--  TEST("No of Max levels of tree",nlevels, block->number_levels());
--
--  block->split();
--  block->print();
--  delete block;
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(3,3,3);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  scene.set_paths("./boxm_scene", "block");
--
--  boxm_block_iterator<tree_type> iter = scene.iterator();
--  int num_blocks=0;
--  for (; !iter.end(); ++iter) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type> *block = scene.get_active_block();
--    block->set_tree(new tree_type(5,3));
--    std::cout << block->bounding_box() << std::endl;
--    ++num_blocks;
--    scene.write_active_block();
--  }
--  int x,y,z;
--  scene.block_num(x,y,z);
--  TEST("Number of blocks iterator visits", num_blocks, x*y*z);
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks in test_block_iter: " << boct_tree_cell<short,vgl_point_3d<double> >::nleaks() << '\n';
--#endif
--  clean_up();
--}
--
--TESTMAIN(test_block_iter);
-diff --git a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx b/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
-deleted file mode 100644
-index f65529a973..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
-+++ /dev/null
-@@ -1,51 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <testlib/testlib_test.h>
--#include "test_utils.h"
--
--void test_cell_iterator()
--{
--
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene();
--
--  //get the iterator
--  boxm_cell_iterator<boct_tree<short, float > > iterator = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors);
--  iterator.begin();
--
--  boct_tree_cell<short,float> *cell = *iterator;
--  unsigned num_cells = 0;
--  bool result = true;
--
--  while (!iterator.end()) {
--
--    if( (std::abs(cell->data() - 0.8) > 1e-7) && (std::abs(cell->data() - 0.5) > 1e-7) ){
--      result = false;
--      std::cerr << " Wrong data: " << cell->data() << std::endl;
--    }
--    ++iterator;
--    num_cells ++;
--        if(!iterator.end()){
--    cell = *iterator;
--        }
--  }
--
--  if(num_cells!=120){
--    result = false;
--    std::cerr << "Wrong number of cells: " << num_cells << std::endl;
--  }
--
--  TEST("Valid Test", result, true);
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_cell_iterator " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--  clean_up();
--
--}
--
--
--TESTMAIN(test_cell_iterator);
-diff --git a/contrib/brl/bseg/boxm/tests/test_driver.cxx b/contrib/brl/bseg/boxm/tests/test_driver.cxx
-deleted file mode 100644
-index 3e55d5a0ea..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_binary_io );
--DECLARE( test_block_iter );
--//FAILS ON DASHBOARD FIX_ME
--//DECLARE( test_region_finder );
--DECLARE( test_cell_iterator );
--DECLARE( test_load_neighboring_blocks );
--
--void register_tests()
--{
--  REGISTER( test_binary_io );
--  REGISTER( test_block_iter );
--//FAILS ON DASHBOARD FIX_ME
--// REGISTER( test_region_finder );
--  REGISTER( test_cell_iterator );
--  REGISTER( test_load_neighboring_blocks );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/tests/test_include.cxx b/contrib/brl/bseg/boxm/tests/test_include.cxx
-deleted file mode 100644
-index ae4ae05a88..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_include.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_io_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene_parser.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx b/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
-deleted file mode 100644
-index 1f8fe346ca..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
-+++ /dev/null
-@@ -1,89 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 17-Aug-2010
--
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--void test_load_neighboring_blocks()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
--  std::cout << "Scene Created" << std::endl;
--
--  //iterate through blocks, loading blocks and eighbors
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  bool result = true;
--  while (!iter.end()) {
--    if (scene->load_block_and_neighbors(iter.index().x(),iter.index().y(),iter.index().z())) {
--      //std::cout << "Center blocks : "  << iter.index()<< std::endl;
--      std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > active_blocks = scene->active_blocks();
--
--      //iterate through the active blocks and check that their trees are in memory
--      auto it = active_blocks.begin();
--
--      for (; it!=active_blocks.end(); it++){
--        boxm_block<boct_tree<short, float> > *block = scene->get_block(*it);
--        if(!block)
--          result = false;
--        boct_tree<short, float> *tree = block->get_tree();
--        if(!tree)
--          result =false;
--      }
--
--
--      unsigned sum =0;
--      if (iter.index().x()>0 && iter.index().x()<3) sum++;
--      if (iter.index().y()>0 && iter.index().y()<3) sum++;
--      if (iter.index().z()>0 && iter.index().z()<3) sum++;
--      if(sum == 0)
--        if(active_blocks.size()!=8){
--          result = false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--      if(sum == 1)
--        if(active_blocks.size()!=12){
--          result = false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--      if(sum == 2)
--        if(active_blocks.size()!=18){
--          result = false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--      if(sum == 3)
--        if(active_blocks.size()!=27){
--          result=false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--#if 0
--      std::cout << "Active blocks : " << std::endl;
--      std::set<vgl_point_3d<int> >::iterator it = active_blocks.begin();
--      for (; it!=active_blocks.end(); it++)
--        std::cout << *it << std::endl;
--#endif
--    }
--    iter++;
--
--  }
--
--  scene->unload_active_blocks();
--  if(scene->active_blocks().size()!=0){
--    result = false;
--    std::cout << "Failed to unload active blocks" << std::endl;
--  }
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks test_load_neighboring_blocks: " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  TEST("Valid Test", result, true);
--  clean_up();
--}
--
--
--TESTMAIN(test_load_neighboring_blocks);
-diff --git a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx b/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
-deleted file mode 100644
-index 47d5fd903b..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--//:
--// \file
--// \brief  A test to verify that findind cells within a region is correct
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--void test_region_finder()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene();
--
--  bool result = true;
--
--  if(!scene) result=false;
--
--  //find a region
--
--  {
--    vgl_point_3d<double> max_point(14.0, 14.0, 14.0);
--    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
--    vgl_box_3d<double> roi(min_point, max_point);
--
--    std::vector<boct_tree_cell<short, float>* > cells;
--    scene->leaves_in_region(roi,cells);
--
--
--    if(cells.size()!=64){
--      result=false;
--      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
--    }
--
--    for(unsigned i =0; i<cells.size(); i++)
--      if(std::abs(cells[i]->data()- 0.8f)>1.0e-7)
--      {
--        result = false;
--        std::cerr << cells[i]->data()<<std::endl;
--      }
--
--    cells.clear();
--    scene->unload_active_blocks();
--
--  }
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Region1: " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  //find another region
--  {
--    vgl_point_3d<double> max_point(19.0, 19.0, 19.0);
--    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
--    vgl_box_3d<double> roi(min_point, max_point);
--
--    std::vector<boct_tree_cell<short, float>* > cells;
--    scene->leaves_in_region(roi,cells);
--
--    if(cells.size()!=83){
--      result=false;
--      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
--    }
--
--    cells.clear();
--    scene->unload_active_blocks();
--  }
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Region2: " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  if(!scene) result=false;
--
--  TEST("Correct region found", result, true);
--  clean_up();
--}
--
--
--TESTMAIN(test_region_finder);
-diff --git a/contrib/brl/bseg/boxm/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/tests/test_template_include.cxx
-deleted file mode 100644
-index edd7156927..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_aux_scene.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/tests/test_utils.cxx b/contrib/brl/bseg/boxm/tests/test_utils.cxx
-deleted file mode 100644
-index 58b40215a5..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_utils.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#include "test_utils.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Aug-2010
--
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i)
--{
--  tree-> split(); //now we have 8 cells
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  leaves[i]->set_data(0.8f);
--  leaves[i]->split();
--}
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz)
--{
--  //crete the input scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--
--  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
--
--    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
--
--  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
--  std::string scene_path("./");
--  scene->set_paths(scene_path, "test_scene");
-- #ifdef DEBUG
--  std::cerr << "Leaks Created - scene constructor: " << boct_tree_cell<short,float>::nleaks() << '\n';
--#endif
--  unsigned cell_index = 7;
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  while (!iter.end())
--  {
--    //std::cout << "Loading block " << iter.index() << std::endl;
--    scene->load_block(iter.index());
--    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
--    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
--    auto *tree = new boct_tree<short,float>(0.5f, 3, 1);
--    //tree->print();
--    init_tree(tree, cell_index);
--    //tree->print();
--    block->init_tree(tree);
--    scene->write_active_block();
--    if (cell_index == 0) cell_index = 7;
--    cell_index--;
--    ++iter;
--  }
--  //scene->unload_active_blocks();
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << '\n';
--#endif
--
--  return scene;
--}
--
--void clean_up()
--{
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());
--    //vul_file::delete_file_glob(file_it());// already deleted ?? FIX_ME
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/tests/test_utils.h b/contrib/brl/bseg/boxm/tests/test_utils.h
-deleted file mode 100644
-index 43f864a0da..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_utils.h
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#ifndef boxm_test_utils_h_
--#define boxm_test_utils_h_
--//:
--// \file
--// \brief  A file containing utility functions for other tests
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <boxm/boxm_scene.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i);
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2);
--
--void clean_up();
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/CMakeLists.txt b/contrib/brl/bseg/boxm/util/CMakeLists.txt
-deleted file mode 100644
-index 10f3b5fd49..0000000000
---- a/contrib/brl/bseg/boxm/util/CMakeLists.txt
-+++ /dev/null
-@@ -1,23 +0,0 @@
--# brl/bseg/boxm/util/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_util_sources
--    boxm_cell_data_traits.h                 boxm_cell_data_traits.cxx
--    boxm_plane_ransac.h
--    boxm_quad_scan_iterator.h               boxm_quad_scan_iterator.cxx
--    boxm_rational_camera_utils.h            boxm_rational_camera_utils.cxx
--    boxm_raytrace_operations.h              boxm_raytrace_operations.cxx
--    boxm_triangle_interpolation_iterator.h  boxm_triangle_interpolation_iterator.hxx
--    boxm_triangle_scan_iterator.h           boxm_triangle_scan_iterator.cxx
--    boxm_utils.h                            boxm_utils.cxx
--    boxm_vrml_util.h
--    boxm_test_util.h                        boxm_test_util.cxx
--   )
--
--aux_source_directory(Templates boxm_util_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_util LIBRARY_SOURCES ${boxm_util_sources})
--target_link_libraries(boxm_util boxm boxm_sample bvrml boct bsta ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx b/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
-deleted file mode 100644
-index 3a276cc3b2..0000000000
---- a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
--
--BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
-deleted file mode 100644
-index b4bf234941..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
-+++ /dev/null
-@@ -1,25 +0,0 @@
--#include "boxm_cell_data_traits.h"
--//:
--// \file
--
--
--//: Template specialization of zero_val for floating point case
--template <>
--float boxm_zero_val<short, float>()
--{
--  return 0.0f;
--}
--
--
--//: Template specialization of zero_val for unimodal gaussian
--template <>
--bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >()
--{
--  return {};
--}
--
--template <>
--mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>()
--{
--  return {};
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
-deleted file mode 100644
-index c96599e730..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
-+++ /dev/null
-@@ -1,89 +0,0 @@
--// This is brl/bseg/boxm/util/boxm_cell_data_traits.h
--#ifndef boxm_cell_data_traits_h_
--#define boxm_cell_data_traits_h_
--//:
--// \file
--// \brief  Set of accessors of cell's data, taking care of different datatypes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date   December 9, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree_cell.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--//: Float to float
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, float >* cell,  double /*step_len*/)
--{
--  //return 1.0 - std::exp(-cell->data()*step_len);
--  return cell->data();
--}
--
--//: Float to float
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, short >* cell,  double /*step_len*/)
--{
--  return (float)cell->data();
--}
--
--//: bool to float
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, bool >* cell,  double /*step_len*/)
--{
--  return (float)cell->data();
--}
--
--//: Mixture of gaussians to float; return the mean
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, bsta_num_obs<bsta_gauss_sf1> >* cell, double /*step_len*/)
--{
--  return cell->data().mean();
--}
--
--//: Mixture of gaussians to float; return the mean
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >* cell, double /*step_len*/)
--{
--  return cell->data().expected_value();
--}
--
--//: boxm_sample to float. Return the probability values
--template <class T_loc, class T_data>
--float boxm_cell_to_float(boct_tree_cell<T_loc, T_data >* cell, double step_len)
--{
--  return 1.f - float(std::exp(-cell->data().basic_val()*step_len));
--}
--
--
--template <class T_loc, class T_data>
--T_data boxm_zero_val()
--{
--  return T_data(0);
--}
--
--static const unsigned int n_gaussian_modes_ = 3;
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
--typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
--template <>
--mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>();
--
--template <>
--bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >();
--
--template <>
--float boxm_zero_val<short, float >();
--
--//: boxm_scalar_sample to float. Return the normalized scalar value
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_scalar_sample<float>  >* cell, double /*step_len*/)
--{
--  return cell->data().basic_val();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h b/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
-deleted file mode 100644
-index 07d10348a6..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
-+++ /dev/null
-@@ -1,126 +0,0 @@
--#ifndef boxm_plane_ransac_h_
--#define boxm_plane_ransac_h_
--//:
--// \file
--// \brief class to find the optimal intersecting 3D line of a set of 3D planes.
--//
--// \author G. Tunali
--//
--// \verbatim
--//  Modifications
--//   Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
--// \endverbatim
--
--#include <iostream>
--#include <cstdlib>
--#include <list>
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_distance.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_closest_point.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#define ITER_MAX 100
--
--template <class T>
--bool boxm_plane_ransac(std::vector<boxm_edge_tangent_sample<T> > aux_samples,
--                       std::vector<T> /*weights*/,
--                       vgl_infinite_line_3d<T>& line,
--                       T &min_res, vgl_box_3d<double> cell_global_box,
--                       unsigned int threshold, float ortho_thres = 0.01f, float volume_ratio = 128.0f)
--{
--  unsigned int num_imgs = aux_samples.size();
--
--  vgl_point_3d<T> local_origin((T)cell_global_box.centroid_x(),(T)cell_global_box.centroid_y(),(T)cell_global_box.centroid_z());
--  std::list<vgl_plane_3d<T> > fit_planes;
--  min_res=T(1e10);
--  line=vgl_infinite_line_3d<T>(vgl_vector_2d<T>(-10000,-10000),vgl_vector_3d<T>(0,0,1));
--  std::vector<T> ws;
--  bool set=false;
--  // this threshold is to check participation from number of images
--  if (num_imgs<=threshold)
--    return set;
--
--  for (unsigned iter=0; iter<ITER_MAX; iter++)
--  {
--    fit_planes.clear();
--    ws.clear();
--    // select two imgs randomly
--    int index1 = std::rand() % num_imgs;
--    int index2 = index1;
--    while (index2==index1)
--      index2=std::rand() % num_imgs;
--
--    int index1_1 =std::rand() % aux_samples[index1].num_obs();
--    int index2_1 =std::rand() % aux_samples[index2].num_obs();
--
--    vgl_plane_3d<T> plane1 = aux_samples[index1].obs(index1_1).plane_;
--    vgl_plane_3d<T> plane2 = aux_samples[index2].obs(index2_1).plane_;
--
--    vgl_infinite_line_3d<T> inters_line;
--    // form a hypothesis
--    if (vgl_intersection(plane1, plane2, inters_line))
--    {
--      vgl_vector_3d<T> line_dir = inters_line.direction();
--      vgl_point_3d<T> p=vgl_closest_point<T>(inters_line,local_origin);
--      int cnt_imgs=0;
--      // only if the hypothesis is close to the cell in consideration
--      // can be made more tighter.
--      if (vgl_distance<T>(p,local_origin)<0.67*cell_global_box.width())
--      {
--        for (unsigned i=0; i<aux_samples.size(); ++i) {
--          bool flag=false;
--          for (unsigned j=0;j<aux_samples[i].num_obs();j++)
--          {
--            vgl_plane_3d<T> plane = aux_samples[i].obs(j).plane_;
--            vgl_vector_3d<T> normal = plane.normal();
--            // see if the line direction and plane normal is perpendicular
--            T res = dot_product(normal,line_dir);
--            if (std::fabs(res) < T(ortho_thres))  {  // ortho_thres, used to be hard-coded to 0.05, then made a param with default 0.01 (stricter)
--              // check to see if the line is close to the plane
--              if (plane.contains(p,T(cell_global_box.width())/T(volume_ratio)))  // volume_ratio, used to be hard-coded to 8, then made a param with default 128 (stricter)
--              {
--                fit_planes.push_back(plane);
--                //ws.push_back(weights[i]);
--                ws.push_back(aux_samples[i].obs(j).seg_len_);
--                flag=true;
--              }
--            }
--          }
--          if (flag)
--            cnt_imgs++;
--        }
--      }
--
--      // intersect the selected planes
--      if (cnt_imgs > (int)threshold ) {
--        T res=0;
--        vgl_infinite_line_3d<T> l;
--        bool good = vgl_intersection(fit_planes, ws, l, res);
--        vgl_point_3d<double> p0,p1;
--        vgl_vector_2d<double> x0(l.x0().x(), l.x0().y());
--        vgl_vector_3d<double> dir(l.direction().x(), l.direction().y(), l.direction().z());
--
--        if (good&&vgl_intersection<double>(cell_global_box, vgl_infinite_line_3d<double>(x0,dir), p0, p1)) {
--          if (res<min_res) {
--            min_res=res;
--            line=l;
--            set=true;
--          }
--        }
--      }
--    }
--  }
--
--  return set;
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
-deleted file mode 100644
-index c1e220a294..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
-+++ /dev/null
-@@ -1,188 +0,0 @@
--#include <vector>
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_quad_scan_iterator.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: constructor
--boxm_quad_scan_iterator::boxm_quad_scan_iterator(double *verts_x, double *verts_y,
--                                                 unsigned int v0, unsigned int v1,
--                                                 unsigned int v2, unsigned int v3):poly_()
--{
--  poly_.new_sheet();
--
--  poly_.push_back(verts_x[v0] * supersample_ratio_ - 0.5,
--                  verts_y[v0] * supersample_ratio_ - 0.5);
--  poly_.push_back(verts_x[v1] * supersample_ratio_ - 0.5,
--                  verts_y[v1] * supersample_ratio_ - 0.5);
--  poly_.push_back(verts_x[v2] * supersample_ratio_ - 0.5,
--                  verts_y[v2] * supersample_ratio_ - 0.5);
--  poly_.push_back(verts_x[v3] * supersample_ratio_ - 0.5,
--                  verts_y[v3] * supersample_ratio_ - 0.5);
--
--  super_it_= new vgl_polygon_scan_iterator<double>(poly_,false);
--
--  poly_bb_.update(verts_x[v0], verts_y[v0]);
--  poly_bb_.update(verts_x[v1], verts_y[v1]);
--  poly_bb_.update(verts_x[v2], verts_y[v2]);
--  poly_bb_.update(verts_x[v3], verts_y[v3]);
--
--  int poly_xmin = (int)std::floor(poly_bb_.xmin());
--  int poly_xmax = (int)std::floor(poly_bb_.xmax()) + 1;
--  poly_diameter_x_ = (poly_xmax - poly_xmin) + 1;
--  aa_vals_ = new float[poly_diameter_x_];
--  aa_vals_offset_ = -poly_xmin;
--  next_return_ = false;
--}
--
--
--//: Resets the scan iterator to before the first scan line
--//  After calling this function, next() needs to be called before
--//  startx() and endx() form a valid scan line.
--void boxm_quad_scan_iterator::reset()
--{
--  super_it_->reset();
--  next_return_ = super_it_->next();
--  while (next_return_ && super_it_->scany() < 0) {
--    next_return_ = super_it_->next();
--  }
--}
--
--//: Tries to move to the next scan line.
--//  Returns false if there are no more scan lines.
--bool boxm_quad_scan_iterator::next()
--{
--  if (!next_return_) {
--    return false;
--  }
--  int super_scany = super_it_->scany();
--  scany_ = super_scany / supersample_ratio_; // super_scany should always be >= 0
--
--  // initialize startx_ and endx_
--  startx_ = int(poly_bb_.xmax()) + 1;
--  endx_ =  int(poly_bb_.xmin()) - 1;
--
--  // compute antialiasing values for each pixel in scanline
--  //std::fill(aa_vals_.begin(), aa_vals_.end(), 0.0f);
--  for (unsigned int i=0; i<poly_diameter_x_; i++)
--    aa_vals_[i] = 0.0f;
--
--  int super_scany_end = (scany_ + 1)*supersample_ratio_;
--  static const float increment = 1.0f / (supersample_ratio_*supersample_ratio_);
--  static const float full_increment = 1.0f / (supersample_ratio_);
--
--  while ( (super_scany < super_scany_end) && next_return_ ) {
--    int super_startx = super_it_->startx();
--    int super_endx = super_it_->endx() + 1;
--
--    super_startx = std::max(0, super_startx);
--    super_endx = std::max(0, super_endx);
--    // make sure super_startx < super_endx
--    if (super_endx > super_startx) {
--      int scanline_startx = super_startx / supersample_ratio_;
--      int scanline_endx = ((super_endx - 1)/ supersample_ratio_) + 1;
--      // update startx and endx
--      if (scanline_startx < startx_) {
--        startx_ = scanline_startx;
--      }
--      if (scanline_endx > endx_) {
--        endx_ = scanline_endx;
--      }
--      // case 1: run covers 1 superpixel only
--      if (scanline_startx + 1 == scanline_endx) {
--        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(super_endx - super_startx);
--      }
--      // case 2: startx is less than endx by more than 1
--      else {
--        // partial coverage at the beginning of scanline
--        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(supersample_ratio_ - (super_startx % supersample_ratio_));
--
--        // full coverage in middle of scanline
--        for (int x = scanline_startx + 1; x < scanline_endx-1; ++x) {
--          aa_vals_[aa_vals_offset_ + x] += full_increment;
--        }
--        // partial coverage at end of scanline
--        aa_vals_[aa_vals_offset_ + scanline_endx - 1] += increment*((super_endx - 1)% supersample_ratio_ + 1);
--      }
--    }
--    next_return_ = super_it_->next();
--    super_scany = super_it_->scany();
--  }
--  return true;
--}
--
--//: y-coordinate of the current scan line.
--int boxm_quad_scan_iterator::scany() const
--{
--  return scany_;
--}
--
--//: Returns starting x-value of the current scan line.
--//  startx() should be smaller than endx(), unless the scan line is empty
--int boxm_quad_scan_iterator::startx() const
--{
--  return startx_;
--}
--
--//: Returns ending x-value of the current scan line.
--//  endx() should be larger than startx(), unless the scan line is empty
--int  boxm_quad_scan_iterator::endx() const
--{
--  return endx_;
--}
--
--//: returns the amount of pixel at location x in the current scanline covered by the triangle
--float boxm_quad_scan_iterator::pix_coverage(int x)
--{
--  return aa_vals_[aa_vals_offset_ + x];
--}
--
--bool
--boxm_quad_scan_iterator:: x_start_end_val(const double * vals,double & start_val,double & end_val)
--{
--  int * chainnum=nullptr;
--  int * vertnum=nullptr;
--  int numcrossedges=0;
--  super_it_->get_crossedge_vertices(chainnum,vertnum,numcrossedges);
--  if (numcrossedges==2)
--  {
--    for (int i=0;i<numcrossedges;++i)
--    {
--      vgl_point_2d<double> p1=poly_[chainnum[i]][vertnum[i]];
--      double val1=vals[vertnum[i]];
--      double val2=0;
--      vgl_point_2d<double> p2;
--      if (vertnum[i]==3)
--      {
--        val2=vals[0];
--        p2=poly_[chainnum[i]][0];
--      }
--      else
--      {
--        val2=vals[vertnum[i]+1];
--        p2=poly_[chainnum[i]][vertnum[i]+1];
--      }
--      if (i==0)
--        start_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
--      else
--        end_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
--    }
--    delete [] vertnum;
--    delete [] chainnum;
--    return true;
--  }
--  else
--    return false;
--}
--
--
--boxm_quad_scan_iterator::~boxm_quad_scan_iterator()
--{
--  delete super_it_;
--  delete[] aa_vals_;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
-deleted file mode 100644
-index 86c7bd0565..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
-+++ /dev/null
-@@ -1,66 +0,0 @@
--#ifndef boxm_quad_scan_iterator_h_
--#define boxm_quad_scan_iterator_h_
--//:
--// \file
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vgl/vgl_region_scan_iterator.h>
--#include <vgl/vgl_polygon_scan_iterator.h>
--
--#include <vbl/vbl_bounding_box.h>
--
--class boxm_quad_scan_iterator : public vgl_region_scan_iterator
--{
-- public:
--  //: constructor
--  boxm_quad_scan_iterator(double *verts_x, double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2, unsigned int v3 = 3);
--  ~boxm_quad_scan_iterator() override;
--
--  //: Resets the scan iterator to before the first scan line
--  //  After calling this function, next() needs to be called before
--  //  startx() and endx() form a valid scan line.
--  void reset() override;
--
--  //: Tries to move to the next scan line.
--  //  Returns false if there are no more scan lines.
--  bool next() override;
--
--  //: y-coordinate of the current scan line.
--  int  scany() const override;
--
--  //: Returns starting x-value of the current scan line.
--  //  startx() should be smaller than endx(), unless the scan line is empty
--  int  startx() const override;
--
--  //: Returns ending x-value of the current scan line.
--  //  endx() should be larger than startx(), unless the scan line is empty
--  int  endx() const override;
--
--  //: returns the amount of pixel at location x in the current scanline covered by the triangle
--  float pix_coverage(int x);
--
--  bool x_start_end_val(const double * vals,double & start_val,double & end_val);
--
--
-- protected:
--  static const unsigned int supersample_ratio_ = 1;
--  vgl_polygon_scan_iterator<double> * super_it_;
--  vgl_polygon<double>  poly_;
--
--  int startx_;
--  int endx_;
--  int scany_;
--  bool next_return_;
--
--  unsigned int poly_diameter_x_;
--  float* aa_vals_;
--  int aa_vals_offset_;
--
--  vbl_bounding_box<double,2> poly_bb_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
-deleted file mode 100644
-index 4ffdd47b22..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
-+++ /dev/null
-@@ -1,36 +0,0 @@
--#include "boxm_rational_camera_utils.h"
--#include <vgl/vgl_point_2d.h>
--
--vgl_plane_3d<double>
--boxm_rational_camera_utils::boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
--                                                           vgl_plane_3d<double> top,
--                                                           vgl_plane_3d<double> bottom,
--                                                           unsigned ni, unsigned nj)
--{
--   vgl_point_3d<double> top_guess(0,0,-top.d()/top.c());
--   vgl_point_3d<double> bottom_guess(0,0,-bottom.d()/bottom.c());
--   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),top,top_guess,top_guess);
--   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),bottom,bottom_guess,bottom_guess);
--
--   vgl_plane_3d<double> parallelplane(bottom_guess-top_guess,top_guess);
--
--   return parallelplane;
--}
--
--void
--boxm_rational_camera_utils::project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
--                                                            vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
--                                                            double* xverts, double* yverts,
--                                                            float* vertdist)
--{
--  double a=plane.a();
--  double b=plane.b();
--  double c=plane.c();
--  double d=plane.d();
--  double denom=std::sqrt(a*a+b*b+c*c);
--  for (unsigned i=0; i<corners.size(); ++i)
--  {
--    rcam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
--    vertdist[i]=float((corners[i].x()*a+corners[i].y()*b+corners[i].z()*c+d)/denom);
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
-deleted file mode 100644
-index 61c9252276..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#ifndef boxm_rational_camera_utils_h
--#define boxm_rational_camera_utils_h
--
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/algo/vpgl_backproject.h>
--
--class boxm_rational_camera_utils
--{
-- public:
--  static vgl_plane_3d<double>  boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
--                                                              vgl_plane_3d<double> top,
--                                                              vgl_plane_3d<double> bottom,
--                                                              unsigned ni, unsigned nj);
--  static void project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
--                                              vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
--                                              double* xverts, double* yverts,
--                                              float* vertdist);
--};
--
--class abs_functor
--{
-- public:
--  abs_functor()= default;
--
--  float operator()(float x) const { return std::fabs(x); }
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
-deleted file mode 100644
-index 1b1a95623b..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
-+++ /dev/null
-@@ -1,232 +0,0 @@
--#include "boxm_raytrace_operations.h"
--
--bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance)
--{
--  // multiply each vertex distance by alpha
--  float vert_alpha_distances[8];
--  float *vert_dist_ptr = vert_distances;
--  float *vert_alpha_dist_ptr = vert_alpha_distances;
--  for (unsigned int i=0; i<8; ++i) {
--    *vert_alpha_dist_ptr++ = *vert_dist_ptr++ * alpha;
--  }
--
--  // for each face, create two triangle iterators and fill in pixel data
--  // X_LOW
--  // tri 0
--  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_alpha_distances, 0, 4, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--
--  // X_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 1, 2, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 2, 6, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--
--  // Y_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 5, 4);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // Y_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 2, 6);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 6, 7);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // Z_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 2);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 2, 3);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // Z_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 5, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  return true;
--}
--
--
--bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
--                     float* vert_distances, boct_face_idx visible_faces,
--                     vil_image_view<float> &depth_image)
--{
--  // for each face, create two triangle iterators and fill in pixel data
--  // X_LOW
--  // tri 0
--  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_distances, 0, 4, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--
--  // X_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 1, 2, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 2, 6, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--
--  // Y_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 5, 4);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // Y_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 2, 6);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 6, 7);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // Z_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 2);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 2, 3);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // Z_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 5, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  return true;
--}
--
--
--bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val)
--{
--  // for each face, create two triangle iterators and fill in pixel data
--  boxm_triangle_scan_iterator tri_it(xverts_2d, yverts_2d, 0,4,3);
--  if (visible_faces & X_LOW) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 4, 3);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 3);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & X_HIGH) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 1, 2, 5);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 2, 6, 5);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Y_LOW) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 5);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 5, 4);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Y_HIGH) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 2, 6);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 6, 7);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Z_LOW) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 2);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 2, 3);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Z_HIGH) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 5, 6);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 6);
--    tri_fill_value(tri_it, img, val);
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
-deleted file mode 100644
-index ee6147127b..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
-+++ /dev/null
-@@ -1,452 +0,0 @@
--#ifndef boxm_raytrace_operations_h_
--#define boxm_raytrace_operations_h_
--//:
--// \file
--
--#include <iostream>
--#include "boxm_triangle_interpolation_iterator.h"
--#include "boxm_triangle_scan_iterator.h"
--#include <boxm/boxm_apm_traits.h>
--
--#include <vnl/algo/vnl_determinant.h>
--#include <vgl/vgl_triangle_scan_iterator.h>
--#include <boct/boct_tree.h>
--#include <vil/vil_image_view.h>
--
--#if 0
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val);
--
--bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance);
--bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
--                     float* vert_distances, boct_face_idx visible_faces,
--                     vil_image_view<float> &depth_image);
--template<class T, class tri_int_it_t>
--bool tri_interpolated_weighted_sum(tri_int_it_t &tri_it, vil_image_view<T> const& values, T &val_sum, float &weight_sum, bool subtract)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= values.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
--
--    if (subtract) {
--      for (unsigned int x = startx; x < endx; ++x) {
--        float point_dist = tri_it.value_at(x);
--        val_sum -= values(x,yu) * point_dist;
--        weight_sum -= point_dist;
--      }
--    }
--    else {
--      for (unsigned int x = startx; x < endx; ++x) {
--        float point_dist = tri_it.value_at(x);
--        val_sum += values(x,yu) * point_dist;
--        weight_sum += point_dist;
--      }
--    }
--  }
--  return true;
--}
--
--//: returns the sum of the weights
--template<class T1, class T2, class tri_it_t>
--bool tri_interpolated_weighted_sum(tri_it_t &tri_it, vil_image_view<T1> const& weights, vil_image_view<T2> const& values, T2 &val_sum, T1 &weight_sum, bool subtract=false)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= values.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
--
--    if (subtract) {
--      for (unsigned int x = startx; x < endx; ++x) {
--        T1 weight = tri_it.value_at(x)*weights(x,yu);
--        val_sum -= weight * values(x,yu);
--        weight_sum -= weight;
--      }
--    }
--    else {
--      for (unsigned int x = startx; x < endx; ++x) {
--        T1 weight = tri_it.value_at(x)*weights(x,yu);
--        val_sum += weight * values(x,yu);
--        weight_sum += weight;
--      }
--    }
--  }
--  return true;
--}
--
--
--template<class T, class tri_it_t>
--void tri_interpolate_values(tri_it_t &tri_it, vil_image_view<T> &img, bool subtract = false)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    if (subtract) {
--      for (unsigned int x = startx; x < endx; ++x) {
--        img(x,yu) -= tri_it.value_at(x);
--      }
--    }
--    else {
--      for (unsigned int x = startx; x < endx; ++x) {
--        img(x,yu) += tri_it.value_at(x);
--      }
--    }
--  }
--  return;
--}
--
--
--#if 0
--template<class T, class tri_it_T>
--void tri_interpolate_values(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &img, vil_image_view<float> &pix_coverage, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
--{
--  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  // (no need to compute barycentric coordinates at each step)
--  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
--  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
--  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
--  double Acol2[] = {1.0, 1.0, 1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2);
--  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
--  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
--  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
--
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu > img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      T interp_val = (T)(s0*x + s1*y + s2);
--      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
--        min_img(x,yu) = interp_val;
--      }
--      if (max_img(x,yu) < interp_val) {
--        max_img(x,yu) = interp_val;
--      }
--    }
--  }
--  return;
--}
--#endif
--
--template<class T, class tri_it_T>
--void tri_interpolate_min_max(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &min_img, vil_image_view<T> &max_img, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
--{
--  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  // (no need to compute barycentric coordinates at each step)
--  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
--  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
--  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
--  double Acol2[] = {1.0, 1.0, 1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2);
--  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
--  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
--  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
--
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= max_img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)max_img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)max_img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      T interp_val = (T)(s0*x + s1*y + s2);
--      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
--        min_img(x,yu) = interp_val;
--      }
--      if (max_img(x,yu) < interp_val) {
--        max_img(x,yu) = interp_val;
--      }
--    }
--  }
--  return;
--}
--
--template<class T1, class T2>
--void tri_weighted_sum(vgl_triangle_scan_iterator<double> &tri_it, vil_image_view<T1> &img, vil_image_view<T2> &weights, T1 &val_sum, T2 &weight_sum)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      val_sum += img(x,yu)*weights(x,yu);
--      weight_sum += weights(x,yu);
--    }
--  }
--  return;
--}
--
--template<class T, class tri_it_T>
--void tri_fill_value(tri_it_T &tri_it, vil_image_view<T> &img, T val)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      img(x,yu) = val;
--    }
--  }
--  return;
--}
--
--#if 0 // this function commented out
--template <class T>
--void tri_fill_value_aa(boxm_triangle_scan_iterator_aa &tri_it, vil_image_view<T> &img, vil_image_view<float> &aa_weights, T val)
--{
--  tri_it.reset();
--  while (tri_it.next())
--  {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      float pix_cov = tri_it.pix_coverage(x);
--      if ((pix_cov < 0.0f) || (pix_cov > 1.0f)) {
--        std::cerr << " error: pix_cov = " << pix_cov << std::endl;
--      }
--      aa_weights(x,yu) += tri_it.pix_coverage(x);
--      img(x,yu) += val * pix_cov;
--    }
--  }
--  return;
--}
--#endif // 0
--
--template<class T>
--bool cube_mean(double* xverts_2d, double* yverts_2d, float* vert_dists, boct_face_idx visible_faces, vil_image_view<T> const& values, T &mean)
--{
--  // for each face, create two triangle iterators to interpolate distances
--  T value_sum(0);
--  float weight_sum(0);
--  // X_LOW
--  // tri 0
--  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_dists, 0, 3, 4);
--  if (visible_faces & X_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 3, 4, 7);
--  if (visible_faces & X_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // X_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 1, 2, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 5, 6);
--  if (visible_faces & X_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Y_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 1, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 0, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Y_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 7, 3, 2);
--  if (visible_faces & Y_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 6, 7);
--  if (visible_faces & Y_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Z_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 1);
--  if (visible_faces & Z_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 3);
--  if (visible_faces & Z_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Z_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 5, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 7, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  if (std::fabs(weight_sum) > 1e-6)  {
--    mean = value_sum / weight_sum;
--  }
--  else {
--    mean = T(0);
--    return false;
--  }
--  return true;
--}
--
--inline void init_triangle_scan_iterator(vgl_triangle_scan_iterator<double> &tri_it, const double* xverts, const double* yverts, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
--{
--  // subtract 0.5 to follow convention that the center of pixel i,j is located at coordinates i+0.5, j+0.5
--  tri_it.a.x = xverts[v0] - 0.5; tri_it.a.y = yverts[v0] - 0.5;
--  tri_it.b.x = xverts[v1] - 0.5; tri_it.b.y = yverts[v1] - 0.5;
--  tri_it.c.x = xverts[v2] - 0.5; tri_it.c.y = yverts[v2] - 0.5;
--}
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx b/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
-deleted file mode 100644
-index 1586ba9fcd..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
-+++ /dev/null
-@@ -1,141 +0,0 @@
--#include "boxm_test_util.h"
--#include <vgl/vgl_line_3d_2_points.h>
--#include <vnl/io/vnl_io_matrix_fixed.h>
--#include <vgl/algo/vgl_rotation_3d.h>
--
--void generate_persp_camera(double focal_length,
--                           vgl_point_2d<double>& pp,  //principal point
--                           double x_scale, double y_scale,
--                           vgl_point_3d<double>& camera_center,
--                           vpgl_perspective_camera<double>& cam)
--{
--  vpgl_calibration_matrix<double> K(focal_length,pp, x_scale, y_scale);
--  cam.set_calibration(K);
--  cam.set_camera_center(camera_center);
--}
--
--vpgl_rational_camera<double>
--perspective_to_rational(vpgl_perspective_camera<double>& cam_pers)
--{
--  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
--  std::vector<double> neu_u,den_u,neu_v,den_v;
--  double x_scale = 1.0, x_off = 0.0,
--         y_scale = 1.0, y_off = 0.0,
--         z_scale = 1.0, z_off = 0.0,
--         u_scale = 1.0, u_off = 0.0,
--         v_scale = 1.0, v_off = 0.0;
--
--  for (int i=0; i<20; i++) {
--    neu_u.push_back(0.0);
--    neu_v.push_back(0.0);
--    den_u.push_back(0.0);
--    den_v.push_back(0.0);
--  }
--
--  int vector_map[] = {9,15,18,19};
--
--  for (int i=0; i<4; i++) {
--    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
--    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
--    den_u[vector_map[i]] = cam_pers_matrix(2,i);
--    den_v[vector_map[i]] = cam_pers_matrix(2,i);
--  }
--
--  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
--                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
--                                       u_scale,u_off,v_scale,v_off);
--  return cam_rat;
--}
--
--vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
--
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--
--  vpgl_perspective_camera<double> persp_cam;
--  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--        double r[] = { 1, 0, 0,
--              0, -1, 0,
--              0, 0, -1 };
--
--  vnl_matrix_fixed<double,3,3> R(r);
--  persp_cam.set_rotation(vgl_rotation_3d<double>(R));
--
--  //persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
--  vpgl_rational_camera<double>* rat_cam = new vpgl_rational_camera<double>(perspective_to_rational(persp_cam));
--  return rat_cam;
--}
--
--vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
--
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--
--  auto * persp_cam= new vpgl_perspective_camera<double>();
--  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, *persp_cam);
--  persp_cam->look_at(vgl_homg_point_3d<double>(centroid));
--  return persp_cam;
--}
--
--std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
--
--  std::vector<vgl_point_3d<double> > centers;
--  unsigned i=0;
--  for (double t=0; t<=1.0; t+=0.1) {
--    vgl_point_3d<double> centroid = diag.point_t(1-t);
--    centers.push_back(centroid);
--    std::cout << centers[i++] << std::endl;
--  }
--
--  std::vector<vpgl_camera_double_sptr> cameras;
--  for (auto camera_center : centers)
--  {
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
--    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--  }
--  return cameras;
--}
--
--std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
--
--  std::vector<vgl_point_3d<double> > centers;
--  vgl_point_3d<double> centroid(0,0,0);
--  double x,y;
--  double alpha = 0;
--  double delta_alpha = vnl_math::pi/9.;
--  for (unsigned i=0; i<11; i++) {
--    x = boxm_camera_dist*std::cos(alpha);
--    y = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(centroid.x()+x, centroid.y()+y, centroid.z());
--    std::cout << centers[i] << std::endl;
--    alpha += delta_alpha;
--  }
--
--  std::vector<vpgl_camera_double_sptr> cameras;
--  for (auto camera_center : centers)
--  {
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
--    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--  }
--  return cameras;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.h b/contrib/brl/bseg/boxm/util/boxm_test_util.h
-deleted file mode 100644
-index b960b6d3c7..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_test_util.h
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#ifndef boxm_test_util_h
--#define boxm_test_util_h
--//:
--// \file
--#include <boct/boct_tree.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vpgl/vpgl_rational_camera.h>
--
--typedef boct_tree<short,vgl_point_3d<double> > tree_type;
--
--constexpr int IMAGE_U = 800;
--constexpr int IMAGE_V = 500;
--constexpr int boxm_x_scale = 500;
--constexpr int boxm_y_scale = 500;
--constexpr double boxm_focal_length = 1.0;
--constexpr double boxm_camera_dist = 300;
--constexpr unsigned num_train_images = 20;
--constexpr bool verbose = true;
--
--void generate_persp_camera(double focal_length,
--                           vgl_point_2d<double>& pp,  //principal point
--                           double x_scale, double y_scale,
--                           vgl_point_3d<double>& camera_center,
--                           vpgl_perspective_camera<double>& cam);
--
--vpgl_rational_camera<double>
--perspective_to_rational(vpgl_perspective_camera<double>& cam_pers);
--
--vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world);
--
--vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world);
--
--//: create a trajectory of perspective cameras at the diagonal of world (inside)
--std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world);
--
--std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world);
--#endif // boxm_test_util_h
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
-deleted file mode 100644
-index e3561eb3b5..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
-+++ /dev/null
-@@ -1,53 +0,0 @@
--#ifndef boxm_triangle_interpolation_iterator_h_
--#define boxm_triangle_interpolation_iterator_h_
--//:
--// \file
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vgl/vgl_region_scan_iterator.h>
--#include <vgl/vgl_triangle_scan_iterator.h>
--
--template<class T>
--class boxm_triangle_interpolation_iterator : public vgl_region_scan_iterator
--{
-- public:
--  //: constructor
--  boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *values, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
--
--  //: Resets the scan iterator to before the first scan line
--  //  After calling this function, next() needs to be called before
--  //  startx() and endx() form a valid scan line.
--  void reset() override;
--
--  //: Tries to move to the next scan line.
--  //  Returns false if there are no more scan lines.
--  bool next() override;
--
--  //: y-coordinate of the current scan line.
--  int  scany() const override;
--
--  //: Returns starting x-value of the current scan line.
--  //  startx() should be smaller than endx(), unless the scan line is empty
--  int  startx() const override;
--
--  //: Returns ending x-value of the current scan line.
--  //  endx() should be larger than startx(), unless the scan line is empty
--  int  endx() const override;
--
--  //: returns the interpolated value at location x in the current scanline
--  T value_at(int x);
--
-- protected:
--
--  vgl_triangle_scan_iterator<double> tri_it_;
--
--  double s0_;
--  double s1_;
--  double s2_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
-deleted file mode 100644
-index 8ea38cb6c3..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_triangle_interpolation_iterator_hxx_
--#define boxm_triangle_interpolation_iterator_hxx_
--//:
--// \file
--
--#include <vector>
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_triangle_interpolation_iterator.h"
--
--#include <vnl/algo/vnl_determinant.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: constructor
--template<class T>
--boxm_triangle_interpolation_iterator<T>::boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *vals, unsigned int v0, unsigned int v1, unsigned int v2)
--: tri_it_()
--{
--  tri_it_.a.x = verts_x[v0]  - 0.5;
--  tri_it_.a.y = verts_y[v0]  - 0.5;
--  tri_it_.b.x = verts_x[v1]  - 0.5;
--  tri_it_.b.y = verts_y[v1]  - 0.5;
--  tri_it_.c.x = verts_x[v2]  - 0.5;
--  tri_it_.c.y = verts_y[v2]  - 0.5;
--
--
--  // compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  double Acol0[] = {tri_it_.a.x + 0.5, tri_it_.b.x + 0.5, tri_it_.c.x + 0.5};
--  double Acol1[] = {tri_it_.a.y + 0.5, tri_it_.b.y + 0.5, tri_it_.c.y + 0.5};
--  double Acol2[] = {1.0, 1.0, 1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2);
--  s0_ = vnl_determinant(Z, Acol1, Acol2) / detA;
--  s1_ = vnl_determinant(Acol0, Z, Acol2) / detA;
--  s2_ = vnl_determinant(Acol0, Acol1, Z) / detA;
--
--  //std::cout << "s0 = " << s0_ <<"  s1 = " << s1_ << " s2 = " << s2_ << std::endl;
--}
--
--
--//: Resets the scan iterator to before the first scan line
--//  After calling this function, next() needs to be called before
--//  startx() and endx() form a valid scan line.
--template<class T>
--void boxm_triangle_interpolation_iterator<T>::reset()
--{
--  tri_it_.reset();
--}
--
--//: Tries to move to the next scan line.
--//  Returns false if there are no more scan lines.
--template<class T>
--bool boxm_triangle_interpolation_iterator<T>::next()
--{
--  return tri_it_.next();
--}
--
--//: y-coordinate of the current scan line.
--template<class T>
--int boxm_triangle_interpolation_iterator<T>::scany() const
--{
--  return tri_it_.scany();
--}
--
--//: Returns starting x-value of the current scan line.
--//  startx() should be smaller than endx(), unless the scan line is empty
--template<class T>
--int boxm_triangle_interpolation_iterator<T>::startx() const
--{
--  return tri_it_.startx();
--}
--
--//: Returns ending x-value of the current scan line.
--//  endx() should be larger than startx(), unless the scan line is empty
--template<class T>
--int  boxm_triangle_interpolation_iterator<T>::endx() const
--{
--  return tri_it_.endx() + 1;
--}
--
--
--//: returns the interpolated value at location x in the current scanline
--template<class T>
--T boxm_triangle_interpolation_iterator<T>::value_at(int x)
--{
--  return (T)((s0_*(x+0.5) + s1_*(tri_it_.scany()+0.5) + s2_));
--}
--
--
--#define BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(T) \
--  template class boxm_triangle_interpolation_iterator<T >
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
-deleted file mode 100644
-index c268ecca30..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
-+++ /dev/null
-@@ -1,59 +0,0 @@
--#include <vector>
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_triangle_scan_iterator.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: constructor
--boxm_triangle_scan_iterator::boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0, unsigned int v1, unsigned int v2)
--: tri_it_()
--{
--  tri_it_.a.x = verts_x[v0] - 0.5;
--  tri_it_.a.y = verts_y[v0] - 0.5;
--  tri_it_.b.x = verts_x[v1] - 0.5;
--  tri_it_.b.y = verts_y[v1] - 0.5;
--  tri_it_.c.x = verts_x[v2] - 0.5;
--  tri_it_.c.y = verts_y[v2] - 0.5;
--}
--
--
--//: Resets the scan iterator to before the first scan line
--//  After calling this function, next() needs to be called before
--//  startx() and endx() form a valid scan line.
--void boxm_triangle_scan_iterator::reset()
--{
--  tri_it_.reset();
--}
--
--//: Tries to move to the next scan line.
--//  Returns false if there are no more scan lines.
--bool boxm_triangle_scan_iterator::next()
--{
--  return tri_it_.next();
--}
--
--//: y-coordinate of the current scan line.
--int boxm_triangle_scan_iterator::scany() const
--{
--  return tri_it_.scany();
--}
--
--//: Returns starting x-value of the current scan line.
--//  startx() should be smaller than endx(), unless the scan line is empty
--int boxm_triangle_scan_iterator::startx() const
--{
--  return tri_it_.startx();
--}
--
--//: Returns ending x-value of the current scan line.
--//  endx() should be larger than startx(), unless the scan line is empty
--int  boxm_triangle_scan_iterator::endx() const
--{
--  return tri_it_.endx() + 1;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
-deleted file mode 100644
-index 47b52ebc26..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
-+++ /dev/null
-@@ -1,46 +0,0 @@
--#ifndef boxm_triangle_scan_iterator_h_
--#define boxm_triangle_scan_iterator_h_
--//:
--// \file
--
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vgl/vgl_region_scan_iterator.h>
--#include <vgl/vgl_triangle_scan_iterator.h>
--
--class boxm_triangle_scan_iterator : public vgl_region_scan_iterator
--{
-- public:
--  //: constructor
--  boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
--
--  //: Resets the scan iterator to before the first scan line
--  //  After calling this function, next() needs to be called before
--  //  startx() and endx() form a valid scan line.
--  void reset() override;
--
--  //: Tries to move to the next scan line.
--  //  Returns false if there are no more scan lines.
--  bool next() override;
--
--  //: y-coordinate of the current scan line.
--  int  scany() const override;
--
--  //: Returns starting x-value of the current scan line.
--  //  startx() should be smaller than endx(), unless the scan line is empty
--  int  startx() const override;
--
--  //: Returns ending x-value of the current scan line.
--  //  endx() should be larger than startx(), unless the scan line is empty
--  int  endx() const override;
--
-- protected:
--
--  vgl_triangle_scan_iterator<double> tri_it_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_utils.cxx
-deleted file mode 100644
-index 2464b5c4a8..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_utils.cxx
-+++ /dev/null
-@@ -1,1469 +0,0 @@
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_utils.h"
--//:
--// \file
--#include "boxm_quad_scan_iterator.h"
--#include <boct/boct_tree_cell.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_vector_2d.h>
--#include <vgl/vgl_polygon.h>
--#include <vgl/vgl_intersection.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vnl/algo/vnl_determinant.h>
--#include <vnl/algo/vnl_matrix_inverse.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bool boxm_utils::is_visible(vgl_box_3d<double> const& bbox,
--                            vpgl_camera_double_sptr const& camera,
--                            unsigned int img_ni, unsigned int img_nj,
--                            bool do_front_test)
--{
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    // make a test for vertices for behind-front case
--    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--    if (do_front_test) {
--      if (cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.max_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.max_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.max_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.max_z())))
--        return false;
--    }
--  }
--
--  // make sure corners project into image bounds
--  vgl_box_2d<double> cube_proj_bb;
--  vgl_box_2d<double> img_bb;
--  img_bb.add(vgl_point_2d<double>(0.0, 0.0));
--  img_bb.add(vgl_point_2d<double>(img_ni, img_nj));
--  // project corners of block into image
--  double u,v;
--  camera->project(bbox.min_x(),bbox.min_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.min_x(),bbox.min_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.min_x(),bbox.max_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.min_x(),bbox.max_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.min_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.min_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.max_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.max_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  // check for intersection
--  vgl_box_2d<double> intersection =  vgl_intersection(cube_proj_bb, img_bb);
--  return ! intersection.is_empty();
--}
--
--//:
--// \verbatim
--//                                 MaxPosition
--//
--//                       7-----------6
--//                      /           /|
--//                     /           / |
--//                    4-----------5  |
--//                    |           |  |
--//                    |           |  |
--//                    |    3      |  2
--//     Z              |           | /
--//     |   Y          |           |/
--//     |  /           0-----------1
--//     | /         MinPosition
--//     O-----X
--//
--// \endverbatim
--std::vector<vgl_point_3d<double> >
--boxm_utils::corners_of_box_3d(vgl_box_3d<double> const& box)
--{
--  std::vector<vgl_point_3d<double> > corners;
--
--  corners.push_back(box.min_point());
--  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.min_z());
--  corners.emplace_back(box.min_x()+box.width(), box.min_y()+box.height(), box.min_z());
--  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.min_z());
--  corners.emplace_back(box.min_x(), box.min_y(), box.max_z());
--  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.max_z());
--  corners.push_back(box.max_point());
--  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.max_z());
--  return corners;
--}
--
--void
--boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
--                            const vpgl_camera_double_sptr& camera,
--                            double* xverts, double* yverts)
--{
--  for (unsigned i=0; i<corners.size(); ++i)
--    camera->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
--}
--
--void
--boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
--                            const vpgl_camera_double_sptr& camera,
--                            double* xverts, double* yverts,
--                            float* vertdist)
--{
--    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
--        for (unsigned i=0; i<corners.size(); ++i)
--        {
--            cam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
--            vertdist[i]=(float)(cam_center-corners[i]).length();
--        }
--    }
--}
--
--void
--boxm_utils::project_point3d(vgl_point_3d<double> const& point,
--                            const vpgl_camera_double_sptr& camera,
--                            double & xvert, double &yvert,
--                            double & vertdist)
--{
--    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
--        cam->project(point.x(), point.y(), point.z(), xvert,yvert);
--        vertdist=(float)(cam_center-point).length();
--    }
--}
--
--//: corners of the input face: visible?
--bool boxm_utils::is_face_visible(const double * xverts, const double *yverts,
--                                 unsigned id1,unsigned id2,unsigned id3,unsigned  /*id4*/) // id4 unused?!? - FIXME
--{
--  double normal=(xverts[id2]-xverts[id1])*(yverts[id3]-yverts[id2])-(yverts[id2]-yverts[id1])*(xverts[id3]-xverts[id2]);
--  return normal < 0;
--}
--
--//: corners of the input face: visible?
--bool boxm_utils::is_face_visible(std::vector<vgl_point_3d<double> > &face,
--                                 vpgl_camera_double_sptr const& camera)
--{
--  assert(face.size() >= 3);
--  std::vector<vgl_point_2d<double> > vs;
--
--  for (auto & i : face) {
--    double u,v;
--    camera->project(i.x(), i.y(), i.z(), u, v);
--    vs.emplace_back(u,v);
--  }
--
--  vgl_vector_2d<double> v0 = vs[1] - vs[0];
--  vgl_vector_2d<double> v1 = vs[2] - vs[1];
--  auto normal = cross_product<double>(v0,v1);
--  //if (normal>-1e-4 && normal<0.0)
--  //    std::cout<<"+";
--  return normal < -1e-5;
--}
--
--std::vector<vgl_point_2d<double> >
--boxm_utils::project_face(std::vector<vgl_point_3d<double> > &face,
--                         vpgl_camera_double_sptr const& camera)
--{
--  std::vector<vgl_point_2d<double> > vs;
--
--  for (auto & i : face) {
--    double u,v;
--    camera->project(i.x(), i.y(), i.z(), u, v);
--    vs.emplace_back(u,v);
--  }
--
--  return vs;
--}
--
--boct_face_idx
--boxm_utils::visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera)
--{
--  boct_face_idx face_idx = NONE;
--  //if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--  //  vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--  //  vgl_point_3d<double> const& cam_center = cam->camera_center();
--
--  //  if (cam_center.x() > bbox.max_x()) {
--  //    face_idx |= X_HIGH;
--  //  }
--  //  else if (cam_center.x() < bbox.min_x()) {
--  //    face_idx |= X_LOW;
--  //  }
--  //  if (cam_center.y() > bbox.max_y()) {
--  //    face_idx |= Y_HIGH;
--  //  }
--  //  else if (cam_center.y() < bbox.min_y()) {
--  //    face_idx |= Y_LOW;
--  //  }
--  //  if (cam_center.z() > bbox.max_x()) {
--  //    face_idx |= Z_HIGH;
--  //  }
--  //  else if (cam_center.z() < bbox.min_z()) {
--  //    face_idx |= Z_LOW;
--  //  }
--  //}
--  //// for other cameras, use projection and normals
--  //else
--  {
--    // fix the face normals so that the vertices are in counter-clockwise order
--    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
--    faces_of_box_3d(bbox, faces);
--
--    if (is_face_visible(faces.find(Z_LOW)->second, camera)) {
--      face_idx |= Z_LOW;
--#ifdef DEBUG
--      std::cout << "Z_LOW " ;
--#endif
--    }
--    if (is_face_visible(faces.find(Z_HIGH)->second, camera)) {
--      face_idx |= Z_HIGH;
--#ifdef DEBUG
--      std::cout << "Z_HIGH " ;
--#endif
--    }
--    if (is_face_visible(faces.find(X_LOW)->second, camera)) {
--      face_idx |= X_LOW;
--#ifdef DEBUG
--      std::cout << "X_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(faces.find(X_HIGH)->second, camera)) {
--      face_idx |= X_HIGH;
--#ifdef DEBUG
--      std::cout << "X_HIGH " ;
--#endif
--    }
--
--    if (is_face_visible(faces.find(Y_LOW)->second, camera)) {
--      face_idx |= Y_LOW;
--#ifdef DEBUG
--      std::cout << "Y_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(faces.find(Y_HIGH)->second, camera)) {
--      face_idx |= Y_HIGH;
--#ifdef DEBUG
--      std::cout << "Y_HIGH " ;
--#endif
--    }
--  }
--#ifdef DEBUG
--  std::cout << std::endl;
--#endif
--
--  return face_idx;
--}
--
--boct_face_idx
--boxm_utils::visible_faces(vgl_box_3d<double> const& /*bbox*/, // FIXME: currently unused -- see commented out code
--                          const vpgl_camera_double_sptr& /*camera*/, // idem
--                          double *xverts, double *yverts)
--{
--  boct_face_idx face_idx = NONE;
--#if 0
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--    vgl_point_3d<double> const& cam_center = cam->camera_center();
--
--    if (cam_center.x() > bbox.max_x()) {
--      face_idx |= X_HIGH;
--    }
--    else if (cam_center.x() < bbox.min_x()) {
--      face_idx |= X_LOW;
--    }
--    if (cam_center.y() > bbox.max_y()) {
--      face_idx |= Y_HIGH;
--    }
--    else if (cam_center.y() < bbox.min_y()) {
--      face_idx |= Y_LOW;
--    }
--    if (cam_center.z() > bbox.max_x()) {
--      face_idx |= Z_HIGH;
--    }
--    else if (cam_center.z() < bbox.min_z()) {
--      face_idx |= Z_LOW;
--    }
--  }
--  // for other cameras, use projection and normals
--  else
--#endif // 0
--  {
--    // fix the face normals so that the vertices are the counter clockwise order
--#if 0
--    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
--    faces_of_box_3d(bbox, faces);
--    project_corners(bbox,camera,xverts,yverts);
--#endif // 0
--    if (is_face_visible(xverts,yverts,1,0,3,2)) {
--      face_idx |= Z_LOW;
--#ifdef DEBUG
--      std::cout << "Z_LOW " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,4,5,6,7)) {
--      face_idx |= Z_HIGH;
--#ifdef DEBUG
--      std::cout << "Z_HIGH " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,7,3,0,4)) {
--      face_idx |= X_LOW;
--#ifdef DEBUG
--      std::cout << "X_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,1,2,6,5)) {
--      face_idx |= X_HIGH;
--#ifdef DEBUG
--      std::cout << "X_HIGH " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,0,1,5,4)) {
--      face_idx |= Y_LOW;
--#ifdef DEBUG
--      std::cout << "Y_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,2,3,7,6)) {
--      face_idx |= Y_HIGH;
--#ifdef DEBUG
--      std::cout << "Y_HIGH " ;
--#endif
--    }
--  }
--#ifdef DEBUG
--  std::cout << std::endl;
--#endif
--
--  return face_idx;
--}
--
--boct_face_idx
--boxm_utils::visible_faces_cell(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera,
--                               double *xverts, double *yverts)
--{
--  boct_face_idx face_idx = NONE;
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--    vgl_point_3d<double> const& cam_center = cam->camera_center();
--
--    if (cam_center.x() > bbox.max_x()) {
--      face_idx |= X_HIGH;
--    }
--    else if (cam_center.x() < bbox.min_x()) {
--      face_idx |= X_LOW;
--    }
--    if (cam_center.y() > bbox.max_y()) {
--      face_idx |= Y_HIGH;
--    }
--    else if (cam_center.y() < bbox.min_y()) {
--      face_idx |= Y_LOW;
--    }
--    if (cam_center.z() > bbox.max_x()) {
--      face_idx |= Z_HIGH;
--    }
--    else if (cam_center.z() < bbox.min_z()) {
--      face_idx |= Z_LOW;
--    }
--  }
--  // for other cameras, use projection and normals
--  else
--  {
--    // fix the face normals so that the vertices are the counter clockwise order
--#if 0
--    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
--    faces_of_box_3d(bbox, faces);
--    double * xverts; double *yverts;
--    project_corners(bbox,camera,xverts,yverts);
--#endif // 0
--    if (is_face_visible(xverts,yverts,1,0,3,2)) {
--      face_idx |= Z_LOW;
--#ifdef DEBUG
--      std::cout << "Z_LOW " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,4,5,6,7)) {
--      face_idx |= Z_HIGH;
--#ifdef DEBUG
--      std::cout << "Z_HIGH " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,7,3,0,4)) {
--      face_idx |= X_LOW;
--#ifdef DEBUG
--      std::cout << "X_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,1,2,6,5)) {
--      face_idx |= X_HIGH;
--#ifdef DEBUG
--      std::cout << "X_HIGH " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,0,1,5,4)) {
--      face_idx |= Y_LOW;
--#ifdef DEBUG
--      std::cout << "Y_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,2,3,7,6)) {
--      face_idx |= Y_HIGH;
--#ifdef DEBUG
--      std::cout << "Y_HIGH " ;
--#endif
--    }
--  }
--#ifdef DEBUG
--  std::cout << std::endl;
--#endif
--
--  return face_idx;
--}
--
--//: returns the faces of a box, the vertices are ordered in the normal direction
--void boxm_utils::faces_of_box_3d(vgl_box_3d<double> const& bbox,
--                                 std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >& faces)
--{
--  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(bbox);
--
--  // face bottom [1,0,3,2]
--  std::vector<vgl_point_3d<double> > face_corners;
--  face_corners.push_back(corners[1]);
--  face_corners.push_back(corners[0]);
--  face_corners.push_back(corners[3]);
--  face_corners.push_back(corners[2]);
--  faces[Z_LOW] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[4]);
--  face_corners.push_back(corners[5]);
--  face_corners.push_back(corners[6]);
--  face_corners.push_back(corners[7]);
--  faces[Z_HIGH] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[7]);
--  face_corners.push_back(corners[3]);
--  face_corners.push_back(corners[0]);
--  face_corners.push_back(corners[4]);
--  faces[X_LOW] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[1]);
--  face_corners.push_back(corners[2]);
--  face_corners.push_back(corners[6]);
--  face_corners.push_back(corners[5]);
--  faces[X_HIGH] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[0]);
--  face_corners.push_back(corners[1]);
--  face_corners.push_back(corners[5]);
--  face_corners.push_back(corners[4]);
--  faces[Y_LOW] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[2]);
--  face_corners.push_back(corners[3]);
--  face_corners.push_back(corners[7]);
--  face_corners.push_back(corners[6]);
--  faces[Y_HIGH] = face_corners;
--}
--
--//: returns the union of the projected faces of a polygon
--void boxm_utils::project_cube(vgl_box_3d<double> &bbox,
--                              const vpgl_camera_double_sptr& camera,
--                              std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
--                              boct_face_idx & vis_face_ids)
--{
--  faces_of_box_3d(bbox, faces);
--  vis_face_ids=boxm_utils::visible_faces(bbox,camera);
--}
--
--
--void boxm_utils::quad_interpolate(boxm_quad_scan_iterator &poly_it,
--                                  double* xvals, double* yvals, double* vals,
--                                  vil_image_view<float> &img,unsigned img_plane_num,
--                                  unsigned int v0, unsigned int v1,
--                                  unsigned int v2,unsigned int v3 )
--{
--  // first compute s0, s1, s2, s3 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  // (no need to compute barycentric coordinates of a quadrilateral at each step)
--  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
--
--  double Acol0[] = {(xvals[v0]-0.5)*(yvals[v0]-0.5),
--            (xvals[v1]-0.5)*(yvals[v1]-0.5),
--            (xvals[v2]-0.5)*(yvals[v2]-0.5),
--            (xvals[v3]-0.5)*(yvals[v3]-0.5)};
--  double Acol1[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5,xvals[v3]-0.5};
--  double Acol2[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5,yvals[v3]-0.5};
--  double Acol3[] = {1.0, 1.0, 1.0,1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2],vals[v3]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2,Acol3);
--  double s0 = vnl_determinant(Z, Acol1, Acol2,Acol3) / detA;
--  double s1 = vnl_determinant(Acol0, Z, Acol2,Acol3) / detA;
--  double s2 = vnl_determinant(Acol0, Acol1, Z,Acol3) / detA;
--  double s3 = vnl_determinant(Acol0, Acol1, Acol2,Z) / detA;
--
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      auto interp_val = (float)(s0*x*y + s1*x + s2*y+s3);
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
--    }
--  }
--  return;
--#if 0 // commented out
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    double start_val=0;
--    double end_val=0;
--
--    if (poly_it.x_start_end_val(vals,start_val,end_val))
--    {
--      float rx=endx-startx;
--      for (unsigned int x = startx; x < endx; ++x) {
--        float interp_val = start_val+(x-startx)/rx*(end_val-start_val);
--        img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
--        //img(x,yu,img_plane_num) =interp_val;
--      }
--    }
--  }
--  return;
--#endif // 0
--}
--
--void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
--                           vil_image_view<float> &img, float val,
--                           unsigned img_plane_num)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      img(x,yu,img_plane_num) = val;
--#if 0 // was:
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      if (poly_it.pix_coverage(x)>1)
--        std::cout<<"ERROR ALERT "<<poly_it.pix_coverage(x)<<std::endl;
--      assert(poly_it.pix_coverage(x)>1);
--#endif // 0
--    }
--  }
--  return;
--}
--
--
--void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
--                           vil_image_view<float> &img,
--                           vil_image_view<float> &weights_img,
--                           float val,
--                           unsigned img_plane_num)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      //img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      weights_img(x,yu)+=poly_it.pix_coverage(x);
--    }
--  }
--  return;
--}
--
--
--void boxm_utils::quad_mean(boxm_quad_scan_iterator &poly_it,
--                           vil_image_view<float> &img, float &val,  float & count)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      val+=poly_it.pix_coverage(x)*img(x,yu) ;
--      count+=poly_it.pix_coverage(x);
--    }
--  }
--  return;
--}
--
--void boxm_utils::quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
--                                    vil_image_view<float> &img,
--                                    vil_image_view<float> &weighted_img,
--                                    float &numerator,  float & denominator)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      numerator+=poly_it.pix_coverage(x)*img(x,yu)*weighted_img(x,yu);
--      denominator+=poly_it.pix_coverage(x)*weighted_img(x,yu);
--      //numerator+=img(x,yu)*weighted_img(x,yu);
--      //denominator+=weighted_img(x,yu);
--    }
--  }
--  return;
--}
--
--void boxm_utils::quad_sum(boxm_quad_scan_iterator &poly_it,
--                          vil_image_view<float> &img, float &val)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      val+=(poly_it.pix_coverage(x)*img(x,yu)) ;
--    }
--  }
--  return;
--}
--
--bool boxm_utils::project_cube_xyz( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                                   boct_face_idx & vis_face_ids,
--                                   vil_image_view<float> &front_xyz,
--                                   vil_image_view<float> &back_xyz,
--                                   const vpgl_camera_double_sptr& cam)
--{
--  auto face_it=faces.begin();
--  for (; face_it!=faces.end(); ++face_it)
--  {
--    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
--    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
--
--    double xs[]={face_projected[0].x(),face_projected[1].x(),face_projected[2].x(),face_projected[3].x()};
--    double ys[]={face_projected[0].y(),face_projected[1].y(),face_projected[2].y(),face_projected[3].y()};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    double Xs[]={face_corners[0].x(),face_corners[1].x(),face_corners[2].x(),face_corners[3].x()};
--    double Ys[]={face_corners[0].y(),face_corners[1].y(),face_corners[2].y(),face_corners[3].y()};
--    double Zs[]={face_corners[0].z(),face_corners[1].z(),face_corners[2].z(),face_corners[3].z()};
--
--    if (vis_face_ids & face_it->first){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--
--  return true;
--}
--
--
--bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
--                                  boct_face_idx & vis_face_ids,
--                                  vil_image_view<float> &front_xyz,
--                                  vil_image_view<float> &back_xyz,
--                                  double *xverts,double * yverts)
--{
--  // open extra scope, to allow redeclaration of xs[], ys[]
--  {
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--#if 0
--    std::vector<vgl_point_2d<double> > face_polygon(4);
--    for (unsigned i=0;i<4;++i)
--      face_polygon.push_back(vgl_point_2d<double>(xs[i],ys[i]));
--#endif // 0
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[1].x(),corners[0].x(),corners[3].x(),corners[2].x()};
--    double Ys[]={corners[1].y(),corners[0].y(),corners[3].y(),corners[2].y()};
--    double Zs[]={corners[1].z(),corners[0].z(),corners[3].z(),corners[2].z()};
--    if (vis_face_ids & Z_LOW){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
--    }
--  }
--  {
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[4].x(),corners[5].x(),corners[6].x(),corners[7].x()};
--    double Ys[]={corners[4].y(),corners[5].y(),corners[6].y(),corners[7].y()};
--    double Zs[]={corners[4].z(),corners[5].z(),corners[6].z(),corners[7].z()};
--    if (vis_face_ids & Z_HIGH){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
--    }
--  }
--  {
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    double Xs[]={corners[7].x(),corners[3].x(),corners[0].x(),corners[4].x()};
--    double Ys[]={corners[7].y(),corners[3].y(),corners[0].y(),corners[4].y()};
--    double Zs[]={corners[7].z(),corners[3].z(),corners[0].z(),corners[4].z()};
--    if (vis_face_ids & X_LOW){
--      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--  {
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    double Xs[]={corners[1].x(),corners[2].x(),corners[6].x(),corners[5].x()};
--    double Ys[]={corners[1].y(),corners[2].y(),corners[6].y(),corners[5].y()};
--    double Zs[]={corners[1].z(),corners[2].z(),corners[6].z(),corners[5].z()};
--    if (vis_face_ids & X_HIGH){
--      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--  {
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--        vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[0].x(),corners[1].x(),corners[5].x(),corners[4].x()};
--    double Ys[]={corners[0].y(),corners[1].y(),corners[5].y(),corners[4].y()};
--    double Zs[]={corners[0].z(),corners[1].z(),corners[5].z(),corners[4].z()};
--    if (vis_face_ids & Y_LOW){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--
--      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--  {
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[2].x(),corners[3].x(),corners[7].x(),corners[6].x()};
--    double Ys[]={corners[2].y(),corners[3].y(),corners[7].y(),corners[6].y()};
--    double Zs[]={corners[2].z(),corners[3].z(),corners[7].z(),corners[6].z()};
--    if (vis_face_ids & Y_HIGH){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--
--  return true;
--}
--
--
--bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & /*corners*/,
--                                  boct_face_idx & vis_face_ids,
--                                  vil_image_view<float> &front_xyz,
--                                  vil_image_view<float> &back_xyz,
--                                  double *xverts,double * yverts,float * vertdist)
--{
--  // Use extra {} so that destructors will do their work
--  {
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    double ds[]={vertdist[1],vertdist[0],vertdist[3],vertdist[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Z_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    double ds[]={vertdist[4],vertdist[5],vertdist[6],vertdist[7]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Z_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    double ds[]={vertdist[7],vertdist[3],vertdist[0],vertdist[4]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    if (vis_face_ids & X_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    double ds[]={vertdist[1],vertdist[2],vertdist[6],vertdist[5]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    if (vis_face_ids & X_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    double ds[]={vertdist[0],vertdist[1],vertdist[5],vertdist[4]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Y_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    double ds[]={vertdist[2],vertdist[3],vertdist[7],vertdist[6]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Y_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--
--  return true;
--}
--
--
--#if 0
--bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                                        boct_face_idx & vis_face_ids,
--                                        vil_image_view<float> &fill_img,
--                                        float val, vpgl_camera_double_sptr cam)
--{
--  for (std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >::iterator face_it=faces.begin();
--       face_it!=faces.end(); ++face_it)
--  {
--    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
--    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
--    vgl_polygon<double> face_polygon(face_projected);
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    if (vis_face_ids & face_it->first){
--      quad_fill(poly_it,fill_img,val,0);
--    }
--  }
--}
--#else
--bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > &,
--                                        boct_face_idx &, vil_image_view<float> &, float, const vpgl_camera_double_sptr&)
--{ return false; }
--#endif // 0
--
--bool boxm_utils::project_cube_fill_val(boct_face_idx & vis_face_ids,
--                                       vil_image_view<float> &fill_img,
--                                       float val, double *xverts,double * yverts)
--{
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  return true;
--}
--
--
--bool boxm_utils::project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
--                                          vil_image_view<float> &fill_img,
--                                          vil_image_view<float> &weight_img,
--                                          float val, double *xverts,double * yverts)
--{
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  return true;
--}
--
--bool boxm_utils::cube_sum(boct_face_idx & vis_face_ids,
--                          vil_image_view<float> &img,
--                          float & val, double *xverts,double * yverts)
--{
--  val=0;
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--
--  return true;
--}
--
--
--bool boxm_utils::cube_uniform_mean(boct_face_idx & vis_face_ids,
--                                   vil_image_view<float> &img,
--                                   float & val, double *xverts,double * yverts)
--{
--  val=0;
--  float count=0;
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--
--  if (count > 0) {
--    val/=(float)count;
--    return true;
--  }
--  else {
--    val = 0;
--    return true;
--  }
--}
--
--
--bool boxm_utils::cube_weighted_mean(boct_face_idx & vis_face_ids,
--                                    vil_image_view<float> &img,
--                                    vil_image_view<float> &weight_img,
--                                    float & val, double *xverts,double * yverts)
--{
--  val=0;
--  float count=0;
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--
--  if (count > 0) {
--    val/=(float)count;
--    return true;
--  }
--  else {
--    val = 0;
--    return true;
--  }
--}
--
--
--bool
--boxm_utils::cube_entry_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
--                             vgl_vector_3d<double> direction,
--                             vgl_point_3d<double> & entry_point,
--                             double & lambda,boct_face_idx & face_id)
--{
--  // check each face
--  if (direction.x() > 0 && pt.x()<=cube.min_x()) {
--    // intersect with low x plane
--    lambda = (cube.min_x() - pt.x()) / direction.x();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=X_LOW;
--        return true;
--    }
--  }
--  else if (direction.x() < 0 && pt.x()>=cube.max_x()){
--    // intersect with high x plane
--    lambda = (cube.max_x() - pt.x()) / direction.x();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=X_HIGH;
--        return true;
--    }
--  }
--  if (direction.y() > 0&& pt.y()<=cube.min_y()) {
--    // intersect with low y plane
--    lambda = (cube.min_y() - pt.y()) / direction.y();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=Y_LOW;
--        return true;
--    }
--  }
--  else if (direction.y() < 0 && pt.y()>=cube.max_y()){
--    // intersect with high y plane
--    lambda = (cube.max_y() - pt.y()) / direction.y();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=Y_HIGH;
--        return true;
--    }
--  }
--  if (direction.z() > 0&& pt.z()<=cube.min_z()) {
--    // intersect with low z plane
--    lambda = (cube.min_z() - pt.z()) / direction.z();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
--        face_id=Z_LOW;
--        return true;
--    }
--  }
--  else if (direction.z() < 0 && pt.z()>=cube.max_z()){
--    // intersect with high z plane
--    lambda = (cube.max_z() - pt.z()) / direction.z();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
--        face_id=Z_HIGH;
--        return true;
--    }
--  }
--  return false;
--}
--
--
--bool boxm_utils::cube_exit_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
--                                 vgl_vector_3d<double> direction,
--                                 vgl_point_3d<double> & exit_pt,
--                                 double & lambda,boct_face_idx & face_id)
--{
--  // check each face
--  if (direction.x() < 0 ) {
--    // intersect with low x plane
--    lambda = (cube.min_x() - pt.x()) / direction.x();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=X_LOW;
--      return true;
--    }
--  }
--  else if (direction.x() > 0 ) {
--    // intersect with high x plane
--    lambda = (cube.max_x() - pt.x()) / direction.x();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=X_HIGH;
--      return true;
--    }
--  }
--  if (direction.y() < 0 ) {
--    // intersect with low y plane
--    lambda = (cube.min_y() - pt.y()) / direction.y();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=Y_LOW;
--      return true;
--    }
--  }
--  else if (direction.y() > 0 ) {
--    // intersect with high y plane
--    lambda = (cube.max_y() - pt.y()) / direction.y();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=Y_HIGH;
--      return true;
--    }
--  }
--  if (direction.z() < 0 ) {
--    // intersect with low z plane
--    lambda = (cube.min_z() - pt.z()) / direction.z();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
--      face_id=Z_LOW;
--      return true;
--    }
--  }
--  else if (direction.z() > 0 ) {
--    // intersect with high z plane
--    lambda = (cube.max_z() - pt.z()) / direction.z();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
--      face_id=Z_HIGH;
--      return true;
--    }
--  }
--  return false;
--}
--
--
--boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
--boxm_utils::obtain_mog_grey_unit_mode()
--{
--  bsta_gauss_sf1 simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--  return simple_obs_mix_gauss_val_sf1;
--}
--
--boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
--boxm_utils::obtain_mog_grey_zero_mode()
--{
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--  return simple_obs_mix_gauss_val_sf1;
--}
--
--boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
--boxm_utils::obtain_mog_grey_single_mode(float  mean)
--{
--  bsta_gauss_sf1 simple_gauss_sf1(mean,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--  return simple_obs_mix_gauss_val_sf1;
--}
--
--double boxm_utils::max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt)
--{
--  double dist_max=0;
--
--  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(box);
--  for (const auto & corner : corners)
--  {
--    if (dist_max<(corner-pt).length())
--      dist_max=(corner-pt).length();
--  }
--  return dist_max;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.h b/contrib/brl/bseg/boxm/util/boxm_utils.h
-deleted file mode 100644
-index 86f74b3945..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_utils.h
-+++ /dev/null
-@@ -1,168 +0,0 @@
--#ifndef boxm_utils_h_
--#define boxm_utils_h_
--//:
--// \file
--// \brief  The utility methods for the boxm project
--//
--// \author Gamze Tunali
--// \date Apr 07, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include "boxm_quad_scan_iterator.h"
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_apm_traits.h>
--#include <vil/vil_image_view.h>
--
--class safe_inverse_functor
--{
-- public:
--  safe_inverse_functor(float tol = 0.0f) : tol_(tol) {}
--
--  float operator()(float x) const { return (x > tol_)? 1.0f/x : 0.0f; }
--
--  float tol_;
--};
--
--class boxm_utils
--{
-- public:
--
--  //: returns true if a given box is visible from the camera and the image plane
--  static bool is_visible(vgl_box_3d<double> const& bbox,
--                         vpgl_camera_double_sptr const& camera,
--                         unsigned int img_ni, unsigned int img_nj,
--                         bool do_front_test = true);
--
--  // returns the 8 corner points of a box
--  static std::vector<vgl_point_3d<double> > corners_of_box_3d(vgl_box_3d<double> const& box);
--
--  //: returns the indices of the faces visible from the camera
--  static bool is_face_visible(std::vector<vgl_point_3d<double> > &face,
--                              vpgl_camera_double_sptr const& camera);
--
--  //:
--  static bool is_face_visible(const double * xverts, const double *yerts,
--                              unsigned id1,unsigned id2,unsigned id3,unsigned id4);
--
--  //: returns the visible faces of a box given a camera.
--  // It puts a bit 1 for each face visible based on the boct_cell_face values.
--  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox,
--                                     const vpgl_camera_double_sptr& camera,
--                                     double *xverts, double *yerts);
--  static boct_face_idx visible_faces_cell(vgl_box_3d<double> const& bbox,
--                                          const vpgl_camera_double_sptr& camera,
--                                          double *xverts, double *yverts);
--
--  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera);
--
--  static void faces_of_box_3d(vgl_box_3d<double> const& bbox,
--                              std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > & faces);
--
--  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,const vpgl_camera_double_sptr& camera,
--                              double * xverts, double *yerts);
--  static void project_point3d(vgl_point_3d<double> const& point,
--                              const vpgl_camera_double_sptr& camera,
--                              double & xvert, double &yert, double & vertdist);
--
--  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,
--                              const vpgl_camera_double_sptr& camera,
--                              double* xverts, double* yverts,
--                              float* vertdist);
--  static void project_cube(vgl_box_3d<double> &bbox,
--                           const vpgl_camera_double_sptr& camera,
--                           std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
--                           boct_face_idx & vis_face_ids);
--
--  static std::vector<vgl_point_2d<double> >  project_face(std::vector<vgl_point_3d<double> > &face,
--                                                         vpgl_camera_double_sptr const& camera);
--
--  static void quad_interpolate(boxm_quad_scan_iterator &poly_it,
--                               double* xvals, double* yvals, double* vals,
--                               vil_image_view<float> &img,unsigned img_plane_num=0,
--                               unsigned int v0=0, unsigned int v1=1,
--                               unsigned int v2=2,unsigned int v3=3);
--
--  static void quad_fill(boxm_quad_scan_iterator &poly_it,
--                        vil_image_view<float> &img, float val,
--                        unsigned img_plane_num=0);
--  static void quad_fill(boxm_quad_scan_iterator &poly_it,
--                        vil_image_view<float> &img,
--                        vil_image_view<float> &weights_img,
--                        float val,
--                        unsigned img_plane_num=0);
--
--  static bool project_cube_xyz(std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                               boct_face_idx & vis_face_ids,
--                               vil_image_view<float> &front_xyz,
--                               vil_image_view<float> &back_xyz,
--                               const vpgl_camera_double_sptr& camera);
--
-- static bool project_cube_xyz(std::vector< vgl_point_3d<double> >  & corners,
--                              boct_face_idx & vis_face_ids,
--                              vil_image_view<float> &front_xyz,
--                              vil_image_view<float> &back_xyz,
--                              double *xverts,double * yerts);
-- //: only for perspective camera
-- static bool project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
--                              boct_face_idx & vis_face_ids,
--                              vil_image_view<float> &front_xyz,
--                              vil_image_view<float> &back_xyz,
--                              double *xverts,double * yverts,float * vertdist);
--
--  static bool project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                                     boct_face_idx & vis_face_ids,
--                                     vil_image_view<float> &fill_img,
--                                     float val, const vpgl_camera_double_sptr& cam);
--
--  static bool project_cube_fill_val(boct_face_idx & vis_face_ids,
--                                    vil_image_view<float> &fill_img,
--                                    float val, double *xverts,double * yverts);
--  static bool project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
--                                       vil_image_view<float> &fill_img,
--                                       vil_image_view<float> &weights_img,
--                                       float val, double *xverts,double * yverts);
--
--  static bool cube_uniform_mean(boct_face_idx & vis_face_ids,
--                                vil_image_view<float> &img,
--                                float & val, double *xverts,double * yverts);
--  static bool cube_weighted_mean(boct_face_idx & vis_face_ids,
--                                 vil_image_view<float> &img,
--                                 vil_image_view<float> &weight_img,
--                                 float & val, double *xverts,double * yverts);
--
--  static bool cube_sum(boct_face_idx & vis_face_ids,
--                       vil_image_view<float> &img,
--                       float & val, double *xverts,double * yverts);
--
--  static void quad_mean(boxm_quad_scan_iterator &poly_it,
--                        vil_image_view<float> &img, float &val,  float & count);
--  static void quad_sum(boxm_quad_scan_iterator &poly_it,
--                       vil_image_view<float> &img, float &val);
--  static void quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
--                                 vil_image_view<float> &img,
--                                 vil_image_view<float> &weighted_img,
--                                 float &numerator,  float & denominator);
--  static bool cube_entry_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
--                               vgl_vector_3d<double> dir,
--                               vgl_point_3d<double> & entry_point,
--                               double & lambda, boct_face_idx & face_id);
--  static bool cube_exit_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
--                              vgl_vector_3d<double> dir, vgl_point_3d<double> & exit_point,
--                              double & lambda,boct_face_idx & face_id);
--
--  static double max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt);
--
--  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_unit_mode();
--
--  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_zero_mode();
--
--  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_single_mode(float  mean);
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h b/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
-deleted file mode 100644
-index 3e7bcdc580..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
-+++ /dev/null
-@@ -1,214 +0,0 @@
--// This is brl/bseg/boxm/util/boxm_vrml_util.h
--#ifndef boxm_vrml_util_h
--#define boxm_vrml_util_h
--//:
--// \file
--// \brief  Set of utilities to save a boxm_scene as vrml files
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Dec 9, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene.h>
--#include "boxm_cell_data_traits.h"
--#include <bvrml/bvrml_write.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class boxm_vrml_util
--{
-- public:
--
--  // Writes the values in the scene above the threshold as vrml dots
--  template <class T_data>
--  static void write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene,
--                               const float threshold= 0.0f);
--#if 0 // not yet working?
--  static void write_vrml_scene(std::ofstream& str, bvxm_voxel_scene<bsta_num_obs<bsta_gauss_sf1> > *scene,
--                               const float threshold);
--  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<float> *scene, float threshold);
--  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
--  static void write_vrml_scene_as_pointers(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
--#endif // 0
--};
--
--
--template <class T_data>
--void boxm_vrml_util::write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene, float /*threshold*/)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short, T_data> cell_type;
--  std::ofstream temp_stream("temp.txt");
--
--  bvrml_write::write_vrml_header(str);
--
--  str << "Shape {\n"
--      << "  appearance NULL\n"
--      << "    geometry PointSet {\n"
--      << "      color Color{\n"
--      << "        color[\n";
--  // write the colors
--  // iterate through the scene
--  boxm_block_iterator<tree_type > iter= scene->iterator();
--  iter.begin();
--
--  for (; !iter.end(); iter++) {
--    scene->load_block(iter.index());
--    tree_type  *tree = (*iter)->get_tree();
--
--    // iterate through the tree
--    std::vector<cell_type*> cells = tree->leaf_cells();
--
--    for (unsigned i = 0; i < cells.size(); i++)
--    {
--      str <<"        0.5 0.2 0.8\n";
--      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
--      temp_stream <<"        " << (int)coord.x() << ' ' <<(int)coord.y() << ' ' << (int)coord.z() <<  '\n';
--    }
--  }
--  temp_stream.close();
--
--  str << "        ]\n     }\n"
--      << "      coord Coordinate{\n"
--      << "        point[\n";
--
--  // write the coordinates.
--  std::ifstream fin;  // file in
--  std::filebuf *fb;   // file buffer
--  fb = fin.rdbuf();
--  fb->open ("temp.txt",std::ios::in);
--  if (fb->is_open() )
--  {
--    while (fb->sgetc()!=EOF)
--    {
--      std::string temp_str;
--      std::istream isbf(fb);
--      std::getline(isbf, temp_str);
--      str << temp_str << '\n';
--    }
--  }
--  else
--    std::cerr << "file is not open.\n";
--
--  fin.close();
--  str << "        ]\n     }\n   }\n}\n";
--}
--
--#if 0 // not yet working?
--void bvxm_vrml_voxel_grid::write_vrml_grid(std::ofstream& str, bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid, float threshold)
--{
--  bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> >::iterator grid_it = grid->begin();
--
--  str << "Shape {\n"
--      << "  appearance NULL\n"
--      << "    geometry PointSet {\n"
--      << "      color Color{\n"
--      << "        color[\n";
--  // write the colors
--  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
--    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
--      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
--        if ((((*grid_it)(i,j)).mean() > threshold))
--          str <<"        " << ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << '\n';
--      }
--    }
--  }
--  str << "        ]\n     }\n"
--      << "      coord Coordinate{\n"
--      << "        point[\n";
--
--  // write the coordinates
--  grid_it = grid->begin();
--  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
--    std::cout << '.';
--    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
--      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
--        if (((*grid_it)(i,j)).mean() > threshold)
--          str<<"        " << i << ' ' <<j << ' ' << k <<  '\n';
--      }
--    }
--  }
--  str << "        ]\n     }\n   }\n}\n";
--}
--
--
--void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<float> *grid, float threshold)
--{
--  bvxm_voxel_grid<float>::iterator grid_it = grid->begin();
--  vgl_vector_3d<unsigned> dim=grid->grid_size();
--  unsigned s=3;
--  // write the colors
--  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
--    if (k%1==0)
--    {
--      for (unsigned i=0; i<(*grid_it).nx(); i+=s) {
--        for (unsigned j=0; j < (*grid_it).ny(); j+=s) {
--          if (((*grid_it)(i,j) > threshold)) {
--#ifdef DEBUG
--            vgl_sphere_3d<float> sphere((float)i,(float)j,(float)k,0.5f);
--            write_vrml_sphere(str, sphere, (*grid_it)(i,j),(*grid_it)(i,j),(*grid_it)(i,j),1-(*grid_it)(i,j));
--#endif // DEBUG
--            vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.4f);
--            bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
--          }
--        }
--      }
--    }
--  }
--}
--
--void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
--{
--  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
--  // write the colors
--  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
--    for (unsigned i=0; i<(*grid_it).nx(); ) {
--      for (unsigned j=0; j < (*grid_it).ny(); ) {
--        if ((*grid_it)(i,j)[3]/255.0f > threshold) {
--          vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.5f);
--          bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
--        }
--      }
--    }
--  }
--}
--
--
--void bvxm_vrml_voxel_grid::write_vrml_grid_as_pointers(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
--{
--  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--  vgl_vector_3d<double> dirx(1,0,0);
--  vgl_vector_3d<double> diry(0,1,0);
--  vgl_vector_3d<double> dirz(0,0,1);
--  bvrml_write::write_vrml_line(str,origin,dirx,1,1,0,0);
--  bvrml_write::write_vrml_line(str,origin,diry,1,0,1,0);
--  bvrml_write::write_vrml_line(str,origin,dirz,1,0,0,1);
--
--  vgl_vector_3d<unsigned> dim=grid->grid_size();
--  // write the colors
--  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
--    if (k%s==0)
--    {
--      for (unsigned i=0; i<(*grid_it).nx(); i=i+s) {
--        for (unsigned j=0; j < (*grid_it).ny(); j=j+s) {
--          if (((*grid_it)(i,j)[3] > threshold)) {
--            vgl_vector_3d<double> dir((*grid_it)(i,j)[0],(*grid_it)(i,j)[1],(*grid_it)(i,j)[2]);
--            vgl_point_3d<double> pt((double)i/s,(double)j/s,(double)k/s);
--            bvrml_write::write_vrml_line(str, pt,dir,4*((*grid_it)(i,j)[3]-0.5f),1,0,0);
--            bvrml_write::write_vrml_disk(str, pt,dir,2*((*grid_it)(i,j)[3]-0.5f),0,0.5f,0.0f);
--          }
--        }
--      }
--    }
--  }
--}
--#endif // 0
--
--#endif // boxm_vrml_util_h
-diff --git a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
-deleted file mode 100644
-index 91cc0db455..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,18 +0,0 @@
--add_executable( boxm_util_test_all
--  test_driver.cxx
--  test_boxm_plane_ransac.cxx
--  test_boxm_rational_camera_utils.cxx
--  test_quad_interpolate.cxx
-- )
--
--target_link_libraries( boxm_util_test_all boxm_util boxm boxm_sample ${VXL_LIB_PREFIX}testlib boct bsta ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil bvrml)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
--
--add_test( NAME boxm_util_test_plane_ransac COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_plane_ransac  )
--add_test( NAME boxm_util_test_rational_camera_utils COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_rational_camera_utils  ${CMAKE_CURRENT_SOURCE_DIR})
--add_test( NAME boxm_util_test_quad_interpolate COMMAND $<TARGET_FILE:boxm_util_test_all> test_quad_interpolate  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
--
--add_executable( boxm_util_test_include test_include.cxx )
--target_link_libraries( boxm_util_test_include boxm_util)
--add_executable( boxm_util_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_util_test_template_include boxm_util)
-diff --git a/contrib/brl/bseg/boxm/util/tests/camera0.txt b/contrib/brl/bseg/boxm/util/tests/camera0.txt
-deleted file mode 100644
-index cf11c57707..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/camera0.txt
-+++ /dev/null
-@@ -1,104 +0,0 @@
--satId = "????";
--bandId = "RGB";
--SpecId = "RPC00B";
--BEGIN_GROUP = IMAGE
--
--
--  lineOffset = 0.0
--  sampOffset = 0.0
--  latOffset = 0.0
--  longOffset = 0.0
--  heightOffset = 0.0
--  lineScale = 1.0
--  sampScale = 1.0
--  latScale = 1.0
--  longScale = 1.0
--  heightScale = 1.0
--  lineNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  lineDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--END_GROUP = IMAGE
--END;
--lvcs
--47.550493 35.395931 664.186757
-diff --git a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt b/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
-deleted file mode 100644
-index a66e2014bd..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
-+++ /dev/null
-@@ -1,7 +0,0 @@
--1 0 0
--0 1 0
--0 0 1
--1 0 0
--0 1 0
--0 0 1
--0 0 0
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
-deleted file mode 100644
-index 6664f28f37..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
-+++ /dev/null
-@@ -1,79 +0,0 @@
--//:
--// \file
--// \author Gamze Tunali
--// \brief  this code tests the function boxm_plane_ransac.
--//  Creates 10 planes that the same line goes through and 10 random planes
--//  which do not contain the plane. It makes sure it returns only the
--//  first 10 planes as the fittest ones.
--//
--// \date   March 25, 2010
--
--#include <iostream>
--#include <vector>
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_plane_ransac.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vnl/vnl_random.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static const unsigned int test_num=10;
--static const unsigned int test_set=10;
--
--static void test_boxm_plane_ransac()
--{
--  // create 10 planes that the line go through and 10 random planes
--  vgl_point_3d<float> p1(20,20,10);
--  vgl_point_3d<float> p2(30,20,10);
--  vgl_infinite_line_3d<float> line(p1,p2);
--
--  std::vector<boxm_edge_tangent_sample<float> > planes;
--  vnl_random rand;
--  // get two points from the line, and create a random 3rd point to define a plane
--
--  for (unsigned i=0; i<test_num; ++i) {
--    auto x=float(rand.drand32()*100);
--    auto y=float(rand.drand32()*100);
--    auto z=float(rand.drand32()*100);
--    vgl_point_3d<float> p3(x,y,z);
--    vgl_plane_3d<float> plane(p1,p2,p3);
--    boxm_plane_obs<float> obs(plane,1);
--    boxm_edge_tangent_sample<float> sample;
--    sample.insert(obs);
--    planes.push_back(sample);
--  }
--
--  // add the random planes
--  for (unsigned i=0; i<test_set; ++i) {
--    auto a=float(rand.drand32()*100);
--    auto b=float(rand.drand32()*100);
--    auto c=float(rand.drand32()*100);
--    auto d=float(rand.drand32()*100);
--    vgl_plane_3d<float> plane(a,b,c,d);
--    boxm_plane_obs<float> obs(plane,1);
--    boxm_edge_tangent_sample<float> sample;
--    sample.insert(obs);
--    planes.push_back(sample);
--  }
--
--  std::cout << " planes size: " << planes.size() << std::endl;
--
--  std::vector<float> weights(test_set,1);
--  int threshold=2;
--  float residual;
--  vgl_infinite_line_3d<float> l;
--  vgl_box_3d<double> cell_global_box(18,15,5,32,25,15);
--  float ortho_thres = 0.01f;
--  float volume_ratio = 128;
--  boxm_plane_ransac<float>(planes, weights, l, residual, cell_global_box, threshold, ortho_thres, volume_ratio);
--
--  TEST_NEAR("test_boxm_plane_ransac: found the right plane set",
--            (l.point()-line.point()).sqr_length() + (l.direction()-line.direction()).sqr_length(),
--            0.0f, 0.01f);
--}
--
--TESTMAIN(test_boxm_plane_ransac);
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
-deleted file mode 100644
-index bbee3d575d..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
-+++ /dev/null
-@@ -1,24 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--
--
--static void test_boxm_rational_camera_utils()
--{
--  std::string filename="camera0.txt";
--
--  vpgl_local_rational_camera<double>* rcam=read_local_rational_camera<double>( "./" + filename);
--  vgl_plane_3d<double> top(0,0,1,-200);
--  vgl_plane_3d<double> bottom(0,0,1,0);
--
--  unsigned ni=800,
--           nj=800;
--  double u, v;
--
--  rcam->project(495,431,200,u,v);
--  vgl_plane_3d<double>  plane_parallel=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam,top,bottom,ni,nj);
--  // TODO: do something with plane_parallel !
--}
--
--TESTMAIN(test_boxm_rational_camera_utils);
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx b/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
-deleted file mode 100644
-index 3bc9c909f2..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,15 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_boxm_plane_ransac );
--DECLARE( test_boxm_rational_camera_utils );
--DECLARE( test_quad_interpolate );
--
--void register_tests()
--{
--  REGISTER( test_boxm_plane_ransac );
--  REGISTER( test_boxm_rational_camera_utils );
--  REGISTER( test_quad_interpolate );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_include.cxx
-deleted file mode 100644
-index fec661974c..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_include.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/util/boxm_cell_data_traits.h>
--#include <boxm/util/boxm_plane_ransac.h>
--#include <boxm/util/boxm_quad_scan_iterator.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_triangle_interpolation_iterator.h>
--#include <boxm/util/boxm_triangle_scan_iterator.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/util/boxm_vrml_util.h>
--#include <boxm/util/boxm_test_util.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx b/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
-deleted file mode 100644
-index 2c8c986813..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
-+++ /dev/null
-@@ -1,117 +0,0 @@
--#include <iostream>
--#include <fstream>
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_utils.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_polygon.h>
--#include <boxm/util/boxm_quad_scan_iterator.h>
--#include <vgl/vgl_box_3d.h>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <vil/vil_save.h>
--#include <vil/vil_plane.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/algo/vgl_rotation_3d.h>
--
--
--static void test_quad_interpolate(int argc, char* argv[])
--{
--  std::vector<vgl_point_2d<double> > points;
--  points.emplace_back(10,10);
--  points.emplace_back(10,12);
--  points.emplace_back(12,12);
--  points.emplace_back(12,10);
--
--  double xvals[]={10,10,12,12};
--  double yvals[]={10,12,12,10};
--  double vals[]={10,10,12,12};
--  //vgl_polygon<double> poly(points);
--  boxm_quad_scan_iterator poly_it(xvals,yvals);
--  vil_image_view<float> img_min(40,40);
--  vil_image_view<float> img_max(40,40);
--  vil_image_view<float> g_img_max(40,40);
--
--  img_max.fill(0.0f);
--  g_img_max.fill(0.0f);
--  // creating ground truth
--  g_img_max(10,10)=10.5f; g_img_max(10,11)=10.5f;
--  g_img_max(11,10)=11.5f; g_img_max(11,11)=11.5f;
--
--  boxm_utils::quad_interpolate(poly_it, xvals, yvals, vals,img_max,0);
--  for (unsigned i=10;i<=12;i++)
--  {
--    for (unsigned j=10;j<=12;j++)
--    {
--      std::cout << img_max(j,i) << ' ';
--    }
--    std::cout << '\n';
--  }
--  bool flag=true;
--  for (unsigned i=0; i<g_img_max.ni() && flag; ++i)
--  for (unsigned j=0; j<g_img_max.nj() && flag; ++j)
--    if (g_img_max(i,j)!=img_max(i,j))
--      flag=false;
--
--  TEST("Interpolated image", true, flag);
--
--  std::vector<vgl_point_2d<double> > points1;
--  points.emplace_back(10.25,10.25);
--  points.emplace_back(10.25,12.25);
--  points.emplace_back(12.25,12.25);
--  points.emplace_back(12.25,10.25);
--
--  double xvals1[]={10.3,10.3,11.4,11.4};
--  double yvals1[]={10.3,11.4,11.4,10.3};
--  //double vals1[]={10,10,12,12};
--  ////vgl_polygon<double> poly(points);
--  boxm_quad_scan_iterator poly_it_1(xvals1,yvals1);
--  //vil_image_view<float> img_min(40,40);
--  //vil_image_view<float> img_max(40,40);
--
--  g_img_max.fill(0.0f);
--  // creating ground truth
--  g_img_max(10,10)=10;g_img_max(10,11)=10;
--  g_img_max(11,10)=10;g_img_max(11,11)=10;
--
--  float val=0;
--  float count=0;
--  boxm_utils::quad_mean(poly_it_1,g_img_max,val,count);
--
--  // code to test the projection of a cube .
--  vgl_box_3d<double> cell_bb(-0.8,19.2,-18.75,0.7625, 20.7625,-17.1875);
--  std::string camera_input_path = (argc < 2) ? "." : argv[1];
--  std::ifstream ifs((camera_input_path + "/frame_00000.txt").c_str());
--  if (!ifs.is_open()) {
--    std::cerr << "Failed to open file " << camera_input_path << "/frame_00000.txt\n";
--    TEST("Opening camera file", true, false);
--    return;
--  }
--  auto* cam = new vpgl_perspective_camera<double>();
--  ifs >> *cam;
--  double xverts[8];
--  double yverts[8];
--  float vertdist[8];
--  unsigned int ni=1280;
--  unsigned int nj=720;
--
--  vpgl_camera_double_sptr cam_d(cam);
--  vil_image_view<float> front_xyz(ni,nj,1);front_xyz.fill(0.0f);
--  vil_image_view<float> back_xyz(ni,nj,1) ;back_xyz.fill(0.0f);
--
--  std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--  boxm_utils::project_corners(corners,cam_d,xverts,yverts,vertdist);
--  boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam_d,xverts,yverts);
--  boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdist);
--
--  std::string image_output_path = (argc < 3) ? "." : argv[2];
--  std::cout << "Saving two TIFF files to directory " << image_output_path << '\n';
--  vil_save(vil_plane(front_xyz,0),(image_output_path + "/front.tiff").c_str());
--  vil_save(vil_plane(back_xyz,0), (image_output_path + "/back.tiff").c_str());
--}
--
--TESTMAIN_ARGS(test_quad_interpolate);
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
-deleted file mode 100644
-index a3fbe3c4ae..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-deleted file mode 100644
-index 643a441654..0000000000
---- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-+++ /dev/null
-@@ -1,59 +0,0 @@
--# contrib/brl/bseg/boxm_batch/CMakeLists.txt
--
--include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
--include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
--
--if( PYTHON_FOUND )
--  FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--  if( EXPAT_FOUND )
--    include_directories( ${PYTHON_INCLUDE_DIRS} )
--    include_directories( ${BRL_INCLUDE_DIR} )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
--
--    include_directories( ${GEL_INCLUDE_DIR}/mrc )
--    include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--    include_directories( ${MUL_INCLUDE_DIR} )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm/algo )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
--    include_directories( ${BRL_INCLUDE_DIR}/bbas/bsta )
--
--     set(boxm_batch_sources
--         reg_boxm.h   reg_boxm.cxx
--        )
--    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
--      vxl_add_library(LIBRARY_NAME boxm_batch LIBRARY_SOURCES SHARED ${boxm_batch_sources})
--
--      #library has to have different name depending on debug or release version.
--      if(WIN32)
--        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch DEBUG_POSTFIX _d SUFFIX .pyd)
--      endif()
--      if(APPLE)
--        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch SUFFIX .so)
--      endif()
--      set_target_properties(boxm_batch PROPERTIES PREFIX "")
--
--      target_link_libraries(boxm_batch bpro_batch boxm_pro boxm_sample_algo boxm_algo_rt_pro boxm_algo_sp_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro sdet_pro bsta_pro icam_pro bapl_pro )
--
--      if(PYTHON_DEBUG_LIBRARIES)
--        target_link_libraries( boxm_batch debug ${PYTHON_DEBUG_LIBRARY})
--      endif()
--
--      if(PYTHON_LIBRARIES)
--        target_link_libraries( boxm_batch optimized ${PYTHON_LIBRARY})
--      endif()
--
--      if( BUILD_TESTING )
--        add_subdirectory(tests)
--      endif()
--
--    endif()
--  endif()
--endif()
--
--include( ${VXL_CMAKE_DIR}/NewCMake/FindDirectShow.cmake )
--if(DIRECTSHOW_FOUND)
--  add_definitions(-DHAS_DIRECTSHOW)
--endif()
-diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx b/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
-deleted file mode 100644
-index baa2f55b02..0000000000
---- a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
-+++ /dev/null
-@@ -1,135 +0,0 @@
--#include "reg_boxm.h"
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <brdb/brdb_selection.h>
--
--// processes
--#include <vil_pro/vil_register.h>
--#include <vpgl_pro/vpgl_register.h>
--#include <sdet_pro/sdet_register.h>
--//#include <icam_pro/icam_register.h>
--#include <boxm/pro/boxm_register.h>
--#include <boxm/algo/pro/boxm_algo_register.h>
--#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
--#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
--
--#include <bsta/pro/bsta_register.h>
--#include <bapl/pro/bapl_register.h>
--
--#include <bbas_pro/bbas_register.h>
--
--#include <boxm/basic/boxm_util_data_types.h>
--PyObject *
--register_processes(PyObject *self, PyObject *args)
--{
--  vil_register::register_process();
--  vpgl_register::register_process();
--  boxm_register::register_process();
--  boxm_algo_register::register_process();
--
--  boxm_algo_rt_register::register_process();
--  boxm_algo_sp_register::register_process();
--  sdet_register::register_process();
--  //icam_register::register_process();
--  bapl_register::register_process();
--  bbas_register::register_process();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--PyObject *
--register_datatypes(PyObject *self, PyObject *args)
--{
--  register_basic_datatypes();
--  vil_register::register_datatype();
--  vpgl_register::register_datatype();
--  boxm_register::register_datatype();
--  boxm_algo_register::register_process();
--
--  boxm_algo_rt_register::register_datatype();
--  boxm_algo_sp_register::register_datatype();
--
--  bsta_register::register_datatype();
--  //icam_register::register_datatype();
--  bapl_register::register_datatype();
--  bbas_register::register_datatype();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--
--PyObject *get_boxm_array_1d_float(PyObject * /*self*/, PyObject *args)
--{
--  unsigned id;
--  boxm_array_1d_float_sptr value;
--  if (!PyArg_ParseTuple(args, "i:get_boxm_array_1d_float", &id))
--    return NULL;
--
--  std::string relation_name = "boxm_array_1d_float_sptr_data";
--
--  // query to get the data
--  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
--  brdb_selection_sptr selec = DATABASE->select(relation_name, std::move(Q));
--  PyObject *array_1d=0;
--  if (selec->size()!=1) {
--    std::cout << "in get_boxm_array_1d_float() - no relation with type" << relation_name << " id: " << id << std::endl;
--
--    return array_1d;
--  }
--
--  brdb_value_sptr brdb_value;
--  if (!selec->get_value(std::string("value"), brdb_value)) {
--    std::cout << "in get_boxm_array_1d_float() didn't get value\n";
--    return array_1d;
--  }
--
--  if (!brdb_value) {
--    std::cout << "in get_boxm_array_1d_float() - null value\n";
--    return array_1d;
--  }
--
--  brdb_value_t<boxm_array_1d_float_sptr>* result_out = static_cast<brdb_value_t<boxm_array_1d_float_sptr>* >(brdb_value.ptr());
--  value = result_out->value();
--
--  array_1d = PyList_New(value->data_array.size());
--  PyObject *x;
--  for(unsigned i=0;i<value->data_array.size();i++)
--  {
--    x=PyFloat_FromDouble((double)value->data_array[i]);
--    PyList_SetItem(array_1d, i,x);//Py_DECREF(x);
--  }
--  Py_INCREF(array_1d);
--  return array_1d;
--}
--PyMODINIT_FUNC
--initboxm_batch(void)
--{
--  PyMethodDef reg_pro;
--  reg_pro.ml_name = "register_processes";
--  reg_pro.ml_meth = register_processes;
--  reg_pro.ml_doc = "register_processes() create instances of each defined process";
--  reg_pro.ml_flags = METH_VARARGS;
--
--
--  PyMethodDef reg_data;
--  reg_data.ml_name = "register_datatypes";
--  reg_data.ml_meth = register_datatypes;
--  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
--  reg_data.ml_flags = METH_VARARGS;
--
--  PyMethodDef get_boxm_array_1d_float_func;
--  get_boxm_array_1d_float_func.ml_name = "get_boxm_array_1d_float";
--  get_boxm_array_1d_float_func.ml_meth = get_boxm_array_1d_float;
--  get_boxm_array_1d_float_func.ml_doc = "get_boxm_array_1d_float() Get 1-d array in python";
--  get_boxm_array_1d_float_func.ml_flags = METH_VARARGS;
--
--  boxm_batch_methods[0]=reg_pro;
--  boxm_batch_methods[1]=reg_data;
--  boxm_batch_methods[2]=get_boxm_array_1d_float_func;
--
--  for (int i=0; i<METHOD_NUM; ++i) {
--    boxm_batch_methods[i+3]=batch_methods[i];
--  }
--
--  Py_InitModule("boxm_batch", boxm_batch_methods);
--}
-diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.h b/contrib/brl/bseg/boxm_batch/reg_boxm.h
-deleted file mode 100644
-index fa2ddfee33..0000000000
---- a/contrib/brl/bseg/boxm_batch/reg_boxm.h
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#ifndef reg_boxm_h_
--#define reg_boxm_h_
--
--#include <bpro/bpro_batch/bpro_batch.h>
--
--static PyObject *register_processes(PyObject *self, PyObject *args);
--static PyObject *register_datatypes(PyObject *self, PyObject *args);
--static PyObject *get_boxm_array_1d_float(PyObject * self, PyObject *args);
--
--static PyMethodDef boxm_batch_methods[METHOD_NUM+3];
--
--#endif
-diff --git a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
-deleted file mode 100644
-index 8b72db0d89..0000000000
---- a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_batch_test_include test_include.cxx )
--target_link_libraries( boxm_batch_test_include boxm_batch)
-diff --git a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx b/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
-deleted file mode 100644
-index f962b339e8..0000000000
---- a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm_batch/reg_boxm.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
-deleted file mode 100644
-index 7186a42583..0000000000
---- a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
-+++ /dev/null
-@@ -1,25 +0,0 @@
--if (HAS_GEOTIFF)
--include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
--if(OPENCL_FOUND)
--
--  add_definitions(-DHAS_OPENCL=1)
--  include_directories( ${OPENCL_INCLUDE_PATH} )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--  include_directories( ${MUL_INCLUDE_DIR} )
--
--  add_executable( boxm2_to_boxm_exe boxm2_to_boxm.cxx  boxm2_to_boxm.h)
--  target_link_libraries( boxm2_to_boxm_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--  # executable to convert a bit scene to a boxm2_scene
--  add_executable( boxm_to_boxm2_exe boxm_to_boxm2.cxx  boxm_to_boxm2.h)
--  target_link_libraries( boxm_to_boxm2_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--  #tests
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
--else()
--  message(STATUS "Skipping contrib/brl/bseg/boxm_bridge: requires geotiff")
--endif()
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
-deleted file mode 100644
-index a9a7c43ba6..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
-+++ /dev/null
-@@ -1,233 +0,0 @@
--//:
--// \file
--#include <iostream>
--#include <queue>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree2.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--#define BOXM2_SCENE_HAS_DIMENSIONS
--
--//: computes the log2 of a number and returns it.
--// power_of_2 is set to true if \p x is an exact power of two.
--// returns -1 when \p x is zero.
--int mylog2(unsigned x, bool& power_of_2)
--{
--  unsigned orig_x = x;
--  int l = -1; // mylog2(0) will return -1
--  while (x != 0u) {
--    x >>= 1u;
--    ++l;
--  }
--  if (orig_x > std::pow(2.0,l)) {
--    power_of_2 = false;
--    ++l;
--  }
--  else
--    power_of_2 = true;
--  return l;
--}
--
--
--template <class T_loc, class T_data>
--void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
--{
--  // find the leaf node in the tree to insert subtree
--  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
--  if (!node)
--    std::cerr << "The node could NOT be FOUND\n";
--  if (node->children()) {
--    std::cerr << "The node is not a leaf node! Cannot insert here\n";
--    return;   // it should have been a leaf node
--  }
--
--  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
--  node->insert_subtree(sub_root);
--}
--
--// converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_tree(boct_bit_tree2 const& bit_tree, boct_tree<T_loc,T_data>*& tree,
--                  boxm2_data<BOXM2_NORMAL>* normal_data)
--{
--  // check if root has any child, if not return the empty tree
--  tree = new boct_tree<T_loc,T_data>(4, 1);
--
--  // if root has no child return a root node filled with data
--  if (!bit_tree.bit_at(0)) {
--    int data_idx = bit_tree.get_data_index(0,false);
--    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
--    tree->root()->set_data(vnl_vector_fixed<float, 3> (data[0], data[1], data[2]));
--    return;
--  }
--
--  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--  boct_tree_cell<T_loc,T_data>* root = tree->root();
--  Q.push(root);
--
--  // go through the bits and create cells
--  int data_idx=bit_tree.get_data_index(0,false);
--  for (unsigned i=0; i<73; i++) {
--    int parent_idx = (i-1)/8;
--    if (i==0 || bit_tree.bit_at(parent_idx)) {
--      if (!Q.empty()) {
--        boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
--        vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
--        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--        ptr->set_data(normal);
--        Q.pop();
--        if (bit_tree.bit_at(i)) {
--          ptr->split();
--          boct_tree_cell<T_loc,T_data>* children = ptr->children();
--          for (unsigned j=0; j<8; j++) {
--            Q.push(&children[j]);
--          }
--        }
--        data_idx++;
--      }
--    }
--  }
--
--  // some of the leaf nodes are still in the queue, fill them with data
--  while (!Q.empty()) {
--    if (data_idx > bit_tree.get_data_index(0,false)+585)
--      std::cerr << "ERROR! exceeded!\n";
--    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
--    vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
--    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--    ptr->set_data(normal);
--    Q.pop();
--    data_idx++;
--  }
--}
--
--int main(int argc, char** argv)
--{
--  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
--  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
--  vul_arg<std::string> boxm_dir("-out", "output directory", "");
--  vul_arg_parse(argc, argv);
--
--  boxm2_scene scene2(boxm2_file());
--
--  //initialize a block and data cache
--  boxm2_lru_cache::create(&scene2);
--  boxm2_cache_sptr cache = boxm2_cache::instance();
--
--  bgeo_lvcs lvcs = scene2.lvcs();
--  //vgl_point_3d<double> origin = scene2.local_origin();
--  vgl_box_3d<double> world = scene2.bounding_box();
--  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2.blocks();
--  std::map<boxm2_block_id, boxm2_block_metadata>::iterator iter = blocks.begin();
--
--  typedef boct_tree<short, vnl_vector_fixed<float, 3> > tree_type;
--  vgl_vector_3d<unsigned int> block_nums = scene2.scene_dimensions();
--  vgl_point_3d<int> min_block_index;
--  vgl_point_3d<double> origin;
--  scene2.min_block_index(min_block_index, origin);
--  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
--
--
--  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
--  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
--  scene.set_paths(scene_path,"block");
--  scene.set_appearance_model(VNL_FLOAT_3);
--
--  int x_dim;
--  while (iter != blocks.end()) {
--    boxm2_block_metadata metadata = iter ->second;
--    boxm2_block_id id = iter->first;
--    boxm2_block *     block     = cache->get_block(iter->first);
--    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
--
--    boxm2_data_base * data_base  = cache->get_data_base(iter->first,boxm2_data_traits<BOXM2_NORMAL>::prefix());
--    boxm2_data<BOXM2_NORMAL> *data =new boxm2_data<BOXM2_NORMAL>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
--
--    // compute the block bounding box etc
--    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
--    vgl_vector_3d<double> subdim=block->sub_block_dim();
--
--    // block dimensions should be equal
--    bool equal = (dim.x()==dim.y());
--    equal = equal && (dim.x()==dim.z());
--    assert(equal);
--
--    // the block dimensions should be the power of 2 for octree creation
--    bool pow_of_2;
--    x_dim = mylog2((double)dim.x(),pow_of_2);
--    assert(pow_of_2);
--
--    double p[3];
--    p[0] = metadata.local_origin_.x();
--    p[1] = metadata.local_origin_.y();
--    p[2] = metadata.local_origin_.z();
--    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
--    tree_type* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
--    block_tree->set_bbox(block_bb);
--    block_tree->init_cells(0);
--
--    int block_i = id.i() - min_block_index.x();
--    int block_j = id.j() - min_block_index.y();
--    int block_k = id.k() - min_block_index.z();
--
--    scene.load_block(block_i, block_j, block_k);
--    // go over the subtrees
--    for (unsigned z=0; z<dim.z(); z++) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        for (unsigned x=0; x<dim.x(); x++) {
--          boxm2_block::uchar16 tree = block->trees()[x][y][z];
--          boct_bit_tree2 bit_tree((unsigned char*)tree.data_block());
--          if (bit_tree.num_cells() >= 1) {
--            tree_type* octree;
--            convert_tree(bit_tree,octree,data);
--            int n1=bit_tree.num_cells();
--            int n2=octree->all_cells().size();
--            if (n1 != n2) {
--              std::cerr << x << ',' << y << ',' << z << '\n'
--              << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
--            }
--
--            // all three dimensions should be same now, so we can use the one value
--            double cell_dim=1./dim.x();
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            insert(block_tree,octree, cell_bb);
--
--            // since the subtree is added to the main tree, we can delete the root node now
--            delete octree;
--          }
--        }
--      }
--    }
--    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
--    block_new->init_tree(block_tree);
--    scene.write_active_block();
--    iter++;
--  }
--  scene.set_octree_levels(x_dim+4, x_dim+1);
--  scene.write_scene("boxm_scene.xml");
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
-deleted file mode 100644
-index a9d5135776..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
-+++ /dev/null
-@@ -1,292 +0,0 @@
--#include <iostream>
--#include <queue>
--#include "boxm2_to_boxm.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--#define BOXM2_SCENE_HAS_DIMENSIONS
--
--//: computes the log2 of a number and returns it.
--// power_of_2 is set to true if \p x is an exact power of two.
--// returns -1 when \p x is zero.
--int mylog2(unsigned x, bool& power_of_2)
--{
--  unsigned orig_x = x;
--  int l = -1; // mylog2(0) will return -1
--  while (x != 0u) {
--    x >>= 1u;
--    ++l;
--  }
--  if (orig_x > std::pow(2.0,l)) {
--    power_of_2 = false;
--    ++l;
--  }
--  else
--    power_of_2 = true;
--  return l;
--}
--
--
--template <class T_loc, class T_data>
--void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
--{
--  // find the leaf node in the tree to insert subtree
--  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
--  if (!node)
--    std::cerr << "The node could NOT be FOUND\n";
--  if (node->children()) {
--    std::cerr << "The node is not a leaf node! Cannot insert here\n";
--    return;   // it should have been a leaf node
--  }
--
--  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
--  node->insert_subtree(sub_root);
--}
--
--//: combine the data values to create a sample
--boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
--                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
--                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs)
--{
--  float m0=data[0]/255.0f;
--  float v0=data[1]/255.0f;
--  float w0=data[2]/255.0f;
--  float m1=data[3]/255.0f;
--  float v1=data[4]/255.0f;
--  float w1=data[5]/255.0f;
--  float m2=data[6]/255.0f;
--  float v2=data[7]/255.0f;
--  float w2=0;
--  if (w0>0 && w1>0)
--    w2=1.0-w0-w1;
--
--  unsigned short n0=num_obs[0];
--  unsigned short n1=num_obs[1];
--  unsigned short n2=num_obs[2];
--  unsigned short nmix=num_obs[3];
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::mix_gauss_sf1_type mix_gauss_sf1_type;
--
--
--  bsta_gauss_sf1 dist0((float)m0, (float)v0);
--  bsta_num_obs<bsta_gauss_sf1> num_obs_dist0(dist0, n0);
--  bsta_gauss_sf1 dist1((float)m1, (float)v1);
--  bsta_num_obs<bsta_gauss_sf1> num_obs_dist1(dist1, n1);
--  bsta_gauss_sf1 dist2((float)m2, (float)v2);
--  bsta_num_obs<bsta_gauss_sf1> num_obs_dist2(dist2, n2);
--
--  bsta_mixture_fixed<gauss_type_sf1, 3>  mf;
--  mf.insert(num_obs_dist0,w0);
--  mf.insert(num_obs_dist1,w1);
--  mf.insert(num_obs_dist2,w2);
--
--  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs(mf,nmix/100.0f);
--
--  boxm_sample<BOXM_APM_MOG_GREY> sample(alpha, obs);
--  return sample;
--}
--
--// converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
--                  boxm2_data<BOXM2_ALPHA>* alpha_data,
--                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
--                  boxm2_data<BOXM2_NUM_OBS>* num_obs)
--{
--  // check if root has any child, if not return the empty tree
--  tree = new boct_tree<T_loc,T_data>(4, 1);
--
--  // if root has no child return a root node filled with data
--  if (!bit_tree.bit_at(0)) {
--    int data_idx = bit_tree.get_data_index(0,false);
--    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
--    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
--    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
--    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
--    tree->root()->set_data(sample);
--    return;
--  }
--
--  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--  boct_tree_cell<T_loc,T_data>* root = tree->root();
--  Q.push(root);
--
--  // go through the bits and create cells
--  int data_idx=bit_tree.get_data_index(0,false);
--  for (unsigned i=0; i<73; i++) {
--    int parent_idx = (i-1)/8;
--    if (i==0 || bit_tree.bit_at(parent_idx)) {
--      if (!Q.empty()) {
--        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
--        boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
--        boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
--        boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
--
--        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--        ptr->set_data(sample);
--        Q.pop();
--        if (bit_tree.bit_at(i)) {
--          ptr->split();
--          boct_tree_cell<T_loc,T_data>* children = ptr->children();
--          for (unsigned j=0; j<8; j++) {
--            Q.push(&children[j]);
--          }
--        }
--        data_idx++;
--      }
--    }
--  }
--
--  // some of the leaf nodes are still in the queue, fill them with data
--  while (!Q.empty()) {
--    if (data_idx > bit_tree.get_data_index(0,false)+585)
--      std::cerr << "ERROR! exceeded!\n";
--    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
--    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
--    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
--    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
--    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--    ptr->set_data(sample);
--    Q.pop();
--   data_idx++;
--  }
--}
--
--int main(int argc, char** argv)
--{
--  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
--  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
--  vul_arg<std::string> boxm_dir("-out", "output directory", "");
--  vul_arg_parse(argc, argv);
--
--  boxm2_scene_sptr scene2 = new boxm2_scene(boxm2_file());
--
--  //initialize a block and data cache
--  boxm2_lru_cache::create(scene2);
--  boxm2_cache_sptr cache = boxm2_cache::instance();
--
--  vpgl_lvcs lvcs = scene2->lvcs();
--  //vgl_point_3d<double> origin = scene2->local_origin();
--  vgl_box_3d<double> world = scene2->bounding_box();
--  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2->blocks();
--  auto iter = blocks.begin();
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  vgl_vector_3d<unsigned int> block_nums = scene2->scene_dimensions();
--  vgl_point_3d<int> min_block_index;
--  vgl_point_3d<double> origin;
--  scene2->min_block_index(min_block_index, origin);
--  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
--
--
--  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
--  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
--  scene.set_paths(scene_path,"block");
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--
--  int x_dim;
--  while (iter != blocks.end()) {
--    boxm2_block_metadata metadata = iter ->second;
--    boxm2_block_id id = iter->first;
--    boxm2_block *     block     = cache->get_block(scene2, iter->first);
--    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
--    boxm2_data_base * data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_NUM_OBS>::prefix());
--    boxm2_data<BOXM2_NUM_OBS> *num_obs=new boxm2_data<BOXM2_NUM_OBS>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
--
--    boxm2_data_base * mog3_data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_MOG3_GREY>::prefix());
--    boxm2_data<BOXM2_MOG3_GREY> *mog3_data=new boxm2_data<BOXM2_MOG3_GREY>(mog3_data_base->data_buffer(),mog3_data_base->buffer_length(),mog3_data_base->block_id());
--    boxm2_data_base * alpha_data_base  = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_ALPHA>::prefix());
--    boxm2_data<BOXM2_ALPHA> *alpha_data =new boxm2_data<BOXM2_ALPHA>(alpha_data_base->data_buffer(),alpha_data_base->buffer_length(),alpha_data_base->block_id());
--
--    // compute the block bounding box etc
--    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
--    vgl_vector_3d<double> subdim=block->sub_block_dim();
--
--    // block dimensions should be equal
--    bool equal = (dim.x()==dim.y());
--    equal = equal && (dim.x()==dim.z());
--    assert(equal);
--
--    // the block dimensions should be the power of 2 for octree creation
--    bool pow_of_2;
--    x_dim = mylog2((double)dim.x(),pow_of_2);
--    assert(pow_of_2);
--
--    double p[3];
--    p[0] = metadata.local_origin_.x();
--    p[1] = metadata.local_origin_.y();
--    p[2] = metadata.local_origin_.z();
--    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
--    auto* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
--    block_tree->set_bbox(block_bb);
--    block_tree->init_cells(0);
--
--    int block_i = id.i() - min_block_index.x();
--    int block_j = id.j() - min_block_index.y();
--    int block_k = id.k() - min_block_index.z();
--
--    scene.load_block(block_i, block_j, block_k);
--    // go over the subtrees
--    for (unsigned z=0; z<dim.z(); z++) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        for (unsigned x=0; x<dim.x(); x++) {
--          boxm2_block::uchar16 tree = block->trees()[x][y][z];
--          boct_bit_tree bit_tree((unsigned char*)tree.data_block());
--          if (bit_tree.num_cells() >= 1) {
--            tree_type* octree;
--            convert_tree(bit_tree,octree,alpha_data,mog3_data,num_obs);
--            int n1=bit_tree.num_cells();
--            int n2=octree->all_cells().size();
--            if (n1 != n2) {
--              std::cerr << x << ',' << y << ',' << z << '\n'
--                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
--            }
--
--            // all three dimensions should be same now, so we can use the one value
--            double cell_dim=1./dim.x();
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            insert(block_tree,octree, cell_bb);
--
--            // since the subtree is added to the main tree, we can delete the root node now
--            delete octree;
--          }
--        }
--      }
--    }
--    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
--    block_new->init_tree(block_tree);
--    scene.write_active_block();
--    iter++;
--  }
--  scene.set_octree_levels(x_dim+4, x_dim+1);
--  scene.write_scene("boxm_scene.xml");
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
-deleted file mode 100644
-index a4dec11806..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
-+++ /dev/null
-@@ -1,24 +0,0 @@
--#ifndef boxm2_to_boxm_h_
--#define boxm2_to_boxm_h_
--//:
--// \file
--
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--#include <boxm2/boxm2_data.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--//: combine the data values to create a sample
--boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
--                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
--                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs);
--
--//: converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
--                  boxm2_data<BOXM2_ALPHA>* alpha_data,
--                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
--                  boxm2_data<BOXM2_NUM_OBS>* num_obs);
--
--#endif // boxm2_to_boxm_h_
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
-deleted file mode 100644
-index 54dc134841..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
-+++ /dev/null
-@@ -1,326 +0,0 @@
--#include <queue>
--#include <iostream>
--#include "boxm_to_boxm2.h"
--//:
--// \file
--//
--//  boxm_normals_to_boxm2.cxx
--//
--// \author
--//  Created by David Borton on 11/28/11.
--//  Copyright (c) 2011 Brown University. All rights reserved.
--//
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree2.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--
--//: extracts the tree cell's data into an array format for boxm2 representation
--template <class T_loc, class T_data>
--void convert_data(boct_tree<T_loc,T_data>* tree,
--                  boct_tree_cell<T_loc,T_data>* tree_cell,
--                  boct_tree_cell<T_loc, bool>* valid_cell,
--                  boct_tree_cell<T_loc, float>* alpha_cell,
--                  boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr,
--                  boxm2_data_traits<BOXM2_POINT>::datatype* points_arr,
--                  boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr,
--                  int& data_idx)
--{
--  // go through the tree, in depth first order to collect data
--  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--  std::queue<boct_tree_cell<T_loc,float>*> alpha_Q;
--  std::queue<boct_tree_cell<T_loc,bool>*> valid_Q;
--
--  Q.push(tree_cell);
--  alpha_Q.push(alpha_cell);
--  valid_Q.push(valid_cell);
--
--  while (!Q.empty()) {
--    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--    boct_tree_cell<T_loc, bool>* valid_ptr = valid_Q.front();
--    boct_tree_cell<T_loc, float> alpha_ptr = alpha_Q.front();
--    vgl_point_3d<double> point = tree->global_centroid(tree_cell);
--
--    if (ptr && valid_ptr && alpha_ptr)
--    {
--      if (valid_ptr->data()) {
--        T_data normal = tree_cell->data();
--
--        normals_arr[data_idx][0] = normal[0];
--        normals_arr[data_idx][1] = normal[2];
--        normals_arr[data_idx][2] = normal[3];
--        normals_arr[data_idx][3] = 0.0f;
--
--        points_arr[data_idx][0] = point.x();
--        points_arr[data_idx][1] = point.y();
--        points_arr[data_idx][2] = point.z();
--        points_arr[data_idx][3] = 0.0f;
--
--        alpha_arr[data_idx]=alpha_cell->data();
--      }
--      else {
--        normals_arr[data_idx][0] = 0.0f;
--        normals_arr[data_idx][1] = 0.0f;
--        normals_arr[data_idx][2] = 0.0f;
--        normals_arr[data_idx][3] = 0.0f;
--
--        points_arr[data_idx][0] = point.x();
--        points_arr[data_idx][1] = point.y();
--        points_arr[data_idx][2] = point.z();
--        points_arr[data_idx][3] = 0.0f;
--
--        alpha_arr[data_idx]=alpha_cell->data();
--      }
--
--      data_idx++;
--
--      if (!ptr->is_leaf()) {
--        boct_tree_cell<T_loc,T_data>* children = ptr->children();
--        boct_tree_cell<T_loc, bool>* valid_children = valid_ptr->children();
--        boct_tree_cell<T_loc, float>* alpha_chidren = alpha_ptr->children();
--        for (unsigned j=0; j<8; j++) {
--          Q.push(&children[j]);
--          alpha_Q.push(&alpha_chidren[j]);
--          valid_Q.push(&valid_children[j]);
--        }
--      }
--    }
--    Q.pop();
--    alpha_Q.pop();
--    valid_Q.pop();
--  }
--}
--
--//: recursively sets the bits based on the octree structure
--template <class T_loc, class T_data>
--void set_bits(boct_bit_tree2*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
--{
--  if (cell.code_.level == 0)
--    return;
--
--  if (!cell.is_leaf()) {
--    int bit_idx=idx*8+1+child_idx;
--    bit_tree->set_bit_at(bit_idx,true);
--    for (unsigned i=0; i<8; i++)
--      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
--  }
--}
--
--//: converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree2*& bit_tree)
--{
--  bit_tree = new boct_bit_tree2();
--  // first set all the bits to 0
--  for (unsigned i=0; i<73; i++)
--    bit_tree->set_bit_at(i,false);
--
--  // empty tree
--  if (!tree_cell)
--    return;
--
--  // only root node
--  if (tree_cell->is_leaf())
--    return;
--
--  int idx=0;
--  bit_tree->set_bit_at(idx,true); // root
--  for (unsigned i=0; i<8; i++) {  // level root-1
--    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
--  }
--}
--
--template <class T_loc, class T_data>
--void convert_scene( boxm_scene<boct_octree<T_loc, T_data> > &scene,
--                    boxm_scene<boct_octree<T_loc, bool> > &valid_scene,
--                    boxm_scene<boct_octree<T_loc, float> > &alpha_scene,
--                    boxm2_scene &new_scene)
--{
--  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
--  unsigned int dim=sub_block_dim();
--  typedef boct_octree<T_loc, T_data> tree_type;
--  boxm_block_iterator<tree_type > iter(&scene);
--  boxm_block_iterator<tree_type > validd_iter(&valid_scene);
--  boxm_block_iterator<tree_type > alpha_iter(&alpha_scene);
--
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type >* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    std::cout<<block_bb<<std::endl;
--    tree_type * tree = block->get_tree();
--
--    valid_scene.load_block(idx);
--    boxm_block<boct_tree<short, bool> >* valid_block = valid_scene.get_block(idx);
--    boct_tree<short, bool> * valid_tree = valid_block->get_tree();
--
--    alpha_scene.load_block(idx);
--    boxm_block<boct_tree<short, float> >* alpha_block = alpha_scene.get_block(idx);
--    boct_tree<short, float> * alpha_tree = alpha_block->get_tree();
--
--    // create metadata for the block
--    boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
--    vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
--    vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
--    vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
--                                         sub_block_dim.y()*scene.block_dim().y(),
--                                         sub_block_dim.z()*scene.block_dim().z());
--    boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
--                                  real_block_dim,sub_block_num,1,4,650.0,0.001);
--    boxm2_block new_block(metadata);
--    new_blocks[block_id]=metadata;
--
--    // find the total number of cells to figure out data array sizes, as the first step
--    int data_size=0;
--    for (unsigned z=0; z<dim; z++) {
--      for (unsigned y=0; y<dim; y++) {
--        for (unsigned x=0; x<dim; x++) {
--          double cell_dim=1./dim;
--          double p[3];
--          p[0] = x*cell_dim;
--          p[1] = y*cell_dim;
--          p[2] = z*cell_dim;
--          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--          boct_tree_cell<T_loc,T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--          if (!node)
--            std::cout << "The node COULD not be FOUND" << std::endl;
--          else {
--            std::vector<boct_tree_cell<T_loc,T_data> > *> children;
--            node->all_children(children);
--            int n2= children.size()+1;
--            data_size += n2;
--          }
--        }
--      }
--    }
--
--    // allocate data array
--    boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr=new  boxm2_data_traits<BOXM2_NORMAL>::datatype[data_size];
--    boxm2_data_traits<BOXM2_POINT>::datatype* points_arr=new  boxm2_data_traits<BOXM2_POINT>::datatype[data_size];
--    boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr = new boxm2_data_traits<BOXM2_ALPHA>::datatype[data_size];
--
--    // divide the blocks
--    int data_idx=0;
--    boxm2_array_3d<boxm2_block::uchar16>& trees = new_block.trees();
--    for (unsigned z=0; z<dim; z++) {
--      for (unsigned y=0; y<dim; y++) {
--        for (unsigned x=0; x<dim; x++) {
--          double cell_dim=1./dim;
--          double p[3];
--          p[0] = x*cell_dim;
--          p[1] = y*cell_dim;
--          p[2] = z*cell_dim;
--          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--          boct_tree_cell<T_loc, T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--          boct_tree_cell<T_loc, bool>* valid_node = valid_tree->locate_point_at_level(cell_bb.centroid(), 3);
--          boct_tree_cell<T_loc, float> *alpha_node = alpha_tree->locate_point_at_level(cell_bb.centroid(), 3);
--
--          if (!(node && valid_node && alpha_node) )
--            std::cout << "One of the nodes COULD not be FOUND" << std::endl;
--          else {
--            std::vector<boct_tree_cell<T_loc, T_data > *> children;
--            node->all_children(children);
--            int n2= children.size()+1;
--
--            boct_bit_tree2* bit_tree;
--            convert_to_bittree(node, bit_tree);
--            int n1=bit_tree->num_cells();
--            int start=data_idx;
--            convert_data(tree, node, valid_node, alpha_node, normals_arr, points_arr, alpha_arr,  data_idx);
--            // set the data index at the tree
--            bit_tree->set_data_ptr(start, false);
--            // set the tree at the block
--            boxm2_block::uchar16& t=trees[x][y][z];
--            t.set(bit_tree->get_bits());
--            if (n1 != n2) {
--              std::cout << x << ',' << y << ',' << z << '\n'
--                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
--            }
--          }
--        }
--      }
--    }
--    char* b1 = reinterpret_cast<char *>(normals_arr);
--    boxm2_data<BOXM2_NORMAL> *normals_data=new boxm2_data<BOXM2_NORMAL>(b1,data_size*sizeof(boxm2_data_traits<BOXM2_NORMAL>::datatype),block_id);
--    char* b2 = reinterpret_cast<char *>(pointa_arr);
--    boxm2_data<BOXM2_POINT> *points_data=new boxm2_data<BOXM2_POINT>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_POINT>::datatype),block_id);
--    char* b3 = reinterpret_cast<char *>(alpha_arr);
--    boxm2_data<BOXM2_ALPHA> *alpha_data = new boxm2_data<BOXM2_ALPHA>(b3, data_size*sizeof(boxm2_data_traits<BOXM2_ALPHA>::datatype),block_id);
--
--    boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
--    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, normals_data);
--    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, points_data);
--    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
--
--    delete [] normals_arr;
--    delete [] points_arr;
--    delete [] alpha_arr;
--    iter++;
--  }
--  new_scene.set_blocks(new_blocks);
--  new_scene.save_scene();
--}
--
--int main(int argc, char** argv)
--{
--  std::cout << "Converting boxm scene with normals to boxm2 normals and points" << std::endl;
--  vul_arg<std::string> scene_path("-normals_scene", "scene filename", "");
--  vul_arg<std::string> scene_path("-valid_scene", "scene filename", "");
--  vul_arg<std::string> scene_path("-alpha_scene", "scene filename", "");
--  vul_arg<std::string> out_dir("-out", "output directory", "");
--  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
--  vul_arg_parse(argc, argv);
--
--  boxm_scene_parser parser;
--  boxm_scene_base_sptr n_scene_ptr=new boxm_scene_base();
--  n_scene_ptr->load_scene(normals_scene(), parser);
--
--  if (n_scene_ptr->appearence_model() == VNL_FLOAT_3)
--  {
--    typedef boct_tree<short, VNL_FLOAT_3 > tree_type;
--    boxm_scene<tree_type > scene;
--    scene.load_scene(normals_scene());
--
--    boxm_scene<boct_tree<short, bool> > valid_scene;
--    valid_scene.load_scene(valid_scene());
--
--    boxm_scene<boct_tree<short, float> > alpha_scene;
--    alpha_scene.load_scene(alpha_scene());
--
--    // create a boxm2 scene
--    boxm2_scene new_scene;
--    new_scene.set_data_path(out_dir());
--    new_scene.set_local_origin(scene.origin());
--    new_scene.set_lvcs(scene.lvcs());
--    new_scene.set_xml_path(out_dir()+"/scene.xml");
--
--    //initialize a block
--    boxm2_lru_cache::create(&new_scene);
--
--    convert_scene(scene, valid_scene, alpha_scene, new_scene);
--  }
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
-deleted file mode 100644
-index 5a3d2d6e83..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
-+++ /dev/null
-@@ -1,262 +0,0 @@
--#include <iostream>
--#include <queue>
--#include "boxm_to_boxm2.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--
--//: extracts the parameters of a boxm_sample for boxm2 representation
--void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
--                        float &alpha,
--                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
--                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs)
--{
--  alpha=sample.alpha;
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
--
--  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs = sample.appearance();
--  unsigned int nmix = obs.num_observations*100.0;
--  num_obs[3] = nmix;
--
--  for (unsigned i=0; i<obs.num_components(); i++) {
--    gauss_type_sf1  mf=obs.distribution(i);
--    auto w = (unsigned char)std::floor(obs.weight(i)*255.0);
--    unsigned int  n = (unsigned char)mf.num_observations;
--    auto m = (unsigned char)std::floor(mf.mean()*255.0);
--    auto v = (unsigned char)std::floor(mf.var()*255.0);
--    num_obs[i]=n;
--    data[i*3]=m;
--    data[i*3+1]=v;
--    if (i<2)
--      data[i*3+2]=w;
--  }
--}
--
--//: extracts the tree cell's data into an array format for boxm2 representation
--template <class T_loc, class T_data>
--void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
--                  float* alpha,
--                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
--                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
--                  int& data_idx)
--{
--    // go through the tree, in depth first order to collect data
--    std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--    Q.push(tree_cell);
--    while (!Q.empty()) {
--        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--        {
--            deconstruct_sample(ptr->data(),alpha[data_idx],data[data_idx],num_obs[data_idx]);
--            data_idx++;
--            if (!ptr->is_leaf()) {
--                boct_tree_cell<T_loc,T_data>* children = ptr->children();
--                for (unsigned j=0; j<8; j++) {
--                    Q.push(&children[j]);
--                }
--            }
--        }
--        Q.pop();
--    }
--}
--
--//: recursively sets the bits based on the octree structure
--template <class T_loc, class T_data>
--void set_bits(boct_bit_tree*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
--{
--  if (cell.code_.level == 0)
--    return;
--
--  if (!cell.is_leaf()) {
--    int bit_idx=idx*8+1+child_idx;
--    bit_tree->set_bit_at(bit_idx,true);
--    for (unsigned i=0; i<8; i++)
--      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
--  }
--}
--
--//: converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree)
--{
--  bit_tree = new boct_bit_tree();
--  // first set all the bits to 0
--  for (unsigned i=0; i<73; i++)
--    bit_tree->set_bit_at(i,false);
--
--  // empty tree
--  if (!tree_cell)
--    return;
--
--  // only root node
--  if (tree_cell->is_leaf()) {
--    return;
--  }
--
--  int idx=0;
--  bit_tree->set_bit_at(idx,true); // root
--  for (unsigned i=0; i<8; i++) {  // level root-1
--    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
--  }
--}
--
--int main(int argc, char** argv)
--{
--  std::cout << "Converting boxm scene to boxm2 Scene" << std::endl;
--  vul_arg<std::string> scene_path("-scene", "scene filename", "");
--  vul_arg<std::string> out_dir("-out", "output directory", "");
--  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
--  vul_arg_parse(argc, argv);
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  boxm_scene<tree_type > scene;
--  scene.load_scene(scene_path());
--
--  // create a boxm2 scene
--  boxm2_scene new_scene;
--  new_scene.set_data_path(out_dir());
--  new_scene.set_local_origin(scene.origin());
--  new_scene.set_lvcs(scene.lvcs());
--  new_scene.set_xml_path(out_dir()+"/scene.xml");
--
--  //initialize a block
--  boxm2_lru_cache::create(&new_scene);
--
--  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
--  unsigned int dim=sub_block_dim();
--  if (scene.appearence_model() == BOXM_APM_MOG_GREY) {
--    boxm_block_iterator<tree_type > iter(&scene);
--    while (!iter.end()) {
--      vgl_point_3d<int> idx = iter.index();
--      scene.load_block(idx);
--      boxm_block<tree_type >* block = scene.get_block(idx);
--      vgl_box_3d<double> block_bb = block->bounding_box();
--      std::cout<<block_bb<<std::endl;
--      tree_type * tree = block->get_tree();
--
--      // create metadata for the block
--      boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
--      vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
--      vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
--      vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
--                                           sub_block_dim.y()*scene.block_dim().y(),
--                                           sub_block_dim.z()*scene.block_dim().z());
--      boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
--                                    real_block_dim,sub_block_num,1,4,650.0,0.001);
--      boxm2_block new_block(metadata);
--      new_blocks[block_id]=metadata;
--
--      // find the total number of cells to figure out data array sizes, as the first step
--      int data_size=0;
--      for (unsigned z=0; z<dim; z++) {
--        for (unsigned y=0; y<dim; y++) {
--          for (unsigned x=0; x<dim; x++) {
--            double cell_dim=1./dim;
--            double p[3];
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--            if (!node)
--              std::cout << "The node COULD not be FOUND" << std::endl;
--            else {
--              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
--              node->all_children(children);
--              int n2= children.size()+1;
--              data_size += n2;
--            }
--          }
--        }
--      }
--
--      // allocate data array
--      auto* data_arr=new  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype[data_size];
--      auto* num_obs_arr=new  boxm2_data_traits<BOXM2_NUM_OBS>::datatype[data_size];
--      auto* alpha_arr = new float[data_size];
--
--      // divide the blocks
--      int data_idx=0;
--      boxm2_array_3d<boxm2_block::uchar16> trees = new_block.trees_copy();
--      for (unsigned z=0; z<dim; z++) {
--        for (unsigned y=0; y<dim; y++) {
--          for (unsigned x=0; x<dim; x++) {
--            double cell_dim=1./dim;
--            double p[3];
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--            if (!node)
--              std::cout << "The node COULD not be FOUND" << std::endl;
--            else {
--              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
--              node->all_children(children);
--              int n2= children.size()+1;
--
--              boct_bit_tree* bit_tree;
--              convert_to_bittree(node, bit_tree);
--              int n1=bit_tree->num_cells();
--              int start=data_idx;
--              convert_data(node, alpha_arr, data_arr, num_obs_arr, data_idx);
--              // set the data index at the tree
--              bit_tree->set_data_ptr(start, false);
--              // set the tree at the block
--              boxm2_block::uchar16& t=trees[x][y][z];
--              t.set(bit_tree->get_bits());
--              if (n1 != n2) {
--                std::cout << x << ',' << y << ',' << z << '\n'
--                         << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
--              }
--            }
--          }
--        }
--      }
--      new_block.set_trees(trees);
--      char* b1 = reinterpret_cast<char *>(alpha_arr);
--      boxm2_data<BOXM2_ALPHA> *alpha_data=new boxm2_data<BOXM2_ALPHA>(b1,data_size*sizeof(float),block_id);
--      char* b2 = reinterpret_cast<char *>(data_arr);
--      boxm2_data<BOXM2_MOG3_GREY> *mog_data=new boxm2_data<BOXM2_MOG3_GREY>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_MOG3_GREY>::datatype),block_id);
--      char* b3 = reinterpret_cast<char *>(num_obs_arr);
--      boxm2_data<BOXM2_NUM_OBS> *num_data=new boxm2_data<BOXM2_NUM_OBS>(b3,data_size*sizeof(boxm2_data_traits<BOXM2_NUM_OBS>::datatype),block_id);
--
--      boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
--      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
--      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, mog_data);
--      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, num_data);
--
--      delete [] alpha_arr;
--      delete [] data_arr;
--      delete [] num_obs_arr;
--      iter++;
--    }
--    new_scene.set_blocks(new_blocks);
--    new_scene.save_scene();
--  }
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
-deleted file mode 100644
-index 6f15345854..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#ifndef boxm_to_boxm2_h_
--#define boxm_to_boxm2_h_
--//:
--// \file
--
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--#include <boxm2/boxm2_data.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--//: extracts the parameters of a boxm_sample for boxm2 representation
--void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
--                        float &alpha,
--                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
--                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs);
--
--//: extracts the tree cell's data into an array format for boxm2 representation
--template <class T_loc, class T_data>
--void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
--                  float* alpha,
--                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
--                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
--                  int& data_idx);
--
--//: converts the boct_octree to bit tree representation
--template <class T_loc, class T_data>
--void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree);
--
--#endif // boxm_to_boxm2_h_
-diff --git a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
-deleted file mode 100644
-index 62cccc7c6f..0000000000
---- a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_bridge_test_include test_include.cxx )
--target_link_libraries( boxm_bridge_test_include boxm)
-diff --git a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx b/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
-deleted file mode 100644
-index ee10496c92..0000000000
---- a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm_bridge/boxm2_to_boxm.h>
--#include <boxm_bridge/boxm_to_boxm2.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/CMakeLists.txt b/contrib/brl/bseg/bvpl/CMakeLists.txt
-index 424ed5bf50..2593480038 100644
---- a/contrib/brl/bseg/bvpl/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/CMakeLists.txt
-@@ -24,7 +24,6 @@ target_link_libraries(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta ${VXL_
- 
- add_subdirectory(pro)
- add_subdirectory(util)
--add_subdirectory(bvpl_octree)
- add_subdirectory(kernels)
- add_subdirectory(functors)
- 
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-deleted file mode 100644
-index 1f390f966c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-+++ /dev/null
-@@ -1,71 +0,0 @@
--# This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
--# Brown Voxel Processing library for octrees
--
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--
--#option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
--#mark_as_advanced( VXL_FORCE_V3P_RPLY )
--
--if(EXPAT_FOUND)
--
--find_package( Threads )
--
--#vxl_configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/bvpl_octree_config.h.in
--#                ${CMAKE_CURRENT_BINARY_DIR}/bvpl_octree_config.h include/vxl/contrib/brl/bseg/bvpl/bvpl_octree)
--
--include_directories( ${EXPAT_INCLUDE_DIR} )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/boct )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl )
--include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
--
--set(bvpl_octree_sources
--    bvpl_octree_kernel_operator.h
--    bvpl_octree_vector_operator.h
--    bvpl_scene_kernel_operator.h
--    bvpl_scene_vector_operator.h
--    bvpl_block_kernel_operator.h
--    bvpl_block_vector_operator.h
--    bvpl_octree_vrml_util.h
--    bvpl_cell_data_traits.h
--    bvpl_octree_neighbors.h
--    bvpl_scene_neighborhood_operator.h    bvpl_scene_neighborhood_operator.cxx
--    bvpl_scene_statistics.h               bvpl_scene_statistics.cxx
--    bvpl_discover_pca_kernels.h           bvpl_discover_pca_kernels.cxx
--    bvpl_pca_error_scenes.h               bvpl_pca_error_scenes.cxx
--    bvpl_global_pca.h                     bvpl_global_pca.hxx
--    bvpl_taylor_scenes_map.h              bvpl_taylor_scenes_map.cxx
--    bvpl_taylor_basis.h                   bvpl_taylor_basis.cxx
--    bvpl_global_taylor.h                  bvpl_global_taylor.hxx          bvpl_global_taylor.cxx
--    bvpl_global_corners.h                 bvpl_global_corners.cxx
--    bvpl_corner_detector.h
--    bvpl_corner_functors.h
--    bvpl_gauss3D_steerable_filters.h      bvpl_gauss3D_steerable_filters.cxx
--   )
--
--aux_source_directory(Templates bvpl_octree_sources)
--
--vxl_add_library(LIBRARY_NAME bvpl_octree LIBRARY_SOURCES ${bvpl_octree_sources})
--target_link_libraries(bvpl_octree bvpl_kernels bvpl_functors bvpl_octree_sample bvrml boxm boct ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
--
--#Binary io
--add_subdirectory(io)
--
--#Directory with python/c++ processes
--add_subdirectory(pro)
--
--# Octree samples needed by bvpl
--add_subdirectory(sample)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--if( CMAKE_USE_PTHREADS_INIT )
--  add_definitions(-DBVPL_OCTREE_HAS_PTHREADS=1)
--  set_target_properties(bvpl_octree PROPERTIES COMPILE_FLAGS -pthread)
--  target_link_libraries(bvpl_octree pthread)
--endif()
--
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index 067773b3d9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
-deleted file mode 100644
-index a5900cfb6b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--
--BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<float>);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<float>);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
-deleted file mode 100644
-index 7c2f63355a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--
--BOCT_TREE_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
-deleted file mode 100644
-index 81366222a6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--BOCT_TREE_INSTANTIATE(short, bvpl_taylor_basis2_sample);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_taylor_basis2_sample);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
-deleted file mode 100644
-index 7cad8969f8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
-+++ /dev/null
-@@ -1,20 +0,0 @@
--#include <iostream>
--#include <string>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short, bvpl_octree_sample< gauss_type> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
-deleted file mode 100644
-index 8a135d4e05..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, bvpl_octree_sample<float> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
-deleted file mode 100644
-index fcc60090f2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vbl/vbl_array_3d.hxx>
--
--typedef boct_tree<short, bvpl_pca_basis_sample<10> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
-deleted file mode 100644
-index d4d340f12d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--#include <vbl/vbl_array_3d.hxx>
--
--typedef boct_tree<short, bvpl_taylor_basis2_sample> tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
-deleted file mode 100644
-index cafd0cfaf7..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
--BVPL_GLOBAL_PCA(125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
-deleted file mode 100644
-index 9e815605e3..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl_octree/bvpl_global_taylor.hxx>
--
--BVPL_GLOBAL_TAYLOR_INSTANTIATE(double, 10);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
-deleted file mode 100644
-index b8312f8e7e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl_octree/bvpl_global_taylor.hxx>
--
--BVPL_GLOBAL_TAYLOR_INSTANTIATE(float, 3);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
-deleted file mode 100644
-index e32ee1303b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
-deleted file mode 100644
-index 1bf245a9f9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_global_corners);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
-deleted file mode 100644
-index ff5175103e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--typedef bvpl_global_pca<125> bvpl_global_pca_125;
--VBL_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
-deleted file mode 100644
-index 254b91e81f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--typedef bvpl_global_taylor<double,10> gt;
--VBL_SMART_PTR_INSTANTIATE(gt);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
-deleted file mode 100644
-index a13ebae610..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
-deleted file mode 100644
-index 07c500d5bb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
-deleted file mode 100644
-index e15416cdba..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#include <vnl/vnl_matrix_fixed.hxx>
--VNL_MATRIX_FIXED_INSTANTIATE(double,125,125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
-deleted file mode 100644
-index ec59fe4893..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
-+++ /dev/null
-@@ -1,134 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
--#ifndef bvpl_block_kernel_operator_h
--#define bvpl_block_kernel_operator_h
--
--//:
--// \file
--// \brief A class operates a kernel on a boxm_block
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  1-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boxm/boxm_scene.h>
--#include "bvpl_octree_kernel_operator.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: A class which operates a kernel on a boxm_block.
--// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
--// This class is useful to run multithreading processes
--class bvpl_block_kernel_operator
--{
-- public:
--  //: "Convolves" kernel with an input octree, storing the output in an output octree.
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data, class F>
--  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--               F functor,
--               bvpl_kernel_sptr kernel,
--               unsigned i, unsigned j, unsigned k,
--               boxm_scene<boct_tree<short, T_data > > &scene_out,
--               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
--};
--
--//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data, class F>
--void bvpl_block_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_sptr kernel,
--                                         unsigned block_i, unsigned block_j, unsigned block_k,
--                                         boxm_scene<boct_tree<short, T_data > > &scene_out,
--                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  //scene_in.clone_blocks(scene_out, T_data());
--
--  // Load input and output blocks
--  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
--  scene_out.load_block(block_i,block_j,block_k);
--  valid_scene.load_block(block_i,block_j,block_k);
--
--
--  tree_type *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
--  tree_type *tree_out = tree_in->clone();
--  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<cell_type* > cells_out = tree_out->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  typename std::vector<cell_type* >::iterator it_out = cells_out.begin();
--  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end())&& (valid_it!=valid_cells.end()); it_in++, it_out++, valid_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short,T_data> *out_center_cell = *it_out;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    bool valid = true;
--
--#ifdef DEBUG
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
--
--      if (this_cell) {
--        bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val, d);
--      }
--      else {
--        valid = false;
--        break;
--      }
--
--      ++kernel_iter;
--    }
--
--    out_center_cell->set_data(functor.result());
--    valid_center_cell->set_data(valid);
--  }
--
--  //write the output block
--  std::cout << "Writing scenes\n";
--  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
--  scene_out.write_active_block();
--  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene.write_active_block();
--}
--
--#endif // bvpl_block_kernel_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
-deleted file mode 100644
-index 7c772dbd2f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
-+++ /dev/null
-@@ -1,146 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
--#ifndef bvpl_block_vector_operator_h
--#define bvpl_block_vector_operator_h
--
--//:
--// \file
--// \brief A class operates a kernel on a boxm_block
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  1-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boxm/boxm_scene.h>
--#include "bvpl_octree_kernel_operator.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//:A class operates a kernel on a boxm_block.
--// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
--// This class is useful to run multathreding processes
--class bvpl_block_vector_operator
--{
-- public:
--  //: "Convolves" kernel with an input octree, storing the output in an output octree.
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data_in, class T_data_out,class F, unsigned dim >
--  void operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
--               F functor,
--               bvpl_kernel_vector_sptr kernel_vector,
--               unsigned block_i, unsigned block_j, unsigned block_k,
--               boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
--               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
--};
--
--//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data_in, class T_data_out,class F, unsigned dim >
--void bvpl_block_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_vector_sptr kernel_vector,
--                                         unsigned block_i, unsigned block_j, unsigned block_k,
--                                         boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
--                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
--{
--  if (kernel_vector->size()!=dim) {
--    std::cout << "Error in bvpl_block_vector_operator::operate ---> size missmatch\n";
--    return;
--  }
--
--  typedef boct_tree<short, T_data_in> tree_type_in;
--  typedef boct_tree_cell<short,T_data_in> cell_type_in;
--
--  typedef boct_tree<short, vnl_vector_fixed<T_data_out, dim> > tree_type_out;
--  typedef boct_tree_cell<short, vnl_vector_fixed<T_data_out, dim> > cell_type_out;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  // Load input and output blocks
--  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
--  scene_out.load_block(block_i,block_j,block_k);
--  valid_scene.load_block(block_i,block_j,block_k);
--
--
--  tree_type_in *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
--  tree_type_out *tree_out = tree_in->template clone_to_type<vnl_vector_fixed<T_data_out, dim> >();
--  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
--
--  std::vector<cell_type_in* > cells_in = tree_in->leaf_cells();
--  std::vector<cell_type_out* > cells_out = tree_out->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type_in* >::iterator it_in = cells_in.begin();
--  typename std::vector<cell_type_out* >::iterator it_out = cells_out.begin();
--  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--
--  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end() && (valid_it!=valid_cells.end())); ++it_in, ++it_out, ++valid_it)
--  {
--    cell_type_in *center_cell = *it_in;
--    cell_type_out *out_center_cell = *it_out;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    bool valid = true;
--
--#ifdef DEBUG
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    vnl_vector_fixed<T_data_out, dim> responses;
--
--    for (unsigned k=0; k< kernel_vector->kernels_.size(); ++k)
--    {
--      bvpl_kernel_sptr kernel = kernel_vector->kernels_[k];
--      bvpl_kernel_iterator kernel_iter = kernel->iterator();
--      kernel_iter.begin(); // reset the kernel iterator
--      while (!kernel_iter.isDone())
--      {
--        vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
--
--        if (this_cell) {
--          bvpl_kernel_dispatch d = *kernel_iter;
--          T_data_in val =(T_data_in)this_cell->data();
--          functor.apply(val, d);
--        }
--        else {
--          valid = false;
--          break;
--        }
--
--        ++kernel_iter;
--      }
--      responses[k] = (T_data_out)(functor.result());
--    }
--
--    out_center_cell->set_data(responses);
--    valid_center_cell->set_data(valid);
--  }
--
--  //write the output block
--  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
--  scene_out.write_active_block();
--  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene.write_active_block();
--}
--
--#endif // bvpl_block_vector_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
-deleted file mode 100644
-index 7f28fa9bef..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
-+++ /dev/null
-@@ -1,34 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
--#ifndef bvpl_cell_data_traits_h
--#define bvpl_cell_data_traits_h
--//:
--// \file
--// \brief  Set of accessors of cell's data, taking care of different datatypes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Dec 16, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree_cell.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--
--//: Float to float
--template <class T_loc>
--float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<float> >* cell)
--{
--  return cell->data().response_;
--}
--
--//: Mixture of gaussians to float; return the mean
--template <class T_loc>
--float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > >* cell)
--{
--  return cell->data().response_.mean();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
-deleted file mode 100644
-index e3988f369f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
-+++ /dev/null
-@@ -1,299 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
--#ifndef bvpl_corner_detector_h
--#define bvpl_corner_detector_h
--//:
--// \file
--// \brief A class to detect 3d Harris corners, based on the 2nd moment matrix
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  20-Jul-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vnl/vnl_double_3x3.h>
--#include <vnl/algo/vnl_determinant.h>
--
--class bvpl_corner_detector
--{
-- public:
--  //: Detects Harris features  kernel with an input octree
--  //  However, features below the Harris threshold are set as invalid in the valid_scene (in place)
--  //  The type of measure used, depends on the functor.
--  template<class T_data, class F>
--  void detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                             F harris_functor,
--                             vgl_point_3d<int> min_neigborhood_idx,
--                             vgl_point_3d<int> max_neigborhood_idx,
--                             unsigned block_i, unsigned block_j, unsigned block_k,
--                             boxm_scene<boct_tree<short, bool> > *valid_scene,
--                             boxm_scene<boct_tree<short, float> > *corner_scene,
--                             double cell_length);
--
--  //: Computes the corner measure and stores it in "corner_scene"
--  //  Input scene and auxiliary valid scene are not modified
--  template<class T_data, class F>
--  void compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                  F harris_functor,
--                  vgl_point_3d<int> min_neigborhood_idx,
--                  vgl_point_3d<int> max_neigborhood_idx,
--                  unsigned block_i, unsigned block_j, unsigned block_k,
--                  boxm_scene<boct_tree<short, bool> > *valid_scene,
--                  boxm_scene<boct_tree<short, float> > *corner_scene,
--                  double cell_length);
--
--  //: Compute the determinant of the hessian
--  template<class T_data>
--  void compute_det_H(boxm_scene<boct_tree<short, T_data > > *scene_in,
--                     unsigned block_i, unsigned block_j, unsigned block_k,
--                     boxm_scene<boct_tree<short, bool> > *valid_scene,
--                     boxm_scene<boct_tree<short, float> > *corner_scene);
--};
--
--
--template<class T_data, class F>
--void bvpl_corner_detector::detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                                                 F harris_functor,
--                                                 vgl_point_3d<int> min_neigborhood_idx,
--                                                 vgl_point_3d<int> max_neigborhood_idx,
--                                                 unsigned block_i, unsigned block_j, unsigned block_k,
--                                                 boxm_scene<boct_tree<short, bool> > *valid_scene,
--                                                 boxm_scene<boct_tree<short, float> > *corner_scene,
--                                                 double cell_length)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  // Load input and output blocks
--  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--  corner_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
--  corner_tree->init_cells(0.0f);
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
--
--  unsigned long n_fail = 0;
--
--  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
--
--    if (!valid_center_cell->data()) {
--      continue;
--    }
--#if 0
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
--      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
--        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
--        {
--          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
--
--          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
--                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
--                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
--
--          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
--
--          if (this_cell) {
--            harris_functor.apply(this_cell->data());
--          }
--          else
--            break;
--        }
--
--    double C = 0;
--    if (!harris_functor.result(C)) {
--      valid_center_cell->set_data(false);
--      ++n_fail;
--    }
--    corner_center_cell->set_data(float(C));
--  }
--
--  std::cout << "Number of Harris fails: " << n_fail << std::endl;
--  //write the output block
--  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene->write_active_block();
--  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
--  corner_scene->write_active_block();
--}
--
--template<class T_data, class F>
--void bvpl_corner_detector::compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                                      F harris_functor,
--                                      vgl_point_3d<int> min_neigborhood_idx,
--                                      vgl_point_3d<int> max_neigborhood_idx,
--                                      unsigned block_i, unsigned block_j, unsigned block_k,
--                                      boxm_scene<boct_tree<short, bool> > *valid_scene,
--                                      boxm_scene<boct_tree<short, float> > *corner_scene,
--                                      double cell_length)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  // Load input and output blocks
--  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--  corner_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
--  corner_tree->init_cells(0.0f);
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
--
--  unsigned long n_fail = 0;
--
--  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
--
--    if (!valid_center_cell->data()) {
--      continue;
--    }
--#if 0
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
--      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
--        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
--        {
--          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
--
--          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
--                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
--                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
--
--          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
--
--          if (this_cell) {
--            harris_functor.apply(this_cell->data());
--          }
--          else
--            break;
--        }
--
--    double C = 0;
--    harris_functor.result(C);
--    corner_center_cell->set_data(float(C));
--  }
--
--  std::cout << "Number of Harris fails: " << n_fail << std::endl;
--  //write the output block
--  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
--  corner_scene->write_active_block();
--}
--
--
--template<class T_data>
--void bvpl_corner_detector::compute_det_H( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                                          unsigned block_i, unsigned block_j, unsigned block_k,
--                                          boxm_scene<boct_tree<short, bool> > *valid_scene,
--                                          boxm_scene<boct_tree<short, float> > *corner_scene)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  // Load input and output blocks
--  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--  corner_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
--  corner_tree->init_cells(0.0f);
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
--
--  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
--
--    if (!valid_center_cell->data()) {
--      continue;
--    }
--
--    vnl_vector_fixed<double,10> mean_coeff = center_cell->data();
--
--    vnl_double_3x3 H;
--    H.put(0,0,mean_coeff[4]);
--    H.put(0,1,mean_coeff[7]);
--    H.put(0,2,mean_coeff[8]);
--    H.put(1,0,mean_coeff[7]);
--    H.put(1,1,mean_coeff[5]);
--    H.put(1,2,mean_coeff[9]);
--    H.put(2,0,mean_coeff[8]);
--    H.put(2,1,mean_coeff[9]);
--    H.put(2,2,mean_coeff[6]);
--
--    corner_center_cell->set_data(float(vnl_determinant(H)));
--  }
--
--  //write the output block
--  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
--  corner_scene->write_active_block();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
-deleted file mode 100644
-index 85231de3e0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
-+++ /dev/null
-@@ -1,68 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
--#ifndef bvpl_corner_functors_h
--#define bvpl_corner_functors_h
--//:
--// \file
--// \brief Set of functors based on Harris measures
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  20-Jul-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vnl/vnl_double_3x3.h>
--#include <vnl/algo/vnl_determinant.h>
--
--//  Functor to threshold on Harris corner measure proposed in:
--//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107-123, 2005
--class bvpl_harris_laptev_functor
--{
-- public:
--  bvpl_harris_laptev_functor(double k)
--  {
--    H_ = vnl_double_3x3(0.0);
--    count_ = 0;
--    k_ = k;
--  }
--
--  //: Apply a given operation to value \p val, depending on the dispatch character
--  void apply(vnl_vector_fixed<double,10> taylor_coeff)
--  {
--    vnl_double_3x3 temp_H;
--    for (unsigned mi = 0; mi <3; mi++)
--      for (unsigned mj = 0; mj <3; mj++)
--        temp_H.put(mi,mj, taylor_coeff[mi+1] * taylor_coeff[mj+1]);
--
--    H_ = H_ + temp_H;
--    count_++;
--  }
--
--  //: Returns true if the harris threshold is passed, returns by reference the value of the harris ration
--  bool result( double &C)
--  {
--    H_ /= (double)count_;
--
--    double trace_H = H_[0][0] + H_[1][1] + H_[2][2];
--    bool pass = false;
--
--    C = vnl_determinant(H_) - k_*(trace_H * trace_H * trace_H);
--
--    if (C >= 1e-7)
--      pass = true;
--
--    count_ = 0;
--    H_.fill(0.0);
--
--    return pass;
--  }
--
-- protected:
--
--  vnl_double_3x3 H_;
--  unsigned count_;
--  double k_;
--};
--
--#endif // bvpl_corner_functors_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
-deleted file mode 100644
-index a2aa13a8c6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
-+++ /dev/null
-@@ -1,1028 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 8-Nov-2010
--
--#include "bvpl_discover_pca_kernels.h"
--#include <vnl/algo/vnl_symmetric_eigensystem.h>
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--#include <boxm/boxm_scene_parser.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bvpl_discover_pca_kernels::bvpl_discover_pca_kernels(const std::string &path)
--{
--  std::cout << "Loading pca info from xml-file" << std::endl;
--
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--
--  if (!xml_ifs)
--    return;
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("pca_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cout << "bvpl_discover_pca_kernels - could not parse xml root\n";
--  }
--
--  //Parse neighborhood bounding box - units are number of voxels
--  bxml_element nbbox_query("neighborhood");
--  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
--  auto* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
--  int min_x=0, min_y=0, min_z=0, max_x=0, max_y=0, max_z =0;
--  nbbox_elm->get_attribute("min_x", min_x);
--  nbbox_elm->get_attribute("min_y", min_y);
--  nbbox_elm->get_attribute("min_z", min_z);
--  nbbox_elm->get_attribute("max_x", max_x);
--  nbbox_elm->get_attribute("max_y", max_y);
--  nbbox_elm->get_attribute("max_z", max_z);
--
--  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
--  std::cout << "Neighborhood: " << nbbox_ << std::endl;
--
--  //Parse Number of samples
--  bxml_element nsamples_query("samples");
--  bxml_data_sptr nsamples_data = bxml_find_by_name(root, nsamples_query);
--  auto* nsamples_elm = dynamic_cast<bxml_element*>(nsamples_data.ptr());
--  nsamples_elm->get_attribute("nsamples", nsamples_);
--  std::cout << "Number of samples: " << nsamples_ << std::endl;
--
--  //Parse dimension
--  bxml_element dim_query("dimension");
--  bxml_data_sptr dim_data = bxml_find_by_name(root, dim_query);
--  auto* dim_elm = dynamic_cast<bxml_element*>(dim_data.ptr());
--  dim_elm->get_attribute("feature_dim", feature_dim_);
--  std::cout << "Feature dimension: " << feature_dim_ << std::endl;
--
--  //Parse paths and set matrices
--  bxml_element paths_query("paths");
--  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
--  auto* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
--
--  int valid = 0;
--  std::string ifs_path;
--
--  path_elm->get_attribute("pc_path", ifs_path);
--  if (ifs_path != pc_path())
--    valid = -1;
--  else{
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> pc_;
--    if (pc_.size()!=feature_dim_*feature_dim_)
--      valid = -2;
--  }
--
--  path_elm->get_attribute("weights_path", ifs_path);
--  if (ifs_path != weights_path())
--    valid = -3;
--  else{
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> weights_;
--    if (weights_.size()!=feature_dim_)
--      valid = -4;
--  }
--
--  path_elm->get_attribute("sample_mean_path", ifs_path);
--  if (ifs_path != sample_mean_path())
--    valid = -5;
--  else
--  {
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> sample_mean_feature_ ;
--    if (sample_mean_feature_.size()!=feature_dim_)
--      valid = -6;
--  }
--
--  path_elm->get_attribute("data_path", ifs_path);
--  if (ifs_path != data_path())
--    valid = -7;
--
--  path_elm->get_attribute("positions_path", ifs_path);
--  if (ifs_path != pos_path())
--    valid = -8;
--
--  path_elm->get_attribute("scene_path", scene_path_);
--
--  //load scene
--  boxm_scene_parser parser;
--  data_scene_base_=new boxm_scene_base();
--  data_scene_base_->load_scene(scene_path_, parser);
--
--  //cast scene
--  auto *scene= new boxm_scene<boct_tree<short, float > >();
--  if (data_scene_base_->appearence_model() == BOXM_FLOAT){
--    scene->load_scene(parser);
--    data_scene_base_ = scene;
--  }
--
--  path_elm->get_attribute("data_mean_path", ifs_path);
--  if (ifs_path != data_mean_path()){
--    compute_mean_feature(scene);
--    valid = -9;
--    std::cout << "bvpl_discover_pca_kernels - errors parsing data_mean_feature.xml\n";
--  }
--  else
--  {
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> data_mean_feature_ ;
--    if (data_mean_feature_.size()!=feature_dim_)
--      valid = -10;
--  }
--
--  //Parse dimension
--  bxml_element cell_length_query("finest_cell_length");
--  bxml_data_sptr cell_length_data = bxml_find_by_name(root, cell_length_query);
--  auto* cell_length_elm = dynamic_cast<bxml_element*>(cell_length_data.ptr());
--  bool has_length = cell_length_elm->get_attribute("length", finest_cell_length_);
--  if (!has_length || finest_cell_length_ < 0.0){
--     std::cout << "Error: Finest cell length read from file: " << finest_cell_length_ << " has length " << has_length << std::endl;
--     finest_cell_length_ = scene->finest_cell_length();
--     valid = -11;
--  }
--  std::cout << "Finest cell length: " << finest_cell_length_ << std::endl;
--
--  if (valid<0){
--    std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
--    xml_write();
--  }
--}
--
--
--//: Set Up the PCA matrix for the given scene
--void bvpl_discover_pca_kernels::set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene)
--{
--  //zero-mean feature matrix
--  vnl_matrix<double> M = this->compute_deviation_matrix(scene);
--
--  vnl_svd<double> A(M);
--
--  //columns of U contain principal components.
--  pc_.set_size(feature_dim_, feature_dim_);
--  A.U().extract(pc_);
--  weights_.set_size(feature_dim_);
--  weights_ = A.W().diagonal().extract(feature_dim_);
--
--  weights_ = element_product(weights_, weights_);
--
--#ifdef DEBUG
--  std::cerr << "Scatter Matix svd" << M*M.transpose() << '\n'
--           << "PC Matix SVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
--           << "Evals SVD:\nSize: " << weights_.size() << '\n' << weights_ << '\n';
--  bvpl_write_pca(path_out_ + "/pca_matrices", M, weights_, pc_);
--#endif
--}
--
--
--//: Set Up the PCA matrix for the given scene
--//  This method performs eigen value decomposition on the scatter matrix
--//  Use this method when number of samples >> number of dimensions
--void bvpl_discover_pca_kernels::set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene)
--{
--  //zero-mean feature matrix
--  vnl_matrix<double> S = this->compute_scatter_matrix(scene);
--
--  // Compute eigenvectors(principal components) and values of S
--  pc_.set_size(feature_dim_,feature_dim_);
--  weights_.set_size(feature_dim_);
--
--  vnl_symmetric_eigensystem_compute(S, pc_, weights_);
--
--  pc_.fliplr();
--  weights_.flip();
--
--#ifdef DEBUG
--  std::cerr << "Scatter Matix" << S << '\n'
--           << "PC Matix EVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
--           << "EVals EVD:\n Size: " << weights_.size() << '\n' <<weights_ << '\n';
--  bvpl_write_pca(path_out_ + "/pca_evd", S, weights_, pc_);
--#endif
--}
--
--
--//: Ramndom samples according to octree structure.
--//  Sampling is achieved by generating uniform random cell samples.
--//  Since there are more cells where the resolution is finer, then these regions get sampled more often
--vnl_matrix<double> bvpl_discover_pca_kernels::compute_scatter_matrix( boxm_scene<boct_tree<short, float> > *scene)
--{
--  //init variables
--  double scene_ncells = scene->size();
--  scene->unload_active_blocks();
--  sample_mean_feature_.fill(0.0f);
--  vnl_matrix<double> S(feature_dim_, feature_dim_, 0.0f);
--  vnl_random rng;
--  std::ofstream pos_ofs(pos_path().c_str());
--  std::ofstream data_ofs(data_path().c_str());
--  data_ofs.precision(15);
--
--  // 1. Traverse through the blocks/trees
--  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
--  unsigned long long nfeature = 1;
--  for (it.begin(); !it.end(); ++it)
--  {
--    scene->load_block_and_neighbors(it.index());
--    boct_tree<short, float>   *tree = (*it)->get_tree();
--    assert(tree != nullptr);
--
--    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
--    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
--    int tree_ncells = leaf_cells.size();
--    auto tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
--#ifdef DEBUG
--    std::cout <<"Tree nsamples is: " << tree_nsamples << '\n'
--             <<" nsamples is: " << nsamples_ <<std::endl;
--#endif
--    for (unsigned i=0; i<tree_nsamples; ++i)
--    {
--      unsigned long sample = rng.lrand32(tree_ncells-1);
--
--      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
--      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--      //convert neighborhood box to scene coordinates
--      vgl_point_3d<int> nmin = nbbox_.min_point();
--      vgl_point_3d<int> nmax = nbbox_.max_point();
--
--      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
--                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
--      roi.set_centroid(center_cell_centroid);
--
--      //if neighborhood is not inclusive we would have missing features
--      if (!((scene->get_world_bbox()).contains(roi))){
--        --i;
--        continue;
--      }
--
--      //3. Assemble neighborhood as a feature-vector
--      vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--      unsigned curr_dim = 0;
--      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--          {
--            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
--                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
--                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
--
--            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--            assert(neighbor_cell !=nullptr);
--            this_feature[curr_dim] = (double)neighbor_cell->data();
--            ++curr_dim;
--          }
--
--      assert(curr_dim == feature_dim_);
--
--      pos_ofs << center_cell_centroid <<'\n' ;
--      data_ofs << this_feature << '\n';
--
--      //increment weights
--      double rho = 1.0/(double)nfeature;
--      double rho_comp = 1.0 - rho;
--
--      // the difference vector between the sample and the mean
--      vnl_vector<double> diff = this_feature - sample_mean_feature_;
--
--      //update the covariance
--      S += rho_comp*outer_product(diff,diff);
--
--      //update the mean
--      sample_mean_feature_ += (rho*diff);
--
--      ++nfeature;
--#ifdef DEBUG
--      std::cerr << "Feature EVD: " <<this_feature << '\n'
--               << "Mean Feature EVD: " <<mean_feature << '\n';
--#endif
--    }
--  } //end of block-loop
--
--  pos_ofs.close();
--  data_ofs.close();
--  std::ofstream mean_ofs(sample_mean_path().c_str());
--  mean_ofs.precision(15);
--  mean_ofs << sample_mean_feature_;
--  mean_ofs.close();
--
--  nsamples_ = nfeature-1;
--
--  return S;
--}
--
--
--//: Samples according to octree structure.
--//  Sampling is achieved by generating uniform random cell samples.
--//  Since there are more cells where the resolution is finer, then these regions get sampled more often
--vnl_matrix<double> bvpl_discover_pca_kernels::compute_deviation_matrix( boxm_scene<boct_tree<short, float> > *scene)
--{
--  //init variables
--  unsigned long scene_ncells = scene->size();
--  sample_mean_feature_.fill(0.0f);
--  vnl_matrix<double> M(feature_dim_, (unsigned int)nsamples_);
--  vnl_random rng(9667566ul);
--  std::ofstream pos_ofs(pos_path().c_str());
--
--  // 1. Traverse through the blocks/trees
--  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
--  unsigned long feature_col = 0;
--  for (it.begin(); !it.end(); ++it)
--  {
--    scene->load_block_and_neighbors(it.index());
--    boct_tree<short, float>   *tree = (*it)->get_tree();
--    assert(tree != nullptr);
--
--    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
--    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
--    int tree_ncells = leaf_cells.size();
--    auto tree_nsamples = (unsigned long)(tree_ncells*nsamples_/scene_ncells); // possible overflow ...
--
--    for (unsigned int i=0; i<tree_nsamples; ++i)
--    {
--      unsigned long sample = rng.lrand32(tree_ncells-1);
--
--      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
--      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--      //convert neighborhood box to scene coordinates
--      vgl_point_3d<int> nmin = nbbox_.min_point();
--      vgl_point_3d<int> nmax = nbbox_.max_point();
--
--      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
--                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
--      roi.set_centroid(center_cell_centroid);
--
--      //if neighborhood is not inclusive we would have missing features
--      if (!((scene->get_world_bbox()).contains(roi))){
--        --i;
--        continue;
--      }
--
--      //3. Assemble neighborhood as a feature-vector
--      vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--      unsigned curr_dim = 0;
--      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--          {
--            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
--                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
--                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
--
--            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--            assert(neighbor_cell !=nullptr);
--            this_feature[curr_dim] = (double)neighbor_cell->data();
--            ++curr_dim;
--          }
--
--      assert(curr_dim == feature_dim_);
--
--      pos_ofs << center_cell_centroid <<'\n' ;
--
--      M.set_column(feature_col,this_feature);
--      sample_mean_feature_+=this_feature;
--      ++feature_col;
--#ifdef DEBUG
--      std::cerr << "Feature SVD: " <<this_feature << '\n'
--               << "Mean Feature SVD: " <<mean_feature/(double)feature_col << '\n';
--#endif
--    }
--  } //end of block-loop
--
--  //the actual number of samples is different from desired number of smaples because only integer samples are drawn from each tree
--  vnl_matrix<double> F(feature_dim_, feature_col);
--
--  M.extract(F);
--
--  //4. Normalize feature vector
--  sample_mean_feature_/=feature_col;
--#ifdef DEBUG
--  std::cerr << "Mean Feature SVD: " <<mean_feature << '\n';
--#endif
--  std::ofstream mean_ofs(sample_mean_path().c_str());
--  mean_ofs.precision(15);
--  mean_ofs << sample_mean_feature_;
--  mean_ofs.close();
--
--  for (unsigned int j=0; j<feature_col; ++j)
--    F.set_column(j,F.get_column(j) - sample_mean_feature_);
--
--  return F;
--}
--
--
--//: Project training samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::compute_training_error(vnl_vector<double> &proj_error)
--{
--  std::ifstream data_ifs(data_path().c_str());
--  std::cerr << data_path() << '\n';
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond elemend, to error when projecting on frist 2 components and so on
--  proj_error.set_size(feature_dim_);
--  proj_error.fill(0.0);
--
--  //For all samples
--  for (unsigned long i = 0; i < nsamples_; ++i)
--  {
--    if (data_ifs.eof())
--      continue;
--
--    //retrieve the data from file
--    vnl_vector<double> norm_feature(feature_dim_, 0.0);
--    data_ifs >> norm_feature;
--#ifdef DEBUG
--    std::cerr << "Feature: " <<norm_feature << '\n';
--#endif
--    norm_feature-=sample_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (norm_feature);
--
--    //project as a function of number of components
--    for (unsigned c = 0; c < feature_dim_; ++c)
--    {
--      //reconstruct
--      vnl_vector<double> norm_feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
--      vnl_vector<double> rec_feature = pc_*a;
--      //compute error
--      proj_error[c]+= (norm_feature - norm_feature_approx).squared_magnitude();
--    }
--  }
--}
--
--
--//: Project training samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::compute_normalized_training_error(vnl_vector<double> &proj_error)
--{
--  theoretical_training_error(proj_error);
--  proj_error /= (double)nsamples_;
--}
--
--//: Project training samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::theoretical_training_error(vnl_vector<double> &proj_error)
--{
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond elemend, to error when projecting on frist 2 components and so on
--  proj_error.set_size(feature_dim_);
--  proj_error.fill(0.0);
--
--  for (unsigned i=0; i<weights_.size(); ++i)
--  {
--    double error = weights_.extract(weights_.size() - (i+1), i+1).sum(); // * 0.5
--    proj_error[i] = error;
--  }
--}
--
--
--//: Project test samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::compute_testing_error(vnl_vector<double> &proj_error)
--{
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond element, to error when projecting on frist 2 components and so on
--  proj_error.set_size(feature_dim_);
--  proj_error.fill(0.0);
--
--  //cast scene
--  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > > *> (data_scene_base_.as_pointer());
--
--  compute_mean_feature(scene);
--
--  //iterate through leaves and arrage as vectors.
--  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
--  cell_it.begin();
--
--  while (!(cell_it.end()))
--  {
--    //boct_tree_cell<short, float> *center_cell = *cell_it;
--    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--    //convert neighborhood box to scene coordinates
--    vgl_point_3d<int> nmin = nbbox_.min_point();
--    vgl_point_3d<int> nmax = nbbox_.max_point();
--
--    vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
--                           finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
--    roi.set_centroid(center_cell_centroid);
--
--    //if neighborhood is not inclusive we would have missing features
--    if (!((scene->get_world_bbox()).contains(roi))){
--      ++cell_it;
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
--                                                 center_cell_centroid.y() + (double)y*finest_cell_length_,
--                                                 center_cell_centroid.z() + (double)z*finest_cell_length_);
--
--          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--          assert(neighbor_cell !=nullptr);
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    assert(curr_dim == feature_dim_);
--
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--#ifdef DEBUG
--    std::cout <<"This feature is " << this_feature <<std::endl;
--#endif
--
--    //project as a function of number of components
--    for (unsigned c = 0; c < feature_dim_; ++c)
--    {
--      //reconstruct
--      vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
--      vnl_vector<double> rec_feature = pc_*a;
--#ifdef DEBUG
--      std::cout <<"Feature approx at c = " << c << " is " <<  feature_approx <<std::endl;
--#endif
--      //compute error
--      proj_error[c]+= (this_feature - feature_approx).squared_magnitude();
--    }
--
--    ++cell_it;
--  }
--#if 0
--  vnl_vector<double> training_error;
--  this->theoretical_training_error(training_error);
--  proj_error-=training_error;
--#endif
--}
--
--
--//: Reconstructions error on testing samples. By block. Error is given as average error per sample
--void bvpl_discover_pca_kernels::compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
--                                                      int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  //cast the scenes
--  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
--  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  if (!(data_scene &&error_scene)){
--    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
--    return;
--  }
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))){
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--  data_scene->unload_active_blocks();
--  error_scene->unload_active_blocks();
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  error_tree->init_cells(-1.0f);
--
--  //get the leaves
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> min_point = nbbox_.min_point();
--  vgl_point_3d<int> max_point = nbbox_.max_point();
--
--  for (unsigned i=0; i<data_leaves.size(); ++i)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
--      continue;
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
--                                                 centroid.y() + (double)y*finest_cell_length_,
--                                                 centroid.z() + (double)z*finest_cell_length_);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell){
--            std::cerr << "Error in compute_testing_error\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    if (curr_dim != feature_dim_){
--      std::cerr << "Error in compute_testing_error\n";
--      return;
--    }
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--    //project as a function of number of components
--    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
--
--    //compute error
--    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
--  error_scene->write_active_block();
--  data_scene->unload_active_blocks();
--  error_scene->unload_active_blocks();
--}
--
--
--#if BVPL_OCTREE_HAS_PTHREADS
--void bvpl_discover_pca_kernels::compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene,
--                                                                  unsigned ncomponents,
--                                                                  int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  //cast the scenes
--  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
--
--  if (!(data_scene &&error_scene)){
--    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
--    return;
--  }
--
--  if (!(data_scene->load_all_blocks() && error_scene->load_all_blocks())){
--    std::cerr << "Must load all blocks into memory before using threads\n";
--    return;
--  }
--  //get the cells for this block
--  if (!error_scene->valid_index(block_i, block_j, block_k)){
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  //error_scene->load_block_thread_safe(block_i, block_j, block_k);
--
--  //get the trees
--  boxm_block<float_tree_type> *data_block = data_scene->get_block(block_i, block_j, block_k);
--  if (!data_block)
--    return;
--
--  float_tree_type* data_tree = data_block->get_tree();
--  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  // error_tree->init_cells(-1.0f);
--
--  //get the leaves
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  //std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> min_point = nbbox_.min_point();
--  vgl_point_3d<int> max_point = nbbox_.max_point();
--
--  for (auto data_cell : data_leaves)
--  {
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
--      continue;
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
--                                                 centroid.y() + (double)y*finest_cell_length_,
--                                                 centroid.z() + (double)z*finest_cell_length_);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell){
--            std::cerr << "Error in compute_testing_error\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    if (curr_dim != feature_dim_){
--      std::cerr << "Error in compute_testing_error\n";
--      return;
--    }
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--    //project as a function of number of components
--    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
--
--    //compute error
--    //error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
--  error_scene->write_block_thread_safe(block_i, block_j, block_k);
--}
--#endif // BVPL_OCTREE_HAS_PTHREADS
--
--
--//: Compute mean feature of all "leaf-features" in a scene
--void bvpl_discover_pca_kernels::compute_mean_feature(boxm_scene<boct_tree<short, float> > *scene)
--{
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond element, to error when projecting on frist 2 components and so on
--  data_mean_feature_.set_size(feature_dim_);
--  data_mean_feature_.fill(0.0);
--  unsigned long nfeatures = 0;
--
--  //iterate through leaves and arrage as vectors.
--  double cell_length = scene->finest_cell_length();
--
--  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
--  cell_it.begin();
--
--  while (!(cell_it.end()))
--  {
--    //boct_tree_cell<short, float> *center_cell = *cell_it;
--    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--    //convert neighborhood box to scene coordinates
--    vgl_point_3d<int> nmin = nbbox_.min_point();
--    vgl_point_3d<int> nmax = nbbox_.max_point();
--
--    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
--                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
--    roi.set_centroid(center_cell_centroid);
--
--    //if neighborhood is not inclusive we would have missing features
--    if (!((scene->get_world_bbox()).contains(roi))){
--      ++cell_it;
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
--                                                 center_cell_centroid.y() + (double)y*cell_length,
--                                                 center_cell_centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--          assert(neighbor_cell !=nullptr);
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    assert(curr_dim == feature_dim_);
--
--    data_mean_feature_+=this_feature;
--    ++nfeatures;
--    ++cell_it;
--  }
--  data_mean_feature_ = data_mean_feature_/(double)nfeatures;
--
--  std::ofstream mean_ofs(data_mean_path().c_str());
--  mean_ofs.precision(15);
--  mean_ofs << data_mean_feature_;
--  mean_ofs.close();
--}
--
--
--#if 0 //too_slow
--      //: Compute deviations i.e. zero-mean feature matrix
--vnl_matrix<float>& bvpl_discover_pca_kernels::compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene)
--{
--  unsigned long max_nsamples = scene->size();
--
--  //iterate through leaves, keep random samples in memory and arrage as vectors.
--  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
--  cell_it.begin();
--
--  vnl_random rng(9667566ul);
--  unsigned long pos_pre = 0;  //previous position on random samples array
--
--  for (unsigned i=1; i<nsamples_; ++i)
--  {
--    unsigned long sample = rng.lrand32(max_nsamples);
--    vgl_box_3d<double> roi = nbbox_;
--    for (unsigned u = 0; u + pos_pre < sample; ++u)
--      ++cell_it;
--    pos_pre = sample;
--    roi.set_centroid(cell_it.global_centroid());
--    if (!((scene->get_world_bbox()).contains(roi))){
--      --i;
--      continue;
--    }
--
--    positions_.push_back(sample);
--  }
--
--  //sort random numbers for easy access
--  positions_.sort();
--  if (nsamples_ != positions_.size())
--  {
--    std::cerr << "Error computing PCA features: Wrong number of random samples generated\n";
--    return false;
--  }
--
--  cell_it.begin();
--
--  //init cells array to first random element
--  std::list<unsigned long>::const_iterator rand_it = positions_.begin();
--  cell_it+=(*rand_it - pos_pre);
--  pos_pre = *rand_it;
--
--  //init quantities for mean
--  unsigned feature_dim = nbbox_.width()*nbbox_.height()* nbbox_.depth();
--  vnl_vector<float> mean(feature_dim);
--  M.set_size(feature_dim, nsamples_);
--  unsigned i=0;
--
--  double cell_length = scene->finest_cell_length();
--  while (!(cell_it.end()))
--  {
--    boct_tree_cell<short, float> *center_cell = *cell_it;
--    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--    if (!center_cell){
--      std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
--      return false;
--    }
--
--    //assemble neighborhood as a feature-vector
--    vnl_vector<float> this_feature(feature_dim);
--
--    unsigned curr_dims = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_origin(center_cell_centroid.x() + (double)x*cell_length,
--                                               center_cell_centroid.y() + (double)y*cell_length,
--                                               center_cell_centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_origin);
--
--          if (!neighbor_cell){
--            std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
--            return false;
--          }
--
--          this_feature[x + nbbox_.width()*y + nbbox_.width()*nbbox_.height()*z] = neighbor_cell->data();
--          ++curr_dims;
--        }
--
--    M.set_column(i,this_feature);
--    mean+=this_feature;
--
--    //increment iterators
--    cell_it+=(*rand_it - pos_pre);
--    pos_pre = *rand_it;
--    ++rand_it;
--    ++i;
--  }
--
--  mean/=nsamples_;
--
--  for (unsigned int j=0; j<nsamples_; ++j)
--    M.set_column(j,M.get_column(j) - mean);
--
--  return true;
--}
--#endif
--
--void bvpl_discover_pca_kernels::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("pca_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  bxml_element* paths = new bxml_element("paths");
--  paths->append_text("\n");
--  paths->set_attribute("pc_path", pc_path() );
--  paths->set_attribute("data_path", data_path() );
--  paths->set_attribute("weights_path", weights_path() );
--  paths->set_attribute("positions_path", pos_path()) ;
--  paths->set_attribute("sample_mean_path", sample_mean_path());
--  paths->set_attribute("data_mean_path", data_mean_path());
--  paths->set_attribute("scene_path", scene_path_);
--  root->append_data(paths);
--  root->append_text("\n");
--
--  bxml_element* neighborhood = new bxml_element("neighborhood");
--  neighborhood->append_text("\n");
--  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
--  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
--  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
--  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
--  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
--  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
--  root->append_data(neighborhood);
--  root->append_text("\n");
--
--  bxml_element* nsamples = new bxml_element("samples");
--  nsamples->append_text("\n");
--  nsamples->set_attribute("nsamples", nsamples_);
--  root->append_data(nsamples);
--  root->append_text("\n");
--
--  bxml_element* dim = new bxml_element("dimension");
--  dim->append_text("\n");
--  dim->set_attribute("feature_dim", feature_dim_);
--  root->append_data(dim);
--  root->append_text("\n");
--
--  bxml_element* cell_length = new bxml_element("finest_cell_length");
--  cell_length->append_text("\n");
--  cell_length->set_attribute("length", finest_cell_length_);
--  root->append_data(cell_length);
--  root->append_text("\n");
--
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--
--  //: Write pca main matrices -other matrices aren't class variables and should have been written during computation time
--
--  write_pca_matrices();
--}
--
--
--//: Write a PCA file
--bool bvpl_discover_pca_kernels::write_pca_matrices()
--{
--  std::ofstream pc_ofs(pc_path().c_str());
--  pc_ofs.precision(15);
--  std::ofstream weights_ofs(weights_path().c_str());
--  weights_ofs.precision(15);
--
--  pc_ofs << pc_;
--  pc_ofs.close();
--  weights_ofs << weights_;
--  weights_ofs.close();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
-deleted file mode 100644
-index 875504affa..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
-+++ /dev/null
-@@ -1,309 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
--#ifndef bvpl_discover_pca_kernels_h
--#define bvpl_discover_pca_kernels_h
--//:
--// \file
--// \brief A class to discover those features that represent the data the best in a least square sense using PCA
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  8-Nov-2010.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <list>
--#include <iostream>
--#include <utility>
--#include <vgl/vgl_box_3d.h>
--
--#include <boxm/boxm_scene.h>
--#include <bxml/bxml_document.h>
--
--#include <vnl/vnl_matrix.h>
--#include <vnl/vnl_vector.h>
--#include <vnl/algo/vnl_svd.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--
--#if BVPL_OCTREE_HAS_PTHREADS
--#include <pthread.h>
--#endif
--
--class bvpl_discover_pca_kernels;
--
--typedef vbl_smart_ptr<bvpl_discover_pca_kernels> bvpl_discover_pca_kernels_sptr;
--
--class bvpl_discover_pca_kernels: public vbl_ref_count
--{
-- public:
--  //: Constructor from neighborhood bounding boxm, number of samples to be drawn, scene and flag to indicate whether to use evd or svd
--  bvpl_discover_pca_kernels(vgl_box_3d<int> nbbox, unsigned long long nsamples, boxm_scene<boct_tree<short,float> > *scene, std::string  path_out=".", bool use_evd = true):
--  nbbox_(nbbox), nsamples_(nsamples), path_out_(std::move(path_out))
--  {
--    scene_path_ = scene->filename();
--    std::cout << "Scene path: " << scene->filename()<< std::endl;;
--    data_scene_base_=scene;
--
--    finest_cell_length_ = scene->finest_cell_length();
--
--    feature_dim_ = (nbbox_.width()+1)*(nbbox_.height()+1)* (nbbox_.depth()+1);
--    compute_mean_feature(scene);
--
--    sample_mean_feature_.set_size(feature_dim_);
--
--    if (use_evd)
--      set_up_pca_evd(scene);
--    else
--      set_up_pca_svd(scene);
--
--    scene->unload_active_blocks();
--  }
--
--  //: Construct from xml file
--  bvpl_discover_pca_kernels(const std::string &path);
--
--  //: Constructor from zero-mean matrix
--  bvpl_discover_pca_kernels(const vnl_matrix<double>& M)
--  {
--    vnl_svd<double> A(M, -1e-8);
--
--    //columns of U contain principal components.
--    pc_.set_size(A.rank(), M.rows());
--    A.U().extract(pc_);
--  }
--
--  //: Access the principal components
--  const vnl_matrix<double>& principal_comps() { return pc_; }
--
--  //: Access the coefficients
--  const vnl_vector<double>& weights() { return weights_; }
--
--  //: Access the mean of samples
--  const vnl_vector<double>& mean()  { return sample_mean_feature_; }
--
--  //: Project training samples onto pca space and return error as a function of number of components used
--  void compute_training_error(vnl_vector<double> &proj_error);
--
--  //: Project training samples onto pca space and return error as a function of number of components used
--  void compute_normalized_training_error(vnl_vector<double> &proj_error);
--
--  //: Reconstrcution error on training samples. Same as above but it is not computed from samples.
--  void theoretical_training_error(vnl_vector<double> &proj_error);
--
--  //: Reconstructions error on testing samples. All training samples are excuded!
--  void compute_testing_error(vnl_vector<double> &proj_error);
--
--  //: Reconstructions error on testing samples. By block. Error is given as average error per sample
--  void compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
--                             int block_i, int block_j, int block_k);
--
--#if BVPL_OCTREE_HAS_PTHREADS
--
--  void compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene, unsigned ncomponents,
--                                         int block_i, int block_j, int block_k);
--
--//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
--//  bool compute_testing_error_thread_safe(boxm_scene_base_sptr error_scene_base, unsigned ncomponents);
--//
--//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
--//  friend void *compute_testing_error_thread( void *ptr);
--
--#endif
--
--  //: Computes pca projection at each voxel on the block and it save the specified number of dimensions (dim)
--  template <unsigned DIM>
--  void project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
--               int block_i, int block_j, int block_k);
--
--  //: Compute the mean feature of all "leaf" samples in the data scene associated with this class
--  void compute_mean_feature(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Return the number of samples used
--  unsigned long long nsamples() const { return nsamples_; }
--
--  //: Return dimension of the features
--  unsigned feature_dim() const { return feature_dim_; }
--
--  //: Return scene path
--  std::string scene_path() const { return scene_path_; }
--
--  //: Return number of blocks in the data scene
--  vgl_vector_3d<unsigned> data_scene_dim() const { return data_scene_base_->world_dim(); }
--
--  bool load_all_scene_blocks()
--  {
--    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
--    return scene->read_all_blocks();
--  }
--
--  void unload_all_scene_blocks()
--  {
--    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
--    scene->unload_active_blocks();
--  }
--
--  //: Compute deviations i.e. zero-mean feature matrix
--  vnl_matrix<double> compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Compute the scatter matrix.
--  vnl_matrix<double> compute_scatter_matrix(boxm_scene<boct_tree<short,float> > *scene);
--
--  void xml_write();
--
-- protected:
--
--  //: Set Up the PCA matrix for the given scene.
--  //  This method computes the deviation matrix and performs SVD to find the principal components
--  //  If the number of samples is very large use set_up_pca_evd
--  void set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Set Up the PCA matrix for the given scene
--  //  This method performs eigen value decomposition on the covariance matrix
--  //  Use this method when number of samples >> number of dimensions
--  void set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Write a PCA file
--  bool write_pca_matrices();
--
--  //: The size around the central feature to include in PCA vectors
--  vgl_box_3d<int> nbbox_;
--  //: Number of total samples(leaves) to be drawn
--  unsigned long long nsamples_;
--  //: Number of dimension of feature vector
--  unsigned feature_dim_;
--  //: Principal components - eigen vectors of the scatter matrix
--  vnl_matrix<double> pc_;
--  //: Weights - eigen values of the scatter matrix
--  vnl_vector<double> weights_;
--  //: The mean of sample data
--  vnl_vector<double> sample_mean_feature_;
--  //: The mean of all features in the scene data
--  vnl_vector<double> data_mean_feature_;
--  //: Pointer to data scene
--  boxm_scene_base_sptr data_scene_base_;
--  //: Finest cell length of data scene
--  double finest_cell_length_;
--
--  //: Paths for i/o of matrices and vectors
--  std::string path_out_;
--  std::string scene_path_;
--  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
--  std::string data_path() const { return path_out_ + "/data.txt"; }
--  std::string weights_path() const { return path_out_ + "/weights.txt"; }
--  std::string pos_path() const { return path_out_ + "/positions.txt"; }
--  std::string sample_mean_path() const { return  path_out_ + "/sample_mean.txt"; }
--  std::string data_mean_path() const { return  path_out_ + "/data_mean.txt"; }
--  std::string xml_path() const { return path_out_ + "/pca_info.xml"; }
--
--  //: Tolerance, retain eigenvalues above max(eigenVals)*tol
--  double tol_;
--};
--
--
--//: Computes pca projection at each voxel on the block and it saves the specified number of coefficientes
--template <unsigned DIM>
--void bvpl_discover_pca_kernels::project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
--                                        int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree<short,bvpl_pca_basis_sample<DIM> > pca_tree_type;
--  typedef boct_tree_cell<short,bvpl_pca_basis_sample<DIM> > pca_cell_type;
--
--  //cast the scenes
--  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
--
--  if (!(data_scene &&proj_scene)) {
--    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
--    return;
--  }
--
--  double cell_length = data_scene->finest_cell_length();
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  proj_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  pca_tree_type* proj_tree = data_tree->template clone_to_type<bvpl_pca_basis_sample<DIM> >();
--
--  //get the leaves
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<pca_cell_type*> proj_leaves = proj_tree->leaf_cells();
--
--  //CAUTION: the neighborhood box was supposed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> min_point = nbbox_.min_point();
--  vgl_point_3d<int> max_point = nbbox_.max_point();
--
--  for (unsigned i =0; i<data_leaves.size(); i++)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
--      proj_leaves[i]->set_data(bvpl_pca_basis_sample<DIM>());
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
--                                                 centroid.y() + (double)y*cell_length,
--                                                 centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell) {
--            std::cerr << "Error in compute_testing_error\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    if (curr_dim != feature_dim_) {
--      std::cerr << "Error in compute_testing_error\n";
--      return;
--    }
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--    //compute error
--    bvpl_pca_basis_sample<DIM> sample(a.extract(DIM), 0);
--    proj_leaves[i]->set_data(sample);
--  }
--
--  // write and release memory
--  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
--  proj_scene->write_active_block();
--  data_scene->unload_active_blocks();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
-deleted file mode 100644
-index 978a9443de..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
-+++ /dev/null
-@@ -1,512 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 12-Aug-2011
--
--#include "bvpl_gauss3D_steerable_filters.h"
--#include <vgl/vgl_vector_3d.h>
--
--//: Constructor
--//  Initializes the order separable filter tabs should be applied for eac bases
--bvpl_gauss3D_steerable_filters::bvpl_gauss3D_steerable_filters()
--{
--  axis_.clear();
--  axis_.emplace_back(1,0,0);
--  axis_.emplace_back(0,1,0);
--  axis_.emplace_back(0,0,1);
--
--  //Initialize from lists - waiting for VXL to support TR1!
--  basis_.clear();
--  basis_names_.clear();
--
--  //zerth order - that is gaussian functio
--  std::string G0a[3] = {"f01", "f02", "f02"};
--  basis_.emplace_back(&G0a[0], &G0a[3]);
--  basis_names_.emplace_back("G0a");
--
--  //first order derivatives
--  std::string G1a[3] = {"f11", "f12", "f12"};
--  std::string G1b[3] = {"f12", "f11", "f12"};
--  std::string G1c[3] = {"f12", "f12", "f11"};
--  basis_.emplace_back(&G1a[0], &G1a[3]);
--  basis_.emplace_back(&G1b[0], &G1b[3]);
--  basis_.emplace_back(&G1c[0], &G1c[3]);
--  basis_names_.emplace_back("G1a");
--  basis_names_.emplace_back("G1b");
--  basis_names_.emplace_back("G1c");
--
--  //second order derivatives
--  std::string G2a[3] = {"f21", "f22", "f22"};
--  std::string G2b[3] = {"f23", "f24", "f22"};
--  std::string G2c[3] = {"f22", "f21", "f22"};
--  std::string G2d[3] = {"f23", "f22", "f24"};
--  std::string G2e[3] = {"f22", "f23", "f24"};
--  std::string G2f[3] = {"f22", "f22", "f21"};
--  basis_.emplace_back(&G2a[0], &G2a[3]);
--  basis_.emplace_back(&G2b[0], &G2b[3]);
--  basis_.emplace_back(&G2c[0], &G2c[3]);
--  basis_.emplace_back(&G2d[0], &G2d[3]);
--  basis_.emplace_back(&G2e[0], &G2e[3]);
--  basis_.emplace_back(&G2f[0], &G2f[3]);
--  basis_names_.emplace_back("G2a");
--  basis_names_.emplace_back("G2b");
--  basis_names_.emplace_back("G2c");
--  basis_names_.emplace_back("G2d");
--  basis_names_.emplace_back("G2e");
--  basis_names_.emplace_back("G2f");
--}
--
--//: Computes  the responses to separable filter taps.
--//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
--//  Each basis is made up of 3 1-d filter taps (x, y, z)
--//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
--//  the taps have size 5, this could be changed later on
--bool bvpl_gauss3D_steerable_filters::basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                              boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
--{
--  this->assemble_basis_size_5();
--
--  bvpl_algebraic_functor  functor;
--
--  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
--  unsigned max_ntaps = 3;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  // Load input and output blocks
--  scene->clone_blocks_to_type(*valid_scene, true);
--
--  //create and init a temporary scene to hold the intermediate 1-d output.
--  boxm_scene<tree_type> *temp_scene =
--  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  temp_scene->set_paths(".", "temp_gsf_scene");
--  temp_scene->set_appearance_model(VNL_FLOAT_10);
--  temp_scene->write_scene("temp_gsf_scene.xml");
--  scene->clone_blocks(*temp_scene);
--
--  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
--  {
--    //Assemple tabs into a map
--    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
--
--    for (unsigned dim=0; dim< DIM_; dim++){
--      std::string tap_name = basis_[dim][tap_i];
--      one_d_taps.push_back(separable_taps_[tap_name]);
--    }
--
--    //Traverse applying the appropriate 1-d taps
--    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
--    cell_it.begin();
--
--    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
--    temp_cell_it.begin();
--
--    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
--    valid_cell_it.begin();
--
--    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
--    {
--      cell_type *temp_center_cell = *temp_cell_it;
--      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
--
--      if (!valid_center_cell->data())
--      {
--        ++cell_it; ++temp_cell_it; ++valid_cell_it;
--        continue;
--      }
--
--      bool valid = true;
--
--      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--      vnl_vector_fixed<float, DIM_> responses(0.0);
--
--      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
--      {
--        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
--
--        for (int i =-2; i<=2; i++)
--        {
--          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
--
--          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
--
--          if (this_cell) {
--            bvpl_kernel_dispatch d(this_tap[i+2]);
--            float val =(float)(this_cell->data()[response_dim]);
--            functor.apply(val, d);
--          }
--          else {
--            valid = false;
--            break;
--          }
--        }
--
--        if (!valid)
--          break;
--
--        responses[response_dim] = (float)(functor.result());
--      }
--
--      temp_center_cell->set_data(responses);
--      valid_center_cell->set_data(valid);
--      ++cell_it; ++temp_cell_it; ++valid_cell_it;
--    }
--
--    //copy temp cells into cells
--    cell_it.begin();
--    temp_cell_it.begin();
--
--    while ( !(cell_it.end() || temp_cell_it.end()) )
--    {
--      (*cell_it)->set_data((*temp_cell_it)->data());
--      ++cell_it; ++temp_cell_it;
--    }
-- }
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  temp_scene->unload_active_blocks();
--  delete temp_scene;
--  return true;
--}
--
--
--//: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
--bool bvpl_gauss3D_steerable_filters::multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                               boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level)
--{
--  this->assemble_basis_size_5();
--
--  bvpl_algebraic_functor  functor;
--
--  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
--  unsigned max_ntaps = 3;
--
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  // Load input and output blocks
--  scene->clone_blocks_to_type(*valid_scene, true);
--
--  //create and init a temporary scene to hold the intermediate 1-d output.
--  boxm_scene<tree_type> *temp_scene =
--  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  temp_scene->set_paths(".", "temp_gsf_scene");
--  temp_scene->set_appearance_model(VNL_FLOAT_10);
--  temp_scene->write_scene("temp_gsf_scene.xml");
--  scene->clone_blocks(*temp_scene);
--
--  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
--  {
--    //Assemple tabs into a map
--    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
--
--    for (unsigned dim=0; dim< DIM_; dim++){
--      std::string tap_name = basis_[dim][tap_i];
--      one_d_taps.push_back(separable_taps_[tap_name]);
--    }
--
--    //Traverse applying the appropriate 1-d taps
--    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
--    cell_it.begin(true);
--
--    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
--    temp_cell_it.begin(true);
--
--    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
--    valid_cell_it.begin(true);
--
--    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
--    {
--      cell_type *temp_center_cell = *temp_cell_it;
--      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
--
--      if (!valid_center_cell->data())
--      {
--        ++cell_it; ++temp_cell_it; ++valid_cell_it;
--        continue;
--      }
--
--      bool valid = true;
--
--      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--      double cell_length = cell_it.length();
--
--      vnl_vector_fixed<float, DIM_> responses(0.0);
--
--      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
--      {
--        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
--
--        for (int i =-2; i<=2; i++)
--        {
--          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
--
--          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid, resolution_level);
--
--          if (this_cell) {
--            bvpl_kernel_dispatch d(this_tap[i+2]);
--            float val =(float)(this_cell->data()[response_dim]);
--            functor.apply(val, d);
--          }
--          else {
--            valid = false;
--            break;
--          }
--        }
--
--        if (!valid)
--          break;
--
--        responses[response_dim] = (float)(functor.result());
--      }
--
--      temp_center_cell->set_data(responses);
--      valid_center_cell->set_data(valid);
--      ++cell_it; ++temp_cell_it; ++valid_cell_it;
--    }
--
--    //copy temp cells into cells
--    cell_it.begin();
--    temp_cell_it.begin();
--
--    while ( !(cell_it.end() || temp_cell_it.end()) )
--    {
--      (*cell_it)->set_data((*temp_cell_it)->data());
--      ++cell_it; ++temp_cell_it;
--    }
--  }
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  temp_scene->unload_active_blocks();
--  delete temp_scene;
--  return true;
--}
--
--#if 0
--//: Computes  the responses to separable filter taps.
--//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
--//  Each basis is made up of 3 1-d filter taps (x, y, z)
--//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
--//  the taps have size 5, this could be changed later on
--bool bvpl_gauss3D_steerable_filters::basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                    int block_i, int block_j, int block_k,
--                                                    boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
--{
--  this->assemble_basis_size_5();
--
--  bvpl_algebraic_functor  functor;
--
--  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
--  unsigned max_ntaps = 3;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  // Load input and output blocks
--  scene->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree = scene->get_block(block_i, block_j, block_k)->get_tree();
--  tree_type *temp_tree = tree->clone(); //a temporary tree to store partial results
--  boct_tree<short, bool> *valid_tree = tree->clone_to_type<bool>();
--  valid_tree->init_cells(true);
--
--  std::vector<cell_type* > cells = tree->leaf_cells();
--  std::vector<cell_type* > temp_cells = temp_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--
--  std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;
--
--  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
--  {
--    //Assemple tabs into a map
--    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
--
--    for (unsigned dim=0; dim< DIM_; dim++){
--      std::string tap_name = basis_[dim][tap_i];
--      one_d_taps.push_back(separable_taps_[tap_name]);
--    }
--
--    //Traverse applying the appropriate 1-d taps
--    std::vector<cell_type* >::iterator cells_it = cells.begin();
--    std::vector<cell_type* >::iterator temp_it = temp_cells.begin();
--    std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end())&&(valid_it!=valid_cells.end()); cells_it++, valid_it++, temp_it++)
--    {
--      cell_type *center_cell = *cells_it;
--      cell_type *temp_center_cell = *temp_it;
--      boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--
--      if (!valid_center_cell->data())
--        continue;
--
--      bool valid = true;
--
--      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--      vnl_vector_fixed<float, DIM_> responses(0.0);
--
--      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
--      {
--        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
--
--        for (int i =-2; i<=2; i++)
--        {
--          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
--
--          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
--
--          if (this_cell) {
--            bvpl_kernel_dispatch d(this_tap[i+2]);
--            float val =(float)(this_cell->data()[response_dim]);
--            functor.apply(val, d);
--          }
--          else {
--            valid = false;
--            break;
--          }
--        }
--
--        if (!valid)
--          break;
--
--        responses[response_dim] = (float)(functor.result());
--      }
--
--      temp_center_cell->set_data(responses);
--      valid_center_cell->set_data(valid);
--    }
--
--    //copy temp cells into cells
--    cells_it = cells.begin();
--    temp_it = temp_cells.begin();
--    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end()); cells_it++, temp_it++)
--      (*cells_it)->set_data((*temp_it)->data());
--
--    std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;;
--  }
--
--  //write the output block
--  scene->get_block(block_i, block_j, block_k)->init_tree(tree);
--  scene->write_active_block();
--  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene->write_active_block();
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  delete temp_tree;
--  return true;
--}
--#endif
--
--
--bool bvpl_gauss3D_steerable_filters::rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                                      boxm_scene<boct_tree<short, bool> > *valid_scene)
--{
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  //Traverse all cells
--  boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block);
--  cell_it.begin();
--  boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block, true);
--  valid_cell_it.begin();
--
--  while ( !(cell_it.end() || valid_cell_it.end()) )
--  {
--    cell_type *center_cell = *cell_it;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
--
--    if (!valid_center_cell->data()){
--      ++cell_it; ++valid_cell_it;
--      continue;
--    }
--
--    vnl_vector_fixed<float, DIM_> responses=center_cell->data();
--
--    vgl_vector_3d<float> grad(responses[1], responses[2],responses[3]);
--    normalize(grad); //after normalizing the gradient the direction cosines are the cartesian coordinates of grad
--
--    //rotate the responses according to the gradient
--    vnl_vector_fixed<float, DIM_> rotation_weigths(1.0f);
--    rotation_weigths[0] = 1;
--    rotation_weigths[1] = grad.x(); rotation_weigths[2] = grad.y();     rotation_weigths[3] = grad.z();
--    rotation_weigths[4] = grad.x()* grad.x(); rotation_weigths[5] = 2.0f* grad.x()*grad.y();
--    rotation_weigths[6] = grad.y()* grad.y(); rotation_weigths[7] = 2.0f* grad.x()*grad.z();
--    rotation_weigths[8] = 2.0f * grad.y()* grad.z(); rotation_weigths[9] = grad.z()*grad.z();
--
--    responses = element_product(responses, rotation_weigths);
--
--    center_cell->set_data(responses);
--    ++cell_it; ++valid_cell_it;
--  }
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  return true;
--}
--
--
--void bvpl_gauss3D_steerable_filters::assemble_basis_size_5()
--{
--  separable_taps_.clear();
--
--  //Zeroth Derivative G0
--  //Separable basis taps: f01, f02
--  float f01_data[5] = {0.000402093f, 0.162216f, 1.19862f, 0.162216f, 0.000402093f};
--  vnl_vector_fixed<float, 5> f01(f01_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f01", f01));
--
--  float f02_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
--  vnl_vector_fixed<float,5> f02(f02_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f02", f02));
--
--  //First Derivative Basis: G1 = alpha*G1a + beta*G1b
--  //Separable basis functions: f11, f12
--  float f11_data[5] = {0.00227458f, 0.458816f, 0.0f, -0.458816f, -0.00227458f};
--  vnl_vector_fixed<float,5> f11(f11_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f11", f11));
--  float f12_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
--  vnl_vector_fixed<float,5> f12(f12_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f12", f12));
--
--  //Second derivative basis G2 = alpha^2*G2a + 2*alpha*beta*G2b + beta^2*G2c + 2*alpha*gamma*G2d + 2*beta*gamma*G2e + gamma^2*G2f
--  //Separable basis taps = f21, f22, f23, f24
--  float f21_data[5] = {0.00696448f, 0.561934f, -1.38405f, 0.561934f, 0.00696448f};
--  vnl_vector_fixed<float,5> f21(f21_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f21", f21));
--
--  float f22_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
--  vnl_vector_fixed<float,5> f22(f22_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f22", f22));
--
--  float f23_data[5] = {-0.00643349f, -1.29773f, 0.0f, 1.29773f, 0.00643349f};
--  vnl_vector_fixed<float,5> f23(f23_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f23", f23));
--
--  float f24_data[5] = {-0.000670925f, -0.135335f, 0.0f, 0.135335f, 0.000670925f};
--  vnl_vector_fixed<float,5> f24(f24_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f24", f24));
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
-deleted file mode 100644
-index bda8905d49..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
-+++ /dev/null
-@@ -1,61 +0,0 @@
--// This is bvpl_gauss3D_steerable_filters.h
--#ifndef bvpl_gauss3D_steerable_filters_h
--#define bvpl_gauss3D_steerable_filters_h
--
--//:
--// \file
--// \brief 3-d Streerable filters implemented theough separable basis
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  12-Aug-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vnl/vnl_vector_fixed.h>
--#include <boxm/boxm_scene.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--
--
--class bvpl_gauss3D_steerable_filters{
--
--public:
--  bvpl_gauss3D_steerable_filters();
--
--  //: The dimension of the filter response e.i. number of steerable filters
--  enum { DIM_ = 10 };
--
--  //: Compute basis response at all leaf cells
--  bool basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length);
--
--  //: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
--  bool multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                 boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level);
--
--  //: Assemble basis for: -2 -1 0 1 2
--  void assemble_basis_size_5();
--
--  std::vector<std::vector<std::string> > basis() {return basis_;}
--  std::vector<std::string> basis_names() {return basis_names_;}
--  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps(){return separable_taps_;}
--
--  bool rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                        boxm_scene<boct_tree<short, bool> > *valid_scene);
--
--protected:
--
--  //: lists of 1-d filter tap names needed for each basis
--  std::vector<std::vector<std::string> > basis_;
--
--  //: list of basis identifying strings
--  std::vector<std::string> basis_names_;
--
--  //: map containing the 1-d filter taps (actual values) and their identifying string
--  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps_;
--
--  std::vector<vgl_vector_3d<int> > axis_;
--};
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
-deleted file mode 100644
-index 391c7f157e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
-+++ /dev/null
-@@ -1,475 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include <iostream>
--#include <fstream>
--#include "bvpl_global_corners.h"
--
--#include <bsta/bsta_histogram.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--#include <bvpl_octree/bvpl_corner_detector.h>
--#include <bvpl_octree/bvpl_corner_functors.h>
--
--#include <vul/vul_file.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: Constructor  from xml file
--bvpl_global_corners::bvpl_global_corners(const std::string &path)
--{
--  std::cout << "Loading corners info from xml-file" << std::endl;
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--  if (!xml_ifs.is_open()){
--    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
--    throw;
--  }
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("global_corners_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
--    throw;
--  }
--
--  //Parse scenes
--  bxml_element scenes_query("scene");
--  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
--
--  unsigned nscenes=scenes_data.size();
--  std::cout << "Number of scenes: " << nscenes << std::endl;
--
--  aux_dirs_.clear();
--  aux_dirs_.resize(nscenes);
--
--  finest_cell_length_.clear();
--  finest_cell_length_.resize(nscenes);
--
--  for (unsigned si = 0; si < nscenes; si++)
--  {
--    auto* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
--    int id = -1;
--    scenes_elm->get_attribute("id", id);
--    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
--    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
--
--    if (!(vul_file::exists(aux_dirs_[id]) && vul_file::is_directory(aux_dirs_[id]))){
--      vul_file::make_directory(aux_dirs_[id]);
--    }
--  }
--
--  //Parse kernels
--  bxml_element params_query("parameters");
--  bxml_data_sptr params_data = bxml_find_by_name(root, params_query);
--  if (params_data)
--  {
--    auto* params_elm = dynamic_cast<bxml_element*>(params_data.ptr());
--
--    params_elm->get_attribute("harris_k", harris_k_);
--    std::cout << "Harris_k is " << harris_k_ << '\n';
--  }
--  else {
--    std::cerr << " In Gobal Corners: no parameters element\n";
--  }
--}
--
--
--//: Compute Harris' measure extension to 3-d as proposed by:
--//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
--void bvpl_global_corners::compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--
--  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, float> >* corner_scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  corner_scene->set_appearance_model(BOXM_FLOAT);
--  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
--  corner_scene->write_scene("harris_scene.xml");
--
--  if (!( proj_scene && valid_scene && corner_scene ))
--  {
--    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_corner_detector corner_detector;
--  bvpl_harris_laptev_functor harris_functor(harris_k_);
--
--  vgl_point_3d<int> max_neighborhood_idx = global_taylor->kernel_vector_->max();
--  vgl_point_3d<int> min_neighborhood_idx = global_taylor->kernel_vector_->min();
--
--  std::cout << "Neighborhood for Harris threshold: " << min_neighborhood_idx << " , " << max_neighborhood_idx << std::endl;
--
--  corner_detector.compute_C(proj_scene, harris_functor, min_neighborhood_idx, max_neighborhood_idx, block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
--
--  //clean memory
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--
--//: Compute corner measure extension to 3-d as proposed by:
--// P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
--void bvpl_global_corners::compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--
--  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, float> >* corner_scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  corner_scene->set_appearance_model(BOXM_FLOAT);
--  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
--  corner_scene->write_scene("harris_scene.xml");
--
--  if (!( proj_scene && valid_scene && corner_scene ))
--  {
--    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_corner_detector corner_detector;
--
--  corner_detector.compute_det_H(proj_scene, block_i, block_j, block_k, valid_scene, corner_scene);
--
--  //clean memory
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--
--//: Threshold a percentage of corners, based of the Harris' measure extension to 3-d proposed by:
--//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
--void bvpl_global_corners::threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float harris_thresh, const std::string& output_path)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
--
--  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--
--  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
--
--  if (!(vul_file::exists(output_path) && vul_file::is_directory(output_path)))
--    vul_file::make_directory(output_path);
--
--  boxm_scene<boct_tree<short, bool> >* valid_corner_scene =
--  new boxm_scene<boct_tree<short, bool> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  valid_corner_scene->set_appearance_model(BOXM_BOOL);
--
--  std::stringstream valid_ss;
--  valid_ss << "valid_scene_" << scene_id ;
--
--  valid_corner_scene->set_paths(output_path, valid_ss.str());
--  valid_corner_scene->write_scene(valid_ss.str() + ".xml");
--  valid_scene->clone_blocks(*valid_corner_scene);
--
--  std::stringstream proj_ss;
--  proj_ss << "proj_taylor_scene_" << scene_id ;
--
--  boxm_scene<taylor_tree_type >* copy_proj_scene =
--  new boxm_scene<taylor_tree_type >(proj_scene->lvcs(), proj_scene->origin(), proj_scene->block_dim(), proj_scene->world_dim(), proj_scene->max_level(), proj_scene->init_level());
--  copy_proj_scene->set_appearance_model(VNL_DOUBLE_10);
--  copy_proj_scene->set_paths(proj_scene->path(), proj_scene->block_prefix());
--  copy_proj_scene->write_scene(output_path, proj_ss.str() + ".xml");
--
--  delete copy_proj_scene;
--
--  if (!( valid_scene && corner_scene && valid_corner_scene))
--  {
--    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
--  valid_it.begin();
--
--  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
--  corners_it.begin();
--
--  boxm_cell_iterator<boct_tree<short, bool > > valid_corners_it = valid_corner_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block);
--  valid_corners_it.begin();
--
--  while ( !(valid_it.end() || corners_it.end() || valid_corners_it.end()) )
--  {
--    boct_tree_cell<short,bool> *valid_cell = *valid_it;
--    boct_tree_cell<short,float> *corner_cell = *corners_it;
--    boct_tree_cell<short,bool> *valid_corner_cell = *valid_corners_it;
--
--    boct_loc_code<short> valid_code = valid_cell->get_code();
--    boct_loc_code<short> corner_code = corner_cell->get_code();
--    boct_loc_code<short> valid_corner_code = valid_corner_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((valid_cell->level() != corner_cell->level()) || (valid_cell->level() != valid_corner_cell->level()) || !(valid_code.isequal(&corner_code)) || !(valid_code.isequal(&valid_corner_code))){
--      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
--      return;
--    }
--
--    /*****CAUTION: Only looking at cells at level 0*/
--    if (valid_cell->level()!=0) {
--      ++valid_it;
--      ++corners_it;
--      valid_corner_cell->set_data(false);
--      ++valid_corners_it;
--      continue;
--    }
--
--    if (corner_cell->data() < harris_thresh)
--      valid_corner_cell->set_data(false);
--    else
--      valid_corner_cell->set_data(true);
--
--    ++valid_it;
--    ++corners_it;
--    ++valid_corners_it;
--  }
--
--  //clean memory
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--  valid_corner_scene->unload_active_blocks();
--
--  delete valid_corner_scene;
--}
--
--//: Take a histogram of corners and get different values for percentage of thresholds
--void bvpl_global_corners::explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
--
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--
--  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
--
--  if (!( valid_scene && corner_scene))
--  {
--    std::cerr << "Error in bvpl_global_corners::explore_corner_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--
--  //compute scene statistics at valid cells only
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
--  valid_it.begin();
--
--  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
--  corners_it.begin();
--
--  float cell_count = 0;
--  auto max = (float)(*corners_it)->data();
--  float min = max;
--  float this_val = max;
--  while ( !(valid_it.end() || corners_it.end()) )
--  {
--    boct_tree_cell<short,bool> *valid_cell = *valid_it;
--    boct_tree_cell<short,float> *corner_cell = *corners_it;
--
--    boct_loc_code<short> valid_code = valid_cell->get_code();
--    boct_loc_code<short> corner_code = corner_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
--      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
--      return;
--    }
--
--    /*****CAUTION: Only looking at cells at level 0*/
--    if (valid_cell->level()!=0) {
--      ++valid_it;
--      ++corners_it;
--      continue;
--    }
--
--    cell_count++;
--    this_val = (float)(*corners_it)->data();
--    if ( this_val > max)  max = this_val;
--    if ( this_val < min)  min = this_val;
--
--    ++valid_it;
--    ++corners_it;
--  }
--
--  auto nbins = (unsigned int)std::floor(std::sqrt(cell_count));
--  bsta_histogram<float>  corner_hist(min, max, nbins);
--  valid_it.begin();
--  corners_it.begin();
--  while ( !(valid_it.end() || corners_it.end()) )
--  {
--    boct_tree_cell<short,bool> *valid_cell = *valid_it;
--    boct_tree_cell<short,float> *corner_cell = *corners_it;
--
--    boct_loc_code<short> valid_code = valid_cell->get_code();
--    boct_loc_code<short> corner_code = corner_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
--      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
--      return;
--    }
--
--    /*****CAUTION: Only looking at cells at level 0*/
--    if (valid_cell->level()!=0) {
--      ++valid_it;
--      ++corners_it;
--      continue;
--    }
--
--    corner_hist.upcount((float)(*corners_it)->data(), 1.0f);
--
--    ++valid_it;
--    ++corners_it;
--  }
--
--  std::string file = aux_dirs_[scene_id] + "/corner_threshold_values.txt";
--  float threshold[] = {0.01f, 0.02f, 0.05f, 0.1f, 0.2f, 0.5f, 0.8f};
--  std::ofstream ofs(file.c_str());
--  ofs.precision(7);
--  for (float i : threshold) {
--    ofs << i << ' ' << corner_hist.value_with_area_above(i) << '\n';
--  }
--
--  //clean memory
--  ofs.close();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--//: Load scene info
--boxm_scene_base_sptr bvpl_global_corners::load_corner_scene(int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr scene_base = new boxm_scene_base();
--  boxm_scene_parser scene_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/harris_scene.xml";
--  scene_base->load_scene(aux_scene_ss.str(), scene_parser);
--
--  //cast scene
--  auto *scene= new boxm_scene<boct_tree<short, float > >();
--  if (scene_base->appearence_model() == BOXM_FLOAT){
--    scene->load_scene(scene_parser);
--    scene_base = scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
--boxm_scene_base_sptr bvpl_global_corners::load_valid_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_corners::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  auto *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL){
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_corners::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--//: Write this class to xml file
--void bvpl_global_corners::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("global_corners_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  //write the scene elements
--  for (unsigned i =0; i<aux_dirs_.size(); i++)
--  {
--    bxml_element* scenes_elm = new bxml_element("scene");
--    scenes_elm->append_text("\n");
--    scenes_elm->set_attribute("id", i);
--    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
--    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
--    root->append_data(scenes_elm);
--    root->append_text("\n");
--  }
--
--  //write parameters for corner detection
--  bxml_element* param_elm = new bxml_element("parameters");
--  param_elm->append_text("\n");
--  param_elm->set_attribute("harris_k", harris_k_);
--  root->append_data(param_elm);
--  root->append_text("\n");
--
--  //write to disk
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
-deleted file mode 100644
-index 0e7924fe1b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
-+++ /dev/null
-@@ -1,71 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
--#ifndef bvpl_global_corners_h
--#define bvpl_global_corners_h
--//:
--// \file
--// \brief A class to compute corner features across different boxm_scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  21-Jul-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--#include <bvpl_octree/bvpl_global_taylor.h>
--
--class bvpl_global_corners : public vbl_ref_count
--{
--
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  public:
--
--  //: Constructor  from xml file
--  bvpl_global_corners(const std::string &path);
--
--  //: Compute Harris' measure extension to 3-d as proposed by:
--  //  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
--  void compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor, int scene_id, int block_i, int block_j, int block_k);
--
--  //: Compute corner measure extension to 3-d as proposed by:
--  // P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
--  void compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k);
--
--  //: Threshold corners below a threshold
--  void threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float thresh, const std::string& output_path);
--
--  //: Take a histogram of corners and get different values for percentage of thresholds
--  void explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id);
--
--  //: Write to global_corners_info.xml
--  void xml_write();
--
--  // Accessors
--  std::string path_out() {return path_out_;}
--  std::vector<std::string> aux_dirs() { return aux_dirs_; }
--  std::string aux_dirs( unsigned i ) { return aux_dirs_[i]; }
--  std::vector<double> cell_lengths() { return finest_cell_length_; }
--
--  boxm_scene_base_sptr load_corner_scene (int scene_id);
--  boxm_scene_base_sptr load_valid_scene (int scene_id);
--
--  std::string xml_path() { return path_out_ + "/global_corners_info.xml"; }
--
-- protected:
--
--  //: A vector to hold paths to keep taylor coefficient scenes and valid scenes
--  std::vector<std::string> aux_dirs_;
--  //: A vector to hold the finest cell length of the corresponding scene scene
--  std::vector<double> finest_cell_length_;
--  //: Path to xml info file
--  std::string path_out_;
--  //: The value of the parameter k for harris corners
--  float harris_k_;
--};
--
--typedef vbl_smart_ptr<bvpl_global_corners > bvpl_global_corners_sptr;
--
--
--#endif // bvpl_global_corners_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
-deleted file mode 100644
-index 7b33da89da..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include "bvpl_global_pca.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Mar-2011
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
-deleted file mode 100644
-index 39ff106c20..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
-+++ /dev/null
-@@ -1,153 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
--#ifndef bvpl_global_pca_h
--#define bvpl_global_pca_h
--//:
--// \file
--// \brief A class to compute and learn pca features across different boxm_scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  14-Mar-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <utility>
--#include <vnl/vnl_matrix_fixed.h>
--#include <vnl/vnl_vector_fixed.h>
--
--#include <boxm/boxm_scene.h>
--
--
--template <unsigned feature_dim>
--class bvpl_global_pca: public vbl_ref_count
--{
-- public:
--  //: Constructor
--  bvpl_global_pca(std::vector<std::string> scenes, std::vector<std::string> aux_dirs, std::vector<double> finest_cell_length,
--                  vgl_box_3d<int> nbbox,  double training_fraction = 0.1, std::string path_out = "./"):
--  scenes_(std::move(scenes)), aux_dirs_(std::move(aux_dirs)), finest_cell_length_(std::move(finest_cell_length)), nbbox_(nbbox), training_fraction_(training_fraction),path_out_(std::move(path_out))
--  {
--    training_scenes_ = std::vector<bool>(scenes_.size(), true);
--    nleaves_ =  std::vector<unsigned long>(scenes_.size(), 0);
--    nsamples_ = 0;
--    training_mean_.fill(0.0);
--    pc_.fill(0.0);
--    weights_.fill(0.0);
--    scatter_.fill(0.0);
--    this->xml_write();
--  }
--
--  //:Create from xml file
--  bvpl_global_pca(const std::string &path);
--
--  //: Init auxiliary scenes and smallest cell length values
--  void init(unsigned scene_id);
--
--  //: Computes the scatter matrix and mean vector of a portion of random samples from a block
--  bool sample_statistics( int scene_id, int block_i, int block_j, int block_k,
--                          vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                          vnl_vector_fixed<double, feature_dim> &mean,
--                          unsigned long &nfeature);
--
--  //: Update mean and scatter, given the mean and scatter of two sets.
--  //  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
--   static void combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim>  &mean1,
--                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter1,
--                                            double const n1,
--                                            const vnl_vector_fixed<double,feature_dim>  &mean2,
--                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter2,
--                                            double const n2,
--                                            vnl_vector_fixed<double,feature_dim> & mean_out,
--                                            vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
--                                            double &n_out );
--
--  //: Set total scatter matrix, mean, sample, principal components and weights for this class
--  void set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                      const vnl_vector_fixed<double, feature_dim> &mean,
--                      const double total_nsamples);
--
--  //: Access the principal components
--  const vnl_matrix_fixed<double, feature_dim, feature_dim>& principal_comps() { return pc_; }
--
--  //: Access the coefficients
--  const vnl_vector_fixed<double, feature_dim>& weights() { return weights_; }
--
--  //: Access the mean of samples
--  const vnl_vector_fixed<double, feature_dim>& mean()  { return training_mean_; }
--
--  bool register_scene(std::string scene_path, std::string aux_path)
--  {
--    if (scenes_.size()!=aux_dirs_.size())
--      return false;
--    scenes_.push_back(scene_path);
--    aux_dirs_.push_back(aux_path);
--    return true;
--  }
--
--  void xml_write();
--
--  //: Computes 10-dimensional pca projection at each voxel on the block and saves it
--  void project(int scene_id, int block_i, int block_j, int block_k);
--
--  void projection_error(int scene_id, int block_i, int block_j, int block_k);
--
--
--  std::string path_out() const { return path_out_; }
--
--  inline std::vector<std::string> scenes() const { return scenes_; }
--  inline std::vector<std::string> aux_dirs() const { return aux_dirs_; }
--  inline std::vector<double> cell_lengths() const { return finest_cell_length_; }
--  inline std::vector<bool> training_scenes() const { return training_scenes_; }
--  inline vgl_box_3d<int> nbbox() const { return nbbox_; }
--  inline unsigned nscenes() const { return scenes_.size(); }
-- protected:
--
--  //: A vector to hold scene paths
--  std::vector<std::string> scenes_;
--  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
--  std::vector<std::string> aux_dirs_;
--  //: A vector to hold the finest cell length of the corresponding scene scene
--  std::vector<double> finest_cell_length_;
--  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
--  std::vector<bool> training_scenes_;
--  //: A vector to keep the size of each scene
--  std::vector<unsigned long> nleaves_;
--
--  //: The size around the central feature to include in PCA vectors
--  vgl_box_3d<int> nbbox_;
--  //: Number of total samples(leaves) to be drawn
--  unsigned long long nsamples_;
--
--  //: Principal components - eigen vectors of the scatter matrix
--  vnl_matrix_fixed<double, feature_dim, feature_dim> pc_;
--  //: Weights - eigen values of the scatter matrix
--  vnl_vector_fixed<double, feature_dim> weights_;
--  //: The mean of sample data
--  vnl_vector_fixed<double, feature_dim> training_mean_;
--  //: Scatter matrix used to compute pca
--  vnl_matrix_fixed<double, feature_dim, feature_dim> scatter_;
--  //: Fraction of cells used for learning
--  double training_fraction_;
--
--  //: Paths for i/o of matrices and vectors
--  std::string path_out_;
--  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
--  std::string weights_path() const { return path_out_ + "/weights.txt"; }
--  std::string mean_path() const { return  path_out_ + "/mean.txt"; }
--  std::string scatter_path() const { return  path_out_ + "/scatter.txt"; }
--  std::string xml_path() const { return path_out_ + "/pca_global_info.xml"; }
--
--  void write_pca_matrices();
--
-- public:
--  boxm_scene_base_sptr load_scene (int scene_id);
--  boxm_scene_base_sptr load_train_scene (int scene_id);
--  boxm_scene_base_sptr load_valid_scene (int scene_id);
--  boxm_scene_base_sptr load_projection_scene (int scene_id);
--  boxm_scene_base_sptr load_error_scene (int scene_id);
--};
--
--typedef vbl_smart_ptr<bvpl_global_pca<125> > bvpl_global_pca_125_sptr;
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
-deleted file mode 100644
-index 6877b12a34..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
-+++ /dev/null
-@@ -1,1018 +0,0 @@
--#ifndef bvpl_global_pca_hxx_
--#define bvpl_global_pca_hxx_
--//:
--// \file
--// \author Isabel Restrepo
--// \date 14-Mar-2011
--
--#include "bvpl_global_pca.h"
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--
--
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--
--#include <boxm/boxm_scene_parser.h>
--
--#include <vnl/vnl_random.h>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_matrix_fixed.h>
--#include <vnl/algo/vnl_symmetric_eigensystem.h>
--
--#include <vul/vul_file.h>
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//#define DEBUG_PROJ
--
--//: Create from xml_file
--template <unsigned feature_dim>
--bvpl_global_pca<feature_dim>::bvpl_global_pca(const std::string &path)
--{
--  std::cout << "Loading pca info from xml-file" << std::endl;
--  int valid = 0;
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--  if (!xml_ifs.is_open()) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not open xml info file: " << xml_path() << '\n';
--    throw;
--  }
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("pca_global_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
--    throw;
--  }
--
--  //Parse neighborhood bounding box - units are number of voxels
--  bxml_element nbbox_query("neighborhood");
--  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
--  bxml_element* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
--  int min_x, min_y, min_z, max_x, max_y, max_z =0;
--  nbbox_elm->get_attribute("min_x", min_x);
--  nbbox_elm->get_attribute("min_y", min_y);
--  nbbox_elm->get_attribute("min_z", min_z);
--  nbbox_elm->get_attribute("max_x", max_x);
--  nbbox_elm->get_attribute("max_y", max_y);
--  nbbox_elm->get_attribute("max_z", max_z);
--
--  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
--  std::cout << "Neighborhood: " << nbbox_ << std::endl;
--
--  //Parse Number of samples
--  bxml_element properties_query("properties");
--  bxml_data_sptr properties_data = bxml_find_by_name(root, properties_query);
--  bxml_element* properties_elm = dynamic_cast<bxml_element*>(properties_data.ptr());
--  properties_elm->get_attribute("nsamples", nsamples_);
--  unsigned temp_dim;
--  properties_elm->get_attribute("feature_dim", temp_dim);
--  if (temp_dim!=feature_dim) {
--    valid = -10;
--  }
--  properties_elm->get_attribute("training_fraction", training_fraction_);
--
--  unsigned nscenes = 0;
--  properties_elm->get_attribute("nscenes", nscenes);
--
--  std::cout << "Number of samples: " << nsamples_ << '\n'
--           << "Feature dimension: " << temp_dim << '\n'
--           << "Number of scenes: " << nscenes <<std::endl;
--
--  //Parse scenes
--  bxml_element scenes_query("scene");
--  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
--
--  if (nscenes !=scenes_data.size()) {
--    std::cerr<<"Wrong number of scenes\n";
--    throw;
--  }
--
--  scenes_.clear();
--  scenes_.resize(nscenes);
--
--  aux_dirs_.clear();
--  aux_dirs_.resize(nscenes);
--
--  finest_cell_length_.clear();
--  finest_cell_length_.resize(nscenes);
--
--  nleaves_.clear();
--  nleaves_.resize(nscenes);
--
--  for (unsigned si = 0; si < nscenes; si++)
--  {
--    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
--    int id = -1;
--    scenes_elm->get_attribute("id", id);
--    scenes_elm->get_attribute("path", scenes_[id]);
--    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
--    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
--    scenes_elm->get_attribute("nleaves", nleaves_[id]);
--
--    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
--  }
--
--  //Parse training scenes
--  bxml_element train_query("training_scenes");
--  bxml_element* train_elm = dynamic_cast<bxml_element*>(bxml_find_by_name(root, train_query).ptr());
--  unsigned n_train_scenes = 0;
--  train_elm->get_attribute("nscenes", n_train_scenes);
--  training_scenes_.clear();
--  training_scenes_.resize(nscenes, false);
--
--  //read out the scenes
--  for (bxml_element::const_data_iterator s_it = train_elm->data_begin(); s_it != train_elm->data_end(); s_it++) {
--    if ((*s_it)->type() == bxml_data::TEXT) {
--      bxml_text* t = dynamic_cast<bxml_text*>((*s_it).ptr());
--      std::stringstream text_d(t->data()); std::string buf;
--      std::vector<std::string> tokens;
--      while (text_d >> buf) {
--        tokens.push_back(buf);
--      }
--      if (tokens.size() != n_train_scenes)
--        continue;
--      for (unsigned i = 0; i < n_train_scenes; i++) {
--        std::stringstream ss2(tokens[i]); int s_type_id;
--        ss2 >> s_type_id;
--        std::cout << "Scene: " << s_type_id << " is used for training\n";
--        training_scenes_[s_type_id]=true;
--      }
--      break;
--    }
--  }
--
--  //Parse paths and set matrices
--  bxml_element paths_query("paths");
--  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
--  if (paths_data)
--  {
--    bxml_element* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
--
--    std::string ifs_path;
--
--    path_elm->get_attribute("pc_path", ifs_path);
--    if (ifs_path != pc_path())
--      valid = -1;
--    else{
--      std::ifstream ifs(ifs_path.c_str());
--      ifs >> pc_;
--      ifs.close();
--      if (pc_.size()!=feature_dim*feature_dim)
--        valid = -2;
--    }
--
--    path_elm->get_attribute("weights_path", ifs_path);
--    if (ifs_path != weights_path())
--      valid = -3;
--    else{
--      std::ifstream ifs(ifs_path.c_str());
--      ifs >> weights_;
--      ifs.close();
--      if (weights_.size()!=feature_dim)
--        valid = -4;
--    }
--
--    path_elm->get_attribute("mean_path", ifs_path);
--    if (ifs_path != mean_path())
--      valid = -5;
--    else
--    {
--      if ( vul_file::exists(ifs_path))
--      {
--        std::ifstream ifs(ifs_path.c_str());
--        ifs >> training_mean_;
--        ifs.close();
--      }
--      else{
--        std::cerr << " Warning: Mean file is empty\n";
--        training_mean_.fill(0.0);
--      }
--
--      path_elm->get_attribute("scatter_path", ifs_path);
--      if (ifs_path != scatter_path())
--        valid = -6;
--      else if (vul_file::exists(ifs_path)) {
--        std::ifstream(ifs_path);
--        ifs_path >> scatter_;
--        ifs_path.close();
--      }
--      else{
--        std::cerr << " Warning: Scatter file is empty\n";
--        scatter_.fill(0.0);
--      }
--
--      if (valid<0) {
--        std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
--        xml_write();
--      }
--    }
--  }
--
--  xml_ifs.close();
--}
--
--//: Init auxiliary scenes and smallest cell length values
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::init(unsigned scene_id)
--{
--  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  if (!data_scene) {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
--    return;
--  }
--  double finest_cell_length = data_scene->finest_cell_length();
--  finest_cell_length_[scene_id] = finest_cell_length;
--  nleaves_[scene_id] = data_scene->size();
--
--  if (!(vul_file::exists(aux_dirs_[scene_id]) && vul_file::is_directory(aux_dirs_[scene_id]))) {
--    vul_file::make_directory(aux_dirs_[scene_id]);
--  }
--
--  {
--    std::stringstream aux_scene_ss;
--    aux_scene_ss << "train_scene_" << scene_id ;
--    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--    if (!vul_file::exists(aux_scene_path)) {
--      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--      boxm_scene<boct_tree<short, bool> > *aux_scene =
--      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--      aux_scene->set_appearance_model(BOXM_BOOL);
--      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--    }
--  }
--  {
--    std::stringstream aux_scene_ss;
--    aux_scene_ss << "valid_scene_" << scene_id ;
--    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--    if (!vul_file::exists(aux_scene_path)) {
--      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--      boxm_scene<boct_tree<short, bool> > *aux_scene =
--      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--      aux_scene->set_appearance_model(BOXM_BOOL);
--      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--    }
--  }
--
--  {
--    std::stringstream proj_scene_ss;
--    proj_scene_ss << "proj_pca_scene_" << scene_id ;
--    std::string proj_scene_path = aux_dirs_[scene_id] + "/" + proj_scene_ss.str() + ".xml";
--    if (!vul_file::exists(proj_scene_path)) {
--      std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
--      typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--      boxm_scene<pca_tree_type > *proj_scene =
--      new boxm_scene<pca_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--      proj_scene->set_appearance_model(VNL_DOUBLE_10);
--      proj_scene->set_paths(aux_dirs_[scene_id], proj_scene_ss.str());
--      proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
--    }
--  }
--
--  xml_write();
--}
--
--//: Compute the scatter matrix of the specified block. A random number of cells are drawn for the calculation
--//  The mask block indicates, whether a cell was used for learning the scatter matrix and mean
--//  Ramndom samples according to octree structure.
--//  Sampling is achieved by generating uniform random cell samples.
--//  Since there are more cells where the resolution is finer, then these regions get sampled more often
--template <unsigned feature_dim>
--bool bvpl_global_pca<feature_dim>::sample_statistics( int scene_id, int block_i, int block_j, int block_k,
--                                                      vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                                                      vnl_vector_fixed<double, feature_dim> &mean,
--                                                      unsigned long &nfeature)
--{
--  if (!training_scenes_[scene_id]) {
--    std::cout << "Skiping scene: " << scene_id <<", labeled for testing\n";
--    return false;
--  }
--
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,bool> bool_tree_type;
--  typedef boct_tree_cell<short,bool> bool_cell_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr mask_scene_base =load_train_scene(scene_id);
--
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* mask_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*>(mask_scene_base.as_pointer());
--
--  if (!(data_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast data scenes\n";
--    return false;
--  }
--  if (!(mask_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast mask scenes\n";
--    return false;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  mask_scene->unload_active_blocks();
--
--  mean.fill(0.0);
--  S.fill(0.0);
--
--  vnl_random rng;
--  //vnl_random rng(9667566ul);
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && mask_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return false;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  mask_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  bool_tree_type* mask_tree = data_tree->template clone_to_type<bool>();
--  mask_tree->init_cells(false);
--
--  nfeature = 1;
--
--  //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
--  std::vector<float_cell_type *> leaf_cells = data_tree->leaf_cells();
--  std::vector<bool_cell_type*> mask_leaves = mask_tree->leaf_cells();
--
--  int tree_ncells = leaf_cells.size();
--  unsigned long tree_nsamples = (unsigned long)(tree_ncells*training_fraction_);
--  double cell_length = finest_cell_length_[scene_id];
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> nmin = nbbox_.min_point();
--  vgl_point_3d<int> nmax = nbbox_.max_point();
--
--  std::cout <<" In block (" << block_i <<", " << block_j << ", " << block_k << "), number of nsamples is: " << tree_nsamples << ", cell length is: " << cell_length << std::endl;
--
--  for (unsigned long i=0; i<tree_nsamples; i++)
--  {
--    unsigned long sample = rng.lrand32(tree_ncells-1);
--
--    boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
--    vgl_point_3d<double> center_cell_centroid = data_tree->global_centroid(center_cell);
--
--    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
--                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
--    roi.set_centroid(center_cell_centroid);
--
--    //if neighborhood is not inclusive we would have missing features
--    if (!((data_scene->get_world_bbox()).contains(roi))) {
--      i--;
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector_fixed<double, feature_dim> this_feature(0.0);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
--        {
--          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
--                                                 center_cell_centroid.y() + (double)y*cell_length,
--                                                 center_cell_centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          assert(neighbor_cell !=nullptr);
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    assert(curr_dim == feature_dim);
--
--    mask_leaves[sample]->set_data(true);
--
--    //increment weights
--    double rho = 1.0/(double)nfeature;
--    double rho_comp = 1.0 - rho;
--
--    // the difference vector between the sample and the mean
--    vnl_vector_fixed<double, feature_dim> diff = this_feature - mean;
--
--    //update the covariance
--    S += rho_comp*outer_product(diff,diff);
--
--    //update the mean
--    mean += (rho*diff);
--
--    ++nfeature;
--#if 0
--    std::cerr << "Feature EVD: " <<this_feature << '\n'
--             << "Mean Feature EVD: " <<mean_feature << '\n';
--#endif
--  }
--
--  --nfeature;
--  // write and release memory
--  mask_scene->get_block(block_i, block_j, block_k)->init_tree(mask_tree);
--  mask_scene->write_active_block();
--
--  data_scene->unload_active_blocks();
--  mask_scene->unload_active_blocks();
--
--  return true;
--}
--
--
--//: Update mean and scatter, given the mean and scatter of two sets.
--//  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim> &mean1,
--                                                                const vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter1,
--                                                                double const n1,
--                                                                const vnl_vector_fixed<double,feature_dim>  &mean2,
--                                                                const  vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter2,
--                                                                double const n2,
--                                                                vnl_vector_fixed<double,feature_dim> & mean_out,
--                                                                vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
--                                                                double &n_out )
--{
--  n_out = n1+n2;
--  mean_out = (n1*mean1 + n2*mean2)* (1.0/n_out);
--  vnl_vector_fixed<double, feature_dim> d = mean2 - mean1;
--  scatter_out = scatter1 + scatter2 + (n1*n2/n_out)*outer_product(d,d);
--}
--
--//: Set total scatter matrix, mean, sample, principal components and weights for this class
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                                                  const vnl_vector_fixed<double, feature_dim> &mean,
--                                                  const double total_nsamples)
--{
--  scatter_ = S;
--  training_mean_ = mean;
--  nsamples_ = (long unsigned int)total_nsamples;
--
--  // Compute eigenvectors(principal components) and values of S
--
--  vnl_matrix<double> pc_temp;
--  vnl_vector<double> w_temp;
--
--  vnl_symmetric_eigensystem_compute(scatter_.as_ref(), pc_temp, w_temp);
--  pc_ = pc_temp.fliplr();
--  weights_=w_temp.flip();
--
--  //save the newly set vaeiables
--  this->xml_write();
--}
--
--//: Computes 10-dimensional pca projection at each voxel on the block and saves it
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::project(int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
--  boxm_scene_base_sptr aux_scene_base = load_valid_scene(scene_id);
--
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
--  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* aux_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (aux_scene_base.as_pointer());
--  if (!(data_scene && proj_scene && aux_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  aux_scene->unload_active_blocks();
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && aux_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  proj_scene->load_block(block_i, block_j, block_k);
--  aux_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  pca_tree_type* proj_tree = data_tree->template clone_to_type<vnl_vector_fixed<double,10> >();
--  boct_tree<short, bool>* aux_tree = data_tree->template clone_to_type<bool>();
--  aux_tree->init_cells(true);
--
--  //get leaf cells
--  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
--  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> *> aux_leaves = aux_tree->leaf_cells();
--
--  double cell_length = finest_cell_length_[scene_id];
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> nmin = nbbox_.min_point();
--  vgl_point_3d<int> nmax = nbbox_.max_point();
--#ifdef DEBUG_PROJ
--  double error = 0.0;
--  unsigned long n_valid_cells= 0;
--#endif
--
--  for (unsigned long i =0; i<data_leaves.size(); i++)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
--      proj_leaves[i]->set_data(vnl_vector_fixed<double,10>(0.0));
--      aux_leaves[i]->set_data(false);
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
--                                                 centroid.y() + (double)y*cell_length,
--                                                 centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell) {
--            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    if (curr_dim != feature_dim) {
--      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--      return;
--    }
--    this_feature-=training_mean_;
--
--    //solve for the coefficients
--    vnl_vector_fixed<double, feature_dim> a(0.0);
--    a = pc_.transpose() * (this_feature);
--    vnl_vector_fixed<double,10> sample(a.extract(10));
--    proj_leaves[i]->set_data(sample);
--
--#ifdef DEBUG_PROJ
--    //project as a function of number of components
--    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * sample;
--
--    //compute error
--    error+=(float)((this_feature - feature_approx).squared_magnitude());
--    n_valid_cells++;
--#endif
--  }
--
--  // write and release memory
--  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
--  proj_scene->write_active_block();
--  proj_scene->unload_active_blocks();
--  aux_scene->get_block(block_i, block_j, block_k)->init_tree(aux_tree);
--  aux_scene->write_active_block();
--  aux_scene->unload_active_blocks();
--  data_scene->unload_active_blocks();
--
--#ifdef DEBUG_PROJ
--  std::cout << "Total error in this block: " << error/(double)n_valid_cells << std::endl;
--#endif
--}
--
--//: Computes the projection error (as square magniture) given 10-dimensional pca projection at each voxel on the block
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::projection_error(int scene_id, int block_i, int block_j, int block_k)
--{
--  if (training_scenes_[scene_id]) {
--    std::cout << "Skipping training scene: " <<scene_id << std::endl;
--    return;
--  }
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
--  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--
--  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>*>(data_scene_base.as_pointer());
--  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<float_tree_type >* error_scene = dynamic_cast<boxm_scene<float_tree_type >*>(error_scene_base.as_pointer());
--
--  if (!(data_scene && error_scene && proj_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  error_scene->unload_active_blocks();
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  proj_scene->load_block(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  pca_tree_type* proj_tree = proj_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--  error_tree->init_cells(-1.0f);
--
--  //get leaf cells
--  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
--  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
--  std::vector<float_cell_type *> error_leaves = error_tree->leaf_cells();
--
--  double cell_length = finest_cell_length_[scene_id];
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> nmin = nbbox_.min_point();
--  vgl_point_3d<int> nmax = nbbox_.max_point();
--
--  for (unsigned i =0; i<data_leaves.size(); i++)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates aad test if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
--      error_leaves[i]->set_data(-1.0f);
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
--                                                 centroid.y() + (double)y*cell_length,
--                                                 centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell) {
--            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    if (curr_dim != feature_dim) {
--      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--      return;
--    }
--    this_feature-=training_mean_;
--
--    //get the coefficients
--    vnl_vector_fixed<double, 10> a = proj_leaves[i]->data();
--
--    //project
--    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * a;
--
--    //compute error
--    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
--  error_scene->write_active_block();
--  error_scene->unload_active_blocks();
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--}
--
--
--//: Load scene info
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr scene_base = new boxm_scene_base();
--  boxm_scene_parser scene_parser;
--  scene_base->load_scene(scenes_[scene_id], scene_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
--  if (scene_base->appearence_model() == BOXM_FLOAT) {
--    scene->load_scene(scene_parser);
--    scene_base = scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_valid_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is should be used for training
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_train_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--
--//: Load auxiliary scene info
--template <unsigned feature_dim>
--
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_projection_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_projection_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
--  boxm_scene_parser proj_parser;
--  std::stringstream proj_scene_ss;
--  proj_scene_ss << aux_dirs_[scene_id] << "/proj_pca_scene_" << scene_id << ".xml";
--  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
--
--  //cast scene
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--  boxm_scene<pca_tree_type > *proj_scene= new boxm_scene<pca_tree_type >();
--  if (proj_scene_base->appearence_model() == VNL_DOUBLE_10) {
--    proj_scene->load_scene(proj_parser);
--    proj_scene_base = proj_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_proj_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return proj_scene_base;
--}
--
--
--//: Load auxiliary scene info
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_error_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid scene id\n";
--    return nullptr;
--  }
--
--  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  if (!data_scene) {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
--    return nullptr;
--  }
--
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << "error_pca_scene_" << scene_id ;
--  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--  if (!vul_file::exists(aux_scene_path)) {
--    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--    boxm_scene<boct_tree<short, float> > *aux_scene =
--    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--    aux_scene->set_appearance_model(BOXM_FLOAT);
--    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--  }
--
--  //load scene
--  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
--  boxm_scene_parser error_parser;
--  std::stringstream error_scene_ss;
--  error_scene_ss << aux_dirs_[scene_id] << "/error_pca_scene_" << scene_id << ".xml";
--  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
--  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
--    error_scene->load_scene(error_parser);
--    error_scene_base = error_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return error_scene_base;
--}
--
--
--//: Write this class to xml file
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("pca_global_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  bxml_element* paths = new bxml_element("paths");
--  paths->append_text("\n");
--  paths->set_attribute("pc_path", pc_path() );
--  paths->set_attribute("weights_path", weights_path() );
--  paths->set_attribute("mean_path", mean_path());
--  paths->set_attribute("scatter_path", scatter_path());
--  root->append_data(paths);
--  root->append_text("\n");
--
--  bxml_element* neighborhood = new bxml_element("neighborhood");
--  neighborhood->append_text("\n");
--  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
--  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
--  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
--  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
--  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
--  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
--  root->append_data(neighborhood);
--  root->append_text("\n");
--
--  bxml_element* properties = new bxml_element("properties");
--  properties->append_text("\n");
--  properties->set_attribute("nsamples", nsamples_);
--  properties->set_attribute("feature_dim", feature_dim);
--  //properties->set_attribute("finest_cell_length", finest_cell_length_);
--  properties->set_attribute("nscenes", scenes_.size());
--  properties->set_attribute("training_fraction", training_fraction_);
--
--  root->append_data(properties);
--  root->append_text("\n");
--
--  //write the scenes
--  for (unsigned i =0; i<scenes_.size(); i++)
--  {
--    bxml_element* scenes_elm = new bxml_element("scene");
--    scenes_elm->append_text("\n");
--    scenes_elm->set_attribute("id", i);
--    scenes_elm->set_attribute("path", scenes_[i]);
--    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
--    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
--    scenes_elm->set_attribute("nleaves", nleaves_[i]);
--    root->append_data(scenes_elm);
--    root->append_text("\n");
--  }
--
--  //write training scenes
--  bxml_element* train_elm = new bxml_element("training_scenes");
--  train_elm->append_text("\n");
--
--  std::stringstream ss;
--  unsigned ts = 0;
--
--  for (unsigned i = 0; i< training_scenes_.size(); i++) {
--    if (training_scenes_[i]) {
--      ss << i << ' ';
--      ts++;
--    }
--  }
--
--  train_elm->set_attribute("nscenes", ts);
--  train_elm->append_text(ss.str());
--  train_elm->append_text("\n");
--  root->append_data(train_elm);
--  root->append_text("\n");
--
--  //write to disk
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--
--  // Write pca main matrices -other matrices aren't class variables and should have been written during computation time
--  write_pca_matrices();
--}
--
--//: Write a PCA file
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::write_pca_matrices()
--{
--  std::ofstream pc_ofs(pc_path().c_str());
--  pc_ofs.precision(15);
--  std::ofstream weights_ofs(weights_path().c_str());
--  weights_ofs.precision(15);
--  std::ofstream mean_ofs(mean_path().c_str());
--  mean_ofs.precision(15);
--  std::ofstream scatter_ofs(scatter_path().c_str());
--  scatter_ofs.precision(15);
--
--  pc_ofs << pc_;
--  pc_ofs.close();
--  weights_ofs << weights_;
--  weights_ofs.close();
--  mean_ofs << training_mean_;
--  mean_ofs.close();
--  scatter_ofs << scatter_;
--  scatter_ofs.close();
--}
--
--
--#define BVPL_GLOBAL_PCA(feature_dim) \
--template class bvpl_global_pca<feature_dim>;
--
--
--#endif // bvpl_global_pca_hxx_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
-deleted file mode 100644
-index 40ca062045..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 11-Apr-2011
--
--#include "bvpl_global_taylor.h"
--
--template <>
--boxm_apm_type bvpl_taylor_apm<double, 10>(){return VNL_DOUBLE_10;}
--
--template <>
--boxm_apm_type bvpl_taylor_apm<float, 3>(){return VNL_FLOAT_3;}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
-deleted file mode 100644
-index 38c05600fb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
--#ifndef bvpl_global_taylor_h
--#define bvpl_global_taylor_h
--//:
--// \file
--// \brief A class to compute taylor features across different boxm_scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  11-Apr-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <vbl/vbl_ref_count.h>
--
--//Forward declaration
--class bvpl_global_corners;
--
--template <class T_data, unsigned DIM>
--boxm_apm_type bvpl_taylor_apm();
--
--namespace bvpl_global_tylor_defaults
--{
--  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--;
--}
--
--template<class T_data, unsigned DIM>
--class bvpl_global_taylor : public vbl_ref_count
--{
-- public:
--
--  //: Constructor  from xml file
--  bvpl_global_taylor(const std::string &path, const std::string kernel_names[]);
--
--  //: Init auxiliary scenes and smallest cell length values
--  void init();
--
--  //: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
--  void compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k);
--
--  //: Compute reconstruction error
--  bool compute_approximation_error(int scene_id, int block_i, int block_j, int block_k);
--
--  //: Extract a particular coefficient scene
--  void extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *coeff_scene);
--
--  //: Threshold non-salient features according to Harris' measure
--  void threshold_corners(int scene_id, int block_i, int block_j, int block_k, double k);
--
--  //: Write to taylor_global_info.xml
--  void xml_write();
--
--  // Accessors
--  std::string path_out() const { return path_out_; }
--  std::vector<std::string> scenes() const { return scenes_; }
--  std::vector<std::string> aux_dirs() const { return aux_dirs_; }
--  std::string aux_dirs( unsigned i ) const { return aux_dirs_[i]; }
--  std::vector<double> cell_lengths() const { return finest_cell_length_; }
--  //std::vector<bool> training_scenes() const { return training_scenes_; }
--
--  boxm_scene_base_sptr load_scene (int scene_id);
--  boxm_scene_base_sptr load_error_scene (int scene_id);
--  boxm_scene_base_sptr load_valid_scene (int scene_id);
--  boxm_scene_base_sptr load_projection_scene (int scene_id);
--
--  std::string xml_path() { return path_out_ + "/taylor_global_info.xml"; }
--
--  friend class bvpl_global_corners;
--
-- protected:
--
--  //: A vector to hold scene paths
--  std::vector<std::string> scenes_;
--  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
--  std::vector<std::string> aux_dirs_;
--  //: A vector to hold the finest cell length of the corresponding scene scene
--  std::vector<double> finest_cell_length_;
--  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
--  //std::vector<bool> training_scenes_;
--
--  //: A vector to 2-degree taylor approximation kernels
--  //  The order is I0, Ix, Iy, Iz, Ixx, Iyy, Izz, Ixy, Ixz, Iyz (therefore this class works for dimensions 1-10)
--  bvpl_kernel_vector_sptr kernel_vector_;
--
--  //: Path to kernel files
--  std::string kernels_path_;
--  //: Path to xml info file
--  std::string path_out_;
--};
--
--#include <vbl/vbl_smart_ptr.h>
--// This does not really seem like a good idea to me ... - PVr.
--typedef vbl_smart_ptr<bvpl_global_taylor<double,10> > bvpl_global_taylor_sptr;
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
-deleted file mode 100644
-index d8bdd3f0e4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
-+++ /dev/null
-@@ -1,645 +0,0 @@
--#ifndef bvpl_global_taylor_hxx_
--#define bvpl_global_taylor_hxx_
--//:
--// \file
--#include "bvpl_global_taylor.h"
--// \author Isabel Restrepo
--// \date 11-Apr-2011
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--
--#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <bvpl_octree/bvpl_corner_detector.h>
--#include <bvpl_octree/bvpl_corner_functors.h>
--
--#include <vul/vul_file.h>
--
--#include <vnl/algo/vnl_matrix_inverse.h>
--#include <vnl/vnl_double_3.h>
--#include <vnl/vnl_double_3x3.h>
--
--//: Constructor  from xml file
--template<class T_data, unsigned DIM>
--bvpl_global_taylor<T_data, DIM>::bvpl_global_taylor(const std::string &path, const std::string kernel_names[])
--{
--  std::cout << "Loading taylor info from xml-file" << std::endl;
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--  if (!xml_ifs.is_open()) {
--    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
--    throw;
--  }
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("taylor_global_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
--    throw;
--  }
--
--  //Parse scenes
--  bxml_element scenes_query("scene");
--  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
--
--  unsigned nscenes=scenes_data.size();
--  std::cout << "Number of scenes: " << nscenes <<std::endl;
--
--  scenes_.clear();
--  scenes_.resize(nscenes);
--
--  aux_dirs_.clear();
--  aux_dirs_.resize(nscenes);
--
--  finest_cell_length_.clear();
--  finest_cell_length_.resize(nscenes);
--
--  for (unsigned si = 0; si < nscenes; si++)
--  {
--    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
--    int id = -1;
--    scenes_elm->get_attribute("id", id);
--    scenes_elm->get_attribute("path", scenes_[id]);
--    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
--    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
--
--    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
--  }
--
--  //Parse kernels
--  bxml_element kernels_query("kernels");
--  bxml_data_sptr kernels_data = bxml_find_by_name(root, kernels_query);
--  if (kernels_data)
--  {
--    bxml_element* kernels_elm = dynamic_cast<bxml_element*>(kernels_data.ptr());
--
--    kernels_elm->get_attribute("path", kernels_path_);
--
--    std::cout << "Kernels path is " << kernels_path_ << '\n';
--    kernel_vector_ = new bvpl_kernel_vector;
--
--    if (vul_file::exists(kernels_path_) && vul_file::is_directory(kernels_path_)) {
--      //read the kernels
--
--      kernel_vector_->kernels_.clear();
--
--      kernel_vector_->kernels_.resize(DIM, nullptr);
--      //std::string kernel_names[]={"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz"};
--      for (unsigned ki = 0; ki<DIM; ki++) {
--        std::string filename = kernels_path_ + "/" + kernel_names[ki] + ".txt";
--        std::cout << "Reading kernel file : " << filename << std::endl;
--        bvpl_taylor_basis_factory factory(filename);
--        bvpl_kernel_sptr kernel = new bvpl_kernel(factory.create());
--        kernel_vector_->kernels_[ki] = kernel;
--      }
--    }
--  }
--  else {
--    std::cerr << " In Gobal Taylor, path to kernels does not exist\n";
--  }
--}
--
--//: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
--
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
--  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  if (!(data_scene && proj_scene && valid_scene))
--  {
--    std::cerr << "Error in bvpl_global_taylor::sample_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_block_vector_operator block_oper;
--  bvpl_algebraic_functor functor;
--  block_oper.operate(*data_scene, functor, kernel_vector_, block_i, block_j, block_k, *proj_scene, *valid_scene, finest_cell_length_[scene_id]);
--
--  //clean memory
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--}
--
--template<class T_data, unsigned DIM>
--bool bvpl_global_taylor<T_data, DIM>::compute_approximation_error(int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
--  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--
--  //cast the scenes
--  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
--  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (proj_scene_base.as_pointer());
--  boxm_scene<float_tree_type> * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  if (!data_scene || !basis_scene || !error_scene) {
--    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
--    return false;
--  }
--
--  //load blocks of interest
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  basis_scene->load_block(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  error_tree->init_cells(-1.0f);
--  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
--
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
--
--  vgl_point_3d<int> min_point = kernel_vector_->min();
--  vgl_point_3d<int> max_point = kernel_vector_->max();
--  double cell_length = this->finest_cell_length_[scene_id];
--  std::cout << "In computing taylor error, limits are: " <<min_point << " and " <<max_point <<std::endl;
--
--  for (unsigned i =0; i<data_leaves.size(); i++)
--  {
--    //current cell is the center
--    float_cell_type* data_cell = data_leaves[i];
--    taylor_cell_type* basis_cell = basis_leaves[i];
--
--    boct_loc_code<short> data_code = data_cell->get_code();
--    boct_loc_code<short> basis_code = basis_cell->get_code();
--
--    //check cells are at the same location
--    if (! data_code.isequal(basis_code)) {
--      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
--               << "Data Code: " << data_code << '\n'
--               << "Basis Code: " << basis_code << '\n';
--
--      return false;
--    }
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length,
--                                          centroid.y() + (double)min_point.y()*cell_length,
--                                          centroid.z() + (double)min_point.z()*cell_length);
--    if (! data_scene->locate_point_in_memory(min_point_global))
--      continue;
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length,
--                                          centroid.y() + (double)max_point.y()*cell_length,
--                                          centroid.z() + (double)max_point.z()*cell_length);
--    if (! data_scene->locate_point_in_memory(max_point_global))
--      continue;
--
--    //assemble basis
--//    double I0 = basis_cell->data().I0;
--//    vnl_double_3 G= basis_cell->data().G;
--//    vnl_double_3x3 H = basis_cell->data().H;
--    vnl_vector_fixed<double,10> taylor_coeff = basis_cell->data();
--
--    //form basis
--    double I0 = taylor_coeff[0];
--    vnl_double_3 G(taylor_coeff[1], taylor_coeff[2], taylor_coeff[3]);
--    vnl_double_3x3 H;
--    H.put(0,0,taylor_coeff[4]);
--    H.put(0,1,taylor_coeff[7]);
--    H.put(0,2,taylor_coeff[8]);
--    H.put(1,0,taylor_coeff[7]);
--    H.put(1,1,taylor_coeff[5]);
--    H.put(1,2,taylor_coeff[9]);
--    H.put(2,0,taylor_coeff[8]);
--    H.put(2,1,taylor_coeff[9]);
--    H.put(2,2,taylor_coeff[6]);
--
--    double error = 0.0;
--    for (int x = min_point.x(); x<= max_point.x(); x++) {
--      for (int y = min_point.y(); y<=max_point.y(); y++) {
--        for (int z = min_point.z(); z<=max_point.z(); z++) {
--          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
--          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
--          if (this_cell) {
--            vnl_double_3 X((double)x,(double)y, (double)z);
--            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
--            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
--            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
--            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
--          }
--        }
--      }
--    }
--
--    error_leaves[i]->set_data((float)error);
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
--  error_scene->write_active_block();
--  data_scene->unload_active_blocks();
--  basis_scene->unload_active_blocks();
--
--  return true;
--}
--
--
--//: Threshold non-salient features according to Harris' measure
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::threshold_corners(int scene_id, int block_i, int block_j, int block_k, double harris_k)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
--
--  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, float> >* corner_scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  corner_scene->set_appearance_model(BOXM_FLOAT);
--  corner_scene->set_paths(valid_scene->path(), "harris_scene");
--  corner_scene->write_scene("/harris_scene.xml");
--
--  if (!( proj_scene && valid_scene && corner_scene ))
--  {
--    std::cerr << "Error in bvpl_global_taylor::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_corner_detector corner_detector;
--  bvpl_harris_laptev_functor harris_functor(harris_k);
--
--  vgl_point_3d<int> max_neigborhood_idx = kernel_vector_->max();
--  vgl_point_3d<int> min_neigborhood_idx = kernel_vector_->min();
--
--  std::cout << "Neighborhood for harris threshhold: " << min_neigborhood_idx << " , " << max_neigborhood_idx << std::endl;
--
--  corner_detector.detect_and_threshold(proj_scene, harris_functor, min_neigborhood_idx, max_neigborhood_idx,
--                                       block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
--
--  //clean memory
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--//: Init auxiliary scenes and smallest cell length values
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::init()
--{
--  for (unsigned i = 0; i < aux_dirs_.size(); i++)
--  {
--    boxm_scene_base_sptr data_scene_base = load_scene(i);
--    boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--    if (!data_scene) {
--      std::cerr << "Error in bvpl_global_taylor::init(): Could not cast data scene\n";
--      return;
--    }
--    double finest_cell_length = data_scene->finest_cell_length();
--    finest_cell_length_[i] = finest_cell_length;
--
--    if (!(vul_file::exists(aux_dirs_[i]) && vul_file::is_directory(aux_dirs_[i]))) {
--      vul_file::make_directory(aux_dirs_[i]);
--    }
--
--    {
--      std::stringstream aux_scene_ss;
--      aux_scene_ss << "valid_scene_" << i ;
--      std::string aux_scene_path = aux_dirs_[i] + "/" + aux_scene_ss.str() + ".xml";
--      if (!vul_file::exists(aux_scene_path)) {
--        std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--        boxm_scene<boct_tree<short, bool> > *aux_scene =
--        new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--        aux_scene->set_appearance_model(BOXM_BOOL);
--        aux_scene->set_paths(aux_dirs_[i], aux_scene_ss.str());
--        aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--      }
--    }
--
--    {
--      std::stringstream proj_scene_ss;
--      proj_scene_ss << "proj_taylor_scene_" << i ;
--      std::string proj_scene_path = aux_dirs_[i] + "/" + proj_scene_ss.str() + ".xml";
--      if (!vul_file::exists(proj_scene_path)) {
--        std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
--        typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
--        boxm_scene<taylor_tree_type > *proj_scene =
--        new boxm_scene<taylor_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--        proj_scene->set_appearance_model(bvpl_taylor_apm<T_data,DIM>());
--        proj_scene->set_paths(aux_dirs_[i], proj_scene_ss.str());
--        proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
--      }
--    }
--  }
--
--  xml_write();
--}
--
--
--//: Load scene info
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr scene_base = new boxm_scene_base();
--  boxm_scene_parser scene_parser;
--  scene_base->load_scene(scenes_[scene_id], scene_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
--  if (scene_base->appearence_model() == BOXM_FLOAT) {
--    scene->load_scene(scene_parser);
--    scene_base = scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_valid_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--
--//: Load auxiliary scene info
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_error_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>=(int)scenes_.size())
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid scene id\n";
--    return nullptr;
--  }
--
--  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  if (!data_scene) {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
--    return nullptr;
--  }
--
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << "error_taylor_scene_" << scene_id ;
--  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--  if (!vul_file::exists(aux_scene_path)) {
--    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--    boxm_scene<boct_tree<short, float> > *aux_scene =
--    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--    aux_scene->set_appearance_model(BOXM_FLOAT);
--    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--  }
--
--  //load scene
--  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
--  boxm_scene_parser error_parser;
--  std::stringstream error_scene_ss;
--  error_scene_ss << aux_dirs_[scene_id] << "/error_taylor_scene_" << scene_id << ".xml";
--  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
--  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
--    error_scene->load_scene(error_parser);
--    error_scene_base = error_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return error_scene_base;
--}
--
--
--#if 0
--//: Load auxiliary scene indicating if a cell is should be used for training
--boxm_scene_base_sptr bvpl_global_taylor::load_train_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
--    return NULL;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
--    return NULL;
--  }
--
--  return aux_scene_base;
--}
--#endif
--
--
--//: Load auxiliary scene info
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_projection_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_projection_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
--  boxm_scene_parser proj_parser;
--  std::stringstream proj_scene_ss;
--  proj_scene_ss << aux_dirs_[scene_id] << "/proj_taylor_scene_" << scene_id << ".xml";
--  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
--
--  //cast scene
--  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
--  boxm_scene<taylor_tree_type > *proj_scene= new boxm_scene<taylor_tree_type >();
--  if (proj_scene_base->appearence_model() == bvpl_taylor_apm<T_data,DIM>()) {
--    proj_scene->load_scene(proj_parser);
--    proj_scene_base = proj_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_proj_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return proj_scene_base;
--}
--
--//: Write this class to xml file
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("taylor_global_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  //write the scenes
--  for (unsigned i =0; i<scenes_.size(); i++)
--  {
--    bxml_element* scenes_elm = new bxml_element("scene");
--    scenes_elm->append_text("\n");
--    scenes_elm->set_attribute("id", i);
--    scenes_elm->set_attribute("path", scenes_[i]);
--    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
--    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
--    root->append_data(scenes_elm);
--    root->append_text("\n");
--  }
--
--  //write path to kernels
--  bxml_element* kernel_elm = new bxml_element("kernels");
--  kernel_elm->append_text("\n");
--  kernel_elm->set_attribute("path", kernels_path_);
--  root->append_data(kernel_elm);
--  root->append_text("\n");
--
--  //write to disk
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--}
--
--
--//: Extract a particular coefficient scene
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *float_scene)
--{
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree_cell<short, float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > projection_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > projection_cell_type;
--  std::vector<vnl_vector_fixed<double,10> > projections;
--
--  boxm_scene_base_sptr projection_scene_base = load_projection_scene(scene_id);
--
--  boxm_scene<projection_tree_type>* projection_scene = dynamic_cast<boxm_scene<projection_tree_type>* >(projection_scene_base.as_pointer());
--
--  if (!(projection_scene && float_scene))
--  {
--    std::cerr << "Error in bof_util::random_label_for_training: Could not cast scenes\n";
--    return;
--  }
--
--  //init variables
--  projection_scene->unload_active_blocks();
--  float_scene->unload_active_blocks();
--
--  //get the cells for these blocks
--  boxm_block_iterator<projection_tree_type> it = projection_scene->iterator();
--  for (it.begin(); !it.end(); ++it)
--  {
--    if (!(projection_scene->valid_index(it.index()) && float_scene->valid_index(it.index()))) {
--      std::cerr << "In bof_util::random_label_for_training: invalid block\n";
--      return;
--    }
--
--    projection_scene->load_block(it.index());
--    float_scene->load_block(it.index());
--
--    //get the trees
--    projection_tree_type* projection_tree = projection_scene->get_block(it.index())->get_tree();
--    float_tree_type* float_tree = projection_tree->clone_to_type<float>();
--
--    //get leaf cells
--    std::vector<projection_cell_type *> projection_leaves = projection_tree->leaf_cells();
--    std::vector<float_cell_type *> float_leaves = float_tree->leaf_cells();
--
--    unsigned int tree_ncells = projection_leaves.size();
--
--    for (unsigned int i =0; i<tree_ncells; ++i)
--    {
--      float_leaves[i]->set_data(float(projection_leaves[i]->data()[coefficient_id]));
--    }
--    float_scene->get_block(it.index())->init_tree(float_tree);
--    float_scene->write_active_block();
--  }
--
--  //release memory
--  projection_scene->unload_active_blocks();
--  float_scene->unload_active_blocks();
--}
--
--
--#define BVPL_GLOBAL_TAYLOR_INSTANTIATE(T1,T2) \
--template class bvpl_global_taylor<T1,T2 >
--
--#endif // bvpl_global_taylor_hxx_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
-deleted file mode 100644
-index 6d3206a9c5..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
-+++ /dev/null
-@@ -1,142 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
--#ifndef bvpl_octree_kernel_operator_h
--#define bvpl_octree_kernel_operator_h
--//:
--// \file
--// \brief A class that operates a bvpl_kernel on an octree or boxm scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 13, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<class T_data>
--class bvpl_octree_kernel_operator
--{
-- public:
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  //Constructor from a bvpl functor
--  bvpl_octree_kernel_operator(tree_type* tree_in): tree_in_(tree_in){}
--
--  // "Convolves" kernel with class tree, storing the output in an output octree.
--  template<class F>
--  void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
--  {
--    // get all (leaf) cells at given scale
--    std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
--    std::vector<cell_type* > out_cells = out_tree->leaf_cells_at_level(level);
--
--    bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--    // iterate, through all cells
--    for (unsigned i = 0; i <  cells.size();i++)
--    {
--      // iterate through vector and compute result
--      cell_type* center_cell = cells[i];
--
--      if (center_cell->level()!=level)
--        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
--
--      if (!center_cell->is_leaf())
--        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a leaf\n";
--
--      vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
--
--      // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
--
--      kernel_iter.begin(); // reset the kernel iterator
--      while (!kernel_iter.isDone())
--      {
--        vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--        vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
--                                           this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
--                                           this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
--
--        cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
--
--        if (this_cell) {
--          bvpl_kernel_dispatch d = *kernel_iter;
--          T_data val = this_cell->data();
--          functor.apply(val, d);
--        }
--        else
--          break;
--        ++kernel_iter;
--      }
--
--      out_cells[i]->set_data(functor.result());
--    }
--  }
--
--  // "Convolves" kernel with class tree, storing the output in an output octree.
--  template<class F>
--  void operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length);
--
-- private:
--  tree_type * tree_in_;
--};
--
--template <class T_data> template <class F>
--void bvpl_octree_kernel_operator<T_data>::operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length)
--{
--  // get all (leaf) cells at given scale/tree level
--  std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
--
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  // iterate, through all cells
--  for (unsigned i = 0; i <  cells.size();i++)
--  {
--    // iterate through vector and compute result
--    cell_type* center_cell = cells[i];
--
--    if (center_cell->level()!=level)
--      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
--
--    if (!center_cell->is_leaf())
--      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a not a leaf\n";
--
--    vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
--
--    // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
--                                         this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
--                                         this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
--
--      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
--
--      if (this_cell) {
--        bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val, d);
--      }
--      else
--        break;
--      ++kernel_iter;
--    }
--
--    center_cell->set_data(functor.result());
--  }
--
--}
--
--#endif // bvpl_octree_kernel_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
-deleted file mode 100644
-index be5efb6238..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
-+++ /dev/null
-@@ -1,78 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
--#ifndef bvpl_octree_neighbors_h
--#define bvpl_octree_neighbors_h
--//:
--// \file
--// \brief  A class that operates a bvpl_kernel on an octree or boxm scene to find all the neighbor cells that correspond to that kernel, and returns a list of pointers to those neighbors
--// \author Gamze Tunali Gamze_Tunali@brown.edu
--// \date   March 18, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<class T_data>
--class bvpl_octree_neighbors
--{
-- public:
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  //Constructor from a bvpl functor
--  bvpl_octree_neighbors(tree_type* tree_in): tree_in_(tree_in){}
--
--  // "Convolves" kernel with class tree, storing the output in an output octree.
--  void neighbors(bvpl_kernel_sptr kernel, cell_type* cell,
--                 std::vector<cell_type *>& neighb_cells)
--  {
--    bvpl_kernel_iterator kernel_iter = kernel->iterator();
--    short level = cell->level();
--    double cell_length = tree_in_->cell_length(cell);
--    // iterate through vector and find the neighbors
--    vgl_point_3d<double> cell_origin = tree_in_->local_origin(cell);
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--      vgl_point_3d<double> this_cell_idx(cell_origin.x() + (double)kernel_idx.x()*cell_length,
--                                         cell_origin.y() + (double)kernel_idx.y()*cell_length,
--                                         cell_origin.z() + (double)kernel_idx.z()*cell_length);
--
--      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
--      if (this_cell) {
--        // check if this cell is an internal node, if so get the children
--        if (!this_cell->is_leaf()) {
--          std::vector<cell_type *> children;
--          this_cell->leaf_children(children);
--          neighb_cells.insert(neighb_cells.end(), children.begin(), children.end());
--        }
--        else {
--          // make sure that the same cell is not added more than once
--          bool found=false;
--          for (unsigned i=0; i<neighb_cells.size(); i++) {
--            if (neighb_cells[i] == this_cell)
--              found=true;
--          }
--          if (!found)
--            neighb_cells.push_back(this_cell);
--        }
--      }
--      ++kernel_iter;
--    }
--  }
--
-- private:
--  tree_type * tree_in_;
--};
--
--#endif // bvpl_octree_neighbors_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
-deleted file mode 100644
-index c5067b597e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
-+++ /dev/null
-@@ -1,84 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
--#ifndef bvpl_octree_vector_operator_h
--#define bvpl_octree_vector_operator_h
--//:
--// \file
--// \brief An abstract class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 17, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include "bvpl_octree_kernel_operator.h"
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/functors/bvpl_local_max_functor.h>
--#include <boct/boct_tree.h>
--
--
--//: A class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
--//  The class also contains abstract methods to be specialized in the subclasses
--template <class T_data>
--class bvpl_octree_vector_operator
--{
-- public:
--
--  //: Applies a vector of kernels and functor to a grid. Returns a grid that combines the responses of the kernels as specified in the subclass
--  template <class F>
--  bool operate(boct_tree<short ,T_data>* tree_in,
--               F functor,
--               bvpl_kernel_vector_sptr kernel_vector,
--               boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
--               short level, double cell_length)
--  {
--    bvpl_local_max_functor<T_data> func_max;
--    boct_tree<short ,T_data>* temp_tree = tree_in->clone();
--    bvpl_octree_kernel_operator<T_data> oper(tree_in);
--    for (unsigned int id = 0; id < kernel_vector->kernels_.size(); ++id)
--    {
--      temp_tree->init_cells(func_max.min_response());
--      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
--      oper.operate(functor, kernel, temp_tree,level, cell_length);
--      combine_kernel_responses(tree_out, temp_tree, id);
--    }
--
--    return true;
--  }
--
-- protected:
--  //: Abstract function to be implemented on children on how to combine current kernel response with output response
--
--  virtual void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
--                                        int id_curr)=0;
--
--  //: Compares response grids and stores in out, the maximum responses. This function gets called in subclasses when implementing combine_kernel_responses
--
--  void keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* new_tree,
--                              int new_id);
--};
--
--
--//: Compares response grids and stores in grid1, the wining responses.
--template<class T_data>
--void bvpl_octree_vector_operator<T_data>::keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
--                                                                 boct_tree<short ,T_data>* new_tree,
--                                                                 int new_id)
--{
--  bvpl_local_max_functor<T_data> func_max;
--
--  std::vector<boct_tree_cell<short,T_data>*> new_leaves = new_tree->leaf_cells();
--  std::vector<boct_tree_cell<short,bvpl_octree_sample<T_data> >*> leaves_out = tree_out->leaf_cells();
--
--  for (unsigned i=0; i< new_leaves.size(); i++)
--  {
--    T_data val1 = new_leaves[i]->data();
--    T_data val2 = leaves_out[i]->data().response_;
--    if (func_max.greater_than(val1, val2))
--      leaves_out[i]->set_data(bvpl_octree_sample<T_data>(new_leaves[i]->data(), new_id));
--  }
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
-deleted file mode 100644
-index e01a23ca65..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
--#ifndef bvpl_octree_vector_operator_impl_h
--#define bvpl_octree_vector_operator_impl_h
--//:
--// \file
--// \brief Subclasses that implement the abstract interface of bvpl_octree_vector_operator. They can be used to queue operations
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 30, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include "bvpl_octree_vector_operator.h"
--
--
--//: Class to apply a vector of kernels and functor to a grid, returning a grid containing at each voxel the max response
--template <class T_data>
--class bvpl_max_vector_operator: public bvpl_octree_vector_operator<T_data>
--{
-- public:
--  void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample <T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
--                                        int id_curr) override
--  {
--    this->keep_max_response_tree(tree_out, tree_curr, id_curr);
--  }
--};
--
--#endif // bvpl_octree_vector_operator_impl_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
-deleted file mode 100644
-index ec024dfe41..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
-+++ /dev/null
-@@ -1,84 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
--#ifndef bvpl_octree_vrml_util_h
--#define bvpl_octree_vrml_util_h
--//:
--// \file
--// \brief VRML utilities for scenes with bvpl_octree samples
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  December 10,  2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
--
--#include <boxm/boxm_scene.h>
--#include <bvrml/bvrml_write.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class bvpl_octree_vrml_util
--{
-- public:
--   //: Writes direction of kernel and magnitude of the response as disks of different sizes
--  template<class T_data>
--  static void write_scene_as_disks(std::ofstream &vrml_os,
--                                   boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > >  *scene,
--                                   bvpl_kernel_vector_sptr kernel_vector);
--};
--
--template<class T_data>
--void bvpl_octree_vrml_util::write_scene_as_disks(std::ofstream &vrml_os,
--                                                 boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > > *scene,
--                                                 bvpl_kernel_vector_sptr kernel_vector)
--{
--  typedef boct_tree<short, bvpl_octree_sample<T_data> > tree_type;
--  typedef boct_tree_cell<short, bvpl_octree_sample<T_data> > cell_type;
--
--  bvrml_write::write_vrml_header(vrml_os);
--
--  // iterate through the scene
--  boxm_block_iterator<tree_type > iter= scene->iterator();
--  iter.begin();
--
--  for (; !iter.end(); iter++)
--  {
--    scene->load_block(iter.index());
--    tree_type  *tree = (*iter)->get_tree();
--
--    // iterate through the tree
--    std::vector<cell_type*> cells = tree->leaf_cells();
--    unsigned lines = 0;
--    float max_response =bvpl_cell_to_float(cells[0]);
--    for (unsigned i = 0; i < cells.size(); i+=10)
--    {
--      int id = cells[i]->data().id_;
--      if (id < 0)
--        continue;
--      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
--      float response = bvpl_cell_to_float(cells[i]);
--      if (response > max_response) {
--        max_response = response;
--      }
--      std::cout << "response " << response << std::endl;
--      vgl_vector_3d<double> dir((kernel->axis())[0],(kernel->axis())[1],(kernel->axis())[2]);
--      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
--      if (response > 3.5f) {
--        bvrml_write::write_vrml_line(vrml_os, coord, dir, .1f*response, 1, 0, 0);
--        lines++;
--      }
--#ifdef DEBUG
--      bvrml_write::write_vrml_disk(vrml_os, coord, dir, 2*response-.5f, 0, .5f, 0);
--#endif
--    }
--    std::cout << "max response " << max_response << std::endl
--             << "number of lines: " << lines << std::endl;
--  }
--}
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
-deleted file mode 100644
-index 1d72f41d58..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 18-Feb-2011
--
--#include <iostream>
--#include <sstream>
--#include "bvpl_pca_error_scenes.h"
--
--#include <boxm/boxm_scene.h>
--
--#include <vul/vul_file.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bvpl_pca_error_scenes::bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& pca_path, unsigned dim)
--{
--  typedef boct_tree<short,float> tree_type;
--  for (unsigned i =0; i<dim+1; i++)
--    scenes_.push_back(new boxm_scene_base());
--
--  auto* data_scene= dynamic_cast<boxm_scene<tree_type>* > (data_scene_base.as_pointer());
--  if (!data_scene)
--    std::cerr << "In bvpl_pca_error_scenes: Null Scene\n";
--
--  for (unsigned i = 0; i<dim+1; i++)
--  {
--    //path to error scenes
--    std::stringstream error_path_ss;
--    error_path_ss << pca_path << "/error_" << i;
--    std::string error_path = error_path_ss.str();
--    if (!vul_file::is_directory(error_path))
--      vul_file::make_directory(error_path);
--
--    boxm_scene<tree_type> *error_scene =
--    new boxm_scene<tree_type>(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--    error_scene->set_appearance_model(BOXM_FLOAT);
--
--    std::string scene_name = "error_scene";
--    error_scene->set_paths(error_path, scene_name);
--
--    if (!vul_file::exists(error_path + "/" + scene_name +  ".xml"))
--      error_scene->write_scene("/" +scene_name +  ".xml");
--
--    //data_scene->clone_blocks(*error_scene, -1.0);
--
--    scenes_[i] = error_scene;
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
-deleted file mode 100644
-index a50c851c2f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
-+++ /dev/null
-@@ -1,39 +0,0 @@
--// This is bvpl_pca_error_scenes.h
--#ifndef bvpl_pca_error_scenes_h
--#define bvpl_pca_error_scenes_h
--
--//:
--// \file
--// \brief A class to hold the smartpointers to pca error scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <boxm/boxm_scene_base.h>
--#include <vsl/vsl_binary_io.h>
--
--// Forward declarations
--class bvpl_pca_error_scenes;
--
--typedef vbl_smart_ptr<bvpl_pca_error_scenes> bvpl_pca_error_scenes_sptr;
--
--//: A class to hold the smartpointers to response scenes and their corresponding names
--class bvpl_pca_error_scenes : public vbl_ref_count
--{
--public:
--
--  bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& taylor_path, unsigned dim);
--
--  //: Return the error scene associated with a number of components used for reconstruction
--  boxm_scene_base_sptr get_scene(unsigned ncomponent) {return scenes_[ncomponent];}
--
--private:
--  std::vector<boxm_scene_base_sptr> scenes_;
--
--};
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
-deleted file mode 100644
-index 2217b22966..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
-+++ /dev/null
-@@ -1,213 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
--#ifndef bvpl_scene_kernel_operator_h
--#define bvpl_scene_kernel_operator_h
--//:
--// \file
--// \brief A class that operates a bvpl_kernel on a boxm_scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 18, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boxm/boxm_scene.h>
--#include "bvpl_octree_kernel_operator.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class bvpl_scene_kernel_operator
--{
-- public:
--  //: "Convolves" kernel with an input octree, storing the output in an output octree.
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data, class F>
--  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--               F functor,
--               bvpl_kernel_sptr kernel,
--               boxm_scene<boct_tree<short, T_data > > &scene_out);
--
--  //: Performs in-situ non-maxima suppression over the area occupied by the kernel
--  template<class T_data, class F>
--  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                    F functor,
--                                    bvpl_kernel_sptr kernel);
--
--#if 0 //Depracated
--  // "Convolves" kernel with an input octree, storing the output in an output octree.
--  template<class T_data, class F>
--  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--               F functor,
--               bvpl_kernel_sptr kernel,
--               boxm_scene<boct_tree<short, T_data > > &scene_out,
--               short level)
--  {
--    typedef boct_tree<short, T_data > tree_type;
--    boxm_block_iterator<tree_type> iter_in = scene_in.iterator();
--    boxm_block_iterator<tree_type> iter_out = scene_out.iterator();
--    iter_in.begin();
--    iter_out.begin();
--    for (; !iter_in.end(); iter_in++, iter_out++) {
--      //Isa: change to load block and neighbors
--      scene_in.load_block(iter_in.index());
--      scene_out.load_block(iter_out.index());
--      tree_type *tree_in= (*iter_in)->get_tree();
--      tree_type *tree_out = tree_in->clone();
--
--      // output tree has the same shape but is initialized to have response zero
--      T_data zero_val = T_data();
--      std::cout << "Response tree is initialized to: " << zero_val << std::endl;
--      tree_out->init_cells(zero_val);
--
--      bvpl_octree_kernel_operator<T_data> oper(tree_in);
--      double cell_length = 1.0/(double)(1<<(tree_in->root_level() -level));
--      oper.operate(functor, kernel, tree_out, level, cell_length);
--      (*iter_out)->init_tree(tree_out);
--      scene_out.write_active_block();
--    }
--  }
--#endif
--};
--
--//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data, class F>
--void bvpl_scene_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_sptr kernel,
--                                         boxm_scene<boct_tree<short, T_data > > &scene_out)
--{
--  double cell_length = kernel->voxel_length();
--  short finest_level = scene_in.finest_level();
--  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
--
--  scene_in.clone_blocks(scene_out, T_data());
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
--  iterator.begin();
--
--  boxm_cell_iterator<boct_tree<short, T_data > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block);
--  out_iter.begin();
--
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  while ( !(iterator.end() || out_iter.end()) )
--  {
--    boct_tree_cell<short,T_data> *center_cell = *iterator;
--    boct_tree_cell<short,T_data> *out_center_cell = *out_iter;
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    //we are only interested in finest resolution
--    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()){
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    vgl_point_3d<double> center_cell_origin = iterator.global_origin();
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> kernel_cell_origin(center_cell_origin.x() + (double)kernel_idx.x()*cell_length + 1.0e-7,
--                                              center_cell_origin.y() + (double)kernel_idx.y()*cell_length + 1.0e-7,
--                                              center_cell_origin.z() + (double)kernel_idx.z()*cell_length + 1.0e-7);
--
--      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_origin);
--
--      if (this_cell) {
--        bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val, d);
--      }
--      else {
--        break;
--      }
--
--      ++kernel_iter;
--    }
--
--    out_center_cell->set_data(functor.result());
--    ++iterator;
--    ++out_iter;
--  }
--}
--
--//: Applies non-maxima suppression on the region occupied by the kernel. The output is stored in situ.
--//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data, class F>
--void bvpl_scene_kernel_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                                              F functor,
--                                                              bvpl_kernel_sptr kernel)
--{
--  short finest_level = scene_in.finest_level();
--  double cell_length = kernel->voxel_length();
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
--  iterator.begin();
--
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  while ( !(iterator.end()) )
--  {
--    boct_tree_cell<short,T_data> *center_cell = *iterator;
--
--    //we are only interested in finest resolution
--    if (!center_cell->level() == finest_level || !center_cell->is_leaf()){
--      ++iterator;
--      continue;
--    }
--    T_data this_data = center_cell->data();
--
--    //vgl_point_3d<double> center_cell_origin = iterator.global_origin();
--    vgl_point_3d<double> center_cell_center = this_data.location();
--    if (!functor.init(this_data)){
--      ++iterator;
--      continue;
--    }
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> kernel_cell_center(center_cell_center.x() + (double)kernel_idx.x()*cell_length,
--                                              center_cell_center.y() + (double)kernel_idx.y()*cell_length,
--                                              center_cell_center.z() + (double)kernel_idx.z()*cell_length);
--
--      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_center);
--
--      if (this_cell) {
--        //bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val);
--      }
--      else {
--        break;
--      }
--
--      ++kernel_iter;
--    }
--
--    center_cell->set_data(functor.result());
--    ++iterator;
--  }
--}
--
--#endif // bvpl_scene_kernel_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
-deleted file mode 100644
-index c6fabe14e2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include "bvpl_scene_neighborhood_operator.h"
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
-deleted file mode 100644
-index 5f8e43f92f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
--#ifndef bvpl_scene_neighborhood_operator_h
--#define bvpl_scene_neighborhood_operator_h
--//:
--// \file
--// \brief A class to perform neighborhood operations on a boxm_scene.
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  13-Aug-2010.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--
--#include <vgl/vgl_box_3d.h>
--
--//: A class to perform neighborhood operations on a bvxm_scene.
--// This class operates on all leaf cells within a region
--class bvpl_scene_neighborhood_operator
--{
-- public:
--  bvpl_scene_neighborhood_operator()= default;
--
--  //: Applies the region-based functor on every leaf cell of the scene. The output is stored on a separate scene
--  template <class T_data_in, class T_data_out, class F>
--  void operate(boxm_scene<boct_tree<short, T_data_in > > *scene_in,
--               F functor,
--               vgl_box_3d<double> roi,
--               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
--
--  //: Applies the region-based functor on every leaf cell of the scene. The region is obtained from scen2.
--  //  The output is stored on a separate scene
--  template <class T_data_in1, class T_data_in2, class T_data_out, class F>
--  void operate(boxm_scene<boct_tree<short, T_data_in1 > > *scene_in1,
--               boxm_scene<boct_tree<short, T_data_in2 > > *scene_in2,
--               F functor,
--               vgl_box_3d<double> roi,
--               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
--
--  //: Applies a non-maxima suppression functor on every leaf cell of the scene. The output is stored in situ
--  template <class T_data, class F>
--  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                    F functor,
--                                    vgl_box_3d<double> &roi);
--};
--
--
--//: Applies the region-based functor on every leaf cell of the scene. The output is stored in situ. The ROI must be in scene-coordinates
--//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template <class T_data, class F>
--void bvpl_scene_neighborhood_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                                                    F functor,vgl_box_3d<double> &roi)
--{
--  short finest_level = scene_in.finest_level();
--
--  //(1) Traverse the scene
--  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block_and_neighbors);
--
--  iterator.begin();
--
--  while (!iterator.end())
--  {
--    boct_tree_cell<short,T_data> *cell = *iterator;
--    if ((!(cell->level() == finest_level)) || !cell->is_leaf()){
--      ++iterator;
--      continue;
--    }
--    // the region is located with subvoxel accuracy so datastructure should contain subvoxel localization
--    roi.set_centroid((cell->data()).location());
--
--    T_data this_data= cell->data();
--    functor.init(this_data, roi);
--
--    // get all cells that intersect a region
--    std::vector<boct_tree_cell<short, T_data>* > cells_in_roi;
--
--    //Return all cells that intersec the region
--    scene_in.leaves_in_region(roi,cells_in_roi);
--
--    for (unsigned i = 0; i<cells_in_roi.size(); i++)
--    {
--      boct_tree_cell<short, T_data> *this_cell = cells_in_roi[i];
--      if (!this_cell)
--        continue;
--      T_data val = this_cell->data();
--      functor.apply(val);
--    }
--
--    cell->set_data(functor.result());
--    ++iterator;
--  }
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
-deleted file mode 100644
-index 5f43040cc0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 22-Sep-2010
--
--#include "bvpl_scene_statistics.h"
--
--
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
--
--  scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
--  std::vector<float_cell_type*> leaves = tree->leaf_cells();
--
--  int tree_ncells = leaves.size();
--  //unsigned long tree_nsamples = (tree_ncells/scene_ncells)*(float)nsamples_;
--
--  double avg_val = 0.0;
--  vnl_random rng(9667566ul);
--  for (unsigned i=0; i<tree_nsamples; i++)
--  {
--    unsigned long sample = rng.lrand32(tree_ncells-1);
--
--    boct_tree_cell<short, float> *center_cell = leaves[sample];
--    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--    //if neighborhood is not inclusive we would have missing features
--    if ((double)center_cell->data()< -0.5) {
--      i--;
--      continue;
--    }
--    else {
--      avg_val+=(double)center_cell->data();
--    }
--  }
--
--  return avg_val/tree_nsamples;
--}
--
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
--  if (!scene) {
--    std::cerr << "Error in bvpl_average_value: Error scene is of incorrect type\n";
--    return false;
--  }
--  scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
--  std::vector<float_cell_type*> leaves = tree->leaf_cells();
--
--  double actual_samples = 0.0;
--  double avg_val = 0.0;
--  for (auto center_cell : leaves)
--  {
--    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--    //if neighborhood is not inclusive we would have missing features
--    if ((double)center_cell->data()< -0.5) {
--      continue;
--    }
--    else {
--      avg_val+=(double)center_cell->data();
--      actual_samples = actual_samples +1.0;
--    }
--  }
--
--  std::cout << "Adding errors of : " << actual_samples << " samples" << std::endl;
--
--  return avg_val/actual_samples;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
-deleted file mode 100644
-index f14813bc74..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
-+++ /dev/null
-@@ -1,102 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
--#ifndef bvpl_scene_statistics_h
--#define bvpl_scene_statistics_h
--//:
--// \file
--// \brief A set of functions to provide statistics about response scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  22-Sep-2010.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bsta/bsta_histogram.h>
--#include <boxm/boxm_scene.h>
--
--template <unsigned DIM>
--bool bvpl_compute_scene_statistics(boxm_scene< boct_tree<short, vnl_vector_fixed<float,DIM> > > *scene, bsta_histogram<float> &response_hist )
--{
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM> > tree_type;
--
--  //(1) Traverse the leaves of the scene
--  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
--
--  iterator.begin();
--  float cell_count = 0;
--  float max = (*iterator)->data().magnitude();
--  float min = max;
--  float mag = max;
--  while (!iterator.end()) {
--    cell_count++;
--    mag = (*iterator)->data().magnitude();
--    if ( mag > max)  max = mag;
--    if ( mag < min)  min = mag;
--    ++iterator;
--  }
--
--  unsigned int nbins = (unsigned int)std::floor(std::sqrt(cell_count));
--  response_hist = bsta_histogram<float>(min, max, nbins);
--
--  iterator.begin();
--
--  while (!iterator.end()) {
--    response_hist.upcount(static_cast<float>((*iterator)->data().magnitude()), 1.0f);
--    ++iterator;
--  }
--
--  scene->unload_active_blocks();
--
--  return true;
--}
--
--
--template <class T_loc, class T_data>
--bool bvpl_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist, unsigned int nbins = 0 )
--                                   //, bsta_histogram<float>& level_hist, unsigned& n_leaves)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc,T_data> cell_type;
--
--  //(1) Traverse the leaves of the scene
--  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
--
--  iterator.begin();
--  float cell_count = 0;
--  T_data max = (*iterator)->data();
--  T_data min = max;
--  T_data this_val = max;
--  while (!iterator.end()) {
--    cell_count++;
--    this_val = (*iterator)->data();
--    if ( this_val > max)  max = this_val;
--    if ( this_val < min)  min = this_val;
--    ++iterator;
--  }
--
--  if (nbins == 0)
--    nbins = (unsigned int)std::floor(std::sqrt(cell_count));
--  response_hist = bsta_histogram<float>(min, max, nbins);
--  scene->unload_active_blocks();
--  iterator.begin();
--  while (!iterator.end()) {
--    response_hist.upcount(static_cast<T_data>((*iterator)->data()), 1.0f);
--    ++iterator;
--  }
--
--  scene->unload_active_blocks();
--
--  return true;
--}
--
--//: Function that compute average value of a fraction of samples in the specified block.
--//  Datatype is assumed to be float, but if could be templated to expand to other types
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples);
--
--//: Function that compute average value of all positive samples in the specified block.
--//  Datatype is assumed to be float, but if could be templated to expand to other types
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k);
--
--
--#endif // bvpl_scene_statistics_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
-deleted file mode 100644
-index 49e7066a5c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
-+++ /dev/null
-@@ -1,178 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
--#ifndef bvpl_scene_vector_operator_h
--#define bvpl_scene_vector_operator_h
--//:
--// \file
--// \brief  A class that applies a vector of bvpl_kernels on a boxm_scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 30, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/functors/bvpl_local_max_functor.h>
--
--#include <boxm/boxm_scene.h>
--
--#include <vnl/vnl_vector_fixed.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class bvpl_scene_vector_operator
--{
-- public:
--
--  //: "Convolves" a vector of kernel with an input octree, storing the output in an output octree.
--  //  The shape of the output is determined by a templated function
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data_in, class T_data_out, class F >
--  void operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
--               F functor,
--               bvpl_kernel_vector_sptr kernel_vector,
--               boxm_scene<boct_tree<short, T_data_out > > &scene_out);
--
-- protected:
--
--  //:Function incharged of combining results
--  template<class T_data>
--  void combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out);
--
--  //:Function incharged of combining results
--  template<class T_data>
--  void combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out);
--};
--
--
--//: Operates a vector of kernels on a scene by : (1)Traversing input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data_in, class T_data_out,class F >
--void bvpl_scene_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_vector_sptr kernel_vector,
--                                         boxm_scene<boct_tree<short, T_data_out > > &scene_out)
--{
--  short finest_level = scene_in.finest_level();
--  // CAUTION: kernel is run at finest resolution, but this may not always be desired
--  double cell_length = scene_in.finest_cell_length();
--
--  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
--
--  T_data_out zero;
--  scene_in.template clone_blocks_to_type<boct_tree<short, T_data_out > >(scene_out, zero);
--  std::cout << "The initial zero-value for all cells is : " << zero << std::endl;
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, T_data_in > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data_in > >::load_block_and_neighbors);
--  iterator.begin();
--
--  boxm_cell_iterator<boct_tree<short, T_data_out > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data_out > >::load_block);
--  out_iter.begin();
--
--  while ( !(iterator.end() || out_iter.end()) )
--  {
--    boct_tree_cell<short,T_data_in> *center_cell = *iterator;
--    boct_tree_cell<short,T_data_out> *out_center_cell = *out_iter;
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure " << std::endl;
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    //we are only interested in finest resolution
--    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()) {
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    vgl_point_3d<double> center_cell_centroid = iterator.global_centroid();
--
--    //(2) Run vector of kernels
--
--    std::vector<T_data_in> responses;
--    for (auto kernel : kernel_vector->kernels_)
--    {
--      bvpl_kernel_iterator kernel_iter = kernel->iterator();
--      kernel_iter.begin(); // reset the kernel iterator
--      while (!kernel_iter.isDone())
--      {
--        vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
--
--        if (this_cell) {
--          bvpl_kernel_dispatch d = *kernel_iter;
--          T_data_in val = this_cell->data();
--          functor.apply(val, d);
--        }
--
--        ++kernel_iter;
--      }
--
--      responses.push_back(functor.result());
--    }
--
--    T_data_out data_out;
--    combine_kernel_responses(responses, data_out);
--    out_center_cell->set_data(data_out);
--    ++iterator;
--    ++out_iter;
--  }
--  return;
--}
--
--template <class T_data>
--void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out)
--{
--  if (responses.size() != 3) {
--    std::cerr << "Wrong number of responses" << std::endl;
--    return;
--  }
--
--  for (unsigned i = 0 ; i < 3; i++)
--  {
--    response_out[i] = responses[i];
--  }
--  return;
--}
--
--template <class T_data>
--void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out)
--{
--  if (responses.size() != 3) {
--    std::cerr << "Wrong number of responses" << std::endl;
--    return;
--  }
--
--  bvpl_local_max_functor<T_data> func_max;
--
--  T_data max= responses[0];
--  int max_id =0;
--  for (unsigned i = 1 ; i < responses.size(); i++)
--  {
--    if (func_max.greater_than(max, responses[i])){
--      max = responses[i];
--      max_id = i;
--    }
--  }
--  response_out.response_=max;
--  response_out.id_ = max_id;
--  return;
--}
--
--#endif // bvpl_scene_vector_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
-deleted file mode 100644
-index e8cac33615..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
-+++ /dev/null
-@@ -1,258 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 31-Jan-2011
--
--#include "bvpl_taylor_basis.h"
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--#include <boxm/boxm_scene.h>
--
--bool bvpl_taylor_basis::compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
--                                                    const boxm_scene_base_sptr& basis_scene_base,
--                                                    const boxm_scene_base_sptr& error_scene_base,
--                                                    const bvpl_taylor_basis_loader& loader,
--                                                    int block_i, int block_j, int block_k, double cell_length)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
--  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
--  //cast the scenes
--  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
--  auto* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (basis_scene_base.as_pointer());
--  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  if (!(data_scene && basis_scene &&error_scene)){
--    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
--    return false;
--  }
--
--  //load blocks of interest
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  basis_scene->load_block(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  error_tree->init_cells(-1.0f);
--  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
--
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
--
--  vgl_point_3d<int> min_point =  loader.min_point();
--  vgl_point_3d<int> max_point =  loader.max_point();
--
--
--  for (unsigned i =0; i<data_leaves.size(); i++) {
--    //current cell is the center
--    float_cell_type* data_cell = data_leaves[i];
--    taylor_cell_type* basis_cell = basis_leaves[i];
--
--    boct_loc_code<short> data_code = data_cell->get_code();
--    boct_loc_code<short> basis_code = basis_cell->get_code();
--
--    //check cells are at the same location
--    if (! data_code.isequal(basis_code)){
--      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
--               << "Data Code: " << data_code << '\n'
--               << "Basis Code: " << basis_code << '\n';
--
--      return false;
--    }
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
--      continue;
--
--    //retrieve basis
--    double I0 = basis_cell->data().I0;
--    vnl_double_3 G= basis_cell->data().G;
--    vnl_double_3x3 H = basis_cell->data().H;
--    double error = 0.0;
--    for (int x = min_point.x(); x<= max_point.x(); x++) {
--      for (int y = min_point.y(); y<=max_point.y(); y++) {
--        for (int z = min_point.z(); z<=max_point.z(); z++) {
--          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
--          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
--          if (this_cell) {
--            vnl_double_3 X((double)x,(double)y, (double)z);
--            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
--            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
--            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
--            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
--          }
--        }
--      }
--    }
--
--    error_leaves[i]->set_data((float)error);
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
--  error_scene->write_active_block();
--  data_scene->unload_active_blocks();
--  basis_scene->unload_active_blocks();
--
--  return true;
--}
--
--
--double bvpl_taylor_basis::sum_errors(const boxm_scene_base_sptr& error_scene_base,
--                                     int block_i, int block_j, int block_k, unsigned long tree_nsamples)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--
--  int tree_ncells = error_leaves.size();
--  //unsigned long tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
--
--  double error = 0.0;
--  vnl_random rng(9667566ul);
--  for (unsigned i=0; i<tree_nsamples; i++)
--  {
--    unsigned long sample = rng.lrand32(tree_ncells-1);
--
--    boct_tree_cell<short, float> *center_cell = error_leaves[sample];
--    // vgl_point_3d<double> center_cell_centroid = error_tree->global_centroid(center_cell);
--
--    //if neighborhood is not inclusive we would have missing features
--    if ((double)center_cell->data()< -0.5){
--      i--;
--      continue;
--    }
--    else {
--      error+=(double)center_cell->data();
--    }
--  }
--
--  return error/tree_nsamples;
--}
--
--//: Reads the values of basis responses and assembles them into matrices and vectors
--bool bvpl_taylor_basis::assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
--
--  std::cerr << "Caution: Using hardcoded size for taylor reconstruction\n";
--
--  //load output scene
--  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (taylor_scenes->get_scene("basis").as_pointer());
--  if (!basis_scene)
--  {
--    std::cerr << "Error in reconstruct: Faild to cast output scene\n";
--    return false;
--  }
--
--  //retieve basis scenes
--  //zeroth derivative scene
--  boxm_scene<float_tree_type>* I0_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("I0").as_pointer());
--  boxm_scene<float_tree_type>* Ix_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ix").as_pointer());
--  boxm_scene<float_tree_type>* Iy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iy").as_pointer());
--  boxm_scene<float_tree_type>* Iz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iz").as_pointer());
--  boxm_scene<float_tree_type>* Ixx_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixx").as_pointer());
--  boxm_scene<float_tree_type>* Ixy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixy").as_pointer());
--  boxm_scene<float_tree_type>* Ixz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixz").as_pointer());
--  boxm_scene<float_tree_type>* Iyy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyy").as_pointer());
--  boxm_scene<float_tree_type>* Iyz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyz").as_pointer());
--  boxm_scene<float_tree_type>* Izz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Izz").as_pointer());
--
--
--  if (!(I0_scene && Ix_scene && Iy_scene && Iz_scene && Ixx_scene && Iyy_scene && Izz_scene && Ixy_scene && Ixz_scene && Iyz_scene))
--  {
--    std::cerr << "Error in assemble_basis: Faild to load taylor scenes\n";
--    return false;
--  }
--
--  //load the blocks
--  basis_scene->load_block(block_i, block_j,block_k);
--  I0_scene->load_block(block_i, block_j,block_k);
--  Ix_scene->load_block(block_i, block_j,block_k);
--  Iy_scene->load_block(block_i, block_j,block_k);
--  Iz_scene->load_block(block_i, block_j,block_k);
--  Ixx_scene->load_block(block_i, block_j,block_k);
--  Ixy_scene->load_block(block_i, block_j,block_k);
--  Ixz_scene->load_block(block_i, block_j,block_k);
--  Iyy_scene->load_block(block_i, block_j,block_k);
--  Iyz_scene->load_block(block_i, block_j,block_k);
--  Izz_scene->load_block(block_i, block_j,block_k);
--
--
--  float_tree_type *treeI0 = I0_scene->get_block(block_i, block_j, block_k)->get_tree();
--  taylor_tree_type *basis_tree = treeI0->clone_to_type<bvpl_taylor_basis2_sample>();
--  basis_tree->init_cells(bvpl_taylor_basis2_sample());
--  std::vector<taylor_cell_type*> leaves_basis = basis_tree->leaf_cells();
--  std::vector<float_cell_type* > leaves_I0 = treeI0->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ix = Ix_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iy = Iy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iz = Iz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ixx =Ixx_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ixy =Ixy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ixz =Ixz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iyy =Iyy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iyz =Iyz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Izz =Izz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--
--
--  //iterate gathering and assembling the data
--  for (unsigned i=0; i<leaves_basis.size(); i++)
--  {
--    auto I0 = (double)leaves_I0[i]->data();
--    vnl_double_3 G((double)leaves_Ix[i]->data(),(double)leaves_Iy[i]->data(),(double)leaves_Iz[i]->data());
--
--    vnl_double_3x3 H;
--    H.put(0,0,(double)leaves_Ixx[i]->data());
--    H.put(0,1,(double)leaves_Ixy[i]->data());
--    H.put(0,2,(double)leaves_Ixz[i]->data());
--    H.put(1,0,(double)leaves_Ixy[i]->data());
--    H.put(1,1,(double)leaves_Iyy[i]->data());
--    H.put(1,2,(double)leaves_Iyz[i]->data());
--    H.put(2,0,(double)leaves_Ixz[i]->data());
--    H.put(2,1,(double)leaves_Iyz[i]->data());
--    H.put(2,2,(double)leaves_Izz[i]->data());
--
--    bvpl_taylor_basis2_sample sample(I0, G, H);
--
--    leaves_basis[i]->set_data(sample);
--  }
--
--  //write basis block
--  basis_scene->get_block(block_i, block_j, block_k)->set_tree(basis_tree);
--  basis_scene->write_active_block();
--
--  //free up memory
--  basis_scene->unload_active_blocks();
--  I0_scene->unload_active_blocks();
--  Ix_scene->unload_active_blocks();
--  Iy_scene->unload_active_blocks();
--  Iz_scene->unload_active_blocks();
--  Ixx_scene->unload_active_blocks();
--  Ixy_scene->unload_active_blocks();
--  Ixz_scene->unload_active_blocks();
--  Iyy_scene->unload_active_blocks();
--  Iyz_scene->unload_active_blocks();
--  Izz_scene->unload_active_blocks();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
-deleted file mode 100644
-index 6d35064025..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
-+++ /dev/null
-@@ -1,50 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
--#ifndef bvpl_taylor_basis_h
--#define bvpl_taylor_basis_h
--
--//:
--// \file
--// \brief A class with utilities to apply taylor kernels to a scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  31-Jan-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include "bvpl_taylor_scenes_map.h"
--#include <boxm/boxm_scene_base.h>
--
--
--class bvpl_taylor_basis
--{
--
--public:
--  //  bvpl_taylor_basis(boxm_scene_base_sptr scene_base, bvpl_taylor_basis_loader loader, std::string path_out):
--  //  kernel_loader_(loader), scene_base_(scene_base), path_out_(path_out){}
--  //
--  static bool assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k);
--
--  //: Computes the square errors between the scene and the taylor approximation at every voxel
--  // This function operates on a block specified by an index
--  static bool compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
--                                          const boxm_scene_base_sptr& basis_scene_base,
--                                          const boxm_scene_base_sptr& error_scene_base,
--                                          const bvpl_taylor_basis_loader& loader,
--                                          int block_i, int block_j, int block_k, double cell_length);
--
--  //: Sums the square errors for a percenatge of random samples
--  static double sum_errors(const boxm_scene_base_sptr& error_scene_base,
--                           int block_i, int block_j, int block_k, unsigned long tree_nsamples);
--
--protected:
--
--  //
--  //  bvpl_taylor_basis_loader kernel_loader_;
--  //  boxm_scene_base_sptr scene_base_;
--  //  std::string path_out_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
-deleted file mode 100644
-index 92128f59d6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_taylor_scenes_map.h"
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--#include <vul/vul_file.h>
--
--bvpl_taylor_scenes_map::bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader)
--{
--  loader_ = loader;
--  typedef boct_tree<short,float> tree_type;
--
--  std::vector<std::string> kernel_names;
--  loader.files(kernel_names);
--
--  //Load scenes one-by-one an insert them in the map
--  for (auto & kernel_name : kernel_names)
--  {
--    std::string scene_in_file = loader.path() + '/' + kernel_name + "/float_response_scene.xml";
--    boxm_scene_parser parser;
--    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--    scene_ptr->load_scene(scene_in_file, parser);
--
--    if (scene_ptr->appearence_model() != BOXM_FLOAT) {
--      std::cerr << " bvpl_taylor_scenes, scenes must be of type float\n";
--    }
--
--    auto* scene = new boxm_scene<tree_type>();
--    scene->load_scene(parser);
--    scene_ptr = scene;
--
--    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( kernel_name, scene_ptr));
--  }
--
--  // Create a scene to later save the taylor reconstruction (parameters of the  scene are the same as those of the input scene)
--  auto* scene_in = static_cast<boxm_scene<tree_type>* > (scenes_[kernel_names[0]].as_pointer());
--  {
--    boxm_scene<tree_type> *scene_out =
--    new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(loader.path(), "error");
--    scene_out->set_appearance_model(BOXM_FLOAT);
--    if (!vul_file::exists(loader.path() + "/error_scene.xml"))
--      scene_out->write_scene("error_scene.xml");
--    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "error", scene_out));
--  }
--
--  {
--    boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> > *scene_out =
--    new boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(loader.path(), "basis");
--    scene_out->set_appearance_model(BOXM_FLOAT);
--    if (!vul_file::exists(loader.path() + "/basis_scene.xml"))
--      scene_out->write_scene("basis_scene.xml");
--    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "basis", scene_out));
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
-deleted file mode 100644
-index 51f783da43..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
-+++ /dev/null
-@@ -1,41 +0,0 @@
--// This is bvpl_taylor_scenes_map.h
--#ifndef bvpl_taylor_scenes_map_h
--#define bvpl_taylor_scenes_map_h
--
--//:
--// \file
--// \brief A class to hold the smartpointers to response scenes and their corresponding names
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <boxm/boxm_scene_base.h>
--#include <vsl/vsl_binary_io.h>
--
--// Forward declarations
--class bvpl_taylor_scenes_map;
--
--typedef vbl_smart_ptr<bvpl_taylor_scenes_map> bvpl_taylor_scenes_map_sptr;
--
--//: A class to hold the smartpointers to response scenes and their corresponding names
--class bvpl_taylor_scenes_map : public vbl_ref_count
--{
--public:
--
--  bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader);
--
--  boxm_scene_base_sptr get_scene(std::string basis) {return scenes_[basis];}
--
--  const bvpl_taylor_basis_loader& loader() {return loader_ ;}
--
--private:
--  std::map<std::string, boxm_scene_base_sptr> scenes_;
--  bvpl_taylor_basis_loader loader_;
--
--};
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
-deleted file mode 100644
-index e1264a0f5c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
-+++ /dev/null
-@@ -1,20 +0,0 @@
--# contrib/brl/bseg/bvpl/io/CMakeLists.txt
--
--set(bvpl_octree_io_sources
--    bvpl_io_taylor_scenes_map.h       bvpl_io_taylor_scenes_map.cxx
--    bvpl_io_pca_error_scenes.h        bvpl_io_pca_error_scenes.cxx
--    bvpl_io_discover_pca_kernels.h    bvpl_io_discover_pca_kernels.cxx
--    bvpl_io_global_pca.h              bvpl_io_global_pca.cxx
--    bvpl_io_global_taylor.h
--    bvpl_io_global_corners.h          bvpl_io_global_corners.cxx
--
--)
--
--aux_source_directory(Templates bvpl_octree_io_sources)
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_io LIBRARY_SOURCES ${bvpl_octree_io_sources})
--target_link_libraries(bvpl_octree_io bvpl_octree ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vsl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
-deleted file mode 100644
-index 45954e1337..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
-deleted file mode 100644
-index ed29b40a54..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <bvpl_octree/io/bvpl_io_global_corners.h>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_corners);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
-deleted file mode 100644
-index fc4656672f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <bvpl_octree/io/bvpl_io_global_pca.h>
--
--typedef bvpl_global_pca<125> bvpl_global_pca_125;
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
-deleted file mode 100644
-index ff9d7dc465..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <bvpl_octree/io/bvpl_io_global_taylor.h>
--
--typedef bvpl_global_taylor<double, 10> bvpl_global_taylor_double_10;
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_taylor_double_10);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
-deleted file mode 100644
-index 427e3937d4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-deleted file mode 100644
-index 25a60ca12c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
-deleted file mode 100644
-index 05fe44152d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_discover_pca_kernels.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_discover_pca_kernels const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_discover_pca_kernels & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_discover_pca_kernels & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_discover_pca_kernels*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_discover_pca_kernels* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
-deleted file mode 100644
-index b52e2355b2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// This is bvpl_io_discover_pca_kernels.h
--#ifndef bvpl_io_discover_pca_kernels_h
--#define bvpl_io_discover_pca_kernels_h
--
--//:
--// \file
--// \brief Binary IO for bvpl_discover_pca_kernels. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_discover_pca_kernels const &);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_discover_pca_kernels &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_discover_pca_kernels &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_discover_pca_kernels* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_discover_pca_kernels* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
-deleted file mode 100644
-index ef10f3ad61..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include "bvpl_io_global_corners.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_corners const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_corners & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_corners & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_corners*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_corners* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
-deleted file mode 100644
-index ac64d773d4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
--#ifndef bvpl_io_global_cornerss_h
--#define bvpl_io_global_cornerss_h
--//:
--// \file
--// \brief Binary IO for bvpl_global_corners_125. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--typedef bvpl_global_corners bvpl_global_corners;
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_global_corners const &);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_global_corners &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_global_corners &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_global_corners* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_global_corners* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
-deleted file mode 100644
-index cac12cb25b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_global_pca.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_pca_125 const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_pca_125 & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_pca_125 & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_pca_125*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_pca_125* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
-deleted file mode 100644
-index 2858d03895..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
--#ifndef bvpl_io_global_pca_h
--#define bvpl_io_global_pca_h
--//:
--// \file
--// \brief Binary IO for bvpl_global_pca_125. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--typedef bvpl_global_pca<125> bvpl_global_pca_125;
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_global_pca_125 const &);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_global_pca_125 &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_global_pca_125 &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_global_pca_125* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_global_pca_125* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
-deleted file mode 100644
-index 8c57308415..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
-+++ /dev/null
-@@ -1,75 +0,0 @@
--// This is bvpl_io_global_taylor.h
--#ifndef bvpl_io_global_taylor_h
--#define bvpl_io_global_taylor_h
--
--//:
--// \file
--// \brief Binary IO for bvpl_global_taylor. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--
--//: Binary save parameters to stream.
--template <class T, unsigned N>
--void vsl_b_write(vsl_b_ostream & os, bvpl_global_taylor<T,N> const &)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--//: Binary load parameters from stream.
--template <class T, unsigned N>
--void vsl_b_read(vsl_b_istream & is, bvpl_global_taylor<T,N> &p)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--template <class T, unsigned N>
--void vsl_print_summary(std::ostream &os, const bvpl_global_taylor<T,N> &p)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--template <class T, unsigned N>
--void vsl_b_read(vsl_b_istream& is, bvpl_global_taylor<T,N>* p)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--template <class T, unsigned N>
--void vsl_b_write(vsl_b_ostream& os, const bvpl_global_taylor<T,N>* &mp)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--template <class T, unsigned N>
--void vsl_print_summary(std::ostream& os, const bvpl_global_taylor<T,N>* &p)
--{
--  if (p==0)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
-deleted file mode 100644
-index ff1de28596..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_pca_error_scenes.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_pca_error_scenes const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_pca_error_scenes & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_pca_error_scenes & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_pca_error_scenes*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_pca_error_scenes* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
-deleted file mode 100644
-index b0e98d6299..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// This is bvpl_io_pca_error_scenes.h
--#ifndef bvpl_io_pca_error_scenes_h
--#define bvpl_io_pca_error_scenes_h
--
--//:
--// \file
--// \brief Binary IO for bvpl_pca_error_scenes. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_pca_error_scenes);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_error_scenes &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_pca_error_scenes &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_pca_error_scenes* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_pca_error_scenes* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
-deleted file mode 100644
-index ba4155da13..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_taylor_scenes_map.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_taylor_scenes_map const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_taylor_scenes_map & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_taylor_scenes_map & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_taylor_scenes_map*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_taylor_scenes_map* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
-deleted file mode 100644
-index 3900318cd2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
-+++ /dev/null
-@@ -1,38 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
--#ifndef bvpl_io_taylor_scenes_map_h
--#define bvpl_io_taylor_scenes_map_h
--//:
--// \file
--// \brief Binary IO for bvpl_taylor_scenes_map.
--//        Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_taylor_scenes_map);
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_scenes_map &m);
--
--void vsl_print_summary(std::ostream &os, const bvpl_taylor_scenes_map &m);
--
--void vsl_b_read(vsl_b_istream& is, bvpl_taylor_scenes_map* m);
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_taylor_scenes_map* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &m);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
-deleted file mode 100644
-index 8c8f573ab9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( bvpl_octree_io_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_io_test_include bvpl_octree_io)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
-deleted file mode 100644
-index 4ddefe5f48..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_global_corners.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_global_pca.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_global_taylor.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-deleted file mode 100644
-index bbc90f7cea..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,31 +0,0 @@
--# This is contrib/brl/bseg/bvpl/pro/CMakeLists.txt
--# bvxm's Process Library
--
--# bprb depends on expat and bvxm_pro depends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--include_directories( ${BRL_INCLUDE_DIR}/bpro )
--include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--
--set(bvpl_octree_pro_sources
--    bvpl_octree_processes.h
--    bvpl_octree_register.h    bvpl_octree_register.cxx
--   )
--
--aux_source_directory(Templates bvpl_octree_pro_sources)
--aux_source_directory(processes bvpl_octree_pro_sources)
--aux_source_directory(processes/pca bvpl_octree_pro_sources)
--aux_source_directory(processes/taylor bvpl_octree_pro_sources)
--aux_source_directory(processes/corners bvpl_octree_pro_sources)
--aux_source_directory(processes/steerable_filters bvpl_octree_pro_sources)
--
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_pro LIBRARY_SOURCES ${bvpl_octree_pro_sources})
--target_link_libraries(bvpl_octree_pro bvpl_octree_io bvpl_octree bvpl_kernels_io boxm boct boxm_algo_pro boxm_sample boxm_util bprb brdb ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-deleted file mode 100644
-index 5de38b0662..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/boxm_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.h>
--BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
-deleted file mode 100644
-index 9cf83eebc4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_discover_pca_kernels_sptr, "bvpl_discover_pca_kernels_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
-deleted file mode 100644
-index b2e7fa3fed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_global_corners_sptr, "bvpl_global_corners_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
-deleted file mode 100644
-index f911ce4589..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_global_pca_125_sptr, "bvpl_global_pca_125_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
-deleted file mode 100644
-index 1a079ac413..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_pca_error_scenes_sptr, "bvpl_pca_error_scenes_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-deleted file mode 100644
-index ee1188aea5..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
-deleted file mode 100644
-index 600668ef3f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--BRDB_VALUE_INSTANTIATE(bvpl_global_taylor_sptr, "bvpl_global_taylor_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
-deleted file mode 100644
-index 89d5581af3..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
-+++ /dev/null
-@@ -1,61 +0,0 @@
--#ifndef bvpl_octree_processes_h_
--#define bvpl_octree_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--DECLARE_FUNC_CONS(bvpl_scene_vector_operator_process);
--DECLARE_FUNC_CONS(bvpl_scene_kernel_operator_process);
--DECLARE_FUNC_CONS(bvpl_block_kernel_operator_process);
--DECLARE_FUNC_CONS(bvpl_save_vrml_process);
--DECLARE_FUNC_CONS(bvpl_create_scene_process);
--DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
--DECLARE_FUNC_CONS(bvpl_nonmax_supp_process);
--DECLARE_FUNC_CONS(bvpl_compute_gauss_gradients);
--DECLARE_FUNC_CONS(bvpl_scene_histogram_process);
--DECLARE_FUNC_CONS(bvpl_block_avg_value_process);
--DECLARE_FUNC_CONS(bvpl_grad_scene_to_bin_process);
--
--
--//PCA related
--DECLARE_FUNC_CONS(bvpl_discover_pca_features_process);
--DECLARE_FUNC_CONS(bvpl_compute_pca_test_error_process);
--DECLARE_FUNC_CONS(bvpl_compute_pca_error_scene_process);
--DECLARE_FUNC_CONS(bvpl_compute_pca_error_block_process);
--DECLARE_FUNC_CONS(bvpl_load_pca_error_scenes_process);
--DECLARE_FUNC_CONS(bvpl_add_pca_errors_process);
--DECLARE_FUNC_CONS(bvpl_load_pca_info_process);
--DECLARE_FUNC_CONS(bvpl_pca_project_process);
--DECLARE_FUNC_CONS(bvpl_normalize_pca_training_error_process);
--DECLARE_FUNC_CONS(bvpl_pca_global_statistics_process);
--DECLARE_FUNC_CONS(bvpl_combine_pairwise_statistics_process);
--DECLARE_FUNC_CONS(bvpl_global_pca_process);
--DECLARE_FUNC_CONS(bvpl_init_global_pca_process);
--DECLARE_FUNC_CONS(bvpl_load_global_pca_125_process);
--DECLARE_FUNC_CONS(bvpl_pca_global_proj_error_process);
--DECLARE_FUNC_CONS(bvpl_pca_global_add_error_process);
--
--//Taylor related
--DECLARE_FUNC_CONS(bvpl_load_taylor_scenes_process);
--DECLARE_FUNC_CONS(bvpl_compute_taylor_error_process);
--DECLARE_FUNC_CONS(bvpl_add_taylor_errors_process);
--DECLARE_FUNC_CONS(bvpl_init_global_taylor_process);
--DECLARE_FUNC_CONS(bvpl_compute_taylor_coefficients_process);
--DECLARE_FUNC_CONS(bvpl_explore_coefficient_scene_process);
--DECLARE_FUNC_CONS(bvpl_load_global_taylor_process);
--DECLARE_FUNC_CONS(bvpl_taylor_global_proj_error_process);
--DECLARE_FUNC_CONS(bvpl_taylor_global_add_error_process);
--
--//Corner related
--DECLARE_FUNC_CONS(bvpl_compute_harris_measure_process);
--DECLARE_FUNC_CONS(bvpl_load_global_corners_process);
--DECLARE_FUNC_CONS(bvpl_corner_statistics_process);
--DECLARE_FUNC_CONS(bvpl_threshold_corners_process);
--DECLARE_FUNC_CONS(bvpl_compute_beaudet_measure_process);
--
--//Steerable filters
--DECLARE_FUNC_CONS(bvpl_init_sf_response_scene_process);
--DECLARE_FUNC_CONS(bvpl_compute_sf_raw_response_process);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
-deleted file mode 100644
-index 189cb04ae3..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
-+++ /dev/null
-@@ -1,81 +0,0 @@
--#include "bvpl_octree_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "bvpl_octree_processes.h"
--#include <bvpl_octree/bvpl_taylor_scenes_map.h>
--#include <bvpl_octree/bvpl_pca_error_scenes.h>
--#include <bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl_octree/bvpl_global_pca.h>
--#include <bvpl_octree/bvpl_global_taylor.h>
--#include <bvpl_octree/bvpl_global_corners.h>
--
--void bvpl_octree_register::register_datatype()
--{
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  REGISTER_DATATYPE(bvpl_taylor_scenes_map_sptr);
--  REGISTER_DATATYPE(bvpl_pca_error_scenes_sptr);
--  REGISTER_DATATYPE(bvpl_discover_pca_kernels_sptr);
--  REGISTER_DATATYPE(bvpl_global_pca_125_sptr);
--  REGISTER_DATATYPE(bvpl_global_taylor_sptr);
--  REGISTER_DATATYPE(bvpl_global_corners_sptr);
--
--}
--
--void bvpl_octree_register::register_process()
--{
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_vector_operator_process, "bvplSceneVectorOperatorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_kernel_operator_process, "bvplSceneKernelOperatorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_kernel_operator_process, "bvplBlockKernelOperatorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_save_vrml_process, "bvplSaveVrmlProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_scene_process, "bvplCreateSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_nonmax_supp_process, "bvplNonmaxSuppProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_gauss_gradients, "bvplComputeGaussGradients");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_test_error_process, "bvplComputeTestErrorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_histogram_process, "bvplSceneHistorgramProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_grad_scene_to_bin_process, "bvplGradSceneToBinProcess");
--
--  //PCA related
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_discover_pca_features_process, "bvplDiscoverPCAFeaturesProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_scene_process, "bvplComputePCAErrorSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_block_process, "bvplComputePCAErrorBlockProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_error_scenes_process, "bvplLoadPCAErrorSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_avg_value_process, "bvplBlockAvgValueProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_pca_errors_process, "bvplAddPCAErrorsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_info_process, "bvplLoadPCAInfoProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_project_process, "bvplPCAProjectProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_normalize_pca_training_error_process, "bvplNormalizePCATrainingErrorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_global_statistics_process, "bvplPCAGlobalStatisticsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_combine_pairwise_statistics_process, "bvplCombinePairwiseStatisticsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_global_pca_process, "bvplGlobalPCAProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_pca_process, "bvplInitGlobalPCAProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_pca_125_process, "bvplLoadGlobalPCA125Process");
--  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_proj_error_process);
--  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_add_error_process);
--
--  //Taylor related
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_scenes_process, "bvplLoadTaylorScenesProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_error_process, "bvplComputeTaylorErrorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_taylor_errors_process, "bvplAddTaylorErrorsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_taylor_process, "bvplInitGlobalTaylorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_coefficients_process, "bvplComputeTaylorCoefficients");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_explore_coefficient_scene_process, "bvplExploreCoefficientSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_taylor_process, "bvplLoadGlobalTaylorProcess");
--  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_proj_error_process);
--  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_add_error_process);
--
--  //Corner related
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_threshold_corners_process, "bvplThresholdCornersProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_harris_measure_process, "bvplComputeHarrisMeasureProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_corners_process, "bvplLoadGlobalCornersProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_corner_statistics_process, "bvplCornerStatisticsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_beaudet_measure_process, "bvplComputeBeaudetMeasureProcess");
--
--  //Steerable filters
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_sf_response_scene_process, "bvplInitSFResponseSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_sf_raw_response_process, "bvplComputeSFRawResponseProcess");
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
-deleted file mode 100644
-index a72acdd9a2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef bvpl_octree_register_h_
--#define bvpl_octree_register_h_
--
--class bvpl_octree_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // bvpl_octree_register_h_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
-deleted file mode 100644
-index 5a37180f2d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
-+++ /dev/null
-@@ -1,81 +0,0 @@
--//:
--// \file
--// \brief A process to add taylor error at a percentage of voxels in a block
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_block_avg_value_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_block_avg_value_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_block_avg_value_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_block_avg_value_process(bprb_func_process& pro)
--{
--  using namespace bvpl_block_avg_value_process_globals;
--
--  //get inputs
--  unsigned i =0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto fraction_nsamples = pro.get_input<double>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!scene_base){
--    std::cerr << "Error in bvpl_block_avg_value_process: Null error scene\n";
--    return false;
--  }
--  auto* scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (scene_base.as_pointer());
--  if (!scene){
--    std::cerr << "Error in bvpl_block_avg_value_process: Error scene is of incorrect type\n";
--    return false;
--  }
--  //sum errors within block
--  auto scene_ncells = (double)scene->size();
--  scene->load_block(block_i,block_j,block_k);
--  auto tree_ncells = (double)scene->get_block(block_i,block_j,block_k)->get_tree()->size();
--  double nsamples = scene_ncells * fraction_nsamples;
--
--  //number of samples - 10% of total number of leaf-cells
--  auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
--  std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
--           << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
--  double avg_value = bvpl_average_value(scene,block_i, block_j, block_k, tree_nsamples);
--
--  //store output
--  pro.set_output_val<double>(0, avg_value);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
-deleted file mode 100644
-index 0602d6d2ed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
-+++ /dev/null
-@@ -1,208 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 1-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
--#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
--#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--
--#include <boxm/boxm_scene.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--
--#include <vul/vul_file.h>
--
--namespace bvpl_block_kernel_operator_process_globals
--{
--  constexpr unsigned n_inputs_ = 8;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: process takes 6 inputs and has 1 output.
--// * input[0]: The boxm_scene
--// * input[1]: The kernels; bvpl_kernel_vector_sptr
--// * input[2,3,4]: block index (i,j,k);
--// * input[5]: String identifying functor type
--// * input[6]: Output path to a dir where to store response blocks
--
--
--bool bvpl_block_kernel_operator_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_block_kernel_operator_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i=0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "bvpl_kernel_sptr";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "vcl_string";
--  input_types_[i++] = "vcl_string";
--  input_types_[i++] = "double";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_block_kernel_operator_process(bprb_func_process& pro)
--{
--  using namespace bvpl_block_kernel_operator_process_globals;
--
--  if (pro.n_inputs() < n_inputs_)
--  {
--    std::cerr << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << '\n';
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  std::string functor_name = pro.get_input<std::string>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--  auto cell_length = pro.get_input<double>(i++);
--  //short level = 0;
--
--  //print inputs
--  std::cout << "In bvpl_block_kernel_operator:\n"
--           << "Index(i,j,k) : (" << block_i << ',' << block_j << ',' << block_k << ")\n"
--           << "Functor Name: " << functor_name << '\n'
--           << "Output path: " << output_path  << '\n'
--           << "Cell length" << cell_length << std::endl;
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cerr <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if (!kernel) {
--    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
--    return false;
--  }
--
--
--  switch (scene_base->appearence_model())
--  {
--    case BSTA_GAUSS_F1:
--    {
--      typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--      typedef boct_tree<short, gauss_type > tree_type;
--      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--
--      //parameters of the output scene are the same as those of the input scene
--      boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      scene_out->set_paths(output_path, "gauss_response_scene");
--      scene_out->set_appearance_model(BSTA_GAUSS_F1);
--      if (!vul_file::exists(output_path + "/gauss_response_scene.xml"))
--        scene_out->write_scene("/gauss_response_scene.xml");
--
--      //parameters of the output scene are the same as those of the input scene
--      boxm_scene<boct_tree<short,bool> > *valid_scene =
--      new boxm_scene<boct_tree<short,bool > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      valid_scene->set_paths(output_path, "valid_scene");
--      valid_scene->set_appearance_model(BOXM_BOOL);
--      if (!vul_file::exists(output_path + "/valid_scene.xml"))
--        valid_scene->write_scene("/valid_scene.xml");
--
--      if (functor_name == "gauss_convolution") {
--        bvpl_gauss_convolution_functor functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--
--        return true;
--      }
--      else if (functor_name == "positive_gauss_convolution") {
--        bvpl_positive_gauss_conv_functor functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--
--        return true;
--      }
--      else
--        return false;
--
--      break;
--    }
--    case BOXM_FLOAT:
--    {
--      typedef boct_tree<short, float > tree_type;
--      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--      //parameters of the output scene are the same as those of the input scene
--      boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      scene_out->set_paths(output_path, "response_scene");
--      scene_out->set_appearance_model(BOXM_FLOAT);
--      if (!vul_file::exists(output_path + "/float_response_scene.xml"))
--        scene_out->write_scene("/float_response_scene.xml");
--
--      boxm_scene<boct_tree<short,bool> > *valid_scene =
--      new boxm_scene<boct_tree<short,bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      valid_scene->set_paths(output_path, "valid_scene");
--      valid_scene->set_appearance_model(BOXM_BOOL);
--      if (!vul_file::exists(output_path + "/valid_scene.xml"))
--        valid_scene->write_scene("/valid_scene.xml");
--
--      if (functor_name == "edge_algebraic_mean")
--      {
--        bvpl_edge_algebraic_mean_functor<float> functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--        return true;
--      }
--      else if (functor_name == "algebraic")
--      {
--        bvpl_algebraic_functor functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--        return true;
--      }
--      else
--        return false;
--
--      break;
--    }
--    default:
--      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
--      return false;
--  }
--  return false;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
-deleted file mode 100644
-index 126deb3ac8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
-+++ /dev/null
-@@ -1,86 +0,0 @@
--//:
--// \file
--// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
--// \author Isabel Restrepo
--// \date 13-Oct-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--#include <boxm/boxm_scene.h>
--
--//: global variables
--namespace bvpl_compute_gauss_gradients_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_compute_gauss_gradients_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_gauss_gradients_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";  //input scene
--  input_types_[1] = "vcl_string";            //output path
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";  //output scene
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_compute_gauss_gradients(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_gauss_gradients_globals;
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  //Create the factory and get the vector of kernels
--  bvpl_gauss3d_x_kernel_factory factory(1.0f,1.0f,1.0f);
--  bvpl_create_directions_xyz dir;
--  bvpl_kernel_vector_sptr kernels = factory.create_kernel_vector(dir);
--
--  //get scene
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
--
--  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
--  {
--    boxm_scene<grad_tree_type> *scene_out =
--    new boxm_scene<grad_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "float_gradient_scene");
--    scene_out->set_appearance_model(VNL_FLOAT_3);
--    scene_out->write_scene("float_gradient_scene.xml");
--
--    bvpl_algebraic_functor functor;
--    bvpl_scene_vector_operator vector_oper;
--    vector_oper.operate(*scene_in, functor, kernels, *scene_out);
--    //store output
--    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--    scene_ptr = scene_out;
--    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--    bsta_histogram<float> magnitude_hist;
--    bvpl_compute_scene_statistics(scene_out, magnitude_hist);
--    std::cout << "Histogram:\n" << magnitude_hist << std::endl;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
-deleted file mode 100644
-index e175191e55..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
-+++ /dev/null
-@@ -1,88 +0,0 @@
--//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
--#include <iostream>
--#include <string>
--#include <boxm/boxm_scene_base.h>
--//:
--// \file
--// \brief A process loading xml parameters of a boxm_scene of types specific to bvpl_octree
--//
--// \author Isabel Restrepo
--// \date Nov 15, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--//:global variables
--namespace bvpl_create_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//:sets input and output types
--bool bvpl_create_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_create_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:creates a scene from parameters
--bool bvpl_create_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_create_scene_process_globals;
--  std::string fname = pro.get_input<std::string>(0);
--
--  boxm_scene_parser parser;
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--  scene_ptr->load_scene(fname, parser);
--  if (scene_ptr->appearence_model() == BVPL_SAMPLE_FLOAT) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bvpl_octree_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BVPL_SAMPLE_BSTA_GAUSS_F1) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else {
--    std::cerr << "bvpl_create_scene_process: undefined datatype\n";
--    return false;
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
-deleted file mode 100644
-index 39195ec048..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
-+++ /dev/null
-@@ -1,136 +0,0 @@
--//:
--// \file
--// \brief A process to save a gradient scene to a flat binary file
--// \author Isabel Restrepo
--// \date 3-Aug-2011
--
--#include <iostream>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <vnl/vnl_vector_fixed.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//:global variables
--namespace bvpl_grad_scene_to_bin_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_grad_scene_to_bin_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_grad_scene_to_bin_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "boxm_scene_base_sptr";  //alpha scene
--  input_types_[i++] = "boxm_scene_base_sptr";  //gradient scene
--  input_types_[i++] = "vcl_string";            //output binary file
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_grad_scene_to_bin_process(bprb_func_process& pro)
--{
--  using namespace bvpl_grad_scene_to_bin_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr alpha_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr grad_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string output_file = pro.get_input<std::string>(i++);
--
--  //get scene
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
--
--  std::ofstream os(output_file.c_str(), std::ios::out);
--
--  if (auto *alpha_scene = dynamic_cast<boxm_scene< float_tree_type >* >(alpha_scene_base.as_pointer()))
--  {
--    if (auto *grad_scene = dynamic_cast<boxm_scene< grad_tree_type >* >(grad_scene_base.as_pointer()))
--    {
--      double cell_length = alpha_scene->finest_cell_length();
--      short finest_level = alpha_scene->finest_level();
--
--      bool read_only = true;
--
--      boxm_cell_iterator<float_tree_type > alpha_iter = alpha_scene->cell_iterator(&boxm_scene<float_tree_type >::load_block_and_neighbors, read_only);
--      alpha_iter.begin();
--
--      boxm_cell_iterator<grad_tree_type > grad_iter = grad_scene->cell_iterator(&boxm_scene<grad_tree_type >::load_block, read_only);
--      grad_iter.begin();
--
--      long unsigned n_grads = 0;
--
--      while ( !(alpha_iter.end() || grad_iter.end()) )
--      {
--        boct_tree_cell<short, float> *alpha_cell = *alpha_iter;
--        boct_tree_cell<short, vnl_vector_fixed< float,3 > > *grad_cell = *grad_iter;
--
--        boct_loc_code<short> grad_code = grad_cell->get_code();
--        boct_loc_code<short> alpha_code = alpha_cell->get_code();
--
--        //if level and location code of cells isn't the same then continue
--        if ((alpha_cell->level() != grad_cell->level()) || !(alpha_code.isequal(&grad_code))) {
--          std::cerr << " Input and output cells don't have the same structure\n";
--          ++alpha_iter;
--          ++grad_iter;
--          continue;
--        }
--
--        //we are only interested in finest resolution
--        if ((!(alpha_cell->level() == finest_level)) || !alpha_cell->is_leaf()) {
--          ++alpha_iter;
--          ++grad_iter;
--          continue;
--        }
--
--        vgl_point_3d<double> centroid = alpha_iter.global_centroid();
--        vnl_vector_fixed< float,3 > grad = grad_cell->data();
--        float p_x = 1.0f - (float)std::exp(- (alpha_cell->data() * cell_length ));
--#if 0
--        vsl_b_write(os, (float)centroid.x());
--        vsl_b_write(os, (float)centroid.y());
--        vsl_b_write(os, (float)centroid.z());
--        vsl_b_write(os, grad[0]);
--        vsl_b_write(os, grad[1]);
--        vsl_b_write(os, grad[2]);
--        vsl_b_write(os, p_x);
--#endif
--
--        os << (float)centroid.x() << ' '
--           << (float)centroid.y() << ' '
--           << (float)centroid.z() << ' '
--           << grad[0] << ' '
--           << grad[1] << ' '
--           << grad[2] << ' '
--           << p_x << '\n';
--
--        ++alpha_iter;
--        ++grad_iter;
--        n_grads++;
--      }
--
--      grad_scene->unload_active_blocks();
--      alpha_scene->unload_active_blocks();
--      os.close();
--      std::cout << "Wrote " << n_grads << " gradients\n";
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
-deleted file mode 100644
-index b53398692b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
-+++ /dev/null
-@@ -1,178 +0,0 @@
--//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for spreading the plane information of the cell to the neighbors
--// \author Gamze Tunali
--// \date   Mar 19, 2010
--//
--// \verbatim
--//  Modifications
--//
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--#include <bvpl/bvpl_neighb_operator.h>
--#include <bvpl/kernels/bvpl_kernel_iterator.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
--
--namespace bvpl_nonmax_supp_process_globals
--{
--  constexpr unsigned int n_inputs_ = 4;
--  constexpr unsigned int n_outputs_ = 1;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool bvpl_nonmax_supp_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_nonmax_supp_process_globals;
--
--  // process takes 4 inputs:
--  //input[0]: The scene
--  //input[1]: the scene path for the output scene
--  //input[2]: block prefix for the output scene
--  //input[3]: the filename for the new scene xml file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--
--  // process has 1 output:
--  // output[0]: the new scene with updated cell information
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool bvpl_nonmax_supp_process(bprb_func_process& pro)
--{
--  using namespace bvpl_nonmax_supp_process_globals;
--
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string scene_path = pro.get_input<std::string>(1);
--  std::string block_prefix = pro.get_input<std::string>(2);
--  std::string scene_filename = pro.get_input<std::string>(3);
--  boxm_scene_base_sptr output_scene_sptr;
--
--  // only applies to the edge_line type of scenes
--  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
--    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--    typedef boct_tree_cell<short,boxm_inf_line_sample<float> > cell_type;
--    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--       return false;
--    }
--
--    auto *output_scene=new boxm_scene<tree_type>(*scene);
--    output_scene->set_paths(scene_path, block_prefix);
--    output_scene_sptr = output_scene;
--
--    // create a kernel for 3x3 neighborhood
--    bvpl_kernel_iterator k_iter;
--    vgl_point_3d<int> min_pt(-1,-1,-1);
--    vgl_point_3d<int> max_pt(1,1,1);
--    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
--      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
--        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
--          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
--        }
--      }
--    }
--    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
--
--    boxm_block_iterator<tree_type> iter(scene);
--    boxm_block_iterator<tree_type> output_iter(output_scene);
--    iter.begin();
--    output_iter.begin();
--
--    while (!iter.end())
--    {
--      scene->load_block(iter.index());
--      output_scene->load_block(iter.index());
--      boxm_block<tree_type>* block = *iter;
--      boxm_block<tree_type>* output_block = *output_iter;
--
--      tree_type* tree = block->get_tree();
--      std::vector<cell_type *> cells = tree->leaf_cells();
--
--      tree_type* output_tree=tree->clone();
--      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
--
--      bvpl_octree_neighbors<boxm_inf_line_sample<float> > oper(tree);
--      for (unsigned i=0; i<cells.size(); i++) {
--        cell_type *cell=cells[i];
--        cell_type *output_cell=output_cells[i];
--        std::vector<cell_type *> neighb_cells;
--        oper.neighbors(kernel, cells[i], neighb_cells);
--
--        float residual = cell->data().residual_;
--
--        bool min=true;
--        for (unsigned n=0; n<neighb_cells.size()&& min; n++) {
--          cell_type *neighbor = neighb_cells[n];
--          boct_loc_code<short> cell_code=cell->code_;
--          boct_loc_code<short> n_code = neighbor->code_;
--          bool itself = n_code.isequal(&cell_code);
--          // do not include itself in the list
--          if (!itself) {
--            float r = neighbor->data().residual_;
--            if ( r < residual)
--              min=false;
--          }
--
--          if (min) {
--            boxm_inf_line_sample<float> data = cell->data();
--            output_cell->set_data(data);
--          }
--        }
--      }
--      output_block->delete_tree();
--      output_block->set_tree(output_tree);
--      output_scene->write_active_block();
--      iter++;
--    }
--    output_scene->write_scene(scene_filename);
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
-deleted file mode 100644
-index 2c503cdbf2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
-+++ /dev/null
-@@ -1,209 +0,0 @@
--//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <set>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for spreading the plane information of the cell to the neighbors
--// \author Gamze Tunali
--// \date   Mar 19, 2010
--//
--// \verbatim
--//  Modifications
--//
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--
--#include <bvpl/bvpl_neighb_operator.h>
--#include <bvpl/kernels/bvpl_kernel_iterator.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
--
--struct ltstr
--{
--  bool operator()(const boxm_plane_obs<float> & p1, const boxm_plane_obs<float> & p2) const
--  {
--      if(p1.plane_.a()<p2.plane_.a())
--          return true;
--      else if(p1.plane_.a()>p2.plane_.a())
--          return false;
--      else
--      {
--          if(p1.plane_.b()<p2.plane_.b())
--              return true;
--          else if(p1.plane_.b()>p2.plane_.b())
--              return false;
--          else
--          {
--              if(p1.plane_.c()<p2.plane_.c())
--                  return true;
--              else if(p1.plane_.c()>p2.plane_.c())
--                  return false;
--              else
--              {
--                  if(p1.plane_.d()<p2.plane_.d())
--                      return true;
--                  else
--                      return false;
--              }
--          }
--      }
--  }
--};
--
--namespace bvpl_plane_propagate_process_globals
--{
--  constexpr unsigned int n_inputs_ = 4;
--  constexpr unsigned int n_outputs_ = 1;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool bvpl_plane_propagate_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_plane_propagate_process_globals;
--
--  // process takes 4 inputs:
--  //input[0]: The scene
--  //input[1]: the scene path for the output scene
--  //input[2]: block prefix for the output scene
--  //input[3]: the filename for the new scene xml file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--
--  // process has 1 output:
--  // output[0]: the new scene with updated cell information
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool bvpl_plane_propagate_process(bprb_func_process& pro)
--{
--  using namespace bvpl_plane_propagate_process_globals;
--
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string scene_path = pro.get_input<std::string>(1);
--  std::string block_prefix = pro.get_input<std::string>(2);
--  std::string scene_filename = pro.get_input<std::string>(3);
--  boxm_scene_base_sptr output_scene_sptr;
--  // only applies to the edge_line type of scenes
--  if (scene_base->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
--    typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
--    typedef boct_tree_cell<short,boxm_edge_tangent_sample<float> > cell_type;
--    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--       return false;
--    }
--
--    auto *output_scene=new boxm_scene<tree_type>(*scene);
--    output_scene->set_paths(scene_path, block_prefix);
--    output_scene_sptr = output_scene;
--    // create a kernel for 3x3 neighborhood
--    bvpl_kernel_iterator k_iter;
--    vgl_point_3d<int> min_pt(-1,-1,-1);
--    vgl_point_3d<int> max_pt(1,1,1);
--    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
--      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
--        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
--          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
--        }
--      }
--    }
--    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
--
--    boxm_block_iterator<tree_type> iter(scene);
--    boxm_block_iterator<tree_type> output_iter(output_scene);
--    iter.begin();
--    output_iter.begin();
--
--    while (!iter.end())
--    {
--      scene->load_block(iter.index());
--      output_scene->load_block(iter.index());
--      boxm_block<tree_type>* block = *iter;
--      boxm_block<tree_type>* output_block = *output_iter;
--
--      tree_type* tree = block->get_tree();
--      std::vector<cell_type *> cells = tree->leaf_cells();
--
--      tree_type* output_tree=tree->clone();
--      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
--
--      bvpl_octree_neighbors<boxm_edge_tangent_sample<float> > oper(tree);
--      for (unsigned i=0; i<cells.size(); i++) {
--        cell_type *cell=cells[i];
--        cell_type *output_cell=output_cells[i];
--        std::vector<cell_type *> neighb_cells;
--        oper.neighbors(kernel, cells[i], neighb_cells);
--        std::set<boxm_plane_obs<float>,ltstr> planes;
--
--        for (auto neighbor : neighb_cells) {
--          boct_loc_code<short> cell_code=cell->code_;
--          boct_loc_code<short> n_code = neighbor->code_;
--          bool itself = n_code.isequal(&cell_code);
--         if (!itself) {
--             std::vector<boxm_plane_obs<float> > observations = neighbor->data().obs_list();
--             boxm_edge_tangent_sample<float> data=output_cell->data();
--             data.insert(observations);
--             output_cell->set_data(data);
--            }
--        }
--      }
--      //  std::set<boxm_plane_obs<float>,ltstr >::iterator iter1=planes.begin();
--      //  boxm_edge_tangent_sample<float> data;
--      //  for(;iter1!=planes.end();iter1++)
--      //  {
--      //      data.insert(*iter1);
--      //  }
--      //  output_cell->set_data(data);
--      //}
--      output_block->delete_tree();
--      output_block->set_tree(output_tree);
--      output_scene->write_active_block();
--      iter++;
--    }
--    output_scene->write_scene(scene_filename);
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
-deleted file mode 100644
-index 5adb8cc4ec..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
-+++ /dev/null
-@@ -1,89 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief process saves a boxm_scene of kernel responses to a vrml file
--//
--// \author Isabel Restrepo
--// \date December 10, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace bvpl_save_vrml_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: process takes 3 inputs and has no outputs.
--// input[0]: The scene
--// input[1]: The vector of kernels
--// input[2]: Path to output vrml file
--// No outputs
--
--bool bvpl_save_vrml_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_save_vrml_process_globals;
--
--  //process takes 3 inputs but has no outputs
--  std::vector<std::string> output_types_(n_outputs_);
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "bvpl_kernel_vector_sptr";
--  input_types_[2] = "vcl_string";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_save_vrml_process(bprb_func_process& pro)
--{
--  using namespace bvpl_save_vrml_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  bvpl_kernel_vector_sptr kernel_vector = pro.get_input<bvpl_kernel_vector_sptr>(1);
--  std::string vrml_path = pro.get_input<std::string>(2);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  std::ofstream ofs(vrml_path.c_str());
--
--  if (auto *scene_in =
--      dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >* > (scene_base.as_pointer()))
--  {
--    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
--  }
--  else if (auto *scene_in =
--           dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > >* >(scene_base.as_pointer()))
--  {
--    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
--  }
--  else {
--    std::cerr << "In bvpl_save_vrml_process: Unsupported scene type\n";
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
-deleted file mode 100644
-index f3d93180ba..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
-+++ /dev/null
-@@ -1,66 +0,0 @@
--//:
--// \file
--// \brief Process to explore the histogram of a scene
--// \author Isabel Restrepo
--// \date 18-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--//:global variables
--namespace bvpl_scene_histogram_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_scene_histogram_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_histogram_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_scene_histogram_process(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_histogram_process_globals;
--
--  //get inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  if (!scene_base){
--    std::cerr << "Null scene\n";
--    return false;
--  }
--
--  switch (scene_base->appearence_model())
--  {
--    case BOXM_FLOAT:
--    {
--      typedef boct_tree<short, float > tree_type;
--      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--      bsta_histogram<float> hist;
--      bvpl_compute_scene_statistics(scene_in, hist);
--      hist.pretty_print();
--      break;
--    }
--    default:
--      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
--      return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
-deleted file mode 100644
-index 9d7c20ba2c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
-+++ /dev/null
-@@ -1,179 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for running a kernel to a boxm_scene
--// \author Isabel Restrepo
--// \date January 29, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
--#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
--#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--
--namespace bvpl_scene_kernel_operator_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 5 inputs and has 1 output.
--// * input[0]: The boxm_scene
--// * input[1]: The kernel
--// * input[2]: The grid type:
--//           - float
--//           - opinion
--//           - ...
--// * input[3]: String identifying functor type
--// * input[4]: Output path to a dir where to store, id octree and response octree
--//
--// * output[0]: Output scene with response and kernel id
--
--bool bvpl_scene_kernel_operator_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_kernel_operator_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "bvpl_kernel_sptr";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_scene_kernel_operator_process(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_kernel_operator_process_globals;
--
--  if (pro.n_inputs() < n_inputs_)
--  {
--    std::cerr << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << '\n';
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
--  std::string datatype = pro.get_input<std::string>(i++);
--  std::string functor_name = pro.get_input<std::string>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--  //short level = 0;
--
--  //print inputs
--  std::cout << "In bvpl_scene_kernel_operator:\n"
--           << "Datatype:     " << datatype << std::endl
--           << "Functor Name: " << functor_name << std::endl;
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cerr <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if ( !kernel ) {
--    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--
--  if (datatype == "bsta_gauss_f1")
--  {
--    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--    typedef boct_tree<short, gauss_type > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--    double finest_cell_length = scene_in->finest_cell_length();
--    kernel->set_voxel_length(finest_cell_length);
--
--    //parameters of the output scene are the same as those of the input scene
--    boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "gauss_response_scene");
--    scene_out->set_appearance_model(BSTA_GAUSS_F1);
--    scene_out->write_scene("/gauss_response_scene.xml");
--
--    if (functor_name == "gauss_convolution") {
--      bvpl_gauss_convolution_functor functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--      return true;
--    }
--    else if (functor_name == "positive_gauss_convolution") {
--      bvpl_positive_gauss_conv_functor functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--      //clean memory
--      scene_in->unload_active_blocks();
--      scene_out->unload_active_blocks();
--
--      return true;
--    }
--      return false;
--  }
--  else if (datatype == "float")
--  {
--    typedef boct_tree<short, float > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--    double finest_cell_length = scene_in->finest_cell_length();
--    kernel->set_voxel_length(finest_cell_length);
--    //parameters of the output scene are the same as those of the input scene
--    boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "response_scene");
--    scene_out->set_appearance_model(BOXM_FLOAT);
--    scene_out->write_scene("/float_response_scene.xml");
--
--    if (functor_name == "edge_algebraic_mean") {
--      bvpl_edge_algebraic_mean_functor<float> functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--      return true;
--    }
--    else if (functor_name == "algebraic") {
--      bvpl_algebraic_functor functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--      return true;
--    }
--    else
--      return false;
--  }
--  else
--    return false;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
-deleted file mode 100644
-index 74762468c1..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
-+++ /dev/null
-@@ -1,151 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for successively running a kernel(of a vector), applying non-max suppression and combining with previous result
--// \author Isabel Restrepo
--// \date December 2, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel_factory.h>
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--
--namespace bvpl_scene_vector_operator_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 6 inputs and has 1 output.
--// * input[0]: The boxm_scene
--// * input[1]: The kernels; bvpl_kernel_vector_sptr
--// * input[2]: The grid type:
--//           - float
--//           - opinion
--//           - ...
--// * input[3]: String identifying octree_vector_operator (e.g. max)
--// * input[4]: String identifying functor type
--// * input[5]: Output path to a dir where to store, id octree and response octree
--//
--// * output[0]: Output scene with response and kernel id
--
--
--bool bvpl_scene_vector_operator_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_vector_operator_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "bvpl_kernel_vector_sptr";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "vcl_string";
--  input_types_[5] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_scene_vector_operator_process(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_vector_operator_process_globals;
--
--  if (pro.n_inputs() < n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_kernel_vector_sptr kernel_vec = pro.get_input<bvpl_kernel_vector_sptr>(i++);
--  std::string datatype = pro.get_input<std::string>(i++);
--  std::string operator_name = pro.get_input<std::string>(i++);
--  std::string functor_name = pro.get_input<std::string>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if ( !kernel_vec ) {
--    std::cout << pro.name() << " :-- Kernel is not valid!\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--
--  if (datatype == "float")
--  {
--    typedef boct_tree<short, float > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--    //parameters of the output scene are the same as thos of the input scene
--    boxm_scene<boct_tree<short, bvpl_octree_sample<float> > > *scene_out =
--    new boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
--    scene_out->set_paths(output_path, "response_scene");
--    scene_out->set_appearance_model(BVPL_SAMPLE_FLOAT);
--    scene_out->write_scene("/response_scene.xml");
--    if (operator_name == "max_vector_operator")
--    {
--      bvpl_max_vector_operator<float> max_oper;
--
--      if (functor_name == "edge_geometric_mean") {
--        bvpl_edge_geometric_mean_functor<float> functor;
--        bvpl_scene_vector_operator scene_oper;
--        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
--        scene_ptr = scene_out;
--        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--        return true;
--      }
--    }
--  }
--  if (datatype == "bsta_gauss_f1")
--  {
--    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--    typedef boct_tree<short, gauss_type > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--    //parameters of the output scene are the same as thos of the input scene
--    boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > > *scene_out =
--    new boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
--    scene_out->set_paths(output_path, "response_scene");
--    scene_out->set_appearance_model(BVPL_SAMPLE_BSTA_GAUSS_F1);
--    scene_out->write_scene("/response_scene.xml");
--    if (operator_name == "max_vector_operator")
--    {
--      bvpl_max_vector_operator<gauss_type> max_oper;
--
--      if (functor_name == "gauss_convolution") {
--        bvpl_gauss_convolution_functor functor;
--        bvpl_scene_vector_operator scene_oper;
--        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
--        scene_ptr = scene_out;
--        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--        return true;
--      }
--    }
--    return false;
--  }
--  else
--    return false;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
-deleted file mode 100644
-index 93af3679c8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
-+++ /dev/null
-@@ -1,64 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (beaudet)
--// \author Isabel Restrepo
--// \date 27-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_compute_beaudet_measure_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_beaudet_measure_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_beaudet_measure_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_beaudet_measure_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_beaudet_measure_process_globals;
--
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->compute_beaudet_corners(global_taylor, scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
-deleted file mode 100644
-index 94d872196d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
-+++ /dev/null
-@@ -1,65 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (Harris)
--// \author Isabel Restrepo
--// \date 20-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_compute_harris_measure_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_harris_measure_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_harris_measure_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_harris_measure_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_harris_measure_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->compute_laptev_corners(global_taylor, scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
-deleted file mode 100644
-index 16f6bd1cd0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
-+++ /dev/null
-@@ -1,57 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (Harris)
--// \author Isabel Restrepo
--// \date 20-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_corner_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_corner_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_corner_statistics_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_corner_statistics_process(bprb_func_process& pro)
--{
--  using namespace bvpl_corner_statistics_process_globals;
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->explore_corner_statistics(global_taylor, scene_id);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
-deleted file mode 100644
-index 9c003728ca..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl_octree/bvpl_global_corners.h>
--
--//: global variables
--namespace bvpl_load_global_corners_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_load_global_corners_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_corners_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_global_corners_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_load_global_corners_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_corners_process_globals;
--
--  // get inputs
--  std::string corners_file = pro.get_input<std::string>(0);
--  auto *global_corners = new bvpl_global_corners(corners_file);
--
--  // store output
--  pro.set_output_val<bvpl_global_corners_sptr>(0, global_corners);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
-deleted file mode 100644
-index af283e13ec..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (Harris)
--// \author Isabel Restrepo
--// \date 20-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_threshold_corners_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_threshold_corners_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_threshold_corners_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--  input_types_[i++] = "float"; //threshold
--  input_types_[i++] = "vcl_string"; //output path for thresholded scenes
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_threshold_corners_process(bprb_func_process& pro)
--{
--  using namespace bvpl_threshold_corners_process_globals;
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  auto corner_thresh = pro.get_input<float>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->threshold_laptev_corners(global_taylor, scene_id, corner_thresh, output_path);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
-deleted file mode 100644
-index c4eebb2560..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
-+++ /dev/null
-@@ -1,94 +0,0 @@
--//:
--// \file
--// \brief A process to add Taylor error at a percentage of voxels in a block
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_add_pca_errors_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_add_pca_errors_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_add_pca_errors_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
--  input_types_[i++] = "unsigned"; //dimension
--  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_add_pca_errors_process(bprb_func_process& pro)
--{
--  using namespace bvpl_add_pca_errors_process_globals;
--
--  //get inputs
--  unsigned i =0;
--  bvpl_pca_error_scenes_sptr error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
--  auto dim = pro.get_input<unsigned>(i++);
--  auto fraction_nsamples = pro.get_input<double>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!error_scenes) {
--    std::cerr << "Error in bvpl_add_pca_errors_process: Null error scene\n";
--    return false;
--  }
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scenes->get_scene(dim).as_pointer());
--  if (!error_scene) {
--    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--  //sum errors within block
--  double error = 0;
--  if (fraction_nsamples < 0.95)
--  {
--    auto scene_ncells = (double)error_scene->size();
--    error_scene->load_block(block_i,block_j,block_k);
--    auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
--    double nsamples = scene_ncells * fraction_nsamples;
--
--    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
--    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
--             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << '\n';
--    error = bvpl_average_value(error_scene,block_i, block_j, block_k, tree_nsamples);
--    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
--  }
--  else
--  {
--    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
--    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
--  }
--
--  //store output
--  pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
-deleted file mode 100644
-index f6fb2f5d0a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
-+++ /dev/null
-@@ -1,95 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 17-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_matrix_fixed.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_combine_pairwise_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_combine_pairwise_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_combine_pairwise_statistics_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i=0;
--  input_types_[i++] = "vcl_string" ; //stats_file1
--  input_types_[i++] = "vcl_string" ; //stats_file2
--  input_types_[i++] = "vcl_string" ; //stats_file_out
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_combine_pairwise_statistics_process(bprb_func_process& pro)
--{
--  using namespace bvpl_combine_pairwise_statistics_process_globals;
--
--  //get inputs
--  unsigned i= 0;
--  std::string stats_file1 = pro.get_input<std::string>(i++);
--  std::string stats_file2 = pro.get_input<std::string>(i++);
--  std::string stats_file_out = pro.get_input<std::string>(i++);
--
--  //load files
--  vnl_matrix_fixed<double, 125, 125> S1(0.0);
--  vnl_vector_fixed<double, 125> mean1(0.0);
--  unsigned long nfeatures1 =0;
--  {
--    std::ifstream stats_ifs(stats_file1.c_str());
--    if (!stats_ifs.is_open()) {
--      std::cerr << "Error: Failed to open file1\n";
--      return false;
--    }
--    stats_ifs >> nfeatures1 >> mean1 >> S1;
--    stats_ifs.close();
--
--  }
--
--  vnl_matrix_fixed<double, 125, 125> S2(0.0);
--  vnl_vector_fixed<double, 125> mean2(0.0);
--  unsigned long nfeatures2 =0;
--
--  {
--    std::ifstream stats_ifs(stats_file2.c_str());
--    if (!stats_ifs.is_open()) {
--      std::cerr << "Warning: Failed to open file2 - output file will be identical to file1\n";
--      std::ofstream stats_ofs(stats_file_out.c_str());
--      stats_ofs.precision(15);
--      stats_ofs << nfeatures1 << '\n' << mean1 << '\n' << S1;
--      return true;
--    }
--    stats_ifs >> nfeatures2 >> mean2 >> S2;
--    stats_ifs.close();
--  }
--
--  vnl_matrix_fixed<double, 125, 125> S_out(0.0);
--  vnl_vector_fixed<double, 125> mean_out(0.0);
--  double nfeatures_out =0.0;
--  bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
--
--  std::ofstream stats_ofs(stats_file_out.c_str());
--  stats_ofs.precision(15);
--  stats_ofs << nfeatures_out << '\n' << mean_out << '\n' << S_out;
--  stats_ofs.close();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
-deleted file mode 100644
-index e6acd1accd..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
-+++ /dev/null
-@@ -1,69 +0,0 @@
--//:
--// \file
--// \brief A process to compute reconstruction error over all samples in a scene (test + train)
--// \author Isabel Restrepo
--// \date 13-Jan-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--//:global variables
--namespace bvpl_compute_pca_error_block_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;        //directory path, where pca_info.xml is
--  constexpr unsigned n_outputs_ = 0;       //error file
--}
--
--
--//:sets input and output types
--bool bvpl_compute_pca_error_block_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_block_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_discover_pca_kernels_sptr" ;  //directory path
--  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
--  input_types_[i++] = "int";   //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "unsigned";  //num_components
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_pca_error_block_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_block_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_discover_pca_kernels_sptr pca_extractor = pro.get_input<bvpl_discover_pca_kernels_sptr>(i++);
--  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  auto num_components = pro.get_input<unsigned>(i++);
--
--  if (!pca_extractor)
--    return false;
--
--  if (!pca_error_scenes)
--    return false;
--
--  //bvpl_discover_pca_kernels pca_extractor(pca_dir);
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
--  pca_extractor->compute_testing_error(error_scene, num_components, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
-deleted file mode 100644
-index 70d9cf1a4b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
-+++ /dev/null
-@@ -1,132 +0,0 @@
--//:
--// \file
--// \brief A process to compute reconstruction error over all samples in a scene (test + train)
--// \author Isabel Restrepo
--// \date 13-Jan-2011
--
--#include <iostream>
--#include <cstdlib>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--#include <vul/vul_file.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--// global variables
--namespace bvpl_compute_pca_error_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;        //directory path, where pca_info.xml is
--  constexpr unsigned n_outputs_ = 0;       //error file
--}
--
--
--// sets input and output types
--bool bvpl_compute_pca_error_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string" ;  //directory path
--  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
--  input_types_[i++] = "unsigned";  //num_components
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--#if BVPL_OCTREE_HAS_PTHREADS
--// helper code to launch and manage pthreads
--namespace {
--  struct pthread_data
--  {
--    bvpl_discover_pca_kernels* pca_extractor;
--    boxm_scene<boct_tree<short,float> > * error_scene;
--    vgl_point_3d<int> block_idx;
--    unsigned num_components;
--  };
--
--  void* pthread_launcher(void *arg)
--  {
--    pthread_data *pd = reinterpret_cast<pthread_data*>(arg);
--    vgl_point_3d<int> block_idx = pd->block_idx;
--    pd->pca_extractor->compute_testing_error_thread_safe(pd->error_scene, pd->num_components, block_idx.x(), block_idx.y(), block_idx.z());
--    //delete pd;
--    return arg;
--  }
--}
--#endif
--
--// the process
--bool bvpl_compute_pca_error_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_scene_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  std::string pca_dir = pro.get_input<std::string>(i++);
--  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
--  auto num_components = pro.get_input<unsigned>(i++);
--
--  if (!vul_file::is_directory(pca_dir))
--    return false;
--
--  if (!pca_error_scenes)
--    return false;
--
--  auto *pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
--  vgl_vector_3d<unsigned int> num_blocks = pca_extractor->data_scene_dim();
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
--
--#if BVPL_OCTREE_HAS_PTHREADS
--  pca_extractor->load_all_scene_blocks();
--  error_scene->read_all_blocks();
--  unsigned num_threads = 0;
--  std::vector<vgl_point_3d<int> > block_indices;
--  for (unsigned block_i = 0; block_i < num_blocks.x(); ++block_i) {
--    for (unsigned block_j = 0; block_j < num_blocks.y(); ++block_j) {
--      for (unsigned block_k = 0; block_k < num_blocks.z(); ++block_k) {
--        block_indices.push_back(vgl_point_3d<int>(block_i,block_j,block_k));
--        ++num_threads;
--      }
--    }
--  }
--
--  pthread_t* thread_id = new pthread_t[num_threads]; // beware of memory leaks ...
--
--  for (unsigned i =0; i < num_threads; ++i)
--  {
--    pthread_data* pd = new pthread_data();
--    pd->pca_extractor = pca_extractor;
--    pd->error_scene = error_scene;
--    pd->num_components = num_components;
--    pd->block_idx= block_indices[i];
--    int rc = pthread_create(&thread_id[i], NULL, pthread_launcher, (void*) pd );
--    //pthread_detach(thread_id[i]);
--    if (rc)
--    {
--      std::cerr << "Error creating pthread, return code: "<<rc<<'\n';
--      std::exit(-1);
--    }
--  }
--#if 0
--  for (unsigned i =0; i < num_threads; ++i)
--  {
--    pca_extractor.compute_testing_error_thread_safe(error_scene, num_components, block_indices[i].x(), block_indices[i].y(), block_indices[i].z());
--  }
--  pca_extractor.unload_all_scene_blocks();
--#endif
--
--#endif // PTHREADS
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
-deleted file mode 100644
-index 775dc4cb23..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
-+++ /dev/null
-@@ -1,59 +0,0 @@
--//:
--// \file
--// \brief A process to compute reconstruction error over all samples in a scene (test + train)
--// \author Isabel Restrepo
--// \date 13-Jan-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--
--//:global variables
--namespace bvpl_compute_pca_test_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;        //directory path, where pca_info.xml is
--  constexpr unsigned n_outputs_ = 1;       //error file
--}
--
--
--//:sets input and output types
--bool bvpl_compute_pca_test_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_test_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string" ;
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "vcl_string";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_pca_test_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_test_error_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--
--  bvpl_discover_pca_kernels pca_extractor(pca_dir);
--
--  vnl_vector<double> t_error;
--  pca_extractor.compute_testing_error(t_error);
--  std::ofstream error_ofs((pca_dir+ "/test_error.txt").c_str());
--
--  if (error_ofs)
--    error_ofs << t_error;
--
--  //store output
--  pro.set_output_val<std::string>(0, pca_dir+ "/test_error.txt");
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
-deleted file mode 100644
-index e76b7b5d98..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
-+++ /dev/null
-@@ -1,98 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 17-Nov-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--//:global variables
--namespace bvpl_discover_pca_features_process_globals
--{
--  constexpr unsigned n_inputs_ = 9;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_discover_pca_features_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_discover_pca_features_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "vcl_string";   //directory to save PCA matrices
--  input_types_[i++] = "double";   //fraction of the total number of leaves
--  input_types_[i++] = "int";    // min and max of kernel
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--
--  return pro.set_input_types(input_types_);
--}
--
--
--//:the process
--bool bvpl_discover_pca_features_process(bprb_func_process& pro)
--{
--  using namespace bvpl_discover_pca_features_process_globals;
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs
--  unsigned i =0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string pca_dir = pro.get_input<std::string>(i++);
--  auto frac = pro.get_input<double>(i++);
--  int min_x = pro.get_input<int>(i++);
--  int min_y = pro.get_input<int>(i++);
--  int min_z = pro.get_input<int>(i++);
--  int max_x = pro.get_input<int>(i++);
--  int max_y = pro.get_input<int>(i++);
--  int max_z = pro.get_input<int>(i++);
--
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Base Scene is not valid!\n";
--    return false;
--  }
--
--  //neighborhood box for volume "patches" 5x5x5 for now - this could be an input to the process
--  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
--
--  //cast scene
--  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > >* > (scene_base.as_pointer());
--  if (!scene) {
--    std::cout <<  " :-- Input Scene is not of supported type\n";
--    return false;
--  }
--  std::cout << "Scene path: " << scene->filename()<< std::endl;;
--
--
--  //number of samples - 10% of total number of leaf-cells
--  auto nsamples = (unsigned long)((double)scene->size() * frac);
--  std::cout << "Number of samples: " << nsamples << std::endl;
--
--  //bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene);
--  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, pca_dir);
--
--  //write matrices to disk
--  pca_extractor.xml_write();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
-deleted file mode 100644
-index 365a0eb791..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
-+++ /dev/null
-@@ -1,64 +0,0 @@
--//:
--// \file
--// \brief A process that performs PCA analysis given the statistics collected from various scenes using bvpl_pca_global
--// \author Isabel Restrepo
--// \date 23-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_global_pca_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_global_pca_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_global_pca_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";   //path pca_global_info file
--  input_types_[1] = "vcl_string";   //path to statistics file
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_global_pca_process(bprb_func_process& pro)
--{
--  using namespace bvpl_global_pca_process_globals;
--
--  //get inputs
--  std::string pca_file = pro.get_input<std::string>(0);
--  std::string stats_file = pro.get_input<std::string>(1);
--
--  //load file into matrices
--  vnl_matrix_fixed<double, 125, 125> S(0.0);
--  vnl_vector_fixed<double, 125> mean(0.0);
--  unsigned long nfeatures =0;
--  {
--    std::ifstream stats_ifs(stats_file.c_str());
--    if (!stats_ifs.is_open()) {
--      std::cerr << "Error: Failed to open stats file\n";
--      return false;
--    }
--    stats_ifs >> nfeatures >> mean >> S;
--  }
--
--  bvpl_global_pca<125> global_pca(pca_file);
--
--  global_pca.set_up_pca_evd(S,mean,nfeatures);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
-deleted file mode 100644
-index 10e35faddb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \brief A process to init auxiliary scenes and other variables
--// \author Isabel Restrepo
--// \date 23-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_init_global_pca_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_init_global_pca_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_pca_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; // path to pca_global_info file
--  input_types_[1] = "unsigned"; //id of the scene to initialize
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_init_global_pca_process(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_pca_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--  auto scene_id = pro.get_input<unsigned>(1);
--
--  bvpl_global_pca<125> global_pca(pca_dir);
--  global_pca.init(scene_id);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
-deleted file mode 100644
-index 8b2070e215..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 15-May-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl_octree/bvpl_global_pca.h>
--
--//: global variables
--namespace bvpl_load_global_pca_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_load_global_pca_125_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_pca_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_global_pca_125_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_load_global_pca_125_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_pca_process_globals;
--
--  // get inputs
--  std::string pca_file = pro.get_input<std::string>(0);
--  auto *global_pca = new bvpl_global_pca<125>(pca_file);
--
--  // store output
--  pro.set_output_val<bvpl_global_pca_125_sptr>(0, global_pca);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
-deleted file mode 100644
-index 39161edf02..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
-+++ /dev/null
-@@ -1,58 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 21-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--//:global variables
--namespace bvpl_load_pca_error_scenes_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_pca_error_scenes_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_error_scenes_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "boxm_scene_base_sptr";  //data scene
--  input_types_[i++] = "vcl_string";   //pca path
--  input_types_[i++] = "unsigned";   //dimension pca feture
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_pca_error_scenes_sptr" ;
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_pca_error_scenes_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_error_scenes_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string pca_path = pro.get_input<std::string>(i++);
--  auto feature_dim = pro.get_input<unsigned>(i++);
--
--  if (!data_scene_base)
--    return false;
--
--  bvpl_pca_error_scenes *error_scenes = new bvpl_pca_error_scenes(data_scene_base, pca_path, feature_dim);
--  //store output
--  pro.set_output_val<bvpl_pca_error_scenes_sptr>(0, error_scenes);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
-deleted file mode 100644
-index 48082ecb75..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
-+++ /dev/null
-@@ -1,55 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 3-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vul/vul_file.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--//:global variables
--namespace bvpl_load_pca_info_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_pca_info_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_info_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string" ;  //directory path
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_discover_pca_kernels_sptr";  //pca info
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_pca_info_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_info_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--
--  if (!vul_file::is_directory(pca_dir))
--    return false;
--
--  bvpl_discover_pca_kernels_sptr pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
--
--  //store output
--  pro.set_output_val<bvpl_discover_pca_kernels_sptr>(0, pca_extractor);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
-deleted file mode 100644
-index fb29aeaa8c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 4-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--#include <vul/vul_file.h>
--
--//:global variables
--namespace bvpl_normalize_pca_training_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;  //directory path
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_normalize_pca_training_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_normalize_pca_training_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_normalize_pca_training_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_normalize_pca_training_error_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--
--  if (!vul_file::is_directory(pca_dir)){
--    std::cerr << " Invalid pca directory\n";
--    return false;
--  }
--
--
--  bvpl_discover_pca_kernels pca_extractor(pca_dir);
--
--  vnl_vector<double> error;
--  pca_extractor.compute_normalized_training_error(error);
--
--  std::ofstream ofs((pca_dir + "/normalized_training_error.txt").c_str());
--  ofs.precision(15);
--  ofs << error;
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
-deleted file mode 100644
-index 40149c3411..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
-+++ /dev/null
-@@ -1,77 +0,0 @@
--//:
--// \file
--// \brief A process to compute pca projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--//:global variables
--namespace bvpl_pca_global_add_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_global_add_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_add_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_global_add_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_add_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_pca)
--  {
--    std::cerr << "Global PCA is NULL\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr error_scene_base = global_pca->load_error_scene(scene_id);
--  if (!error_scene_base) {
--    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--
--  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
--  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
--
--  //store output
--    pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
-deleted file mode 100644
-index 0e127a6a1c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
-+++ /dev/null
-@@ -1,63 +0,0 @@
--//:
--// \file
--// \brief A process to compute pca projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_pca_global_proj_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_global_proj_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_proj_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_global_proj_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_proj_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_pca)
--  {
--    std::cerr << "Global PCA is NULL\n";
--    return false;
--  }
--
--  global_pca->projection_error(scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
-deleted file mode 100644
-index fc2e46ff3e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
-+++ /dev/null
-@@ -1,75 +0,0 @@
--//:
--// \file
--// \brief  A process that computes pca statistics (scatter matrix and mean) on a per block basis
--// \author Isabel Restrepo
--// \date 14-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_pca_global_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_global_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_statistics_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene_id (this can be confirmed in xml file pca_info.xml)
--  input_types_[i++] = "int";   //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "vcl_string"; //path to file to hold statistics of this block
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_global_statistics_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_statistics_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  std::string stats_file = pro.get_input<std::string>(i++);
--
--  if(!global_pca)
--  {
--    std::cerr << "Global PCA is NULL \n";
--    return false;
--  }
--  vnl_matrix_fixed<double, 125, 125> S(0.0);
--  vnl_vector_fixed<double, 125> mean(0.0);
--  unsigned long nfeatures = 0;
--
--
--  if(global_pca->sample_statistics(scene_id, block_i, block_j, block_k, S, mean, nfeatures))
--  {
--    std::ofstream stats_ofs(stats_file.c_str());
--    stats_ofs.precision(15);
--    stats_ofs << nfeatures << '\n' << mean << '\n' << S;
--    stats_ofs.close();
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
-deleted file mode 100644
-index 341a8e76ac..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
-+++ /dev/null
-@@ -1,63 +0,0 @@
--//:
--// \file
--// \brief A process to compute pca projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_pca_project_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_project_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_project_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_project_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_project_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_pca)
--  {
--    std::cerr << "Global PCA is NULL\n";
--    return false;
--  }
--
--  global_pca->project(scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
-deleted file mode 100644
-index 3f4d2adf17..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
-+++ /dev/null
-@@ -1,70 +0,0 @@
--//:
--// \file
--// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
--// \author Isabel Restrepo
--// \date 13-Oct-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
--
--
--#include <boxm/boxm_scene.h>
--
--//: global variables
--namespace bvpl_compute_sf_raw_response_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//: sets input and output types
--bool bvpl_compute_sf_raw_response_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_sf_raw_response_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";  //input/response scene
--  input_types_[i++] = "boxm_scene_base_sptr";  //valid scene
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_compute_sf_raw_response_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_sf_raw_response_process_globals;
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr valid_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  //get scene
--  typedef boct_tree<short, vnl_vector_fixed< float,10 > > response_tree_type;
--  typedef boct_tree<short, bool > valid_tree_type;
--
--
--  if (auto *scene_in = dynamic_cast<boxm_scene< response_tree_type >* >(scene_base.as_pointer()))
--  {
--    double cell_length = scene_in->finest_cell_length();
--
--    if (auto *valid_scene = dynamic_cast<boxm_scene< valid_tree_type >* >(valid_scene_base.as_pointer()))
--    {
--      bvpl_gauss3D_steerable_filters sf;
--      sf.basis_response_at_leaves(scene_in,valid_scene, cell_length);
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
-deleted file mode 100644
-index 3ceffbbc47..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
-+++ /dev/null
-@@ -1,87 +0,0 @@
--//:
--// \file
--// \brief A process to initialize the response scene for steerable filter bank
--// \author Isabel Restrepo
--// \date 22-Aug-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--#include <boxm/boxm_scene.h>
--
--//: global variables
--namespace bvpl_init_sf_response_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--
--//: sets input and output types
--bool bvpl_init_sf_response_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_init_sf_response_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";  //input scene
--  input_types_[1] = "vcl_string";            //output path
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";  //response scene
--  output_types_[1] = "boxm_scene_base_sptr";  //valid scene
--
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_init_sf_response_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_init_sf_response_scene_process_globals;
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  //get scene
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
--
--  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
--  {
--    boxm_scene<out_tree_type> *scene_out =
--    new boxm_scene<out_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "steerable_gauss_3d_scene");
--    scene_out->set_appearance_model(VNL_FLOAT_10);
--    scene_out->write_scene("steerable_gauss_3d_scene.xml");
--    scene_in->clone_blocks_to_vector<10>(*scene_out);
--
--    boxm_scene<boct_tree<short, bool> > *valid_scene =
--    new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    valid_scene->set_paths(output_path, "valid_scene");
--    valid_scene->set_appearance_model(BOXM_BOOL);
--    valid_scene->write_scene("valid_scene.xml");
--
--
--    //store output
--    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--    scene_ptr = scene_out;
--    boxm_scene_base_sptr valid_scene_ptr=new boxm_scene_base();
--    valid_scene_ptr = valid_scene;
--    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--    pro.set_output_val<boxm_scene_base_sptr>(1, valid_scene_ptr);
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
-deleted file mode 100644
-index c1b1c309c0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
-+++ /dev/null
-@@ -1,90 +0,0 @@
--//:
--// \file
--// \brief A process to add Taylor error at a percentage of voxels in a block
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_add_taylor_errors_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_add_taylor_errors_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_add_taylor_errors_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_add_taylor_errors_process(bprb_func_process& pro)
--{
--  using namespace bvpl_add_taylor_errors_process_globals;
--
--  //get inputs
--  unsigned i =0;
--  boxm_scene_base_sptr error_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto fraction_nsamples = pro.get_input<double>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!error_scene_base) {
--    std::cerr << "Error in bvpl_add_taylor_errors_process: Null error scene\n";
--    return false;
--  }
--  auto* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scene_base.as_pointer());
--  if (!error_scene) {
--    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--  //sum errors within block
--  auto scene_ncells = (double)error_scene->size();
--  error_scene->load_block(block_i,block_j,block_k);
--  auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
--  double nsamples = scene_ncells * fraction_nsamples;
--
--  //number of samples - 10% of total number of leaf-cells
--  double error = 0.0;
--  if (fraction_nsamples < 0.95) {
--    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
--    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
--             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
--    error = bvpl_taylor_basis::sum_errors(error_scene,block_i, block_j, block_k, tree_nsamples);
--  }
--  else {
--    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
--    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << std::endl;
--  }
--
--  //store output
--  pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
-deleted file mode 100644
-index 50c28a393e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 12-Apr-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--#include <vul/vul_file.h>
--
--//:global variables
--namespace bvpl_compute_taylor_coefficients_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_taylor_coefficients_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_coefficients_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string" ;  //path of taylor_global_info.xml
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_taylor_coefficients_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_coefficients_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  std::string taylor_dir = pro.get_input<std::string>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  int dim = pro.get_input<int>(i++);
--
--  if (!vul_file::is_directory(taylor_dir))
--    return false;
--
--  switch (dim) {
--    case 3:
--    {
--      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
--      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
--      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
--      break;
--    }
--    case 10:
--    {
--      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
--      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
--      break;
--    }
--    default:
--      break;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
-deleted file mode 100644
-index b992c1b5ae..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
-+++ /dev/null
-@@ -1,78 +0,0 @@
--//:
--// \file
--// \brief A process to compute the Taylor reconstruction error of a block (Assumes, basis has been applied)
--// \author Isabel Restrepo
--// \date 9-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_compute_taylor_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_taylor_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr"; //the original data scene
--  input_types_[i++] = "bvpl_taylor_scenes_map_sptr" ; //scenes needed for Taylor operations
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  i=0;
--  output_types_[i++] = "boxm_scene_base_sptr"; //the error for this block
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_taylor_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_taylor_scenes_map_sptr taylor_scenes = pro.get_input<bvpl_taylor_scenes_map_sptr>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  if (!data_scene_base) {
--    std::cerr << "Error in bvpl_compute_taylor_error_process: Null data scene\n";
--    return false;
--  }
--  if (!taylor_scenes) {
--    std::cerr << "Error in bvpl_compute_taylor_error_process: Null scenes map\n";
--    return false;
--  }
--
--  //assemble the Taylor basis
--  bvpl_taylor_basis::assemble_basis(taylor_scenes, block_i, block_j, block_k);
--
--  //compute the error block
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
--  auto* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  double cell_length = data_scene->finest_cell_length();
--  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),
--                                                 error_scene,taylor_scenes->loader(),
--                                                 block_i, block_j, block_k, cell_length);
--
--  pro.set_output_val<boxm_scene_base_sptr>(0, error_scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
-deleted file mode 100644
-index 0b57bb488d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
-+++ /dev/null
-@@ -1,77 +0,0 @@
--//:
--// \file
--// \brief A process to extract a Taylor coefficient from the 10-d vector
--// \author Isabel Restrepo
--// \date 12-Apr-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--//:global variables
--namespace bvpl_explore_coefficient_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_explore_coefficient_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_explore_coefficient_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string"; //path to Taylor info file
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int"; //coefficient
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_explore_coefficient_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_explore_coefficient_scene_process_globals;
--
--  //get inputs
--  std::string taylor_dir = pro.get_input<std::string>(0);
--  int scene_id = pro.get_input<int>(1);
--  int coeff_id = pro.get_input<int>(2);
--
--  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--  bvpl_global_taylor<double, 10> taylor(taylor_dir, kernel_names);
--
--  boxm_scene_base_sptr valid_scene_base = taylor.load_valid_scene(scene_id);
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  if (!valid_scene) {
--    std::cerr << "Error in bvpl_explore_coefficient_scene_process: Could not cast valid scene\n";
--    return false;
--  }
--
--  std::stringstream scene_ss;
--  scene_ss << "coefficient_" << coeff_id << "_scene_" << scene_id ;
--  std::string scene_path = taylor.aux_dirs(scene_id) + "/" + scene_ss.str() + ".xml";
--
--  std::cout << "Initializing " << scene_path << '\n'
--           << "Scene: " << scene_path << " does not exist, initializing xml" << std::endl;
--  boxm_scene<boct_tree<short, float> > *scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->set_paths(taylor.aux_dirs(scene_id), scene_ss.str());
--  scene->write_scene("/" + scene_ss.str() +  ".xml");
--  taylor.extract_coefficient_scene(scene_id,  coeff_id, scene);
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
-deleted file mode 100644
-index c900aeef5d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
-+++ /dev/null
-@@ -1,68 +0,0 @@
--//:
--// \file
--// \brief A process to init auxiliary scenes and other variables
--// \author Isabel Restrepo
--// \date 12-Apr-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--//:global variables
--namespace bvpl_init_global_taylor_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_init_global_taylor_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_taylor_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; // path to taylor_global_info file
--  input_types_[1] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_init_global_taylor_process(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_taylor_process_globals;
--
--  //get inputs
--  std::string taylor_dir = pro.get_input<std::string>(0);
--  int dim = pro.get_input<int>(1);
--
--  switch (dim) {
--    case 3:
--    {
--      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
--      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
--      global_taylor.init();
--      break;
--    }
--    case 10:
--    {
--      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
--      global_taylor.init();
--      break;
--    }
--    default:
--      break;
--  }
--
--
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
-deleted file mode 100644
-index 0e5713c4dc..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
-+++ /dev/null
-@@ -1,52 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl_octree/bvpl_global_taylor.h>
--
--//: global variables
--namespace bvpl_load_global_taylor_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_load_global_taylor_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_taylor_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_global_taylor_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_load_global_taylor_process(bprb_func_process& pro)
--{
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--  using namespace bvpl_load_global_taylor_process_globals;
--
--  // get inputs
--  std::string taylor_file = pro.get_input<std::string>(0);
--  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--  auto *global_taylor = new bvpl_global_taylor<double, 10>(taylor_file, kernel_names);
--
--  // store output
--  pro.set_output_val<bvpl_global_taylor_sptr>(0, global_taylor);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
-deleted file mode 100644
-index 0b405689b0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--//:
--// \file
--// \brief A process to load to memory all smart pointers of scenes needed for Taylor reconstruction
--// \author Isabel Restrepo
--// \date 14-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vul/vul_file.h>
--
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--//:global variables
--namespace bvpl_load_taylor_scenes_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_taylor_scenes_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_scenes_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string";  //dir to Taylor scenes
--  input_types_[i++] = "int";         // min and max of Taylor kernel
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  std::vector<std::string> output_types_(n_outputs_);
--  i = 0;
--  output_types_[i++] = "bvpl_taylor_scenes_map_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_taylor_scenes_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_scenes_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  std::string taylor_dir = pro.get_input<std::string>(i++);
--  int min_x = pro.get_input<int>(i++);
--  int min_y = pro.get_input<int>(i++);
--  int min_z = pro.get_input<int>(i++);
--  int max_x = pro.get_input<int>(i++);
--  int max_y = pro.get_input<int>(i++);
--  int max_z = pro.get_input<int>(i++);
--
--  if (!vul_file::is_directory(taylor_dir)) {
--    std::cerr<<"Error in bvpl_load_taylor_scenes_process_process: Taylor directory doesn't exist\n";
--  }
--
--  bvpl_taylor_basis_loader loader(taylor_dir, vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
--  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
--
--  //store output
--  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
-deleted file mode 100644
-index 6fe31b4168..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
-+++ /dev/null
-@@ -1,77 +0,0 @@
--//:
--// \file
--// \brief A process to compute taylor projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--//:global variables
--namespace bvpl_taylor_global_add_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_taylor_global_add_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_add_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_taylor_global_add_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_add_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_taylor)
--  {
--    std::cerr << "Global taylor is NULL\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr error_scene_base = global_taylor->load_error_scene(scene_id);
--  if (!error_scene_base) {
--    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--
--  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
--  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
--
--  //store output
--    pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
-deleted file mode 100644
-index 3f3ca0a701..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
-+++ /dev/null
-@@ -1,63 +0,0 @@
--//:
--// \file
--// \brief A process to compute taylor projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--//:global variables
--namespace bvpl_taylor_global_proj_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_taylor_global_proj_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_proj_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_taylor_global_proj_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_proj_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_taylor)
--  {
--    std::cerr << "Global taylor is NULL\n";
--    return false;
--  }
--
--  global_taylor->compute_approximation_error(scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index 320399fb72..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,16 +0,0 @@
--include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree/pro)
--
--add_executable( bvpl_octree_pro_test_all
--  test_driver.cxx
--  test_bvpl_plane_propagation_process.cxx
--)
--
--target_link_libraries( bvpl_octree_pro_test_all ${VXL_LIB_PREFIX}testlib bvpl_octree_pro bvpl_octree boxm boxm_pro boxm_sample boxm_util boct bvpl bprb brdb sdet ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
--
--if(SEGFAULT_FIXED)
--add_test( NAME bvpl_octree_pro_plane_propagation_process COMMAND $<TARGET_FILE:bvpl_octree_pro_test_all> test_bvpl_plane_propagation_process)
--endif()
--
--add_executable( bvpl_octree_pro_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_pro_test_include bvpl_octree_pro sdet )
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
-deleted file mode 100644
-index 1073b2e437..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
-+++ /dev/null
-@@ -1,144 +0,0 @@
--#include <iostream>
--#include <vector>
--#include <testlib/testlib_test.h>
--//:
--// \file
--// \brief  This test creates a tree with 8 leaf cells and inserts only one plane to each
--//         After the boxm_plane_propagation_process is applied, each cell will insert their
--//         neighbors' observation planes and insert into itself. At the end each cell should
--//         have 8 planes in the observation list since each cell has 7 neighbors (all the
--//         other cells in the tree)
--//
--// \author Gamze Tunali
--// \date   March 24, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <brdb/brdb_value.h>
--#include <brdb/brdb_query.h>
--#include <brdb/brdb_selection.h>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_parameters_sptr.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree_cell.h>
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
--#include <vul/vul_file.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static void test_bvpl_plane_propagation_process()
--{
--  typedef boxm_edge_tangent_sample<float> data_type;
--  typedef boct_tree<short,data_type > tree_type;
--  typedef boxm_scene<boct_tree<short,data_type > > scene_type;
--
--  // create the main scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  scene_type scene(lvcs, origin, block_dim, world_dim);
--  scene.set_octree_levels(3,2);
--  scene.set_paths("./boxm_scene", "block");
--  scene.set_appearance_model(BOXM_EDGE_LINE);
--  x_write(std::cout, scene, "scene");
--  vul_file::make_directory("./boxm_scene");
--  scene.write_scene();
--
--  boxm_block_iterator<boct_tree<short,data_type > > iter(&scene);
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,data_type > > * block=scene.get_active_block();
--    boct_tree<short,data_type > * tree= block->get_tree();
--
--    // get the leaf nodes and insert one plane to each
--    std::vector<boct_tree_cell<short,data_type >*> cells=tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++) {
--      boxm_plane_obs<float> p(vgl_homg_plane_3d<float>(float(i+1),0.f,0.f,1.f), 1.0f);
--      data_type data = cells[i]->data();
--      data.insert(p);
--      cells[i]->set_data(data);
--    }
--    block->init_tree(tree);
--    block->get_tree()->print();
--    scene.write_active_block();
--    iter++;
--  }
--
--  DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
--  REGISTER_DATATYPE(boxm_scene_base_sptr);
--
--  //: set the inputs
--  brdb_value_sptr v0 = new brdb_value_t<boxm_scene_base_sptr>(new boxm_scene<boct_tree<short,data_type > >(scene));
--  brdb_value_sptr v1 = new brdb_value_t<std::string>(scene.path());
--  brdb_value_sptr v2 = new brdb_value_t<std::string>("new_scene");
--  brdb_value_sptr v3 = new brdb_value_t<std::string>("new_scene.xml");
--
--  //: inits with the default params
--  bool good = bprb_batch_process_manager::instance()->init_process("bvplPlanePropagateProcess");
--  good = good && bprb_batch_process_manager::instance()->set_input(0, v0);
--  good = good && bprb_batch_process_manager::instance()->set_input(1, v1);
--  good = good && bprb_batch_process_manager::instance()->set_input(2, v2);
--  good = good && bprb_batch_process_manager::instance()->set_input(3, v3);
--  good = good && bprb_batch_process_manager::instance()->run_process();
--
--  unsigned id;
--  good = good && bprb_batch_process_manager::instance()->commit_output(0, id);
--  TEST("process commits output", good, true);
--
--  // check if the results are in DB
--  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
--  brdb_selection_sptr S = DATABASE->select("boxm_scene_base_sptr_data", std::move(Q));
--  if (S->size()!=1){
--    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
--             << " no selections\n";
--  }
--  brdb_value_sptr value;
--  if (!S->get_value(std::string("value"), value)) {
--    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
--             << " didn't get value\n";
--  }
--  bool non_null = (value != nullptr);
--  TEST("the output scene non-null", non_null, true);
--
--  auto* result=static_cast<brdb_value_t<boxm_scene_base_sptr>* >(value.ptr());
--  boxm_scene_base_sptr scene_sptr = result->value();
--
--  // get the new scene with updated cells
--  auto *scene2 = static_cast<scene_type *>(scene_sptr.as_pointer());
--  boxm_block_iterator<boct_tree<short,data_type > > iter2(scene2);
--
--  bool obs_num_ok=true;
--  while (!iter2.end())
--  {
--    scene2->load_block(iter2.index().x(),iter2.index().y(),iter2.index().z());
--    boxm_block<tree_type > * block=scene2->get_active_block();
--    tree_type * tree= block->get_tree();
--
--    // get the leaf nodes and insert one plane to each
--    std::vector<boct_tree_cell<short,data_type >*> nodes=tree->leaf_cells();
--    for (auto & node : nodes) {
--      unsigned num=node->data().num_obs();
--      // each node has 8 neighbors in the 3x3 neighborhood including itself
--      if (num != 8)
--        obs_num_ok = false;
--    }
--    iter2++;
--  }
--  TEST("The number of expected observations at each cell", obs_num_ok, true);
--}
--
--TESTMAIN(test_bvpl_plane_propagation_process);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
-deleted file mode 100644
-index 9fae26da90..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_bvpl_plane_propagation_process );
--
--void register_tests()
--{
--  REGISTER( test_bvpl_plane_propagation_process );
--}
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
-deleted file mode 100644
-index 407d98e94a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
--#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
-deleted file mode 100644
-index 79b3a2bcb4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
-+++ /dev/null
-@@ -1,7 +0,0 @@
--Each of the subfolders contains scripts for different experiments:
--
--reconstruction error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed fraction of training samples and varying number of dimensions.
--
--training error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed dimension and varying number of training samples
--
--Note: *.sh calls the python scripts with appropriate inputs. You only need to adjust *.sh for your system
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
-deleted file mode 100644
-index 133a5822ed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
-+++ /dev/null
-@@ -1,193 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 21, 2011
--
--@author:Isabel Restrepo
--
--Adds the error of a portion of voxels. Each block is processed in a separate thread.
--This script assumes that the reconstruction error at each voxel has been computed
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class pca_error_job():
--
--    def __init__(self, pca_scenes, dim, fraction, block_i, block_j, block_k):
--        self.pca_scenes = pca_scenes
--        self.dim = dim
--        self.fraction = fraction
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--
--
--def execute_jobs(jobs, num_procs=4):
--    # load up work queue
--    work_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    # create a queue to pass to workers to store the results
--    result_queue = multiprocessing.Queue()
--
--    # spawn workers
--    for i in range(num_procs):
--        worker = pca_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--       # collect the results off the queue
--    # all_results=[];
--#    results = []
--#    while len(results) < len(jobs):
--#        result = result_queue.get()
--#        results.append(result)
--#        all_results[job.dim].append(result);
--#
--#    return all_results;
--
--    # collect the results off the queue
--    results = []
--    while len(results) < len(jobs):
--        result = result_queue.get()
--        results.append(result)
--
--    return results
--
--
--class pca_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Adding Errors")
--            batch.init_process("bvplAddPCAErrorsProcess")
--            batch.set_input_from_db(0, job.pca_scenes)
--            batch.set_input_unsigned(1, job.dim)
--            batch.set_input_double(2, job.fraction)
--            batch.set_input_int(3, job.block_i)
--            batch.set_input_int(4, job.block_j)
--            batch.set_input_int(5, job.block_k)
--            batch.run_process()
--            (id, type) = batch.commit_output(0)
--            error_val = dbvalue(id, type)
--            error = batch.get_output_double(id)
--
--            self.result_queue.put(error)
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#***************** The Main Algorithm ************************#
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA Error Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--fraction', action="store",
--                      dest="fraction", type="float", default=0.0)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--    parser.add_option('--dimension', action="store",
--                      dest="dimension", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    fraction = options.fraction
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--    dimension = options.dimension
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        print "Invalid PCA Dir"
--        sys.exit(-1)
--
--    print("Loading Data Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    data_scene = dbvalue(scene_id, scene_type)
--
--    # Load PCA scenes
--    pca_feature_dim = 125
--    print("Loading PCA Error Scenes")
--    batch.init_process("bvplLoadPCAErrorSceneProcess")
--    batch.set_input_from_db(0, data_scene)
--    batch.set_input_string(1, pca_dir)
--    batch.set_input_unsigned(
--        2, pca_feature_dim)  # dimension pca feature
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    pca_scenes = dbvalue(id, type)
--
--    # Begin multiprocessing
--    # Enqueue jobs
--    job_list = []
--    # for dim in range(0, pca_feature_dim):
--    for block_i in range(0, nblocks_x):
--        for block_j in range(0, nblocks_y):
--            for block_k in range(0, nblocks_z):
--                current_job = pca_error_job(
--                    pca_scenes, dimension, fraction, block_i, block_j, block_k)
--                job_list.append(current_job)
--
--    # run
--    results = execute_jobs(job_list, num_cores)
--
--    # dump results
--    total_error = 0
--    for r in results:
--        total_error = total_error + r
--
--    int_frac = int(fraction * 100)
--    error_file = pca_dir + "/error_" + str(dimension) + "/error.txt"
--    fd = open(error_file, "w")
--    print >>fd, total_error / len(results)
--    print >>fd, results
--    fd.close()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
-deleted file mode 100644
-index c8ede20327..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
-+++ /dev/null
-@@ -1,164 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--Compuets PCA reconstruction error. Each block is processed in a separate thread.
--This script assumes that the pca basis has been computed as gone by extract_pca_kernels.py
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--import sys
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class pca_error_job():
--
--    def __init__(self, pca_info, pca_error_scenes, block_i, block_j, block_k, dim):
--        self.pca_info = pca_info
--        self.pca_error_scenes = pca_error_scenes
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--        self.dim = dim
--
--
--def execute_jobs(jobs, num_procs=4):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = pca_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class pca_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Computing Error Scene")
--            batch.init_process("bvplComputePCAErrorBlockProcess")
--            batch.set_input_from_db(0, job.pca_info)
--            batch.set_input_from_db(1, job.pca_error_scenes)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.set_input_unsigned(5, job.dim)
--            batch.run_process()
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--#*******************The Main Algorithm ************************#
--if __name__ == "__main__":
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA Error Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--    parser.add_option('--dimension', action="store",
--                      dest="dimension", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--    dimension = options.dimension
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        print "Invalid PCA Dir"
--        sys.exit(-1)
--
--    print("Loading Data Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    data_scene = dbvalue(scene_id, scene_type)
--
--    # Load pca scenes
--    pca_feature_dim = 125
--    print("Loading PCA Error Scenes")
--    batch.init_process("bvplLoadPCAErrorSceneProcess")
--    batch.set_input_from_db(0, data_scene)
--    batch.set_input_string(1, pca_dir)
--    batch.set_input_unsigned(
--        2, pca_feature_dim)  # dimension pca feature
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    pca_scenes = dbvalue(id, type)
--
--    print("Loading PCA Info")
--    batch.init_process("bvplLoadPCAInfoProcess")
--    batch.set_input_string(0, pca_dir)
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    pca_info = dbvalue(id, type)
--
--    # Begin multiprocessing
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--    all_indices = []
--    for block_i in range(0, nblocks_x):
--        for block_j in range(0, nblocks_y):
--            for block_k in range(0, nblocks_z):
--                idx = [block_i, block_j, block_k]
--                all_indices.append(idx)
--
--    random.shuffle(all_indices)
--
--    for i in range(0, len(all_indices)):
--        idx = all_indices[i]
--        current_job = pca_error_job(pca_info, pca_scenes, idx[
--            0], idx[1], idx[2], dimension)
--        job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
-deleted file mode 100644
-index 5d8b2b7910..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
-+++ /dev/null
-@@ -1,61 +0,0 @@
--# Computes the gaussian gradients on a boxm_alpha_scene
--
--import os
--import optparse
--import time
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA basis')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--train_fraction', action="store",
--                      dest="train_fraction", type="float", default=0.0)
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    train_fraction = options.train_fraction
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    print("Extracting Principal Components patches")
--
--    print("Creating a Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    scene = dbvalue(scene_id, scene_type)
--
--    start_time = time.time()
--
--    print("Extract PC")
--    batch.init_process("bvplDiscoverPCAFeaturesProcess")
--    batch.set_input_from_db(0, scene)
--    batch.set_input_string(1,  pca_dir)
--    batch.set_input_double(2,  train_fraction)
--    batch.set_input_int(3, -2)  # min and max points of the kernel
--    batch.set_input_int(4, -2)
--    batch.set_input_int(5, -2)
--    batch.set_input_int(6, 2)
--    batch.set_input_int(7, 2)
--    batch.set_input_int(8, 2)
--    batch.run_process()
--
--    print("Runing time forbvplDiscoverPCAFeaturesProcess:")
--    print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
-deleted file mode 100755
-index 61f3346338..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
-+++ /dev/null
-@@ -1,68 +0,0 @@
--#!/bin/bash
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--A script that encapsulates all steps needed to computer pca reconstruction error as a function of number of components used
--"""
--
--if [ $1 = "-r" ] ; then
--  export PYTHONPATH=/Projects/vxl/bin/release/lib
--else
--  if [ $1 = "-d" ] ; then
--    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
--  else
--    echo "Need a flag, either -d or -r";
--  fi
--fi
--
--echo "PYTHONPATH=" $PYTHONPATH
--
--#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
--#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall/10";
--#nblocks_x=1;
--#nblocks_y=1;
--#nblocks_z=1;
--
--
--#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
--#model_name="capitol_scene";
--#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXM_6_4_4/10";
--#nblocks_x=6;
--#nblocks_y=4;
--#nblocks_z=4;
--
--
--model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
--model_name="downtown_scene";
--pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1/10";
--nblocks_x=3;
--nblocks_y=3;
--nblocks_z=1;
--
--train_fraction=0.1;
--test_fraction=1.0;
--num_cores=5;
--
--
--##************Compute Expected Color Scene
--#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
--
--#Compute PCA basis
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $train_fraction
--
--#Compute reconstruction at each voxel in the scene
--for ((dim = 45; dim <125; dim++))
--do
--  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/compute_pca_error_scene.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --dimension $dim
--
--  #Add error of fraction of voxels
--
--  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/add_pca_error.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $test_fraction --dimension $dim
--done
--
--# #Save all scenes to drishti raw file
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/save_pca_raw.py --pca_dir $pca_dir --num_cores $num_cores
--
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/reconstruction_error/explore_histogram.py --pca_dir $pca_dir --num_cores $num_cores
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
-deleted file mode 100644
-index 15d23e5ebf..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
-+++ /dev/null
-@@ -1,108 +0,0 @@
--import multiprocessing
--import Queue
--import time
--import os
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class save_scene_job():
--
--    def __init__(self, input_scene_path, output_scene_path):
--        self.input_scene_path = input_scene_path
--        self.output_scene_path = output_scene_path
--
--
--def execute_jobs(jobs, num_procs=5):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = save_scene_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class save_scene_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating a Scene")
--            batch.init_process("boxmCreateSceneProcess")
--            batch.set_input_string(0, job.input_scene_path)
--            batch.run_process()
--            (scene_id, scene_type) = batch.commit_output(0)
--            scene = dbvalue(scene_id, scene_type)
--
--            print("Save Scene")
--            batch.init_process("boxmSaveSceneRawProcess")
--            batch.set_input_from_db(0, scene)
--            batch.set_input_string(1, job.output_scene_path)
--            batch.set_input_unsigned(2, 0)
--            batch.set_input_unsigned(3, 1)
--            batch.run_process()
--
--            print ("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#*********************The Main Algorithm ****************************#
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    parser = optparse.OptionParser(
--        description='Save taylor responses to raw file')
--
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--
--    options, args = parser.parse_args()
--
--    pca_dir = options.pca_dir
--    num_cores = options.num_cores
--
--    if not os.path.isdir(pca_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--    pca_feature_dim = 125
--    for dim in range(0, pca_feature_dim):
--
--        scene_in_path = pca_dir + "/error_" + str(dim) + "/error_scene.xml"
--        scene_out_path = pca_dir + "/error_" + str(dim) + "/error_scene"
--
--        current_job = save_scene_job(scene_in_path, scene_out_path)
--
--        job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
-deleted file mode 100644
-index 1616b7850a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
-+++ /dev/null
-@@ -1,66 +0,0 @@
--# Computes the gaussian gradients on a boxm_alpha_scene
--
--import os
--import optparse
--import time
--import sys
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA basis')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--train_fraction', action="store",
--                      dest="train_fraction", type="float", default=0.0)
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    train_fraction = (options.train_fraction) / 10
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    print("Extracting Principal Components patches")
--
--    print("Creating a Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    scene = dbvalue(scene_id, scene_type)
--
--    start_time = time.time()
--
--    print("Extract PC")
--    batch.init_process("bvplDiscoverPCAFeaturesProcess")
--    batch.set_input_from_db(0, scene)
--    batch.set_input_string(1,  pca_dir)
--    batch.set_input_double(2,  train_fraction)
--    batch.set_input_int(3, -2)  # min and max points of the kernel
--    batch.set_input_int(4, -2)
--    batch.set_input_int(5, -2)
--    batch.set_input_int(6, 2)
--    batch.set_input_int(7, 2)
--    batch.set_input_int(8, 2)
--    batch.run_process()
--
--    print ("Runing time for bvplDiscoverPCAFeaturesProcess:")
--    print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
-deleted file mode 100644
-index e151f95144..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
-+++ /dev/null
-@@ -1,42 +0,0 @@
--# Computes normalized pca training error
--
--import os
--import optparse
--import time
--import sys
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA basis')
--
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--train_fraction', action="store",
--                      dest="train_fraction", type="float", default=0.0)
--    options, args = parser.parse_args()
--
--    pca_dir = options.pca_dir
--    train_fraction = (options.train_fraction) / 10
--
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    start_time = time.time()
--
--    batch.init_process("bvplNormalizePCATrainingErrorProcess")
--    batch.set_input_string(0,  pca_dir)
--    batch.run_process()
--
--    print ("Runing time for bvplNormalizePCATrainingErrorProcess:")
--    print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
-deleted file mode 100755
-index 82b0a516d8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
-+++ /dev/null
-@@ -1,42 +0,0 @@
--#!/bin/bash
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--A script that encapsulates all steps needed to computer pca training error as a the number of training samples varies
--"""
--
--if [ $1 = "-r" ] ; then
--  export PYTHONPATH=/projects/vxl/bin/release/lib
--else
--  if [ $1 = "-d" ] ; then
--     export PYTHONPATH=/projects/vxl/bin/Debug/lib
--  else
--    echo "Need a flag, either -d or -r";
--  fi
--fi
--
--echo "PYTHONPATH=" $PYTHONPATH
--
--#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
--#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall";
--
--model_dir="/homelocal/isa/Experiments/CapitolBOXM_6_4_4";
--pca_dir="/homelocal/isa/Experiments/PCA/CapitolBOXM_6_4_4";
--
--
--#model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
--#pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1";
--
--
--##Compute Expected Color Scene
--#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
--
--#Compute reconstruction at each voxel in the scene
--for ((dim = 2; dim <11; dim++))
--do
--  #Compute PCA basis
--  python extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $dim
--done
--
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
-deleted file mode 100644
-index 5030ca4508..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
-+++ /dev/null
-@@ -1 +0,0 @@
--This folder contains Python scripts that use the main processes of bvpl_octree
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
-deleted file mode 100644
-index a7084e3cbe..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
-+++ /dev/null
-@@ -1,183 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--Adds the error of a portion of voxels. Each block is processed in a separate thread.
--This script assumes that the reconstruction error at each voxel has been computed
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class taylor_error_job():
--
--    def __init__(self, error_scene, fraction, block_i, block_j, block_k):
--        self.error_scene = error_scene
--        self.fraction = fraction
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--
--
--def execute_jobs(jobs, num_procs=4):
--    # load up work queue
--    work_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    # create a queue to pass to workers to store the results
--    result_queue = multiprocessing.Queue()
--
--    # spawn workers
--    for i in range(num_procs):
--        worker = taylor_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--       # collect the results off the queue
--    results = []
--    while len(results) < len(jobs):
--        result = result_queue.get()
--        results.append(result)
--
--    return results
--
--
--class taylor_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Adding Errors")
--            batch.init_process("bvplAddTaylorErrorsProcess")
--            batch.set_input_from_db(0, job.error_scene)
--            batch.set_input_double(1, job.fraction)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.run_process()
--            (id, type) = batch.commit_output(0)
--            error_val = dbvalue(id, type)
--            error = batch.get_output_double(id)
--
--            self.result_queue.put(error)
--
--            print("error")
--            print(error)
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#***************** The Main Algorithm ************************#
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Add Taylor Errors in a Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--fraction', action="store",
--                      dest="fraction", type="float", default=0.0)
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int", default=1)
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int", default=1)
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int", default=1)
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    taylor_dir = options.taylor_dir
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--    fraction = options.fraction
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    print("Loading Error Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  taylor_dir + "/error_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    error_scene = dbvalue(scene_id, scene_type)
--
--    # Begin multiprocessing
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    blocks_x = [i for i in range(0, nblocks_x)]
--    blocks_y = [i for i in range(0, nblocks_y)]
--    blocks_z = [i for i in range(0, nblocks_z)]
--
--    random.shuffle(blocks_x)
--    random.shuffle(blocks_y)
--    random.shuffle(blocks_y)
--
--    # Enqueue jobs
--    for i in range(0, len(blocks_x)):
--        for j in range(0, len(blocks_y)):
--            for k in range(0, len(blocks_z)):
--                block_i = blocks_x[i]
--                block_j = blocks_y[j]
--                block_k = blocks_z[k]
--                current_job = taylor_error_job(
--                    error_scene, fraction, block_i, block_j, block_k)
--                job_list.append(current_job)
--
--    # run
--    results = execute_jobs(job_list, num_cores)
--
--    # dump results
--    total_error = 0
--    for r in results:
--        print(r)
--        total_error = total_error + r
--
--    # write schedule file
--    int_frac = int(fraction * 100)
--    error_file = taylor_dir + "/error_" + str(int_frac) + ".txt"
--    fd = open(error_file, "w")
--    print >>fd, total_error / len(results)
--    print >>fd, results
--    fd.close()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
-deleted file mode 100644
-index 11386b774c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
-+++ /dev/null
-@@ -1,156 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--Compuets Taylor reconstruction error. Each block is processed in a separate thread.
--This script assumes that the taylor kernels have been run on the data scene as done in run_taylor_kernels.py
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class taylor_error_job():
--
--    def __init__(self, data_scene, taylor_scenes, block_i, block_j, block_k):
--        self.data_scene = data_scene
--        self.taylor_scenes = taylor_scenes
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--
--
--def execute_jobs(jobs, num_procs=4):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = taylor_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class taylor_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Computing Error Scene")
--            batch.init_process("bvplComputeTaylorErrorProcess")
--            batch.set_input_from_db(0, job.data_scene)
--            batch.set_input_from_db(1, job.taylor_scenes)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.run_process()
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--#*******************The Main Algorithm ************************#
--if __name__ == "__main__":
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute Taylor Error Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    taylor_dir = options.taylor_dir
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    print("Loading Data Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    data_scene = dbvalue(scene_id, scene_type)
--
--    # Load taylor scenes
--    print("Loading Taylor Scenes")
--    batch.init_process("bvplLoadTaylorScenesProcess")
--    batch.set_input_string(0, taylor_dir)
--    batch.set_input_int(1, -2)  # min and max points of the kernel
--    batch.set_input_int(2, -2)
--    batch.set_input_int(3, -2)
--    batch.set_input_int(4, 2)
--    batch.set_input_int(5, 2)
--    batch.set_input_int(6, 2)
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    taylor_scenes = dbvalue(id, type)
--
--    # Begin multiprocessing
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    blocks_x = [i for i in range(0, nblocks_x)]
--    blocks_y = [i for i in range(0, nblocks_y)]
--    blocks_z = [i for i in range(0, nblocks_z)]
--
--    random.shuffle(blocks_x)
--    random.shuffle(blocks_y)
--    random.shuffle(blocks_y)
--
--    # Enqueue jobs
--    for i in range(0, len(blocks_x)):
--        for j in range(0, len(blocks_y)):
--            for k in range(0, len(blocks_z)):
--                block_i = blocks_x[i]
--                block_j = blocks_y[j]
--                block_k = blocks_z[k]
--                current_job = taylor_error_job(
--                    data_scene, taylor_scenes, block_i, block_j, block_k)
--                job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
-deleted file mode 100644
-index 40fcac4910..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
-+++ /dev/null
-@@ -1,113 +0,0 @@
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class histogram_job():
--
--    def __init__(self, scene_path):
--        self.scene_path = scene_path
--
--
--def execute_jobs(jobs, num_procs=4):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = histogram_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class histogram_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating a Scene")
--            batch.init_process("boxmCreateSceneProcess")
--            batch.set_input_string(0,  job.scene_path)
--            batch.run_process()
--            (scene_id, scene_type) = batch.commit_output(0)
--            scene = dbvalue(scene_id, scene_type)
--
--            print("Explore Histogram")
--            batch.init_process("bvplSceneHistorgramProcess")
--            batch.set_input_from_db(0, scene)
--            batch.run_process()
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--#*******************The Main Algorithm ************************#
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    parser = optparse.OptionParser(description='Run Taylor Kernels')
--
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--
--    options, args = parser.parse_args()
--
--    taylor_dir = options.taylor_dir
--    num_cores = options.num_cores
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    # Kernel names for 2-degree approximation
--    kernel_list = []
--    kernel_list.append("I0")
--    kernel_list.append("Ix")
--    kernel_list.append("Iy")
--    kernel_list.append("Iz")
--    kernel_list.append("Ixx")
--    kernel_list.append("Iyy")
--    kernel_list.append("Izz")
--    kernel_list.append("Ixy")
--    kernel_list.append("Ixz")
--    kernel_list.append("Iyz")
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--    for curr_kernel in range(0, len(kernel_list)):
--        scene_path = taylor_dir + "/" + \
--            kernel_list[curr_kernel] + "/float_response_scene.xml"
--        current_job = histogram_job(scene_path)
--        job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
-deleted file mode 100644
-index 76a0beacab..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
-+++ /dev/null
-@@ -1,98 +0,0 @@
--import os
--from multiprocessing import Queue
--from taylor_kernel_threads import taylor_kernel_job, execute_jobs
--import time
--import optparse
--import random
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--    parser = optparse.OptionParser(description='Run Taylor Kernels')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--kernel_path', action="store", dest="kernel_path")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    taylor_dir = options.taylor_dir
--    kernel_path = options.kernel_path
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Kernel Path"
--        sys.exit(-1)
--
--    if not os.path.isdir(taylor_dir + "/"):
--        os.mkdir(taylor_dir + "/")
--
--    # Kernel names for 2-degree approximation
--    kernel_list = []
--    kernel_list.append("I0")
--    kernel_list.append("Ix")
--    kernel_list.append("Iy")
--    kernel_list.append("Iz")
--    kernel_list.append("Ixx")
--    kernel_list.append("Iyy")
--    kernel_list.append("Izz")
--    kernel_list.append("Ixy")
--    kernel_list.append("Ixz")
--    kernel_list.append("Iyz")
--
--    print("Creating a Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    scene = dbvalue(scene_id, scene_type)
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = Queue()
--    job_list = []
--
--    blocks_x = [i for i in range(0, nblocks_x)]
--    blocks_y = [i for i in range(0, nblocks_y)]
--    blocks_z = [i for i in range(0, nblocks_z)]
--
--    random.shuffle(blocks_x)
--    random.shuffle(blocks_y)
--    random.shuffle(blocks_y)
--
--    # Enqueue jobs
--    for curr_kernel in range(0, len(kernel_list)):
--        for i in range(0, len(blocks_x)):
--            for j in range(0, len(blocks_y)):
--                for k in range(0, len(blocks_z)):
--                    block_i = blocks_x[i]
--                    block_j = blocks_y[j]
--                    block_k = blocks_z[k]
--                    curr_kernel_path = kernel_path + "/" + \
--                        kernel_list[curr_kernel] + ".txt"
--                    output_path = taylor_dir + "/" + kernel_list[curr_kernel]
--                    if not os.path.isdir(output_path + "/"):
--                        os.mkdir(output_path + "/")
--                    current_job = taylor_kernel_job(
--                        scene, curr_kernel_path, block_i, block_j, block_k, output_path)
--                    job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
-deleted file mode 100644
-index 1694729229..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
-+++ /dev/null
-@@ -1,146 +0,0 @@
--import multiprocessing
--import Queue
--import time
--import os
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class save_scene_job():
--
--    def __init__(self, input_scene_path, output_scene_path):
--        self.input_scene_path = input_scene_path
--        self.output_scene_path = output_scene_path
--
--
--def execute_jobs(jobs, num_procs=5):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = save_scene_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class save_scene_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating a Scene")
--            batch.init_process("boxmCreateSceneProcess")
--            batch.set_input_string(0, job.input_scene_path)
--            batch.run_process()
--            (scene_id, scene_type) = batch.commit_output(0)
--            scene = dbvalue(scene_id, scene_type)
--
--            print("Save Scene")
--            batch.init_process("boxmSaveSceneRawProcess")
--            batch.set_input_from_db(0, scene)
--            batch.set_input_string(
--                1, job.output_scene_path + "_float")
--            batch.set_input_unsigned(2, 0)
--            batch.set_input_unsigned(3, 1)
--            batch.run_process()
--
--#            resolution = 0;
--#            enforce_level = 1;
--
--#            print("Convert to regular grid");
--#            batch.init_process("boxmSceneToBvxmGridProcess");
--#            batch.set_input_from_db(0,scene);
--#            batch.set_input_string(1, job.output_scene_path + ".vox");
--#            batch.set_input_unsigned(2, resolution);
--#            batch.set_input_bool(3, enforce_level);
--#            batch.run_process();
--#            (grid_id, grid_type) = batch.commit_output(0);
--#            grid = dbvalue(grid_id, grid_type);
--#
--#            print("Save Grid");
--#            batch.init_process("bvxmSaveGridRawProcess");
--#            batch.set_input_from_db(0,grid);
--#            batch.set_input_string(1,job.output_scene_path + ".raw");
--#            batch.run_process();
--
--            print ("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#*********************The Main Algorithm ****************************#
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    parser = optparse.OptionParser(
--        description='Save taylor responses to raw file')
--
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--
--    options, args = parser.parse_args()
--
--    taylor_dir = options.taylor_dir
--    num_cores = options.num_cores
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    kernel_list = []
--
--    kernel_list.append("I0")
--    kernel_list.append("Ix")
--    kernel_list.append("Iy")
--    kernel_list.append("Iz")
--    kernel_list.append("Ixx")
--    kernel_list.append("Iyy")
--    kernel_list.append("Izz")
--    kernel_list.append("Ixy")
--    kernel_list.append("Ixz")
--    kernel_list.append("Iyz")
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--#  for i in range(0, len(kernel_list)):
--#
--#      scene_in_path = taylor_dir + "/" + kernel_list[i] + "/float_response_scene.xml";
--#      scene_out_path = taylor_dir + "/" + kernel_list[i]+ "/float_response_scene";
--#
--#      current_job = save_scene_job(scene_in_path, scene_out_path);
--#
--#      job_list.append(current_job);
--
--    # append error scene
--    scene_in_path = taylor_dir + "/error_scene.xml"
--    scene_out_path = taylor_dir + "/error_scene"
--    current_job = save_scene_job(scene_in_path, scene_out_path)
--    job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
-deleted file mode 100755
-index db27ee1939..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
-+++ /dev/null
-@@ -1,67 +0,0 @@
--#!/bin/bash
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--A script that encapsulates all steps needed to computer taylor reconstruction error
--"""
--
--if [ $1 = "-r" ] ; then
--  export PYTHONPATH=/Projects/vxl/bin/Release/lib
--else
--  if [ $1 = "-d" ] ; then
--    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
--  else
--    echo "Need a flag, either -d or -r";
--  fi
--fi
--
--echo "PYTHONPATH=" $PYTHONPATH
--
--#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
--#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXMSmall_test";
--#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
--#nblocks_x=1;
--#nblocks_y=1;
--#nblocks_z=1;
--
--
--#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
--#model_name="capitol_scene";
--#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXM_6_4_4";
--#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
--#nblocks_x=6;
--#nblocks_y=4;
--#nblocks_z=4;
--
--
--model_dir="/Users/isa/Experiments/DowntownBOXM_12_12_4";
--model_name="downtown_scene";
--taylor_dir="/Users/isa/Experiments/Taylor/DowntownBOXM_12_12_4";
--kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
--nblocks_x=12;
--nblocks_y=12;
--nblocks_z=4;
--
--fraction=1.0;
--num_cores=10;
--
--cd "/Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor"
--
--# #Compute Expected Color Scene
--#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
--#
--# #Compute Responses to Taylor Kernels
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/run_taylor_kernels.py --model_dir $model_dir --taylor_dir $taylor_dir --kernel_path $kernel_path --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
--#
--# #Compute reconstruction at each voxel in the scene
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/compute_taylor_error_scene.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
--#
--# #Add error of fraction of voxels
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/add_taylor_error.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $fraction
--#
--# #Save all scenes to drishti raw file
--python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/save_taylor_raw.py --taylor_dir $taylor_dir --num_cores $num_cores
--
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/explore_histogram.py --taylor_dir $taylor_dir --num_cores $num_cores
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
-deleted file mode 100644
-index 029ce9315d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
-+++ /dev/null
-@@ -1,72 +0,0 @@
--import multiprocessing
--import Queue
--import time
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class taylor_kernel_job():
--
--    def __init__(self, scene, kernel_path, block_i, block_j, block_k, output_path):
--        self.scene = scene
--        self.kernel_path = kernel_path
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--        self.output_path = output_path
--
--
--def execute_jobs(jobs, num_procs=5):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = taylor_kernel_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class taylor_kernel_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating taylor kernel")
--            batch.init_process("bvplLoadTaylorKernelProcess")
--            batch.set_input_string(0, job.kernel_path)
--            batch.run_process()
--            (kernel_id, kernel_type) = batch.commit_output(0)
--            kernel = dbvalue(kernel_id, kernel_type)
--
--            print("Running Kernel")
--            batch.init_process("bvplBlockKernelOperatorProcess")
--            batch.set_input_from_db(0, job.scene)
--            batch.set_input_from_db(1, kernel)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.set_input_string(5, "algebraic")
--            batch.set_input_string(6, job.output_path)
--            batch.run_process()
--
--            print ("Runing time for worker:", self.name)
--            print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
-deleted file mode 100644
-index 0784ff8eea..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
--
--set(bvpl_octree_sample_sources
--    bvpl_octree_sample.h           bvpl_octree_sample.hxx
--    bvpl_taylor_basis_sample.h     bvpl_taylor_basis_sample.cxx
--    bvpl_pca_basis_sample.h        bvpl_pca_basis_sample.hxx
--   )
--
--aux_source_directory(Templates bvpl_octree_sample_sources)
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_sample LIBRARY_SOURCES ${bvpl_octree_sample_sources})
--target_link_libraries(bvpl_octree_sample ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
-deleted file mode 100644
-index 8cdbd4476b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bsta/bsta_gaussian_sphere.hxx>
--
--BSTA_GAUSSIAN_SPHERE_INSTANTIATE(float, 1);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
-deleted file mode 100644
-index da403deee4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--BVPL_OCTREE_SAMPLE_INSTANTIATE(gauss_type);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
-deleted file mode 100644
-index f88db3342c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--
--BVPL_OCTREE_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
-deleted file mode 100644
-index fcaa1db057..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
--
--BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(10);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
-deleted file mode 100644
-index 8f1cc33b1f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
-+++ /dev/null
-@@ -1,57 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
--#ifndef bvpl_octree_sample_h
--#define bvpl_octree_sample_h
--//:
--// \file
--// \brief  A data structure to contain bvpl_kernel response, and id corresponding to axis of rotations and rotation around axis
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  December 9, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--template<class T_data>
--class bvpl_octree_sample
--{
-- public:
--  //: Default Constructor. Be careful when using default constructor, the value of response may be nonsense
--  //  This is indicated by the negative id.
--  bvpl_octree_sample():response_(),id_(-1){}
--
--  //: Constructor from response and id
--  bvpl_octree_sample(const T_data& response, const int& id):
--  response_(response),id_(id){}
--
--  short version_no() const{ return 1; }
--
--  void  print(std::ostream& os) const;
--
--  //Member variables
--  T_data response_;
--  int id_;
--};
--
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample);
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample);
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample);
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample);
--
--template<class T_data>
--std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample);
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
-deleted file mode 100644
-index fdc4d34d4a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
-+++ /dev/null
-@@ -1,70 +0,0 @@
--#ifndef bvpl_octree_sample_hxx_
--#define bvpl_octree_sample_hxx_
--
--#include "bvpl_octree_sample.h"
--
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.response_);
--}
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.response_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--
--template<class T_data>
--void bvpl_octree_sample<T_data>::print(std::ostream& os) const
--{
--  os << "(response=" << response_ << " id=" << id_ <<')';
--}
--
--template<class T_data>
--std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BVPL_OCTREE_SAMPLE_INSTANTIATE(T) \
--template class bvpl_octree_sample<T >; \
--template std::ostream& operator << (std::ostream&, const bvpl_octree_sample<T >&); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > *&)
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
-deleted file mode 100644
-index 64e29dd1fd..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
-+++ /dev/null
-@@ -1,57 +0,0 @@
--// This is bvpl_pca_basis_sample.h
--#ifndef bvpl_pca_basis_sample_h
--#define bvpl_pca_basis_sample_h
--
--//:
--// \file
--// \brief A data structure that contains the vector of projections on pca space
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  28-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vnl/vnl_vector_fixed.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--template <unsigned dim>
--class bvpl_pca_basis_sample{
--
--public:
--  bvpl_pca_basis_sample(){
--    pca_projections_.fill(0);
--  }
--
--  bvpl_pca_basis_sample(vnl_vector_fixed<double,dim> pp){
--    pca_projections_ = pp;
--  }
--  inline short version_no() const{ return 1; }
--
--  //: Vector of projections on pca space
--  vnl_vector_fixed<double,dim> pca_projections_;
--
--};
--
--
--template <unsigned dim>
--std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample);
--
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample);
--
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample);
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample);
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
-deleted file mode 100644
-index 93769db3f7..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#ifndef bvpl_pca_basis_sample_hxx_
--#define bvpl_pca_basis_sample_hxx_
--//:
--// \file
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include "bvpl_pca_basis_sample.h"
--
--#include <vnl/io/vnl_io_vector_fixed.h>
--#include <vsl/vsl_binary_io.h>
--
--
--template <unsigned dim>
--std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample)
--{
--  os << "PCA projection = " << sample.pca_projections_ << std::endl;
--  return os;
--}
--
--//I/O
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.pca_projections_);
--}
--
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.pca_projections_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--
--#define BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(T) \
--template class bvpl_pca_basis_sample<T >; \
--template std::ostream& operator << (std::ostream&, const bvpl_pca_basis_sample<T >&); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > *&)
--
--#endif // bvpl_pca_basis_sample_hxx_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
-deleted file mode 100644
-index f2d0372181..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
-+++ /dev/null
-@@ -1,58 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 10-Feb-2011
--
--#include "bvpl_taylor_basis_sample.h"
--#include <vnl/io/vnl_io_matrix_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample)
--{
--  os << "I0 = " << sample.I0 << ", G= " <<sample.G<< ", H=" << sample.H << std::endl;
--  return os;
--}
--
--//I/O
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.I0);
--  vsl_b_write(os, sample.G);
--  vsl_b_write(os, sample.H);
--
--}
--
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.I0);
--      vsl_b_read(is, sample.G);
--      vsl_b_read(is, sample.H);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--      << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--
--}
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample)
--{
--  vsl_b_read(is, *sample);
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
-deleted file mode 100644
-index a10ece861f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
-+++ /dev/null
-@@ -1,59 +0,0 @@
--// This is bvpl_taylor_basis_sample.h
--#ifndef bvpl_taylor_basis_sample_h
--#define bvpl_taylor_basis_sample_h
--
--//:
--// \file
--// \brief A data structure that contains vectors and matrices needed for taylor approximation
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  10-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vnl/vnl_double_3.h>
--#include <vnl/vnl_double_3x3.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--
--//: Data structure needed for 2-degree taylor approximation of 3-dimesional volumes
--class bvpl_taylor_basis2_sample
--{
--public:
--  bvpl_taylor_basis2_sample()
--  {
--    I0 = 0.0f;
--    //empty - to save space
--    G = vnl_double_3(0.0,0.0,0.0);
--    H = vnl_double_3x3(0.0);
--  }
--
--  bvpl_taylor_basis2_sample(double zeroth_dev, vnl_double_3 grad, vnl_double_3x3 hess): I0(zeroth_dev), G(grad), H(hess){}
--
--  short version_no() const{ return 1; }
--  //: Approximation to zeroth derivative
--  double I0;
--  //: Approximation to the Gradient Vector
--  vnl_double_3 G;
--  //: Approximation to the Hessian
--  vnl_double_3x3 H;
--};
--
--std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample);
--
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample);
--
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample);
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample);
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
-deleted file mode 100644
-index a5ca7c7bdf..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,4 +0,0 @@
--add_executable( bvpl_octree_sample_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_sample_test_include bvpl_octree_sample)
--add_executable( bvpl_octree_sample_test_template_include test_template_include.cxx )
--target_link_libraries( bvpl_octree_sample_test_template_include bvpl_octree_sample)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
-deleted file mode 100644
-index df8d03d364..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
-deleted file mode 100644
-index 075d4723fb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
-deleted file mode 100644
-index 5781fd45ca..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,35 +0,0 @@
--include_directories( ${MUL_INCLUDE_DIR} )
--
--add_executable( bvpl_octree_test_all
--  test_driver.cxx
--  test_octree_kernel_operator.cxx
--  test_octree_neighbors.cxx
--#Test EXHIBITS PATH ERRORS --  FIX_ME
--#  test_pca_kernels.cxx
--#Test FAILS --  FIX_ME
--#  test_taylor_basis.cxx
--# Test FAILS FIX_ME
--#  test_gauss3D_steerable_filters.cxx
-- )
--
--set(bvpl_octree_test_all_sources
--    test_utils.h    test_utils.cxx
--   )
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_tests_util LIBRARY_SOURCES  ${bvpl_octree_test_all_sources})
--
--target_link_libraries( bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
--target_link_libraries( bvpl_octree_test_all bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME bvpl_octree_test_kernel_operator COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_kernel_operator  )
--add_test( NAME bvpl_octree_test_neighbors COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_neighbors  )
--#add_test( NAME bvpl_octree_test_pca COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_pca_kernels )
--#add_test( NAME bvpl_octree_test_taylor_basis COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_taylor_basis )
--#add_test( NAME test_gauss3D_steerable_filters COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_gauss3D_steerable_filters )
--
--add_executable( bvpl_octree_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_test_include bvpl_octree)
--
--add_executable( bvpl_octree_test_template_include test_template_include.cxx )
--target_link_libraries( bvpl_octree_test_template_include bvpl_octree)
--
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
-deleted file mode 100644
-index b1b39e0bed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,19 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_octree_kernel_operator );
--DECLARE( test_octree_neighbors );
--//DECLARE( test_pca_kernels );//TEST EXHIBITS PATH ERRORS
--//DECLARE( test_taylor_basis );//TEST FAILS FIX_ME
--//DECLARE( test_gauss3D_steerable_filters );//TEST FAILS FIX_ME
--
--void register_tests()
--{
--  REGISTER( test_octree_kernel_operator );
--  REGISTER( test_octree_neighbors );
--  //  REGISTER( test_pca_kernels );
--  //  REGISTER( test_taylor_basis );
--  //  REGISTER( test_gauss3D_steerable_filters );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
-deleted file mode 100644
-index 47ec04a8ef..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
-+++ /dev/null
-@@ -1,127 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 24-Aug-2011
--
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--#include <bvpl_octree/bvpl_gauss3D_steerable_filters.h>
--
--void test_gauss3D_steerable_filters()
--{
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
--
--  clean_up();
--
--  //create scene
--  boxm_scene<boct_tree<short, float > > *mean_scene = create_scene(2,2,2);
--
--  //Explore mean scene
--  std::cout << "Exploring mean scene \n";
--  {
--    boxm_cell_iterator<boct_tree<short,float > > iterator = mean_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short,float > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  //create the output scenes
--  boxm_scene<out_tree_type> *scene_out =
--  new boxm_scene<out_tree_type>(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
--  scene_out->set_paths(".", "steerable_gauss_3d_scene");
--  scene_out->set_appearance_model(VNL_FLOAT_10);
--  scene_out->write_scene("steerable_gauss_3d_scene.xml");
--  mean_scene->clone_blocks_to_vector<10>(*scene_out);
--
--  //Explore Initial Response scene
--  std::cout << "Exploring initial response scene \n";
--  {
--    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  boxm_scene<boct_tree<short, bool> > *valid_scene =
--  new boxm_scene<boct_tree<short, bool> >(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
--  valid_scene->set_paths(".", "valid_scene");
--  valid_scene->set_appearance_model(BOXM_BOOL);
--  valid_scene->write_scene("valid_scene.xml");
--
--  //operate on scene
--  double cell_length = scene_out->finest_cell_length();
--  bvpl_gauss3D_steerable_filters sf;
--
--  sf.basis_response_at_leaves(scene_out, valid_scene, cell_length);
--
--
--  //Explore Response scene
--  std::cout << "Exploring response scene \n";
--  {
--    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  //rotate features according to gradient
--  sf.rotation_invariant_interpolation(scene_out, valid_scene);
--
--  //Explore Invariant Response scene
--  std::cout << "Exploring rotation invariant response scene \n";
--  {
--    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  bool result = true;
--  TEST("Valid Test", result, true);
--}
--
--
--TESTMAIN(test_gauss3D_steerable_filters);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
-deleted file mode 100644
-index a3b8a060e7..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
-+++ /dev/null
-@@ -1,24 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
--#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
--#include <bvpl/bvpl_octree/bvpl_corner_detector.h>
--#include <bvpl/bvpl_octree/bvpl_corner_functors.h>
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--#include <bvpl/bvpl_octree/bvpl_octree_kernel_operator.h>
--#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
-deleted file mode 100644
-index 73b0ddef0f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
-+++ /dev/null
-@@ -1,352 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov. 16, 2009.
--
--#include <testlib/testlib_test.h>
--
--#include "../bvpl_octree_kernel_operator.h"
--#include "../bvpl_scene_kernel_operator.h"
--#include "../bvpl_octree_vector_operator_impl.h"
--#include "../bvpl_scene_vector_operator.h"
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--
--#include <boct/boct_loc_code.h>
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--static bool debug = false;
--typedef boct_tree<short, float> tree_type;
--typedef boct_tree_cell<short, float> cell_type;
--
--
--void fill_sample_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--    tree->split();
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5);
--    if (debug)
--      for (auto & leave : leaves) {
--        std::cout<< leave->get_code().x_loc_ << ','
--                << leave->get_code().y_loc_ << ','
--                << leave->get_code().z_loc_ << ','
--                << leave->data() << std::endl;
--      }
--
--    leaves[1]->split();
--    //leaves[1]->set_data(0.6);
--  }
--
--#if 0
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (unsigned i=0; i<leaves.size(); i++) {
--      std::cout<< leaves[i]->get_code().x_loc_ << ','
--              << leaves[i]->get_code().y_loc_ << ','
--              << leaves[i]->get_code().z_loc_ << ','
--              << tree->local_origin(leaves[i]) << ','
--              << leaves[i]->get_code().level << ','
--              << tree->cell_size(leaves[i]) << ','
--              << leaves[i]->data() << std::endl;
--    }
--  }
--#endif
--}
--
--void fill_edge3d_tree(boct_tree<short,float>* tree)
--{
--  tree-> split();
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  for (unsigned i= 0; i<4; i++)
--  {
--    leaves[i]->set_data(0.2f);
--    leaves[i]->split();
--    {
--      boct_tree_cell<short,float>* cc =leaves[i]->children();
--      for (unsigned j1=0; j1<8; j1++)
--        cc[j1].split();
--    }
--    leaves[i+4]->set_data(0.9f);
--    leaves[i+4]->split();
--    {
--      boct_tree_cell<short,float>* cc =leaves[i+4]->children();
--      for (unsigned j1=0; j1<8; j1++)
--        cc[j1].split();
--    }
--    //split children
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  }
--}
--
--void octree_kernel()
--{
--  //Create kernel
--  bvpl_edge3d_kernel_factory edge_factory(-1,1,-1,0,-1,0);
--  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
--#ifdef DEBUG
--  kernel->print();
--#endif
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--  //Create the octree
--  auto *tree = new boct_tree<short,float>(3);
--  fill_sample_octree(tree);
--
--  //operate kernel on octree
--  bvpl_octree_kernel_operator<float> oper(tree);
--
--  boct_tree<short,float> *tree_out = tree->clone();
--#ifdef DEBUG
--  tree_out->print();
--#endif
--  oper.operate(functor, kernel, tree_out, 1, 0.5);
--#ifdef DEBUG
--  tree_out->print();
--#endif
--
--  TEST("Octree kernel", true, true);
--  delete tree;
--  delete tree_out;
--}
--
--void scene_kernel_operator()
--{
--  //Create kernel
--  bvpl_edge3d_kernel_factory edge_factory(-1,0,-1,0,-1,0);
--  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
--
--  //kernel->print();
--
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--
--  /***********Part1 operate on tree*******************/
--
--  //Create tree
--  typedef boct_tree<short,float > tree_type;
--  auto *tree = new boct_tree<short,float>(3);
--
--  fill_sample_octree(tree);
--
--  //operate on octree
--  bvpl_octree_kernel_operator<float> oper(tree);
--
--
--  //Create output trees
--  boct_tree<short,float > *tree_out = tree->clone();
--  tree_out->init_cells(0.0f);
--  short level = 0;
--  double cell_length = 1.0/(double)(1<<(tree->root_level() -level));
--
--  // void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
--  oper.operate(functor,kernel, tree_out, level, cell_length);
--
--
--  /***********Part2 operate on scene*******************/
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(1,1,1);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  std::string scene_path="./";
--  scene.set_paths(scene_path, "in_block");
--
--  boxm_block_iterator<tree_type>  iter =scene.iterator();
--  iter.begin();
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type> *block = scene.get_active_block();
--    block->init_tree(tree->clone());
--    scene.write_active_block();
--  }
--
--  //Create the output scenes
--  boxm_scene<boct_tree<short,float> > scene_out(lvcs, origin, block_dim, world_dim);
--  scene_out.set_paths(scene_path, "response_scene");
--
--  //operate on scene
--  bvpl_scene_kernel_operator scene_oper;
--  scene_oper.operate(scene,functor, kernel, scene_out);
--
--  //compare blocks of scene with single tree, result should be the same
--  std::vector<boct_tree_cell<short,float>* > leaves_out = tree_out->leaf_cells();
--  boxm_block_iterator<tree_type>  iter2 =scene_out.iterator();
--  bool eq=true;
--  iter2.begin();
--  for (; !iter2.end(); iter2++) {
--    scene_out.load_block(iter2.index());
--    boxm_block<tree_type> *block = scene_out.get_active_block();
--    tree_type *temp_tree = block->get_tree();
--    std::vector<boct_tree_cell<short,float>* > temp_leaves = temp_tree->leaf_cells();
--    // compare tree values
--    for (unsigned i=0; i<temp_leaves.size(); i++) {
--      if (!((temp_leaves[i]->data() == leaves_out[i]->data())))
--      {
--        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
--        eq = false;
--      }
--    }
--  }
--  TEST("tree operator == scene operator", eq, true);
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());//file_it() is deleted here
--   // vul_file::delete_file_glob(file_it());
--  }
--}
--
--void octree_vector_operator()
--{
--  //Create the vector of kernels
--  bvpl_edge3d_kernel_factory kernels_3d(-3,2, -3,2,-3,2);
--  bvpl_create_directions_a dir;
--  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
--
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--  //Create tree. this tree is initialized with 4 leves as a regular grid
--  auto *tree = new boct_tree<short,float>(4);
--
--  fill_edge3d_tree(tree);
--
--  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
--  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
--  short level = 0;
--  double cell_length = 1.0/(double)(1<<(3 -level));
--
--  bvpl_max_vector_operator<float> vector_op;
--
--  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
--
--  //test response at the center is correct
--  boct_loc_code<short> loc_code;
--
--  bool result = true;
--  for (short x=3; x<5; x++)
--    for (short y=3; y<5; y++)
--      for (short z=3; z<5; z++)
--      {
--        loc_code.set_code(x,y,z);
--        loc_code.set_level(0);
--        result = result && tree_out->get_cell(loc_code)->data().id_ == 0;
--      }
--  TEST("Octree vector operator", result, true);
--}
--
--void scene_vector_operator()
--{
--  //Create the vector of kernels
--  bvpl_edge3d_kernel_factory kernels_3d(-3,2,-3,2,-3,2);
--  bvpl_create_directions_a dir;
--  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
--
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--  /***********Part1 operate on tree*******************/
--
--  //Create tree. this tree is initialized with 4 leves as a regular grid
--  auto *tree = new boct_tree<short,float>(4);
--  fill_edge3d_tree(tree);
--
--  //Create output trees
--  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
--  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
--  short level = 0;
--  double cell_length = 1.0/(double)(1<<(3 -level));
--
--  //operate vector on tree
--  bvpl_max_vector_operator<float> vector_op;
--
--  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
--
--  /***********Part2 operate on scene*******************/
--
--  //Crete the input scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--
--  vgl_vector_3d<double> block_dim(1,1,1); //world coordinate dimensions of a block
--  vgl_vector_3d<unsigned> world_dim(2,2,2); //number of blocks in a scene
--
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  std::string scene_path("./");
--  scene.set_paths(scene_path, "scene_in");
--
--  boxm_block_iterator<tree_type>  iter =scene.iterator();
--  iter.begin();
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type> *block = scene.get_active_block();
--    block->init_tree(tree->clone());
--    scene.write_active_block();
--  }
--
--  //Create the output scenes
--  boxm_scene<boct_tree<short,bvpl_octree_sample<float> > > scene_out(lvcs, origin, block_dim, world_dim);
--  scene_out.set_paths(scene_path, "response_scene");
--
--  //operate on scene
--  bvpl_scene_vector_operator scene_oper;
--  scene_oper.operate(scene, functor, kernel_vec, scene_out);
--
--  //compare blocks of scene with single tree, result should be the same
--  std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > leaves_out = tree_out->leaf_cells();
--  boxm_block_iterator<boct_tree<short,bvpl_octree_sample<float> > >  iter2 =scene_out.iterator();
--  bool eq = true;
--  iter2.begin();
--  for (; !iter2.end(); iter2++) {
--    scene_out.load_block(iter2.index());
--    boxm_block<boct_tree<short,bvpl_octree_sample<float> > > *block = scene_out.get_active_block();
--    boct_tree<short,bvpl_octree_sample<float> > *temp_tree = block->get_tree();
--    std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > temp_leaves = temp_tree->leaf_cells();
--    // compare tree values
--    for (unsigned i=0; i<temp_leaves.size(); i++)
--      if (!((temp_leaves[i]->data().response_ == leaves_out[i]->data().response_)||
--            (temp_leaves[i]->data().id_ == leaves_out[i]->data().id_)))
--      {
--        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
--        eq = false;
--      }
--  }
--
--  TEST("tree operator == scene operator", eq, true);
--
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());//Already deletes file_it()
--  //  vul_file::delete_file_glob(file_it());
--  }
--}
--
--
--static void test_octree_kernel_operator()
--{
--  octree_kernel();
-- // octree_vector_operator(); //TEST FAIL FIX_ME
-- // scene_kernel_operator();
-- // scene_vector_operator();
-- }
--
--TESTMAIN(test_octree_kernel_operator);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
-deleted file mode 100644
-index 20a062b9f9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
-+++ /dev/null
-@@ -1,92 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov. 16, 2009.
--
--#include <testlib/testlib_test.h>
--
--#include "../bvpl_octree_neighbors.h"
--#include "../bvpl_scene_kernel_operator.h"
--#include "../bvpl_octree_vector_operator_impl.h"
--#include "../bvpl_scene_vector_operator.h"
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--
--#include <boct/boct_loc_code.h>
--
--static bool debug = false;
--typedef boct_tree<short, float> tree_type;
--typedef boct_tree_cell<short, float> cell_type;
--
--
--void fill_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--    //tree->split();
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5);
--    if (debug)
--      for (auto & leave : leaves) {
--        std::cout<< leave->get_code().x_loc_ << ','
--                << leave->get_code().y_loc_ << ','
--                << leave->get_code().z_loc_ << ','
--                << leave->data() << std::endl;
--      }
--
--    leaves[0]->split();
--    //leaves[1]->set_data(0.6);
--  }
--
--#if 0
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (unsigned i=0; i<leaves.size(); i++) {
--      std::cout<< leaves[i]->get_code().x_loc_ << ','
--              << leaves[i]->get_code().y_loc_ << ','
--              << leaves[i]->get_code().z_loc_ << ','
--              << tree->local_origin(leaves[i]) << ','
--              << leaves[i]->get_code().level << ','
--              << tree->cell_size(leaves[i]) << ','
--              << leaves[i]->data() << std::endl;
--    }
--  }
--#endif
--}
--
--static void test_octree_neighbors()
--{
--  auto* tree = new boct_tree<short,float>(4,3);
--  fill_octree(tree);
--  bvpl_kernel_iterator iter;
--  vgl_point_3d<int> min_pt(-1,-1,-1);
--  vgl_point_3d<int> max_pt(1,1,1);
--  for (int i=min_pt.x(); i<=max_pt.x(); i++) {
--    for (int j=min_pt.y(); j<=max_pt.y(); j++) {
--      for (int k=min_pt.z(); k<=max_pt.z(); k++) {
--        iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
--      }
--    }
--  }
--  bvpl_kernel_sptr kernel= new bvpl_kernel(iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0),0.0f, vgl_vector_3d<int>(3,3,3), min_pt,max_pt);
--
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  bvpl_octree_neighbors<float> neighb(tree);
--  for (auto cell : leaves) {
--    std::cout << cell->code_
--             << "THIS   " << tree->local_origin(cell) << std::endl;
--    std::vector<boct_tree_cell<short,float> *> neighb_cells;
--    neighb.neighbors(kernel, cell, neighb_cells);
--    std::cout << "Number of neighbors: " << neighb_cells.size() << std::endl;
--    for (auto & neighb_cell : neighb_cells) {
--      std::cout << "  " << tree->local_origin(neighb_cell) << std::endl;
--    }
--  }
--}
--
--TESTMAIN(test_octree_neighbors);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
-deleted file mode 100644
-index 602b9b14c6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
-+++ /dev/null
-@@ -1,304 +0,0 @@
--//:
--// \file
--// \brief : Tests bvpl/PCA operations
--// \author Isabel Restrepo
--// \date 17-Nov-2010
--
--#include <testlib/testlib_test.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include "test_utils.h"
--
--#include <vnl/vnl_vector.h>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_matrix.h>
--#include <vnl/vnl_matrix_fixed.h>
--
--#include <vul/vul_file.h>
--#include <vpl/vpl.h>
--
--void test_kernel_set_up()
--{
--  bool result=true;;
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
--  //neighborhood box for volume "patches" 3x3x3
--   vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-1,-1,-1), vgl_point_3d<int>(1,1,1));
--  //number of samples - 10% of total number of leaf-cells
--  unsigned long nsamples = (unsigned long)((double)scene->size() * 0.1);
--
--  clean_up("./evd", "*.txt");
--  vpl_mkdir("./evd",0777);
--  clean_up("./svd", "*.txt");
--  vpl_mkdir("./svd",0777);
--
--  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, "./evd");
--  bvpl_discover_pca_kernels pca_extractor_svd(neighborhood, nsamples, scene, "./svd", false);
--
--
--  //XML write
--  pca_extractor.xml_write();
--  pca_extractor_svd.xml_write();
--
--  //training errorr
--  vnl_vector<double> verror;
--  vnl_vector<double> t_verror;
--  vnl_vector<double> testing_error;
--  pca_extractor.compute_training_error(verror);
--  pca_extractor.theoretical_training_error(t_verror);
--  pca_extractor.compute_testing_error(testing_error);
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_pca_kernels - 1 " << boct_tree_cell<short, float >::nleaks() << '\n';
--#endif
--
--  result = verror[verror.size()-1] < 1.0e-7;
--  TEST("Test training error:", result, true);
--
--  bvpl_discover_pca_kernels pca_extractor2("./evd");
--  vnl_vector<double> verror2;
--  pca_extractor2.compute_training_error(verror2);
--  vnl_vector<double> test_error2;
--  pca_extractor2.compute_testing_error(test_error2);
--
--  //Load from XML file - and check that clases are the same
--  result = pca_extractor.principal_comps().is_equal(pca_extractor2.principal_comps(), 1.0e-9);
--  TEST("Test xml_write PC:", result, true);
--
--  result = pca_extractor.weights().is_equal(pca_extractor2.weights(), 1.0e-9);
--  TEST("Test xml_write weights:", result, true);
--
--  result = pca_extractor.mean().is_equal(pca_extractor2.mean(), 1.0e-9);
--  TEST("Test xml_write mean:", result, true);
--
--  result = pca_extractor.feature_dim()== pca_extractor2.feature_dim();
--  TEST("Test xml_write feature dim:", result, true);
--
--  result = pca_extractor.nsamples()== pca_extractor2.nsamples();
--  TEST("Test xml_write nsamples :", result, true);
--
--  result = verror.is_equal(t_verror, 1.0e-9);
--  TEST("Test training errors agrees with theoretical value:", result, true);
--
--  result = testing_error.squared_magnitude() > t_verror.squared_magnitude();
--  TEST("Test testing error > training error:", result, true);
--
--  result = testing_error.is_equal(test_error2, 1.0e-9);
--  TEST("Testing errors are equal:", result, true);
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_pca_kernels - 2 " << boct_tree_cell<short, float >::nleaks() << '\n';
--#endif
--
--#if 0
--  std::cout<< "error : " << verror << '\n'
--          << "t_error : " << t_verror << '\n'
--          << "weights : " << pca_extractor.weights() << '\n'
--
--          << "error 1: " << verror << '\n'
--          << "error 2: " << verror2 << '\n'
--
--          << "mean 1: " << pca_extractor.mean() << '\n'
--          << "mean 2: " << pca_extractor2.mean() << '\n'
--
--          << "path 1: " << pca_extractor.scene_path() << '\n'
--          << "path 2: " << pca_extractor2.scene_path() << std::endl;
--#endif
--}
--
--void test_global()
--{
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene(3,3,3);
--  //neighborhood box for volume "patches" 5x5x5
--  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-2,-2,-2), vgl_point_3d<int>(2,2,2));
--  //number of samples - 10% of total number of leaf-cells
--  double training_fraction = 1.0;
--  unsigned long nsamples = (unsigned long)((double)scene->size() * training_fraction);
--  double finest_cell_length = scene->finest_cell_length();
--
--  clean_up("./pca_info", "*.txt");
--  vpl_mkdir("./pca_info",0777);
--  clean_up("./pca_global_info", "*.txt");
--  vpl_mkdir("./pca_global_info",0777);
--
--  bvpl_discover_pca_kernels pca_info(neighborhood, nsamples, scene, "./pca_info");
--  pca_info.xml_write();
--
--  std::vector<std::string> scenes;
--  std::vector<std::string> aux_paths;
--  std::vector<double> cell_lengths;
--  scenes.push_back("./test_scene.xml");
--  aux_paths.push_back(".");
--  cell_lengths.push_back(finest_cell_length);
--
--  boxm_scene<boct_tree<short, int> > *aux_scene =
--  new boxm_scene<boct_tree<short, int> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  aux_scene->set_appearance_model(BOXM_INT);
--
--  std::string scene_name = "test_aux_scene";
--  std::string scene_path(vul_file::get_cwd());
--  aux_scene->set_paths(scene_path, scene_name);
--  aux_scene->write_scene("./test_aux_scene.xml");
--
--  bvpl_global_pca<125> pca_global_info(scenes, aux_paths,cell_lengths, neighborhood,training_fraction, "./pca_global_info");
--  pca_global_info.xml_write();
--
--  vnl_matrix<double> s1 = pca_info.compute_scatter_matrix(scene);
--
--  unsigned file =0;
--  for (unsigned i = 0; i < 3; i++)
--    for (unsigned j = 0; j < 3; j++)
--      for (unsigned k = 0; k < 3; k++) {
--        vnl_matrix_fixed<double, 125, 125> S;
--        vnl_vector_fixed<double, 125> mean;
--        unsigned long nfeature =0L;
--        pca_global_info.sample_statistics(0, i, j, k, S, mean, nfeature);
--
--        std::stringstream scatter_ss;
--        scatter_ss << pca_global_info.path_out() << "/S_" << 0 << '_' <<file<< ".txt";
--        std::ofstream scatter_ofs(scatter_ss.str().c_str());
--        scatter_ofs.precision(15);
--        scatter_ofs << S;
--
--        std::stringstream mean_ss;
--        mean_ss <<  pca_global_info.path_out() << "/mean_" << 0 << '_'  <<file << ".txt";
--        std::ofstream mean_ofs ( mean_ss.str().c_str() );
--        mean_ofs.precision(15);
--        mean_ofs << nfeature << '\n' << mean;
--        file++;
--      }
--
--  //read pairwise
--
--  unsigned nrepeat = 0; // will become ceil(log_2(file)) after this iteration
--  unsigned orig_file = file;
--  for (unsigned pow_of_2 = 1; pow_of_2 < orig_file; pow_of_2*=2,++nrepeat) // i.e.: ceil(log_2(file)) iterations
--  {
--    unsigned file_p = 0;
--    unsigned nfiles = 0;
--    for (; file_p < file; file_p+=2, ++nfiles)
--    {
--      vnl_matrix_fixed<double, 125, 125> S1(0.0);
--      vnl_vector_fixed<double, 125> mean1(0.0);
--      unsigned long nfeatures1 =0;
--
--      {
--        std::stringstream scatter_ss;
--        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p << ".txt";
--        std::ifstream scatter_ifs(scatter_ss.str().c_str());
--        scatter_ifs >> S1;
--        std::stringstream mean_ss;
--        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << file_p << ".txt";
--        std::ifstream mean_ifs ( mean_ss.str().c_str() );
--        mean_ifs >> nfeatures1;
--        mean_ifs >> mean1;
--#if 0
--        vul_file::delete(scatter_ss.str());
--        vul_file::delete(mean_ss.str());
--#endif
--      }
--
--      vnl_matrix_fixed<double, 125, 125> S2(0.0);
--      vnl_vector_fixed<double, 125> mean2(0.0);
--      unsigned long nfeatures2 =0;
--
--      {
--        std::stringstream scatter_ss;
--        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p + 1  << ".txt";
--        std::ifstream scatter_ifs(scatter_ss.str().c_str());
--        scatter_ifs >> S2;
--        std::stringstream mean_ss;
--        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_' << file_p + 1 << ".txt";
--        std::ifstream mean_ifs ( mean_ss.str().c_str() );
--        mean_ifs >> nfeatures2;
--        mean_ifs >> mean2;
--      }
--
--      vnl_matrix_fixed<double, 125, 125> S_out(0.0);
--      vnl_vector_fixed<double, 125> mean_out(0.0);
--      double nfeatures_out =0.0;
--      bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
--
--      std::stringstream scatter_ss;
--      scatter_ss <<pca_global_info.path_out()  << "/S_" << (nrepeat+1) << '_' << file_p/2  << ".txt";
--      std::ofstream scatter_ofs(scatter_ss.str().c_str());
--      scatter_ofs.precision(15);
--      scatter_ofs << S_out;
--
--      std::stringstream mean_ss;
--      mean_ss << pca_global_info.path_out() << "/mean_" <<  (nrepeat+1) << '_' << file_p/2<< ".txt";
--      std::ofstream mean_ofs ( mean_ss.str().c_str() );
--      mean_ofs.precision(15);
--      mean_ofs << nfeatures_out << '\n' << mean_out;
--    }
--    file = nfiles;
--  }
--
--  //load final mean and scatter
--  vnl_matrix_fixed<double, 125, 125> S_total(0.0);
--  vnl_vector_fixed<double, 125> mean_total(0.0);
--  unsigned long nfeatures_total =0;
--
--
--  std::stringstream scatter_ss;
--  scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat<< '_' << 0 << ".txt";
--  std::ifstream scatter_ifs(scatter_ss.str().c_str());
--  scatter_ifs >> S_total;
--  std::stringstream mean_ss;
--  mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << 0 << ".txt";
--  std::ifstream mean_ifs ( mean_ss.str().c_str() );
--  mean_ifs >> nfeatures_total;
--  mean_ifs >> mean_total;
--
--
--  std::cout << "Scatter diff:\n " << ((s1  - S_total).array_two_norm()) << '\n'
--           << "Mean diff:\n " << (pca_info.mean()  - mean_total).two_norm() << '\n';
--
--  clean_up("./pca_info", "*.txt");
--  clean_up("./pca_global_info", "*.txt");
--#if 0
--  pca_global_info.compute_statistics();
--#endif
--  //compare results
--}
--
--
--void test_pca_kernels()
--{
--  clean_up();
--
--  //make up a matrix
--  vnl_matrix<double> data(2, 10);
--  unsigned i =0;
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.69f, 0.49f));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-1.31f, -1.21f));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.39, 0.99));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.09, 0.29));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(1.29, 1.09));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.49, 0.79));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.19, -0.31));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.81, -0.81));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.31, -0.31));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.71, -1.01));
--
--  bvpl_discover_pca_kernels pca_extractor(data);
--
--  vnl_matrix<double> pc = pca_extractor.principal_comps();
--
--  vnl_matrix<double> true_pc(2,2);
--  i =0;
--  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.677873, -0.735179));
--  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.735179, 0.677873));
--
--  bool result = true_pc.is_equal(pc, 0.001);
--  TEST("Test pc equals true_pc", result, true);
--
--  test_kernel_set_up();
--  test_global();
--  clean_up();
--}
--
--
--TESTMAIN(test_pca_kernels);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
-deleted file mode 100644
-index 4e5a30d980..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
-+++ /dev/null
-@@ -1,143 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 11-Feb-2011
--
--#include <iostream>
--#include <map>
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--#include <vul/vul_file.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vnl/vnl_sym_matrix.h>
--
--void create_basis(std::string test_dir, std::map<std::string, float> &values)
--{
--  //generate basis paths
--  if (!vul_file::is_directory(test_dir))
--    vul_file::make_directory(test_dir);
--
--  vul_file::change_directory(test_dir);
--
--  bvpl_taylor_basis_loader loader(test_dir);
--
--  std::vector<std::string> basis_names;
--  loader.files(basis_names);
--
--  //make the basis directories
--  for (unsigned i= 0; i<basis_names.size(); i++)
--  {
--    std::string basis_dir = vul_file::get_cwd()+ "/" + basis_names[i];
--    if (!vul_file::is_directory(basis_dir))
--      vul_file::make_directory(basis_dir);
--
--    vul_file::change_directory(basis_dir);
--
--    create_scene(1,1,1, true, float(i), "float_response_scene");
--
--    vul_file::change_directory("..");
--
--    values.insert(std::pair<std::string, float>(basis_names[i], float(i)));
--  }
--}
--
--void test_assemble_basis(bvpl_taylor_scenes_map_sptr taylor_scenes, std::map<std::string, float> &values)
--{
--  bvpl_taylor_basis::assemble_basis(taylor_scenes, 0, 0, 0);
--
--  //retieve the basis seen and check vectors and matrices
--  double I0 = values["I0"];
--
--  vnl_vector<double> G(3);
--  G[0] = values["Ix"];
--  G[1] = values["Iy"];
--  G[2] = values["Iz"];
--
--  double H_as_vector[6];
--  H_as_vector[0] = values["Ixx"];
--  H_as_vector[1] = values["Ixy"];
--  H_as_vector[2] = values["Iyy"];
--  H_as_vector[3] = values["Ixz"];
--  H_as_vector[4] = values["Iyz"];
--  H_as_vector[5] = values["Izz"];
--  vnl_sym_matrix<double> H(H_as_vector, 3);
--
--  std::cout << "IO: " << I0 << "\nG: " << G <<"\nH: " << H.as_matrix() << std::endl;
--
--  boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* basis_scene = dynamic_cast<boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* > (taylor_scenes->get_scene("basis").as_pointer());
--  basis_scene->load_block(0, 0, 0);
--
--  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* > basis_leaves = basis_scene->get_block(0, 0, 0)->get_tree()->leaf_cells();
--
--  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* >::iterator it = basis_leaves.begin();
--  bool result = true;
--  for (; it!= basis_leaves.end(); it++)
--  {
--    bvpl_taylor_basis2_sample sample = (*it)->data();
--    if (sample.I0!=I0){
--      result = false;
--      std::cout << sample << std::endl;
--    }
--
--    if (!((sample.G.as_vector()).is_equal(G, 1e-7))){
--      result = false;
--      std::cout << sample << std::endl;
--    }
--
--    if (!((sample.H.as_matrix()).is_equal(H.as_matrix(), 1e-7))){
--      result = false;
--      std::cout << sample << std::endl;
--    }
--  }
--
--  TEST("Test assemble basis", result, true);
--}
--
--
--void test_taylor_basis()
--{
--  //generate basis
--  std::string basis_dir = "./taylor_basis";
--  std::map<std::string, float> values;
--  create_basis(basis_dir, values);
--
--  //load map of scenes into memory
--  bvpl_taylor_basis_loader loader(vul_file::get_cwd());
--  std::cout << vul_file::get_cwd() << std::endl;
--  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
--
--
--  //test assembling
--  test_assemble_basis(taylor_scenes, values);
--
--  //test computing error
--  boxm_scene<boct_tree<short, float> >* data_scene = create_scene(2,2,2, true, 1.0f, "data_scene");
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
--  double cell_length = data_scene->finest_cell_length();
--  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),error_scene,loader,0,0,0, cell_length);
--
--  error_scene->load_block(0,0,0);
--  std::cout.precision(15);
--  error_scene->get_block(0,0,0)->get_tree()->print();
--
--  unsigned long tree_ncells = error_scene->get_block(0,0,0)->get_tree()->size();
--  unsigned long scene_ncells = error_scene->size();
--  unsigned long nsamples = scene_ncells*100L;
--
--  //number of samples - 10% of total number of leaf cells
--  unsigned long tree_nsamples = (unsigned long)(float(tree_ncells)/scene_ncells*nsamples);
--  double error = bvpl_taylor_basis::sum_errors(error_scene,0,0,0, tree_nsamples);
--
--  TEST_NEAR("Test average error", error, 131737.5, 1e-7);
--}
--
--
--TESTMAIN(test_taylor_basis);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
-deleted file mode 100644
-index 2932c2a301..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
-deleted file mode 100644
-index 39bffed911..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
-+++ /dev/null
-@@ -1,94 +0,0 @@
--#include "test_utils.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Aug-2010
--
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val)
--{
--  tree-> split(); //now we have 8 cells
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  leaves[i]->set_data(init_val);
--  leaves[i]->split();
--
--  boct_loc_code<short> code = leaves[i]->get_code() ;
--  std::cerr<< "Create Scene Code: " << code << std::endl;
--}
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz,
--                                                   bool uniform, float val, const std::string& scene_prefix)
--{
--  float init_val = 0.5f;
--
--  if (uniform)
--    init_val = val;
--
--  //crete the input scene
--  unsigned int max_tree_level = 3;
--  unsigned int init_level = 1;
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--
--  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
--
--  vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
--
--  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim, max_tree_level, init_level );
--  std::string scene_path(vul_file::get_cwd());
--  scene->set_paths(scene_path, scene_prefix);
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->write_scene(scene_prefix + ".xml");
--  unsigned cell_index = 7;
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  while (!iter.end())
--  {
--    scene->load_block(iter.index());
--    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
--    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
--    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
--    //tree->print();
--    if (uniform)
--      init_tree(tree, cell_index, init_val);
--    else
--      init_tree(tree, cell_index);
--    //tree->print();
--    block->init_tree(tree);
--    scene->write_active_block();
--    if (cell_index == 0) cell_index = 7;
--    cell_index--;
--    ++iter;
--  }
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << std::endl;
--#endif
--  return scene;
--}
--
--
--void clean_up()
--{
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());// this deletes the file at file_it()
--    //    vul_file::delete_file_glob(file_it());
--  }
--}
--
--void clean_up(const std::string& dir, const std::string& ext)
--{
--  //clean temporary files
--  vul_file_iterator file_it(dir+"/"+ext);
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());
--    vul_file::delete_file_glob(file_it());
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
-deleted file mode 100644
-index f2c915a5cb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
-+++ /dev/null
-@@ -1,20 +0,0 @@
--#ifndef bvpl_octree_test_utils_h_
--#define bvpl_octree_test_utils_h_
--//:
--// \file
--// \brief  A file containing utility functions for other tests
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <boxm/boxm_scene.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val = 0.8);
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
--                                                   bool uniform = false, float val = 0.5, const std::string& scene_prefix = "test_scene");
--
--void clean_up();
--
--void clean_up(const std::string& dir, const std::string& ext);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-index 4279f1e47d..3e7108103d 100644
---- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-@@ -19,7 +19,7 @@ if(EXPAT_FOUND)
- 
-   vxl_add_library(LIBRARY_NAME bvpl_kernels_pro LIBRARY_SOURCES ${bvpl_kernels_pro_sources})
- 
--  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io bvpl_octree bvpl_octree_io bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
-+  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io  bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
- 
-   if( BUILD_TESTING )
-     add_subdirectory(tests)
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-deleted file mode 100644
-index ee1188aea5..0000000000
---- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-deleted file mode 100644
-index 25a60ca12c..0000000000
---- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
-index 71a463d5d7..cb9febce0d 100644
---- a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
-+++ b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
-@@ -25,7 +25,6 @@ void bvpl_kernels_register::register_process()
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_corner2d_kernel_process, "bvplCreateCorner2dKernelProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_gauss3d_xx_kernel_vector_process, "bvplCreateGauss3dXXKernelVectorProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_wc_kernel_vector_process, "bvplCreateWCKernelVectorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_kernel_process, "bvplLoadTaylorKernelProcess");
-   REG_PROCESS_FUNC_CONS2(bvpl_create_gauss3d_kernel_process);
-   REG_PROCESS_FUNC_CONS2(bvpl_create_generic_kernel_vector_process);
-   REG_PROCESS_FUNC_CONS2(bvpl_write_generic_kernel_vector_process);
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx b/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
-deleted file mode 100644
-index c56d9cdb15..0000000000
---- a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
-+++ /dev/null
-@@ -1,53 +0,0 @@
--//:
--// \file
--// \brief A process to load taylor response scenes into memory
--// \author Isabel Restrepo
--// \date 9-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--//:global variables
--namespace bvpl_load_taylor_responses_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_taylor_responses_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_responses_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; //parent dir of responses
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_taylor_scenes_map_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_taylor_responses_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_responses_process_globals;
--
--  //get inputs
--  std::string parent_dir = pro.get_input<std::string>(0);
--
--  bvpl_taylor_basis_loader loader(parent_dir);
--  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
--
--  //store output
--  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-deleted file mode 100644
-index 3bf956ba6c..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-+++ /dev/null
-@@ -1,44 +0,0 @@
--# contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
--include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
--if( PYTHON_FOUND )
--  FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--  if( EXPAT_FOUND )
--    include_directories( ${PYTHON_INCLUDE_DIRS} )
--    include_directories( ${BRL_INCLUDE_DIR} )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree)
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
--
--     set(bvpl_octree_batch_sources
--       reg_bvpl_octree.h   reg_bvpl_octree.cxx
--     )
--    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
--      vxl_add_library(LIBRARY_NAME bvpl_octree_batch LIBRARY_SOURCES SHARED ${bvpl_octree_batch_sources})
--
--      #In windows, library has to have different name depending on debug or release version.
--      if(WIN32)
--        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch DEBUG_POSTFIX _d SUFFIX .pyd)
--      endif()
--      if(APPLE) #This is because python only looks for .so
--        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch SUFFIX .so)
--      endif()
--      set_target_properties(bvpl_octree_batch PROPERTIES PREFIX "")
--
--      target_link_libraries(bvpl_octree_batch bvpl_octree_pro bvpl_kernels_pro bpro_batch boxm_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro)
--
--      if(PYTHON_DEBUG_LIBRARIES)
--        target_link_libraries( bvpl_octree_batch debug ${PYTHON_DEBUG_LIBRARY})
--      endif()
--
--      if(PYTHON_LIBRARIES)
--        target_link_libraries( bvpl_octree_batch optimized ${PYTHON_LIBRARY})
--      endif()
--
--      if( BUILD_TESTING )
--        add_subdirectory(tests)
--      endif()
--    endif()
--  endif()
--endif()
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
-deleted file mode 100644
-index d2df8b6752..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--#include "reg_bvpl_octree.h"
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--
--// processes
--#include <bvpl/kernels/pro/bvpl_kernels_register.h>
--#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
--#include <boxm/pro/boxm_register.h>
--#include <boxm/algo/pro/boxm_algo_register.h>
--#include <vpgl_pro/vpgl_register.h>
--
--PyObject *
--register_processes(PyObject *self, PyObject *args)
--{
--  bvpl_kernels_register::register_process();
--  bvpl_octree_register::register_process();
--  boxm_register::register_process();
--  boxm_algo_register::register_process();
--  vpgl_register::register_process();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--PyObject *
--register_datatypes(PyObject *self, PyObject *args)
--{
--  register_basic_datatypes();
--  bvpl_kernels_register::register_datatype();
--  bvpl_octree_register::register_datatype();
--  boxm_register::register_datatype();
--  boxm_algo_register::register_datatype();
--  vpgl_register::register_datatype();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--PyMODINIT_FUNC
--initbvpl_octree_batch(void)
--{
--  PyMethodDef reg_pro;
--  reg_pro.ml_name = "register_processes";
--  reg_pro.ml_meth = register_processes;
--  reg_pro.ml_doc = "register_processes() create instances of each defined process";
--  reg_pro.ml_flags = METH_VARARGS;
--
--
--  PyMethodDef reg_data;
--  reg_data.ml_name = "register_datatypes";
--  reg_data.ml_meth = register_datatypes;
--  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
--  reg_data.ml_flags = METH_VARARGS;
--
--  bvpl_octree_batch_methods[0]=reg_pro;
--  bvpl_octree_batch_methods[1]=reg_data;
--
--  for (int i=0; i<METHOD_NUM; ++i) {
--    bvpl_octree_batch_methods[i+2]=batch_methods[i];
--  }
--
--  Py_InitModule("bvpl_octree_batch", bvpl_octree_batch_methods);
--}
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
-deleted file mode 100644
-index 4aad2e3dcb..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#ifndef reg_bvpl_octree_h_
--#define reg_bvpl_octree_h_
--
--#include <bpro/bpro_batch/bpro_batch.h>
--
--static PyObject *register_processes(PyObject *self, PyObject *args);
--static PyObject *register_datatypes(PyObject *self, PyObject *args);
--static PyMethodDef bvpl_octree_batch_methods[METHOD_NUM+2];
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
-deleted file mode 100644
-index 1cc8664ce3..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( bvpl_octree_batch_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_batch_test_include bvpl_octree_batch)
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx b/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
-deleted file mode 100644
-index 292774691a..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl_octree_batch/reg_bvpl_octree.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
-index a387778a0c..0505293103 100644
---- a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
-@@ -5,14 +5,13 @@ include_directories( ${BRL_INCLUDE_DIR}/bseg/bvxm )
- set(bvxm_algo_sources
-     bvxm_merge_mog.h     bvxm_merge_mog.cxx
-     bvxm_mog_norm.h      bvxm_mog_norm.hxx
--    bvxm_boxm_convert.h
-    )
- 
- aux_source_directory(Templates bvxm_algo_sources)
- 
- vxl_add_library(LIBRARY_NAME bvxm_algo LIBRARY_SOURCES ${bvxm_algo_sources})
- 
--target_link_libraries( bvxm_algo bsta bvxm_grid_io boxm_util ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
-+target_link_libraries( bvxm_algo bsta ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
- 
- add_subdirectory(pro)
- 
-diff --git a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h b/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
-deleted file mode 100644
-index d2b4e815e6..0000000000
---- a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
-+++ /dev/null
-@@ -1,152 +0,0 @@
--// This is brl/bseg/bvxm/algo/bvxm_boxm_convert.h
--#ifndef bvxm_boxm_convert_h
--#define bvxm_boxm_convert_h
--//:
--// \file
--// \brief Set of functions that convert a boxm_scene to a bvxm grid
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Jan 15, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#include <bvxm/grid/bvxm_voxel_grid.h>
--#include <bvxm/grid/bvxm_voxel_grid_basic_ops.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/util/boxm_cell_data_traits.h>
--
--template <class T_loc, class T_data>
--bvxm_voxel_grid<T_data>* boxm_scene_to_bvxm_grid(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                                 std::string input_path,
--                                                 unsigned int resolution_level,
--                                                 bool enforce_level = false )
--{
--  //Print a little reminder that no inter/extra-polation happens in this function
--  std::cout << "Convertion boxm_scene to bvxm_grid\n"
--           << "Current resolution level: " << resolution_level << '\n'
--           << "Enforcing only level cells ? " << enforce_level << '\n'
--           << "Is grid saving internal nodes? " <<scene.save_internal_nodes() << std::endl;
--
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  // create an array for each block, and save in a binary file
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  unsigned int finest_level=100000;
--  // find the finest levels in the blocks
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    tree_type* tree = block->get_tree();
--    if (tree->finest_level() < int(finest_level)) {
--      finest_level = tree->finest_level();
--    }
--    ++iter;
--  }
--
--  // do not make the resolution smaller than finest level
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--
--  // make sure the resolution level for all trees is the same
--  iter.begin();
--  short root_level = 0;
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    tree_type* tree = block->get_tree();
--    root_level = tree->root_level();
--  }
--
--  // make sure root level is the same for all the trees
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    tree_type* tree = block->get_tree();
--    if (tree->root_level() != root_level)
--    {
--      std::cerr << "Error converting boxm_scene to bvxm_grid: blocks have different root level\n";
--    }
--    iter++;
--  }
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 1 << (root_level - (int)resolution_level);
--
--  std::cout << "Number of cells per grid side: " << ncells << '\n';
--
--  //create the regular grid
--  vgl_vector_3d<unsigned> dim = scene.world_dim(); //number of blocks in the scene
--  unsigned dimx = dim.x()*ncells; // total number of cells in the scene x-dim
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  bvxm_voxel_grid<T_data> *grid = new bvxm_voxel_grid<T_data>(input_path,vgl_vector_3d<unsigned>(dimx,dimy,dimz));
--  T_data data_init(boxm_zero_val<T_loc, T_data>());
--  grid->initialize_data(data_init);
--
--  std::cout << "Grid Size: " << vgl_vector_3d<unsigned>(dimx,dimy,dimz) << '\n'
--           << "In boxm_scene_to_bxm_grid, default voxel value for the grid is: " << data_init << std::endl;
--
--  //iterate through grid, locate corresponding position in the octree
--  typename bvxm_voxel_grid<T_data>::iterator grid_it=grid->begin();
--
--  //locate point in the tree, for now assume ONLY ONE BLOCK
--  iter.begin();
--  vgl_point_3d<int> idx = iter.index();
--  scene.load_block(idx);
--  boxm_block<tree_type>* block = scene.get_block(idx);
--  tree_type* tree = block->get_tree();
--#if 0
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  // assume that bounding box is a cube
--  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--#endif
--
--  for (unsigned z=0; z<dimz; ++grid_it, ++z)
--  {
--    bvxm_voxel_slab<T_data> slab = (*grid_it);
--    std::cout << '.' <<std::flush ;
--    for (unsigned y=0; y<dimy;++y)
--    {
--      for (unsigned x=0; x<dimx; ++x)
--      {
--        vgl_point_3d<double> p(((double)x/(double)dimx), ((double)y/(double)dimy), (0.99 - (double)z/(double)dimz));
--        //locate the cell containing the point closest to the specified level
--        boct_tree_cell<T_loc,T_data>* this_cell = tree->locate_point_at_level(p, resolution_level,true);
--
--        if (!this_cell) {
--          std::cerr << "In boxm_scene_to_bvxm_grid: cell out of bounds\n";
--          continue;
--        }
--
--        unsigned int level = this_cell->get_code().level;
--        T_data cell_val = this_cell->data();
--
--        if (level < resolution_level)
--          std::cerr << "In boxm_scene_to_bvxm_grid: current level smaller than target level\n";
--
--        //if enfoce level is true, there is no iter/extrapolation
--        if ((enforce_level)&& (level != resolution_level))
--          continue;
--
--        // just copy value to output grid
--        slab(x,y) = cell_val;
--      }
--    }
--  }
--  std::cout << '\n';
--  return grid;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-index 4917b6eb59..3a0824d257 100644
---- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-@@ -18,7 +18,8 @@ FIND_PACKAGE(EXPATPP REQUIRED)
-   aux_source_directory(processes bvxm_algo_pro_sources)
- 
-   vxl_add_library(LIBRARY_NAME bvxm_algo_pro LIBRARY_SOURCES ${bvxm_algo_pro_sources} )
--  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
-+  #target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
-+  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
- 
-   if( BUILD_TESTING )
-     add_subdirectory(tests)
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
-index 69e97478e7..8b9ad6d7f6 100644
---- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
-+++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
-@@ -8,6 +8,6 @@
- DECLARE_FUNC_CONS(bvxm_merge_mog_process);
- DECLARE_FUNC_CONS(bvxm_mog_to_mpm_process);
- DECLARE_FUNC_CONS(bvxm_mog_l2_distance);
--DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
-+//DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
- 
- #endif
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
-index a7b2141026..a4f1e49d9d 100644
---- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
-+++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
-@@ -19,5 +19,5 @@ void bvxm_algo_register::register_process()
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_merge_mog_process, "bvxmMergeMogProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_to_mpm_process, "bvxmMogToMpmProcess");
-  // REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_l2_process, "bvxmMogL2Process");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
-+  //  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
- }
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx b/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
-deleted file mode 100644
-index cfc6175b03..0000000000
---- a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--// This is brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
--#include <bvxm/algo/bvxm_boxm_convert.h>
--//:
--// \file
--// \brief  Process to convert a boxm_scene to a bvxm_voxel_grid
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Jan 19, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_gauss_if3.h>
--
--
--namespace boxm_scene_to_bvxm_grid_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 4 inputs and 1 output.
--// input[0]: The scene
--// input[1]: Path to output grid
--// input[2]: Resolution level
--// input[3]: Bool: Enforce only cells at the resolution leve?
--//           If true, there is no interpolation
--// output[0]: The output grid
--
--bool boxm_scene_to_bvxm_grid_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_scene_to_bvxm_grid_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvxm_voxel_grid_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_scene_to_bvxm_grid_process(bprb_func_process& pro)
--{
--  using namespace boxm_scene_to_bvxm_grid_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cerr << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string filepath = pro.get_input<std::string>(1);
--  unsigned resolution_level = pro.get_input<short>(2);
--  bool enforce_level = pro.get_input<bool>(3);
--
--  static const unsigned int n_gaussian_modes_ = 3;
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
--  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
--
--  //check input's validity
--  if (!scene_base.ptr())
--  {
--    std::cerr << pro.name() << ": -- Input scene is not valid!\n";
--    return false;
--  }
--
--  if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_base.as_pointer()))
--  {
--    bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level,enforce_level);
--    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
--    return true;
--  }
--  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_base.as_pointer()))
--  {
--    bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
--    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
--    return true;
--  }
--  else if ( auto *scene =
--            dynamic_cast<boxm_scene< boct_tree<short, mix_gauss_sf1_type > > * >(scene_base.as_pointer()))
--  {
--    bvxm_voxel_grid<mix_gauss_sf1_type > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
--    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
--    return true;
--  }
--  else
--  {
--    std::cerr << "It's not possible to convert input scene to a bvxm grid\n";
--    return false;
--  }
--}
--
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vbl/vbl_array_3d.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef bsta_num_obs<bsta_mixture_fixed<gauss_type,3> > mixture_type;
--typedef boct_tree<short,mixture_type> tree_type;
--typedef boxm_block<tree_type> block_type;
--
--BOCT_TREE_INSTANTIATE(short,mixture_type);
--BOCT_TREE_CELL_INSTANTIATE(short,mixture_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--BOXM_BLOCK_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(block_type);
--
--void vsl_b_write(vsl_b_ostream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
--void vsl_b_read(vsl_b_istream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
--void vsl_b_read(vsl_b_istream&, bsta_gaussian_sphere<float,1>&) {}
--//bool operator==(block_type const&, block_type const&) { return false; }
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
-index 1110054d05..d9d1c54305 100644
---- a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
-@@ -2,15 +2,12 @@ add_executable( bvxm_algo_test_all
-   test_driver.cxx
-   test_merge_mog.cxx
-   test_mog_norm.cxx
--# causes memory allocation errors (FIX_ME)
--#  test_boxm_scene_to_bvxm_grid.cxx
- )
- 
- target_link_libraries( bvxm_algo_test_all bvxm_algo bvxm_grid ${VXL_LIB_PREFIX}testlib bsta)
- 
- add_test( NAME bvxm_algo_test_merge_mog COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_merge_mog )
- add_test( NAME bvxm_algo_test_mog_norm COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_mog_norm )
--#add_test( NAME bvxm_algo_test_boxm_scene_to_bvxm_grid COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_boxm_scene_to_bvxm_grid)
- 
- add_executable( bvxm_algo_test_include test_include.cxx )
- target_link_libraries( bvxm_algo_test_include bvxm_algo)
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
-deleted file mode 100644
-index cf5dfe2b40..0000000000
---- a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
-+++ /dev/null
-@@ -1,111 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Jan 19, 2010.
--
--#include <testlib/testlib_test.h>
--#include <bvxm/algo/bvxm_boxm_convert.h>
--#include <boxm/boxm_apm_traits.h>
--
--const bool debug = true;
--
--void fill_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--  tree->init_cells(0.1f);
--  tree->split();
--  std::cout << "Level 1" << std::endl;
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5f);
--    if (debug)
--      for (unsigned i=0; i<leaves.size(); i++) {
--        std::cout << leaves[i]->get_code().x_loc_ << ','
--                 << leaves[i]->get_code().y_loc_ << ','
--                 << leaves[i]->get_code().z_loc_ << ','
--                 << leaves[i]->data() << std::endl;
--      }
--
--    leaves[1]->split();
--  }
--
--  if (debug)
--  {
--    std::cout << "Level 0" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (unsigned i=0; i<leaves.size(); i++) {
--      leaves[i]->set_data(0.9f);
--      std::cout << leaves[i]->get_code().x_loc_ << ','
--               << leaves[i]->get_code().y_loc_ << ','
--               << leaves[i]->get_code().z_loc_ << ','
--               << leaves[i]->get_code().level << ','
--               << leaves[i]->data() << std::endl;
--    }
--  }
--
--  if (debug)
--  {
--    std::cout << "All Levels" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
--    for (unsigned i=0; i<leaves.size(); i++) {
--      std::cout << leaves[i]->get_code().x_loc_ << ','
--               << leaves[i]->get_code().y_loc_ << ','
--               << leaves[i]->get_code().z_loc_ << ','
--               << leaves[i]->get_code().level << ','
--               << leaves[i]->data() << std::endl;
--    }
--  }
--}
--
--static void test_boxm_scene_to_bvxm_grid()
--{
--  //Create a dummy scene
--  typedef boct_tree<short,float > tree_type;
--  boct_tree<short,float> *tree = new boct_tree<short,float>(3);
--  fill_octree(tree);
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--
--  boxm_scene<tree_type> *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
--  std::string scene_path=".";
--  scene->set_paths(scene_path, "in_block");
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->clean_scene();
--
--  boxm_block_iterator<tree_type >  iter =scene->iterator();
--  iter.begin();
--  scene->load_block(iter.index());
--  boxm_block<tree_type> *block = scene->get_active_block();
--  block->init_tree(tree);
--  scene->write_active_block();
--  std::string input_path("scene_to_grid.vox");
--
--  bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene,input_path, 0);
--
--  //Check the grid
--  bvxm_voxel_grid<float>::iterator grid_it = grid->slab_iterator(0, grid->grid_size().z());
--
--  for (unsigned z = 0; z<grid->grid_size().z(); ++z)
--    for (unsigned y = 0; y<grid->grid_size().y(); ++y)
--      for (unsigned x= 0; x<grid->grid_size().x(); ++x)
--      {
--        std::cout << "Value at " << '(' << x << ',' << y <<',' <<z << ")= " << (*grid_it)(x,y,z) << std::endl;
--      }
--
--  // TEST("Valid cropped tree", result, true);
--
--  scene->clean_scene();
--}
--
--TESTMAIN(test_boxm_scene_to_bvxm_grid);
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
-index 73e5836b26..cdb72c7ec2 100644
---- a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
-+++ b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
-@@ -2,15 +2,13 @@
- 
- DECLARE( test_merge_mog );
- DECLARE( test_mog_norm );
--//DECLARE( test_boxm_scene_to_bvxm_grid);
-+
- 
- 
- void register_tests()
- {
-   REGISTER( test_merge_mog );
-   REGISTER( test_mog_norm );
--  // test causing memory allocation errors on dashboard build
--  //REGISTER( test_boxm_scene_to_bvxm_grid );
- 
- }
- 
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
-index b109456239..2c0b205311 100644
---- a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
-+++ b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
-@@ -1,4 +1,3 @@
--#include <bvxm/algo/bvxm_boxm_convert.h>
- #include <bvxm/algo/bvxm_merge_mog.h>
- #include <bvxm/algo/bvxm_mog_norm.h>
- 
--- 
-2.21.0
-

From ef3d7631e3899e2940fed7c8f4fc35e982a98b4f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 03:26:06 +0000
Subject: [PATCH 38/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index fc0ce70..b04fab0 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,6 +1,6 @@
 Name:       vxl
 Version:    2.0.2
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -828,6 +828,9 @@ ctest . || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sun Sep 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-6
 - Fix failing build: update patch to fix minizip include
 

From 890505beab4f35e9cdd37a8fa49d48d89c8d900b Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Mon, 6 Jul 2020 09:38:52 +0200
Subject: [PATCH 39/74] Improve compatibility with new CMake macro

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 vxl.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index b04fab0..395399d 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 Name:       vxl
 Version:    2.0.2
 Release:    7%{?dist}
@@ -185,7 +187,7 @@ sed -i '/add_subdirectory(minizip)/ d' contrib/brl/b3p/CMakeLists.txt
     -DVXL_BUILD_DOCUMENTATION:BOOL=ON \
     -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
     -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
-    -DVNL_CONFIG_LEGACY_METHODS:BOOL=ON .
+    -DVNL_CONFIG_LEGACY_METHODS:BOOL=ON
 
 # Other stuff
 # -DEXPATPP_INCLUDE_DIR:PATH=%%{_includedir} \
@@ -197,10 +199,10 @@ sed -i '/add_subdirectory(minizip)/ d' contrib/brl/b3p/CMakeLists.txt
 #wxwidgets seems to be found
 #Multiple versions of QT found please set DESIRED_QT_VERSION
 
-%make_build
+%cmake_build
 
 %install
-%make_install
+%cmake_install
 
 # Stray file installed in a random location
 rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
@@ -212,8 +214,7 @@ rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 # 801 - volm_test_candidate_region_parser (Child aborted)
 # 967 - vifa_test_int_faces_attr (Child aborted)
 # 968 - vifa_test_int_faces_adj_attr (Child aborted)
-
-ctest . || exit 0
+ctest %{_vpath_builddir} || exit 0
 
 %ldconfig_scriptlets
 

From f1aa7978fba245777b755a17f0500a7b677201ba Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 27 Jul 2020 16:59:42 +0100
Subject: [PATCH 40/74] Rebuild for libdc1394 soname bump

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 395399d..2a481de 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -829,6 +829,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Mon Jul 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-8
+- Rebuild for libdc1394 soname bump
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From a646428df06846efeb6a44d87e6dda20be8c5089 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Sat, 17 Oct 2020 20:00:36 -0600
Subject: [PATCH 41/74] Fix missing #includes for gcc-11

---
 0010-gcc11.patch | 37 +++++++++++++++++++++++++++++++++++++
 vxl.spec         |  3 +++
 2 files changed, 40 insertions(+)
 create mode 100644 0010-gcc11.patch

diff --git a/0010-gcc11.patch b/0010-gcc11.patch
new file mode 100644
index 0000000..f54851e
--- /dev/null
+++ b/0010-gcc11.patch
@@ -0,0 +1,37 @@
+From 66f985519061bc789153ad4654debebd88c922c4 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sat, 17 Oct 2020 19:59:22 -0600
+Subject: [PATCH] gcc-11
+
+---
+ core/testlib/testlib_test.h | 1 +
+ core/vnl/vnl_bignum.cxx     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/core/testlib/testlib_test.h b/core/testlib/testlib_test.h
+index e070f2a..87d5c5c 100644
+--- a/core/testlib/testlib_test.h
++++ b/core/testlib/testlib_test.h
+@@ -14,6 +14,7 @@
+ 
+ #include <string>
+ #include <complex>
++#include <limits>
+ 
+ //: initialise test counters, check test name 'name' exists
+ void testlib_test_start(const char* name = nullptr);
+diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx
+index b615a9b..741bd43 100644
+--- a/core/vnl/vnl_bignum.cxx
++++ b/core/vnl/vnl_bignum.cxx
+@@ -6,6 +6,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <iostream>
++#include <limits>
+ #include "vnl_bignum.h"
+ //:
+ // \file
+-- 
+2.28.0
+
diff --git a/vxl.spec b/vxl.spec
index 2a481de..2b63bbd 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -34,6 +34,9 @@ Patch9:     0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
 # https://github.com/vxl/vxl/commit/cdf414000606af4bad322f7ff4c1fcdeaaa286ad
 Patch10:    0009-removed-the-obsolete-octree-library-boxm.patch
 
+# Fix missing #include caught by gcc-11
+Patch11:     0010-gcc11.patch
+
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
 BuildRequires:  doxygen

From 187b2e80d2f8abbf1c559c144c47d914ddf3bc11 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Sat, 17 Oct 2020 20:01:15 -0600
Subject: [PATCH 42/74] Finish last patch

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 2b63bbd..7511d05 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 2.0.2-9
+- Fix missing #includes for gcc-11
+
 * Mon Jul 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-8
 - Rebuild for libdc1394 soname bump
 

From 56acfb4913cc4b57412bb39d1e22d018a10058ae Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 23:17:03 +0000
Subject: [PATCH 43/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 7511d05..0639a1f 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Sat Oct 17 2020 Jeff Law <law@redhat.com> - 2.0.2-9
 - Fix missing #includes for gcc-11
 

From 36318a21bcaecd45b9452eb1beda1996b7e98971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 9 Feb 2021 12:16:34 +0100
Subject: [PATCH 44/74] Rebuilt for minizip 3.0.0

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 0639a1f..f30ed58 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Tue Feb 09 2021 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-11
+- Rebuilt for minizip 3.0.0
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 2da8706f7a9ee1e5469d4869ad69a28de55c77de Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:42:44 +0000
Subject: [PATCH 45/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index f30ed58..49f6b5e 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Feb 09 2021 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-11
 - Rebuilt for minizip 3.0.0
 

From ad99191d0ccc74b21a73cde782589bca9a86e4b9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 04:13:38 +0000
Subject: [PATCH 46/74] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 49f6b5e..f4a5126 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    12%{?dist}
+Release:    13%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From a95a4ab63744321441355dab7a7569118673ff74 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 12:09:42 +0000
Subject: [PATCH 47/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index f4a5126..28da7ab 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    13%{?dist}
+Release:    14%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 868e36cc439f02e2ef4b45b1504f2e562403f3d2 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 15 Nov 2022 15:16:30 +0100
Subject: [PATCH 48/74] Rebuild (minizip-ng)

---
 vxl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 28da7ab..cf7f1fd 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    14%{?dist}
+Release:    15%{?dist}
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,6 +832,9 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
+* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 2.0.2-15
+- Rebuild (minizip-ng)
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From e2d034c59ff16f83867f1ccd8d4b2173aa8db133 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 12 Jan 2023 17:52:49 +0000
Subject: [PATCH 49/74] chore: use rpmautospec

---
 changelog | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 vxl.spec  | 205 +-----------------------------------------------------
 2 files changed, 205 insertions(+), 203 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..6b9f2cf
--- /dev/null
+++ b/changelog
@@ -0,0 +1,203 @@
+* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 2.0.2-15
+- Rebuild (minizip-ng)
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Feb 09 2021 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-11
+- Rebuilt for minizip 3.0.0
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 2.0.2-9
+- Fix missing #includes for gcc-11
+
+* Mon Jul 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-8
+- Rebuild for libdc1394 soname bump
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Sep 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-6
+- Fix failing build: update patch to fix minizip include
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-4
+- Remove obsolete boxm library (was also causing arm build to fail)
+- Remove obsolete octree library
+
+* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-3
+- Fix 32 bit arch builds: https://github.com/vxl/vxl/issues/638
+- Remove invalid comments
+- Do not make docs require the base package
+
+* Fri Apr 26 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
+- Add complete file list
+- Remove no longer needed BR: klt
+- Remove more unneeded patches
+- Add patch to include FindRPLY.cmake
+- Use system shapelib and expat
+- More patches to complete build
+- Document failing tests, do not let them fail build
+
+* Fri Apr 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
+- Enable OUL---why was it disabled?
+- Remove rply include patch: build seems to find it just fine.
+- Remove uneeded rply function call fix patch.
+- Remove Coin3D cmake config patch---included in cmake distribution now.
+- Remove SIMVoleon cmake patch---seems to find it just fine.
+- Correct CMake flags.
+- Enable BRL build
+- add Python BR
+- Add expatpp bits manually
+- File upstream issue and use bundled openjpeg2: https://github.com/vxl/vxl/issues/627
+- Remove unneeded xerces BR, and corresponding patch.
+
+* Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
+- Update to latest upstream release
+- Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)
+- Use new github upstream
+- Remove uneeded patches
+- Explicitly list all shared objects
+
+* Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
+- Rebuild for dcmtk-3.6.4
+
+* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.17.0-30
+- Use autosetup macro
+- Remove whitespaces, use space instead of tabs for cleanliness
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com> - 1.17.0-28
+- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.17.0-26
+- Rebuild to fix GCC 8 mis-compilation
+  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 25 2016 Tom Callaway <spot@fedoraproject.org> - 1.17.0-20
+- remove non-free lena image file from source tarball (bz1310388)
+- fix FTBFS (bz1303695, bz1308234)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 16 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 1.17.0-17
+- Rebuilt using hardened build flags: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+
+* Mon Feb 16 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.17.0-16
+- Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
+- Fix bogus %%changelog date.
+
+* Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
+- Rebuilt for libgeotiff
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Mar 04 2013 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-11
+- Applied upstream patches (25, 26) to ensure compatibility with ITK
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.17.0-9
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Wed Dec 05 2012 Dan Horák <dan[at]danny.cz> - 1.17.0-8
+- fix build on non-x86 arches
+
+* Sun Nov 25 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-7%{?dist}
+- Changed source0 path to point to vxl 1.17
+- Added missing sonames
+
+* Fri Nov 02 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-6%{?dist}
+- Patched to build BRL
+- Updated to last version
+
+* Mon Oct 29 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-5%{?dist}
+- Removed expatpp bundled library and added corresponding BR
+- Removed bundled bzip
+
+
+* Thu Oct 18 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-4%{?dist}
+- Fixed missing oxl_vrml lib
+- Turn on compilation of BRL
+
+* Sun Oct 14 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-3%{?dist}
+- More fixes from Volker's post https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
+
+* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-2%{?dist}
+- Added patches 12-16 from https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
+- Minor rework of the spec file as pointed out by Volker in the previous link
+
+* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-1%{?dist}
+- Updated to new version
+- Reworked patches to the new version
+- Disabled BRL because it gives a compilation error
+
+* Fri May 27 2011 Mario Ceresa mrceresa fedoraproject org vxl 1.14.0-1%{?dist}
+- Updated to new version
+- Added BR doxygen (thanks to Ankur for noticing it)
+- Changed patch naming schema
+- Work around a rply related bug (patches 3-6)
+- Thanks to Thomas Bouffon for patch 7-8
+- Patches 9-10 address http://www.itk.org/pipermail/insight-users/2010-July/037418.html
+- Fixed 70 missing sonames in patch 11
+- Removed bundled expact, shapelib, minizip, dcmtk
+- Force brl build
+- Use system shipped FindEXPAT
+
+
+* Tue Mar 23 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-4%{?dist}
+- sed patch to add ${LIB_SUFFIX} to all lib install target
+- Added soname version info to vil vil_algo lib
+
+* Sun Mar 21 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-3%{?dist}
+- Applied patch to build against newly packaged rply
+
+* Tue Mar 2 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-2%{?dist}
+- Applied patch from debian distribution to force the generation of versioned lib
+
+* Fri Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
+- Initial RPM Release
+
+
diff --git a/vxl.spec b/vxl.spec
index cf7f1fd..9e15e85 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -2,7 +2,7 @@
 
 Name:       vxl
 Version:    2.0.2
-Release:    15%{?dist}
+Release:    %autorelease
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
 URL:        https://vxl.github.io/
@@ -832,205 +832,4 @@ ctest %{_vpath_builddir} || exit 0
 %doc %{_docdir}/*
 
 %changelog
-* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 2.0.2-15
-- Rebuild (minizip-ng)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Feb 09 2021 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-11
-- Rebuilt for minizip 3.0.0
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 2.0.2-9
-- Fix missing #includes for gcc-11
-
-* Mon Jul 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-8
-- Rebuild for libdc1394 soname bump
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Sep 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-6
-- Fix failing build: update patch to fix minizip include
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-4
-- Remove obsolete boxm library (was also causing arm build to fail)
-- Remove obsolete octree library
-
-* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-3
-- Fix 32 bit arch builds: https://github.com/vxl/vxl/issues/638
-- Remove invalid comments
-- Do not make docs require the base package
-
-* Fri Apr 26 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
-- Add complete file list
-- Remove no longer needed BR: klt
-- Remove more unneeded patches
-- Add patch to include FindRPLY.cmake
-- Use system shapelib and expat
-- More patches to complete build
-- Document failing tests, do not let them fail build
-
-* Fri Apr 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
-- Enable OUL---why was it disabled?
-- Remove rply include patch: build seems to find it just fine.
-- Remove uneeded rply function call fix patch.
-- Remove Coin3D cmake config patch---included in cmake distribution now.
-- Remove SIMVoleon cmake patch---seems to find it just fine.
-- Correct CMake flags.
-- Enable BRL build
-- add Python BR
-- Add expatpp bits manually
-- File upstream issue and use bundled openjpeg2: https://github.com/vxl/vxl/issues/627
-- Remove unneeded xerces BR, and corresponding patch.
-
-* Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
-- Update to latest upstream release
-- Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)
-- Use new github upstream
-- Remove uneeded patches
-- Explicitly list all shared objects
-
-* Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
-- Rebuild for dcmtk-3.6.4
-
-* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.17.0-30
-- Use autosetup macro
-- Remove whitespaces, use space instead of tabs for cleanliness
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com> - 1.17.0-28
-- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.17.0-26
-- Rebuild to fix GCC 8 mis-compilation
-  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 25 2016 Tom Callaway <spot@fedoraproject.org> - 1.17.0-20
-- remove non-free lena image file from source tarball (bz1310388)
-- fix FTBFS (bz1303695, bz1308234)
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 16 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 1.17.0-17
-- Rebuilt using hardened build flags: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
-
-* Mon Feb 16 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.17.0-16
-- Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
-- Fix bogus %%changelog date.
-
-* Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
-- Rebuilt for libgeotiff
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Mar 04 2013 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-11
-- Applied upstream patches (25, 26) to ensure compatibility with ITK
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.17.0-9
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Wed Dec 05 2012 Dan Horák <dan[at]danny.cz> - 1.17.0-8
-- fix build on non-x86 arches
-
-* Sun Nov 25 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-7%{?dist}
-- Changed source0 path to point to vxl 1.17
-- Added missing sonames
-
-* Fri Nov 02 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-6%{?dist}
-- Patched to build BRL
-- Updated to last version
-
-* Mon Oct 29 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-5%{?dist}
-- Removed expatpp bundled library and added corresponding BR
-- Removed bundled bzip
-
-
-* Thu Oct 18 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-4%{?dist}
-- Fixed missing oxl_vrml lib
-- Turn on compilation of BRL
-
-* Sun Oct 14 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-3%{?dist}
-- More fixes from Volker's post https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
-
-* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-2%{?dist}
-- Added patches 12-16 from https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
-- Minor rework of the spec file as pointed out by Volker in the previous link
-
-* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-1%{?dist}
-- Updated to new version
-- Reworked patches to the new version
-- Disabled BRL because it gives a compilation error
-
-* Fri May 27 2011 Mario Ceresa mrceresa fedoraproject org vxl 1.14.0-1%{?dist}
-- Updated to new version
-- Added BR doxygen (thanks to Ankur for noticing it)
-- Changed patch naming schema
-- Work around a rply related bug (patches 3-6)
-- Thanks to Thomas Bouffon for patch 7-8
-- Patches 9-10 address http://www.itk.org/pipermail/insight-users/2010-July/037418.html
-- Fixed 70 missing sonames in patch 11
-- Removed bundled expact, shapelib, minizip, dcmtk
-- Force brl build
-- Use system shipped FindEXPAT
-
-
-* Tue Mar 23 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-4%{?dist}
-- sed patch to add ${LIB_SUFFIX} to all lib install target
-- Added soname version info to vil vil_algo lib
-
-* Sun Mar 21 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-3%{?dist}
-- Applied patch to build against newly packaged rply
-
-* Tue Mar 2 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-2%{?dist}
-- Applied patch from debian distribution to force the generation of versioned lib
-
-* Fri Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
-- Initial RPM Release
-
+%autochangelog

From 984b1c731c0032d7e3e6f045fcbb62633eb71811 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 06:33:20 +0000
Subject: [PATCH 50/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From ef89e98d8a665e6468980dee18823e1f2fc17bdb Mon Sep 17 00:00:00 2001
From: Sandro <devel@penguinpee.nl>
Date: Tue, 6 Jun 2023 11:00:04 +0200
Subject: [PATCH 51/74] Rebuild for libdc1394 soname bump


From 869139c1f028a3a957a94b1f55c0c6bb1f1b5aa2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 17:55:36 +0000
Subject: [PATCH 52/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From f4f89793b3cdda7c7d23cbdddaaaa7074dc8b960 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 23 Oct 2023 17:59:58 +0100
Subject: [PATCH 53/74] wip: update to v3.5.0

---
 .gitignore                                    |     1 +
 ...nditional-compilation-was-exactly-wr.patch |   103 -
 ...y.patch => 0001-v3.5.0-unbundle-rply.patch |    22 +-
 ...-v3.5.0-Use-Fedora-expat-and-expatpp.patch |   265 +-
 ...ch => 0003-v3.5.0-Use-Fedora-minizip.patch |    18 +-
 0004-v2.0.2-Version-shared-objects.patch      |    38 -
 ...v3.5.0-Add-cmake-module-to-find-RPLY.patch |    24 +-
 ...t.patch => 0005-v3.5.0-fix-bkml-test.patch |     6 +-
 ...-Update-function-arguments-in-declar.patch |    34 -
 ... 0006-v3.5.0-Correct-rply-includedir.patch |    55 +-
 0007-v3.5.0-remove-triangle.patch             | 20107 ++++++
 0008-v3.5.0-remove-bits-using-triangle.patch  |  2051 +
 ...ved-the-obsolete-octree-library-boxm.patch | 53224 ----------------
 0009-v3.5.0-indent-to-keep-gcc-happy.patch    |    26 +
 ...move-dependency-on-brdb-by-imesh-lib.patch |    32 +
 0010-gcc11.patch                              |    37 -
 0011-v3.5.0-fix-for-gcc11.patch               |    89 +
 sources                                       |     2 +-
 vxl.spec                                      |   837 +-
 19 files changed, 22830 insertions(+), 54141 deletions(-)
 delete mode 100644 0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
 rename 0001-v2.0.2-unbundle-rply.patch => 0001-v3.5.0-unbundle-rply.patch (99%)
 rename 0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch => 0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch (80%)
 rename 0003-v2.0.2-Use-Fedora-minizip.patch => 0003-v3.5.0-Use-Fedora-minizip.patch (77%)
 delete mode 100644 0004-v2.0.2-Version-shared-objects.patch
 rename 0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch => 0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch (82%)
 rename 0007-v2.0.2-fix-bkml-test.patch => 0005-v3.5.0-fix-bkml-test.patch (94%)
 delete mode 100644 0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
 rename 0008-v2.0.2-Correct-rply-includedir.patch => 0006-v3.5.0-Correct-rply-includedir.patch (67%)
 create mode 100644 0007-v3.5.0-remove-triangle.patch
 create mode 100644 0008-v3.5.0-remove-bits-using-triangle.patch
 delete mode 100644 0009-removed-the-obsolete-octree-library-boxm.patch
 create mode 100644 0009-v3.5.0-indent-to-keep-gcc-happy.patch
 create mode 100644 0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
 delete mode 100644 0010-gcc11.patch
 create mode 100644 0011-v3.5.0-fix-for-gcc11.patch

diff --git a/.gitignore b/.gitignore
index 5d40acb..9859608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vxl-1.17.0.tar.gz
 /vxl-1.17.0-clean.tar.gz
 /vxl-2.0.2-clean.tar.gz
+/vxl-3.5.0-clean.tar.gz
diff --git a/0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch b/0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
deleted file mode 100644
index a61aeab..0000000
--- a/0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From c3fd27959f51e0469a7a6075e975f245ac306f3d Mon Sep 17 00:00:00 2001
-From: Hans Johnson <hans-johnson@uiowa.edu>
-Date: Thu, 29 Nov 2018 14:11:12 -0600
-Subject: [PATCH] BUG:  Logic for conditional compilation was exactly wrong
-
----
- core/vsl/Templates/vsl_vector_io+int_64-.cxx | 2 +-
- core/vsl/vsl_binary_explicit_io.h            | 4 ++--
- core/vsl/vsl_binary_io.cxx                   | 2 +-
- core/vsl/vsl_binary_io.h                     | 2 +-
- core/vsl/vsl_block_binary.cxx                | 2 +-
- core/vsl/vsl_block_binary.h                  | 2 +-
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/core/vsl/Templates/vsl_vector_io+int_64-.cxx b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
-index fcdafc0270..02c7a13c36 100644
---- a/core/vsl/Templates/vsl_vector_io+int_64-.cxx
-+++ b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
-@@ -1,6 +1,6 @@
- #include <vxl_config.h>
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_INT_64_IS_LONGLONG
- #include <vsl/vsl_vector_io.hxx>
- VSL_VECTOR_IO_INSTANTIATE(vxl_int_64);
- 
-diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h
-index 9ff669fce0..49536d172c 100644
---- a/core/vsl/vsl_binary_explicit_io.h
-+++ b/core/vsl/vsl_binary_explicit_io.h
-@@ -141,7 +141,7 @@ macro (int);
- macro (unsigned int);
- macro (long);
- macro (unsigned long);
--#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_INT_64_IS_LONGLONG
- macro (vxl_int_64);
- macro (vxl_uint_64);
- #endif
-@@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer
- 
- /////////////////////////////////////////////////////////////////////////
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_INT_64_IS_LONGLONG
- 
- //: Decode a buffer of arbitrary length integers
- // Converts from the integers from the arbitrary length format into
-diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx
-index c36142bd41..9477642b0b 100644
---- a/core/vsl/vsl_binary_io.cxx
-+++ b/core/vsl/vsl_binary_io.cxx
-@@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short);
- MACRO_MAKE_INTEGER_READ_WRITE(unsigned short);
- MACRO_MAKE_INTEGER_READ_WRITE(long);
- MACRO_MAKE_INTEGER_READ_WRITE(unsigned long);
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG)
-+#if VXL_INT_64_IS_LONGLONG
- MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64);
- MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64);
- #endif
-diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h
-index d38478aea5..9498f844c8 100644
---- a/core/vsl/vsl_binary_io.h
-+++ b/core/vsl/vsl_binary_io.h
-@@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n );
- inline void vsl_print_summary(std::ostream& os, unsigned long n )
- {  os << n; }
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_INT_64_IS_LONGLONG
- 
- //: Write  to vsl_b_ostream
- void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n );
-diff --git a/core/vsl/vsl_block_binary.cxx b/core/vsl/vsl_block_binary.cxx
-index 017a651e99..c4220bebf6 100644
---- a/core/vsl/vsl_block_binary.cxx
-+++ b/core/vsl/vsl_block_binary.cxx
-@@ -285,7 +285,7 @@ template void vsl_block_binary_write_byte_impl(vsl_b_ostream &, const unsigned c
- template void vsl_block_binary_read_byte_impl(vsl_b_istream &, signed char*, std::size_t);
- template void vsl_block_binary_read_byte_impl(vsl_b_istream &, unsigned char*, std::size_t);
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_INT_64_IS_LONGLONG
- template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_int_64*, std::size_t);
- template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_uint_64*, std::size_t);
- template void vsl_block_binary_read_int_impl(vsl_b_istream &, vxl_int_64*, std::size_t);
-diff --git a/core/vsl/vsl_block_binary.h b/core/vsl/vsl_block_binary.h
-index 014bb8d055..2ceafb0186 100644
---- a/core/vsl/vsl_block_binary.h
-+++ b/core/vsl/vsl_block_binary.h
-@@ -218,7 +218,7 @@ inline void vsl_block_binary_read(vsl_b_istream &is, unsigned long* begin, std::
- }
- 
- /////////////////////////////////////////////////////////////////////////
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_INT_64_IS_LONGLONG
- 
- //: Write a block of signed longs to a vsl_b_ostream
- // This function is very speed efficient, but
--- 
-2.21.0
-
diff --git a/0001-v2.0.2-unbundle-rply.patch b/0001-v3.5.0-unbundle-rply.patch
similarity index 99%
rename from 0001-v2.0.2-unbundle-rply.patch
rename to 0001-v3.5.0-unbundle-rply.patch
index 76af26e..2e10623 100644
--- a/0001-v2.0.2-unbundle-rply.patch
+++ b/0001-v3.5.0-unbundle-rply.patch
@@ -1,11 +1,10 @@
-From 03d46e9ecaae8e18c892aecded6f918f6407344d Mon Sep 17 00:00:00 2001
+From b7944a8898b3a1aef606cf6f4047dcf11aca11a6 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 1/9] v2.0.2: unbundle rply
+Subject: [PATCH 01/11] v3.5.0: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
- contrib/brl/bseg/boxm/algo/CMakeLists.txt     |    3 +-
  contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |    6 +-
  .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |    6 +-
  v3p/CMakeLists.txt                            |    1 -
@@ -21,7 +20,7 @@ Subject: [PATCH 1/9] v2.0.2: unbundle rply
  v3p/rply/readme.txt                           |   24 -
  v3p/rply/rply.c                               | 1570 -----------------
  v3p/rply/rply.h                               |  367 ----
- 17 files changed, 13 insertions(+), 3307 deletions(-)
+ 16 files changed, 11 insertions(+), 3306 deletions(-)
  delete mode 100644 v3p/rply/CMakeLists.txt
  delete mode 100644 v3p/rply/LICENSE
  delete mode 100644 v3p/rply/etc/convert.c
@@ -59,19 +58,6 @@ index 5cf355e3fe..662ec284e9 100644
  
  if( BUILD_TESTING )
    add_subdirectory(tests)
-diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-index cee22bd271..4714624fa3 100644
---- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # brl/bseg/boxm/algo/CMakeLists.txt
-+FIND_PACKAGE(rply REQUIRED)
- include_directories( ${MUL_INCLUDE_DIR} )
--include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+include_directories( ${RPLY_INCLUDE_DIR} )
- set(boxm_algo_sources
-     boxm_compute_scene_statistics.h
-     boxm_crop_scene.h
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 index 92b959f740..fff9ae2d84 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
@@ -3622,5 +3608,5 @@ index 3c604fd88e..0000000000
 - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 - * ---------------------------------------------------------------------- */
 -- 
-2.21.0
+2.41.0
 
diff --git a/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
similarity index 80%
rename from 0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
rename to 0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
index bb26680..852f5ed 100644
--- a/0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
+++ b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
@@ -1,10 +1,10 @@
-From 5b1f1b76bb9c71c46ba867ce2170cb43d7ba0e2e Mon Sep 17 00:00:00 2001
+From 26d548e302e9fa1bcc2986ba91f12313ccb00829 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 2/9] v2.0.2 Use Fedora expat and expatpp
+Subject: [PATCH 02/11] v3.5.0 Use Fedora expat and expatpp
 
 ---
- CMakeLists.txt                                |  3 ++
+ CMakeLists.txt                                |  2 +
  config/cmake/fedora-modules/FindEXPATPP.cmake | 37 +++++++++++++++++
  contrib/brl/b3p/expat/CMakeLists.txt          |  3 +-
  contrib/brl/b3p/expatpp/CMakeLists.txt        | 22 +---------
@@ -30,55 +30,45 @@ Subject: [PATCH 2/9] v2.0.2 Use Fedora expat and expatpp
  contrib/brl/bseg/betr_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bmdl/pro/CMakeLists.txt      |  3 +-
  contrib/brl/bseg/bmdl_batch/CMakeLists.txt    |  3 +-
- contrib/brl/bseg/boxm/CMakeLists.txt          |  3 +-
- contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |  3 +-
- .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |  3 +-
- .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |  3 +-
- contrib/brl/bseg/boxm/pro/CMakeLists.txt      |  3 +-
  contrib/brl/bseg/boxm2/CMakeLists.txt         |  3 +-
  .../bseg/boxm2/boxm2_bounding_box_parser.h    |  2 +-
  contrib/brl/bseg/boxm2/boxm2_scene_parser.h   |  2 +-
  contrib/brl/bseg/boxm2/pro/CMakeLists.txt     |  3 +-
- .../boxm2_ingest_convex_mesh_process.cxx      |  2 +-
+ .../boxm2_ingest_convex_mesh_process.cxx      |  4 +-
  contrib/brl/bseg/boxm2/volm/CMakeLists.txt    |  3 +-
  .../brl/bseg/boxm2/volm/pro/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/boxm2_batch/CMakeLists.txt   |  3 +-
  .../brl/bseg/boxm2_multi/pro/CMakeLists.txt   |  3 +-
- contrib/brl/bseg/boxm_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/brec_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bstm/CMakeLists.txt          |  3 +-
  contrib/brl/bseg/bstm/bstm_scene_parser.h     |  2 +-
  contrib/brl/bseg/bstm_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bstm_multi/CMakeLists.txt    |  3 +-
  .../bseg/bstm_multi/space_time_scene_parser.h |  2 +-
- .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |  3 +-
- .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |  3 +-
  contrib/brl/bseg/bvpl/functors/CMakeLists.txt |  3 +-
  contrib/brl/bseg/bvpl/kernels/CMakeLists.txt  |  3 +-
  .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |  3 +-
  contrib/brl/bseg/bvpl/pro/CMakeLists.txt      |  3 +-
  contrib/brl/bseg/bvpl_batch/CMakeLists.txt    |  3 +-
- .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |  3 +-
  contrib/brl/bseg/bvxm/CMakeLists.txt          |  3 +-
  contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |  3 +-
  .../brl/bseg/bvxm/bvxm_world_params_parser.h  |  2 +-
  contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt |  3 +-
  contrib/brl/bseg/bvxm/pro/CMakeLists.txt      |  3 +-
- contrib/brl/bseg/bvxm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bvxm_batch/CMakeLists.txt    |  2 +
  contrib/brl/bseg/bvxm_bridge/CMakeLists.txt   |  3 +-
  contrib/brl/bseg/vcon/CMakeLists.txt          |  3 +-
- 63 files changed, 162 insertions(+), 118 deletions(-)
+ 54 files changed, 144 insertions(+), 109 deletions(-)
  create mode 100644 config/cmake/fedora-modules/FindEXPATPP.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 230de81825..dfc509d8fc 100644
+index e5de354156..e52a8c0abb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -50,6 +50,9 @@ project(VXL #Project name must be all caps to have properly generated VXL_VERSIO
-     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
-     LANGUAGES CXX C)
+@@ -75,6 +75,8 @@ SET(VXL_API_VERSION "${VXL_VERSION_MAJOR}.${VXL_VERSION_MINOR}")
+ SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
+     SOVERSION "${VXL_API_VERSION}")
  
-+
 +set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
 +
  include(CMakeDependentOption)
@@ -128,7 +118,7 @@ index 0000000000..88a29681aa
 +    EXPATPP_LIBRARY
 +)
 diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
-index 5b9d660530..1304b5f634 100644
+index dad475e211..d64a8f3832 100644
 --- a/contrib/brl/b3p/expat/CMakeLists.txt
 +++ b/contrib/brl/b3p/expat/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -251,7 +241,7 @@ index 76995137ed..1cb0736454 100644
  if(EXPAT_FOUND)
    set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
 diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
-index dace2292e7..a05c9d0366 100644
+index 4a16a57d9e..72ea30dc37 100644
 --- a/contrib/brl/bbas/bwm/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/CMakeLists.txt
 @@ -26,7 +26,8 @@ endif()
@@ -265,10 +255,10 @@ index dace2292e7..a05c9d0366 100644
  # Set CMake options for using vgui
  include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
 diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-index dc2102047f..ba8c13a706 100644
+index 918c196161..f0ea9a69c9 100644
 --- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-@@ -7,7 +7,8 @@ set(bwm_io_sources
+@@ -8,7 +8,8 @@ set(bwm_io_sources
  )
  aux_source_directory(Templates bwm_io_sources)
  
@@ -353,7 +343,7 @@ index c027dfaa28..72fed69f82 100644
  
  if( BUILD_TESTING )
 diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
-index cf11103557..ebb93384f9 100644
+index 72b3b217ea..fe8cf45b75 100644
 --- a/contrib/brl/bbas/volm/CMakeLists.txt
 +++ b/contrib/brl/bbas/volm/CMakeLists.txt
 @@ -6,7 +6,8 @@
@@ -365,7 +355,7 @@ index cf11103557..ebb93384f9 100644
 +FIND_PACKAGE(EXPATPP REQUIRED)
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
-     include_directories( ${BRL_INCLUDE_DIR} )
+ 
 diff --git a/contrib/brl/bbas/volm/volm_osm_parser.h b/contrib/brl/bbas/volm/volm_osm_parser.h
 index 82283250dd..289d5d5265 100644
 --- a/contrib/brl/bbas/volm/volm_osm_parser.h
@@ -487,30 +477,30 @@ index 013afc8146..365ef65b67 100644
  
  include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-index cbd9222c7f..b9ed6f8459 100644
+index fb0836b415..0dfcfc9795 100644
 --- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
+ 
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
 diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-index 3c5d70e0c6..588c0df0c0 100644
+index 20df829930..5321bd017e 100644
 --- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-@@ -4,7 +4,8 @@ project( betr_batch )
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+@@ -2,7 +2,8 @@
+ project( betr_batch )
  
- if( PYTHON_FOUND )
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
@@ -529,87 +519,19 @@ index 76fe0891b7..7c73fe1bb0 100644
    include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
    if(TIFF_FOUND)
 diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-index f341e59f07..6e8186a875 100644
+index fb7fcb176d..52aa721a3f 100644
 --- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
+ 
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
     if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
-diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
-index 6c9da00de1..6a0e5159f4 100644
---- a/contrib/brl/bseg/boxm/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/CMakeLists.txt
-@@ -1,5 +1,6 @@
- # contrib/brl/bseg/boxm/CMakeLists.txt
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
- 
- include_directories( ${EXPAT_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-index 7afa616e35..c821d10a77 100644
---- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm's Process Library
- 
- # bprb depends on expat and bvxm_pro depends on bprb primarily
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${BRL_INCLUDE_DIR}/bpro )
-   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-index 7bb150ce57..112a19f789 100644
---- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm's Process Library
- 
- # bprb depends on expat and boxm_pro depends on bprb primarily
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${BRL_INCLUDE_DIR}/bpro )
-   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-index f9cf2251e6..41fe3f9dbd 100644
---- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm's Process Library
- 
- # bprb depends on expat and bvxm_prodepends on bprb primarily
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${BRL_INCLUDE_DIR}/bpro )
-   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
-diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-index ff6552a58c..4c0cd29038 100644
---- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm's Process Library
- 
- # bprb depends on expat and bvxm_prodepends on bprb primarily
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   include_directories( ${BRL_INCLUDE_DIR}/bpro )
-   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
 index 4475e418be..476d43b151 100644
 --- a/contrib/brl/bseg/boxm2/CMakeLists.txt
@@ -665,20 +587,22 @@ index ca91150930..7c2ec1d9c3 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
-index 4a640a7120..43fd0d7817 100644
+index 082696b982..605e90bb61 100644
 --- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
 +++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
-@@ -32,7 +32,7 @@
+@@ -31,8 +31,8 @@
+ #include <bmsh3d/bmsh3d_mesh.h>
  #include <bmsh3d/algo/bmsh3d_fileio.h>
  #include <bmsh3d/bmsh3d_mesh_mc.h>
- #include <vgl/vgl_intersection.h>
+-#include "vgl/vgl_intersection.h"
 -#include <expatpplib.h>
++#include <vgl/vgl_intersection.h>
 +#include <expatpp.h>
  #include <boxm2/boxm2_bounding_box_parser.h>
  
  namespace boxm2_ingest_convex_mesh_process_globals
 diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-index 861b960f4d..24bf5c6f37 100644
+index 923e37f35f..064003f994 100644
 --- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -689,9 +613,9 @@ index 861b960f4d..24bf5c6f37 100644
 +FIND_PACKAGE(EXPATPP REQUIRED)
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
-     #depends on OPENCL being found...
+ 
 diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-index 6ade9339d0..bea0c2c32d 100644
+index 6ad0bdde83..265cd5d066 100644
 --- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -705,16 +629,16 @@ index 6ade9339d0..bea0c2c32d 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-index 70e603743b..b2282b0c64 100644
+index 9e1c59a967..c7eb640d55 100644
 --- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-@@ -9,7 +9,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
+@@ -7,7 +7,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
  include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
  
- if( PYTHON_FOUND )
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
@@ -732,31 +656,17 @@ index c0330db1e2..68ab30dffc 100644
  if(EXPAT_FOUND)
    include_directories( ${BRL_INCLUDE_DIR}/bseg )
    set(boxm2_multi_pro_sources
-diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-index 1d57861444..643a441654 100644
---- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-@@ -4,7 +4,8 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
- 
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-index b7e3039d7e..a47356c784 100644
+index a3ab77b316..e228152f4b 100644
 --- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/brec_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
+ 
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
@@ -788,16 +698,16 @@ index 325aee9239..f1b519d12f 100644
  #include <bstm/basic/bstm_block_id.h>
  #include <bstm/bstm_block_metadata.h>
 diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-index c94ddbcc4c..18b5e9c5f8 100644
+index e548807de5..b2b047f3b6 100644
 --- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-@@ -12,7 +12,8 @@ if(DIRECTSHOW_FOUND)
+@@ -10,7 +10,8 @@ if(DIRECTSHOW_FOUND)
  endif()
  
- if( PYTHON_FOUND )
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
@@ -828,34 +738,6 @@ index 062a2eda8f..c5108c1018 100644
  
  #ifdef _MSC_VER
  #  include <vcl_msvc_warnings.h>
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-index a1fd1eb943..1f390f966c 100644
---- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
- # Brown Voxel Processing library for octrees
- 
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
- #mark_as_advanced( VXL_FORCE_V3P_RPLY )
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-index 96064e507e..bbc90f7cea 100644
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-@@ -2,7 +2,8 @@
- # bvxm's Process Library
- 
- # bprb depends on expat and bvxm_pro depends on bprb primarily
--include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
- include_directories( ${BRL_INCLUDE_DIR}/bpro )
- include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 index 25433e56f2..f3659d5390 100644
 --- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
@@ -885,7 +767,7 @@ index 0672b5d3d8..615f02e3fa 100644
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-index 67cdcf8e00..4279f1e47d 100644
+index 82ce0655e0..3e7108103d 100644
 --- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -913,35 +795,21 @@ index 3f4b2b26bc..03b7df907e 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-index 9010286745..5583214c7b 100644
+index 754741a408..9c629d4e5e 100644
 --- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
+ 
+ if( PYTHONLIBS_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
-   if( EXPAT_FOUND )
-     include_directories( ${PYTHON_INCLUDE_DIRS} )
-     include_directories( ${BRL_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-index 052a160d9c..3bf956ba6c 100644
---- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
-index fbda67337c..6c7b6091a8 100644
+index d637fead62..caa2ff3f35 100644
 --- a/contrib/brl/bseg/bvxm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
 @@ -38,7 +38,8 @@ set(bvxm_sources
@@ -955,7 +823,7 @@ index fbda67337c..6c7b6091a8 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-index 8a1789161d..4917b6eb59 100644
+index e07b20ebb7..3a0824d257 100644
 --- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -996,7 +864,7 @@ index c2901f9c90..a41c67e514 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
-index 5d107edbd1..5c6cbc56e4 100644
+index 6c98f11cc3..e5b88b5aff 100644
 --- a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -1010,24 +878,23 @@ index 5d107edbd1..5c6cbc56e4 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-index 58ece0b8d3..ed25993cc7 100644
+index fee846b6d0..2044353da0 100644
 --- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-@@ -2,7 +2,8 @@
- if(HAS_GEOTIFF)
- include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
- if( PYTHON_FOUND )
--  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+@@ -3,6 +3,8 @@ if(HAS_GEOTIFF)
+ 
+ if( PYTHONLIBS_FOUND )
+   include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-index b7b0636f29..efc4aa9b30 100644
+index 76defad7a7..1cfd293103 100644
 --- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-@@ -8,7 +8,8 @@ if(OPENCL_FOUND)
+@@ -5,7 +5,8 @@ if(OpenCL_FOUND)
    include_directories( ${MUL_INCLUDE_DIR} )
  
    #find expatpp library
@@ -1052,5 +919,5 @@ index 26504576be..ed189bccd7 100644
    if(EXPATPP_FOUND)
      include_directories( ${BRL_INCLUDE_DIR} )
 -- 
-2.21.0
+2.41.0
 
diff --git a/0003-v2.0.2-Use-Fedora-minizip.patch b/0003-v3.5.0-Use-Fedora-minizip.patch
similarity index 77%
rename from 0003-v2.0.2-Use-Fedora-minizip.patch
rename to 0003-v3.5.0-Use-Fedora-minizip.patch
index 00dd52f..9d024a9 100644
--- a/0003-v2.0.2-Use-Fedora-minizip.patch
+++ b/0003-v3.5.0-Use-Fedora-minizip.patch
@@ -1,12 +1,12 @@
-From 2a0cd34dbe8aec011713860321a569f9ec64b7d4 Mon Sep 17 00:00:00 2001
+From 9ea313cbb20b9d4ac4d21e03323e57eb0eb79502 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 3/9] v2.0.2 Use Fedora minizip
+Subject: [PATCH 03/11] v3.5.0 Use Fedora minizip
 
 ---
  contrib/brl/b3p/CMakeLists.txt                                | 4 ----
- .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 1 +
- 2 files changed, 1 insertion(+), 4 deletions(-)
+ .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 3 ++-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
 index 7fefd89f41..b2f4b5f6bd 100644
@@ -21,17 +21,19 @@ index 7fefd89f41..b2f4b5f6bd 100644
 -
 -
 diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-index 7a907be4a4..2cac32963a 100644
+index daf78da93f..82e4a0b6d6 100644
 --- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
 +++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-@@ -38,6 +38,7 @@
+@@ -37,7 +37,8 @@
+ #include "vul/vul_file.h"
  
  #if HAS_ZLIB
- #include <minizip/zip.h>
+-#include <minizip/zip.h>
++#include <zip.h>
 +#include <zlib.h>
  #endif
  
  #define WRITEBUFFERSIZE (16384)
 -- 
-2.21.0
+2.41.0
 
diff --git a/0004-v2.0.2-Version-shared-objects.patch b/0004-v2.0.2-Version-shared-objects.patch
deleted file mode 100644
index b53cc11..0000000
--- a/0004-v2.0.2-Version-shared-objects.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e1eb7b3fab1cec8dde0c09a20fa731f497be8630 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Thu, 18 Apr 2019 22:11:41 +0100
-Subject: [PATCH 4/9] v2.0.2 Version shared objects
-
----
- CMakeLists.txt | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dfc509d8fc..0748a6c737 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,13 +46,19 @@ foreach(p
- endforeach()
- 
- project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
--    VERSION 2.0.2.0
-     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
-     LANGUAGES CXX C)
- 
--
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
- 
-+SET(VXL_MAJOR_VERSION 2)
-+SET(VXL_MINOR_VERSION 0)
-+SET(VXL_BUILD_VERSION 2)
-+SET(VXL_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
-+SET(VXL_API_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
-+SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
-+    SOVERSION "${VXL_API_VERSION}")
-+
- include(CMakeDependentOption)
- include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
- 
--- 
-2.21.0
-
diff --git a/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
similarity index 82%
rename from 0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
rename to 0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
index 5ffb79a..8af0445 100644
--- a/0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
+++ b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
@@ -1,23 +1,22 @@
-From 0ce6048e45379a0bdac240b3b3c655f752e289c0 Mon Sep 17 00:00:00 2001
+From 88a4bf8941e7d98768697ef71070fce5302808d2 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 14:11:31 +0100
-Subject: [PATCH 5/9] v2.0.2 Add cmake module to find RPLY
+Subject: [PATCH 04/11] v3.5.0 Add cmake module to find RPLY
 
 ---
  CMakeLists.txt                                |  3 +-
  config/cmake/fedora-modules/FindRPLY.cmake    | 39 +++++++++++++++++++
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |  2 +-
- contrib/brl/bseg/boxm/algo/CMakeLists.txt     |  2 +-
  contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |  2 +-
  .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |  2 +-
- 6 files changed, 45 insertions(+), 5 deletions(-)
+ 5 files changed, 44 insertions(+), 4 deletions(-)
  create mode 100644 config/cmake/fedora-modules/FindRPLY.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0748a6c737..dfd9187aa0 100644
+index e52a8c0abb..e1aa0390d4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -120,7 +120,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
+@@ -142,7 +142,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
  
  # Location of VXL's FindXXX.cmake CMake modules.
  # This is identical to VXL_CMAKE_DIR.  Perhaps we should eliminate MODULE_PATH?
@@ -84,17 +83,6 @@ index 662ec284e9..1c2e6a7089 100644
  
  include_directories( ${BRL_INCLUDE_DIR} )
  include_directories( ${RPLY_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-index 4714624fa3..16694fbbc4 100644
---- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # brl/bseg/boxm/algo/CMakeLists.txt
--FIND_PACKAGE(rply REQUIRED)
-+FIND_PACKAGE(RPLY REQUIRED)
- include_directories( ${MUL_INCLUDE_DIR} )
- include_directories( ${RPLY_INCLUDE_DIR} )
- set(boxm_algo_sources
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 index fff9ae2d84..d7ef6ed5fa 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
@@ -116,5 +104,5 @@ index c3ed4ed27d..19763fbd71 100644
  include_directories( ${BRL_INCLUDE_DIR}/bseg )
  include_directories( ${MUL_INCLUDE_DIR} )
 -- 
-2.21.0
+2.41.0
 
diff --git a/0007-v2.0.2-fix-bkml-test.patch b/0005-v3.5.0-fix-bkml-test.patch
similarity index 94%
rename from 0007-v2.0.2-fix-bkml-test.patch
rename to 0005-v3.5.0-fix-bkml-test.patch
index 8b6a2f2..f2250b4 100644
--- a/0007-v2.0.2-fix-bkml-test.patch
+++ b/0005-v3.5.0-fix-bkml-test.patch
@@ -1,7 +1,7 @@
-From 220d1ca54a2cc737d921472c4fe554e0fd52e770 Mon Sep 17 00:00:00 2001
+From 61d87d4f700e66f09f5cad1ae5c9e3fbbb4c61b9 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 17:05:39 +0100
-Subject: [PATCH 7/9] v2.0.2 fix bkml test
+Subject: [PATCH 05/11] v3.5.0 fix bkml test
 
 ---
  contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
@@ -54,5 +54,5 @@ index 84c36469a4..9eddec1f66 100644
 +  target_link_libraries( bkml_test_include bkml )
 +endif()
 -- 
-2.21.0
+2.41.0
 
diff --git a/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch b/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
deleted file mode 100644
index e2a392e..0000000
--- a/0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3297b7f7dc864aca4f0a1df822d6c657a7c67abd Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Thu, 25 Apr 2019 16:16:56 +0100
-Subject: [PATCH 6/9] v2.0.2 bbas-baio Update function arguments in declaration
-
----
- contrib/brl/bbas/baio/baio_unix.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/brl/bbas/baio/baio_unix.cxx b/contrib/brl/bbas/baio/baio_unix.cxx
-index e8af7199f2..98fc110276 100644
---- a/contrib/brl/bbas/baio/baio_unix.cxx
-+++ b/contrib/brl/bbas/baio/baio_unix.cxx
-@@ -34,7 +34,7 @@ baio::~baio()
- }
- 
- //: Opens and reads file asynchronously
--bool baio::read(std::string filename, char* buff, long BUFSIZE)
-+bool baio::read(const std::string& filename, char* buff, long BUFSIZE)
- {
-   // 1. call c open to get standard file handle
-   int fhandle = open(filename.c_str(), O_RDONLY);
-@@ -68,7 +68,7 @@ bool baio::read(std::string filename, char* buff, long BUFSIZE)
- }
- 
- //: opens and writes file asynchronously
--bool baio::write(std::string filename, char* buff, long BUFSIZE)
-+bool baio::write(const std::string& filename, char* buff, long BUFSIZE)
- {
-   // 1. call c open to get standard file handle
-   int fhandle = open(filename.c_str(), O_WRONLY | O_CREAT, 0666);
--- 
-2.21.0
-
diff --git a/0008-v2.0.2-Correct-rply-includedir.patch b/0006-v3.5.0-Correct-rply-includedir.patch
similarity index 67%
rename from 0008-v2.0.2-Correct-rply-includedir.patch
rename to 0006-v3.5.0-Correct-rply-includedir.patch
index 588393f..77ffa27 100644
--- a/0008-v2.0.2-Correct-rply-includedir.patch
+++ b/0006-v3.5.0-Correct-rply-includedir.patch
@@ -1,16 +1,15 @@
-From 074e01ca47a9c1379f293271ddc0470d8ddf5c9d Mon Sep 17 00:00:00 2001
+From eb908f4841ef0f25fc6a34740343a04303caf60b Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 23:32:15 +0100
-Subject: [PATCH 8/9] v2.0.2 Correct rply includedir
+Subject: [PATCH 06/11] v3.5.0 Correct rply includedir
 
 ---
- contrib/brl/bbas/bvrml/pro/CMakeLists.txt      | 8 +++++++-
- contrib/brl/bbas/bwm/exe/CMakeLists.txt        | 8 +++++++-
- contrib/brl/bbas/volm/pro/CMakeLists.txt       | 8 +++++++-
- contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt  | 7 +++++++
- contrib/brl/bseg/boxm2/pro/CMakeLists.txt      | 7 +++++++
- contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt | 7 +++++++
- 6 files changed, 42 insertions(+), 3 deletions(-)
+ contrib/brl/bbas/bvrml/pro/CMakeLists.txt      |  8 +++++++-
+ contrib/brl/bbas/bwm/exe/CMakeLists.txt        |  8 +++++++-
+ contrib/brl/bbas/volm/pro/CMakeLists.txt       |  8 +++++++-
+ contrib/brl/bseg/boxm2/pro/CMakeLists.txt      |  7 +++++++
+ contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt | 10 +++++++++-
+ 5 files changed, 37 insertions(+), 4 deletions(-)
 
 diff --git a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
 index c1c82d0dd4..3a82f2e050 100644
@@ -69,31 +68,6 @@ index 76c1216a4f..aa028ca71f 100644
  
    # The N-dimensional bin structure implementations use rpl/rsdl
  
-diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-index c821d10a77..2a41c2db1a 100644
---- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-@@ -3,13 +3,20 @@
- # bprb depends on expat and bvxm_pro depends on bprb primarily
- FIND_PACKAGE(EXPAT REQUIRED)
- FIND_PACKAGE(EXPATPP REQUIRED)
-+
- if(EXPAT_FOUND)
-   include_directories( ${BRL_INCLUDE_DIR}/bpro )
-   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
-   include_directories( ${BRL_INCLUDE_DIR}/bseg )
-   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
-   include_directories( ${GEL_INCLUDE_DIR}/mrc )
-+
-+FIND_PACKAGE(RPLY REQUIRED)
-+if(RPLY_FOUND)
-+  include_directories( ${RPLY_INCLUDE_DIR} )
-+else()
-   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+endif()
- 
-   set(boxm_algo_pro_sources
-       boxm_algo_processes.h
 diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 index 7c2ec1d9c3..0536e327fd 100644
 --- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
@@ -114,10 +88,10 @@ index 7c2ec1d9c3..0536e327fd 100644
    set(boxm2_pro_sources
        boxm2_processes.h
 diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-index bea0c2c32d..f19374be80 100644
+index 265cd5d066..2ec707047f 100644
 --- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-@@ -11,7 +11,14 @@ if(EXPAT_FOUND)
+@@ -11,8 +11,16 @@ if(EXPAT_FOUND)
    include_directories( ${BRL_INCLUDE_DIR}/bbas )
    include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
    include_directories( ${GEL_INCLUDE_DIR}/mrc )
@@ -127,11 +101,14 @@ index bea0c2c32d..f19374be80 100644
 +  include_directories( ${RPLY_INCLUDE_DIR} )
 +else()
    include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
+-if(OpenCL_FOUND)
 +endif()
 +
- if(OPENCL_FOUND)
-   include_directories( ${OPENCL_INCLUDE_PATH} )
++if(OPENCL_FOUND)
++  include_directories( ${OPENCL_INCLUDE_PATH} )
    set( BOXM2_VOLM_PRO_LIBS boxm2_ocl)
+ endif()
+ 
 -- 
-2.21.0
+2.41.0
 
diff --git a/0007-v3.5.0-remove-triangle.patch b/0007-v3.5.0-remove-triangle.patch
new file mode 100644
index 0000000..0a01794
--- /dev/null
+++ b/0007-v3.5.0-remove-triangle.patch
@@ -0,0 +1,20107 @@
+From 0bab0cea132ba88f0d3646797e3d4087016bc2a8 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 10:48:40 +0100
+Subject: [PATCH 07/11] v3.5.0: remove triangle
+
+Reference:
+https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files
+---
+ config/cmake/Modules/FindNetlib.cmake |     2 +-
+ v3p/netlib/CMakeLists.txt             |    19 -
+ v3p/netlib/examples/.NoDartCoverage   |     0
+ v3p/netlib/examples/A.poly            |    62 -
+ v3p/netlib/examples/CMakeLists.txt    |    14 -
+ v3p/netlib/examples/showme.c          |  3392 -----
+ v3p/netlib/tests/CMakeLists.txt       |     4 -
+ v3p/netlib/triangle.README            |   198 -
+ v3p/netlib/triangle.c                 | 16011 ------------------------
+ v3p/netlib/triangle.h                 |   299 -
+ 10 files changed, 1 insertion(+), 20000 deletions(-)
+ delete mode 100644 v3p/netlib/examples/.NoDartCoverage
+ delete mode 100644 v3p/netlib/examples/A.poly
+ delete mode 100644 v3p/netlib/examples/CMakeLists.txt
+ delete mode 100644 v3p/netlib/examples/showme.c
+ delete mode 100644 v3p/netlib/triangle.README
+ delete mode 100644 v3p/netlib/triangle.c
+ delete mode 100644 v3p/netlib/triangle.h
+
+diff --git a/config/cmake/Modules/FindNetlib.cmake b/config/cmake/Modules/FindNetlib.cmake
+index c953a8bbc3..0fba6dddf2 100644
+--- a/config/cmake/Modules/FindNetlib.cmake
++++ b/config/cmake/Modules/FindNetlib.cmake
+@@ -9,4 +9,4 @@
+ set( NETLIB_FOUND "YES" )
+ set( NETLIB_INCLUDE_DIR ${VXL_ROOT_SOURCE_DIR}/v3p/netlib )
+ set( NETLIB_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/v3p/netlib )
+-set( NETLIB_LIBRARIES ${VXL_LIB_PREFIX}netlib ${VXL_LIB_PREFIX}v3p_netlib )
++set( NETLIB_LIBRARIES ${VXL_LIB_PREFIX}v3p_netlib )
+diff --git a/v3p/netlib/CMakeLists.txt b/v3p/netlib/CMakeLists.txt
+index 1c3df5db0c..05941c9ed0 100644
+--- a/v3p/netlib/CMakeLists.txt
++++ b/v3p/netlib/CMakeLists.txt
+@@ -2,21 +2,6 @@
+ 
+ project( netlib C )
+ 
+-set(netlib_sources
+-     # The "Triangle" program of Jonathan Richard Shewchuk
+-     triangle.c triangle.h
+-   )
+-
+-vxl_add_library(
+-    LIBRARY_NAME ${VXL_LIB_PREFIX}netlib
+-    LIBRARY_SOURCES ${netlib_sources}
+-    DISABLE_MSVC_MP
+-)
+-
+-if(UNIX)
+-  target_link_libraries( ${VXL_LIB_PREFIX}netlib m )
+-endif()
+-
+ # Allow sources in subdirectories to see the include files.
+ include_directories(${netlib_SOURCE_DIR})
+ 
+@@ -447,10 +432,6 @@ if(BUILD_TESTING)
+   add_subdirectory(tests)
+ endif()
+ 
+-if(VXL_BUILD_EXAMPLES)
+-  add_subdirectory(examples)
+-endif()
+-
+ if (VXL_BUILD_OBJECT_LIBRARIES)
+   add_library(v3p_netlib-obj OBJECT ${v3p_netlib_sources})
+ endif()
+diff --git a/v3p/netlib/examples/.NoDartCoverage b/v3p/netlib/examples/.NoDartCoverage
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/v3p/netlib/examples/A.poly b/v3p/netlib/examples/A.poly
+deleted file mode 100644
+index 166a71773a..0000000000
+--- a/v3p/netlib/examples/A.poly
++++ /dev/null
+@@ -1,62 +0,0 @@
+-29 2 1 0
+-1 0.200000 -0.776400 -0.57
+-2 0.220000 -0.773200 -0.55
+-3 0.245600 -0.756400 -0.51
+-4 0.277600 -0.702000 -0.53
+-5 0.488800 -0.207600 0.28
+-6 0.504800 -0.207600 0.30
+-7 0.740800 -0.739600 0
+-8 0.756000 -0.761200 -0.01
+-9 0.774400 -0.772400 0
+-10 0.800000 -0.776400 0.02
+-11 0.800000 -0.792400 0.01
+-12 0.579200 -0.792400 -0.21
+-13 0.579200 -0.776400 -0.2
+-14 0.621600 -0.771600 -0.15
+-15 0.633600 -0.762800 -0.13
+-16 0.639200 -0.744400 -0.1
+-17 0.620800 -0.684400 -0.06
+-18 0.587200 -0.604400 -0.01
+-19 0.360800 -0.604400 -0.24
+-20 0.319200 -0.706800 -0.39
+-21 0.312000 -0.739600 -0.43
+-22 0.318400 -0.761200 -0.44
+-23 0.334400 -0.771600 -0.44
+-24 0.371200 -0.776400 -0.41
+-25 0.371200 -0.792400 -0.42
+-26 0.374400 -0.570000 -0.2
+-27 0.574400 -0.570000 0
+-28 0.473600 -0.330800 0.14
+-29 0.200000 -0.792400 -0.59
+-29 0
+-1 29 1
+-2 1 2
+-3 2 3
+-4 3 4
+-5 4 5
+-6 5 6
+-7 6 7
+-8 7 8
+-9 8 9
+-10 9 10
+-11 10 11
+-12 11 12
+-13 12 13
+-14 13 14
+-15 14 15
+-16 15 16
+-17 16 17
+-18 17 18
+-19 18 19
+-20 19 20
+-21 20 21
+-22 21 22
+-23 22 23
+-24 23 24
+-25 24 25
+-26 25 29
+-27 26 27
+-28 27 28
+-29 28 26
+-1
+-1 0.47 -0.5
+diff --git a/v3p/netlib/examples/CMakeLists.txt b/v3p/netlib/examples/CMakeLists.txt
+deleted file mode 100644
+index 1021aa2877..0000000000
+--- a/v3p/netlib/examples/CMakeLists.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-link_libraries(netlib)
+-
+-include(${VXL_CMAKE_DIR}/FindNetlib.cmake)
+-if(NETLIB_FOUND)
+-  include_directories(${NETLIB_INCLUDE_DIR})
+-
+-  find_package(X11)
+-  if(X11_FOUND)
+-    include_directories(${X11_INCLUDE_DIR})
+-    add_executable(netlib_showme showme.c)
+-    target_link_libraries(netlib_showme ${X11_LIBRARIES})
+-  endif()
+-
+-endif()
+diff --git a/v3p/netlib/examples/showme.c b/v3p/netlib/examples/showme.c
+deleted file mode 100644
+index 815d63a0fd..0000000000
+--- a/v3p/netlib/examples/showme.c
++++ /dev/null
+@@ -1,3392 +0,0 @@
+-/*****************************************************************************/
+-/*                                                                           */
+-/*    ,d88^^o 888                                   o    o                   */
+-/*    8888    888o^88,  o88^^o Y88b    o    /      d8b  d8b      o88^^8o     */
+-/*    "Y88b   888  888 d888   b Y88b  d8b  /      d888bdY88b    d888  88b    */
+-/*     "Y88b, 888  888 8888   8  Y888/Y88b/      / Y88Y Y888b   8888oo888    */
+-/*    o  8888 888  888 q888   p   Y8/  Y8/      /   YY   Y888b  q888         */
+-/*    "oo88P" 888  888  "88oo"     Y    Y      /          Y888b  "88oooo"    */
+-/*                                                                           */
+-/*  A Display Program for Meshes and More.                                   */
+-/*  (showme.c)                                                               */
+-/*                                                                           */
+-/*  Version 1.3                                                              */
+-/*  July 20, 1996                                                            */
+-/*                                                                           */
+-/*  Copyright 1996                                                           */
+-/*  Jonathan Richard Shewchuk                                                */
+-/*  School of Computer Science                                               */
+-/*  Carnegie Mellon University                                               */
+-/*  5000 Forbes Avenue                                                       */
+-/*  Pittsburgh, Pennsylvania  15213-3891                                     */
+-/*  jrs@cs.cmu.edu                                                           */
+-/*                                                                           */
+-/*  This program may be freely redistributed under the condition that the    */
+-/*    copyright notices (including this entire header and the copyright      */
+-/*    notice printed when the `-h' switch is selected) are not removed, and  */
+-/*    no compensation is received.  Private, research, and institutional     */
+-/*    use is free.  You may distribute modified versions of this code UNDER  */
+-/*    THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE   */
+-/*    SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE   */
+-/*    AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR    */
+-/*    NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as    */
+-/*    part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT  */
+-/*    WITH THE AUTHOR.  (If you are not directly supplying this code to a    */
+-/*    customer, and you are instead telling them how they can obtain it for  */
+-/*    free, then you are not required to make any arrangement with me.)      */
+-/*                                                                           */
+-/*  Hypertext instructions for Triangle are available on the Web at          */
+-/*                                                                           */
+-/*      http://www.cs.cmu.edu/~quake/showme.html                             */
+-/*                                                                           */
+-/*  Show Me was created as part of the Archimedes project in the School of   */
+-/*    Computer Science at Carnegie Mellon University.  Archimedes is a       */
+-/*    system for compiling parallel finite element solvers.  For further     */
+-/*    information, see Anja Feldmann, Omar Ghattas, John R. Gilbert, Gary L. */
+-/*    Miller, David R. O'Hallaron, Eric J. Schwabe, Jonathan R. Shewchuk,    */
+-/*    and Shang-Hua Teng.  "Automated Parallel Solution of Unstructured PDE  */
+-/*    Problems."  To appear in Communications of the ACM, we hope.           */
+-/*                                                                           */
+-/*  If you make any improvements to this code, please please please let me   */
+-/*    know, so that I may obtain the improvements.  Even if you don't change */
+-/*    the code, I'd still love to hear what it's being used for.             */
+-/*                                                                           */
+-/*  Disclaimer:  Neither I nor Carnegie Mellon warrant this code in any way  */
+-/*    whatsoever.  Use at your own risk.                                     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/* For single precision (which will save some memory and reduce paging),     */
+-/*   write "#define SINGLE" below.                                           */
+-/*                                                                           */
+-/* For double precision (which will allow you to display triangulations of   */
+-/*   a finer resolution), leave SINGLE undefined.                            */
+-
+-/* #define SINGLE */
+-
+-#ifdef SINGLE
+-#define REAL float
+-#else
+-#define REAL double
+-#endif
+-
+-/* Maximum number of characters in a file name (including the null).         */
+-
+-#define FILENAMESIZE 1024
+-
+-/* Maximum number of characters in a line read from a file (including the    */
+-/*   null).                                                                  */
+-
+-#define INPUTLINESIZE 512
+-
+-#define STARTWIDTH 414
+-#define STARTHEIGHT 414
+-#define MINWIDTH 50
+-#define MINHEIGHT 50
+-#define BUTTONHEIGHT 21
+-#define BUTTONROWS 3
+-#define PANELHEIGHT (BUTTONHEIGHT * BUTTONROWS)
+-#define MAXCOLORS 64
+-
+-#define IMAGE_TYPES 7
+-#define NOTHING -1
+-#define NODE 0
+-#define POLY 1
+-#define ELE 2
+-#define EDGE 3
+-#define PART 4
+-#define ADJ 5
+-#define VORO 6
+-
+-#define STARTEXPLOSION 0.5
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <X11/Xlib.h>
+-#include <X11/Xutil.h>
+-#include <X11/Xatom.h>
+-
+-/* The following obscenity seems to be necessary to ensure that this program */
+-/* will port to Dec Alphas running OSF/1, because their stdio.h file commits */
+-/* the unpardonable sin of including stdlib.h.  Hence, malloc(), free(), and */
+-/* exit() may or may not already be defined at this point.  I declare these  */
+-/* functions explicitly because some non-ANSI C compilers lack stdlib.h.     */
+-
+-#if !defined(_STDLIB_H_) && !defined(_STDLIB_H) && defined(__need_malloc_and_calloc)
+-extern char *malloc();
+-extern void free();
+-extern void exit();
+-extern double strtod();
+-extern long strtol();
+-#endif
+-
+-/* A necessary forward declaration.                                          */
+-
+-int load_image();
+-
+-Display *display;
+-int screen;
+-Window rootwindow;
+-Window mainwindow;
+-Window quitwin;
+-Window leftwin;
+-Window rightwin;
+-Window upwin;
+-Window downwin;
+-Window resetwin;
+-Window pswin;
+-Window epswin;
+-Window expwin;
+-Window exppluswin;
+-Window expminuswin;
+-Window widthpluswin;
+-Window widthminuswin;
+-Window versionpluswin;
+-Window versionminuswin;
+-Window fillwin;
+-Window nodewin[2];
+-Window polywin[2];
+-Window elewin[2];
+-Window edgewin[2];
+-Window partwin[2];
+-Window adjwin[2];
+-Window voronoiwin[2];
+-
+-int windowdepth;
+-XEvent event;
+-Colormap rootmap;
+-XFontStruct *font;
+-int width, height;
+-int black, white;
+-int showme_foreground;
+-GC fontgc;
+-GC blackfontgc;
+-GC linegc;
+-GC trianglegc;
+-int colors[MAXCOLORS];
+-XColor rgb[MAXCOLORS];
+-int color;
+-
+-int start_image, current_image;
+-int start_inc, current_inc;
+-int loweriteration;
+-int line_width;
+-int loaded[2][IMAGE_TYPES];
+-REAL xlo[2][IMAGE_TYPES], ylo[2][IMAGE_TYPES];
+-REAL xhi[2][IMAGE_TYPES], yhi[2][IMAGE_TYPES];
+-REAL xscale, yscale;
+-REAL xoffset, yoffset;
+-int zoom;
+-
+-int nodes[2], node_dim[2];
+-REAL *nodeptr[2];
+-int polynodes[2], poly_dim[2], polyedges[2], polyholes[2];
+-REAL *polynodeptr[2], *polyholeptr[2];
+-int *polyedgeptr[2];
+-int elems[2], ele_corners[2];
+-int *eleptr[2];
+-int edges[2];
+-int *edgeptr[2];
+-REAL *normptr[2];
+-int subdomains[2];
+-int *partpart[2];
+-REAL *partcenter[2], *partshift[2];
+-int adjsubdomains[2];
+-int *adjptr[2];
+-int vnodes[2], vnode_dim[2];
+-REAL *vnodeptr[2];
+-int vedges[2];
+-int *vedgeptr[2];
+-REAL *vnormptr[2];
+-int firstnumber[2];
+-
+-int quiet, fillelem, bw_ps, explode;
+-REAL explosion;
+-
+-char filename[FILENAMESIZE];
+-char nodefilename[2][FILENAMESIZE];
+-char polyfilename[2][FILENAMESIZE];
+-char elefilename[2][FILENAMESIZE];
+-char edgefilename[2][FILENAMESIZE];
+-char partfilename[2][FILENAMESIZE];
+-char adjfilename[2][FILENAMESIZE];
+-char vnodefilename[2][FILENAMESIZE];
+-char vedgefilename[2][FILENAMESIZE];
+-
+-const
+-char *colorname[] = {"aquamarine", "red", "green yellow", "magenta",
+-                     "yellow", "green", "orange", "blue",
+-                     "white", "sandy brown", "cyan", "moccasin",
+-                     "cadet blue", "coral", "cornflower blue", "sky blue",
+-                     "firebrick", "forest green", "gold", "goldenrod",
+-                     "gray", "hot pink", "chartreuse", "pale violet red",
+-                     "indian red", "khaki", "lavender", "light blue",
+-                     "light gray", "light steel blue", "lime green", "azure",
+-                     "maroon", "medium aquamarine", "dodger blue", "honeydew",
+-                     "medium orchid", "medium sea green", "moccasin",
+-                     "medium slate blue", "medium spring green",
+-                     "medium turquoise", "medium violet red",
+-                     "orange red", "chocolate", "light goldenrod",
+-                     "orchid", "pale green", "pink", "plum",
+-                     "purple", "salmon", "sea green",
+-                     "sienna", "slate blue", "spring green",
+-                     "steel blue", "tan", "thistle", "turquoise",
+-                     "violet", "violet red", "wheat",
+-                     "yellow green"};
+-
+-void syntax()
+-{
+-  printf("showme [-bfw_Qh] input_file\n");
+-  printf("    -b  Black and white PostScript (default is color).\n");
+-  printf("    -f  Fill triangles of partitioned mesh with color.\n");
+-  printf("    -w  Set line width to some specified number.\n");
+-  printf("    -Q  Quiet:  No terminal output except errors.\n");
+-  printf("    -h  Help:  Detailed instructions for Show Me.\n");
+-  exit(0);
+-}
+-
+-void info()
+-{
+-  printf("Show Me\n");
+-  printf("A Display Program for Meshes and More.\n");
+-  printf("Version 1.3\n\n");
+-  printf(
+-"Copyright 1996 Jonathan Richard Shewchuk  (bugs/comments to jrs@cs.cmu.edu)\n"
+-);
+-  printf("School of Computer Science / Carnegie Mellon University\n");
+-  printf("5000 Forbes Avenue / Pittsburgh, Pennsylvania  15213-3891\n");
+-  printf(
+-"Created as part of the Archimedes project (tools for parallel FEM).\n");
+-  printf(
+-"Supported in part by NSF Grant CMS-9318163 and an NSERC 1967 Scholarship.\n");
+-  printf("There is no warranty whatsoever.  Use at your own risk.\n");
+-#ifdef SINGLE
+-  printf("This executable is compiled for single precision arithmetic.\n\n\n");
+-#else
+-  printf("This executable is compiled for double precision arithmetic.\n\n\n");
+-#endif
+-  printf(
+-"Show Me graphically displays the contents of geometric files, especially\n");
+-  printf(
+-"those generated by Triangle, my two-dimensional quality mesh generator and\n"
+-);
+-  printf(
+-"Delaunay triangulator.  Show Me can also write images in PostScript form.\n");
+-  printf(
+-"Show Me is also useful for checking the consistency of the files you create\n"
+-);
+-  printf(
+-"as input to Triangle; Show Me does these checks more thoroughly than\n");
+-  printf("Triangle does.  The command syntax is:\n\n");
+-  printf("showme [-bfw_Qh] input_file\n\n");
+-  printf(
+-"The underscore indicates that a number should follow the -w switch.\n");
+-  printf(
+-"input_file may be one of several types of file.  It must have extension\n");
+-  printf(
+-".node, .poly, .ele, .edge, .part, or .adj.  If no extension is provided,\n");
+-  printf(
+-"Show Me will assume the extension .ele.  A .node file represents a set of\n");
+-  printf(
+-"points; a .poly file represents a Planar Straight Line Graph; an .ele file\n"
+-);
+-  printf(
+-"(coupled with a .node file) represents the elements of a mesh or the\n");
+-  printf(
+-"triangles of a triangulation; an .edge file (coupled with a .node file)\n");
+-  printf(
+-"represents a set of edges; a .part file specifies a partition of a mesh;\n");
+-  printf(
+-"and a .adj file represents the adjacency graph defined by a partition.\n");
+-  printf("\n");
+-  printf("Command Line Switches:\n");
+-  printf("\n");
+-  printf(
+-"    -b  Makes all PostScript output black and white.  If this switch is not\n"
+-);
+-  printf(
+-"        selected, color PostScript is used for partitioned meshes and\n");
+-  printf("        adjacency graphs (.part and .adj files).\n");
+-  printf(
+-"    -f  On color displays and in color PostScript, displays partitioned\n");
+-  printf(
+-"        meshes by filling triangles with color, rather than by coloring the\n"
+-);
+-  printf(
+-"        edges.  This switch will result in a clearer picture if all\n");
+-  printf(
+-"        triangles are reasonably large, and a less clear picture if small\n");
+-  printf(
+-"        triangles are present.  (There is also a button to toggle this\n");
+-  printf("        behavior.)\n");
+-  printf(
+-"    -w  Followed by an integer, specifies the line width used in all\n");
+-  printf(
+-"        images.  (There are also buttons to change the line width.)\n");
+-  printf(
+-"    -Q  Quiet:  Suppresses all explanation of what Show Me is doing, unless\n"
+-);
+-  printf("        an error occurs.\n");
+-  printf("    -h  Help:  Displays these instructions.\n");
+-  printf("\n");
+-  printf("Controls:\n");
+-  printf("\n");
+-  printf(
+-"  To zoom in on an image, point at the location where you want a closer\n");
+-  printf(
+-"  look, and click the left mouse button.  To zoom out, click the right\n");
+-  printf(
+-"  mouse button.  In either case, the point you click on will be centered in\n"
+-);
+-  printf(
+-"  the window.  If you want to know the coordinates of a point, click the\n");
+-  printf(
+-"  middle mouse button; the coordinates will be printed on the terminal you\n"
+-);
+-  printf("  invoked Show Me from.\n\n");
+-  printf(
+-"  If you resize the window, the image will grow or shrink to match.\n");
+-  printf("\n");
+-  printf(
+-"  There is a panel of control buttons at the bottom of the Show Me window:\n"
+-);
+-  printf("\n");
+-  printf("  Quit:  Shuts down Show Me.\n");
+-  printf("  <, >, ^, v:  Moves the image in the indicated direction.\n");
+-  printf(
+-"  Reset: Unzooms and centers the image in the window.  When you switch from\n"
+-);
+-  printf(
+-"    one image to another, the viewing region does not change, so you may\n");
+-  printf(
+-"    need to reset the new image to make it fully visible.  This often is\n");
+-  printf(
+-"    the case when switching between Delaunay triangulations and their\n");
+-  printf(
+-"    corresponding Voronoi diagrams, as Voronoi vertices can be far from the\n"
+-);
+-  printf("    initial point set.\n");
+-  printf(
+-"  Width+, -:  Increases or decreases the width of all lines and points.\n");
+-  printf(
+-"  Exp, +, -:  These buttons appear only when you are viewing a partitioned\n"
+-);
+-  printf(
+-"    mesh (.part file).  `Exp' toggles between an exploded and non-exploded\n"
+-);
+-  printf(
+-"    image of the mesh.  The non-exploded image will not show the partition\n"
+-);
+-  printf(
+-"    on a black and white monitor.  `+' and `-' allow you to adjust the\n");
+-  printf(
+-"    spacing between pieces of the mesh to better distinguish them.\n");
+-  printf(
+-"  Fill:  This button appears only when you are viewing a partitioned mesh\n");
+-  printf(
+-"    (.part file).  It toggles between color-filled triangles and colored\n");
+-  printf(
+-"    edges (as the -f switch does).  Filled triangles look better when all\n");
+-  printf(
+-"    triangles are reasonably large; colored edges look better when there\n");
+-  printf("    are very small triangles present.\n");
+-  printf(
+-"  PS:  Creates a PostScript file containing the image you are viewing.  If\n"
+-);
+-  printf(
+-"    the -b switch is selected, all PostScript output will be black and\n");
+-  printf(
+-"    white; otherwise, .part.ps and .adj.ps files will be color, independent\n"
+-);
+-  printf(
+-"    of whether you are using a color monitor.  Normally the output will\n");
+-  printf(
+-"    preserve the properties of the image you see on the screen, including\n");
+-  printf(
+-"    zoom and line width; however, if black and white output is selected (-b\n"
+-);
+-  printf(
+-"    switch), partitioned meshes will always be drawn exploded.  The output\n"
+-);
+-  printf(
+-"    file name depends on the image being viewed.  If you want several\n");
+-  printf(
+-"    different snapshots (zooming in on different parts) of the same object,\n"
+-);
+-  printf(
+-"    you'll have to rename each file after Show Me creates it so that it\n");
+-  printf("    isn't overwritten by the next snapshot.\n");
+-  printf(
+-"  EPS:  Creates an encapsulated PostScript file, suitable for inclusion in\n"
+-);
+-  printf(
+-"    documents.  Otherwise, this button is just like the PS button.  (The\n");
+-  printf(
+-"    main difference is that .eps files lack a `showpage' command at the\n");
+-  printf("    end.)\n\n");
+-  printf(
+-"  There are two nearly-identical rows of buttons that load different images\n"
+-);
+-  printf("  from disk.  Each row contains the following buttons:\n\n");
+-  printf("  node:  Loads a .node file.\n");
+-  printf(
+-"  poly:  Loads a .poly file (and possibly an associated .node file).\n");
+-  printf("  ele:  Loads an .ele file (and associated .node file).\n");
+-  printf("  edge:  Loads an .edge file (and associated .node file).\n");
+-  printf(
+-"  part:  Loads a .part file (and associated .node and .ele files).\n");
+-  printf(
+-"  adj:  Loads an .adj file (and associated .node, .ele, and .part files).\n");
+-  printf("  voro:  Loads a .v.node and .v.edge file for a Voronoi diagram.\n");
+-  printf("\n");
+-  printf(
+-"  Each row represents a different iteration number of the geometry files.\n");
+-  printf(
+-"  For a full explanation of iteration numbers, read the instructions for\n");
+-  printf(
+-"  Triangle.  Briefly, iteration numbers are used to allow a user to easily\n"
+-);
+-  printf(
+-"  represent a sequence of related triangulations.  Iteration numbers are\n");
+-  printf(
+-"  used in the names of geometry files; for instance, mymesh.3.ele is a\n");
+-  printf(
+-"  triangle file with iteration number three, and mymesh.ele has an implicit\n"
+-);
+-  printf("  iteration number of zero.\n\n");
+-  printf(
+-"  The control buttons at the right end of each row display the two\n");
+-  printf(
+-"  iterations currently under view.  These buttons can be clicked to\n");
+-  printf(
+-"  increase or decrease the iteration numbers, and thus conveniently view\n");
+-  printf("  a sequence of meshes.\n\n");
+-  printf(
+-"  Show Me keeps each file in memory after loading it, but you can force\n");
+-  printf(
+-"  Show Me to reread a set of files (for one iteration number) by reclicking\n"
+-);
+-  printf(
+-"  the button that corresponds to the current image.  This is convenient if\n"
+-);
+-  printf("  you have changed a geometry file.\n\n");
+-  printf("File Formats:\n\n");
+-  printf(
+-"  All files may contain comments prefixed by the character '#'.  Points,\n");
+-  printf(
+-"  segments, holes, triangles, edges, and subdomains must be numbered\n");
+-  printf(
+-"  consecutively, starting from either 1 or 0.  Whichever you choose, all\n");
+-  printf(
+-"  input files must be consistent (for any single iteration number); if the\n"
+-);
+-  printf(
+-"  nodes are numbered from 1, so must be all other objects.  Show Me\n");
+-  printf(
+-"  automatically detects your choice while reading a .node (or .poly) file.\n"
+-);
+-  printf("  Examples of these file formats are given below.\n\n");
+-  printf("  .node files:\n");
+-  printf(
+-"    First line:  <# of points> <dimension (must be 2)> <# of attributes>\n");
+-  printf(
+-"                                           <# of boundary markers (0 or 1)>\n"
+-);
+-  printf(
+-"    Remaining lines:  <point #> <x> <y> [attributes] [boundary marker]\n");
+-  printf("\n");
+-  printf(
+-"    The attributes, which are typically floating-point values of physical\n");
+-  printf(
+-"    quantities (such as mass or conductivity) associated with the nodes of\n"
+-);
+-  printf(
+-"    a finite element mesh, are ignored by Show Me.  Show Me also ignores\n");
+-  printf(
+-"    boundary markers.  See the instructions for Triangle to find out what\n");
+-  printf("    attributes and boundary markers are.\n\n");
+-  printf("  .poly files:\n");
+-  printf(
+-"    First line:  <# of points> <dimension (must be 2)> <# of attributes>\n");
+-  printf(
+-"                                           <# of boundary markers (0 or 1)>\n"
+-);
+-  printf(
+-"    Following lines:  <point #> <x> <y> [attributes] [boundary marker]\n");
+-  printf("    One line:  <# of segments> <# of boundary markers (0 or 1)>\n");
+-  printf(
+-"    Following lines:  <segment #> <endpoint> <endpoint> [boundary marker]\n");
+-  printf("    One line:  <# of holes>\n");
+-  printf("    Following lines:  <hole #> <x> <y>\n");
+-  printf("    [Optional additional lines that are ignored]\n\n");
+-  printf(
+-"    A .poly file represents a Planar Straight Line Graph (PSLG), an idea\n");
+-  printf(
+-"    familiar to computational geometers.  By definition, a PSLG is just a\n");
+-  printf(
+-"    list of points and edges.  A .poly file also contains some additional\n");
+-  printf("    information.\n\n");
+-  printf(
+-"    The first section lists all the points, and is identical to the format\n"
+-);
+-  printf(
+-"    of .node files.  <# of points> may be set to zero to indicate that the\n"
+-);
+-  printf(
+-"    points are listed in a separate .node file; .poly files produced by\n");
+-  printf(
+-"    Triangle always have this format.  When Show Me reads such a file, it\n");
+-  printf("    also reads the corresponding .node file.\n\n");
+-  printf(
+-"    The second section lists the segments.  Segments are edges whose\n");
+-  printf(
+-"    presence in a triangulation produced from the PSLG is enforced.  Each\n");
+-  printf(
+-"    segment is specified by listing the indices of its two endpoints.  This\n"
+-);
+-  printf(
+-"    means that its endpoints must be included in the point list.  Each\n");
+-  printf(
+-"    segment, like each point, may have a boundary marker, which is ignored\n"
+-);
+-  printf("    by Show Me.\n\n");
+-  printf(
+-"    The third section lists holes and concavities that are desired in any\n");
+-  printf(
+-"    triangulation generated from the PSLG.  Holes are specified by\n");
+-  printf("    identifying a point inside each hole.\n\n");
+-  printf("  .ele files:\n");
+-  printf(
+-"    First line:  <# of triangles> <points per triangle> <# of attributes>\n");
+-  printf(
+-"    Remaining lines:  <triangle #> <point> <point> <point> ... [attributes]\n"
+-);
+-  printf("\n");
+-  printf(
+-"    Points are indices into the corresponding .node file.  Show Me ignores\n"
+-);
+-  printf(
+-"    all but the first three points of each triangle; these should be the\n");
+-  printf(
+-"    corners listed in counterclockwise order around the triangle.  The\n");
+-  printf("    attributes are ignored by Show Me.\n\n");
+-  printf("  .edge files:\n");
+-  printf("    First line:  <# of edges> <# of boundary markers (0 or 1)>\n");
+-  printf(
+-"    Following lines:  <edge #> <endpoint> <endpoint> [boundary marker]\n");
+-  printf("\n");
+-  printf(
+-"    Endpoints are indices into the corresponding .node file.  The boundary\n"
+-);
+-  printf("    markers are ignored by Show Me.\n\n");
+-  printf(
+-"    In Voronoi diagrams, one also finds a special kind of edge that is an\n");
+-  printf(
+-"    infinite ray with only one endpoint.  For these edges, a different\n");
+-  printf("    format is used:\n\n");
+-  printf("        <edge #> <endpoint> -1 <direction x> <direction y>\n\n");
+-  printf(
+-"    The `direction' is a floating-point vector that indicates the direction\n"
+-);
+-  printf("    of the infinite ray.\n\n");
+-  printf("  .part files:\n");
+-  printf("    First line:  <# of triangles> <# of subdomains>\n");
+-  printf("    Remaining lines:  <triangle #> <subdomain #>\n\n");
+-  printf(
+-"    The set of triangles is partitioned by a .part file; each triangle is\n");
+-  printf("    mapped to a subdomain.\n\n");
+-  printf("  .adj files:\n");
+-  printf("    First line:  <# of subdomains>\n");
+-  printf("    Remaining lines:  <adjacency matrix entry>\n\n");
+-  printf(
+-"    An .adj file represents adjacencies between subdomains (presumably\n");
+-  printf("    computed by a partitioner).  The first line is followed by\n");
+-  printf(
+-"    (subdomains X subdomains) lines, each containing one entry of the\n");
+-  printf(
+-"    adjacency matrix.  A nonzero entry indicates that two subdomains are\n");
+-  printf("    adjacent (share a point).\n\n");
+-  printf("Example:\n\n");
+-  printf(
+-"  Here is a sample file `box.poly' describing a square with a square hole:\n"
+-);
+-  printf("\n");
+-  printf(
+-"    # A box with eight points in 2D, no attributes, no boundary marker.\n");
+-  printf("    8 2 0 0\n");
+-  printf("    # Outer box has these vertices:\n");
+-  printf("     1   0 0\n");
+-  printf("     2   0 3\n");
+-  printf("     3   3 0\n");
+-  printf("     4   3 3\n");
+-  printf("    # Inner square has these vertices:\n");
+-  printf("     5   1 1\n");
+-  printf("     6   1 2\n");
+-  printf("     7   2 1\n");
+-  printf("     8   2 2\n");
+-  printf("    # Five segments without boundary markers.\n");
+-  printf("    5 0\n");
+-  printf("     1   1 2          # Left side of outer box.\n");
+-  printf("     2   5 7          # Segments 2 through 5 enclose the hole.\n");
+-  printf("     3   7 8\n");
+-  printf("     4   8 6\n");
+-  printf("     5   6 5\n");
+-  printf("    # One hole in the middle of the inner square.\n");
+-  printf("    1\n");
+-  printf("     1   1.5 1.5\n\n");
+-  printf(
+-"  After this PSLG is triangulated by Triangle, the resulting triangulation\n"
+-);
+-  printf(
+-"  consists of a .node and .ele file.  Here is the former, `box.1.node',\n");
+-  printf("  which duplicates the points of the PSLG:\n\n");
+-  printf("    8  2  0  0\n");
+-  printf("       1    0  0\n");
+-  printf("       2    0  3\n");
+-  printf("       3    3  0\n");
+-  printf("       4    3  3\n");
+-  printf("       5    1  1\n");
+-  printf("       6    1  2\n");
+-  printf("       7    2  1\n");
+-  printf("       8    2  2\n");
+-  printf("    # Generated by triangle -pcBev box\n");
+-  printf("\n");
+-  printf("  Here is the triangulation file, `box.1.ele'.\n");
+-  printf("\n");
+-  printf("    8  3  0\n");
+-  printf("       1       1     5     6\n");
+-  printf("       2       5     1     3\n");
+-  printf("       3       2     6     8\n");
+-  printf("       4       6     2     1\n");
+-  printf("       5       7     3     4\n");
+-  printf("       6       3     7     5\n");
+-  printf("       7       8     4     2\n");
+-  printf("       8       4     8     7\n");
+-  printf("    # Generated by triangle -pcBev box\n\n");
+-  printf("  Here is the edge file for the triangulation, `box.1.edge'.\n\n");
+-  printf("    16  0\n");
+-  printf("       1   1  5\n");
+-  printf("       2   5  6\n");
+-  printf("       3   6  1\n");
+-  printf("       4   1  3\n");
+-  printf("       5   3  5\n");
+-  printf("       6   2  6\n");
+-  printf("       7   6  8\n");
+-  printf("       8   8  2\n");
+-  printf("       9   2  1\n");
+-  printf("      10   7  3\n");
+-  printf("      11   3  4\n");
+-  printf("      12   4  7\n");
+-  printf("      13   7  5\n");
+-  printf("      14   8  4\n");
+-  printf("      15   4  2\n");
+-  printf("      16   8  7\n");
+-  printf("    # Generated by triangle -pcBev box\n");
+-  printf("\n");
+-  printf(
+-"  Here's a file `box.1.part' that partitions the mesh into four subdomains.\n"
+-);
+-  printf("\n");
+-  printf("    8  4\n");
+-  printf("       1    3\n");
+-  printf("       2    3\n");
+-  printf("       3    4\n");
+-  printf("       4    4\n");
+-  printf("       5    1\n");
+-  printf("       6    1\n");
+-  printf("       7    2\n");
+-  printf("       8    2\n");
+-  printf("    # Generated by slice -s4 box.1\n\n");
+-  printf(
+-"  Here's a file `box.1.adj' that represents the resulting adjacencies.\n");
+-  printf("\n");
+-  printf("    4\n");
+-  printf("      9\n");
+-  printf("      2\n");
+-  printf("      2\n");
+-  printf("      0\n");
+-  printf("      2\n");
+-  printf("      9\n");
+-  printf("      0\n");
+-  printf("      2\n");
+-  printf("      2\n");
+-  printf("      0\n");
+-  printf("      9\n");
+-  printf("      2\n");
+-  printf("      0\n");
+-  printf("      2\n");
+-  printf("      2\n");
+-  printf("      9\n");
+-  printf("\n");
+-  printf("Display Speed:\n");
+-  printf("\n");
+-  printf(
+-"  It is worthwhile to note that .edge files typically plot and print twice\n"
+-);
+-  printf(
+-"  as quickly as .ele files, because .ele files cause each internal edge to\n"
+-);
+-  printf(
+-"  be drawn twice.  For the same reason, PostScript files created from edge\n"
+-);
+-  printf("  sets are smaller than those created from triangulations.\n\n");
+-  printf("Show Me on the Web:\n\n");
+-  printf(
+-"  To see an illustrated, updated version of these instructions, check out\n");
+-  printf("\n");
+-  printf("    http://www.cs.cmu.edu/~quake/showme.html\n");
+-  printf("\n");
+-  printf("A Brief Plea:\n");
+-  printf("\n");
+-  printf(
+-"  If you use Show Me (or Triangle), and especially if you use it to\n");
+-  printf(
+-"  accomplish real work, I would like very much to hear from you.  A short\n");
+-  printf(
+-"  letter or email (to jrs@cs.cmu.edu) describing how you use Show Me (and\n");
+-  printf(
+-"  its sister programs) will mean a lot to me.  The more people I know\n");
+-  printf(
+-"  are using my programs, the more easily I can justify spending time on\n");
+-  printf(
+-"  improvements, which in turn will benefit you.  Also, I can put you\n");
+-  printf(
+-"  on a list to receive email whenever new versions are available.\n");
+-  printf("\n");
+-  printf(
+-"  If you use a PostScript file generated by Show Me in a publication,\n");
+-  printf("  please include an acknowledgment as well.\n\n");
+-  exit(0);
+-}
+-
+-void set_filenames(filename, lowermeshnumber)
+-char *filename;
+-int lowermeshnumber;
+-{
+-  char numberstring[100];
+-  int i;
+-
+-  for (i = 0; i < 2; i++) {
+-    strcpy(nodefilename[i], filename);
+-    strcpy(polyfilename[i], filename);
+-    strcpy(elefilename[i], filename);
+-    strcpy(edgefilename[i], filename);
+-    strcpy(partfilename[i], filename);
+-    strcpy(adjfilename[i], filename);
+-    strcpy(vnodefilename[i], filename);
+-    strcpy(vedgefilename[i], filename);
+-
+-    if (lowermeshnumber + i > 0) {
+-      sprintf(numberstring, ".%d", lowermeshnumber + i);
+-      strcat(nodefilename[i], numberstring);
+-      strcat(polyfilename[i], numberstring);
+-      strcat(elefilename[i], numberstring);
+-      strcat(edgefilename[i], numberstring);
+-      strcat(partfilename[i], numberstring);
+-      strcat(adjfilename[i], numberstring);
+-      strcat(vnodefilename[i], numberstring);
+-      strcat(vedgefilename[i], numberstring);
+-    }
+-
+-    strcat(nodefilename[i], ".node");
+-    strcat(polyfilename[i], ".poly");
+-    strcat(elefilename[i], ".ele");
+-    strcat(edgefilename[i], ".edge");
+-    strcat(partfilename[i], ".part");
+-    strcat(adjfilename[i], ".adj");
+-    strcat(vnodefilename[i], ".v.node");
+-    strcat(vedgefilename[i], ".v.edge");
+-  }
+-}
+-
+-#if 1 /* This function is already in netlib.lib, see triangle.c */
+-void parsecommandline(int argc, char **argv);
+-#else
+-void parsecommandline(argc, argv)
+-int argc;
+-char **argv;
+-{
+-  int increment;
+-  int meshnumber;
+-  int i, j;
+-
+-  quiet = 0;
+-  fillelem = 0;
+-  line_width = 1;
+-  bw_ps = 0;
+-  start_image = ELE;
+-  filename[0] = '\0';
+-  for (i = 1; i < argc; i++) {
+-    if (argv[i][0] == '-') {
+-      for (j = 1; argv[i][j] != '\0'; j++) {
+-        if (argv[i][j] == 'f') {
+-          fillelem = 1;
+-        }
+-        if (argv[i][j] == 'w') {
+-          if ((argv[i][j + 1] >= '1') && (argv[i][j + 1] <= '9')) {
+-            line_width = 0;
+-            while ((argv[i][j + 1] >= '0') && (argv[i][j + 1] <= '9')) {
+-              j++;
+-              line_width = line_width * 10 + (int) (argv[i][j] - '0');
+-            }
+-            if (line_width > 100) {
+-              printf("Error:  Line width cannot exceed 100.\n");
+-              line_width = 1;
+-            }
+-          }
+-        }
+-        if (argv[i][j] == 'b') {
+-          bw_ps = 1;
+-        }
+-        if (argv[i][j] == 'Q') {
+-          quiet = 1;
+-        }
+-        if ((argv[i][j] == 'h') || (argv[i][j] == 'H') ||
+-            (argv[i][j] == '?')) {
+-          info();
+-        }
+-      }
+-    } else {
+-      strcpy(filename, argv[i]);
+-    }
+-  }
+-  if (filename[0] == '\0') {
+-    syntax();
+-  }
+-  if (!strcmp(&filename[strlen(filename) - 5], ".node")) {
+-    filename[strlen(filename) - 5] = '\0';
+-    start_image = NODE;
+-  }
+-  if (!strcmp(&filename[strlen(filename) - 5], ".poly")) {
+-    filename[strlen(filename) - 5] = '\0';
+-    start_image = POLY;
+-  }
+-  if (!strcmp(&filename[strlen(filename) - 4], ".ele")) {
+-    filename[strlen(filename) - 4] = '\0';
+-    start_image = ELE;
+-  }
+-  if (!strcmp(&filename[strlen(filename) - 5], ".edge")) {
+-    filename[strlen(filename) - 5] = '\0';
+-    start_image = EDGE;
+-  }
+-  if (!strcmp(&filename[strlen(filename) - 5], ".part")) {
+-    filename[strlen(filename) - 5] = '\0';
+-    start_image = PART;
+-  }
+-  if (!strcmp(&filename[strlen(filename) - 4], ".adj")) {
+-    filename[strlen(filename) - 4] = '\0';
+-    start_image = ADJ;
+-  }
+-
+-  increment = 0;
+-  j = 1;
+-  while (filename[j] != '\0') {
+-    if ((filename[j] == '.') && (filename[j + 1] != '\0')) {
+-      increment = j + 1;
+-    }
+-    j++;
+-  }
+-  meshnumber = 0;
+-  if (increment > 0) {
+-    j = increment;
+-    do {
+-      if ((filename[j] >= '0') && (filename[j] <= '9')) {
+-        meshnumber = meshnumber * 10 + (int) (filename[j] - '0');
+-      } else {
+-        increment = 0;
+-      }
+-      j++;
+-    } while (filename[j] != '\0');
+-  }
+-  if (increment > 0) {
+-    filename[increment - 1] = '\0';
+-  }
+-
+-  if (meshnumber == 0) {
+-    start_inc = 0;
+-    loweriteration = 0;
+-  } else {
+-    start_inc = 1;
+-    loweriteration = meshnumber - 1;
+-  }
+-  set_filenames(filename, loweriteration);
+-}
+-#endif /* 0 */
+-
+-void free_inc(inc)
+-int inc;
+-{
+-  if (loaded[inc][NODE]) {
+-    free(nodeptr[inc]);
+-  }
+-  if (loaded[inc][POLY]) {
+-    if (polynodes[inc] > 0) {
+-      free(polynodeptr[inc]);
+-    }
+-    free(polyedgeptr[inc]);
+-    free(polyholeptr[inc]);
+-  }
+-  if (loaded[inc][ELE]) {
+-    free(eleptr[inc]);
+-  }
+-  if (loaded[inc][PART]) {
+-    free(partpart[inc]);
+-    free(partcenter[inc]);
+-    free(partshift[inc]);
+-  }
+-  if (loaded[inc][EDGE]) {
+-    free(edgeptr[inc]);
+-    free(normptr[inc]);
+-  }
+-  if (loaded[inc][ADJ]) {
+-    free(adjptr[inc]);
+-  }
+-  if (loaded[inc][VORO]) {
+-    free(vnodeptr[inc]);
+-    free(vedgeptr[inc]);
+-    free(vnormptr[inc]);
+-  }
+-}
+-
+-void move_inc(inc)
+-int inc;
+-{
+-  int i;
+-
+-  free_inc(1 - inc);
+-  for (i = 0; i < IMAGE_TYPES; i++) {
+-    loaded[1 - inc][i] = loaded[inc][i];
+-    loaded[inc][i] = 0;
+-    xlo[1 - inc][i] = xlo[inc][i];
+-    ylo[1 - inc][i] = ylo[inc][i];
+-    xhi[1 - inc][i] = xhi[inc][i];
+-    yhi[1 - inc][i] = yhi[inc][i];
+-  }
+-  nodes[1 - inc] = nodes[inc];
+-  node_dim[1 - inc] = node_dim[inc];
+-  nodeptr[1 - inc] = nodeptr[inc];
+-  polynodes[1 - inc] = polynodes[inc];
+-  poly_dim[1 - inc] = poly_dim[inc];
+-  polyedges[1 - inc] = polyedges[inc];
+-  polyholes[1 - inc] = polyholes[inc];
+-  polynodeptr[1 - inc] = polynodeptr[inc];
+-  polyedgeptr[1 - inc] = polyedgeptr[inc];
+-  polyholeptr[1 - inc] = polyholeptr[inc];
+-  elems[1 - inc] = elems[inc];
+-  ele_corners[1 - inc] = ele_corners[inc];
+-  eleptr[1 - inc] = eleptr[inc];
+-  edges[1 - inc] = edges[inc];
+-  edgeptr[1 - inc] = edgeptr[inc];
+-  normptr[1 - inc] = normptr[inc];
+-  subdomains[1 - inc] = subdomains[inc];
+-  partpart[1 - inc] = partpart[inc];
+-  partcenter[1 - inc] = partcenter[inc];
+-  partshift[1 - inc] = partshift[inc];
+-  adjsubdomains[1 - inc] = adjsubdomains[inc];
+-  adjptr[1 - inc] = adjptr[inc];
+-  vnodes[1 - inc] = vnodes[inc];
+-  vnode_dim[1 - inc] = vnode_dim[inc];
+-  vnodeptr[1 - inc] = vnodeptr[inc];
+-  vedges[1 - inc] = vedges[inc];
+-  vedgeptr[1 - inc] = vedgeptr[inc];
+-  vnormptr[1 - inc] = vnormptr[inc];
+-  firstnumber[1 - inc] = firstnumber[inc];
+-  firstnumber[inc] = -1;
+-}
+-
+-void unload_inc(inc)
+-int inc;
+-{
+-  int i;
+-
+-  current_image = NOTHING;
+-  for (i = 0; i < IMAGE_TYPES; i++) {
+-    loaded[inc][i] = 0;
+-    firstnumber[inc] = -1;
+-  }
+-}
+-
+-void showme_init()
+-{
+-  current_image = NOTHING;
+-  current_inc = 0;
+-  explosion = STARTEXPLOSION;
+-  unload_inc(0);
+-  unload_inc(1);
+-}
+-
+-char *readline(string, infile, infilename)
+-char *string;
+-FILE *infile;
+-char *infilename;
+-{
+-  char *result;
+-
+-  do {
+-    result = fgets(string, INPUTLINESIZE, infile);
+-    if (result == (char *) NULL) {
+-      printf("  Error:  Unexpected end of file in %s.\n",
+-             infilename);
+-      exit(1);
+-    }
+-    while ((*result != '\0') && (*result != '#')
+-           && (*result != '.') && (*result != '+') && (*result != '-')
+-           && ((*result < '0') || (*result > '9'))) {
+-      result++;
+-    }
+-  } while ((*result == '#') || (*result == '\0'));
+-  return result;
+-}
+-
+-char *findfield(string)
+-char *string;
+-{
+-  char *result;
+-
+-  result = string;
+-  while ((*result != '\0') && (*result != '#')
+-         && (*result != ' ') && (*result != '\t')) {
+-    result++;
+-  }
+-  while ((*result != '\0') && (*result != '#')
+-         && (*result != '.') && (*result != '+') && (*result != '-')
+-         && ((*result < '0') || (*result > '9'))) {
+-    result++;
+-  }
+-  if (*result == '#') {
+-    *result = '\0';
+-  }
+-  return result;
+-}
+-
+-int load_node(fname, firstnumber, nodes, dim, ptr, xmin, ymin, xmax, ymax)
+-char *fname;
+-int *firstnumber;
+-int *nodes;
+-int *dim;
+-REAL **ptr;
+-REAL *xmin;
+-REAL *ymin;
+-REAL *xmax;
+-REAL *ymax;
+-{
+-  FILE *infile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int extras;
+-  int nodemarks;
+-  int index;
+-  int nodenumber;
+-  int i, j;
+-  int smallerr;
+-  REAL x, y;
+-
+-  *xmin = *ymin = 0.0;
+-  *xmax = *ymax = 1.0;
+-  if (!quiet) {
+-    printf("Opening %s.\n", fname);
+-  }
+-  infile = fopen(fname, "r");
+-  if (infile == (FILE *) NULL) {
+-    printf("  Error:  Cannot access file %s.\n", fname);
+-    return 1;
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  *nodes = (int) strtol (stringptr, &stringptr, 0);
+-  if (*nodes < 3) {
+-    printf("  Error:  %s contains %d points.\n", fname, *nodes);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    *dim = 2;
+-  } else {
+-    *dim = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (*dim < 1) {
+-    printf("  Error:  %s has dimensionality %d.\n", fname, *dim);
+-    return 1;
+-  }
+-  if (*dim != 2) {
+-    printf("  I only understand two-dimensional meshes.\n");
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    extras = 0;
+-  } else {
+-    extras = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (extras < 0) {
+-    printf("  Error:  %s has negative value for number of attributes.\n",
+-           fname);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    nodemarks = 0;
+-  } else {
+-    nodemarks = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (nodemarks < 0) {
+-    printf("  Warning:  %s has negative value for number of point markers.\n",
+-           fname);
+-  }
+-  if (nodemarks > 1) {
+-    printf(
+-   "  Warning:  %s has value greater than one for number of point markers.\n",
+-           fname);
+-  }
+-  *ptr = (REAL *) malloc((*nodes + 1) * *dim * sizeof(REAL));
+-  if (*ptr == (REAL *) NULL) {
+-    printf("  Out of memory.\n");
+-    return 1;
+-  }
+-  index = *dim;
+-  smallerr = 1;
+-  for (i = 0; i < *nodes; i++) {
+-    stringptr = readline(inputline, infile, fname);
+-    nodenumber = (int) strtol (stringptr, &stringptr, 0);
+-    if ((i == 0) && (*firstnumber == -1)) {
+-      if (nodenumber == 0) {
+-        *firstnumber = 0;
+-      } else {
+-        *firstnumber = 1;
+-      }
+-    }
+-    if ((nodenumber != *firstnumber + i) && (smallerr)) {
+-      printf("  Warning:  Points in %s are not numbered correctly\n", fname);
+-      printf("            (starting with point %d).\n", *firstnumber + i);
+-      smallerr = 0;
+-    }
+-    for (j = 0; j < *dim; j++) {
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Point %d is missing a coordinate in %s.\n",
+-               *firstnumber + i, fname);
+-        free(*ptr);
+-        return 1;
+-      }
+-      (*ptr)[index++] = (REAL) strtod(stringptr, &stringptr);
+-    }
+-  }
+-  fclose(infile);
+-  index = *dim;
+-  *xmin = *xmax = (*ptr)[index];
+-  *ymin = *ymax = (*ptr)[index + 1];
+-  for (i = 2; i <= *nodes; i++) {
+-    index += *dim;
+-    x = (*ptr)[index];
+-    y = (*ptr)[index + 1];
+-    if (x < *xmin) {
+-      *xmin = x;
+-    }
+-    if (y < *ymin) {
+-      *ymin = y;
+-    }
+-    if (x > *xmax) {
+-      *xmax = x;
+-    }
+-    if (y > *ymax) {
+-      *ymax = y;
+-    }
+-  }
+-  if (*xmin == *xmax) {
+-    *xmin -= 0.5;
+-    *xmax += 0.5;
+-  }
+-  if (*ymin == *ymax) {
+-    *ymin -= 0.5;
+-    *ymax += 0.5;
+-  }
+-  return 0;
+-}
+-
+-int load_poly(inc, fname, firstnumber, pnodes, dim, edges, holes, nodeptr,
+-              edgeptr, holeptr, xmin, ymin, xmax, ymax)
+-int inc;
+-char *fname;
+-int *firstnumber;
+-int *pnodes;
+-int *dim;
+-int *edges;
+-int *holes;
+-REAL **nodeptr;
+-int **edgeptr;
+-REAL **holeptr;
+-REAL *xmin;
+-REAL *ymin;
+-REAL *xmax;
+-REAL *ymax;
+-{
+-  FILE *infile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int extras;
+-  int nodemarks;
+-  int segmentmarks;
+-  int index;
+-  int nodenumber, edgenumber, holenumber;
+-  int maxnode;
+-  int i, j;
+-  int smallerr;
+-  REAL x, y;
+-
+-  if (!quiet) {
+-    printf("Opening %s.\n", fname);
+-  }
+-  infile = fopen(fname, "r");
+-  if (infile == (FILE *) NULL) {
+-    printf("  Error:  Cannot access file %s.\n", fname);
+-    return 1;
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  *pnodes = (int) strtol (stringptr, &stringptr, 0);
+-  if (*pnodes == 0) {
+-    if (!loaded[inc][NODE]) {
+-      if (load_image(inc, NODE)) {
+-        return 1;
+-      }
+-    }
+-    maxnode = nodes[inc];
+-    *xmin = xlo[inc][NODE];
+-    *ymin = ylo[inc][NODE];
+-    *xmax = xhi[inc][NODE];
+-    *ymax = yhi[inc][NODE];
+-  } else {
+-    if (*pnodes < 1) {
+-      printf("  Error:  %s contains %d points.\n", fname, *pnodes);
+-      return 1;
+-    }
+-    maxnode = *pnodes;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    *dim = 2;
+-  } else {
+-    *dim = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (*dim < 1) {
+-    printf("  Error:  %s has dimensionality %d.\n", fname, *dim);
+-    return 1;
+-  }
+-  if (*dim != 2) {
+-    printf("  I only understand two-dimensional meshes.\n");
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    extras = 0;
+-  } else {
+-    extras = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (extras < 0) {
+-    printf("  Error:  %s has negative value for number of attributes.\n",
+-           fname);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    nodemarks = 0;
+-  } else {
+-    nodemarks = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (nodemarks < 0) {
+-    printf("  Warning:  %s has negative value for number of point markers.\n",
+-           fname);
+-  }
+-  if (nodemarks > 1) {
+-    printf(
+-   "  Warning:  %s has value greater than one for number of point markers.\n",
+-           fname);
+-  }
+-  if (*pnodes > 0) {
+-    *nodeptr = (REAL *) malloc((*pnodes + 1) * *dim * sizeof(REAL));
+-    if (*nodeptr == (REAL *) NULL) {
+-      printf("  Out of memory.\n");
+-      return 1;
+-    }
+-    index = *dim;
+-    smallerr = 1;
+-    for (i = 0; i < *pnodes; i++) {
+-      stringptr = readline(inputline, infile, fname);
+-      nodenumber = (int) strtol (stringptr, &stringptr, 0);
+-      if ((i == 0) && (*firstnumber == -1)) {
+-        if (nodenumber == 0) {
+-          *firstnumber = 0;
+-        } else {
+-          *firstnumber = 1;
+-        }
+-      }
+-      if ((nodenumber != *firstnumber + i) && (smallerr)) {
+-        printf("  Warning:  Points in %s are not numbered correctly.\n",
+-               fname);
+-        printf("            (starting with point %d).\n", *firstnumber + i);
+-        smallerr = 0;
+-      }
+-      for (j = 0; j < *dim; j++) {
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          printf("Error:  Point %d is missing a coordinate in %s.\n",
+-                 *firstnumber + i, fname);
+-          free(*nodeptr);
+-          return 1;
+-        }
+-        (*nodeptr)[index++] = (REAL) strtod(stringptr, &stringptr);
+-      }
+-    }
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  *edges = (int) strtol (stringptr, &stringptr, 0);
+-  if (*edges < 0) {
+-    printf("  Error:  %s contains %d segments.\n", fname, *edges);
+-    free(*nodeptr);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    segmentmarks = 0;
+-  } else {
+-    segmentmarks = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (segmentmarks < 0) {
+-    printf("  Error:  %s has negative value for number of segment markers.\n",
+-           fname);
+-    free(*nodeptr);
+-    return 1;
+-  }
+-  if (segmentmarks > 1) {
+-    printf(
+-   "  Error:  %s has value greater than one for number of segment markers.\n",
+-           fname);
+-    free(*nodeptr);
+-    return 1;
+-  }
+-  *edgeptr = (int *) malloc(((*edges + 1) << 1) * sizeof(int));
+-  if (*edgeptr == (int *) NULL) {
+-    printf("  Out of memory.\n");
+-    free(*nodeptr);
+-    return 1;
+-  }
+-  index = 2;
+-  smallerr = 1;
+-  for (i = *firstnumber; i < *firstnumber + *edges; i++) {
+-    stringptr = readline(inputline, infile, fname);
+-    edgenumber = (int) strtol (stringptr, &stringptr, 0);
+-    if ((edgenumber != i) && (smallerr)) {
+-      printf("  Warning:  Segments in %s are not numbered correctly.\n",
+-             fname);
+-      printf("            (starting with segment %d).\n", i);
+-      smallerr = 0;
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Segment %d is missing its endpoints in %s.\n", i, fname);
+-      free(*nodeptr);
+-      free(*edgeptr);
+-      return 1;
+-    }
+-    (*edgeptr)[index] = (int) strtol (stringptr, &stringptr, 0) + 1 -
+-                        *firstnumber;
+-    if (((*edgeptr)[index] < 1) || ((*edgeptr)[index] > maxnode)) {
+-      printf("Error:  Segment %d has invalid endpoint in %s.\n", i, fname);
+-      return 1;
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Segment %d is missing an endpoint in %s.\n", i, fname);
+-      free(*nodeptr);
+-      free(*edgeptr);
+-      return 1;
+-    }
+-    (*edgeptr)[index + 1] = (int) strtol (stringptr, &stringptr, 0) + 1 -
+-                            *firstnumber;
+-    if (((*edgeptr)[index + 1] < 1) || ((*edgeptr)[index + 1] > maxnode)) {
+-      printf("Error:  Segment %d has invalid endpoint in %s.\n", i, fname);
+-      return 1;
+-    }
+-    index += 2;
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  *holes = (int) strtol (stringptr, &stringptr, 0);
+-  if (*holes < 0) {
+-    printf("  Error:  %s contains %d holes.\n", fname, *holes);
+-    free(*nodeptr);
+-    free(*edgeptr);
+-    return 1;
+-  }
+-  *holeptr = (REAL *) malloc((*holes + 1) * *dim * sizeof(REAL));
+-  if (*holeptr == (REAL *) NULL) {
+-    printf("  Out of memory.\n");
+-    free(*nodeptr);
+-    free(*edgeptr);
+-    return 1;
+-  }
+-  index = *dim;
+-  smallerr = 1;
+-  for (i = *firstnumber; i < *firstnumber + *holes; i++) {
+-    stringptr = readline(inputline, infile, fname);
+-    holenumber = (int) strtol (stringptr, &stringptr, 0);
+-    if ((holenumber != i) && (smallerr)) {
+-      printf("  Warning:  Holes in %s are not numbered correctly.\n", fname);
+-      printf("            (starting with hole %d).\n", i);
+-      smallerr = 0;
+-    }
+-    for (j = 0; j < *dim; j++) {
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Hole %d is missing a coordinate in %s.\n", i,
+-               fname);
+-        free(*nodeptr);
+-        free(*edgeptr);
+-        free(*holeptr);
+-        return 1;
+-      }
+-      (*holeptr)[index++] = (REAL) strtod(stringptr, &stringptr);
+-    }
+-  }
+-  fclose(infile);
+-  if (*pnodes > 0) {
+-    index = *dim;
+-    *xmin = *xmax = (*nodeptr)[index];
+-    *ymin = *ymax = (*nodeptr)[index + 1];
+-    for (i = 2; i <= *pnodes; i++) {
+-      index += *dim;
+-      x = (*nodeptr)[index];
+-      y = (*nodeptr)[index + 1];
+-      if (x < *xmin) {
+-        *xmin = x;
+-      }
+-      if (y < *ymin) {
+-        *ymin = y;
+-      }
+-      if (x > *xmax) {
+-        *xmax = x;
+-      }
+-      if (y > *ymax) {
+-        *ymax = y;
+-      }
+-    }
+-  }
+-  index = *dim;
+-  for (i = 1; i <= *holes; i++) {
+-    x = (*holeptr)[index];
+-    y = (*holeptr)[index + 1];
+-    if (x < *xmin) {
+-      *xmin = x;
+-    }
+-    if (y < *ymin) {
+-      *ymin = y;
+-    }
+-    if (x > *xmax) {
+-      *xmax = x;
+-    }
+-    if (y > *ymax) {
+-      *ymax = y;
+-    }
+-    index += *dim;
+-  }
+-  return 0;
+-}
+-
+-int load_ele(fname, firstnumber, nodes, elems, corners, ptr)
+-char *fname;
+-int firstnumber;
+-int nodes;
+-int *elems;
+-int *corners;
+-int **ptr;
+-{
+-  FILE *infile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int extras;
+-  int index;
+-  int elemnumber;
+-  int i, j;
+-  int smallerr;
+-
+-  if (!quiet) {
+-    printf("Opening %s.\n", fname);
+-  }
+-  infile = fopen(fname, "r");
+-  if (infile == (FILE *) NULL) {
+-    printf("  Error:  Cannot access file %s.\n", fname);
+-    return 1;
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  *elems = (int) strtol (stringptr, &stringptr, 0);
+-  if (*elems < 1) {
+-    printf("  Error:  %s contains %d triangles.\n", fname, *elems);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    *corners = 3;
+-  } else {
+-    *corners = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (*corners < 3) {
+-    printf("  Error:  Triangles in %s have only %d corners.\n", fname,
+-           *corners);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    extras = 0;
+-  } else {
+-    extras = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (extras < 0) {
+-    printf("  Error:  %s has negative value for extra fields.\n", fname);
+-    return 1;
+-  }
+-  *ptr = (int *) malloc((*elems + 1) * 3 * sizeof(int));
+-  if (*ptr == (int *) NULL) {
+-    printf("  Out of memory.\n");
+-    return 1;
+-  }
+-  index = 3;
+-  smallerr = 1;
+-  for (i = firstnumber; i < firstnumber + *elems; i++) {
+-    stringptr = readline(inputline, infile, fname);
+-    elemnumber = (int) strtol (stringptr, &stringptr, 0);
+-    if ((elemnumber != i) && (smallerr)) {
+-      printf("  Warning:  Triangles in %s are not numbered correctly.\n",
+-             fname);
+-      printf("            (starting with triangle %d).\n", i);
+-      smallerr = 0;
+-    }
+-    for (j = 0; j < 3; j++) {
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Triangle %d is missing a corner in %s.\n", i, fname);
+-        free(*ptr);
+-        return 1;
+-      }
+-      (*ptr)[index] = (int) strtol (stringptr, &stringptr, 0) + 1 -
+-                      firstnumber;
+-      if (((*ptr)[index] < 1) || ((*ptr)[index] > nodes)) {
+-        printf("Error:  Triangle %d has invalid corner in %s.\n", i, fname);
+-        return 1;
+-      }
+-      index++;
+-    }
+-  }
+-  fclose(infile);
+-  return 0;
+-}
+-
+-int load_edge(fname, firstnumber, nodes, edges, edgeptr, normptr)
+-char *fname;
+-int firstnumber;
+-int nodes;
+-int *edges;
+-int **edgeptr;
+-REAL **normptr;
+-{
+-  FILE *infile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int index;
+-  int edgenumber;
+-  int edgemarks;
+-  int i;
+-  int smallerr;
+-
+-  if (!quiet) {
+-    printf("Opening %s.\n", fname);
+-  }
+-  infile = fopen(fname, "r");
+-    if (infile == (FILE *) NULL) {
+-      printf("  Error:  Cannot access file %s.\n", fname);
+-      return 1;
+-    }
+-  stringptr = readline(inputline, infile, fname);
+-  *edges = (int) strtol (stringptr, &stringptr, 0);
+-  if (*edges < 1) {
+-    printf("  Error:  %s contains %d edges.\n", fname, *edges);
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    edgemarks = 0;
+-  } else {
+-    edgemarks = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (edgemarks < 0) {
+-    printf("  Error:  %s has negative value for number of edge markers.\n",
+-           fname);
+-    return 1;
+-  }
+-  if (edgemarks > 1) {
+-    printf(
+-   "  Error:  %s has value greater than one for number of edge markers.\n",
+-           fname);
+-    return 1;
+-  }
+-  *edgeptr = (int *) malloc(((*edges + 1) << 1) * sizeof(int));
+-  if (*edgeptr == (int *) NULL) {
+-    printf("  Out of memory.\n");
+-    return 1;
+-  }
+-  *normptr = (REAL *) malloc(((*edges + 1) << 1) * sizeof(REAL));
+-  if (*normptr == (REAL *) NULL) {
+-    printf("  Out of memory.\n");
+-    free(*edgeptr);
+-    return 1;
+-  }
+-  index = 2;
+-  smallerr = 1;
+-  for (i = firstnumber; i < firstnumber + *edges; i++) {
+-    stringptr = readline(inputline, infile, fname);
+-    edgenumber = (int) strtol (stringptr, &stringptr, 0);
+-    if ((edgenumber != i) && (smallerr)) {
+-      printf("  Warning:  Edges in %s are not numbered correctly.\n", fname);
+-      printf("            (starting with edge %d).\n", i);
+-      smallerr = 0;
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Edge %d is missing its endpoints in %s.\n", i, fname);
+-      free(*edgeptr);
+-      free(*normptr);
+-      return 1;
+-    }
+-    (*edgeptr)[index] = (int) strtol (stringptr, &stringptr, 0) + 1 -
+-                        firstnumber;
+-    if (((*edgeptr)[index] < 1) || ((*edgeptr)[index] > nodes)) {
+-      printf("Error:  Edge %d has invalid endpoint in %s.\n", i, fname);
+-      return 1;
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Edge %d is missing an endpoint in %s.\n", i, fname);
+-      free(*edgeptr);
+-      free(*normptr);
+-      return 1;
+-    }
+-    (*edgeptr)[index + 1] = (int) strtol (stringptr, &stringptr, 0);
+-    if ((*edgeptr)[index + 1] == -1) {
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Edge %d is missing its direction in %s.\n", i, fname);
+-        free(*edgeptr);
+-        free(*normptr);
+-        return 1;
+-      }
+-      (*normptr)[index] = (REAL) strtod(stringptr, &stringptr);
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Edge %d is missing a direction coordinate in %s.\n",
+-               i, fname);
+-        free(*edgeptr);
+-        free(*normptr);
+-        return 1;
+-      }
+-      (*normptr)[index + 1] = (REAL) strtod(stringptr, &stringptr);
+-    } else {
+-      (*edgeptr)[index + 1] += 1 - firstnumber;
+-      if (((*edgeptr)[index + 1] < 1) || ((*edgeptr)[index + 1] > nodes)) {
+-        printf("Error:  Edge %d has invalid endpoint in %s.\n", i, fname);
+-        return 1;
+-      }
+-    }
+-    index += 2;
+-  }
+-  fclose(infile);
+-  return 0;
+-}
+-
+-int load_part(fname, dim, firstnumber, elems, nodeptr, eleptr, parts,
+-              partition, partcenter, partshift)
+-char *fname;
+-int dim;
+-int firstnumber;
+-int elems;
+-REAL *nodeptr;
+-int *eleptr;
+-int *parts;
+-int **partition;
+-REAL **partcenter;
+-REAL **partshift;
+-{
+-  FILE *infile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int partelems;
+-  int index;
+-  int elemnumber;
+-  int i, j;
+-  int smallerr;
+-  int *partsize;
+-
+-  if (!quiet) {
+-    printf("Opening %s.\n", fname);
+-  }
+-  infile = fopen(fname, "r");
+-  if (infile == (FILE *) NULL) {
+-    printf("  Error:  Cannot access file %s.\n", fname);
+-    return 1;
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  partelems = (int) strtol (stringptr, &stringptr, 0);
+-  if (partelems != elems) {
+-    printf(
+-      "  Error:  .ele and .part files do not agree on number of triangles.\n");
+-    return 1;
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    *parts = 1;
+-  } else {
+-    *parts = (int) strtol (stringptr, &stringptr, 0);
+-  }
+-  if (*parts < 1) {
+-    printf("  Error:  %s specifies %d subdomains.\n", fname, *parts);
+-    return 1;
+-  }
+-  *partition = (int *) malloc((elems + 1) * sizeof(int));
+-  if (*partition == (int *) NULL) {
+-    printf("  Out of memory.\n");
+-    return 1;
+-  }
+-  smallerr = 1;
+-  for (i = firstnumber; i < firstnumber + partelems; i++) {
+-    stringptr = readline(inputline, infile, fname);
+-    elemnumber = (int) strtol (stringptr, &stringptr, 0);
+-    if ((elemnumber != i) && (smallerr)) {
+-      printf("  Warning:  Triangles in %s are not numbered correctly.\n",
+-             fname);
+-      printf("            (starting with triangle %d).\n", i);
+-      smallerr = 0;
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Triangle %d has no subdomain in %s.\n", i, fname);
+-      free(*partition);
+-      return 1;
+-    }
+-    (*partition)[i] = (int) strtol (stringptr, &stringptr, 0) - firstnumber;
+-    if (((*partition)[i] >= *parts) || ((*partition)[i] < 0)) {
+-      printf("  Error:  Triangle %d of %s has an invalid subdomain.\n",
+-             i, fname);
+-      free(*partition);
+-      return 1;
+-    }
+-  }
+-  fclose(infile);
+-  *partcenter = (REAL *) malloc(((*parts + 1) << 1) * sizeof(REAL));
+-  if (*partcenter == (REAL *) NULL) {
+-    printf("Error:  Out of memory.\n");
+-    free(*partition);
+-    return 1;
+-  }
+-  *partshift = (REAL *) malloc((*parts << 1) * sizeof(REAL));
+-  if (*partshift == (REAL *) NULL) {
+-    printf("Error:  Out of memory.\n");
+-    free(*partition);
+-    free(*partcenter);
+-    return 1;
+-  }
+-  partsize = (int *) malloc((*parts + 1) * sizeof(int));
+-  if (partsize == (int *) NULL) {
+-    printf("Error:  Out of memory.\n");
+-    free(*partition);
+-    free(*partcenter);
+-    free(*partshift);
+-    return 1;
+-  }
+-  index = 3;
+-  for (i = 0; i <= *parts; i++) {
+-    partsize[i] = 0;
+-    (*partcenter)[i << 1] = 0.0;
+-    (*partcenter)[(i << 1) + 1] = 0.0;
+-  }
+-  for (i = 1; i <= elems; i++) {
+-    partsize[(*partition)[i]] += 3;
+-    for (j = 0; j < 3; j++) {
+-      (*partcenter)[(*partition)[i] << 1] +=
+-                nodeptr[eleptr[index] * dim];
+-      (*partcenter)[((*partition)[i] << 1) + 1] +=
+-                nodeptr[eleptr[index++] * dim + 1];
+-    }
+-  }
+-  for (i = 0; i < *parts; i++) {
+-    (*partcenter)[i << 1] /= (REAL) partsize[i];
+-    (*partcenter)[(i << 1) + 1] /= (REAL) partsize[i];
+-    (*partcenter)[*parts << 1] += (*partcenter)[i << 1];
+-    (*partcenter)[(*parts << 1) + 1] += (*partcenter)[(i << 1) + 1];
+-  }
+-  (*partcenter)[*parts << 1] /= (REAL) *parts;
+-  (*partcenter)[(*parts << 1) + 1] /= (REAL) *parts;
+-  free(partsize);
+-  return 0;
+-}
+-
+-int load_adj(fname, subdomains, ptr)
+-char *fname;
+-int *subdomains;
+-int **ptr;
+-{
+-  FILE *infile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int i, j;
+-
+-  if (!quiet) {
+-    printf("Opening %s.\n", fname);
+-  }
+-  infile = fopen(fname, "r");
+-  if (infile == (FILE *) NULL) {
+-    printf("  Error:  Cannot access file %s.\n", fname);
+-    return 1;
+-  }
+-  stringptr = readline(inputline, infile, fname);
+-  *subdomains = (int) strtol (stringptr, &stringptr, 0);
+-  if (*subdomains < 1) {
+-    printf("  Error:  %s contains %d subdomains.\n", fname, *subdomains);
+-    return 1;
+-  }
+-  *ptr = (int *) malloc(*subdomains * *subdomains * sizeof(int));
+-  if (*ptr == (int *) NULL) {
+-    printf("  Out of memory.\n");
+-    return 1;
+-  }
+-  for (i = 0; i < *subdomains; i++) {
+-    for (j = 0; j < *subdomains; j++) {
+-      stringptr = readline(inputline, infile, fname);
+-      (*ptr)[i * *subdomains + j] = (int) strtol (stringptr, &stringptr, 0);
+-    }
+-  }
+-  return 0;
+-}
+-
+-void findpartshift(parts, explosion, partcenter, partshift)
+-int parts;
+-REAL explosion;
+-REAL *partcenter;
+-REAL *partshift;
+-{
+-  int i;
+-
+-  for (i = 0; i < parts; i++) {
+-    partshift[i << 1] = explosion *
+-          (partcenter[i << 1] - partcenter[parts << 1]);
+-    partshift[(i << 1) + 1] = explosion *
+-          (partcenter[(i << 1) + 1] - partcenter[(parts << 1) + 1]);
+-  }
+-}
+-
+-int load_image(inc, image)
+-int inc;
+-int image;
+-{
+-  int error;
+-
+-  switch (image) {
+-    case NODE:
+-      error = load_node(nodefilename[inc], &firstnumber[inc], &nodes[inc],
+-                        &node_dim[inc], &nodeptr[inc], &xlo[inc][NODE],
+-                        &ylo[inc][NODE], &xhi[inc][NODE], &yhi[inc][NODE]);
+-      break;
+-    case POLY:
+-      error = load_poly(inc, polyfilename[inc], &firstnumber[inc],
+-                        &polynodes[inc], &poly_dim[inc], &polyedges[inc],
+-                        &polyholes[inc], &polynodeptr[inc], &polyedgeptr[inc],
+-                        &polyholeptr[inc],
+-                        &xlo[inc][POLY], &ylo[inc][POLY],
+-                        &xhi[inc][POLY], &yhi[inc][POLY]);
+-      break;
+-    case ELE:
+-      error = load_ele(elefilename[inc], firstnumber[inc], nodes[inc],
+-                       &elems[inc], &ele_corners[inc], &eleptr[inc]);
+-      xlo[inc][ELE] = xlo[inc][NODE];
+-      ylo[inc][ELE] = ylo[inc][NODE];
+-      xhi[inc][ELE] = xhi[inc][NODE];
+-      yhi[inc][ELE] = yhi[inc][NODE];
+-      break;
+-    case EDGE:
+-      error = load_edge(edgefilename[inc], firstnumber[inc], nodes[inc],
+-                        &edges[inc], &edgeptr[inc], &normptr[inc]);
+-      xlo[inc][EDGE] = xlo[inc][NODE];
+-      ylo[inc][EDGE] = ylo[inc][NODE];
+-      xhi[inc][EDGE] = xhi[inc][NODE];
+-      yhi[inc][EDGE] = yhi[inc][NODE];
+-      break;
+-    case PART:
+-      error = load_part(partfilename[inc], node_dim[inc], firstnumber[inc],
+-                        elems[inc], nodeptr[inc], eleptr[inc],
+-                        &subdomains[inc], &partpart[inc], &partcenter[inc],
+-                        &partshift[inc]);
+-      if (!error) {
+-        findpartshift(subdomains[inc], explosion, partcenter[inc],
+-                      partshift[inc]);
+-      }
+-      xlo[inc][PART] = xlo[inc][NODE];
+-      ylo[inc][PART] = ylo[inc][NODE];
+-      xhi[inc][PART] = xhi[inc][NODE];
+-      yhi[inc][PART] = yhi[inc][NODE];
+-      break;
+-    case ADJ:
+-      error = load_adj(adjfilename[inc], &adjsubdomains[inc], &adjptr[inc]);
+-      xlo[inc][ADJ] = xlo[inc][NODE];
+-      ylo[inc][ADJ] = ylo[inc][NODE];
+-      xhi[inc][ADJ] = xhi[inc][NODE];
+-      yhi[inc][ADJ] = yhi[inc][NODE];
+-      break;
+-    case VORO:
+-      error = load_node(vnodefilename[inc], &firstnumber[inc], &vnodes[inc],
+-                        &vnode_dim[inc], &vnodeptr[inc], &xlo[inc][VORO],
+-                        &ylo[inc][VORO], &xhi[inc][VORO], &yhi[inc][VORO]);
+-      if (!error) {
+-        error = load_edge(vedgefilename[inc], firstnumber[inc], vnodes[inc],
+-                          &vedges[inc], &vedgeptr[inc], &vnormptr[inc]);
+-      }
+-      break;
+-    default:
+-      error = 1;
+-  }
+-  if (!error) {
+-    loaded[inc][image] = 1;
+-  }
+-  return error;
+-}
+-
+-void choose_image(inc, image)
+-int inc;
+-int image;
+-{
+-  if (!loaded[inc][image]) {
+-    if ((image == ELE) || (image == EDGE) || (image == PART)
+-        || (image == ADJ)) {
+-      if (!loaded[inc][NODE]) {
+-        if (load_image(inc, NODE)) {
+-          return;
+-        }
+-      }
+-    }
+-    if ((image == PART) || (image == ADJ)) {
+-      if (!loaded[inc][ELE]) {
+-        if (load_image(inc, ELE)) {
+-          return;
+-        }
+-      }
+-    }
+-    if (image == ADJ) {
+-      if (!loaded[inc][PART]) {
+-        if (load_image(inc, PART)) {
+-          return;
+-        }
+-      }
+-    }
+-    if (load_image(inc, image)) {
+-      return;
+-    }
+-  }
+-  current_inc = inc;
+-  current_image = image;
+-}
+-
+-Window make_button(name, x, y, width)
+-char *name;
+-int x;
+-int y;
+-int width;
+-{
+-  XSetWindowAttributes attr;
+-  XSizeHints hints;
+-  Window button;
+-
+-  attr.background_pixel = black;
+-  attr.border_pixel = white;
+-  attr.backing_store = NotUseful;
+-  attr.event_mask = ExposureMask | ButtonReleaseMask | ButtonPressMask;
+-  attr.bit_gravity = SouthWestGravity;
+-  attr.win_gravity = SouthWestGravity;
+-  attr.save_under = False;
+-  button = XCreateWindow(display, mainwindow, x, y, width, BUTTONHEIGHT - 4,
+-                         2, 0, InputOutput, CopyFromParent,
+-                         CWBackPixel | CWBorderPixel | CWEventMask |
+-                         CWBitGravity | CWWinGravity | CWBackingStore |
+-                         CWSaveUnder, &attr);
+-  hints.width = width;
+-  hints.height = BUTTONHEIGHT - 4;
+-  hints.min_width = 0;
+-  hints.min_height = BUTTONHEIGHT - 4;
+-  hints.max_width = width;
+-  hints.max_height = BUTTONHEIGHT - 4;
+-  hints.width_inc = 1;
+-  hints.height_inc = 1;
+-  hints.flags = PMinSize | PMaxSize | PSize | PResizeInc;
+-  XSetStandardProperties(display, button, name, "showme", None, (char **) NULL,
+-                         0, &hints);
+-  return button;
+-}
+-
+-void make_buttons(y)
+-int y;
+-{
+-  int i;
+-
+-  for (i = 1; i >= 0; i--) {
+-    nodewin[i] = make_button("node", 0, y + (1 - i) * BUTTONHEIGHT, 42);
+-    XMapWindow(display, nodewin[i]);
+-    polywin[i] = make_button("poly", 44, y + (1 - i) * BUTTONHEIGHT, 42);
+-    XMapWindow(display, polywin[i]);
+-    elewin[i] = make_button("ele", 88, y + (1 - i) * BUTTONHEIGHT, 33);
+-    XMapWindow(display, elewin[i]);
+-    edgewin[i] = make_button("edge", 123, y + (1 - i) * BUTTONHEIGHT, 42);
+-    XMapWindow(display, edgewin[i]);
+-    partwin[i] = make_button("part", 167, y + (1 - i) * BUTTONHEIGHT, 42);
+-    XMapWindow(display, partwin[i]);
+-    adjwin[i] = make_button("adj", 211, y + (1 - i) * BUTTONHEIGHT, 33);
+-    XMapWindow(display, adjwin[i]);
+-    voronoiwin[i] = make_button("voro", 246, y + (1 - i) * BUTTONHEIGHT, 42);
+-    XMapWindow(display, voronoiwin[i]);
+-  }
+-  versionpluswin = make_button("    +", 290, y, 52);
+-  XMapWindow(display, versionpluswin);
+-  versionminuswin = make_button("    -", 290, y + BUTTONHEIGHT, 52);
+-  XMapWindow(display, versionminuswin);
+-
+-  quitwin = make_button("Quit", 0, y + 2 * BUTTONHEIGHT, 42);
+-  XMapWindow(display, quitwin);
+-  leftwin = make_button("<", 44, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, leftwin);
+-  rightwin = make_button(">", 60, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, rightwin);
+-  upwin = make_button("^", 76, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, upwin);
+-  downwin = make_button("v", 92, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, downwin);
+-  resetwin = make_button("Reset", 108, y + 2 * BUTTONHEIGHT, 52);
+-  XMapWindow(display, resetwin);
+-  widthpluswin = make_button("Width+", 162, y + 2 * BUTTONHEIGHT, 61);
+-  XMapWindow(display, widthpluswin);
+-  widthminuswin = make_button("-", 225, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, widthminuswin);
+-  expwin = make_button("Exp", 241, y + 2 * BUTTONHEIGHT, 33);
+-  XMapWindow(display, expwin);
+-  exppluswin = make_button("+", 276, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, exppluswin);
+-  expminuswin = make_button("-", 292, y + 2 * BUTTONHEIGHT, 14);
+-  XMapWindow(display, expminuswin);
+-  fillwin = make_button("Fill", 308, y + 2 * BUTTONHEIGHT, 41);
+-  XMapWindow(display, fillwin);
+-  pswin = make_button("PS", 351, y + 2 * BUTTONHEIGHT, 24);
+-  XMapWindow(display, pswin);
+-  epswin = make_button("EPS", 377, y + 2 * BUTTONHEIGHT, 33);
+-  XMapWindow(display, epswin);
+-}
+-
+-void fill_button(button)
+-Window button;
+-{
+-  int x, y;
+-  unsigned int w, h, d, b;
+-  Window rootw;
+-
+-  XGetGeometry(display, button, &rootw, &x, &y, &w, &h, &d, &b);
+-  XFillRectangle(display, button, fontgc, 0, 0, w, h);
+-}
+-
+-void draw_buttons()
+-{
+-  char numberstring[32];
+-  char buttonstring[6];
+-  int i;
+-
+-  for (i = 1; i >= 0; i--) {
+-    if ((current_image == NODE) && (current_inc == i)) {
+-      fill_button(nodewin[i]);
+-      XDrawString(display, nodewin[i], blackfontgc, 2, 13, "node", 4);
+-    } else {
+-      XClearWindow(display, nodewin[i]);
+-      XDrawString(display, nodewin[i], fontgc, 2, 13, "node", 4);
+-    }
+-    if ((current_image == POLY) && (current_inc == i)) {
+-      fill_button(polywin[i]);
+-      XDrawString(display, polywin[i], blackfontgc, 2, 13, "poly", 4);
+-    } else {
+-      XClearWindow(display, polywin[i]);
+-      XDrawString(display, polywin[i], fontgc, 2, 13, "poly", 4);
+-    }
+-    if ((current_image == ELE) && (current_inc == i)) {
+-      fill_button(elewin[i]);
+-      XDrawString(display, elewin[i], blackfontgc, 2, 13, "ele", 3);
+-    } else {
+-      XClearWindow(display, elewin[i]);
+-      XDrawString(display, elewin[i], fontgc, 2, 13, "ele", 3);
+-    }
+-    if ((current_image == EDGE) && (current_inc == i)) {
+-      fill_button(edgewin[i]);
+-      XDrawString(display, edgewin[i], blackfontgc, 2, 13, "edge", 4);
+-    } else {
+-      XClearWindow(display, edgewin[i]);
+-      XDrawString(display, edgewin[i], fontgc, 2, 13, "edge", 4);
+-    }
+-    if ((current_image == PART) && (current_inc == i)) {
+-      fill_button(partwin[i]);
+-      XDrawString(display, partwin[i], blackfontgc, 2, 13, "part", 4);
+-    } else {
+-      XClearWindow(display, partwin[i]);
+-      XDrawString(display, partwin[i], fontgc, 2, 13, "part", 4);
+-    }
+-    if ((current_image == ADJ) && (current_inc == i)) {
+-      fill_button(adjwin[i]);
+-      XDrawString(display, adjwin[i], blackfontgc, 2, 13, "adj", 3);
+-    } else {
+-      XClearWindow(display, adjwin[i]);
+-      XDrawString(display, adjwin[i], fontgc, 2, 13, "adj", 3);
+-    }
+-    if ((current_image == VORO) && (current_inc == i)) {
+-      fill_button(voronoiwin[i]);
+-      XDrawString(display, voronoiwin[i], blackfontgc, 2, 13, "voro", 4);
+-    } else {
+-      XClearWindow(display, voronoiwin[i]);
+-      XDrawString(display, voronoiwin[i], fontgc, 2, 13, "voro", 4);
+-    }
+-  }
+-
+-  XClearWindow(display, versionpluswin);
+-  sprintf(numberstring, "%d", loweriteration + 1);
+-  sprintf(buttonstring, "%-4.4s+", numberstring);
+-  XDrawString(display, versionpluswin, fontgc, 2, 13, buttonstring, 5);
+-  XClearWindow(display, versionminuswin);
+-  sprintf(numberstring, "%d", loweriteration);
+-  if (loweriteration == 0) {
+-    sprintf(buttonstring, "%-4.4s", numberstring);
+-  } else {
+-    sprintf(buttonstring, "%-4.4s-", numberstring);
+-  }
+-  XDrawString(display, versionminuswin, fontgc, 2, 13, buttonstring, 5);
+-
+-  XClearWindow(display, quitwin);
+-  XDrawString(display, quitwin, fontgc, 2, 13, "Quit", 4);
+-  XClearWindow(display, leftwin);
+-  XDrawString(display, leftwin, fontgc, 2, 13, "<", 1);
+-  XClearWindow(display, rightwin);
+-  XDrawString(display, rightwin, fontgc, 2, 13, ">", 1);
+-  XClearWindow(display, upwin);
+-  XDrawString(display, upwin, fontgc, 2, 13, "^", 1);
+-  XClearWindow(display, downwin);
+-  XDrawString(display, downwin, fontgc, 2, 13, "v", 1);
+-  XClearWindow(display, resetwin);
+-  XDrawString(display, resetwin, fontgc, 2, 13, "Reset", 6);
+-  XClearWindow(display, widthpluswin);
+-  if (line_width < 100) {
+-    XDrawString(display, widthpluswin, fontgc, 2, 13, "Width+", 6);
+-  } else {
+-    XDrawString(display, widthpluswin, fontgc, 2, 13, "Width ", 6);
+-  }
+-  XClearWindow(display, widthminuswin);
+-  if (line_width > 1) {
+-    XDrawString(display, widthminuswin, fontgc, 2, 13, "-", 1);
+-  }
+-  XClearWindow(display, expwin);
+-  XClearWindow(display, exppluswin);
+-  XClearWindow(display, expminuswin);
+-  XClearWindow(display, fillwin);
+-  if (current_image == PART) {
+-    if (explode) {
+-      fill_button(expwin);
+-      XDrawString(display, expwin, blackfontgc, 2, 13, "Exp", 3);
+-    } else {
+-      XDrawString(display, expwin, fontgc, 2, 13, "Exp", 3);
+-    }
+-    XDrawString(display, exppluswin, fontgc, 2, 13, "+", 1);
+-    XDrawString(display, expminuswin, fontgc, 2, 13, "-", 1);
+-    if (fillelem) {
+-      fill_button(fillwin);
+-      XDrawString(display, fillwin, blackfontgc, 2, 13, "Fill", 4);
+-    } else {
+-      XDrawString(display, fillwin, fontgc, 2, 13, "Fill", 4);
+-    }
+-  }
+-  XClearWindow(display, pswin);
+-  XDrawString(display, pswin, fontgc, 2, 13, "PS", 2);
+-  XClearWindow(display, epswin);
+-  XDrawString(display, epswin, fontgc, 2, 13, "EPS", 3);
+-}
+-
+-void showme_window(argc, argv)
+-int argc;
+-char **argv;
+-{
+-  XSetWindowAttributes attr;
+-  XSizeHints hints;
+-  XGCValues fontvalues, linevalues;
+-  XColor alloc_color, exact_color;
+-  int i;
+-
+-  display = XOpenDisplay((char *) NULL);
+-  if (!display) {
+-    printf("Error:  Cannot open display.\n");
+-    exit(1);
+-  }
+-  screen = DefaultScreen(display);
+-  rootwindow = DefaultRootWindow(display);
+-  black = BlackPixel(display, screen);
+-  white = WhitePixel(display, screen);
+-  windowdepth = DefaultDepth(display, screen);
+-  rootmap = DefaultColormap(display, screen);
+-  width = STARTWIDTH;
+-  height = STARTHEIGHT;
+-  attr.background_pixel = black;
+-  attr.border_pixel = white;
+-  attr.backing_store = NotUseful;
+-  attr.event_mask = ExposureMask | ButtonReleaseMask | ButtonPressMask |
+-                    StructureNotifyMask;
+-  attr.bit_gravity = NorthWestGravity;
+-  attr.win_gravity = NorthWestGravity;
+-  attr.save_under = False;
+-  mainwindow = XCreateWindow(display, rootwindow, 0, 0, width,
+-                             height + PANELHEIGHT, 3, 0,
+-                             InputOutput, CopyFromParent,
+-                             CWBackPixel | CWBorderPixel | CWEventMask |
+-                             CWBitGravity | CWWinGravity | CWBackingStore |
+-                             CWSaveUnder, &attr);
+-  hints.width = width;
+-  hints.height = height + PANELHEIGHT;
+-  hints.min_width = MINWIDTH;
+-  hints.min_height = MINHEIGHT + PANELHEIGHT;
+-  hints.width_inc = 1;
+-  hints.height_inc = 1;
+-  hints.flags = PMinSize | PSize | PResizeInc;
+-  XSetStandardProperties(display, mainwindow, "Show Me", "showme", None,
+-                         argv, argc, &hints);
+-
+-  static const unsigned char temp_show_me_achimedes_local[18] = {'s','h','o','w','m','e','\0','A','r','c','h','i','m','e','d','e','s','\0'};
+-  XChangeProperty(display, mainwindow, XA_WM_CLASS, XA_STRING, 8,
+-                  PropModeReplace, temp_show_me_achimedes_local, 18U);
+-  XClearWindow(display, mainwindow);
+-  XMapWindow(display, mainwindow);
+-  if ((windowdepth > 1) &&
+-      XAllocNamedColor(display, rootmap, "yellow", &alloc_color,
+-                       &exact_color)) {
+-    color = 1;
+-    explode = bw_ps;
+-    fontvalues.foreground = alloc_color.pixel;
+-    linevalues.foreground = alloc_color.pixel;
+-    showme_foreground = alloc_color.pixel;
+-    for (i = 0; i < 64; i++) {
+-      if (XAllocNamedColor(display, rootmap, colorname[i], &alloc_color,
+-                           &rgb[i])) {
+-        colors[i] = alloc_color.pixel;
+-      } else {
+-        colors[i] = white;
+-        rgb[i].red = alloc_color.red;
+-        rgb[i].green = alloc_color.green;
+-        rgb[i].blue = alloc_color.blue;
+-        if (!quiet) {
+-          printf("Warning:  I could not allocate %s.\n", colorname[i]);
+-        }
+-      }
+-    }
+-  } else {
+-    color = 0;
+-    fillelem = 0;
+-    explode = 1;
+-    fontvalues.foreground = white;
+-    linevalues.foreground = white;
+-    showme_foreground = white;
+-  }
+-  font = XLoadQueryFont(display, "9x15");
+-  fontvalues.background = black;
+-  fontvalues.font = font->fid;
+-  fontvalues.fill_style = FillSolid;
+-  fontvalues.line_width = 2;
+-  fontgc = XCreateGC(display, rootwindow, GCForeground | GCBackground |
+-                      GCFont | GCLineWidth | GCFillStyle, &fontvalues);
+-  fontvalues.foreground = black;
+-  blackfontgc = XCreateGC(display, rootwindow, GCForeground | GCBackground |
+-                         GCFont | GCLineWidth | GCFillStyle, &fontvalues);
+-  linevalues.background = black;
+-  linevalues.line_width = line_width;
+-  linevalues.cap_style = CapRound;
+-  linevalues.join_style = JoinRound;
+-  linevalues.fill_style = FillSolid;
+-  linegc = XCreateGC(display, rootwindow, GCForeground | GCBackground |
+-                     GCLineWidth | GCCapStyle | GCJoinStyle | GCFillStyle,
+-                     &linevalues);
+-  trianglegc = XCreateGC(display, rootwindow, GCForeground | GCBackground |
+-                         GCLineWidth | GCCapStyle | GCJoinStyle | GCFillStyle,
+-                         &linevalues);
+-  make_buttons(height);
+-  XFlush(display);
+-}
+-
+-void draw_node(nodes, dim, ptr, xscale, yscale, xoffset, yoffset)
+-int nodes;
+-int dim;
+-REAL *ptr;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i;
+-  int index;
+-
+-  index = dim;
+-  for (i = 1; i <= nodes; i++) {
+-    XFillRectangle(display, mainwindow, linegc,
+-                   (int) (ptr[index] * xscale + xoffset) - (line_width >> 1),
+-                   (int) (ptr[index + 1] * yscale + yoffset) -
+-                         (line_width >> 1), line_width, line_width);
+-    index += dim;
+-  }
+-}
+-
+-void draw_poly(nodes, dim, edges, holes, nodeptr, edgeptr, holeptr,
+-               xscale, yscale, xoffset, yoffset)
+-int nodes;
+-int dim;
+-int edges;
+-int holes;
+-REAL *nodeptr;
+-int *edgeptr;
+-REAL *holeptr;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i;
+-  int index;
+-  REAL *point1, *point2;
+-  int x1, y1, x2, y2;
+-
+-  index = dim;
+-  for (i = 1; i <= nodes; i++) {
+-    XFillRectangle(display, mainwindow, linegc,
+-                   (int) (nodeptr[index] * xscale + xoffset) -
+-                         (line_width >> 1),
+-                   (int) (nodeptr[index + 1] * yscale + yoffset) -
+-                         (line_width >> 1), line_width, line_width);
+-    index += dim;
+-  }
+-  index = 2;
+-  for (i = 1; i <= edges; i++) {
+-    point1 = &nodeptr[edgeptr[index++] * dim];
+-    point2 = &nodeptr[edgeptr[index++] * dim];
+-    XDrawLine(display, mainwindow, linegc,
+-              (int) (point1[0] * xscale + xoffset),
+-              (int) (point1[1] * yscale + yoffset),
+-              (int) (point2[0] * xscale + xoffset),
+-              (int) (point2[1] * yscale + yoffset));
+-  }
+-  index = dim;
+-  if (color) {
+-    XSetForeground(display, linegc, colors[0]);
+-  }
+-  for (i = 1; i <= holes; i++) {
+-    x1 = (int) (holeptr[index] * xscale + xoffset) - 3;
+-    y1 = (int) (holeptr[index + 1] * yscale + yoffset) - 3;
+-    x2 = x1 + 6;
+-    y2 = y1 + 6;
+-    XDrawLine(display, mainwindow, linegc, x1, y1, x2, y2);
+-    XDrawLine(display, mainwindow, linegc, x1, y2, x2, y1);
+-    index += dim;
+-  }
+-  XSetForeground(display, linegc, showme_foreground);
+-}
+-
+-void draw_ele(inc, elems, corners, ptr, partition, shift,
+-              xscale, yscale, xoffset, yoffset)
+-int inc;
+-int elems;
+-int corners; /* unused */
+-int *ptr;
+-int *partition;
+-REAL *shift;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i, j;
+-  int index;
+-  REAL shiftx = 0.0, shifty = 0.0;
+-  REAL *prevpoint, *nowpoint;
+-  XPoint *vertices = (XPoint *) NULL;
+-
+-  if (color && fillelem && (partition != (int *) NULL)) {
+-    vertices = (XPoint *) malloc(3 * sizeof(XPoint));
+-    if (vertices == (XPoint *) NULL) {
+-      printf("Error:  Out of memory.\n");
+-      exit(1);
+-    }
+-  }
+-  index = 3;
+-  for (i = 1; i <= elems; i++) {
+-    if ((partition != (int *) NULL) && explode) {
+-      shiftx = shift[partition[i] << 1];
+-      shifty = shift[(partition[i] << 1) + 1];
+-    }
+-    if (color && (partition != (int *) NULL)) {
+-      if (fillelem) {
+-        XSetForeground(display, trianglegc, colors[partition[i] & 63]);
+-      } else {
+-        XSetForeground(display, linegc, colors[partition[i] & 63]);
+-      }
+-    }
+-    if (color && fillelem && (partition != (int *) NULL)) {
+-      if ((partition != (int *) NULL) && explode) {
+-        for (j = 0; j < 3; j++) {
+-          nowpoint = &nodeptr[inc][ptr[index + j] * node_dim[inc]];
+-          vertices[j].x = (nowpoint[0] + shiftx) * xscale + xoffset;
+-          vertices[j].y = (nowpoint[1] + shifty) * yscale + yoffset;
+-        }
+-      } else {
+-        for (j = 0; j < 3; j++) {
+-          nowpoint = &nodeptr[inc][ptr[index + j] * node_dim[inc]];
+-          vertices[j].x = nowpoint[0] * xscale + xoffset;
+-          vertices[j].y = nowpoint[1] * yscale + yoffset;
+-        }
+-      }
+-      XFillPolygon(display, mainwindow, trianglegc, vertices, 3,
+-                   Convex, CoordModeOrigin);
+-    }
+-    prevpoint = &nodeptr[inc][ptr[index + 2] * node_dim[inc]];
+-    if ((partition != (int *) NULL) && explode) {
+-      for (j = 0; j < 3; j++) {
+-        nowpoint = &nodeptr[inc][ptr[index++] * node_dim[inc]];
+-        XDrawLine(display, mainwindow, linegc,
+-                  (int) ((prevpoint[0] + shiftx) * xscale + xoffset),
+-                  (int) ((prevpoint[1] + shifty) * yscale + yoffset),
+-                  (int) ((nowpoint[0] + shiftx) * xscale + xoffset),
+-                  (int) ((nowpoint[1] + shifty) * yscale + yoffset));
+-        prevpoint = nowpoint;
+-      }
+-    } else {
+-      for (j = 0; j < 3; j++) {
+-        nowpoint = &nodeptr[inc][ptr[index++] * node_dim[inc]];
+-        XDrawLine(display, mainwindow, linegc,
+-                  (int) (prevpoint[0] * xscale + xoffset),
+-                  (int) (prevpoint[1] * yscale + yoffset),
+-                  (int) (nowpoint[0] * xscale + xoffset),
+-                  (int) (nowpoint[1] * yscale + yoffset));
+-        prevpoint = nowpoint;
+-      }
+-    }
+-  }
+-  if (color && fillelem && (partition != (int *) NULL)) {
+-    free(vertices);
+-  }
+-  XSetForeground(display, linegc, showme_foreground);
+-}
+-
+-void draw_edge(nodes, dim, edges, nodeptr, edgeptr, normptr,
+-               xscale, yscale, xoffset, yoffset)
+-int nodes; /* unused */
+-int dim;
+-int edges;
+-REAL *nodeptr;
+-int *edgeptr;
+-REAL *normptr;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i;
+-  int index;
+-  REAL *point1, *point2;
+-  REAL normx, normy;
+-  REAL normmult, normmultx, normmulty;
+-  REAL windowxmin, windowymin, windowxmax, windowymax;
+-
+-  index = 2;
+-  for (i = 1; i <= edges; i++) {
+-    point1 = &nodeptr[edgeptr[index++] * dim];
+-    if (edgeptr[index] == -1) {
+-      normx = normptr[index - 1];
+-      normy = normptr[index++];
+-      normmultx = 0.0;
+-      if (normx > 0) {
+-        windowxmax = (width - 1 - xoffset) / xscale;
+-        normmultx = (windowxmax - point1[0]) / normx;
+-      } else if (normx < 0) {
+-        windowxmin = -xoffset / xscale;
+-        normmultx = (windowxmin - point1[0]) / normx;
+-      }
+-      normmulty = 0.0;
+-      if (normy > 0) {
+-        windowymax = -yoffset / yscale;
+-        normmulty = (windowymax - point1[1]) / normy;
+-      } else if (normy < 0) {
+-        windowymin = (height - 1 - yoffset) / yscale;
+-        normmulty = (windowymin - point1[1]) / normy;
+-      }
+-      if (normmultx == 0.0) {
+-        normmult = normmulty;
+-      } else if (normmulty == 0.0) {
+-        normmult = normmultx;
+-      } else if (normmultx < normmulty) {
+-        normmult = normmultx;
+-      } else {
+-        normmult = normmulty;
+-      }
+-      if (normmult > 0.0) {
+-        XDrawLine(display, mainwindow, linegc,
+-                  (int) (point1[0] * xscale + xoffset),
+-                  (int) (point1[1] * yscale + yoffset),
+-                  (int) ((point1[0] + normmult * normx) * xscale + xoffset),
+-                  (int) ((point1[1] + normmult * normy) * yscale + yoffset));
+-      }
+-    } else {
+-      point2 = &nodeptr[edgeptr[index++] * dim];
+-      XDrawLine(display, mainwindow, linegc,
+-                (int) (point1[0] * xscale + xoffset),
+-                (int) (point1[1] * yscale + yoffset),
+-                (int) (point2[0] * xscale + xoffset),
+-                (int) (point2[1] * yscale + yoffset));
+-    }
+-  }
+-}
+-
+-void draw_adj(dim, subdomains, ptr, center, xscale, yscale,
+-              xoffset, yoffset)
+-int dim;
+-int subdomains;
+-int *ptr;
+-REAL *center;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i, j;
+-  REAL *point1, *point2;
+-
+-  for (i = 0; i < subdomains; i++) {
+-    for (j = i + 1; j < subdomains; j++) {
+-      if (ptr[i * subdomains + j]) {
+-        point1 = &center[i * dim];
+-        point2 = &center[j * dim];
+-        XDrawLine(display, mainwindow, linegc,
+-                  (int) (point1[0] * xscale + xoffset),
+-                  (int) (point1[1] * yscale + yoffset),
+-                  (int) (point2[0] * xscale + xoffset),
+-                  (int) (point2[1] * yscale + yoffset));
+-      }
+-    }
+-  }
+-  for (i = 0; i < subdomains; i++) {
+-    point1 = &center[i * dim];
+-    if (color) {
+-      XSetForeground(display, linegc, colors[i & 63]);
+-    }
+-    XFillArc(display, mainwindow, linegc,
+-             (int) (point1[0] * xscale + xoffset) - 5 - (line_width >> 1),
+-             (int) (point1[1] * yscale + yoffset) - 5 - (line_width >> 1),
+-             line_width + 10, line_width + 10, 0, 23040);
+-  }
+-  XSetForeground(display, linegc, showme_foreground);
+-}
+-
+-void draw(inc, image, xmin, ymin, xmax, ymax)
+-int inc;
+-int image;
+-REAL xmin;
+-REAL ymin;
+-REAL xmax;
+-REAL ymax;
+-{
+-  draw_buttons();
+-  XClearWindow(display, mainwindow);
+-  if (image == NOTHING) {
+-    return;
+-  }
+-  if (!loaded[inc][image]) {
+-    return;
+-  }
+-  if ((image == PART) && explode) {
+-    xmin += (xmin - partcenter[inc][subdomains[inc] << 1]) * explosion;
+-    xmax += (xmax - partcenter[inc][subdomains[inc] << 1]) * explosion;
+-    ymin += (ymin - partcenter[inc][(subdomains[inc] << 1) + 1]) * explosion;
+-    ymax += (ymax - partcenter[inc][(subdomains[inc] << 1) + 1]) * explosion;
+-  }
+-  xscale = (REAL) (width - line_width - 4) / (xmax - xmin);
+-  yscale = (REAL) (height - line_width - 4) / (ymax - ymin);
+-  if (xscale > yscale) {
+-    xscale = yscale;
+-  } else {
+-    yscale = xscale;
+-  }
+-  xoffset = 0.5 * ((REAL) width - xscale * (xmax - xmin)) -
+-            xscale * xmin;
+-  yoffset = (REAL) height - 0.5 * ((REAL) height - yscale * (ymax - ymin)) +
+-            yscale * ymin;
+-  yscale = - yscale;
+-  switch(image) {
+-    case NODE:
+-      draw_node(nodes[inc], node_dim[inc], nodeptr[inc],
+-                xscale, yscale, xoffset, yoffset);
+-      break;
+-    case POLY:
+-      if (polynodes[inc] > 0) {
+-        draw_poly(polynodes[inc], poly_dim[inc], polyedges[inc],
+-                  polyholes[inc], polynodeptr[inc], polyedgeptr[inc],
+-                  polyholeptr[inc],
+-                  xscale, yscale, xoffset, yoffset);
+-      } else {
+-        draw_poly(nodes[inc], node_dim[inc], polyedges[inc],
+-                  polyholes[inc], nodeptr[inc], polyedgeptr[inc],
+-                  polyholeptr[inc],
+-                  xscale, yscale, xoffset, yoffset);
+-      }
+-      break;
+-    case ELE:
+-      draw_ele(inc, elems[inc], ele_corners[inc], eleptr[inc],
+-               (int *) NULL, (REAL *) NULL,
+-               xscale, yscale, xoffset, yoffset);
+-      break;
+-    case EDGE:
+-      draw_edge(nodes[inc], node_dim[inc], edges[inc],
+-                nodeptr[inc], edgeptr[inc], normptr[inc],
+-                xscale, yscale, xoffset, yoffset);
+-      break;
+-    case PART:
+-      draw_ele(inc, elems[inc], ele_corners[inc], eleptr[inc],
+-               partpart[inc], partshift[inc],
+-               xscale, yscale, xoffset, yoffset);
+-      break;
+-    case ADJ:
+-      draw_adj(node_dim[inc], adjsubdomains[inc], adjptr[inc], partcenter[inc],
+-               xscale, yscale, xoffset, yoffset);
+-      break;
+-    case VORO:
+-      if (loaded[inc][NODE]) {
+-        draw_node(nodes[inc], node_dim[inc], nodeptr[inc],
+-                  xscale, yscale, xoffset, yoffset);
+-      }
+-      draw_edge(vnodes[inc], vnode_dim[inc], vedges[inc],
+-                vnodeptr[inc], vedgeptr[inc], vnormptr[inc],
+-                xscale, yscale, xoffset, yoffset);
+-      break;
+-    default:
+-      break;
+-  }
+-}
+-
+-void addps(instring, outstring, eps)
+-char *instring;
+-char *outstring;
+-int eps;
+-{
+-  strcpy(outstring, instring);
+-  if (eps) {
+-    strcat(outstring, ".eps");
+-  } else {
+-    strcat(outstring, ".ps");
+-  }
+-}
+-
+-int print_head(fname, file, llcornerx, llcornery, eps)
+-char *fname;
+-FILE **file;
+-int llcornerx;
+-int llcornery;
+-int eps;
+-{
+-  if (!quiet) {
+-    printf("Writing %s\n", fname);
+-  }
+-  *file = fopen(fname, "w");
+-  if (*file == (FILE *) NULL) {
+-    printf("  Error:  Could not open %s\n", fname);
+-    return 1;
+-  }
+-  if (eps) {
+-    fprintf(*file, "%%!PS-Adobe-2.0 EPSF-2.0\n");
+-  } else {
+-    fprintf(*file, "%%!PS-Adobe-2.0\n");
+-  }
+-  fprintf(*file, "%%%%BoundingBox: %d %d %d %d\n", llcornerx, llcornery,
+-          612 - llcornerx, 792 - llcornery);
+-  fprintf(*file, "%%%%Creator: Show Me\n");
+-  fprintf(*file, "%%%%EndComments\n\n");
+-  fprintf(*file, "1 setlinecap\n");
+-  fprintf(*file, "1 setlinejoin\n");
+-  fprintf(*file, "%d setlinewidth\n", line_width);
+-  fprintf(*file, "%d %d moveto\n", llcornerx, llcornery);
+-  fprintf(*file, "%d %d lineto\n", 612 - llcornerx, llcornery);
+-  fprintf(*file, "%d %d lineto\n", 612 - llcornerx, 792 - llcornery);
+-  fprintf(*file, "%d %d lineto\n", llcornerx, 792 - llcornery);
+-  fprintf(*file, "closepath\nclip\nnewpath\n");
+-  return 0;
+-}
+-
+-void print_node(nodefile, nodes, dim, ptr, xscale, yscale,
+-                xoffset, yoffset)
+-FILE *nodefile;
+-int nodes;
+-int dim;
+-REAL *ptr;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i;
+-  int index;
+-
+-  index = dim;
+-  for (i = 1; i <= nodes; i++) {
+-    fprintf(nodefile, "%d %d %d 0 360 arc\nfill\n",
+-            (int) (ptr[index] * xscale + xoffset),
+-            (int) (ptr[index + 1] * yscale + yoffset),
+-            1 + (line_width >> 1));
+-    index += dim;
+-  }
+-}
+-
+-void print_poly(polyfile, nodes, dim, edges, holes, nodeptr, edgeptr, holeptr,
+-                xscale, yscale, xoffset, yoffset)
+-FILE *polyfile;
+-int nodes;
+-int dim;
+-int edges;
+-int holes; /* unused */
+-REAL *nodeptr;
+-int *edgeptr;
+-REAL *holeptr; /* unused */
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-{
+-  int i;
+-  int index;
+-  REAL *point1, *point2;
+-
+-  index = dim;
+-  for (i = 1; i <= nodes; i++) {
+-    fprintf(polyfile, "%d %d %d 0 360 arc\nfill\n",
+-            (int) (nodeptr[index] * xscale + xoffset),
+-            (int) (nodeptr[index + 1] * yscale + yoffset),
+-            1 + (line_width >> 1));
+-    index += dim;
+-  }
+-  index = 2;
+-  for (i = 1; i <= edges; i++) {
+-    point1 = &nodeptr[edgeptr[index++] * dim];
+-    point2 = &nodeptr[edgeptr[index++] * dim];
+-    fprintf(polyfile, "%d %d moveto\n",
+-            (int) (point1[0] * xscale + xoffset),
+-            (int) (point1[1] * yscale + yoffset));
+-    fprintf(polyfile, "%d %d lineto\nstroke\n",
+-            (int) (point2[0] * xscale + xoffset),
+-            (int) (point2[1] * yscale + yoffset));
+-  }
+-}
+-
+-void print_ele(elefile, nodes, dim, elems, corners, nodeptr, eleptr,
+-               partition, shift,
+-               xscale, yscale, xoffset, yoffset, llcornerx, llcornery)
+-FILE *elefile;
+-int nodes; /* unused */
+-int dim;
+-int elems;
+-int corners; /* unused */
+-REAL *nodeptr;
+-int *eleptr;
+-int *partition;
+-REAL *shift;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-int llcornerx;
+-int llcornery;
+-{
+-  int i, j;
+-  int index, colorindex;
+-  REAL shiftx, shifty;
+-  REAL *nowpoint;
+-
+-  index = 3;
+-  if ((partition != (int *) NULL) && !bw_ps) {
+-    fprintf(elefile, "0 0 0 setrgbcolor\n");
+-    fprintf(elefile, "%d %d moveto\n", llcornerx, llcornery);
+-    fprintf(elefile, "%d %d lineto\n", 612 - llcornerx, llcornery);
+-    fprintf(elefile, "%d %d lineto\n", 612 - llcornerx, 792 - llcornery);
+-    fprintf(elefile, "%d %d lineto\n", llcornerx, 792 - llcornery);
+-    fprintf(elefile, "fill\n");
+-  }
+-  for (i = 1; i <= elems; i++) {
+-    if ((partition != (int *) NULL) && !bw_ps) {
+-      colorindex = partition[i] & 63;
+-      fprintf(elefile, "%6.3f %6.3f %6.3f setrgbcolor\n",
+-              (REAL) rgb[colorindex].red / 65535.0,
+-              (REAL) rgb[colorindex].green / 65535.0,
+-              (REAL) rgb[colorindex].blue / 65535.0);
+-    }
+-    nowpoint = &nodeptr[eleptr[index + 2] * dim];
+-    if ((partition != (int *) NULL) && (explode || bw_ps)) {
+-      shiftx = shift[partition[i] << 1];
+-      shifty = shift[(partition[i] << 1) + 1];
+-      fprintf(elefile, "%d %d moveto\n",
+-              (int) ((nowpoint[0] + shiftx) * xscale + xoffset),
+-              (int) ((nowpoint[1] + shifty) * yscale + yoffset));
+-      for (j = 0; j < 3; j++) {
+-        nowpoint = &nodeptr[eleptr[index++] * dim];
+-        fprintf(elefile, "%d %d lineto\n",
+-                (int) ((nowpoint[0] + shiftx) * xscale + xoffset),
+-                (int) ((nowpoint[1] + shifty) * yscale + yoffset));
+-      }
+-    } else {
+-      fprintf(elefile, "%d %d moveto\n",
+-              (int) (nowpoint[0] * xscale + xoffset),
+-              (int) (nowpoint[1] * yscale + yoffset));
+-      for (j = 0; j < 3; j++) {
+-        nowpoint = &nodeptr[eleptr[index++] * dim];
+-        fprintf(elefile, "%d %d lineto\n",
+-                (int) (nowpoint[0] * xscale + xoffset),
+-                (int) (nowpoint[1] * yscale + yoffset));
+-      }
+-    }
+-    if (fillelem && !bw_ps) {
+-      fprintf(elefile, "gsave\nfill\ngrestore\n1 1 0 setrgbcolor\n");
+-    }
+-    fprintf(elefile, "stroke\n");
+-  }
+-}
+-
+-void print_edge(edgefile, nodes, dim, edges, nodeptr, edgeptr, normptr,
+-                xscale, yscale, xoffset, yoffset, llcornerx, llcornery)
+-FILE *edgefile;
+-int nodes; /* unused */
+-int dim;
+-int edges;
+-REAL *nodeptr;
+-int *edgeptr;
+-REAL *normptr;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-int llcornerx;
+-int llcornery;
+-{
+-  int i;
+-  int index;
+-  REAL *point1, *point2;
+-  REAL normx, normy;
+-  REAL normmult, normmultx, normmulty;
+-  REAL windowxmin, windowymin, windowxmax, windowymax;
+-
+-  index = 2;
+-  for (i = 1; i <= edges; i++) {
+-    point1 = &nodeptr[edgeptr[index++] * dim];
+-    if (edgeptr[index] == -1) {
+-      normx = normptr[index - 1];
+-      normy = normptr[index++];
+-      normmultx = 0.0;
+-      if (normx > 0) {
+-        windowxmax = ((REAL) (612 - llcornerx) - xoffset) / xscale;
+-        normmultx = (windowxmax - point1[0]) / normx;
+-      } else if (normx < 0) {
+-        windowxmin = ((REAL) llcornerx - xoffset) / xscale;
+-        normmultx = (windowxmin - point1[0]) / normx;
+-      }
+-      normmulty = 0.0;
+-      if (normy > 0) {
+-        windowymax = ((REAL) (792 - llcornery) - yoffset) / yscale;
+-        normmulty = (windowymax - point1[1]) / normy;
+-      } else if (normy < 0) {
+-        windowymin = ((REAL) llcornery - yoffset) / yscale;
+-        normmulty = (windowymin - point1[1]) / normy;
+-      }
+-      if (normmultx == 0.0) {
+-        normmult = normmulty;
+-      } else if (normmulty == 0.0) {
+-        normmult = normmultx;
+-      } else if (normmultx < normmulty) {
+-        normmult = normmultx;
+-      } else {
+-        normmult = normmulty;
+-      }
+-      if (normmult > 0.0) {
+-        fprintf(edgefile, "%d %d moveto\n",
+-                (int) (point1[0] * xscale + xoffset),
+-                (int) (point1[1] * yscale + yoffset));
+-        fprintf(edgefile, "%d %d lineto\nstroke\n",
+-                (int) ((point1[0] + normmult * normx) * xscale + xoffset),
+-                (int) ((point1[1] + normmult * normy) * yscale + yoffset));
+-      }
+-    } else {
+-      point2 = &nodeptr[edgeptr[index++] * dim];
+-      fprintf(edgefile, "%d %d moveto\n",
+-              (int) (point1[0] * xscale + xoffset),
+-              (int) (point1[1] * yscale + yoffset));
+-      fprintf(edgefile, "%d %d lineto\nstroke\n",
+-              (int) (point2[0] * xscale + xoffset),
+-              (int) (point2[1] * yscale + yoffset));
+-    }
+-  }
+-}
+-
+-void print_adj(adjfile, dim, subdomains, ptr, center, xscale, yscale,
+-               xoffset, yoffset, llcornerx, llcornery)
+-FILE *adjfile;
+-int dim;
+-int subdomains;
+-int *ptr;
+-REAL *center;
+-REAL xscale;
+-REAL yscale;
+-REAL xoffset;
+-REAL yoffset;
+-int llcornerx;
+-int llcornery;
+-{
+-  int i, j;
+-  REAL *point1, *point2;
+-  int colorindex;
+-
+-  if (!bw_ps) {
+-    fprintf(adjfile, "0 0 0 setrgbcolor\n");
+-    fprintf(adjfile, "%d %d moveto\n", llcornerx, llcornery);
+-    fprintf(adjfile, "%d %d lineto\n", 612 - llcornerx, llcornery);
+-    fprintf(adjfile, "%d %d lineto\n", 612 - llcornerx, 792 - llcornery);
+-    fprintf(adjfile, "%d %d lineto\n", llcornerx, 792 - llcornery);
+-    fprintf(adjfile, "fill\n");
+-    fprintf(adjfile, "1 1 0 setrgbcolor\n");
+-  }
+-  for (i = 0; i < subdomains; i++) {
+-    for (j = i + 1; j < subdomains; j++) {
+-      if (ptr[i * subdomains + j]) {
+-        point1 = &center[i * dim];
+-        point2 = &center[j * dim];
+-        fprintf(adjfile, "%d %d moveto\n",
+-                (int) (point1[0] * xscale + xoffset),
+-                (int) (point1[1] * yscale + yoffset));
+-        fprintf(adjfile, "%d %d lineto\nstroke\n",
+-                (int) (point2[0] * xscale + xoffset),
+-                (int) (point2[1] * yscale + yoffset));
+-      }
+-    }
+-  }
+-  for (i = 0; i < subdomains; i++) {
+-    point1 = &center[i * dim];
+-    if (!bw_ps) {
+-      colorindex = i & 63;
+-      fprintf(adjfile, "%6.3f %6.3f %6.3f setrgbcolor\n",
+-              (REAL) rgb[colorindex].red / 65535.0,
+-              (REAL) rgb[colorindex].green / 65535.0,
+-              (REAL) rgb[colorindex].blue / 65535.0);
+-      fprintf(adjfile, "%d %d %d 0 360 arc\nfill\n",
+-              (int) (point1[0] * xscale + xoffset),
+-              (int) (point1[1] * yscale + yoffset),
+-              5 + (line_width >> 1));
+-    } else {
+-      fprintf(adjfile, "%d %d %d 0 360 arc\nfill\n",
+-              (int) (point1[0] * xscale + xoffset),
+-              (int) (point1[1] * yscale + yoffset),
+-              3 + (line_width >> 1));
+-    }
+-  }
+-}
+-
+-void print(inc, image, xmin, ymin, xmax, ymax, eps)
+-int inc;
+-int image;
+-REAL xmin;
+-REAL ymin;
+-REAL xmax;
+-REAL ymax;
+-int eps;
+-{
+-  REAL xxscale, yyscale, xxoffset, yyoffset;
+-  char psfilename[FILENAMESIZE];
+-  int llcornerx, llcornery;
+-  FILE *psfile;
+-
+-  if (image == NOTHING) {
+-    return;
+-  }
+-  if (!loaded[inc][image]) {
+-    return;
+-  }
+-  if ((image == PART) && (explode || bw_ps)) {
+-    xmin += (xmin - partcenter[inc][subdomains[inc] << 1]) * explosion;
+-    xmax += (xmax - partcenter[inc][subdomains[inc] << 1]) * explosion;
+-    ymin += (ymin - partcenter[inc][(subdomains[inc] << 1) + 1]) * explosion;
+-    ymax += (ymax - partcenter[inc][(subdomains[inc] << 1) + 1]) * explosion;
+-  }
+-  xxscale = (460.0 - (REAL) line_width) / (xmax - xmin);
+-  yyscale = (640.0 - (REAL) line_width) / (ymax - ymin);
+-  if (xxscale > yyscale) {
+-    xxscale = yyscale;
+-    llcornerx = (604 - (int) (yyscale * (xmax - xmin)) - line_width) >> 1;
+-    llcornery = 72;
+-  } else {
+-    yyscale = xxscale;
+-    llcornerx = 72;
+-    llcornery = (784 - (int) (xxscale * (ymax - ymin)) - line_width) >> 1;
+-  }
+-  xxoffset = 0.5 * (612.0 - xxscale * (xmax - xmin)) - xxscale * xmin +
+-             (line_width >> 1);
+-  yyoffset = 0.5 * (792.0 - yyscale * (ymax - ymin)) - yyscale * ymin +
+-             (line_width >> 1);
+-  switch(image) {
+-    case NODE:
+-      addps(nodefilename[inc], psfilename, eps);
+-      break;
+-    case POLY:
+-      addps(polyfilename[inc], psfilename, eps);
+-      break;
+-    case ELE:
+-      addps(elefilename[inc], psfilename, eps);
+-      break;
+-    case EDGE:
+-      addps(edgefilename[inc], psfilename, eps);
+-      break;
+-    case PART:
+-      addps(partfilename[inc], psfilename, eps);
+-      break;
+-    case ADJ:
+-      addps(adjfilename[inc], psfilename, eps);
+-      break;
+-    case VORO:
+-      addps(vedgefilename[inc], psfilename, eps);
+-      break;
+-    default:
+-      break;
+-  }
+-  if (print_head(psfilename, &psfile, llcornerx, llcornery, eps)) {
+-    return;
+-  }
+-  switch (image) {
+-    case NODE:
+-      print_node(psfile, nodes[inc], node_dim[inc], nodeptr[inc],
+-                 xxscale, yyscale, xxoffset, yyoffset);
+-      break;
+-    case POLY:
+-      if (polynodes[inc] > 0) {
+-        print_poly(psfile, polynodes[inc], poly_dim[inc], polyedges[inc],
+-                   polyholes[inc], polynodeptr[inc], polyedgeptr[inc],
+-                   polyholeptr[inc], xxscale, yyscale, xxoffset, yyoffset);
+-      } else {
+-        print_poly(psfile, nodes[inc], node_dim[inc], polyedges[inc],
+-                   polyholes[inc], nodeptr[inc], polyedgeptr[inc],
+-                   polyholeptr[inc], xxscale, yyscale, xxoffset, yyoffset);
+-      }
+-      break;
+-    case ELE:
+-      print_ele(psfile, nodes[inc], node_dim[inc], elems[inc],
+-                ele_corners[inc], nodeptr[inc], eleptr[inc],
+-                (int *) NULL, (REAL *) NULL,
+-                xxscale, yyscale, xxoffset, yyoffset, llcornerx, llcornery);
+-      break;
+-    case EDGE:
+-      print_edge(psfile, nodes[inc], node_dim[inc], edges[inc],
+-                 nodeptr[inc], edgeptr[inc], normptr[inc],
+-                 xxscale, yyscale, xxoffset, yyoffset, llcornerx, llcornery);
+-      break;
+-    case PART:
+-      print_ele(psfile, nodes[inc], node_dim[inc], elems[inc],
+-                ele_corners[inc], nodeptr[inc], eleptr[inc],
+-                partpart[inc], partshift[inc],
+-                xxscale, yyscale, xxoffset, yyoffset, llcornerx, llcornery);
+-      break;
+-    case ADJ:
+-      print_adj(psfile, node_dim[inc], adjsubdomains[inc], adjptr[inc],
+-                partcenter[inc],
+-                xxscale, yyscale, xxoffset, yyoffset, llcornerx, llcornery);
+-      break;
+-    case VORO:
+-      print_edge(psfile, vnodes[inc], vnode_dim[inc], vedges[inc],
+-                 vnodeptr[inc], vedgeptr[inc], vnormptr[inc],
+-                 xxscale, yyscale, xxoffset, yyoffset, llcornerx, llcornery);
+-      break;
+-    default:
+-      break;
+-  }
+-  if (!eps) {
+-    fprintf(psfile, "showpage\n");
+-  }
+-  fclose(psfile);
+-}
+-
+-int main(argc, argv)
+-int argc;
+-char **argv;
+-{
+-  REAL xmin = 0.0, ymin = 0.0, xmax = 0.0, ymax = 0.0;
+-  REAL xptr, yptr, xspan, yspan;
+-  int past_image;
+-  int new_image = 0;
+-  int new_inc = 0;
+-
+-  parsecommandline(argc, argv);
+-  showme_init();
+-  choose_image(start_inc, start_image);
+-  showme_window(argc, argv);
+-
+-  if (current_image != NOTHING) {
+-    xmin = xlo[current_inc][current_image];
+-    ymin = ylo[current_inc][current_image];
+-    xmax = xhi[current_inc][current_image];
+-    ymax = yhi[current_inc][current_image];
+-    zoom = 0;
+-  }
+-
+-  XMaskEvent(display, ExposureMask, &event);
+-  while (1) {
+-    switch (event.type) {
+-      case ButtonRelease:
+-        if (event.xany.window == quitwin) {
+-          XDestroyWindow(display, mainwindow);
+-          XCloseDisplay(display);
+-          return 0;
+-        } else if (event.xany.window == leftwin) {
+-          xspan = 0.25 * (xmax - xmin);
+-          xmin += xspan;
+-          xmax += xspan;
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        } else if (event.xany.window == rightwin) {
+-          xspan = 0.25 * (xmax - xmin);
+-          xmin -= xspan;
+-          xmax -= xspan;
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        } else if (event.xany.window == upwin) {
+-          yspan = 0.25 * (ymax - ymin);
+-          ymin -= yspan;
+-          ymax -= yspan;
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        } else if (event.xany.window == downwin) {
+-          yspan = 0.25 * (ymax - ymin);
+-          ymin += yspan;
+-          ymax += yspan;
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        } else if (event.xany.window == resetwin) {
+-          xmin = xlo[current_inc][current_image];
+-          ymin = ylo[current_inc][current_image];
+-          xmax = xhi[current_inc][current_image];
+-          ymax = yhi[current_inc][current_image];
+-          zoom = 0;
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        } else if (event.xany.window == widthpluswin) {
+-          if (line_width < 100) {
+-            line_width++;
+-            XSetLineAttributes(display, linegc, line_width, LineSolid,
+-                               CapRound, JoinRound);
+-            XSetLineAttributes(display, trianglegc, line_width, LineSolid,
+-                               CapRound, JoinRound);
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          }
+-        } else if (event.xany.window == widthminuswin) {
+-          if (line_width > 1) {
+-            line_width--;
+-            XSetLineAttributes(display, linegc, line_width, LineSolid,
+-                               CapRound, JoinRound);
+-            XSetLineAttributes(display, trianglegc, line_width, LineSolid,
+-                               CapRound, JoinRound);
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          }
+-        } else if (event.xany.window == expwin) {
+-          if ((current_image == PART) && loaded[current_inc][PART]) {
+-            explode = !explode;
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          }
+-        } else if (event.xany.window == exppluswin) {
+-          if ((current_image == PART) && loaded[current_inc][PART] && explode) {
+-            explosion += 0.125;
+-            findpartshift(subdomains[current_inc], explosion,
+-                          partcenter[current_inc], partshift[current_inc]);
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          }
+-        } else if (event.xany.window == expminuswin) {
+-          if ((current_image == PART) && loaded[current_inc][PART] && explode &&
+-              (explosion >= 0.125)) {
+-            explosion -= 0.125;
+-            findpartshift(subdomains[current_inc], explosion,
+-                          partcenter[current_inc], partshift[current_inc]);
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          }
+-        } else if (event.xany.window == fillwin) {
+-          if ((current_image == PART) && loaded[current_inc][PART]) {
+-            fillelem = !fillelem;
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          }
+-        } else if (event.xany.window == pswin) {
+-          fill_button(pswin);
+-          XFlush(display);
+-          print(current_inc, current_image, xmin, ymin, xmax, ymax, 0);
+-          XClearWindow(display, pswin);
+-          XDrawString(display, pswin, fontgc, 2, 13, "PS", 2);
+-        } else if (event.xany.window == epswin) {
+-          fill_button(epswin);
+-          XFlush(display);
+-          print(current_inc, current_image, xmin, ymin, xmax, ymax, 1);
+-          XClearWindow(display, epswin);
+-          XDrawString(display, epswin, fontgc, 2, 13, "EPS", 3);
+-        } else if (event.xany.window == versionpluswin) {
+-          move_inc(1);
+-          loweriteration++;
+-          set_filenames(filename, loweriteration);
+-          if (current_inc == 1) {
+-            current_inc = 0;
+-          } else {
+-            current_image = NOTHING;
+-            XClearWindow(display, mainwindow);
+-          }
+-          draw_buttons();
+-        } else if (event.xany.window == versionminuswin) {
+-          if (loweriteration > 0) {
+-            move_inc(0);
+-            loweriteration--;
+-            set_filenames(filename, loweriteration);
+-            if (current_inc == 0) {
+-              current_inc = 1;
+-            } else {
+-              current_image = NOTHING;
+-              XClearWindow(display, mainwindow);
+-            }
+-            draw_buttons();
+-          }
+-        } else if ((event.xany.window == nodewin[0]) ||
+-                   (event.xany.window == polywin[0]) ||
+-                   (event.xany.window == elewin[0]) ||
+-                   (event.xany.window == edgewin[0]) ||
+-                   (event.xany.window == partwin[0]) ||
+-                   (event.xany.window == adjwin[0]) ||
+-                   (event.xany.window == voronoiwin[0]) ||
+-                   (event.xany.window == nodewin[1]) ||
+-                   (event.xany.window == polywin[1]) ||
+-                   (event.xany.window == elewin[1]) ||
+-                   (event.xany.window == edgewin[1]) ||
+-                   (event.xany.window == partwin[1]) ||
+-                   (event.xany.window == adjwin[1]) ||
+-                   (event.xany.window == voronoiwin[1])) {
+-          if (event.xany.window == nodewin[0]) {
+-            new_inc = 0;
+-            new_image = NODE;
+-          }
+-          if (event.xany.window == polywin[0]) {
+-            new_inc = 0;
+-            new_image = POLY;
+-          }
+-          if (event.xany.window == elewin[0]) {
+-            new_inc = 0;
+-            new_image = ELE;
+-          }
+-          if (event.xany.window == edgewin[0]) {
+-            new_inc = 0;
+-            new_image = EDGE;
+-          }
+-          if (event.xany.window == partwin[0]) {
+-            new_inc = 0;
+-            new_image = PART;
+-          }
+-          if (event.xany.window == adjwin[0]) {
+-            new_inc = 0;
+-            new_image = ADJ;
+-          }
+-          if (event.xany.window == voronoiwin[0]) {
+-            new_inc = 0;
+-            new_image = VORO;
+-          }
+-          if (event.xany.window == nodewin[1]) {
+-            new_inc = 1;
+-            new_image = NODE;
+-          }
+-          if (event.xany.window == polywin[1]) {
+-            new_inc = 1;
+-            new_image = POLY;
+-          }
+-          if (event.xany.window == elewin[1]) {
+-            new_inc = 1;
+-            new_image = ELE;
+-          }
+-          if (event.xany.window == edgewin[1]) {
+-            new_inc = 1;
+-            new_image = EDGE;
+-          }
+-          if (event.xany.window == partwin[1]) {
+-            new_inc = 1;
+-            new_image = PART;
+-          }
+-          if (event.xany.window == adjwin[1]) {
+-            new_inc = 1;
+-            new_image = ADJ;
+-          }
+-          if (event.xany.window == voronoiwin[1]) {
+-            new_inc = 1;
+-            new_image = VORO;
+-          }
+-          past_image = current_image;
+-          if ((current_inc == new_inc) && (current_image == new_image)) {
+-            free_inc(new_inc);
+-            unload_inc(new_inc);
+-          }
+-          choose_image(new_inc, new_image);
+-          if ((past_image == NOTHING) && (current_image != NOTHING)) {
+-            xmin = xlo[current_inc][current_image];
+-            ymin = ylo[current_inc][current_image];
+-            xmax = xhi[current_inc][current_image];
+-            ymax = yhi[current_inc][current_image];
+-            zoom = 0;
+-          }
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        } else {
+-          xptr = ((REAL) event.xbutton.x - xoffset) / xscale;
+-          yptr = ((REAL) event.xbutton.y - yoffset) / yscale;
+-          if ((current_image == PART) && loaded[current_inc][PART] && explode) {
+-            xptr = (xptr + partcenter[current_inc]
+-                                     [subdomains[current_inc] << 1]
+-                    * explosion) / (1.0 + explosion);
+-            yptr = (yptr + partcenter[current_inc]
+-                                     [(subdomains[current_inc] << 1) + 1]
+-                    * explosion) / (1.0 + explosion);
+-          }
+-          if ((event.xbutton.button == Button1)
+-              || (event.xbutton.button == Button3)) {
+-            if (event.xbutton.button == Button1) {
+-              xspan = 0.25 * (xmax - xmin);
+-              yspan = 0.25 * (ymax - ymin);
+-              zoom++;
+-            } else {
+-              xspan = xmax - xmin;
+-              yspan = ymax - ymin;
+-              zoom--;
+-            }
+-            xmin = xptr - xspan;
+-            ymin = yptr - yspan;
+-            xmax = xptr + xspan;
+-            ymax = yptr + yspan;
+-            draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          } else if (event.xbutton.button == Button2) {
+-            printf("x = %.4g, y = %.4g\n", xptr, yptr);
+-          }
+-        }
+-        break;
+-      case DestroyNotify:
+-        XDestroyWindow(display, mainwindow);
+-        XCloseDisplay(display);
+-        return 0;
+-      case ConfigureNotify:
+-        if ((width != event.xconfigure.width) ||
+-            (height != event.xconfigure.height - PANELHEIGHT)) {
+-          width = event.xconfigure.width;
+-          height = event.xconfigure.height - PANELHEIGHT;
+-          draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-          while (XCheckMaskEvent(display, ExposureMask, &event));
+-        }
+-        break;
+-      case Expose:
+-        draw(current_inc, current_image, xmin, ymin, xmax, ymax);
+-        while (XCheckMaskEvent(display, ExposureMask, &event));
+-        break;
+-      default:
+-        break;
+-    }
+-    XNextEvent(display, &event);
+-  }
+-}
+diff --git a/v3p/netlib/tests/CMakeLists.txt b/v3p/netlib/tests/CMakeLists.txt
+index d23be0c165..a7471ffdf2 100644
+--- a/v3p/netlib/tests/CMakeLists.txt
++++ b/v3p/netlib/tests/CMakeLists.txt
+@@ -24,10 +24,6 @@ if(BUILD_TESTING)
+   add_test( NAME netlib_test_slamch COMMAND netlib_slamch_test )
+   target_link_libraries(netlib_slamch_test ${VXL_LIB_PREFIX}v3p_netlib)
+   # test
+-  add_executable( netlib_tricall tricall.c )
+-  add_test( NAME netlib_test_tricall COMMAND netlib_tricall )
+-  target_link_libraries(netlib_tricall ${VXL_LIB_PREFIX}netlib)
+-  # test
+   add_executable( netlib_integral_test integral-test.c )
+   add_test( NAME netlib_test_integral COMMAND netlib_integral_test )
+   target_link_libraries(netlib_integral_test ${VXL_LIB_PREFIX}v3p_netlib)
+diff --git a/v3p/netlib/triangle.README b/v3p/netlib/triangle.README
+deleted file mode 100644
+index b33ea00948..0000000000
+--- a/v3p/netlib/triangle.README
++++ /dev/null
+@@ -1,198 +0,0 @@
+-Triangle
+-A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.
+-Version 1.6
+-
+-Show Me
+-A Display Program for Meshes and More.
+-Version 1.6
+-
+-Copyright 1993, 1995, 1997, 1998, 2002, 2005 Jonathan Richard Shewchuk
+-2360 Woolsey #H
+-Berkeley, California  94705-1927
+-Please send bugs and comments to jrs@cs.berkeley.edu
+-
+-Created as part of the Quake project (tools for earthquake simulation).
+-Supported in part by NSF Grant CMS-9318163 and an NSERC 1967 Scholarship.
+-There is no warranty whatsoever.  Use at your own risk.
+-
+-
+-Triangle generates exact Delaunay triangulations, constrained Delaunay
+-triangulations, conforming Delaunay triangulations, Voronoi diagrams, and
+-high-quality triangular meshes.  The latter can be generated with no small
+-or large angles, and are thus suitable for finite element analysis.
+-Show Me graphically displays the contents of the geometric files used by
+-Triangle.  Show Me can also write images in PostScript form.
+-
+-Information on the algorithms used by Triangle, including complete
+-references, can be found in the comments at the beginning of the triangle.c
+-source file.  Another listing of these references, with PostScript copies
+-of some of the papers, is available from the Web page
+-
+-    http://www.cs.cmu.edu/~quake/triangle.research.html
+-
+-------------------------------------------------------------------------------
+-
+-These programs may be freely redistributed under the condition that the
+-copyright notices (including the copy of this notice in the code comments
+-and the copyright notice printed when the `-h' switch is selected) are
+-not removed, and no compensation is received.  Private, research, and
+-institutional use is free.  You may distribute modified versions of this
+-code UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT
+-IN THE SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH
+-SOURCE AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND
+-CLEAR NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as
+-part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
+-WITH THE AUTHOR.  (If you are not directly supplying this code to a
+-customer, and you are instead telling them how they can obtain it for
+-free, then you are not required to make any arrangement with me.)
+-
+-------------------------------------------------------------------------------
+-
+-The files included in this distribution are:
+-
+-  README           The file you're reading now.
+-  triangle.c       Complete C source code for Triangle.
+-  showme.c         Complete C source code for Show Me.
+-  triangle.h       Include file for calling Triangle from another program.
+-  tricall.c        Sample program that calls Triangle.
+-  makefile         Makefile for compiling Triangle and Show Me.
+-  A.poly           A sample input file.
+-
+-Each of Triangle and Show Me is a single portable C file.  The easiest way
+-to compile them is to edit and use the included makefile.  Before
+-compiling, read the makefile, which describes your options, and edit it
+-accordingly.  You should specify:
+-
+-  The source and binary directories.
+-
+-  The C compiler and level of optimization.
+-
+-  The "correct" directories for include files (especially X include files),
+-  if necessary.
+-
+-  Do you want single precision or double?  (The default is double.)  Do you
+-  want to leave out some of Triangle's features to reduce the size of the
+-  executable file?  Investigate the SINGLE, REDUCED, and CDT_ONLY symbols.
+-
+-  If yours is not a Unix system, define the NO_TIMER symbol to remove the
+-  Unix-specific timing code.  Also, don't try to compile Show Me; it only
+-  works with X Windows.
+-
+-  If you are compiling on an Intel x86 CPU and using gcc w/Linux or
+-  Microsoft C, be sure to define the LINUX or CPU86 (for Microsoft) symbol
+-  during compilation so that the exact arithmetic works right.
+-
+-Once you've done this, type "make" to compile the programs.  Alternatively,
+-the files are usually easy to compile without a makefile:
+-
+-  cc -O -o triangle triangle.c -lm
+-  cc -O -o showme showme.c -lX11
+-
+-On some systems, the C compiler won't be able to find the X include files
+-or libraries, and you'll need to specify an include path or library path:
+-
+-  cc -O -I/usr/local/include -o showme showme.c -L/usr/local/lib -lX11
+-
+-Some processors, including Intel x86 family and possibly Motorola 68xxx
+-family chips, are IEEE conformant but have extended length internal
+-floating-point registers that may defeat Triangle's exact arithmetic
+-routines by failing to cause enough roundoff error!  Typically, there is a
+-way to set these internal registers so that they are rounded off to IEEE
+-single or double precision format.  I believe (but I'm not certain) that
+-Triangle has the right incantations for x86 chips, if you have gcc running
+-under Linux (define the LINUX compiler symbol) or Microsoft C (define the
+-CPU86 compiler symbol).
+-
+-If you have a different processor or operating system, or if I got the
+-incantations wrong, you should check your C compiler or system manuals to
+-find out how to configure these internal registers to the precision you are
+-using.  Otherwise, the exact arithmetic routines won't be exact at all.
+-See http://www.cs.cmu.edu/~quake/robust.pc.html for details.  Triangle's
+-exact arithmetic hasn't a hope of working on machines like the Cray C90 or
+-Y-MP, which are not IEEE conformant and have inaccurate rounding.
+-
+-Triangle and Show Me have both text and HTML documentation.  The latter is
+-illustrated.  Find it on the Web at
+-
+-  http://www.cs.cmu.edu/~quake/triangle.html
+-  http://www.cs.cmu.edu/~quake/showme.html
+-
+-Complete text instructions are printed by invoking each program with the
+-`-h' switch:
+-
+-  triangle -h
+-  showme -h
+-
+-The instructions are long; you'll probably want to pipe the output to
+-`more' or `lpr' or redirect it to a file.
+-
+-Both programs give a short list of command line options if they are invoked
+-without arguments (that is, just type `triangle' or `showme').
+-
+-Try out Triangle on the enclosed sample file, A.poly:
+-
+-  triangle -p A
+-  showme A.poly &
+-
+-Triangle will read the Planar Straight Line Graph defined by A.poly, and
+-write its constrained Delaunay triangulation to A.1.node and A.1.ele.
+-Show Me will display the figure defined by A.poly.  There are two buttons
+-marked "ele" in the Show Me window; click on the top one.  This will cause
+-Show Me to load and display the triangulation.
+-
+-For contrast, try running
+-
+-  triangle -pq A
+-
+-Now, click on the same "ele" button.  A new triangulation will be loaded;
+-this one having no angles smaller than 20 degrees.
+-
+-To see a Voronoi diagram, try this:
+-
+-  cp A.poly A.node
+-  triangle -v A
+-
+-Click the "ele" button again.  You will see the Delaunay triangulation of
+-the points in A.poly, without the segments.  Now click the top "voro" button.
+-You will see the Voronoi diagram corresponding to that Delaunay triangulation.
+-Click the "Reset" button to see the full extent of the diagram.
+-
+-------------------------------------------------------------------------------
+-
+-If you wish to call Triangle from another program, instructions for doing
+-so are contained in the file `triangle.h' (but read Triangle's regular
+-instructions first!).  Also look at `tricall.c', which provides an example
+-of how to call Triangle.
+-
+-Type "make trilibrary" to create triangle.o, a callable object file.
+-Alternatively, the object file is usually easy to compile without a
+-makefile:
+-
+-  cc -DTRILIBRARY -O -c triangle.c
+-
+-Type "make distclean" to remove all the object and executable files created
+-by make.
+-
+-------------------------------------------------------------------------------
+-
+-If you use Triangle, and especially if you use it to accomplish real work,
+-I would like very much to hear from you.  A short letter or email (to
+-jrs@cs.berkeley.edu) describing how you use Triangle will mean a lot to me.
+-The more people I know are using this program, the more easily I can
+-justify spending time on improvements and on the three-dimensional
+-successor to Triangle, which in turn will benefit you.  Also, I can put you
+-on a list to receive email whenever a new version of Triangle is available.
+-
+-If you use a mesh generated by Triangle or plotted by Show Me in a
+-publication, please include an acknowledgment as well.  And please spell
+-Triangle with a capital `T'!  If you want to include a citation, use
+-`Jonathan Richard Shewchuk, ``Triangle:  Engineering a 2D Quality Mesh
+-Generator and Delaunay Triangulator,'' in Applied Computational Geometry:
+-Towards Geometric Engineering (Ming C. Lin and Dinesh Manocha, editors),
+-volume 1148 of Lecture Notes in Computer Science, pages 203-222,
+-Springer-Verlag, Berlin, May 1996.  (From the First ACM Workshop on Applied
+-Computational Geometry.)'
+-
+-
+-Jonathan Richard Shewchuk
+-July 27, 2005
+diff --git a/v3p/netlib/triangle.c b/v3p/netlib/triangle.c
+deleted file mode 100644
+index 017dbe1fae..0000000000
+--- a/v3p/netlib/triangle.c
++++ /dev/null
+@@ -1,16011 +0,0 @@
+-/*****************************************************************************/
+-/*                                                                           */
+-/*      888888888        ,o,                          / 888                  */
+-/*         888    88o88o  "    o8888o  88o8888o o88888o 888  o88888o         */
+-/*         888    888    888       88b 888  888 888 888 888 d888  88b        */
+-/*         888    888    888  o88^o888 888  888 "88888" 888 8888oo888        */
+-/*         888    888    888 C888  888 888  888  /      888 q888             */
+-/*         888    888    888  "88o^888 888  888 Cb      888  "88oooo"        */
+-/*                                              "8oo8D                       */
+-/*                                                                           */
+-/*  A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.      */
+-/*  (triangle.c)                                                             */
+-/*                                                                           */
+-/*  Version 1.6                                                              */
+-/*  July 28, 2005                                                            */
+-/*                                                                           */
+-/*  Copyright 1993, 1995, 1997, 1998, 2002, 2005                             */
+-/*  Jonathan Richard Shewchuk                                                */
+-/*  2360 Woolsey #H                                                          */
+-/*  Berkeley, California  94705-1927                                         */
+-/*  jrs@cs.berkeley.edu                                                      */
+-/*                                                                           */
+-/*  This program may be freely redistributed under the condition that the    */
+-/*    copyright notices (including this entire header and the copyright      */
+-/*    notice printed when the `-h' switch is selected) are not removed, and  */
+-/*    no compensation is received.  Private, research, and institutional     */
+-/*    use is free.  You may distribute modified versions of this code UNDER  */
+-/*    THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE   */
+-/*    SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE   */
+-/*    AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR    */
+-/*    NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as    */
+-/*    part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT  */
+-/*    WITH THE AUTHOR.  (If you are not directly supplying this code to a    */
+-/*    customer, and you are instead telling them how they can obtain it for  */
+-/*    free, then you are not required to make any arrangement with me.)      */
+-/*                                                                           */
+-/*  Hypertext instructions for Triangle are available on the Web at          */
+-/*                                                                           */
+-/*      http://www.cs.cmu.edu/~quake/triangle.html                           */
+-/*                                                                           */
+-/*  Disclaimer:  Neither I nor Carnegie Mellon warrant this code in any way  */
+-/*    whatsoever.  This code is provided "as-is".  Use at your own risk.     */
+-/*                                                                           */
+-/*  Some of the references listed below are marked with an asterisk.  [*]    */
+-/*    These references are available for downloading from the Web page       */
+-/*                                                                           */
+-/*      http://www.cs.cmu.edu/~quake/triangle.research.html                  */
+-/*                                                                           */
+-/*  Three papers discussing aspects of Triangle are available.  A short      */
+-/*    overview appears in "Triangle:  Engineering a 2D Quality Mesh          */
+-/*    Generator and Delaunay Triangulator," in Applied Computational         */
+-/*    Geometry:  Towards Geometric Engineering, Ming C. Lin and Dinesh       */
+-/*    Manocha, editors, Lecture Notes in Computer Science volume 1148,       */
+-/*    pages 203-222, Springer-Verlag, Berlin, May 1996 (from the First ACM   */
+-/*    Workshop on Applied Computational Geometry).  [*]                      */
+-/*                                                                           */
+-/*    The algorithms are discussed in the greatest detail in "Delaunay       */
+-/*    Refinement Algorithms for Triangular Mesh Generation," Computational   */
+-/*    Geometry:  Theory and Applications 22(1-3):21-74, May 2002.  [*]       */
+-/*                                                                           */
+-/*    More detail about the data structures may be found in my dissertation: */
+-/*    "Delaunay Refinement Mesh Generation," Ph.D. thesis, Technical Report  */
+-/*    CMU-CS-97-137, School of Computer Science, Carnegie Mellon University, */
+-/*    Pittsburgh, Pennsylvania, 18 May 1997.  [*]                            */
+-/*                                                                           */
+-/*  Triangle was created as part of the Quake Project in the School of       */
+-/*    Computer Science at Carnegie Mellon University.  For further           */
+-/*    information, see Hesheng Bao, Jacobo Bielak, Omar Ghattas, Loukas F.   */
+-/*    Kallivokas, David R. O'Hallaron, Jonathan R. Shewchuk, and Jifeng Xu,  */
+-/*    "Large-scale Simulation of Elastic Wave Propagation in Heterogeneous   */
+-/*    Media on Parallel Computers," Computer Methods in Applied Mechanics    */
+-/*    and Engineering 152(1-2):85-102, 22 January 1998.                      */
+-/*                                                                           */
+-/*  Triangle's Delaunay refinement algorithm for quality mesh generation is  */
+-/*    a hybrid of one due to Jim Ruppert, "A Delaunay Refinement Algorithm   */
+-/*    for Quality 2-Dimensional Mesh Generation," Journal of Algorithms      */
+-/*    18(3):548-585, May 1995 [*], and one due to L. Paul Chew, "Guaranteed- */
+-/*    Quality Mesh Generation for Curved Surfaces," Proceedings of the Ninth */
+-/*    Annual Symposium on Computational Geometry (San Diego, California),    */
+-/*    pages 274-280, Association for Computing Machinery, May 1993,          */
+-/*    http://portal.acm.org/citation.cfm?id=161150 .                         */
+-/*                                                                           */
+-/*  The Delaunay refinement algorithm has been modified so that it meshes    */
+-/*    domains with small input angles well, as described in Gary L. Miller,  */
+-/*    Steven E. Pav, and Noel J. Walkington, "When and Why Ruppert's         */
+-/*    Algorithm Works," Twelfth International Meshing Roundtable, pages      */
+-/*    91-102, Sandia National Laboratories, September 2003.  [*]             */
+-/*                                                                           */
+-/*  My implementation of the divide-and-conquer and incremental Delaunay     */
+-/*    triangulation algorithms follows closely the presentation of Guibas    */
+-/*    and Stolfi, even though I use a triangle-based data structure instead  */
+-/*    of their quad-edge data structure.  (In fact, I originally implemented */
+-/*    Triangle using the quad-edge data structure, but the switch to a       */
+-/*    triangle-based data structure sped Triangle by a factor of two.)  The  */
+-/*    mesh manipulation primitives and the two aforementioned Delaunay       */
+-/*    triangulation algorithms are described by Leonidas J. Guibas and Jorge */
+-/*    Stolfi, "Primitives for the Manipulation of General Subdivisions and   */
+-/*    the Computation of Voronoi Diagrams," ACM Transactions on Graphics     */
+-/*    4(2):74-123, April 1985, http://portal.acm.org/citation.cfm?id=282923 .*/
+-/*                                                                           */
+-/*  Their O(n log n) divide-and-conquer algorithm is adapted from Der-Tsai   */
+-/*    Lee and Bruce J. Schachter, "Two Algorithms for Constructing the       */
+-/*    Delaunay Triangulation," International Journal of Computer and         */
+-/*    Information Science 9(3):219-242, 1980.  Triangle's improvement of the */
+-/*    divide-and-conquer algorithm by alternating between vertical and       */
+-/*    horizontal cuts was introduced by Rex A. Dwyer, "A Faster Divide-and-  */
+-/*    Conquer Algorithm for Constructing Delaunay Triangulations,"           */
+-/*    Algorithmica 2(2):137-151, 1987.                                       */
+-/*                                                                           */
+-/*  The incremental insertion algorithm was first proposed by C. L. Lawson,  */
+-/*    "Software for C1 Surface Interpolation," in Mathematical Software III, */
+-/*    John R. Rice, editor, Academic Press, New York, pp. 161-194, 1977.     */
+-/*    For point location, I use the algorithm of Ernst P. Mucke, Isaac       */
+-/*    Saias, and Binhai Zhu, "Fast Randomized Point Location Without         */
+-/*    Preprocessing in Two- and Three-Dimensional Delaunay Triangulations,"  */
+-/*    Proceedings of the Twelfth Annual Symposium on Computational Geometry, */
+-/*    ACM, May 1996.  [*]  If I were to randomize the order of vertex        */
+-/*    insertion (I currently don't bother), their result combined with the   */
+-/*    result of Kenneth L. Clarkson and Peter W. Shor, "Applications of      */
+-/*    Random Sampling in Computational Geometry II," Discrete &              */
+-/*    Computational Geometry 4(1):387-421, 1989, would yield an expected     */
+-/*    O(n^{4/3}) bound on running time.                                      */
+-/*                                                                           */
+-/*  The O(n log n) sweepline Delaunay triangulation algorithm is taken from  */
+-/*    Steven Fortune, "A Sweepline Algorithm for Voronoi Diagrams",          */
+-/*    Algorithmica 2(2):153-174, 1987.  A random sample of edges on the      */
+-/*    boundary of the triangulation are maintained in a splay tree for the   */
+-/*    purpose of point location.  Splay trees are described by Daniel        */
+-/*    Dominic Sleator and Robert Endre Tarjan, "Self-Adjusting Binary Search */
+-/*    Trees," Journal of the ACM 32(3):652-686, July 1985,                   */
+-/*    http://portal.acm.org/citation.cfm?id=3835 .                           */
+-/*                                                                           */
+-/*  The algorithms for exact computation of the signs of determinants are    */
+-/*    described in Jonathan Richard Shewchuk, "Adaptive Precision Floating-  */
+-/*    Point Arithmetic and Fast Robust Geometric Predicates," Discrete &     */
+-/*    Computational Geometry 18(3):305-363, October 1997.  (Also available   */
+-/*    as Technical Report CMU-CS-96-140, School of Computer Science,         */
+-/*    Carnegie Mellon University, Pittsburgh, Pennsylvania, May 1996.)  [*]  */
+-/*    An abbreviated version appears as Jonathan Richard Shewchuk, "Robust   */
+-/*    Adaptive Floating-Point Geometric Predicates," Proceedings of the      */
+-/*    Twelfth Annual Symposium on Computational Geometry, ACM, May 1996. [*] */
+-/*    Many of the ideas for my exact arithmetic routines originate with      */
+-/*    Douglas M. Priest, "Algorithms for Arbitrary Precision Floating Point  */
+-/*    Arithmetic," Tenth Symposium on Computer Arithmetic, pp. 132-143, IEEE */
+-/*    Computer Society Press, 1991.  [*]  Many of the ideas for the correct  */
+-/*    evaluation of the signs of determinants are taken from Steven Fortune  */
+-/*    and Christopher J. Van Wyk, "Efficient Exact Arithmetic for Computa-   */
+-/*    tional Geometry," Proceedings of the Ninth Annual Symposium on         */
+-/*    Computational Geometry, ACM, pp. 163-172, May 1993, and from Steven    */
+-/*    Fortune, "Numerical Stability of Algorithms for 2D Delaunay Triangu-   */
+-/*    lations," International Journal of Computational Geometry & Applica-   */
+-/*    tions 5(1-2):193-213, March-June 1995.                                 */
+-/*                                                                           */
+-/*  The method of inserting new vertices off-center (not precisely at the    */
+-/*    circumcenter of every poor-quality triangle) is from Alper Ungor,      */
+-/*    "Off-centers:  A New Type of Steiner Points for Computing Size-Optimal */
+-/*    Quality-Guaranteed Delaunay Triangulations," Proceedings of LATIN      */
+-/*    2004 (Buenos Aires, Argentina), April 2004.                            */
+-/*                                                                           */
+-/*  For definitions of and results involving Delaunay triangulations,        */
+-/*    constrained and conforming versions thereof, and other aspects of      */
+-/*    triangular mesh generation, see the excellent survey by Marshall Bern  */
+-/*    and David Eppstein, "Mesh Generation and Optimal Triangulation," in    */
+-/*    Computing and Euclidean Geometry, Ding-Zhu Du and Frank Hwang,         */
+-/*    editors, World Scientific, Singapore, pp. 23-90, 1992.  [*]            */
+-/*                                                                           */
+-/*  The time for incrementally adding PSLG (planar straight line graph)      */
+-/*    segments to create a constrained Delaunay triangulation is probably    */
+-/*    O(t^2) per segment in the worst case and O(t) per segment in the       */
+-/*    common case, where t is the number of triangles that intersect the     */
+-/*    segment before it is inserted.  This doesn't count point location,     */
+-/*    which can be much more expensive.  I could improve this to O(d log d)  */
+-/*    time, but d is usually quite small, so it's not worth the bother.      */
+-/*    (This note does not apply when the -s switch is used, invoking a       */
+-/*    different method is used to insert segments.)                          */
+-/*                                                                           */
+-/*  The time for deleting a vertex from a Delaunay triangulation is O(d^2)   */
+-/*    in the worst case and O(d) in the common case, where d is the degree   */
+-/*    of the vertex being deleted.  I could improve this to O(d log d) time, */
+-/*    but d is usually quite small, so it's not worth the bother.            */
+-/*                                                                           */
+-/*  Ruppert's Delaunay refinement algorithm typically generates triangles    */
+-/*    at a linear rate (constant time per triangle) after the initial        */
+-/*    triangulation is formed.  There may be pathological cases where        */
+-/*    quadratic time is required, but these never arise in practice.         */
+-/*                                                                           */
+-/*  The geometric predicates (circumcenter calculations, segment             */
+-/*    intersection formulae, etc.) appear in my "Lecture Notes on Geometric  */
+-/*    Robustness" at http://www.cs.berkeley.edu/~jrs/mesh .                  */
+-/*                                                                           */
+-/*  If you make any improvements to this code, please please please let me   */
+-/*    know, so that I may obtain the improvements.  Even if you don't change */
+-/*    the code, I'd still love to hear what it's being used for.             */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/* For single precision (which will save some memory and reduce paging),     */
+-/*   define the symbol SINGLE by using the -DSINGLE compiler switch or by    */
+-/*   writing "#define SINGLE" below.                                         */
+-/*                                                                           */
+-/* For double precision (which will allow you to refine meshes to a smaller  */
+-/*   edge length), leave SINGLE undefined.                                   */
+-/*                                                                           */
+-/* Double precision uses more memory, but improves the resolution of the     */
+-/*   meshes you can generate with Triangle.  It also reduces the likelihood  */
+-/*   of a floating exception due to overflow.  Finally, it is much faster    */
+-/*   than single precision on 64-bit architectures like the DEC Alpha.  I    */
+-/*   recommend double precision unless you want to generate a mesh for which */
+-/*   you do not have enough memory.                                          */
+-
+-/* #define SINGLE */
+-
+-#ifdef SINGLE
+-#define REAL float
+-#else /* not SINGLE */
+-#define REAL double
+-#endif /* not SINGLE */
+-
+-#define TRIANGLE_PTRINT size_t
+-
+-/* If yours is not a Unix system, define the NO_TIMER compiler switch to     */
+-/*   remove the Unix-specific timing code.                                   */
+-
+-#define NO_TIMER
+-
+-/* To insert lots of self-checks for internal errors, define the SELF_CHECK  */
+-/*   symbol.  This will slow down the program significantly.  It is best to  */
+-/*   define the symbol using the -DSELF_CHECK compiler switch, but you could */
+-/*   write "#define SELF_CHECK" below.  If you are modifying this code, I    */
+-/*   recommend you turn self-checks on until your work is debugged.          */
+-
+-/* #define SELF_CHECK */
+-
+-/* To compile Triangle as a callable object library (triangle.o), define the */
+-/*   TRILIBRARY symbol.  Read the file triangle.h for details on how to call */
+-/*   the procedure triangulate() that results.                               */
+-
+-#define TRILIBRARY
+-
+-/* It is possible to generate a smaller version of Triangle using one or     */
+-/*   both of the following symbols.  Define the REDUCED symbol to eliminate  */
+-/*   all features that are primarily of research interest; specifically, the */
+-/*   -i, -F, -s, and -C switches.  Define the CDT_ONLY symbol to eliminate   */
+-/*   all meshing algorithms above and beyond constrained Delaunay            */
+-/*   triangulation; specifically, the -r, -q, -a, -u, -D, -S, and -s         */
+-/*   switches.  These reductions are most likely to be useful when           */
+-/*   generating an object library (triangle.o) by defining the TRILIBRARY    */
+-/*   symbol.                                                                 */
+-
+-/* #define REDUCED */
+-/* #define CDT_ONLY */
+-
+-/* On some machines, my exact arithmetic routines might be defeated by the   */
+-/*   use of internal extended precision floating-point registers.  The best  */
+-/*   way to solve this problem is to set the floating-point registers to use */
+-/*   single or double precision internally.  On 80x86 processors, this may   */
+-/*   be accomplished by setting the CPU86 symbol for the Microsoft C         */
+-/*   compiler, or the LINUX symbol for the gcc compiler running on Linux.    */
+-/*                                                                           */
+-/* An inferior solution is to declare certain values as `volatile', thus     */
+-/*   forcing them to be stored to memory and rounded off.  Unfortunately,    */
+-/*   this solution might slow Triangle down quite a bit.  To use volatile    */
+-/*   values, write "#define INEXACT volatile" below.  Normally, however,     */
+-/*   INEXACT should be defined to be nothing.  ("#define INEXACT".)          */
+-/*                                                                           */
+-/* For more discussion, see http://www.cs.cmu.edu/~quake/robust.pc.html .    */
+-/*   For yet more discussion, see Section 5 of my paper, "Adaptive Precision */
+-/*   Floating-Point Arithmetic and Fast Robust Geometric Predicates" (also   */
+-/*   available as Section 6.6 of my dissertation).                           */
+-
+-/* #define CPU86 */
+-/* #define LINUX */
+-
+-#define INEXACT /* Nothing */
+-/* #define INEXACT volatile */
+-
+-/* Maximum number of characters in a file name (including the null).         */
+-
+-#define FILENAMESIZE 2048
+-
+-/* Maximum number of characters in a line read from a file (including the    */
+-/*   null).                                                                  */
+-
+-#define INPUTLINESIZE 4096
+-
+-/* For efficiency, a variety of data structures are allocated in bulk.  The  */
+-/*   following constants determine how many of each structure is allocated   */
+-/*   at once.                                                                */
+-
+-#define TRIPERBLOCK 4092           /* Number of triangles allocated at once. */
+-#define SUBSEGPERBLOCK 508       /* Number of subsegments allocated at once. */
+-#define VERTEXPERBLOCK 4092         /* Number of vertices allocated at once. */
+-#define VIRUSPERBLOCK 1020   /* Number of virus triangles allocated at once. */
+-/* Number of encroached subsegments allocated at once. */
+-#define BADSUBSEGPERBLOCK 252
+-/* Number of skinny triangles allocated at once. */
+-#define BADTRIPERBLOCK 4092
+-/* Number of flipped triangles allocated at once. */
+-#define FLIPSTACKERPERBLOCK 252
+-/* Number of splay tree nodes allocated at once. */
+-#define SPLAYNODEPERBLOCK 508
+-
+-/* The vertex types.   A DEADVERTEX has been deleted entirely.  An           */
+-/*   UNDEADVERTEX is not part of the mesh, but is written to the output      */
+-/*   .node file and affects the node indexing in the other output files.     */
+-
+-#define INPUTVERTEX 0
+-#define SEGMENTVERTEX 1
+-#define FREEVERTEX 2
+-#define DEADVERTEX -32768
+-#define UNDEADVERTEX -32767
+-
+-/* The next line is used to outsmart some very stupid compilers.  If your    */
+-/*   compiler is smarter, feel free to replace the "int" with "void".        */
+-/*   Not that it matters.                                                    */
+-
+-/*#define void int */
+-
+-/* Two constants for algorithms based on random sampling.  Both constants    */
+-/*   have been chosen empirically to optimize their respective algorithms.   */
+-
+-/* Used for the point location scheme of Mucke, Saias, and Zhu, to decide    */
+-/*   how large a random sample of triangles to inspect.                      */
+-
+-#define SAMPLEFACTOR 11
+-
+-/* Used in Fortune's sweepline Delaunay algorithm to determine what fraction */
+-/*   of boundary edges should be maintained in the splay tree for point      */
+-/*   location on the front.                                                  */
+-
+-#define SAMPLERATE 10
+-
+-/* A number that speaks for itself, every kissable digit.                    */
+-
+-#define PI 3.141592653589793238462643383279502884197169399375105820974944592308
+-
+-/* Another fave.                                                             */
+-
+-#define SQUAREROOTTWO 1.4142135623730950488016887242096980785696718753769480732
+-
+-/* And here's one for those of you who are intimidated by math.              */
+-
+-#define ONETHIRD 0.333333333333333333333333333333333333333333333333333333333333
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <math.h>
+-#ifndef NO_TIMER
+-#include <sys/time.h>
+-#endif /* not NO_TIMER */
+-#ifdef CPU86
+-#include <float.h>
+-#endif /* CPU86 */
+-#ifdef LINUX
+-#include <fpu_control.h>
+-#endif /* LINUX */
+-#ifdef TRILIBRARY
+-#include "triangle.h"
+-#endif /* TRILIBRARY */
+-
+-/* A few forward declarations.                                               */
+-
+-#ifndef TRILIBRARY
+-char *readline();
+-char *findfield();
+-#endif /* not TRILIBRARY */
+-
+-/* Labels that signify the result of point location.  The result of a        */
+-/*   search indicates that the point falls in the interior of a triangle, on */
+-/*   an edge, on a vertex, or outside the mesh.                              */
+-
+-enum locateresult {INTRIANGLE, ONEDGE, ONVERTEX, OUTSIDE};
+-
+-/* Labels that signify the result of vertex insertion.  The result indicates */
+-/*   that the vertex was inserted with complete success, was inserted but    */
+-/*   encroaches upon a subsegment, was not inserted because it lies on a     */
+-/*   segment, or was not inserted because another vertex occupies the same   */
+-/*   location.                                                               */
+-
+-enum insertvertexresult {SUCCESSFULVERTEX, ENCROACHINGVERTEX, VIOLATINGVERTEX,
+-                         DUPLICATEVERTEX};
+-
+-/* Labels that signify the result of direction finding.  The result          */
+-/*   indicates that a segment connecting the two query points falls within   */
+-/*   the direction triangle, along the left edge of the direction triangle,  */
+-/*   or along the right edge of the direction triangle.                      */
+-
+-enum finddirectionresult {WITHIN, LEFTCOLLINEAR, RIGHTCOLLINEAR};
+-
+-/* Labels that signify the result of the circumcenter computation routine.   */
+-/*   The return value indicates which edge of the triangle is shortest.      */
+-
+-enum circumcenterresult {OPPOSITEORG, OPPOSITEDEST, OPPOSITEAPEX};
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  The basic mesh data structures                                           */
+-/*                                                                           */
+-/*  There are three:  vertices, triangles, and subsegments (abbreviated      */
+-/*  `subseg').  These three data structures, linked by pointers, comprise    */
+-/*  the mesh.  A vertex simply represents a mesh vertex and its properties.  */
+-/*  A triangle is a triangle.  A subsegment is a special data structure used */
+-/*  to represent an impenetrable edge of the mesh (perhaps on the outer      */
+-/*  boundary, on the boundary of a hole, or part of an internal boundary     */
+-/*  separating two triangulated regions).  Subsegments represent boundaries, */
+-/*  defined by the user, that triangles may not lie across.                  */
+-/*                                                                           */
+-/*  A triangle consists of a list of three vertices, a list of three         */
+-/*  adjoining triangles, a list of three adjoining subsegments (when         */
+-/*  segments exist), an arbitrary number of optional user-defined            */
+-/*  floating-point attributes, and an optional area constraint.  The latter  */
+-/*  is an upper bound on the permissible area of each triangle in a region,  */
+-/*  used for mesh refinement.                                                */
+-/*                                                                           */
+-/*  For a triangle on a boundary of the mesh, some or all of the neighboring */
+-/*  triangles may not be present.  For a triangle in the interior of the     */
+-/*  mesh, often no neighboring subsegments are present.  Such absent         */
+-/*  triangles and subsegments are never represented by NULL pointers; they   */
+-/*  are represented by two special records:  `dummytri', the triangle that   */
+-/*  fills "outer space", and `dummysub', the omnipresent subsegment.         */
+-/*  `dummytri' and `dummysub' are used for several reasons; for instance,    */
+-/*  they can be dereferenced and their contents examined without violating   */
+-/*  protected memory.                                                        */
+-/*                                                                           */
+-/*  However, it is important to understand that a triangle includes other    */
+-/*  information as well.  The pointers to adjoining vertices, triangles, and */
+-/*  subsegments are ordered in a way that indicates their geometric relation */
+-/*  to each other.  Furthermore, each of these pointers contains orientation */
+-/*  information.  Each pointer to an adjoining triangle indicates which face */
+-/*  of that triangle is contacted.  Similarly, each pointer to an adjoining  */
+-/*  subsegment indicates which side of that subsegment is contacted, and how */
+-/*  the subsegment is oriented relative to the triangle.                     */
+-/*                                                                           */
+-/*  The data structure representing a subsegment may be thought to be        */
+-/*  abutting the edge of one or two triangle data structures:  either        */
+-/*  sandwiched between two triangles, or resting against one triangle on an  */
+-/*  exterior boundary or hole boundary.                                      */
+-/*                                                                           */
+-/*  A subsegment consists of a list of four vertices--the vertices of the    */
+-/*  subsegment, and the vertices of the segment it is a part of--a list of   */
+-/*  two adjoining subsegments, and a list of two adjoining triangles.  One   */
+-/*  of the two adjoining triangles may not be present (though there should   */
+-/*  always be one), and neighboring subsegments might not be present.        */
+-/*  Subsegments also store a user-defined integer "boundary marker".         */
+-/*  Typically, this integer is used to indicate what boundary conditions are */
+-/*  to be applied at that location in a finite element simulation.           */
+-/*                                                                           */
+-/*  Like triangles, subsegments maintain information about the relative      */
+-/*  orientation of neighboring objects.                                      */
+-/*                                                                           */
+-/*  Vertices are relatively simple.  A vertex is a list of floating-point    */
+-/*  numbers, starting with the x, and y coordinates, followed by an          */
+-/*  arbitrary number of optional user-defined floating-point attributes,     */
+-/*  followed by an integer boundary marker.  During the segment insertion    */
+-/*  phase, there is also a pointer from each vertex to a triangle that may   */
+-/*  contain it.  Each pointer is not always correct, but when one is, it     */
+-/*  speeds up segment insertion.  These pointers are assigned values once    */
+-/*  at the beginning of the segment insertion phase, and are not used or     */
+-/*  updated except during this phase.  Edge flipping during segment          */
+-/*  insertion will render some of them incorrect.  Hence, don't rely upon    */
+-/*  them for anything.                                                       */
+-/*                                                                           */
+-/*  Other than the exception mentioned above, vertices have no information   */
+-/*  about what triangles, subfacets, or subsegments they are linked to.      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  Handles                                                                  */
+-/*                                                                           */
+-/*  The oriented triangle (`otri') and oriented subsegment (`osub') data     */
+-/*  structures defined below do not themselves store any part of the mesh.   */
+-/*  The mesh itself is made of `triangle's, `subseg's, and `vertex's.        */
+-/*                                                                           */
+-/*  Oriented triangles and oriented subsegments will usually be referred to  */
+-/*  as "handles."  A handle is essentially a pointer into the mesh; it       */
+-/*  allows you to "hold" one particular part of the mesh.  Handles are used  */
+-/*  to specify the regions in which one is traversing and modifying the mesh.*/
+-/*  A single `triangle' may be held by many handles, or none at all.  (The   */
+-/*  latter case is not a memory leak, because the triangle is still          */
+-/*  connected to other triangles in the mesh.)                               */
+-/*                                                                           */
+-/*  An `otri' is a handle that holds a triangle.  It holds a specific edge   */
+-/*  of the triangle.  An `osub' is a handle that holds a subsegment.  It     */
+-/*  holds either the left or right side of the subsegment.                   */
+-/*                                                                           */
+-/*  Navigation about the mesh is accomplished through a set of mesh          */
+-/*  manipulation primitives, further below.  Many of these primitives take   */
+-/*  a handle and produce a new handle that holds the mesh near the first     */
+-/*  handle.  Other primitives take two handles and glue the corresponding    */
+-/*  parts of the mesh together.  The orientation of the handles is           */
+-/*  important.  For instance, when two triangles are glued together by the   */
+-/*  bond() primitive, they are glued at the edges on which the handles lie.  */
+-/*                                                                           */
+-/*  Because vertices have no information about which triangles they are      */
+-/*  attached to, I commonly represent a vertex by use of a handle whose      */
+-/*  origin is the vertex.  A single handle can simultaneously represent a    */
+-/*  triangle, an edge, and a vertex.                                         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/* The triangle data structure.  Each triangle contains three pointers to    */
+-/*   adjoining triangles, plus three pointers to vertices, plus three        */
+-/*   pointers to subsegments (declared below; these pointers are usually     */
+-/*   `dummysub').  It may or may not also contain user-defined attributes    */
+-/*   and/or a floating-point "area constraint."  It may also contain extra   */
+-/*   pointers for nodes, when the user asks for high-order elements.         */
+-/*   Because the size and structure of a `triangle' is not decided until     */
+-/*   runtime, I haven't simply declared the type `triangle' as a struct.     */
+-
+-typedef REAL **triangle;            /* Really:  typedef triangle *triangle   */
+-
+-/* An oriented triangle:  includes a pointer to a triangle and orientation.  */
+-/*   The orientation denotes an edge of the triangle.  Hence, there are      */
+-/*   three possible orientations.  By convention, each edge always points    */
+-/*   counterclockwise about the corresponding triangle.                      */
+-
+-struct otri {
+-  triangle *tri;
+-  int orient;                                         /* Ranges from 0 to 2. */
+-};
+-
+-/* The subsegment data structure.  Each subsegment contains two pointers to  */
+-/*   adjoining subsegments, plus four pointers to vertices, plus two         */
+-/*   pointers to adjoining triangles, plus one boundary marker, plus one     */
+-/*   segment number.                                                         */
+-
+-typedef REAL **subseg;                  /* Really:  typedef subseg *subseg   */
+-
+-/* An oriented subsegment:  includes a pointer to a subsegment and an        */
+-/*   orientation.  The orientation denotes a side of the edge.  Hence, there */
+-/*   are two possible orientations.  By convention, the edge is always       */
+-/*   directed so that the "side" denoted is the right side of the edge.      */
+-
+-struct osub {
+-  subseg *ss;
+-  int ssorient;                                       /* Ranges from 0 to 1. */
+-};
+-
+-/* The vertex data structure.  Each vertex is actually an array of REALs.    */
+-/*   The number of REALs is unknown until runtime.  An integer boundary      */
+-/*   marker, and sometimes a pointer to a triangle, is appended after the    */
+-/*   REALs.                                                                  */
+-
+-typedef REAL *vertex;
+-
+-/* A queue used to store encroached subsegments.  Each subsegment's vertices */
+-/*   are stored so that we can check whether a subsegment is still the same. */
+-
+-struct badsubseg {
+-  subseg encsubseg;                             /* An encroached subsegment. */
+-  vertex subsegorg, subsegdest;                         /* Its two vertices. */
+-};
+-
+-/* A queue used to store bad triangles.  The key is the square of the cosine */
+-/*   of the smallest angle of the triangle.  Each triangle's vertices are    */
+-/*   stored so that one can check whether a triangle is still the same.      */
+-
+-struct badtriang {
+-  triangle poortri;                       /* A skinny or too-large triangle. */
+-  REAL key;                             /* cos^2 of smallest (apical) angle. */
+-  vertex triangorg, triangdest, triangapex;           /* Its three vertices. */
+-  struct badtriang *nexttriang;             /* Pointer to next bad triangle. */
+-};
+-
+-/* A stack of triangles flipped during the most recent vertex insertion.     */
+-/*   The stack is used to undo the vertex insertion if the vertex encroaches */
+-/*   upon a subsegment.                                                      */
+-
+-struct flipstacker {
+-  triangle flippedtri;                       /* A recently flipped triangle. */
+-  struct flipstacker *prevflip;               /* Previous flip in the stack. */
+-};
+-
+-/* A node in a heap used to store events for the sweepline Delaunay          */
+-/*   algorithm.  Nodes do not point directly to their parents or children in */
+-/*   the heap.  Instead, each node knows its position in the heap, and can   */
+-/*   look up its parent and children in a separate array.  The `eventptr'    */
+-/*   points either to a `vertex' or to a triangle (in encoded format, so     */
+-/*   that an orientation is included).  In the latter case, the origin of    */
+-/*   the oriented triangle is the apex of a "circle event" of the sweepline  */
+-/*   algorithm.  To distinguish site events from circle events, all circle   */
+-/*   events are given an invalid (smaller than `xmin') x-coordinate `xkey'.  */
+-
+-struct event {
+-  REAL xkey, ykey;                              /* Coordinates of the event. */
+-  void *eventptr;      /* Can be a vertex or the location of a circle event. */
+-  int heapposition;              /* Marks this event's position in the heap. */
+-};
+-
+-/* A node in the splay tree.  Each node holds an oriented ghost triangle     */
+-/*   that represents a boundary edge of the growing triangulation.  When a   */
+-/*   circle event covers two boundary edges with a triangle, so that they    */
+-/*   are no longer boundary edges, those edges are not immediately deleted   */
+-/*   from the tree; rather, they are lazily deleted when they are next       */
+-/*   encountered.  (Since only a random sample of boundary edges are kept    */
+-/*   in the tree, lazy deletion is faster.)  `keydest' is used to verify     */
+-/*   that a triangle is still the same as when it entered the splay tree; if */
+-/*   it has been rotated (due to a circle event), it no longer represents a  */
+-/*   boundary edge and should be deleted.                                    */
+-
+-struct splaynode {
+-  struct otri keyedge;                     /* Lprev of an edge on the front. */
+-  vertex keydest;           /* Used to verify that splay node is still live. */
+-  struct splaynode *lchild, *rchild;              /* Children in splay tree. */
+-};
+-
+-/* A type used to allocate memory.  firstblock is the first block of items.  */
+-/*   nowblock is the block from which items are currently being allocated.   */
+-/*   nextitem points to the next slab of free memory for an item.            */
+-/*   deaditemstack is the head of a linked list (stack) of deallocated items */
+-/*   that can be recycled.  unallocateditems is the number of items that     */
+-/*   remain to be allocated from nowblock.                                   */
+-/*                                                                           */
+-/* Traversal is the process of walking through the entire list of items, and */
+-/*   is separate from allocation.  Note that a traversal will visit items on */
+-/*   the "deaditemstack" stack as well as live items.  pathblock points to   */
+-/*   the block currently being traversed.  pathitem points to the next item  */
+-/*   to be traversed.  pathitemsleft is the number of items that remain to   */
+-/*   be traversed in pathblock.                                              */
+-/*                                                                           */
+-/* alignbytes determines how new records should be aligned in memory.        */
+-/*   itembytes is the length of a record in bytes (after rounding up).       */
+-/*   itemsperblock is the number of items allocated at once in a single      */
+-/*   block.  itemsfirstblock is the number of items in the first block,      */
+-/*   which can vary from the others.  items is the number of currently       */
+-/*   allocated items.  maxitems is the maximum number of items that have     */
+-/*   been allocated at once; it is the current number of items plus the      */
+-/*   number of records kept on deaditemstack.                                */
+-
+-struct memorypool {
+-  void **firstblock, **nowblock;
+-  void *nextitem;
+-  void *deaditemstack;
+-  void **pathblock;
+-  void *pathitem;
+-  int alignbytes;
+-  int itembytes;
+-  int itemsperblock;
+-  int itemsfirstblock;
+-  long items, maxitems;
+-  int unallocateditems;
+-  int pathitemsleft;
+-};
+-
+-
+-/* Global constants.                                                         */
+-
+-REAL splitter;       /* Used to split REAL factors for exact multiplication. */
+-REAL epsilon;                             /* Floating-point machine epsilon. */
+-REAL resulterrbound;
+-REAL ccwerrboundA, ccwerrboundB, ccwerrboundC;
+-REAL iccerrboundA, iccerrboundB, iccerrboundC;
+-REAL o3derrboundA, o3derrboundB, o3derrboundC;
+-
+-/* Random number seed is not constant, but I've made it global anyway.       */
+-
+-TRIANGLE_PTRINT randomseed;                     /* Current random number seed. */
+-
+-
+-/* Mesh data structure.  Triangle operates on only one mesh, but the mesh    */
+-/*   structure is used (instead of global variables) to allow reentrancy.    */
+-
+-struct mesh {
+-
+-/* Variables used to allocate memory for triangles, subsegments, vertices,   */
+-/*   viri (triangles being eaten), encroached segments, bad (skinny or too   */
+-/*   large) triangles, and splay tree nodes.                                 */
+-
+-  struct memorypool triangles;
+-  struct memorypool subsegs;
+-  struct memorypool vertices;
+-  struct memorypool viri;
+-  struct memorypool badsubsegs;
+-  struct memorypool badtriangles;
+-  struct memorypool flipstackers;
+-  struct memorypool splaynodes;
+-
+-/* Variables that maintain the bad triangle queues.  The queues are          */
+-/*   ordered from 4095 (highest priority) to 0 (lowest priority).            */
+-
+-  struct badtriang *queuefront[4096];
+-  struct badtriang *queuetail[4096];
+-  int nextnonemptyq[4096];
+-  int firstnonemptyq;
+-
+-/* Variable that maintains the stack of recently flipped triangles.          */
+-
+-  struct flipstacker *lastflip;
+-
+-/* Other variables. */
+-
+-  REAL xmin, xmax, ymin, ymax;                            /* x and y bounds. */
+-  REAL xminextreme;      /* Nonexistent x value used as a flag in sweepline. */
+-  int invertices;                               /* Number of input vertices. */
+-  int inelements;                              /* Number of input triangles. */
+-  int insegments;                               /* Number of input segments. */
+-  int holes;                                       /* Number of input holes. */
+-  int regions;                                   /* Number of input regions. */
+-  int undeads;    /* Number of input vertices that don't appear in the mesh. */
+-  long edges;                                     /* Number of output edges. */
+-  int mesh_dim;                                /* Dimension (ought to be 2). */
+-  int nextras;                           /* Number of attributes per vertex. */
+-  int eextras;                         /* Number of attributes per triangle. */
+-  long hullsize;                          /* Number of edges in convex hull. */
+-  int steinerleft;                 /* Number of Steiner points not yet used. */
+-  int vertexmarkindex;         /* Index to find boundary marker of a vertex. */
+-  int vertex2triindex;     /* Index to find a triangle adjacent to a vertex. */
+-  int highorderindex;  /* Index to find extra nodes for high-order elements. */
+-  int elemattribindex;            /* Index to find attributes of a triangle. */
+-  int areaboundindex;             /* Index to find area bound of a triangle. */
+-  int checksegments;         /* Are there segments in the triangulation yet? */
+-  int checkquality;                  /* Has quality triangulation begun yet? */
+-  int readnodefile;                           /* Has a .node file been read? */
+-  long samples;              /* Number of random samples for point location. */
+-
+-  long incirclecount;                 /* Number of incircle tests performed. */
+-  long counterclockcount;     /* Number of counterclockwise tests performed. */
+-  long orient3dcount;           /* Number of 3D orientation tests performed. */
+-  long hyperbolacount;      /* Number of right-of-hyperbola tests performed. */
+-  long circumcentercount;  /* Number of circumcenter calculations performed. */
+-  long circletopcount;       /* Number of circle top calculations performed. */
+-
+-/* Triangular bounding box vertices.                                         */
+-
+-  vertex infvertex1, infvertex2, infvertex3;
+-
+-/* Pointer to the `triangle' that occupies all of "outer space."             */
+-
+-  triangle *dummytri;
+-  triangle *dummytribase;    /* Keep base address so we can free() it later. */
+-
+-/* Pointer to the omnipresent subsegment.  Referenced by any triangle or     */
+-/*   subsegment that isn't really connected to a subsegment at that          */
+-/*   location.                                                               */
+-
+-  subseg *dummysub;
+-  subseg *dummysubbase;      /* Keep base address so we can free() it later. */
+-
+-/* Pointer to a recently visited triangle.  Improves point location if       */
+-/*   proximate vertices are inserted sequentially.                           */
+-
+-  struct otri recenttri;
+-
+-};                                                  /* End of `struct mesh'. */
+-
+-
+-/* Data structure for command line switches and file names.  This structure  */
+-/*   is used (instead of global variables) to allow reentrancy.              */
+-
+-struct behavior {
+-
+-/* Switches for the triangulator.                                            */
+-/*   poly: -p switch.  refine: -r switch.                                    */
+-/*   quality: -q switch.                                                     */
+-/*     minangle: minimum angle bound, specified after -q switch.             */
+-/*     goodangle: cosine squared of minangle.                                */
+-/*     offconstant: constant used to place off-center Steiner points.        */
+-/*   vararea: -a switch without number.                                      */
+-/*   fixedarea: -a switch with number.                                       */
+-/*     maxarea: maximum area bound, specified after -a switch.               */
+-/*   usertest: -u switch.                                                    */
+-/*   regionattrib: -A switch.  convex: -c switch.                            */
+-/*   weighted: 1 for -w switch, 2 for -W switch.  jettison: -j switch        */
+-/*   firstnumber: inverse of -z switch.  All items are numbered starting     */
+-/*     from `firstnumber'.                                                   */
+-/*   edgesout: -e switch.  voronoi: -v switch.                               */
+-/*   neighbors: -n switch.  geomview: -g switch.                             */
+-/*   nobound: -B switch.  nopolywritten: -P switch.                          */
+-/*   nonodewritten: -N switch.  noelewritten: -E switch.                     */
+-/*   noiterationnum: -I switch.  noholes: -O switch.                         */
+-/*   noexact: -X switch.                                                     */
+-/*   order: element order, specified after -o switch.                        */
+-/*   nobisect: count of how often -Y switch is selected.                     */
+-/*   steiner: maximum number of Steiner points, specified after -S switch.   */
+-/*   incremental: -i switch.  sweepline: -F switch.                          */
+-/*   dwyer: inverse of -l switch.                                            */
+-/*   splitseg: -s switch.                                                    */
+-/*   conformdel: -D switch.  docheck: -C switch.                             */
+-/*   quiet: -Q switch.  verbose: count of how often -V switch is selected.   */
+-/*   usesegments: -p, -r, -q, or -c switch; determines whether segments are  */
+-/*     used at all.                                                          */
+-/*                                                                           */
+-/* Read the instructions to find out the meaning of these switches.          */
+-
+-  int poly, refine, quality, vararea, fixedarea, usertest;
+-  int regionattrib, convex, weighted, jettison;
+-  int firstnumber;
+-  int edgesout, voronoi, neighbors, geomview;
+-  int nobound, nopolywritten, nonodewritten, noelewritten, noiterationnum;
+-  int noholes, noexact, conformdel;
+-  int incremental, sweepline, dwyer;
+-  int splitseg;
+-  int docheck;
+-  int quiet, verbose;
+-  int usesegments;
+-  int order;
+-  int nobisect;
+-  int steiner;
+-  REAL minangle, goodangle, offconstant;
+-  REAL maxarea;
+-
+-/* Variables for file names.                                                 */
+-
+-#ifndef TRILIBRARY
+-  char innodefilename[FILENAMESIZE];
+-  char inelefilename[FILENAMESIZE];
+-  char inpolyfilename[FILENAMESIZE];
+-  char areafilename[FILENAMESIZE];
+-  char outnodefilename[FILENAMESIZE];
+-  char outelefilename[FILENAMESIZE];
+-  char outpolyfilename[FILENAMESIZE];
+-  char edgefilename[FILENAMESIZE];
+-  char vnodefilename[FILENAMESIZE];
+-  char vedgefilename[FILENAMESIZE];
+-  char neighborfilename[FILENAMESIZE];
+-  char offfilename[FILENAMESIZE];
+-#endif /* not TRILIBRARY */
+-
+-};                                              /* End of `struct behavior'. */
+-
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  Mesh manipulation primitives.  Each triangle contains three pointers to  */
+-/*  other triangles, with orientations.  Each pointer points not to the      */
+-/*  first byte of a triangle, but to one of the first three bytes of a       */
+-/*  triangle.  It is necessary to extract both the triangle itself and the   */
+-/*  orientation.  To save memory, I keep both pieces of information in one   */
+-/*  pointer.  To make this possible, I assume that all triangles are aligned */
+-/*  to four-byte boundaries.  The decode() routine below decodes a pointer,  */
+-/*  extracting an orientation (in the range 0 to 2) and a pointer to the     */
+-/*  beginning of a triangle.  The encode() routine compresses a pointer to a */
+-/*  triangle and an orientation into a single pointer.  My assumptions that  */
+-/*  triangles are four-byte-aligned and that the `TRIANGLE_PTRINT' type is     */
+-/*  long enough to hold a pointer are two of the few kludges in this program.*/
+-/*                                                                           */
+-/*  Subsegments are manipulated similarly.  A pointer to a subsegment        */
+-/*  carries both an address and an orientation in the range 0 to 1.          */
+-/*                                                                           */
+-/*  The other primitives take an oriented triangle or oriented subsegment,   */
+-/*  and return an oriented triangle or oriented subsegment or vertex; or     */
+-/*  they change the connections in the data structure.                       */
+-/*                                                                           */
+-/*  Below, triangles and subsegments are denoted by their vertices.  The     */
+-/*  triangle abc has origin (org) a, destination (dest) b, and apex (apex)   */
+-/*  c.  These vertices occur in counterclockwise order about the triangle.   */
+-/*  The handle abc may simultaneously denote vertex a, edge ab, and triangle */
+-/*  abc.                                                                     */
+-/*                                                                           */
+-/*  Similarly, the subsegment ab has origin (sorg) a and destination (sdest) */
+-/*  b.  If ab is thought to be directed upward (with b directly above a),    */
+-/*  then the handle ab is thought to grasp the right side of ab, and may     */
+-/*  simultaneously denote vertex a and edge ab.                              */
+-/*                                                                           */
+-/*  An asterisk (*) denotes a vertex whose identity is unknown.              */
+-/*                                                                           */
+-/*  Given this notation, a partial list of mesh manipulation primitives      */
+-/*  follows.                                                                 */
+-/*                                                                           */
+-/*                                                                           */
+-/*  For triangles:                                                           */
+-/*                                                                           */
+-/*  sym:  Find the abutting triangle; same edge.                             */
+-/*  sym(abc) -> ba*                                                          */
+-/*                                                                           */
+-/*  lnext:  Find the next edge (counterclockwise) of a triangle.             */
+-/*  lnext(abc) -> bca                                                        */
+-/*                                                                           */
+-/*  lprev:  Find the previous edge (clockwise) of a triangle.                */
+-/*  lprev(abc) -> cab                                                        */
+-/*                                                                           */
+-/*  onext:  Find the next edge counterclockwise with the same origin.        */
+-/*  onext(abc) -> ac*                                                        */
+-/*                                                                           */
+-/*  oprev:  Find the next edge clockwise with the same origin.               */
+-/*  oprev(abc) -> a*b                                                        */
+-/*                                                                           */
+-/*  dnext:  Find the next edge counterclockwise with the same destination.   */
+-/*  dnext(abc) -> *ba                                                        */
+-/*                                                                           */
+-/*  dprev:  Find the next edge clockwise with the same destination.          */
+-/*  dprev(abc) -> cb*                                                        */
+-/*                                                                           */
+-/*  rnext:  Find the next edge (counterclockwise) of the adjacent triangle.  */
+-/*  rnext(abc) -> *a*                                                        */
+-/*                                                                           */
+-/*  rprev:  Find the previous edge (clockwise) of the adjacent triangle.     */
+-/*  rprev(abc) -> b**                                                        */
+-/*                                                                           */
+-/*  org:  Origin          dest:  Destination          apex:  Apex            */
+-/*  org(abc) -> a         dest(abc) -> b              apex(abc) -> c         */
+-/*                                                                           */
+-/*  bond:  Bond two triangles together at the resepective handles.           */
+-/*  bond(abc, bad)                                                           */
+-/*                                                                           */
+-/*                                                                           */
+-/*  For subsegments:                                                         */
+-/*                                                                           */
+-/*  ssym:  Reverse the orientation of a subsegment.                          */
+-/*  ssym(ab) -> ba                                                           */
+-/*                                                                           */
+-/*  spivot:  Find adjoining subsegment with the same origin.                 */
+-/*  spivot(ab) -> a*                                                         */
+-/*                                                                           */
+-/*  snext:  Find next subsegment in sequence.                                */
+-/*  snext(ab) -> b*                                                          */
+-/*                                                                           */
+-/*  sorg:  Origin                      sdest:  Destination                   */
+-/*  sorg(ab) -> a                      sdest(ab) -> b                        */
+-/*                                                                           */
+-/*  sbond:  Bond two subsegments together at the respective origins.         */
+-/*  sbond(ab, ac)                                                            */
+-/*                                                                           */
+-/*                                                                           */
+-/*  For interacting tetrahedra and subfacets:                                */
+-/*                                                                           */
+-/*  tspivot:  Find a subsegment abutting a triangle.                         */
+-/*  tspivot(abc) -> ba                                                       */
+-/*                                                                           */
+-/*  stpivot:  Find a triangle abutting a subsegment.                         */
+-/*  stpivot(ab) -> ba*                                                       */
+-/*                                                                           */
+-/*  tsbond:  Bond a triangle to a subsegment.                                */
+-/*  tsbond(abc, ba)                                                          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/********* Mesh manipulation primitives begin here                   *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/* Fast lookup arrays to speed some of the mesh manipulation primitives.     */
+-
+-int plus1mod3[3] = {1, 2, 0};
+-int minus1mod3[3] = {2, 0, 1};
+-
+-/********* Primitives for triangles                                  *********/
+-/*                                                                           */
+-/*                                                                           */
+-
+-/* decode() converts a pointer to an oriented triangle.  The orientation is  */
+-/*   extracted from the two least significant bits of the pointer.           */
+-
+-#define decode(ptr, otri)                                                     \
+-  (otri).orient = (int) ((TRIANGLE_PTRINT) (ptr) & (TRIANGLE_PTRINT) 3l);         \
+-  (otri).tri = (triangle *)                                                   \
+-                  ((TRIANGLE_PTRINT) (ptr) ^ (TRIANGLE_PTRINT) (otri).orient)
+-
+-/* encode() compresses an oriented triangle into a single pointer.  It       */
+-/*   relies on the assumption that all triangles are aligned to four-byte    */
+-/*   boundaries, so the two least significant bits of (otri).tri are zero.   */
+-
+-#define encode(otri)                                                          \
+-  (triangle) ((TRIANGLE_PTRINT) (otri).tri | (TRIANGLE_PTRINT) (otri).orient)
+-
+-/* The following handle manipulation primitives are all described by Guibas  */
+-/*   and Stolfi.  However, Guibas and Stolfi use an edge-based data          */
+-/*   structure, whereas I use a triangle-based data structure.               */
+-
+-/* sym() finds the abutting triangle, on the same edge.  Note that the edge  */
+-/*   direction is necessarily reversed, because the handle specified by an   */
+-/*   oriented triangle is directed counterclockwise around the triangle.     */
+-
+-#define sym(otri1, otri2)                                                     \
+-  ptr = (otri1).tri[(otri1).orient];                                          \
+-  decode(ptr, otri2);
+-
+-#define symself(otri)                                                         \
+-  ptr = (otri).tri[(otri).orient];                                            \
+-  decode(ptr, otri);
+-
+-/* lnext() finds the next edge (counterclockwise) of a triangle.             */
+-
+-#define lnext(otri1, otri2)                                                   \
+-  (otri2).tri = (otri1).tri;                                                  \
+-  (otri2).orient = plus1mod3[(otri1).orient]
+-
+-#define lnextself(otri)                                                       \
+-  (otri).orient = plus1mod3[(otri).orient]
+-
+-/* lprev() finds the previous edge (clockwise) of a triangle.                */
+-
+-#define lprev(otri1, otri2)                                                   \
+-  (otri2).tri = (otri1).tri;                                                  \
+-  (otri2).orient = minus1mod3[(otri1).orient]
+-
+-#define lprevself(otri)                                                       \
+-  (otri).orient = minus1mod3[(otri).orient]
+-
+-/* onext() spins counterclockwise around a vertex; that is, it finds the     */
+-/*   next edge with the same origin in the counterclockwise direction.  This */
+-/*   edge is part of a different triangle.                                   */
+-
+-#define onext(otri1, otri2)                                                   \
+-  lprev(otri1, otri2);                                                        \
+-  symself(otri2);
+-
+-#define onextself(otri)                                                       \
+-  lprevself(otri);                                                            \
+-  symself(otri);
+-
+-/* oprev() spins clockwise around a vertex; that is, it finds the next edge  */
+-/*   with the same origin in the clockwise direction.  This edge is part of  */
+-/*   a different triangle.                                                   */
+-
+-#define oprev(otri1, otri2)                                                   \
+-  sym(otri1, otri2);                                                          \
+-  lnextself(otri2);
+-
+-#define oprevself(otri)                                                       \
+-  symself(otri);                                                              \
+-  lnextself(otri);
+-
+-/* dnext() spins counterclockwise around a vertex; that is, it finds the     */
+-/*   next edge with the same destination in the counterclockwise direction.  */
+-/*   This edge is part of a different triangle.                              */
+-
+-#define dnext(otri1, otri2)                                                   \
+-  sym(otri1, otri2);                                                          \
+-  lprevself(otri2);
+-
+-#define dnextself(otri)                                                       \
+-  symself(otri);                                                              \
+-  lprevself(otri);
+-
+-/* dprev() spins clockwise around a vertex; that is, it finds the next edge  */
+-/*   with the same destination in the clockwise direction.  This edge is     */
+-/*   part of a different triangle.                                           */
+-
+-#define dprev(otri1, otri2)                                                   \
+-  lnext(otri1, otri2);                                                        \
+-  symself(otri2);
+-
+-#define dprevself(otri)                                                       \
+-  lnextself(otri);                                                            \
+-  symself(otri);
+-
+-/* rnext() moves one edge counterclockwise about the adjacent triangle.      */
+-/*   (It's best understood by reading Guibas and Stolfi.  It involves        */
+-/*   changing triangles twice.)                                              */
+-
+-#define rnext(otri1, otri2)                                                   \
+-  sym(otri1, otri2);                                                          \
+-  lnextself(otri2);                                                           \
+-  symself(otri2);
+-
+-#define rnextself(otri)                                                       \
+-  symself(otri);                                                              \
+-  lnextself(otri);                                                            \
+-  symself(otri);
+-
+-/* rprev() moves one edge clockwise about the adjacent triangle.             */
+-/*   (It's best understood by reading Guibas and Stolfi.  It involves        */
+-/*   changing triangles twice.)                                              */
+-
+-#define rprev(otri1, otri2)                                                   \
+-  sym(otri1, otri2);                                                          \
+-  lprevself(otri2);                                                           \
+-  symself(otri2);
+-
+-#define rprevself(otri)                                                       \
+-  symself(otri);                                                              \
+-  lprevself(otri);                                                            \
+-  symself(otri);
+-
+-/* These primitives determine or set the origin, destination, or apex of a   */
+-/* triangle.                                                                 */
+-
+-#define org(otri, vertexptr)                                                  \
+-  vertexptr = (vertex) (otri).tri[plus1mod3[(otri).orient] + 3]
+-
+-#define dest(otri, vertexptr)                                                 \
+-  vertexptr = (vertex) (otri).tri[minus1mod3[(otri).orient] + 3]
+-
+-#define apex(otri, vertexptr)                                                 \
+-  vertexptr = (vertex) (otri).tri[(otri).orient + 3]
+-
+-#define setorg(otri, vertexptr)                                               \
+-  (otri).tri[plus1mod3[(otri).orient] + 3] = (triangle) vertexptr
+-
+-#define setdest(otri, vertexptr)                                              \
+-  (otri).tri[minus1mod3[(otri).orient] + 3] = (triangle) vertexptr
+-
+-#define setapex(otri, vertexptr)                                              \
+-  (otri).tri[(otri).orient + 3] = (triangle) vertexptr
+-
+-/* Bond two triangles together.                                              */
+-
+-#define bond(otri1, otri2)                                                    \
+-  (otri1).tri[(otri1).orient] = encode(otri2);                                \
+-  (otri2).tri[(otri2).orient] = encode(otri1)
+-
+-/* Dissolve a bond (from one side).  Note that the other triangle will still */
+-/*   think it's connected to this triangle.  Usually, however, the other     */
+-/*   triangle is being deleted entirely, or bonded to another triangle, so   */
+-/*   it doesn't matter.                                                      */
+-
+-#define dissolve(otri)                                                        \
+-  (otri).tri[(otri).orient] = (triangle) m->dummytri
+-
+-/* Copy an oriented triangle.                                                */
+-
+-#define otricopy(otri1, otri2)                                                \
+-  (otri2).tri = (otri1).tri;                                                  \
+-  (otri2).orient = (otri1).orient
+-
+-/* Test for equality of oriented triangles.                                  */
+-
+-#define otriequal(otri1, otri2)                                               \
+-  (((otri1).tri == (otri2).tri) &&                                            \
+-   ((otri1).orient == (otri2).orient))
+-
+-/* Primitives to infect or cure a triangle with the virus.  These rely on    */
+-/*   the assumption that all subsegments are aligned to four-byte boundaries.*/
+-
+-#define infect(otri)                                                          \
+-  (otri).tri[6] = (triangle)                                                  \
+-                    ((TRIANGLE_PTRINT) (otri).tri[6] | (TRIANGLE_PTRINT) 2l)
+-
+-#define uninfect(otri)                                                        \
+-  (otri).tri[6] = (triangle)                                                  \
+-                    ((TRIANGLE_PTRINT) (otri).tri[6] & ~ (TRIANGLE_PTRINT) 2l)
+-
+-/* Test a triangle for viral infection.                                      */
+-
+-#define infected(otri)                                                        \
+-  (((TRIANGLE_PTRINT) (otri).tri[6] & (TRIANGLE_PTRINT) 2l) != 0l)
+-
+-/* Check or set a triangle's attributes.                                     */
+-
+-#define elemattribute(otri, attnum)                                           \
+-  ((REAL *) (otri).tri)[m->elemattribindex + (attnum)]
+-
+-#define setelemattribute(otri, attnum, value)                                 \
+-  ((REAL *) (otri).tri)[m->elemattribindex + (attnum)] = value
+-
+-/* Check or set a triangle's maximum area bound.                             */
+-
+-#define areabound(otri)  ((REAL *) (otri).tri)[m->areaboundindex]
+-
+-#define setareabound(otri, value)                                             \
+-  ((REAL *) (otri).tri)[m->areaboundindex] = value
+-
+-/* Check or set a triangle's deallocation.  Its second pointer is set to     */
+-/*   NULL to indicate that it is not allocated.  (Its first pointer is used  */
+-/*   for the stack of dead items.)  Its fourth pointer (its first vertex)    */
+-/*   is set to NULL in case a `badtriang' structure points to it.            */
+-
+-#define deadtri(tria)  ((tria)[1] == (triangle) NULL)
+-
+-#define killtri(tria)                                                         \
+-  (tria)[1] = (triangle) NULL;                                                \
+-  (tria)[3] = (triangle) NULL
+-
+-/********* Primitives for subsegments                                *********/
+-/*                                                                           */
+-/*                                                                           */
+-
+-/* sdecode() converts a pointer to an oriented subsegment.  The orientation  */
+-/*   is extracted from the least significant bit of the pointer.  The two    */
+-/*   least significant bits (one for orientation, one for viral infection)   */
+-/*   are masked out to produce the real pointer.                             */
+-
+-#define sdecode(sptr, osub)                                                   \
+-  (osub).ssorient = (int) ((TRIANGLE_PTRINT) (sptr) & (TRIANGLE_PTRINT) 1l);      \
+-  (osub).ss = (subseg *)                                                      \
+-              ((TRIANGLE_PTRINT) (sptr) & ~ (TRIANGLE_PTRINT) 3l)
+-
+-/* sencode() compresses an oriented subsegment into a single pointer.  It    */
+-/*   relies on the assumption that all subsegments are aligned to two-byte   */
+-/*   boundaries, so the least significant bit of (osub).ss is zero.          */
+-
+-#define sencode(osub)                                                         \
+-  (subseg) ((TRIANGLE_PTRINT) (osub).ss | (TRIANGLE_PTRINT) (osub).ssorient)
+-
+-/* ssym() toggles the orientation of a subsegment.                           */
+-
+-#define ssym(osub1, osub2)                                                    \
+-  (osub2).ss = (osub1).ss;                                                    \
+-  (osub2).ssorient = 1 - (osub1).ssorient
+-
+-#define ssymself(osub)                                                        \
+-  (osub).ssorient = 1 - (osub).ssorient
+-
+-/* spivot() finds the other subsegment (from the same segment) that shares   */
+-/*   the same origin.                                                        */
+-
+-#define spivot(osub1, osub2)                                                  \
+-  sptr = (osub1).ss[(osub1).ssorient];                                        \
+-  sdecode(sptr, osub2)
+-
+-#define spivotself(osub)                                                      \
+-  sptr = (osub).ss[(osub).ssorient];                                          \
+-  sdecode(sptr, osub)
+-
+-/* snext() finds the next subsegment (from the same segment) in sequence;    */
+-/*   one whose origin is the input subsegment's destination.                 */
+-
+-#define snext(osub1, osub2)                                                   \
+-  sptr = (osub1).ss[1 - (osub1).ssorient];                                    \
+-  sdecode(sptr, osub2)
+-
+-#define snextself(osub)                                                       \
+-  sptr = (osub).ss[1 - (osub).ssorient];                                      \
+-  sdecode(sptr, osub)
+-
+-/* These primitives determine or set the origin or destination of a          */
+-/*   subsegment or the segment that includes it.                             */
+-
+-#define sorg(osub, vertexptr)                                                 \
+-  vertexptr = (vertex) (osub).ss[2 + (osub).ssorient]
+-
+-#define sdest(osub, vertexptr)                                                \
+-  vertexptr = (vertex) (osub).ss[3 - (osub).ssorient]
+-
+-#define setsorg(osub, vertexptr)                                              \
+-  (osub).ss[2 + (osub).ssorient] = (subseg) vertexptr
+-
+-#define setsdest(osub, vertexptr)                                             \
+-  (osub).ss[3 - (osub).ssorient] = (subseg) vertexptr
+-
+-#define segorg(osub, vertexptr)                                               \
+-  vertexptr = (vertex) (osub).ss[4 + (osub).ssorient]
+-
+-#define segdest(osub, vertexptr)                                              \
+-  vertexptr = (vertex) (osub).ss[5 - (osub).ssorient]
+-
+-#define setsegorg(osub, vertexptr)                                            \
+-  (osub).ss[4 + (osub).ssorient] = (subseg) vertexptr
+-
+-#define setsegdest(osub, vertexptr)                                           \
+-  (osub).ss[5 - (osub).ssorient] = (subseg) vertexptr
+-
+-/* These primitives read or set a boundary marker.  Boundary markers are     */
+-/*   used to hold user-defined tags for setting boundary conditions in       */
+-/*   finite element solvers.                                                 */
+-
+-#define mark(osub)  (* (int *) ((osub).ss + 8))
+-
+-#define setmark(osub, value)                                                  \
+-  * (int *) ((osub).ss + 8) = value
+-
+-/* Bond two subsegments together.                                            */
+-
+-#define sbond(osub1, osub2)                                                   \
+-  (osub1).ss[(osub1).ssorient] = sencode(osub2);                              \
+-  (osub2).ss[(osub2).ssorient] = sencode(osub1)
+-
+-/* Dissolve a subsegment bond (from one side).  Note that the other          */
+-/*   subsegment will still think it's connected to this subsegment.          */
+-
+-#define sdissolve(osub)                                                       \
+-  (osub).ss[(osub).ssorient] = (subseg) m->dummysub
+-
+-/* Copy a subsegment.                                                        */
+-
+-#define subsegcopy(osub1, osub2)                                              \
+-  (osub2).ss = (osub1).ss;                                                    \
+-  (osub2).ssorient = (osub1).ssorient
+-
+-/* Test for equality of subsegments.                                         */
+-
+-#define subsegequal(osub1, osub2)                                             \
+-  (((osub1).ss == (osub2).ss) &&                                              \
+-   ((osub1).ssorient == (osub2).ssorient))
+-
+-/* Check or set a subsegment's deallocation.  Its second pointer is set to   */
+-/*   NULL to indicate that it is not allocated.  (Its first pointer is used  */
+-/*   for the stack of dead items.)  Its third pointer (its first vertex)     */
+-/*   is set to NULL in case a `badsubseg' structure points to it.            */
+-
+-#define deadsubseg(sub)  ((sub)[1] == (subseg) NULL)
+-
+-#define killsubseg(sub)                                                       \
+-  (sub)[1] = (subseg) NULL;                                                   \
+-  (sub)[2] = (subseg) NULL
+-
+-/********* Primitives for interacting triangles and subsegments      *********/
+-/*                                                                           */
+-/*                                                                           */
+-
+-/* tspivot() finds a subsegment abutting a triangle.                         */
+-
+-#define tspivot(otri, osub)                                                   \
+-  sptr = (subseg) (otri).tri[6 + (otri).orient];                              \
+-  sdecode(sptr, osub)
+-
+-/* stpivot() finds a triangle abutting a subsegment.  It requires that the   */
+-/*   variable `ptr' of type `triangle' be defined.                           */
+-
+-#define stpivot(osub, otri)                                                   \
+-  ptr = (triangle) (osub).ss[6 + (osub).ssorient];                            \
+-  decode(ptr, otri)
+-
+-/* Bond a triangle to a subsegment.                                          */
+-
+-#define tsbond(otri, osub)                                                    \
+-  (otri).tri[6 + (otri).orient] = (triangle) sencode(osub);                   \
+-  (osub).ss[6 + (osub).ssorient] = (subseg) encode(otri)
+-
+-/* Dissolve a bond (from the triangle side).                                 */
+-
+-#define tsdissolve(otri)                                                      \
+-  (otri).tri[6 + (otri).orient] = (triangle) m->dummysub
+-
+-/* Dissolve a bond (from the subsegment side).                               */
+-
+-#define stdissolve(osub)                                                      \
+-  (osub).ss[6 + (osub).ssorient] = (subseg) m->dummytri
+-
+-/********* Primitives for vertices                                   *********/
+-/*                                                                           */
+-/*                                                                           */
+-
+-#define vertexmark(vx)  ((int *) (vx))[m->vertexmarkindex]
+-
+-#define setvertexmark(vx, value)                                              \
+-  ((int *) (vx))[m->vertexmarkindex] = value
+-
+-#define vertextype(vx)  ((int *) (vx))[m->vertexmarkindex + 1]
+-
+-#define setvertextype(vx, value)                                              \
+-  ((int *) (vx))[m->vertexmarkindex + 1] = value
+-
+-#define vertex2tri(vx)  ((triangle *) (vx))[m->vertex2triindex]
+-
+-#define setvertex2tri(vx, value)                                              \
+-  ((triangle *) (vx))[m->vertex2triindex] = value
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Mesh manipulation primitives end here                     *********/
+-
+-/********* User-defined triangle evaluation routine begins here      *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  triunsuitable()   Determine if a triangle is unsuitable, and thus must   */
+-/*                    be further refined.                                    */
+-/*                                                                           */
+-/*  You may write your own procedure that decides whether or not a selected  */
+-/*  triangle is too big (and needs to be refined).  There are two ways to do */
+-/*  this.                                                                    */
+-/*                                                                           */
+-/*  (1)  Modify the procedure `triunsuitable' below, then recompile          */
+-/*  Triangle.                                                                */
+-/*                                                                           */
+-/*  (2)  Define the symbol EXTERNAL_TEST (either by adding the definition    */
+-/*  to this file, or by using the appropriate compiler switch).  This way,   */
+-/*  you can compile triangle.c separately from your test.  Write your own    */
+-/*  `triunsuitable' procedure in a separate C file (using the same prototype */
+-/*  as below).  Compile it and link the object code with triangle.o.         */
+-/*                                                                           */
+-/*  This procedure returns 1 if the triangle is too large and should be      */
+-/*  refined; 0 otherwise.                                                    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef EXTERNAL_TEST
+-
+-int triunsuitable();
+-
+-#else /* not EXTERNAL_TEST */
+-
+-#ifdef ANSI_DECLARATORS
+-int triunsuitable(vertex triorg, vertex tridest, vertex triapex, REAL area)
+-#else /* not ANSI_DECLARATORS */
+-int triunsuitable(triorg, tridest, triapex, area)
+-vertex triorg;                              /* The triangle's origin vertex. */
+-vertex tridest;                        /* The triangle's destination vertex. */
+-vertex triapex;                               /* The triangle's apex vertex. */
+-REAL area;                                      /* The area of the triangle. */
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL dxoa, dxda, dxod;
+-  REAL dyoa, dyda, dyod;
+-  REAL oalen, dalen, odlen;
+-  REAL maxlen;
+-
+-  dxoa = triorg[0] - triapex[0];
+-  dyoa = triorg[1] - triapex[1];
+-  dxda = tridest[0] - triapex[0];
+-  dyda = tridest[1] - triapex[1];
+-  dxod = triorg[0] - tridest[0];
+-  dyod = triorg[1] - tridest[1];
+-  /* Find the squares of the lengths of the triangle's three edges. */
+-  oalen = dxoa * dxoa + dyoa * dyoa;
+-  dalen = dxda * dxda + dyda * dyda;
+-  odlen = dxod * dxod + dyod * dyod;
+-  /* Find the square of the length of the longest edge. */
+-  maxlen = (dalen > oalen) ? dalen : oalen;
+-  maxlen = (odlen > maxlen) ? odlen : maxlen;
+-
+-  if (maxlen > 0.05 * (triorg[0] * triorg[0] + triorg[1] * triorg[1]) + 0.02) {
+-    return 1;
+-  } else {
+-    return 0;
+-  }
+-}
+-
+-#endif /* not EXTERNAL_TEST */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* User-defined triangle evaluation routine ends here        *********/
+-
+-/********* Memory allocation and program exit wrappers begin here    *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-#ifdef ANSI_DECLARATORS
+-void triexit(int status)
+-#else /* not ANSI_DECLARATORS */
+-void triexit(status)
+-int status;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  exit(status);
+-}
+-
+-#ifdef ANSI_DECLARATORS
+-void *trimalloc(int size)
+-#else /* not ANSI_DECLARATORS */
+-void *trimalloc(size)
+-int size;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  void *memptr;
+-
+-  memptr = (void *) malloc((unsigned int) size);
+-  if (memptr == (void *) NULL) {
+-    printf("Error:  Out of memory.\n");
+-    triexit(1);
+-  }
+-  return(memptr);
+-}
+-
+-#ifdef ANSI_DECLARATORS
+-void trifree(void *memptr)
+-#else /* not ANSI_DECLARATORS */
+-void trifree(memptr)
+-void *memptr;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  free(memptr);
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Memory allocation and program exit wrappers end here      *********/
+-
+-/********* User interaction routines begin here                      *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  syntax()   Print list of command line switches.                          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-void syntax()
+-{
+-#ifdef CDT_ONLY
+-#ifdef REDUCED
+-  printf("triangle [-pAcjevngBPNEIOXzo_lQVh] input_file\n");
+-#else /* not REDUCED */
+-  printf("triangle [-pAcjevngBPNEIOXzo_iFlCQVh] input_file\n");
+-#endif /* not REDUCED */
+-#else /* not CDT_ONLY */
+-#ifdef REDUCED
+-  printf("triangle [-prq__a__uAcDjevngBPNEIOXzo_YS__lQVh] input_file\n");
+-#else /* not REDUCED */
+-  printf("triangle [-prq__a__uAcDjevngBPNEIOXzo_YS__iFlsCQVh] input_file\n");
+-#endif /* not REDUCED */
+-#endif /* not CDT_ONLY */
+-
+-  printf("    -p  Triangulates a Planar Straight Line Graph (.poly file).\n");
+-#ifndef CDT_ONLY
+-  printf("    -r  Refines a previously generated mesh.\n");
+-  printf(
+-    "    -q  Quality mesh generation.  A minimum angle may be specified.\n");
+-  printf("    -a  Applies a maximum triangle area constraint.\n");
+-  printf("    -u  Applies a user-defined triangle constraint.\n");
+-#endif /* not CDT_ONLY */
+-  printf(
+-    "    -A  Applies attributes to identify triangles in certain regions.\n");
+-  printf("    -c  Encloses the convex hull with segments.\n");
+-#ifndef CDT_ONLY
+-  printf("    -D  Conforming Delaunay:  all triangles are truly Delaunay.\n");
+-#endif /* not CDT_ONLY */
+-/*
+-  printf("    -w  Weighted Delaunay triangulation.\n");
+-  printf("    -W  Regular triangulation (lower hull of a height field).\n");
+-*/
+-  printf("    -j  Jettison unused vertices from output .node file.\n");
+-  printf("    -e  Generates an edge list.\n");
+-  printf("    -v  Generates a Voronoi diagram.\n");
+-  printf("    -n  Generates a list of triangle neighbors.\n");
+-  printf("    -g  Generates an .off file for Geomview.\n");
+-  printf("    -B  Suppresses output of boundary information.\n");
+-  printf("    -P  Suppresses output of .poly file.\n");
+-  printf("    -N  Suppresses output of .node file.\n");
+-  printf("    -E  Suppresses output of .ele file.\n");
+-  printf("    -I  Suppresses mesh iteration numbers.\n");
+-  printf("    -O  Ignores holes in .poly file.\n");
+-  printf("    -X  Suppresses use of exact arithmetic.\n");
+-  printf("    -z  Numbers all items starting from zero (rather than one).\n");
+-  printf("    -o2 Generates second-order subparametric elements.\n");
+-#ifndef CDT_ONLY
+-  printf("    -Y  Suppresses boundary segment splitting.\n");
+-  printf("    -S  Specifies maximum number of added Steiner points.\n");
+-#endif /* not CDT_ONLY */
+-#ifndef REDUCED
+-  printf("    -i  Uses incremental method, rather than divide-and-conquer.\n");
+-  printf("    -F  Uses Fortune's sweepline algorithm, rather than d-and-c.\n");
+-#endif /* not REDUCED */
+-  printf("    -l  Uses vertical cuts only, rather than alternating cuts.\n");
+-#ifndef REDUCED
+-#ifndef CDT_ONLY
+-  printf(
+-    "    -s  Force segments into mesh by splitting (instead of using CDT).\n");
+-#endif /* not CDT_ONLY */
+-  printf("    -C  Check consistency of final mesh.\n");
+-#endif /* not REDUCED */
+-  printf("    -Q  Quiet:  No terminal output except errors.\n");
+-  printf("    -V  Verbose:  Detailed information on what I'm doing.\n");
+-  printf("    -h  Help:  Detailed instructions for Triangle.\n");
+-  triexit(0);
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  info()   Print out complete instructions.                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-void info()
+-{
+-  printf("Triangle\n");
+-  printf(
+-"A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.\n");
+-  printf("Version 1.6\n\n");
+-  printf(
+-"Copyright 1993, 1995, 1997, 1998, 2002, 2005 Jonathan Richard Shewchuk\n");
+-  printf("2360 Woolsey #H / Berkeley, California 94705-1927\n");
+-  printf("Bugs/comments to jrs@cs.berkeley.edu\n");
+-  printf(
+-"Created as part of the Quake project (tools for earthquake simulation).\n");
+-  printf(
+-"Supported in part by NSF Grant CMS-9318163 and an NSERC 1967 Scholarship.\n");
+-  printf("There is no warranty whatsoever.  Use at your own risk.\n");
+-#ifdef SINGLE
+-  printf("This executable is compiled for single precision arithmetic.\n\n\n");
+-#else /* not SINGLE */
+-  printf("This executable is compiled for double precision arithmetic.\n\n\n");
+-#endif /* not SINGLE */
+-  printf(
+-"Triangle generates exact Delaunay triangulations, constrained Delaunay\n");
+-  printf(
+-"triangulations, conforming Delaunay triangulations, Voronoi diagrams, and\n");
+-  printf(
+-"high-quality triangular meshes.  The latter can be generated with no small\n"
+-);
+-  printf(
+-"or large angles, and are thus suitable for finite element analysis.  If no\n"
+-);
+-  printf(
+-"command line switch is specified, your .node input file is read, and the\n");
+-  printf(
+-"Delaunay triangulation is returned in .node and .ele output files.  The\n");
+-  printf("command syntax is:\n\n");
+-  printf("triangle [-prq__a__uAcDjevngBPNEIOXzo_YS__iFlsCQVh] input_file\n\n");
+-  printf(
+-"Underscores indicate that numbers may optionally follow certain switches.\n");
+-  printf(
+-"Do not leave any space between a switch and its numeric parameter.\n");
+-  printf(
+-"input_file must be a file with extension .node, or extension .poly if the\n");
+-  printf(
+-"-p switch is used.  If -r is used, you must supply .node and .ele files,\n");
+-  printf(
+-"and possibly a .poly file and an .area file as well.  The formats of these\n"
+-);
+-  printf("files are described below.\n\n");
+-  printf("Command Line Switches:\n\n");
+-  printf(
+-"    -p  Reads a Planar Straight Line Graph (.poly file), which can specify\n"
+-);
+-  printf(
+-"        vertices, segments, holes, regional attributes, and regional area\n");
+-  printf(
+-"        constraints.  Generates a constrained Delaunay triangulation (CDT)\n"
+-);
+-  printf(
+-"        fitting the input; or, if -s, -q, -a, or -u is used, a conforming\n");
+-  printf(
+-"        constrained Delaunay triangulation (CCDT).  If you want a truly\n");
+-  printf(
+-"        Delaunay (not just constrained Delaunay) triangulation, use -D as\n");
+-  printf(
+-"        well.  When -p is not used, Triangle reads a .node file by default.\n"
+-);
+-  printf(
+-"    -r  Refines a previously generated mesh.  The mesh is read from a .node\n"
+-);
+-  printf(
+-"        file and an .ele file.  If -p is also used, a .poly file is read\n");
+-  printf(
+-"        and used to constrain segments in the mesh.  If -a is also used\n");
+-  printf(
+-"        (with no number following), an .area file is read and used to\n");
+-  printf(
+-"        impose area constraints on the mesh.  Further details on refinement\n"
+-);
+-  printf("        appear below.\n");
+-  printf(
+-"    -q  Quality mesh generation by Delaunay refinement (a hybrid of Paul\n");
+-  printf(
+-"        Chew's and Jim Ruppert's algorithms).  Adds vertices to the mesh to\n"
+-);
+-  printf(
+-"        ensure that all angles are between 20 and 140 degrees.  An\n");
+-  printf(
+-"        alternative bound on the minimum angle, replacing 20 degrees, may\n");
+-  printf(
+-"        be specified after the `q'.  The specified angle may include a\n");
+-  printf(
+-"        decimal point, but not exponential notation.  Note that a bound of\n"
+-);
+-  printf(
+-"        theta degrees on the smallest angle also implies a bound of\n");
+-  printf(
+-"        (180 - 2 theta) on the largest angle.  If the minimum angle is 28.6\n"
+-);
+-  printf(
+-"        degrees or smaller, Triangle is mathematically guaranteed to\n");
+-  printf(
+-"        terminate (assuming infinite precision arithmetic--Triangle may\n");
+-  printf(
+-"        fail to terminate if you run out of precision).  In practice,\n");
+-  printf(
+-"        Triangle often succeeds for minimum angles up to 34 degrees.  For\n");
+-  printf(
+-"        some meshes, however, you might need to reduce the minimum angle to\n"
+-);
+-  printf(
+-"        avoid problems associated with insufficient floating-point\n");
+-  printf("        precision.\n");
+-  printf(
+-"    -a  Imposes a maximum triangle area.  If a number follows the `a', no\n");
+-  printf(
+-"        triangle is generated whose area is larger than that number.  If no\n"
+-);
+-  printf(
+-"        number is specified, an .area file (if -r is used) or .poly file\n");
+-  printf(
+-"        (if -r is not used) specifies a set of maximum area constraints.\n");
+-  printf(
+-"        An .area file contains a separate area constraint for each\n");
+-  printf(
+-"        triangle, and is useful for refining a finite element mesh based on\n"
+-);
+-  printf(
+-"        a posteriori error estimates.  A .poly file can optionally contain\n"
+-);
+-  printf(
+-"        an area constraint for each segment-bounded region, thereby\n");
+-  printf(
+-"        controlling triangle densities in a first triangulation of a PSLG.\n"
+-);
+-  printf(
+-"        You can impose both a fixed area constraint and a varying area\n");
+-  printf(
+-"        constraint by invoking the -a switch twice, once with and once\n");
+-  printf(
+-"        without a number following.  Each area specified may include a\n");
+-  printf("        decimal point.\n");
+-  printf(
+-"    -u  Imposes a user-defined constraint on triangle size.  There are two\n"
+-);
+-  printf(
+-"        ways to use this feature.  One is to edit the triunsuitable()\n");
+-  printf(
+-"        procedure in triangle.c to encode any constraint you like, then\n");
+-  printf(
+-"        recompile Triangle.  The other is to compile triangle.c with the\n");
+-  printf(
+-"        EXTERNAL_TEST symbol set (compiler switch -DEXTERNAL_TEST), then\n");
+-  printf(
+-"        link Triangle with a separate object file that implements\n");
+-  printf(
+-"        triunsuitable().  In either case, the -u switch causes the user-\n");
+-  printf("        defined test to be applied to every triangle.\n");
+-  printf(
+-"    -A  Assigns an additional floating-point attribute to each triangle\n");
+-  printf(
+-"        that identifies what segment-bounded region each triangle belongs\n");
+-  printf(
+-"        to.  Attributes are assigned to regions by the .poly file.  If a\n");
+-  printf(
+-"        region is not explicitly marked by the .poly file, triangles in\n");
+-  printf(
+-"        that region are assigned an attribute of zero.  The -A switch has\n");
+-  printf(
+-"        an effect only when the -p switch is used and the -r switch is not.\n"
+-);
+-  printf(
+-"    -c  Creates segments on the convex hull of the triangulation.  If you\n");
+-  printf(
+-"        are triangulating a vertex set, this switch causes a .poly file to\n"
+-);
+-  printf(
+-"        be written, containing all edges of the convex hull.  If you are\n");
+-  printf(
+-"        triangulating a PSLG, this switch specifies that the whole convex\n");
+-  printf(
+-"        hull of the PSLG should be triangulated, regardless of what\n");
+-  printf(
+-"        segments the PSLG has.  If you do not use this switch when\n");
+-  printf(
+-"        triangulating a PSLG, Triangle assumes that you have identified the\n"
+-);
+-  printf(
+-"        region to be triangulated by surrounding it with segments of the\n");
+-  printf(
+-"        input PSLG.  Beware:  if you are not careful, this switch can cause\n"
+-);
+-  printf(
+-"        the introduction of an extremely thin angle between a PSLG segment\n"
+-);
+-  printf(
+-"        and a convex hull segment, which can cause overrefinement (and\n");
+-  printf(
+-"        possibly failure if Triangle runs out of precision).  If you are\n");
+-  printf(
+-"        refining a mesh, the -c switch works differently:  it causes a\n");
+-  printf(
+-"        .poly file to be written containing the boundary edges of the mesh\n"
+-);
+-  printf("        (useful if no .poly file was read).\n");
+-  printf(
+-"    -D  Conforming Delaunay triangulation:  use this switch if you want to\n"
+-);
+-  printf(
+-"        ensure that all the triangles in the mesh are Delaunay, and not\n");
+-  printf(
+-"        merely constrained Delaunay; or if you want to ensure that all the\n"
+-);
+-  printf(
+-"        Voronoi vertices lie within the triangulation.  (Some finite volume\n"
+-);
+-  printf(
+-"        methods have this requirement.)  This switch invokes Ruppert's\n");
+-  printf(
+-"        original algorithm, which splits every subsegment whose diametral\n");
+-  printf(
+-"        circle is encroached.  It usually increases the number of vertices\n"
+-);
+-  printf("        and triangles.\n");
+-  printf(
+-"    -j  Jettisons vertices that are not part of the final triangulation\n");
+-  printf(
+-"        from the output .node file.  By default, Triangle copies all\n");
+-  printf(
+-"        vertices in the input .node file to the output .node file, in the\n");
+-  printf(
+-"        same order, so their indices do not change.  The -j switch prevents\n"
+-);
+-  printf(
+-"        duplicated input vertices, or vertices `eaten' by holes, from\n");
+-  printf(
+-"        appearing in the output .node file.  Thus, if two input vertices\n");
+-  printf(
+-"        have exactly the same coordinates, only the first appears in the\n");
+-  printf(
+-"        output.  If any vertices are jettisoned, the vertex numbering in\n");
+-  printf(
+-"        the output .node file differs from that of the input .node file.\n");
+-  printf(
+-"    -e  Outputs (to an .edge file) a list of edges of the triangulation.\n");
+-  printf(
+-"    -v  Outputs the Voronoi diagram associated with the triangulation.\n");
+-  printf(
+-"        Does not attempt to detect degeneracies, so some Voronoi vertices\n");
+-  printf(
+-"        may be duplicated.  See the discussion of Voronoi diagrams below.\n");
+-  printf(
+-"    -n  Outputs (to a .neigh file) a list of triangles neighboring each\n");
+-  printf("        triangle.\n");
+-  printf(
+-"    -g  Outputs the mesh to an Object File Format (.off) file, suitable for\n"
+-);
+-  printf("        viewing with the Geometry Center's Geomview package.\n");
+-  printf(
+-"    -B  No boundary markers in the output .node, .poly, and .edge output\n");
+-  printf(
+-"        files.  See the detailed discussion of boundary markers below.\n");
+-  printf(
+-"    -P  No output .poly file.  Saves disk space, but you lose the ability\n");
+-  printf(
+-"        to maintain constraining segments on later refinements of the mesh.\n"
+-);
+-  printf("    -N  No output .node file.\n");
+-  printf("    -E  No output .ele file.\n");
+-  printf(
+-"    -I  No iteration numbers.  Suppresses the output of .node and .poly\n");
+-  printf(
+-"        files, so your input files won't be overwritten.  (If your input is\n"
+-);
+-  printf(
+-"        a .poly file only, a .node file is written.)  Cannot be used with\n");
+-  printf(
+-"        the -r switch, because that would overwrite your input .ele file.\n");
+-  printf(
+-"        Shouldn't be used with the -q, -a, -u, or -s switch if you are\n");
+-  printf(
+-"        using a .node file for input, because no .node file is written, so\n"
+-);
+-  printf("        there is no record of any added Steiner points.\n");
+-  printf("    -O  No holes.  Ignores the holes in the .poly file.\n");
+-  printf(
+-"    -X  No exact arithmetic.  Normally, Triangle uses exact floating-point\n"
+-);
+-  printf(
+-"        arithmetic for certain tests if it thinks the inexact tests are not\n"
+-);
+-  printf(
+-"        accurate enough.  Exact arithmetic ensures the robustness of the\n");
+-  printf(
+-"        triangulation algorithms, despite floating-point roundoff error.\n");
+-  printf(
+-"        Disabling exact arithmetic with the -X switch causes a small\n");
+-  printf(
+-"        improvement in speed and creates the possibility that Triangle will\n"
+-);
+-  printf("        fail to produce a valid mesh.  Not recommended.\n");
+-  printf(
+-"    -z  Numbers all items starting from zero (rather than one).  Note that\n"
+-);
+-  printf(
+-"        this switch is normally overridden by the value used to number the\n"
+-);
+-  printf(
+-"        first vertex of the input .node or .poly file.  However, this\n");
+-  printf(
+-"        switch is useful when calling Triangle from another program.\n");
+-  printf(
+-"    -o2 Generates second-order subparametric elements with six nodes each.\n"
+-);
+-  printf(
+-"    -Y  No new vertices on the boundary.  This switch is useful when the\n");
+-  printf(
+-"        mesh boundary must be preserved so that it conforms to some\n");
+-  printf(
+-"        adjacent mesh.  Be forewarned that you will probably sacrifice much\n"
+-);
+-  printf(
+-"        of the quality of the mesh; Triangle will try, but the resulting\n");
+-  printf(
+-"        mesh may contain poorly shaped triangles.  Works well if all the\n");
+-  printf(
+-"        boundary vertices are closely spaced.  Specify this switch twice\n");
+-  printf(
+-"        (`-YY') to prevent all segment splitting, including internal\n");
+-  printf("        boundaries.\n");
+-  printf(
+-"    -S  Specifies the maximum number of Steiner points (vertices that are\n");
+-  printf(
+-"        not in the input, but are added to meet the constraints on minimum\n"
+-);
+-  printf(
+-"        angle and maximum area).  The default is to allow an unlimited\n");
+-  printf(
+-"        number.  If you specify this switch with no number after it,\n");
+-  printf(
+-"        the limit is set to zero.  Triangle always adds vertices at segment\n"
+-);
+-  printf(
+-"        intersections, even if it needs to use more vertices than the limit\n"
+-);
+-  printf(
+-"        you set.  When Triangle inserts segments by splitting (-s), it\n");
+-  printf(
+-"        always adds enough vertices to ensure that all the segments of the\n"
+-);
+-  printf("        PLSG are recovered, ignoring the limit if necessary.\n");
+-  printf(
+-"    -i  Uses an incremental rather than a divide-and-conquer algorithm to\n");
+-  printf(
+-"        construct a Delaunay triangulation.  Try it if the divide-and-\n");
+-  printf("        conquer algorithm fails.\n");
+-  printf(
+-"    -F  Uses Steven Fortune's sweepline algorithm to construct a Delaunay\n");
+-  printf(
+-"        triangulation.  Warning:  does not use exact arithmetic for all\n");
+-  printf("        calculations.  An exact result is not guaranteed.\n");
+-  printf(
+-"    -l  Uses only vertical cuts in the divide-and-conquer algorithm.  By\n");
+-  printf(
+-"        default, Triangle alternates between vertical and horizontal cuts,\n"
+-);
+-  printf(
+-"        which usually improve the speed except with vertex sets that are\n");
+-  printf(
+-"        small or short and wide.  This switch is primarily of theoretical\n");
+-  printf("        interest.\n");
+-  printf(
+-"    -s  Specifies that segments should be forced into the triangulation by\n"
+-);
+-  printf(
+-"        recursively splitting them at their midpoints, rather than by\n");
+-  printf(
+-"        generating a constrained Delaunay triangulation.  Segment splitting\n"
+-);
+-  printf(
+-"        is true to Ruppert's original algorithm, but can create needlessly\n"
+-);
+-  printf(
+-"        small triangles.  This switch is primarily of theoretical interest.\n"
+-);
+-  printf(
+-"    -C  Check the consistency of the final mesh.  Uses exact arithmetic for\n"
+-);
+-  printf(
+-"        checking, even if the -X switch is used.  Useful if you suspect\n");
+-  printf("        Triangle is buggy.\n");
+-  printf(
+-"    -Q  Quiet:  Suppresses all explanation of what Triangle is doing,\n");
+-  printf("        unless an error occurs.\n");
+-  printf(
+-"    -V  Verbose:  Gives detailed information about what Triangle is doing.\n"
+-);
+-  printf(
+-"        Add more `V's for increasing amount of detail.  `-V' is most\n");
+-  printf(
+-"        useful; itgives information on algorithmic progress and much more\n");
+-  printf(
+-"        detailed statistics.  `-VV' gives vertex-by-vertex details, and\n");
+-  printf(
+-"        prints so much that Triangle runs much more slowly.  `-VVVV' gives\n"
+-);
+-  printf("        information only a debugger could love.\n");
+-  printf("    -h  Help:  Displays these instructions.\n");
+-  printf("\n");
+-  printf("Definitions:\n");
+-  printf("\n");
+-  printf(
+-"  A Delaunay triangulation of a vertex set is a triangulation whose\n");
+-  printf(
+-"  vertices are the vertex set, that covers the convex hull of the vertex\n");
+-  printf(
+-"  set.  A Delaunay triangulation has the property that no vertex lies\n");
+-  printf(
+-"  inside the circumscribing circle (circle that passes through all three\n");
+-  printf("  vertices) of any triangle in the triangulation.\n\n");
+-  printf(
+-"  A Voronoi diagram of a vertex set is a subdivision of the plane into\n");
+-  printf(
+-"  polygonal cells (some of which may be unbounded, meaning infinitely\n");
+-  printf(
+-"  large), where each cell is the set of points in the plane that are closer\n"
+-);
+-  printf(
+-"  to some input vertex than to any other input vertex.  The Voronoi diagram\n"
+-);
+-  printf("  is a geometric dual of the Delaunay triangulation.\n\n");
+-  printf(
+-"  A Planar Straight Line Graph (PSLG) is a set of vertices and segments.\n");
+-  printf(
+-"  Segments are simply edges, whose endpoints are all vertices in the PSLG.\n"
+-);
+-  printf(
+-"  Segments may intersect each other only at their endpoints.  The file\n");
+-  printf("  format for PSLGs (.poly files) is described below.\n\n");
+-  printf(
+-"  A constrained Delaunay triangulation (CDT) of a PSLG is similar to a\n");
+-  printf(
+-"  Delaunay triangulation, but each PSLG segment is present as a single edge\n"
+-);
+-  printf(
+-"  of the CDT.  (A constrained Delaunay triangulation is not truly a\n");
+-  printf(
+-"  Delaunay triangulation, because some of its triangles might not be\n");
+-  printf(
+-"  Delaunay.)  By definition, a CDT does not have any vertices other than\n");
+-  printf(
+-"  those specified in the input PSLG.  Depending on context, a CDT might\n");
+-  printf(
+-"  cover the convex hull of the PSLG, or it might cover only a segment-\n");
+-  printf("  bounded region (e.g. a polygon).\n\n");
+-  printf(
+-"  A conforming Delaunay triangulation of a PSLG is a triangulation in which\n"
+-);
+-  printf(
+-"  each triangle is truly Delaunay, and each PSLG segment is represented by\n"
+-);
+-  printf(
+-"  a linear contiguous sequence of edges of the triangulation.  New vertices\n"
+-);
+-  printf(
+-"  (not part of the PSLG) may appear, and each input segment may have been\n");
+-  printf(
+-"  subdivided into shorter edges (subsegments) by these additional vertices.\n"
+-);
+-  printf(
+-"  The new vertices are frequently necessary to maintain the Delaunay\n");
+-  printf("  property while ensuring that every segment is represented.\n\n");
+-  printf(
+-"  A conforming constrained Delaunay triangulation (CCDT) of a PSLG is a\n");
+-  printf(
+-"  triangulation of a PSLG whose triangles are constrained Delaunay.  New\n");
+-  printf("  vertices may appear, and input segments may be subdivided into\n");
+-  printf(
+-"  subsegments, but not to guarantee that segments are respected; rather, to\n"
+-);
+-  printf(
+-"  improve the quality of the triangles.  The high-quality meshes produced\n");
+-  printf(
+-"  by the -q switch are usually CCDTs, but can be made conforming Delaunay\n");
+-  printf("  with the -D switch.\n\n");
+-  printf("File Formats:\n\n");
+-  printf(
+-"  All files may contain comments prefixed by the character '#'.  Vertices,\n"
+-);
+-  printf(
+-"  triangles, edges, holes, and maximum area constraints must be numbered\n");
+-  printf(
+-"  consecutively, starting from either 1 or 0.  Whichever you choose, all\n");
+-  printf(
+-"  input files must be consistent; if the vertices are numbered from 1, so\n");
+-  printf(
+-"  must be all other objects.  Triangle automatically detects your choice\n");
+-  printf(
+-"  while reading the .node (or .poly) file.  (When calling Triangle from\n");
+-  printf(
+-"  another program, use the -z switch if you wish to number objects from\n");
+-  printf("  zero.)  Examples of these file formats are given below.\n\n");
+-  printf("  .node files:\n");
+-  printf(
+-"    First line:  <# of vertices> <dimension (must be 2)> <# of attributes>\n"
+-);
+-  printf(
+-"                                           <# of boundary markers (0 or 1)>\n"
+-);
+-  printf(
+-"    Remaining lines:  <vertex #> <x> <y> [attributes] [boundary marker]\n");
+-  printf("\n");
+-  printf(
+-"    The attributes, which are typically floating-point values of physical\n");
+-  printf(
+-"    quantities (such as mass or conductivity) associated with the nodes of\n"
+-);
+-  printf(
+-"    a finite element mesh, are copied unchanged to the output mesh.  If -q,\n"
+-);
+-  printf(
+-"    -a, -u, -D, or -s is selected, each new Steiner point added to the mesh\n"
+-);
+-  printf("    has attributes assigned to it by linear interpolation.\n\n");
+-  printf(
+-"    If the fourth entry of the first line is `1', the last column of the\n");
+-  printf(
+-"    remainder of the file is assumed to contain boundary markers.  Boundary\n"
+-);
+-  printf(
+-"    markers are used to identify boundary vertices and vertices resting on\n"
+-);
+-  printf(
+-"    PSLG segments; a complete description appears in a section below.  The\n"
+-);
+-  printf(
+-"    .node file produced by Triangle contains boundary markers in the last\n");
+-  printf("    column unless they are suppressed by the -B switch.\n\n");
+-  printf("  .ele files:\n");
+-  printf(
+-"    First line:  <# of triangles> <nodes per triangle> <# of attributes>\n");
+-  printf(
+-"    Remaining lines:  <triangle #> <node> <node> <node> ... [attributes]\n");
+-  printf("\n");
+-  printf(
+-"    Nodes are indices into the corresponding .node file.  The first three\n");
+-  printf(
+-"    nodes are the corner vertices, and are listed in counterclockwise order\n"
+-);
+-  printf(
+-"    around each triangle.  (The remaining nodes, if any, depend on the type\n"
+-);
+-  printf("    of finite element used.)\n\n");
+-  printf(
+-"    The attributes are just like those of .node files.  Because there is no\n"
+-);
+-  printf(
+-"    simple mapping from input to output triangles, Triangle attempts to\n");
+-  printf(
+-"    interpolate attributes, and may cause a lot of diffusion of attributes\n"
+-);
+-  printf(
+-"    among nearby triangles as the triangulation is refined.  Attributes do\n"
+-);
+-  printf("    not diffuse across segments, so attributes used to identify\n");
+-  printf("    segment-bounded regions remain intact.\n\n");
+-  printf(
+-"    In .ele files produced by Triangle, each triangular element has three\n");
+-  printf(
+-"    nodes (vertices) unless the -o2 switch is used, in which case\n");
+-  printf(
+-"    subparametric quadratic elements with six nodes each are generated.\n");
+-  printf(
+-"    The first three nodes are the corners in counterclockwise order, and\n");
+-  printf(
+-"    the fourth, fifth, and sixth nodes lie on the midpoints of the edges\n");
+-  printf(
+-"    opposite the first, second, and third vertices, respectively.\n");
+-  printf("\n");
+-  printf("  .poly files:\n");
+-  printf(
+-"    First line:  <# of vertices> <dimension (must be 2)> <# of attributes>\n"
+-);
+-  printf(
+-"                                           <# of boundary markers (0 or 1)>\n"
+-);
+-  printf(
+-"    Following lines:  <vertex #> <x> <y> [attributes] [boundary marker]\n");
+-  printf("    One line:  <# of segments> <# of boundary markers (0 or 1)>\n");
+-  printf(
+-"    Following lines:  <segment #> <endpoint> <endpoint> [boundary marker]\n");
+-  printf("    One line:  <# of holes>\n");
+-  printf("    Following lines:  <hole #> <x> <y>\n");
+-  printf(
+-"    Optional line:  <# of regional attributes and/or area constraints>\n");
+-  printf(
+-"    Optional following lines:  <region #> <x> <y> <attribute> <max area>\n");
+-  printf("\n");
+-  printf(
+-"    A .poly file represents a PSLG, as well as some additional information.\n"
+-);
+-  printf(
+-"    The first section lists all the vertices, and is identical to the\n");
+-  printf(
+-"    format of .node files.  <# of vertices> may be set to zero to indicate\n"
+-);
+-  printf(
+-"    that the vertices are listed in a separate .node file; .poly files\n");
+-  printf(
+-"    produced by Triangle always have this format.  A vertex set represented\n"
+-);
+-  printf(
+-"    this way has the advantage that it may easily be triangulated with or\n");
+-  printf(
+-"    without segments (depending on whether the -p switch is invoked).\n");
+-  printf("\n");
+-  printf(
+-"    The second section lists the segments.  Segments are edges whose\n");
+-  printf(
+-"    presence in the triangulation is enforced.  (Depending on the choice of\n"
+-);
+-  printf(
+-"    switches, segment might be subdivided into smaller edges).  Each\n");
+-  printf(
+-"    segment is specified by listing the indices of its two endpoints.  This\n"
+-);
+-  printf(
+-"    means that you must include its endpoints in the vertex list.  Each\n");
+-  printf("    segment, like each point, may have a boundary marker.\n\n");
+-  printf(
+-"    If -q, -a, -u, and -s are not selected, Triangle produces a constrained\n"
+-);
+-  printf(
+-"    Delaunay triangulation (CDT), in which each segment appears as a single\n"
+-);
+-  printf(
+-"    edge in the triangulation.  If -q, -a, -u, or -s is selected, Triangle\n"
+-);
+-  printf(
+-"    produces a conforming constrained Delaunay triangulation (CCDT), in\n");
+-  printf(
+-"    which segments may be subdivided into smaller edges.  If -D is\n");
+-  printf(
+-"    selected, Triangle produces a conforming Delaunay triangulation, so\n");
+-  printf(
+-"    that every triangle is Delaunay, and not just constrained Delaunay.\n");
+-  printf("\n");
+-  printf(
+-"    The third section lists holes (and concavities, if -c is selected) in\n");
+-  printf(
+-"    the triangulation.  Holes are specified by identifying a point inside\n");
+-  printf(
+-"    each hole.  After the triangulation is formed, Triangle creates holes\n");
+-  printf(
+-"    by eating triangles, spreading out from each hole point until its\n");
+-  printf(
+-"    progress is blocked by segments in the PSLG.  You must be careful to\n");
+-  printf(
+-"    enclose each hole in segments, or your whole triangulation might be\n");
+-  printf(
+-"    eaten away.  If the two triangles abutting a segment are eaten, the\n");
+-  printf(
+-"    segment itself is also eaten.  Do not place a hole directly on a\n");
+-  printf("    segment; if you do, Triangle chooses one side of the segment\n");
+-  printf("    arbitrarily.\n\n");
+-  printf(
+-"    The optional fourth section lists regional attributes (to be assigned\n");
+-  printf(
+-"    to all triangles in a region) and regional constraints on the maximum\n");
+-  printf(
+-"    triangle area.  Triangle reads this section only if the -A switch is\n");
+-  printf(
+-"    used or the -a switch is used without a number following it, and the -r\n"
+-);
+-  printf(
+-"    switch is not used.  Regional attributes and area constraints are\n");
+-  printf(
+-"    propagated in the same manner as holes:  you specify a point for each\n");
+-  printf(
+-"    attribute and/or constraint, and the attribute and/or constraint\n");
+-  printf(
+-"    affects the whole region (bounded by segments) containing the point.\n");
+-  printf(
+-"    If two values are written on a line after the x and y coordinate, the\n");
+-  printf(
+-"    first such value is assumed to be a regional attribute (but is only\n");
+-  printf(
+-"    applied if the -A switch is selected), and the second value is assumed\n"
+-);
+-  printf(
+-"    to be a regional area constraint (but is only applied if the -a switch\n"
+-);
+-  printf(
+-"    is selected).  You may specify just one value after the coordinates,\n");
+-  printf(
+-"    which can serve as both an attribute and an area constraint, depending\n"
+-);
+-  printf(
+-"    on the choice of switches.  If you are using the -A and -a switches\n");
+-  printf(
+-"    simultaneously and wish to assign an attribute to some region without\n");
+-  printf("    imposing an area constraint, use a negative maximum area.\n\n");
+-  printf(
+-"    When a triangulation is created from a .poly file, you must either\n");
+-  printf(
+-"    enclose the entire region to be triangulated in PSLG segments, or\n");
+-  printf(
+-"    use the -c switch, which automatically creates extra segments that\n");
+-  printf(
+-"    enclose the convex hull of the PSLG.  If you do not use the -c switch,\n"
+-);
+-  printf(
+-"    Triangle eats all triangles that are not enclosed by segments; if you\n");
+-  printf(
+-"    are not careful, your whole triangulation may be eaten away.  If you do\n"
+-);
+-  printf(
+-"    use the -c switch, you can still produce concavities by the appropriate\n"
+-);
+-  printf(
+-"    placement of holes just inside the boundary of the convex hull.\n");
+-  printf("\n");
+-  printf(
+-"    An ideal PSLG has no intersecting segments, nor any vertices that lie\n");
+-  printf(
+-"    upon segments (except, of course, the endpoints of each segment).  You\n"
+-);
+-  printf(
+-"    aren't required to make your .poly files ideal, but you should be aware\n"
+-);
+-  printf(
+-"    of what can go wrong.  Segment intersections are relatively safe--\n");
+-  printf(
+-"    Triangle calculates the intersection points for you and adds them to\n");
+-  printf(
+-"    the triangulation--as long as your machine's floating-point precision\n");
+-  printf(
+-"    doesn't become a problem.  You are tempting the fates if you have three\n"
+-);
+-  printf(
+-"    segments that cross at the same location, and expect Triangle to figure\n"
+-);
+-  printf(
+-"    out where the intersection point is.  Thanks to floating-point roundoff\n"
+-);
+-  printf(
+-"    error, Triangle will probably decide that the three segments intersect\n"
+-);
+-  printf(
+-"    at three different points, and you will find a minuscule triangle in\n");
+-  printf(
+-"    your output--unless Triangle tries to refine the tiny triangle, uses\n");
+-  printf(
+-"    up the last bit of machine precision, and fails to terminate at all.\n");
+-  printf(
+-"    You're better off putting the intersection point in the input files,\n");
+-  printf(
+-"    and manually breaking up each segment into two.  Similarly, if you\n");
+-  printf(
+-"    place a vertex at the middle of a segment, and hope that Triangle will\n"
+-);
+-  printf(
+-"    break up the segment at that vertex, you might get lucky.  On the other\n"
+-);
+-  printf(
+-"    hand, Triangle might decide that the vertex doesn't lie precisely on\n");
+-  printf(
+-"    the segment, and you'll have a needle-sharp triangle in your output--or\n"
+-);
+-  printf("    a lot of tiny triangles if you're generating a quality mesh.\n");
+-  printf("\n");
+-  printf(
+-"    When Triangle reads a .poly file, it also writes a .poly file, which\n");
+-  printf(
+-"    includes all the subsegments--the edges that are parts of input\n");
+-  printf(
+-"    segments.  If the -c switch is used, the output .poly file also\n");
+-  printf(
+-"    includes all of the edges on the convex hull.  Hence, the output .poly\n"
+-);
+-  printf(
+-"    file is useful for finding edges associated with input segments and for\n"
+-);
+-  printf(
+-"    setting boundary conditions in finite element simulations.  Moreover,\n");
+-  printf(
+-"    you will need the output .poly file if you plan to refine the output\n");
+-  printf(
+-"    mesh, and don't want segments to be missing in later triangulations.\n");
+-  printf("\n");
+-  printf("  .area files:\n");
+-  printf("    First line:  <# of triangles>\n");
+-  printf("    Following lines:  <triangle #> <maximum area>\n");
+-  printf("\n");
+-  printf(
+-"    An .area file associates with each triangle a maximum area that is used\n"
+-);
+-  printf(
+-"    for mesh refinement.  As with other file formats, every triangle must\n");
+-  printf(
+-"    be represented, and the triangles must be numbered consecutively.  A\n");
+-  printf(
+-"    triangle may be left unconstrained by assigning it a negative maximum\n");
+-  printf("    area.\n\n");
+-  printf("  .edge files:\n");
+-  printf("    First line:  <# of edges> <# of boundary markers (0 or 1)>\n");
+-  printf(
+-"    Following lines:  <edge #> <endpoint> <endpoint> [boundary marker]\n");
+-  printf("\n");
+-  printf(
+-"    Endpoints are indices into the corresponding .node file.  Triangle can\n"
+-);
+-  printf(
+-"    produce .edge files (use the -e switch), but cannot read them.  The\n");
+-  printf(
+-"    optional column of boundary markers is suppressed by the -B switch.\n");
+-  printf("\n");
+-  printf(
+-"    In Voronoi diagrams, one also finds a special kind of edge that is an\n");
+-  printf(
+-"    infinite ray with only one endpoint.  For these edges, a different\n");
+-  printf("    format is used:\n\n");
+-  printf("        <edge #> <endpoint> -1 <direction x> <direction y>\n\n");
+-  printf(
+-"    The `direction' is a floating-point vector that indicates the direction\n"
+-);
+-  printf("    of the infinite ray.\n\n");
+-  printf("  .neigh files:\n");
+-  printf(
+-"    First line:  <# of triangles> <# of neighbors per triangle (always 3)>\n"
+-);
+-  printf(
+-"    Following lines:  <triangle #> <neighbor> <neighbor> <neighbor>\n");
+-  printf("\n");
+-  printf(
+-"    Neighbors are indices into the corresponding .ele file.  An index of -1\n"
+-);
+-  printf(
+-"    indicates no neighbor (because the triangle is on an exterior\n");
+-  printf(
+-"    boundary).  The first neighbor of triangle i is opposite the first\n");
+-  printf("    corner of triangle i, and so on.\n\n");
+-  printf(
+-"    Triangle can produce .neigh files (use the -n switch), but cannot read\n"
+-);
+-  printf("    them.\n\n");
+-  printf("Boundary Markers:\n\n");
+-  printf(
+-"  Boundary markers are tags used mainly to identify which output vertices\n");
+-  printf(
+-"  and edges are associated with which PSLG segment, and to identify which\n");
+-  printf(
+-"  vertices and edges occur on a boundary of the triangulation.  A common\n");
+-  printf(
+-"  use is to determine where boundary conditions should be applied to a\n");
+-  printf(
+-"  finite element mesh.  You can prevent boundary markers from being written\n"
+-);
+-  printf("  into files produced by Triangle by using the -B switch.\n\n");
+-  printf(
+-"  The boundary marker associated with each segment in an output .poly file\n"
+-);
+-  printf("  and each edge in an output .edge file is chosen as follows:\n");
+-  printf(
+-"    - If an output edge is part or all of a PSLG segment with a nonzero\n");
+-  printf(
+-"      boundary marker, then the edge is assigned the same marker.\n");
+-  printf(
+-"    - Otherwise, if the edge lies on a boundary of the triangulation\n");
+-  printf(
+-"      (even the boundary of a hole), then the edge is assigned the marker\n");
+-  printf("      one (1).\n");
+-  printf("    - Otherwise, the edge is assigned the marker zero (0).\n");
+-  printf(
+-"  The boundary marker associated with each vertex in an output .node file\n");
+-  printf("  is chosen as follows:\n");
+-  printf(
+-"    - If a vertex is assigned a nonzero boundary marker in the input file,\n"
+-);
+-  printf(
+-"      then it is assigned the same marker in the output .node file.\n");
+-  printf(
+-"    - Otherwise, if the vertex lies on a PSLG segment (even if it is an\n");
+-  printf(
+-"      endpoint of the segment) with a nonzero boundary marker, then the\n");
+-  printf(
+-"      vertex is assigned the same marker.  If the vertex lies on several\n");
+-  printf("      such segments, one of the markers is chosen arbitrarily.\n");
+-  printf(
+-"    - Otherwise, if the vertex occurs on a boundary of the triangulation,\n");
+-  printf("      then the vertex is assigned the marker one (1).\n");
+-  printf("    - Otherwise, the vertex is assigned the marker zero (0).\n");
+-  printf("\n");
+-  printf(
+-"  If you want Triangle to determine for you which vertices and edges are on\n"
+-);
+-  printf(
+-"  the boundary, assign them the boundary marker zero (or use no markers at\n"
+-);
+-  printf(
+-"  all) in your input files.  In the output files, all boundary vertices,\n");
+-  printf("  edges, and segments will be assigned the value one.\n\n");
+-  printf("Triangulation Iteration Numbers:\n\n");
+-  printf(
+-"  Because Triangle can read and refine its own triangulations, input\n");
+-  printf(
+-"  and output files have iteration numbers.  For instance, Triangle might\n");
+-  printf(
+-"  read the files mesh.3.node, mesh.3.ele, and mesh.3.poly, refine the\n");
+-  printf(
+-"  triangulation, and output the files mesh.4.node, mesh.4.ele, and\n");
+-  printf("  mesh.4.poly.  Files with no iteration number are treated as if\n");
+-  printf(
+-"  their iteration number is zero; hence, Triangle might read the file\n");
+-  printf(
+-"  points.node, triangulate it, and produce the files points.1.node and\n");
+-  printf("  points.1.ele.\n\n");
+-  printf(
+-"  Iteration numbers allow you to create a sequence of successively finer\n");
+-  printf(
+-"  meshes suitable for multigrid methods.  They also allow you to produce a\n"
+-);
+-  printf(
+-"  sequence of meshes using error estimate-driven mesh refinement.\n");
+-  printf("\n");
+-  printf(
+-"  If you're not using refinement or quality meshing, and you don't like\n");
+-  printf(
+-"  iteration numbers, use the -I switch to disable them.  This switch also\n");
+-  printf(
+-"  disables output of .node and .poly files to prevent your input files from\n"
+-);
+-  printf(
+-"  being overwritten.  (If the input is a .poly file that contains its own\n");
+-  printf(
+-"  points, a .node file is written.  This can be quite convenient for\n");
+-  printf("  computing CDTs or quality meshes.)\n\n");
+-  printf("Examples of How to Use Triangle:\n\n");
+-  printf(
+-"  `triangle dots' reads vertices from dots.node, and writes their Delaunay\n"
+-);
+-  printf(
+-"  triangulation to dots.1.node and dots.1.ele.  (dots.1.node is identical\n");
+-  printf(
+-"  to dots.node.)  `triangle -I dots' writes the triangulation to dots.ele\n");
+-  printf(
+-"  instead.  (No additional .node file is needed, so none is written.)\n");
+-  printf("\n");
+-  printf(
+-"  `triangle -pe object.1' reads a PSLG from object.1.poly (and possibly\n");
+-  printf(
+-"  object.1.node, if the vertices are omitted from object.1.poly) and writes\n"
+-);
+-  printf(
+-"  its constrained Delaunay triangulation to object.2.node and object.2.ele.\n"
+-);
+-  printf(
+-"  The segments are copied to object.2.poly, and all edges are written to\n");
+-  printf("  object.2.edge.\n\n");
+-  printf(
+-"  `triangle -pq31.5a.1 object' reads a PSLG from object.poly (and possibly\n"
+-);
+-  printf(
+-"  object.node), generates a mesh whose angles are all between 31.5 and 117\n"
+-);
+-  printf(
+-"  degrees and whose triangles all have areas of 0.1 or less, and writes the\n"
+-);
+-  printf(
+-"  mesh to object.1.node and object.1.ele.  Each segment may be broken up\n");
+-  printf("  into multiple subsegments; these are written to object.1.poly.\n");
+-  printf("\n");
+-  printf(
+-"  Here is a sample file `box.poly' describing a square with a square hole:\n"
+-);
+-  printf("\n");
+-  printf(
+-"    # A box with eight vertices in 2D, no attributes, one boundary marker.\n"
+-);
+-  printf("    8 2 0 1\n");
+-  printf("     # Outer box has these vertices:\n");
+-  printf("     1   0 0   0\n");
+-  printf("     2   0 3   0\n");
+-  printf("     3   3 0   0\n");
+-  printf("     4   3 3   33     # A special marker for this vertex.\n");
+-  printf("     # Inner square has these vertices:\n");
+-  printf("     5   1 1   0\n");
+-  printf("     6   1 2   0\n");
+-  printf("     7   2 1   0\n");
+-  printf("     8   2 2   0\n");
+-  printf("    # Five segments with boundary markers.\n");
+-  printf("    5 1\n");
+-  printf("     1   1 2   5      # Left side of outer box.\n");
+-  printf("     # Square hole has these segments:\n");
+-  printf("     2   5 7   0\n");
+-  printf("     3   7 8   0\n");
+-  printf("     4   8 6   10\n");
+-  printf("     5   6 5   0\n");
+-  printf("    # One hole in the middle of the inner square.\n");
+-  printf("    1\n");
+-  printf("     1   1.5 1.5\n");
+-  printf("\n");
+-  printf(
+-"  Note that some segments are missing from the outer square, so you must\n");
+-  printf(
+-"  use the `-c' switch.  After `triangle -pqc box.poly', here is the output\n"
+-);
+-  printf(
+-"  file `box.1.node', with twelve vertices.  The last four vertices were\n");
+-  printf(
+-"  added to meet the angle constraint.  Vertices 1, 2, and 9 have markers\n");
+-  printf(
+-"  from segment 1.  Vertices 6 and 8 have markers from segment 4.  All the\n");
+-  printf(
+-"  other vertices but 4 have been marked to indicate that they lie on a\n");
+-  printf("  boundary.\n\n");
+-  printf("    12  2  0  1\n");
+-  printf("       1    0   0      5\n");
+-  printf("       2    0   3      5\n");
+-  printf("       3    3   0      1\n");
+-  printf("       4    3   3     33\n");
+-  printf("       5    1   1      1\n");
+-  printf("       6    1   2     10\n");
+-  printf("       7    2   1      1\n");
+-  printf("       8    2   2     10\n");
+-  printf("       9    0   1.5    5\n");
+-  printf("      10    1.5   0    1\n");
+-  printf("      11    3   1.5    1\n");
+-  printf("      12    1.5   3    1\n");
+-  printf("    # Generated by triangle -pqc box.poly\n");
+-  printf("\n");
+-  printf("  Here is the output file `box.1.ele', with twelve triangles.\n");
+-  printf("\n");
+-  printf("    12  3  0\n");
+-  printf("       1     5   6   9\n");
+-  printf("       2    10   3   7\n");
+-  printf("       3     6   8  12\n");
+-  printf("       4     9   1   5\n");
+-  printf("       5     6   2   9\n");
+-  printf("       6     7   3  11\n");
+-  printf("       7    11   4   8\n");
+-  printf("       8     7   5  10\n");
+-  printf("       9    12   2   6\n");
+-  printf("      10     8   7  11\n");
+-  printf("      11     5   1  10\n");
+-  printf("      12     8   4  12\n");
+-  printf("    # Generated by triangle -pqc box.poly\n\n");
+-  printf(
+-"  Here is the output file `box.1.poly'.  Note that segments have been added\n"
+-);
+-  printf(
+-"  to represent the convex hull, and some segments have been subdivided by\n");
+-  printf(
+-"  newly added vertices.  Note also that <# of vertices> is set to zero to\n");
+-  printf("  indicate that the vertices should be read from the .node file.\n");
+-  printf("\n");
+-  printf("    0  2  0  1\n");
+-  printf("    12  1\n");
+-  printf("       1     1   9     5\n");
+-  printf("       2     5   7     1\n");
+-  printf("       3     8   7     1\n");
+-  printf("       4     6   8    10\n");
+-  printf("       5     5   6     1\n");
+-  printf("       6     3  10     1\n");
+-  printf("       7     4  11     1\n");
+-  printf("       8     2  12     1\n");
+-  printf("       9     9   2     5\n");
+-  printf("      10    10   1     1\n");
+-  printf("      11    11   3     1\n");
+-  printf("      12    12   4     1\n");
+-  printf("    1\n");
+-  printf("       1   1.5 1.5\n");
+-  printf("    # Generated by triangle -pqc box.poly\n");
+-  printf("\n");
+-  printf("Refinement and Area Constraints:\n");
+-  printf("\n");
+-  printf(
+-"  The -r switch causes a mesh (.node and .ele files) to be read and\n");
+-  printf(
+-"  refined.  If the -p switch is also used, a .poly file is read and used to\n"
+-);
+-  printf(
+-"  specify edges that are constrained and cannot be eliminated (although\n");
+-  printf(
+-"  they can be subdivided into smaller edges) by the refinement process.\n");
+-  printf("\n");
+-  printf(
+-"  When you refine a mesh, you generally want to impose tighter constraints.\n"
+-);
+-  printf(
+-"  One way to accomplish this is to use -q with a larger angle, or -a\n");
+-  printf(
+-"  followed by a smaller area than you used to generate the mesh you are\n");
+-  printf(
+-"  refining.  Another way to do this is to create an .area file, which\n");
+-  printf(
+-"  specifies a maximum area for each triangle, and use the -a switch\n");
+-  printf(
+-"  (without a number following).  Each triangle's area constraint is applied\n"
+-);
+-  printf(
+-"  to that triangle.  Area constraints tend to diffuse as the mesh is\n");
+-  printf(
+-"  refined, so if there are large variations in area constraint between\n");
+-  printf(
+-"  adjacent triangles, you may not get the results you want.  In that case,\n"
+-);
+-  printf(
+-"  consider instead using the -u switch and writing a C procedure that\n");
+-  printf("  determines which triangles are too large.\n\n");
+-  printf(
+-"  If you are refining a mesh composed of linear (three-node) elements, the\n"
+-);
+-  printf(
+-"  output mesh contains all the nodes present in the input mesh, in the same\n"
+-);
+-  printf(
+-"  order, with new nodes added at the end of the .node file.  However, the\n");
+-  printf(
+-"  refinement is not hierarchical: there is no guarantee that each output\n");
+-  printf(
+-"  element is contained in a single input element.  Often, an output element\n"
+-);
+-  printf(
+-"  can overlap two or three input elements, and some input edges are not\n");
+-  printf(
+-"  present in the output mesh.  Hence, a sequence of refined meshes forms a\n"
+-);
+-  printf(
+-"  hierarchy of nodes, but not a hierarchy of elements.  If you refine a\n");
+-  printf(
+-"  mesh of higher-order elements, the hierarchical property applies only to\n"
+-);
+-  printf(
+-"  the nodes at the corners of an element; the midpoint nodes on each edge\n");
+-  printf("  are discarded before the mesh is refined.\n\n");
+-  printf(
+-"  Maximum area constraints in .poly files operate differently from those in\n"
+-);
+-  printf(
+-"  .area files.  A maximum area in a .poly file applies to the whole\n");
+-  printf(
+-"  (segment-bounded) region in which a point falls, whereas a maximum area\n");
+-  printf(
+-"  in an .area file applies to only one triangle.  Area constraints in .poly\n"
+-);
+-  printf(
+-"  files are used only when a mesh is first generated, whereas area\n");
+-  printf(
+-"  constraints in .area files are used only to refine an existing mesh, and\n"
+-);
+-  printf(
+-"  are typically based on a posteriori error estimates resulting from a\n");
+-  printf("  finite element simulation on that mesh.\n\n");
+-  printf(
+-"  `triangle -rq25 object.1' reads object.1.node and object.1.ele, then\n");
+-  printf(
+-"  refines the triangulation to enforce a 25 degree minimum angle, and then\n"
+-);
+-  printf(
+-"  writes the refined triangulation to object.2.node and object.2.ele.\n");
+-  printf("\n");
+-  printf(
+-"  `triangle -rpaa6.2 z.3' reads z.3.node, z.3.ele, z.3.poly, and z.3.area.\n"
+-);
+-  printf(
+-"  After reconstructing the mesh and its subsegments, Triangle refines the\n");
+-  printf(
+-"  mesh so that no triangle has area greater than 6.2, and furthermore the\n");
+-  printf(
+-"  triangles satisfy the maximum area constraints in z.3.area.  No angle\n");
+-  printf(
+-"  bound is imposed at all.  The output is written to z.4.node, z.4.ele, and\n"
+-);
+-  printf("  z.4.poly.\n\n");
+-  printf(
+-"  The sequence `triangle -qa1 x', `triangle -rqa.3 x.1', `triangle -rqa.1\n");
+-  printf(
+-"  x.2' creates a sequence of successively finer meshes x.1, x.2, and x.3,\n");
+-  printf("  suitable for multigrid.\n\n");
+-  printf("Convex Hulls and Mesh Boundaries:\n\n");
+-  printf(
+-"  If the input is a vertex set (not a PSLG), Triangle produces its convex\n");
+-  printf(
+-"  hull as a by-product in the output .poly file if you use the -c switch.\n");
+-  printf(
+-"  There are faster algorithms for finding a two-dimensional convex hull\n");
+-  printf("  than triangulation, of course, but this one comes for free.\n\n");
+-  printf(
+-"  If the input is an unconstrained mesh (you are using the -r switch but\n");
+-  printf(
+-"  not the -p switch), Triangle produces a list of its boundary edges\n");
+-  printf(
+-"  (including hole boundaries) as a by-product when you use the -c switch.\n");
+-  printf(
+-"  If you also use the -p switch, the output .poly file contains all the\n");
+-  printf("  segments from the input .poly file as well.\n\n");
+-  printf("Voronoi Diagrams:\n\n");
+-  printf(
+-"  The -v switch produces a Voronoi diagram, in files suffixed .v.node and\n");
+-  printf(
+-"  .v.edge.  For example, `triangle -v points' reads points.node, produces\n");
+-  printf(
+-"  its Delaunay triangulation in points.1.node and points.1.ele, and\n");
+-  printf(
+-"  produces its Voronoi diagram in points.1.v.node and points.1.v.edge.  The\n"
+-);
+-  printf(
+-"  .v.node file contains a list of all Voronoi vertices, and the .v.edge\n");
+-  printf(
+-"  file contains a list of all Voronoi edges, some of which may be infinite\n"
+-);
+-  printf(
+-"  rays.  (The choice of filenames makes it easy to run the set of Voronoi\n");
+-  printf("  vertices through Triangle, if so desired.)\n\n");
+-  printf(
+-"  This implementation does not use exact arithmetic to compute the Voronoi\n"
+-);
+-  printf(
+-"  vertices, and does not check whether neighboring vertices are identical.\n"
+-);
+-  printf(
+-"  Be forewarned that if the Delaunay triangulation is degenerate or\n");
+-  printf(
+-"  near-degenerate, the Voronoi diagram may have duplicate vertices or\n");
+-  printf("  crossing edges.\n\n");
+-  printf(
+-"  The result is a valid Voronoi diagram only if Triangle's output is a true\n"
+-);
+-  printf(
+-"  Delaunay triangulation.  The Voronoi output is usually meaningless (and\n");
+-  printf(
+-"  may contain crossing edges and other pathology) if the output is a CDT or\n"
+-);
+-  printf(
+-"  CCDT, or if it has holes or concavities.  If the triangulated domain is\n");
+-  printf(
+-"  convex and has no holes, you can use -D switch to force Triangle to\n");
+-  printf(
+-"  construct a conforming Delaunay triangulation instead of a CCDT, so the\n");
+-  printf("  Voronoi diagram will be valid.\n\n");
+-  printf("Mesh Topology:\n\n");
+-  printf(
+-"  You may wish to know which triangles are adjacent to a certain Delaunay\n");
+-  printf(
+-"  edge in an .edge file, which Voronoi cells are adjacent to a certain\n");
+-  printf(
+-"  Voronoi edge in a .v.edge file, or which Voronoi cells are adjacent to\n");
+-  printf(
+-"  each other.  All of this information can be found by cross-referencing\n");
+-  printf(
+-"  output files with the recollection that the Delaunay triangulation and\n");
+-  printf("  the Voronoi diagram are planar duals.\n\n");
+-  printf(
+-"  Specifically, edge i of an .edge file is the dual of Voronoi edge i of\n");
+-  printf(
+-"  the corresponding .v.edge file, and is rotated 90 degrees counterclock-\n");
+-  printf(
+-"  wise from the Voronoi edge.  Triangle j of an .ele file is the dual of\n");
+-  printf(
+-"  vertex j of the corresponding .v.node file.  Voronoi cell k is the dual\n");
+-  printf("  of vertex k of the corresponding .node file.\n\n");
+-  printf(
+-"  Hence, to find the triangles adjacent to a Delaunay edge, look at the\n");
+-  printf(
+-"  vertices of the corresponding Voronoi edge.  If the endpoints of a\n");
+-  printf(
+-"  Voronoi edge are Voronoi vertices 2 and 6 respectively, then triangles 2\n"
+-);
+-  printf(
+-"  and 6 adjoin the left and right sides of the corresponding Delaunay edge,\n"
+-);
+-  printf(
+-"  respectively.  To find the Voronoi cells adjacent to a Voronoi edge, look\n"
+-);
+-  printf(
+-"  at the endpoints of the corresponding Delaunay edge.  If the endpoints of\n"
+-);
+-  printf(
+-"  a Delaunay edge are input vertices 7 and 12, then Voronoi cells 7 and 12\n"
+-);
+-  printf(
+-"  adjoin the right and left sides of the corresponding Voronoi edge,\n");
+-  printf(
+-"  respectively.  To find which Voronoi cells are adjacent to each other,\n");
+-  printf("  just read the list of Delaunay edges.\n\n");
+-  printf(
+-"  Triangle does not write a list of the edges adjoining each Voronoi cell,\n"
+-);
+-  printf(
+-"  but you can reconstructed it straightforwardly.  For instance, to find\n");
+-  printf(
+-"  all the edges of Voronoi cell 1, search the output .edge file for every\n");
+-  printf(
+-"  edge that has input vertex 1 as an endpoint.  The corresponding dual\n");
+-  printf(
+-"  edges in the output .v.edge file form the boundary of Voronoi cell 1.\n");
+-  printf("\n");
+-  printf(
+-"  For each Voronoi vertex, the .neigh file gives a list of the three\n");
+-  printf(
+-"  Voronoi vertices attached to it.  You might find this more convenient\n");
+-  printf("  than the .v.edge file.\n\n");
+-  printf("Quadratic Elements:\n\n");
+-  printf(
+-"  Triangle generates meshes with subparametric quadratic elements if the\n");
+-  printf(
+-"  -o2 switch is specified.  Quadratic elements have six nodes per element,\n"
+-);
+-  printf(
+-"  rather than three.  `Subparametric' means that the edges of the triangles\n"
+-);
+-  printf(
+-"  are always straight, so that subparametric quadratic elements are\n");
+-  printf(
+-"  geometrically identical to linear elements, even though they can be used\n"
+-);
+-  printf(
+-"  with quadratic interpolating functions.  The three extra nodes of an\n");
+-  printf(
+-"  element fall at the midpoints of the three edges, with the fourth, fifth,\n"
+-);
+-  printf(
+-"  and sixth nodes appearing opposite the first, second, and third corners\n");
+-  printf("  respectively.\n\n");
+-  printf("Domains with Small Angles:\n\n");
+-  printf(
+-"  If two input segments adjoin each other at a small angle, clearly the -q\n"
+-);
+-  printf(
+-"  switch cannot remove the small angle.  Moreover, Triangle may have no\n");
+-  printf(
+-"  choice but to generate additional triangles whose smallest angles are\n");
+-  printf(
+-"  smaller than the specified bound.  However, these triangles only appear\n");
+-  printf(
+-"  between input segments separated by small angles.  Moreover, if you\n");
+-  printf(
+-"  request a minimum angle of theta degrees, Triangle will generally produce\n"
+-);
+-  printf(
+-"  no angle larger than 180 - 2 theta, even if it is forced to compromise on\n"
+-);
+-  printf("  the minimum angle.\n\n");
+-  printf("Statistics:\n\n");
+-  printf(
+-"  After generating a mesh, Triangle prints a count of entities in the\n");
+-  printf(
+-"  output mesh, including the number of vertices, triangles, edges, exterior\n"
+-);
+-  printf(
+-"  boundary edges (i.e. subsegments on the boundary of the triangulation,\n");
+-  printf(
+-"  including hole boundaries), interior boundary edges (i.e. subsegments of\n"
+-);
+-  printf(
+-"  input segments not on the boundary), and total subsegments.  If you've\n");
+-  printf(
+-"  forgotten the statistics for an existing mesh, run Triangle on that mesh\n"
+-);
+-  printf(
+-"  with the -rNEP switches to read the mesh and print the statistics without\n"
+-);
+-  printf(
+-"  writing any files.  Use -rpNEP if you've got a .poly file for the mesh.\n");
+-  printf("\n");
+-  printf(
+-"  The -V switch produces extended statistics, including a rough estimate\n");
+-  printf(
+-"  of memory use, the number of calls to geometric predicates, and\n");
+-  printf(
+-"  histograms of the angles and the aspect ratios of the triangles in the\n");
+-  printf("  mesh.\n\n");
+-  printf("Exact Arithmetic:\n\n");
+-  printf(
+-"  Triangle uses adaptive exact arithmetic to perform what computational\n");
+-  printf(
+-"  geometers call the `orientation' and `incircle' tests.  If the floating-\n"
+-);
+-  printf(
+-"  point arithmetic of your machine conforms to the IEEE 754 standard (as\n");
+-  printf(
+-"  most workstations do), and does not use extended precision internal\n");
+-  printf(
+-"  floating-point registers, then your output is guaranteed to be an\n");
+-  printf(
+-"  absolutely true Delaunay or constrained Delaunay triangulation, roundoff\n"
+-);
+-  printf(
+-"  error notwithstanding.  The word `adaptive' implies that these arithmetic\n"
+-);
+-  printf(
+-"  routines compute the result only to the precision necessary to guarantee\n"
+-);
+-  printf(
+-"  correctness, so they are usually nearly as fast as their approximate\n");
+-  printf("  counterparts.\n\n");
+-  printf(
+-"  May CPUs, including Intel x86 processors, have extended precision\n");
+-  printf(
+-"  floating-point registers.  These must be reconfigured so their precision\n"
+-);
+-  printf(
+-"  is reduced to memory precision.  Triangle does this if it is compiled\n");
+-  printf("  correctly.  See the makefile for details.\n\n");
+-  printf(
+-"  The exact tests can be disabled with the -X switch.  On most inputs, this\n"
+-);
+-  printf(
+-"  switch reduces the computation time by about eight percent--it's not\n");
+-  printf(
+-"  worth the risk.  There are rare difficult inputs (having many collinear\n");
+-  printf(
+-"  and cocircular vertices), however, for which the difference in speed\n");
+-  printf(
+-"  could be a factor of two.  Be forewarned that these are precisely the\n");
+-  printf(
+-"  inputs most likely to cause errors if you use the -X switch.  Hence, the\n"
+-);
+-  printf("  -X switch is not recommended.\n\n");
+-  printf(
+-"  Unfortunately, the exact tests don't solve every numerical problem.\n");
+-  printf(
+-"  Exact arithmetic is not used to compute the positions of new vertices,\n");
+-  printf(
+-"  because the bit complexity of vertex coordinates would grow without\n");
+-  printf(
+-"  bound.  Hence, segment intersections aren't computed exactly; in very\n");
+-  printf(
+-"  unusual cases, roundoff error in computing an intersection point might\n");
+-  printf(
+-"  actually lead to an inverted triangle and an invalid triangulation.\n");
+-  printf(
+-"  (This is one reason to specify your own intersection points in your .poly\n"
+-);
+-  printf(
+-"  files.)  Similarly, exact arithmetic is not used to compute the vertices\n"
+-);
+-  printf("  of the Voronoi diagram.\n\n");
+-  printf(
+-"  Another pair of problems not solved by the exact arithmetic routines is\n");
+-  printf(
+-"  underflow and overflow.  If Triangle is compiled for double precision\n");
+-  printf(
+-"  arithmetic, I believe that Triangle's geometric predicates work correctly\n"
+-);
+-  printf(
+-"  if the exponent of every input coordinate falls in the range [-148, 201].\n"
+-);
+-  printf(
+-"  Underflow can silently prevent the orientation and incircle tests from\n");
+-  printf(
+-"  being performed exactly, while overflow typically causes a floating\n");
+-  printf("  exception.\n\n");
+-  printf("Calling Triangle from Another Program:\n\n");
+-  printf("  Read the file triangle.h for details.\n\n");
+-  printf("Troubleshooting:\n\n");
+-  printf("  Please read this section before mailing me bugs.\n\n");
+-  printf("  `My output mesh has no triangles!'\n\n");
+-  printf(
+-"    If you're using a PSLG, you've probably failed to specify a proper set\n"
+-);
+-  printf(
+-"    of bounding segments, or forgotten to use the -c switch.  Or you may\n");
+-  printf(
+-"    have placed a hole badly, thereby eating all your triangles.  To test\n");
+-  printf("    these possibilities, try again with the -c and -O switches.\n");
+-  printf(
+-"    Alternatively, all your input vertices may be collinear, in which case\n"
+-);
+-  printf("    you can hardly expect to triangulate them.\n\n");
+-  printf("  `Triangle doesn't terminate, or just crashes.'\n\n");
+-  printf(
+-"    Bad things can happen when triangles get so small that the distance\n");
+-  printf(
+-"    between their vertices isn't much larger than the precision of your\n");
+-  printf(
+-"    machine's arithmetic.  If you've compiled Triangle for single-precision\n"
+-);
+-  printf(
+-"    arithmetic, you might do better by recompiling it for double-precision.\n"
+-);
+-  printf(
+-"    Then again, you might just have to settle for more lenient constraints\n"
+-);
+-  printf(
+-"    on the minimum angle and the maximum area than you had planned.\n");
+-  printf("\n");
+-  printf(
+-"    You can minimize precision problems by ensuring that the origin lies\n");
+-  printf(
+-"    inside your vertex set, or even inside the densest part of your\n");
+-  printf(
+-"    mesh.  If you're triangulating an object whose x-coordinates all fall\n");
+-  printf(
+-"    between 6247133 and 6247134, you're not leaving much floating-point\n");
+-  printf("    precision for Triangle to work with.\n\n");
+-  printf(
+-"    Precision problems can occur covertly if the input PSLG contains two\n");
+-  printf(
+-"    segments that meet (or intersect) at an extremely small angle, or if\n");
+-  printf(
+-"    such an angle is introduced by the -c switch.  If you don't realize\n");
+-  printf(
+-"    that a tiny angle is being formed, you might never discover why\n");
+-  printf(
+-"    Triangle is crashing.  To check for this possibility, use the -S switch\n"
+-);
+-  printf(
+-"    (with an appropriate limit on the number of Steiner points, found by\n");
+-  printf(
+-"    trial-and-error) to stop Triangle early, and view the output .poly file\n"
+-);
+-  printf(
+-"    with Show Me (described below).  Look carefully for regions where dense\n"
+-);
+-  printf(
+-"    clusters of vertices are forming and for small angles between segments.\n"
+-);
+-  printf(
+-"    Zoom in closely, as such segments might look like a single segment from\n"
+-);
+-  printf("    a distance.\n\n");
+-  printf(
+-"    If some of the input values are too large, Triangle may suffer a\n");
+-  printf(
+-"    floating exception due to overflow when attempting to perform an\n");
+-  printf(
+-"    orientation or incircle test.  (Read the section on exact arithmetic\n");
+-  printf(
+-"    above.)  Again, I recommend compiling Triangle for double (rather\n");
+-  printf("    than single) precision arithmetic.\n\n");
+-  printf(
+-"    Unexpected problems can arise if you use quality meshing (-q, -a, or\n");
+-  printf(
+-"    -u) with an input that is not segment-bounded--that is, if your input\n");
+-  printf(
+-"    is a vertex set, or you're using the -c switch.  If the convex hull of\n"
+-);
+-  printf(
+-"    your input vertices has collinear vertices on its boundary, an input\n");
+-  printf(
+-"    vertex that you think lies on the convex hull might actually lie just\n");
+-  printf(
+-"    inside the convex hull.  If so, the vertex and the nearby convex hull\n");
+-  printf(
+-"    edge form an extremely thin triangle.  When Triangle tries to refine\n");
+-  printf(
+-"    the mesh to enforce angle and area constraints, Triangle might generate\n"
+-);
+-  printf(
+-"    extremely tiny triangles, or it might fail because of insufficient\n");
+-  printf("    floating-point precision.\n\n");
+-  printf(
+-"  `The numbering of the output vertices doesn't match the input vertices.'\n"
+-);
+-  printf("\n");
+-  printf(
+-"    You may have had duplicate input vertices, or you may have eaten some\n");
+-  printf(
+-"    of your input vertices with a hole, or by placing them outside the area\n"
+-);
+-  printf(
+-"    enclosed by segments.  In any case, you can solve the problem by not\n");
+-  printf("    using the -j switch.\n\n");
+-  printf(
+-"  `Triangle executes without incident, but when I look at the resulting\n");
+-  printf(
+-"  mesh, it has overlapping triangles or other geometric inconsistencies.'\n");
+-  printf("\n");
+-  printf(
+-"    If you select the -X switch, Triangle occasionally makes mistakes due\n");
+-  printf(
+-"    to floating-point roundoff error.  Although these errors are rare,\n");
+-  printf(
+-"    don't use the -X switch.  If you still have problems, please report the\n"
+-);
+-  printf("    bug.\n\n");
+-  printf(
+-"  `Triangle executes without incident, but when I look at the resulting\n");
+-  printf("  Voronoi diagram, it has overlapping edges or other geometric\n");
+-  printf("  inconsistencies.'\n");
+-  printf("\n");
+-  printf(
+-"    If your input is a PSLG (-p), you can only expect a meaningful Voronoi\n"
+-);
+-  printf(
+-"    diagram if the domain you are triangulating is convex and free of\n");
+-  printf(
+-"    holes, and you use the -D switch to construct a conforming Delaunay\n");
+-  printf("    triangulation (instead of a CDT or CCDT).\n\n");
+-  printf(
+-"  Strange things can happen if you've taken liberties with your PSLG.  Do\n");
+-  printf(
+-"  you have a vertex lying in the middle of a segment?  Triangle sometimes\n");
+-  printf(
+-"  copes poorly with that sort of thing.  Do you want to lay out a collinear\n"
+-);
+-  printf(
+-"  row of evenly spaced, segment-connected vertices?  Have you simply\n");
+-  printf(
+-"  defined one long segment connecting the leftmost vertex to the rightmost\n"
+-);
+-  printf(
+-"  vertex, and a bunch of vertices lying along it?  This method occasionally\n"
+-);
+-  printf(
+-"  works, especially with horizontal and vertical lines, but often it\n");
+-  printf(
+-"  doesn't, and you'll have to connect each adjacent pair of vertices with a\n"
+-);
+-  printf("  separate segment.  If you don't like it, tough.\n\n");
+-  printf(
+-"  Furthermore, if you have segments that intersect other than at their\n");
+-  printf(
+-"  endpoints, try not to let the intersections fall extremely close to PSLG\n"
+-);
+-  printf("  vertices or each other.\n\n");
+-  printf(
+-"  If you have problems refining a triangulation not produced by Triangle:\n");
+-  printf(
+-"  Are you sure the triangulation is geometrically valid?  Is it formatted\n");
+-  printf(
+-"  correctly for Triangle?  Are the triangles all listed so the first three\n"
+-);
+-  printf(
+-"  vertices are their corners in counterclockwise order?  Are all of the\n");
+-  printf(
+-"  triangles constrained Delaunay?  Triangle's Delaunay refinement algorithm\n"
+-);
+-  printf("  assumes that it starts with a CDT.\n\n");
+-  printf("Show Me:\n\n");
+-  printf(
+-"  Triangle comes with a separate program named `Show Me', whose primary\n");
+-  printf(
+-"  purpose is to draw meshes on your screen or in PostScript.  Its secondary\n"
+-);
+-  printf(
+-"  purpose is to check the validity of your input files, and do so more\n");
+-  printf(
+-"  thoroughly than Triangle does.  Unlike Triangle, Show Me requires that\n");
+-  printf(
+-"  you have the X Windows system.  Sorry, Microsoft Windows users.\n");
+-  printf("\n");
+-  printf("Triangle on the Web:\n");
+-  printf("\n");
+-  printf("  To see an illustrated version of these instructions, check out\n");
+-  printf("\n");
+-  printf("    http://www.cs.cmu.edu/~quake/triangle.html\n");
+-  printf("\n");
+-  printf("A Brief Plea:\n");
+-  printf("\n");
+-  printf(
+-"  If you use Triangle, and especially if you use it to accomplish real\n");
+-  printf(
+-"  work, I would like very much to hear from you.  A short letter or email\n");
+-  printf(
+-"  (to jrs@cs.berkeley.edu) describing how you use Triangle will mean a lot\n"
+-);
+-  printf(
+-"  to me.  The more people I know are using this program, the more easily I\n"
+-);
+-  printf(
+-"  can justify spending time on improvements, which in turn will benefit\n");
+-  printf(
+-"  you.  Also, I can put you on a list to receive email whenever a new\n");
+-  printf("  version of Triangle is available.\n\n");
+-  printf(
+-"  If you use a mesh generated by Triangle in a publication, please include\n"
+-);
+-  printf(
+-"  an acknowledgment as well.  And please spell Triangle with a capital `T'!\n"
+-);
+-  printf(
+-"  If you want to include a citation, use `Jonathan Richard Shewchuk,\n");
+-  printf(
+-"  ``Triangle: Engineering a 2D Quality Mesh Generator and Delaunay\n");
+-  printf(
+-"  Triangulator,'' in Applied Computational Geometry:  Towards Geometric\n");
+-  printf(
+-"  Engineering (Ming C. Lin and Dinesh Manocha, editors), volume 1148 of\n");
+-  printf(
+-"  Lecture Notes in Computer Science, pages 203-222, Springer-Verlag,\n");
+-  printf(
+-"  Berlin, May 1996.  (From the First ACM Workshop on Applied Computational\n"
+-);
+-  printf("  Geometry.)'\n\n");
+-  printf("Research credit:\n\n");
+-  printf(
+-"  Of course, I can take credit for only a fraction of the ideas that made\n");
+-  printf(
+-"  this mesh generator possible.  Triangle owes its existence to the efforts\n"
+-);
+-  printf(
+-"  of many fine computational geometers and other researchers, including\n");
+-  printf(
+-"  Marshall Bern, L. Paul Chew, Kenneth L. Clarkson, Boris Delaunay, Rex A.\n"
+-);
+-  printf(
+-"  Dwyer, David Eppstein, Steven Fortune, Leonidas J. Guibas, Donald E.\n");
+-  printf(
+-"  Knuth, Charles L. Lawson, Der-Tsai Lee, Gary L. Miller, Ernst P. Mucke,\n");
+-  printf(
+-"  Steven E. Pav, Douglas M. Priest, Jim Ruppert, Isaac Saias, Bruce J.\n");
+-  printf(
+-"  Schachter, Micha Sharir, Peter W. Shor, Daniel D. Sleator, Jorge Stolfi,\n"
+-);
+-  printf("  Robert E. Tarjan, Alper Ungor, Christopher J. Van Wyk, Noel J.\n");
+-  printf(
+-"  Walkington, and Binhai Zhu.  See the comments at the beginning of the\n");
+-  printf("  source code for references.\n\n");
+-  triexit(0);
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  internalerror()   Ask the user to send me the defective product.  Exit.  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-void internalerror()
+-{
+-  printf("  Please report this bug to jrs@cs.berkeley.edu\n");
+-  printf("  Include the message above, your input data set, and the exact\n");
+-  printf("    command line you used to run Triangle.\n");
+-  triexit(1);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  parsecommandline()   Read the command line, identify switches, and set   */
+-/*                       up options and file names.                          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void parsecommandline(int argc, const char * const * const argv, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void parsecommandline(argc, argv, b)
+-int argc;
+-const char * const * const argv;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-#ifdef TRILIBRARY
+-#define STARTINDEX 0
+-#else /* not TRILIBRARY */
+-#define STARTINDEX 1
+-  int increment;
+-  int meshnumber;
+-#endif /* not TRILIBRARY */
+-  int i, j, k;
+-  char workstring[FILENAMESIZE];
+-
+-  b->poly = b->refine = b->quality = 0;
+-  b->vararea = b->fixedarea = b->usertest = 0;
+-  b->regionattrib = b->convex = b->weighted = b->jettison = 0;
+-  b->firstnumber = 1;
+-  b->edgesout = b->voronoi = b->neighbors = b->geomview = 0;
+-  b->nobound = b->nopolywritten = b->nonodewritten = b->noelewritten = 0;
+-  b->noiterationnum = 0;
+-  b->noholes = b->noexact = 0;
+-  b->incremental = b->sweepline = 0;
+-  b->dwyer = 1;
+-  b->splitseg = 0;
+-  b->docheck = 0;
+-  b->nobisect = 0;
+-  b->conformdel = 0;
+-  b->steiner = -1;
+-  b->order = 1;
+-  b->minangle = 0.0;
+-  b->maxarea = -1.0;
+-  b->quiet = b->verbose = 0;
+-#ifndef TRILIBRARY
+-  b->innodefilename[0] = '\0';
+-#endif /* not TRILIBRARY */
+-
+-  for (i = STARTINDEX; i < argc; i++) {
+-#ifndef TRILIBRARY
+-    if (argv[i][0] == '-') {
+-#endif /* not TRILIBRARY */
+-      for (j = STARTINDEX; argv[i][j] != '\0'; j++) {
+-        if (argv[i][j] == 'p') {
+-          b->poly = 1;
+-        }
+-#ifndef CDT_ONLY
+-        if (argv[i][j] == 'r') {
+-          b->refine = 1;
+-        }
+-        if (argv[i][j] == 'q') {
+-          b->quality = 1;
+-          if (((argv[i][j + 1] >= '0') && (argv[i][j + 1] <= '9')) ||
+-              (argv[i][j + 1] == '.')) {
+-            k = 0;
+-            while (((argv[i][j + 1] >= '0') && (argv[i][j + 1] <= '9')) ||
+-                   (argv[i][j + 1] == '.')) {
+-              j++;
+-              workstring[k] = argv[i][j];
+-              k++;
+-            }
+-            workstring[k] = '\0';
+-            b->minangle = (REAL) strtod(workstring, (char **) NULL);
+-          } else {
+-            b->minangle = 20.0;
+-          }
+-        }
+-        if (argv[i][j] == 'a') {
+-          b->quality = 1;
+-          if (((argv[i][j + 1] >= '0') && (argv[i][j + 1] <= '9')) ||
+-              (argv[i][j + 1] == '.')) {
+-            b->fixedarea = 1;
+-            k = 0;
+-            while (((argv[i][j + 1] >= '0') && (argv[i][j + 1] <= '9')) ||
+-                   (argv[i][j + 1] == '.')) {
+-              j++;
+-              workstring[k] = argv[i][j];
+-              k++;
+-            }
+-            workstring[k] = '\0';
+-            b->maxarea = (REAL) strtod(workstring, (char **) NULL);
+-            if (b->maxarea <= 0.0) {
+-              printf("Error:  Maximum area must be greater than zero.\n");
+-              triexit(1);
+-            }
+-          } else {
+-            b->vararea = 1;
+-          }
+-        }
+-        if (argv[i][j] == 'u') {
+-          b->quality = 1;
+-          b->usertest = 1;
+-        }
+-#endif /* not CDT_ONLY */
+-        if (argv[i][j] == 'A') {
+-          b->regionattrib = 1;
+-        }
+-        if (argv[i][j] == 'c') {
+-          b->convex = 1;
+-        }
+-        if (argv[i][j] == 'w') {
+-          b->weighted = 1;
+-        }
+-        if (argv[i][j] == 'W') {
+-          b->weighted = 2;
+-        }
+-        if (argv[i][j] == 'j') {
+-          b->jettison = 1;
+-        }
+-        if (argv[i][j] == 'z') {
+-          b->firstnumber = 0;
+-        }
+-        if (argv[i][j] == 'e') {
+-          b->edgesout = 1;
+-        }
+-        if (argv[i][j] == 'v') {
+-          b->voronoi = 1;
+-        }
+-        if (argv[i][j] == 'n') {
+-          b->neighbors = 1;
+-        }
+-        if (argv[i][j] == 'g') {
+-          b->geomview = 1;
+-        }
+-        if (argv[i][j] == 'B') {
+-          b->nobound = 1;
+-        }
+-        if (argv[i][j] == 'P') {
+-          b->nopolywritten = 1;
+-        }
+-        if (argv[i][j] == 'N') {
+-          b->nonodewritten = 1;
+-        }
+-        if (argv[i][j] == 'E') {
+-          b->noelewritten = 1;
+-        }
+-#ifndef TRILIBRARY
+-        if (argv[i][j] == 'I') {
+-          b->noiterationnum = 1;
+-        }
+-#endif /* not TRILIBRARY */
+-        if (argv[i][j] == 'O') {
+-          b->noholes = 1;
+-        }
+-        if (argv[i][j] == 'X') {
+-          b->noexact = 1;
+-        }
+-        if (argv[i][j] == 'o') {
+-          if (argv[i][j + 1] == '2') {
+-            j++;
+-            b->order = 2;
+-          }
+-        }
+-#ifndef CDT_ONLY
+-        if (argv[i][j] == 'Y') {
+-          b->nobisect++;
+-        }
+-        if (argv[i][j] == 'S') {
+-          b->steiner = 0;
+-          while ((argv[i][j + 1] >= '0') && (argv[i][j + 1] <= '9')) {
+-            j++;
+-            b->steiner = b->steiner * 10 + (int) (argv[i][j] - '0');
+-          }
+-        }
+-#endif /* not CDT_ONLY */
+-#ifndef REDUCED
+-        if (argv[i][j] == 'i') {
+-          b->incremental = 1;
+-        }
+-        if (argv[i][j] == 'F') {
+-          b->sweepline = 1;
+-        }
+-#endif /* not REDUCED */
+-        if (argv[i][j] == 'l') {
+-          b->dwyer = 0;
+-        }
+-#ifndef REDUCED
+-#ifndef CDT_ONLY
+-        if (argv[i][j] == 's') {
+-          b->splitseg = 1;
+-        }
+-        if ((argv[i][j] == 'D') || (argv[i][j] == 'L')) {
+-          b->quality = 1;
+-          b->conformdel = 1;
+-        }
+-#endif /* not CDT_ONLY */
+-        if (argv[i][j] == 'C') {
+-          b->docheck = 1;
+-        }
+-#endif /* not REDUCED */
+-        if (argv[i][j] == 'Q') {
+-          b->quiet = 1;
+-        }
+-        if (argv[i][j] == 'V') {
+-          b->verbose++;
+-        }
+-#ifndef TRILIBRARY
+-        if ((argv[i][j] == 'h') || (argv[i][j] == 'H') ||
+-            (argv[i][j] == '?')) {
+-          info();
+-        }
+-#endif /* not TRILIBRARY */
+-      }
+-#ifndef TRILIBRARY
+-    } else {
+-      strncpy(b->innodefilename, argv[i], FILENAMESIZE - 1);
+-      b->innodefilename[FILENAMESIZE - 1] = '\0';
+-    }
+-#endif /* not TRILIBRARY */
+-  }
+-#ifndef TRILIBRARY
+-  if (b->innodefilename[0] == '\0') {
+-    syntax();
+-  }
+-  if (!strcmp(&b->innodefilename[strlen(b->innodefilename) - 5], ".node")) {
+-    b->innodefilename[strlen(b->innodefilename) - 5] = '\0';
+-  }
+-  if (!strcmp(&b->innodefilename[strlen(b->innodefilename) - 5], ".poly")) {
+-    b->innodefilename[strlen(b->innodefilename) - 5] = '\0';
+-    b->poly = 1;
+-  }
+-#ifndef CDT_ONLY
+-  if (!strcmp(&b->innodefilename[strlen(b->innodefilename) - 4], ".ele")) {
+-    b->innodefilename[strlen(b->innodefilename) - 4] = '\0';
+-    b->refine = 1;
+-  }
+-  if (!strcmp(&b->innodefilename[strlen(b->innodefilename) - 5], ".area")) {
+-    b->innodefilename[strlen(b->innodefilename) - 5] = '\0';
+-    b->refine = 1;
+-    b->quality = 1;
+-    b->vararea = 1;
+-  }
+-#endif /* not CDT_ONLY */
+-#endif /* not TRILIBRARY */
+-  b->usesegments = b->poly || b->refine || b->quality || b->convex;
+-  b->goodangle = cos(b->minangle * PI / 180.0);
+-  if (b->goodangle == 1.0) {
+-    b->offconstant = 0.0;
+-  } else {
+-    b->offconstant = 0.475 * sqrt((1.0 + b->goodangle) / (1.0 - b->goodangle));
+-  }
+-  b->goodangle *= b->goodangle;
+-  if (b->refine && b->noiterationnum) {
+-    printf(
+-      "Error:  You cannot use the -I switch when refining a triangulation.\n");
+-    triexit(1);
+-  }
+-  /* Be careful not to allocate space for element area constraints that */
+-  /*   will never be assigned any value (other than the default -1.0).  */
+-  if (!b->refine && !b->poly) {
+-    b->vararea = 0;
+-  }
+-  /* Be careful not to add an extra attribute to each element unless the */
+-  /*   input supports it (PSLG in, but not refining a preexisting mesh). */
+-  if (b->refine || !b->poly) {
+-    b->regionattrib = 0;
+-  }
+-  /* Regular/weighted triangulations are incompatible with PSLGs */
+-  /*   and meshing.                                              */
+-  if (b->weighted && (b->poly || b->quality)) {
+-    b->weighted = 0;
+-    if (!b->quiet) {
+-      printf("Warning:  weighted triangulations (-w, -W) are incompatible\n");
+-      printf("  with PSLGs (-p) and meshing (-q, -a, -u).  Weights ignored.\n"
+-             );
+-    }
+-  }
+-  if (b->jettison && b->nonodewritten && !b->quiet) {
+-    printf("Warning:  -j and -N switches are somewhat incompatible.\n");
+-    printf("  If any vertices are jettisoned, you will need the output\n");
+-    printf("  .node file to reconstruct the new node indices.");
+-  }
+-
+-#ifndef TRILIBRARY
+-  strcpy(b->inpolyfilename, b->innodefilename);
+-  strcpy(b->inelefilename, b->innodefilename);
+-  strcpy(b->areafilename, b->innodefilename);
+-  increment = 0;
+-  strcpy(workstring, b->innodefilename);
+-  j = 1;
+-  while (workstring[j] != '\0') {
+-    if ((workstring[j] == '.') && (workstring[j + 1] != '\0')) {
+-      increment = j + 1;
+-    }
+-    j++;
+-  }
+-  meshnumber = 0;
+-  if (increment > 0) {
+-    j = increment;
+-    do {
+-      if ((workstring[j] >= '0') && (workstring[j] <= '9')) {
+-        meshnumber = meshnumber * 10 + (int) (workstring[j] - '0');
+-      } else {
+-        increment = 0;
+-      }
+-      j++;
+-    } while (workstring[j] != '\0');
+-  }
+-  if (b->noiterationnum) {
+-    strcpy(b->outnodefilename, b->innodefilename);
+-    strcpy(b->outelefilename, b->innodefilename);
+-    strcpy(b->edgefilename, b->innodefilename);
+-    strcpy(b->vnodefilename, b->innodefilename);
+-    strcpy(b->vedgefilename, b->innodefilename);
+-    strcpy(b->neighborfilename, b->innodefilename);
+-    strcpy(b->offfilename, b->innodefilename);
+-    strcat(b->outnodefilename, ".node");
+-    strcat(b->outelefilename, ".ele");
+-    strcat(b->edgefilename, ".edge");
+-    strcat(b->vnodefilename, ".v.node");
+-    strcat(b->vedgefilename, ".v.edge");
+-    strcat(b->neighborfilename, ".neigh");
+-    strcat(b->offfilename, ".off");
+-  } else if (increment == 0) {
+-    strcpy(b->outnodefilename, b->innodefilename);
+-    strcpy(b->outpolyfilename, b->innodefilename);
+-    strcpy(b->outelefilename, b->innodefilename);
+-    strcpy(b->edgefilename, b->innodefilename);
+-    strcpy(b->vnodefilename, b->innodefilename);
+-    strcpy(b->vedgefilename, b->innodefilename);
+-    strcpy(b->neighborfilename, b->innodefilename);
+-    strcpy(b->offfilename, b->innodefilename);
+-    strcat(b->outnodefilename, ".1.node");
+-    strcat(b->outpolyfilename, ".1.poly");
+-    strcat(b->outelefilename, ".1.ele");
+-    strcat(b->edgefilename, ".1.edge");
+-    strcat(b->vnodefilename, ".1.v.node");
+-    strcat(b->vedgefilename, ".1.v.edge");
+-    strcat(b->neighborfilename, ".1.neigh");
+-    strcat(b->offfilename, ".1.off");
+-  } else {
+-    workstring[increment] = '%';
+-    workstring[increment + 1] = 'd';
+-    workstring[increment + 2] = '\0';
+-    sprintf(b->outnodefilename, workstring, meshnumber + 1);
+-    strcpy(b->outpolyfilename, b->outnodefilename);
+-    strcpy(b->outelefilename, b->outnodefilename);
+-    strcpy(b->edgefilename, b->outnodefilename);
+-    strcpy(b->vnodefilename, b->outnodefilename);
+-    strcpy(b->vedgefilename, b->outnodefilename);
+-    strcpy(b->neighborfilename, b->outnodefilename);
+-    strcpy(b->offfilename, b->outnodefilename);
+-    strcat(b->outnodefilename, ".node");
+-    strcat(b->outpolyfilename, ".poly");
+-    strcat(b->outelefilename, ".ele");
+-    strcat(b->edgefilename, ".edge");
+-    strcat(b->vnodefilename, ".v.node");
+-    strcat(b->vedgefilename, ".v.edge");
+-    strcat(b->neighborfilename, ".neigh");
+-    strcat(b->offfilename, ".off");
+-  }
+-  strcat(b->innodefilename, ".node");
+-  strcat(b->inpolyfilename, ".poly");
+-  strcat(b->inelefilename, ".ele");
+-  strcat(b->areafilename, ".area");
+-#endif /* not TRILIBRARY */
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* User interaction routines begin here                      *********/
+-
+-/********* Debugging routines begin here                             *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  printtriangle()   Print out the details of an oriented triangle.         */
+-/*                                                                           */
+-/*  I originally wrote this procedure to simplify debugging; it can be       */
+-/*  called directly from the debugger, and presents information about an     */
+-/*  oriented triangle in digestible form.  It's also used when the           */
+-/*  highest level of verbosity (`-VVV') is specified.                        */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void printtriangle(struct mesh *m, struct behavior *b, struct otri *t)
+-#else /* not ANSI_DECLARATORS */
+-void printtriangle(m, b, t)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *t;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri printtri;
+-  struct osub printsh;
+-  vertex printvertex;
+-
+-  printf("triangle x%lx with orientation %d:\n", (TRIANGLE_PTRINT) t->tri,
+-         t->orient);
+-  decode(t->tri[0], printtri);
+-  if (printtri.tri == m->dummytri) {
+-    printf("    [0] = Outer space\n");
+-  } else {
+-    printf("    [0] = x%lx  %d\n", (TRIANGLE_PTRINT) printtri.tri,
+-           printtri.orient);
+-  }
+-  decode(t->tri[1], printtri);
+-  if (printtri.tri == m->dummytri) {
+-    printf("    [1] = Outer space\n");
+-  } else {
+-    printf("    [1] = x%lx  %d\n", (TRIANGLE_PTRINT) printtri.tri,
+-           printtri.orient);
+-  }
+-  decode(t->tri[2], printtri);
+-  if (printtri.tri == m->dummytri) {
+-    printf("    [2] = Outer space\n");
+-  } else {
+-    printf("    [2] = x%lx  %d\n", (TRIANGLE_PTRINT) printtri.tri,
+-           printtri.orient);
+-  }
+-
+-  org(*t, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Origin[%d] = NULL\n", (t->orient + 1) % 3 + 3);
+-  else
+-    printf("    Origin[%d] = x%lx  (%.12g, %.12g)\n",
+-           (t->orient + 1) % 3 + 3, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-  dest(*t, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Dest  [%d] = NULL\n", (t->orient + 2) % 3 + 3);
+-  else
+-    printf("    Dest  [%d] = x%lx  (%.12g, %.12g)\n",
+-           (t->orient + 2) % 3 + 3, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-  apex(*t, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Apex  [%d] = NULL\n", t->orient + 3);
+-  else
+-    printf("    Apex  [%d] = x%lx  (%.12g, %.12g)\n",
+-           t->orient + 3, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-
+-  if (b->usesegments) {
+-    sdecode(t->tri[6], printsh);
+-    if (printsh.ss != m->dummysub) {
+-      printf("    [6] = x%lx  %d\n", (TRIANGLE_PTRINT) printsh.ss,
+-             printsh.ssorient);
+-    }
+-    sdecode(t->tri[7], printsh);
+-    if (printsh.ss != m->dummysub) {
+-      printf("    [7] = x%lx  %d\n", (TRIANGLE_PTRINT) printsh.ss,
+-             printsh.ssorient);
+-    }
+-    sdecode(t->tri[8], printsh);
+-    if (printsh.ss != m->dummysub) {
+-      printf("    [8] = x%lx  %d\n", (TRIANGLE_PTRINT) printsh.ss,
+-             printsh.ssorient);
+-    }
+-  }
+-
+-  if (b->vararea) {
+-    printf("    Area constraint:  %.4g\n", areabound(*t));
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  printsubseg()   Print out the details of an oriented subsegment.         */
+-/*                                                                           */
+-/*  I originally wrote this procedure to simplify debugging; it can be       */
+-/*  called directly from the debugger, and presents information about an     */
+-/*  oriented subsegment in digestible form.  It's also used when the highest */
+-/*  level of verbosity (`-VVV') is specified.                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void printsubseg(struct mesh *m, struct behavior *b, struct osub *s)
+-#else /* not ANSI_DECLARATORS */
+-void printsubseg(m, b, s)
+-struct mesh *m;
+-struct behavior *b;
+-struct osub *s;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct osub printsh;
+-  struct otri printtri;
+-  vertex printvertex;
+-
+-  printf("subsegment x%lx with orientation %d and mark %d:\n",
+-         (TRIANGLE_PTRINT) s->ss, s->ssorient, mark(*s));
+-  sdecode(s->ss[0], printsh);
+-  if (printsh.ss == m->dummysub) {
+-    printf("    [0] = No subsegment\n");
+-  } else {
+-    printf("    [0] = x%lx  %d\n", (TRIANGLE_PTRINT) printsh.ss,
+-           printsh.ssorient);
+-  }
+-  sdecode(s->ss[1], printsh);
+-  if (printsh.ss == m->dummysub) {
+-    printf("    [1] = No subsegment\n");
+-  } else {
+-    printf("    [1] = x%lx  %d\n", (TRIANGLE_PTRINT) printsh.ss,
+-           printsh.ssorient);
+-  }
+-
+-  sorg(*s, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Origin[%d] = NULL\n", 2 + s->ssorient);
+-  else
+-    printf("    Origin[%d] = x%lx  (%.12g, %.12g)\n",
+-           2 + s->ssorient, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-  sdest(*s, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Dest  [%d] = NULL\n", 3 - s->ssorient);
+-  else
+-    printf("    Dest  [%d] = x%lx  (%.12g, %.12g)\n",
+-           3 - s->ssorient, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-
+-  decode(s->ss[6], printtri);
+-  if (printtri.tri == m->dummytri) {
+-    printf("    [6] = Outer space\n");
+-  } else {
+-    printf("    [6] = x%lx  %d\n", (TRIANGLE_PTRINT) printtri.tri,
+-           printtri.orient);
+-  }
+-  decode(s->ss[7], printtri);
+-  if (printtri.tri == m->dummytri) {
+-    printf("    [7] = Outer space\n");
+-  } else {
+-    printf("    [7] = x%lx  %d\n", (TRIANGLE_PTRINT) printtri.tri,
+-           printtri.orient);
+-  }
+-
+-  segorg(*s, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Segment origin[%d] = NULL\n", 4 + s->ssorient);
+-  else
+-    printf("    Segment origin[%d] = x%lx  (%.12g, %.12g)\n",
+-           4 + s->ssorient, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-  segdest(*s, printvertex);
+-  if (printvertex == (vertex) NULL)
+-    printf("    Segment dest  [%d] = NULL\n", 5 - s->ssorient);
+-  else
+-    printf("    Segment dest  [%d] = x%lx  (%.12g, %.12g)\n",
+-           5 - s->ssorient, (TRIANGLE_PTRINT) printvertex,
+-           printvertex[0], printvertex[1]);
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Debugging routines end here                               *********/
+-
+-/********* Memory management routines begin here                     *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  poolzero()   Set all of a pool's fields to zero.                         */
+-/*                                                                           */
+-/*  This procedure should never be called on a pool that has any memory      */
+-/*  allocated to it, as that memory would leak.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void poolzero(struct memorypool *pool)
+-#else /* not ANSI_DECLARATORS */
+-void poolzero(pool)
+-struct memorypool *pool;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  pool->firstblock = (void **) NULL;
+-  pool->nowblock = (void **) NULL;
+-  pool->nextitem = (void *) NULL;
+-  pool->deaditemstack = (void *) NULL;
+-  pool->pathblock = (void **) NULL;
+-  pool->pathitem = (void *) NULL;
+-  pool->alignbytes = 0;
+-  pool->itembytes = 0;
+-  pool->itemsperblock = 0;
+-  pool->itemsfirstblock = 0;
+-  pool->items = 0;
+-  pool->maxitems = 0;
+-  pool->unallocateditems = 0;
+-  pool->pathitemsleft = 0;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  poolrestart()   Deallocate all items in a pool.                          */
+-/*                                                                           */
+-/*  The pool is returned to its starting state, except that no memory is     */
+-/*  freed to the operating system.  Rather, the previously allocated blocks  */
+-/*  are ready to be reused.                                                  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void poolrestart(struct memorypool *pool)
+-#else /* not ANSI_DECLARATORS */
+-void poolrestart(pool)
+-struct memorypool *pool;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  TRIANGLE_PTRINT alignptr;
+-
+-  pool->items = 0;
+-  pool->maxitems = 0;
+-
+-  /* Set the currently active block. */
+-  pool->nowblock = pool->firstblock;
+-  /* Find the first item in the pool.  Increment by the size of (void *). */
+-  alignptr = (TRIANGLE_PTRINT) (pool->nowblock + 1);
+-  /* Align the item on an `alignbytes'-byte boundary. */
+-  pool->nextitem = (void *)
+-    (alignptr + (TRIANGLE_PTRINT) pool->alignbytes -
+-     (alignptr % (TRIANGLE_PTRINT) pool->alignbytes));
+-  /* There are lots of unallocated items left in this block. */
+-  pool->unallocateditems = pool->itemsfirstblock;
+-  /* The stack of deallocated items is empty. */
+-  pool->deaditemstack = (void *) NULL;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  poolinit()   Initialize a pool of memory for allocation of items.        */
+-/*                                                                           */
+-/*  This routine initializes the machinery for allocating items.  A `pool'   */
+-/*  is created whose records have size at least `bytecount'.  Items will be  */
+-/*  allocated in `itemcount'-item blocks.  Each item is assumed to be a      */
+-/*  collection of words, and either pointers or floating-point values are    */
+-/*  assumed to be the "primary" word type.  (The "primary" word type is used */
+-/*  to determine alignment of items.)  If `alignment' isn't zero, all items  */
+-/*  will be `alignment'-byte aligned in memory.  `alignment' must be either  */
+-/*  a multiple or a factor of the primary word size; powers of two are safe. */
+-/*  `alignment' is normally used to create a few unused bits at the bottom   */
+-/*  of each item's pointer, in which information may be stored.              */
+-/*                                                                           */
+-/*  Don't change this routine unless you understand it.                      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void poolinit(struct memorypool *pool, int bytecount, int itemcount,
+-              int firstitemcount, int alignment)
+-#else /* not ANSI_DECLARATORS */
+-void poolinit(pool, bytecount, itemcount, firstitemcount, alignment)
+-struct memorypool *pool;
+-int bytecount;
+-int itemcount;
+-int firstitemcount;
+-int alignment;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  /* Find the proper alignment, which must be at least as large as:   */
+-  /*   - The parameter `alignment'.                                   */
+-  /*   - sizeof(void *), so the stack of dead items can be maintained */
+-  /*       without unaligned accesses.                                */
+-  if (alignment > sizeof(void *)) {
+-    pool->alignbytes = alignment;
+-  } else {
+-    pool->alignbytes = sizeof(void *);
+-  }
+-  pool->itembytes = ((bytecount - 1) / pool->alignbytes + 1) *
+-                    pool->alignbytes;
+-  pool->itemsperblock = itemcount;
+-  if (firstitemcount == 0) {
+-    pool->itemsfirstblock = itemcount;
+-  } else {
+-    pool->itemsfirstblock = firstitemcount;
+-  }
+-
+-  /* Allocate a block of items.  Space for `itemsfirstblock' items and one  */
+-  /*   pointer (to point to the next block) are allocated, as well as space */
+-  /*   to ensure alignment of the items.                                    */
+-  pool->firstblock = (void **)
+-    trimalloc(pool->itemsfirstblock * pool->itembytes + (int) sizeof(void *) +
+-              pool->alignbytes);
+-  /* Set the next block pointer to NULL. */
+-  *(pool->firstblock) = (void *) NULL;
+-  poolrestart(pool);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  pooldeinit()   Free to the operating system all memory taken by a pool.  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void pooldeinit(struct memorypool *pool)
+-#else /* not ANSI_DECLARATORS */
+-void pooldeinit(pool)
+-struct memorypool *pool;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  while (pool->firstblock != (void **) NULL) {
+-    pool->nowblock = (void **) *(pool->firstblock);
+-    trifree((void *) pool->firstblock);
+-    pool->firstblock = pool->nowblock;
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  poolalloc()   Allocate space for an item.                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void *poolalloc(struct memorypool *pool)
+-#else /* not ANSI_DECLARATORS */
+-void *poolalloc(pool)
+-struct memorypool *pool;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  void *newitem;
+-  void **newblock;
+-  TRIANGLE_PTRINT alignptr;
+-
+-  /* First check the linked list of dead items.  If the list is not   */
+-  /*   empty, allocate an item from the list rather than a fresh one. */
+-  if (pool->deaditemstack != (void *) NULL) {
+-    newitem = pool->deaditemstack;               /* Take first item in list. */
+-    pool->deaditemstack = * (void **) pool->deaditemstack;
+-  } else {
+-    /* Check if there are any free items left in the current block. */
+-    if (pool->unallocateditems == 0) {
+-      /* Check if another block must be allocated. */
+-      if (*(pool->nowblock) == (void *) NULL) {
+-        /* Allocate a new block of items, pointed to by the previous block. */
+-        newblock = (void **) trimalloc(pool->itemsperblock * pool->itembytes +
+-                                       (int) sizeof(void *) +
+-                                       pool->alignbytes);
+-        *(pool->nowblock) = (void *) newblock;
+-        /* The next block pointer is NULL. */
+-        *newblock = (void *) NULL;
+-      }
+-
+-      /* Move to the new block. */
+-      pool->nowblock = (void **) *(pool->nowblock);
+-      /* Find the first item in the block.    */
+-      /*   Increment by the size of (void *). */
+-      alignptr = (TRIANGLE_PTRINT) (pool->nowblock + 1);
+-      /* Align the item on an `alignbytes'-byte boundary. */
+-      pool->nextitem = (void *)
+-        (alignptr + (TRIANGLE_PTRINT) pool->alignbytes -
+-         (alignptr % (TRIANGLE_PTRINT) pool->alignbytes));
+-      /* There are lots of unallocated items left in this block. */
+-      pool->unallocateditems = pool->itemsperblock;
+-    }
+-
+-    /* Allocate a new item. */
+-    newitem = pool->nextitem;
+-    /* Advance `nextitem' pointer to next free item in block. */
+-    pool->nextitem = (void *) ((char *) pool->nextitem + pool->itembytes);
+-    pool->unallocateditems--;
+-    pool->maxitems++;
+-  }
+-  pool->items++;
+-  return newitem;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  pooldealloc()   Deallocate space for an item.                            */
+-/*                                                                           */
+-/*  The deallocated space is stored in a queue for later reuse.              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void pooldealloc(struct memorypool *pool, void *dyingitem)
+-#else /* not ANSI_DECLARATORS */
+-void pooldealloc(pool, dyingitem)
+-struct memorypool *pool;
+-void *dyingitem;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  /* Push freshly killed item onto stack. */
+-  *((void **) dyingitem) = pool->deaditemstack;
+-  pool->deaditemstack = dyingitem;
+-  pool->items--;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  traversalinit()   Prepare to traverse the entire list of items.          */
+-/*                                                                           */
+-/*  This routine is used in conjunction with traverse().                     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void traversalinit(struct memorypool *pool)
+-#else /* not ANSI_DECLARATORS */
+-void traversalinit(pool)
+-struct memorypool *pool;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  TRIANGLE_PTRINT alignptr;
+-
+-  /* Begin the traversal in the first block. */
+-  pool->pathblock = pool->firstblock;
+-  /* Find the first item in the block.  Increment by the size of (void *). */
+-  alignptr = (TRIANGLE_PTRINT) (pool->pathblock + 1);
+-  /* Align with item on an `alignbytes'-byte boundary. */
+-  pool->pathitem = (void *)
+-    (alignptr + (TRIANGLE_PTRINT) pool->alignbytes -
+-     (alignptr % (TRIANGLE_PTRINT) pool->alignbytes));
+-  /* Set the number of items left in the current block. */
+-  pool->pathitemsleft = pool->itemsfirstblock;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  traverse()   Find the next item in the list.                             */
+-/*                                                                           */
+-/*  This routine is used in conjunction with traversalinit().  Be forewarned */
+-/*  that this routine successively returns all items in the list, including  */
+-/*  deallocated ones on the deaditemqueue.  It's up to you to figure out     */
+-/*  which ones are actually dead.  Why?  I don't want to allocate extra      */
+-/*  space just to demarcate dead items.  It can usually be done more         */
+-/*  space-efficiently by a routine that knows something about the structure  */
+-/*  of the item.                                                             */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void *traverse(struct memorypool *pool)
+-#else /* not ANSI_DECLARATORS */
+-void *traverse(pool)
+-struct memorypool *pool;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  void *newitem;
+-  TRIANGLE_PTRINT alignptr;
+-
+-  /* Stop upon exhausting the list of items. */
+-  if (pool->pathitem == pool->nextitem) {
+-    return (void *) NULL;
+-  }
+-
+-  /* Check whether any untraversed items remain in the current block. */
+-  if (pool->pathitemsleft == 0) {
+-    /* Find the next block. */
+-    pool->pathblock = (void **) *(pool->pathblock);
+-    /* Find the first item in the block.  Increment by the size of (void *). */
+-    alignptr = (TRIANGLE_PTRINT) (pool->pathblock + 1);
+-    /* Align with item on an `alignbytes'-byte boundary. */
+-    pool->pathitem = (void *)
+-      (alignptr + (TRIANGLE_PTRINT) pool->alignbytes -
+-       (alignptr % (TRIANGLE_PTRINT) pool->alignbytes));
+-    /* Set the number of items left in the current block. */
+-    pool->pathitemsleft = pool->itemsperblock;
+-  }
+-
+-  newitem = pool->pathitem;
+-  /* Find the next item in the block. */
+-  pool->pathitem = (void *) ((char *) pool->pathitem + pool->itembytes);
+-  pool->pathitemsleft--;
+-  return newitem;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  dummyinit()   Initialize the triangle that fills "outer space" and the   */
+-/*                omnipresent subsegment.                                    */
+-/*                                                                           */
+-/*  The triangle that fills "outer space," called `dummytri', is pointed to  */
+-/*  by every triangle and subsegment on a boundary (be it outer or inner) of */
+-/*  the triangulation.  Also, `dummytri' points to one of the triangles on   */
+-/*  the convex hull (until the holes and concavities are carved), making it  */
+-/*  possible to find a starting triangle for point location.                 */
+-/*                                                                           */
+-/*  The omnipresent subsegment, `dummysub', is pointed to by every triangle  */
+-/*  or subsegment that doesn't have a full complement of real subsegments    */
+-/*  to point to.                                                             */
+-/*                                                                           */
+-/*  `dummytri' and `dummysub' are generally required to fulfill only a few   */
+-/*  invariants:  their vertices must remain NULL and `dummytri' must always  */
+-/*  be bonded (at offset zero) to some triangle on the convex hull of the    */
+-/*  mesh, via a boundary edge.  Otherwise, the connections of `dummytri' and */
+-/*  `dummysub' may change willy-nilly.  This makes it possible to avoid      */
+-/*  writing a good deal of special-case code (in the edge flip, for example) */
+-/*  for dealing with the boundary of the mesh, places where no subsegment is */
+-/*  present, and so forth.  Other entities are frequently bonded to          */
+-/*  `dummytri' and `dummysub' as if they were real mesh entities, with no    */
+-/*  harm done.                                                               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void dummyinit(struct mesh *m, struct behavior *b, int trianglebytes,
+-               int subsegbytes)
+-#else /* not ANSI_DECLARATORS */
+-void dummyinit(m, b, trianglebytes, subsegbytes)
+-struct mesh *m;
+-struct behavior *b;
+-int trianglebytes;
+-int subsegbytes;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  TRIANGLE_PTRINT alignptr;
+-
+-  /* Set up `dummytri', the `triangle' that occupies "outer space." */
+-  m->dummytribase = (triangle *) trimalloc(trianglebytes +
+-                                           m->triangles.alignbytes);
+-  /* Align `dummytri' on a `triangles.alignbytes'-byte boundary. */
+-  alignptr = (TRIANGLE_PTRINT) m->dummytribase;
+-  m->dummytri = (triangle *)
+-    (alignptr + (TRIANGLE_PTRINT) m->triangles.alignbytes -
+-     (alignptr % (TRIANGLE_PTRINT) m->triangles.alignbytes));
+-  /* Initialize the three adjoining triangles to be "outer space."  These  */
+-  /*   will eventually be changed by various bonding operations, but their */
+-  /*   values don't really matter, as long as they can legally be          */
+-  /*   dereferenced.                                                       */
+-  m->dummytri[0] = (triangle) m->dummytri;
+-  m->dummytri[1] = (triangle) m->dummytri;
+-  m->dummytri[2] = (triangle) m->dummytri;
+-  /* Three NULL vertices. */
+-  m->dummytri[3] = (triangle) NULL;
+-  m->dummytri[4] = (triangle) NULL;
+-  m->dummytri[5] = (triangle) NULL;
+-
+-  if (b->usesegments) {
+-    /* Set up `dummysub', the omnipresent subsegment pointed to by any */
+-    /*   triangle side or subsegment end that isn't attached to a real */
+-    /*   subsegment.                                                   */
+-    m->dummysubbase = (subseg *) trimalloc(subsegbytes +
+-                                           m->subsegs.alignbytes);
+-    /* Align `dummysub' on a `subsegs.alignbytes'-byte boundary. */
+-    alignptr = (TRIANGLE_PTRINT) m->dummysubbase;
+-    m->dummysub = (subseg *)
+-      (alignptr + (TRIANGLE_PTRINT) m->subsegs.alignbytes -
+-       (alignptr % (TRIANGLE_PTRINT) m->subsegs.alignbytes));
+-    /* Initialize the two adjoining subsegments to be the omnipresent      */
+-    /*   subsegment.  These will eventually be changed by various bonding  */
+-    /*   operations, but their values don't really matter, as long as they */
+-    /*   can legally be dereferenced.                                      */
+-    m->dummysub[0] = (subseg) m->dummysub;
+-    m->dummysub[1] = (subseg) m->dummysub;
+-    /* Four NULL vertices. */
+-    m->dummysub[2] = (subseg) NULL;
+-    m->dummysub[3] = (subseg) NULL;
+-    m->dummysub[4] = (subseg) NULL;
+-    m->dummysub[5] = (subseg) NULL;
+-    /* Initialize the two adjoining triangles to be "outer space." */
+-    m->dummysub[6] = (subseg) m->dummytri;
+-    m->dummysub[7] = (subseg) m->dummytri;
+-    /* Set the boundary marker to zero. */
+-    * (int *) (m->dummysub + 8) = 0;
+-
+-    /* Initialize the three adjoining subsegments of `dummytri' to be */
+-    /*   the omnipresent subsegment.                                  */
+-    m->dummytri[6] = (triangle) m->dummysub;
+-    m->dummytri[7] = (triangle) m->dummysub;
+-    m->dummytri[8] = (triangle) m->dummysub;
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  initializevertexpool()   Calculate the size of the vertex data structure */
+-/*                           and initialize its memory pool.                 */
+-/*                                                                           */
+-/*  This routine also computes the `vertexmarkindex' and `vertex2triindex'   */
+-/*  indices used to find values within each vertex.                          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void initializevertexpool(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void initializevertexpool(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int vertexsize;
+-
+-  /* The index within each vertex at which the boundary marker is found,    */
+-  /*   followed by the vertex type.  Ensure the vertex marker is aligned to */
+-  /*   a sizeof(int)-byte address.                                          */
+-  m->vertexmarkindex = ((m->mesh_dim + m->nextras) * sizeof(REAL) +
+-                        sizeof(int) - 1) /
+-                       sizeof(int);
+-  vertexsize = (m->vertexmarkindex + 2) * sizeof(int);
+-  if (b->poly) {
+-    /* The index within each vertex at which a triangle pointer is found.  */
+-    /*   Ensure the pointer is aligned to a sizeof(triangle)-byte address. */
+-    m->vertex2triindex = (vertexsize + sizeof(triangle) - 1) /
+-                         sizeof(triangle);
+-    vertexsize = (m->vertex2triindex + 1) * sizeof(triangle);
+-  }
+-
+-  /* Initialize the pool of vertices. */
+-  poolinit(&m->vertices, vertexsize, VERTEXPERBLOCK,
+-           m->invertices > VERTEXPERBLOCK ? m->invertices : VERTEXPERBLOCK,
+-           sizeof(REAL));
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  initializetrisubpools()   Calculate the sizes of the triangle and        */
+-/*                            subsegment data structures and initialize      */
+-/*                            their memory pools.                            */
+-/*                                                                           */
+-/*  This routine also computes the `highorderindex', `elemattribindex', and  */
+-/*  `areaboundindex' indices used to find values within each triangle.       */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void initializetrisubpools(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void initializetrisubpools(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int trisize;
+-
+-  /* The index within each triangle at which the extra nodes (above three)  */
+-  /*   associated with high order elements are found.  There are three      */
+-  /*   pointers to other triangles, three pointers to corners, and possibly */
+-  /*   three pointers to subsegments before the extra nodes.                */
+-  m->highorderindex = 6 + (b->usesegments * 3);
+-  /* The number of bytes occupied by a triangle. */
+-  trisize = ((b->order + 1) * (b->order + 2) / 2 + (m->highorderindex - 3)) *
+-            sizeof(triangle);
+-  /* The index within each triangle at which its attributes are found, */
+-  /*   where the index is measured in REALs.                           */
+-  m->elemattribindex = (trisize + sizeof(REAL) - 1) / sizeof(REAL);
+-  /* The index within each triangle at which the maximum area constraint  */
+-  /*   is found, where the index is measured in REALs.  Note that if the  */
+-  /*   `regionattrib' flag is set, an additional attribute will be added. */
+-  m->areaboundindex = m->elemattribindex + m->eextras + b->regionattrib;
+-  /* If triangle attributes or an area bound are needed, increase the number */
+-  /*   of bytes occupied by a triangle.                                      */
+-  if (b->vararea) {
+-    trisize = (m->areaboundindex + 1) * sizeof(REAL);
+-  } else if (m->eextras + b->regionattrib > 0) {
+-    trisize = m->areaboundindex * sizeof(REAL);
+-  }
+-  /* If a Voronoi diagram or triangle neighbor graph is requested, make    */
+-  /*   sure there's room to store an integer index in each triangle.  This */
+-  /*   integer index can occupy the same space as the subsegment pointers  */
+-  /*   or attributes or area constraint or extra nodes.                    */
+-  if ((b->voronoi || b->neighbors) &&
+-      (trisize < 6 * sizeof(triangle) + sizeof(int))) {
+-    trisize = 6 * sizeof(triangle) + sizeof(int);
+-  }
+-
+-  /* Having determined the memory size of a triangle, initialize the pool. */
+-  poolinit(&m->triangles, trisize, TRIPERBLOCK,
+-           (2 * m->invertices - 2) > TRIPERBLOCK ? (2 * m->invertices - 2) :
+-           TRIPERBLOCK, 4);
+-
+-  if (b->usesegments) {
+-    /* Initialize the pool of subsegments.  Take into account all eight */
+-    /*   pointers and one boundary marker.                              */
+-    poolinit(&m->subsegs, 8 * sizeof(triangle) + sizeof(int),
+-             SUBSEGPERBLOCK, SUBSEGPERBLOCK, 4);
+-
+-    /* Initialize the "outer space" triangle and omnipresent subsegment. */
+-    dummyinit(m, b, m->triangles.itembytes, m->subsegs.itembytes);
+-  } else {
+-    /* Initialize the "outer space" triangle. */
+-    dummyinit(m, b, m->triangles.itembytes, 0);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  triangledealloc()   Deallocate space for a triangle, marking it dead.    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void triangledealloc(struct mesh *m, triangle *dyingtriangle)
+-#else /* not ANSI_DECLARATORS */
+-void triangledealloc(m, dyingtriangle)
+-struct mesh *m;
+-triangle *dyingtriangle;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  /* Mark the triangle as dead.  This makes it possible to detect dead */
+-  /*   triangles when traversing the list of all triangles.            */
+-  killtri(dyingtriangle);
+-  pooldealloc(&m->triangles, (void *) dyingtriangle);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  triangletraverse()   Traverse the triangles, skipping dead ones.         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-triangle *triangletraverse(struct mesh *m)
+-#else /* not ANSI_DECLARATORS */
+-triangle *triangletraverse(m)
+-struct mesh *m;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  triangle *newtriangle;
+-
+-  do {
+-    newtriangle = (triangle *) traverse(&m->triangles);
+-    if (newtriangle == (triangle *) NULL) {
+-      return (triangle *) NULL;
+-    }
+-  } while (deadtri(newtriangle));                         /* Skip dead ones. */
+-  return newtriangle;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  subsegdealloc()   Deallocate space for a subsegment, marking it dead.    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void subsegdealloc(struct mesh *m, subseg *dyingsubseg)
+-#else /* not ANSI_DECLARATORS */
+-void subsegdealloc(m, dyingsubseg)
+-struct mesh *m;
+-subseg *dyingsubseg;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  /* Mark the subsegment as dead.  This makes it possible to detect dead */
+-  /*   subsegments when traversing the list of all subsegments.          */
+-  killsubseg(dyingsubseg);
+-  pooldealloc(&m->subsegs, (void *) dyingsubseg);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  subsegtraverse()   Traverse the subsegments, skipping dead ones.         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-subseg *subsegtraverse(struct mesh *m)
+-#else /* not ANSI_DECLARATORS */
+-subseg *subsegtraverse(m)
+-struct mesh *m;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  subseg *newsubseg;
+-
+-  do {
+-    newsubseg = (subseg *) traverse(&m->subsegs);
+-    if (newsubseg == (subseg *) NULL) {
+-      return (subseg *) NULL;
+-    }
+-  } while (deadsubseg(newsubseg));                        /* Skip dead ones. */
+-  return newsubseg;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  vertexdealloc()   Deallocate space for a vertex, marking it dead.        */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void vertexdealloc(struct mesh *m, vertex dyingvertex)
+-#else /* not ANSI_DECLARATORS */
+-void vertexdealloc(m, dyingvertex)
+-struct mesh *m;
+-vertex dyingvertex;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  /* Mark the vertex as dead.  This makes it possible to detect dead */
+-  /*   vertices when traversing the list of all vertices.            */
+-  setvertextype(dyingvertex, DEADVERTEX);
+-  pooldealloc(&m->vertices, (void *) dyingvertex);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  vertextraverse()   Traverse the vertices, skipping dead ones.            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-vertex vertextraverse(struct mesh *m)
+-#else /* not ANSI_DECLARATORS */
+-vertex vertextraverse(m)
+-struct mesh *m;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  vertex newvertex;
+-
+-  do {
+-    newvertex = (vertex) traverse(&m->vertices);
+-    if (newvertex == (vertex) NULL) {
+-      return (vertex) NULL;
+-    }
+-  } while (vertextype(newvertex) == DEADVERTEX);          /* Skip dead ones. */
+-  return newvertex;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  badsubsegdealloc()   Deallocate space for a bad subsegment, marking it   */
+-/*                       dead.                                               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void badsubsegdealloc(struct mesh *m, struct badsubseg *dyingseg)
+-#else /* not ANSI_DECLARATORS */
+-void badsubsegdealloc(m, dyingseg)
+-struct mesh *m;
+-struct badsubseg *dyingseg;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  /* Set subsegment's origin to NULL.  This makes it possible to detect dead */
+-  /*   badsubsegs when traversing the list of all badsubsegs             .   */
+-  dyingseg->subsegorg = (vertex) NULL;
+-  pooldealloc(&m->badsubsegs, (void *) dyingseg);
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  badsubsegtraverse()   Traverse the bad subsegments, skipping dead ones.  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-struct badsubseg *badsubsegtraverse(struct mesh *m)
+-#else /* not ANSI_DECLARATORS */
+-struct badsubseg *badsubsegtraverse(m)
+-struct mesh *m;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct badsubseg *newseg;
+-
+-  do {
+-    newseg = (struct badsubseg *) traverse(&m->badsubsegs);
+-    if (newseg == (struct badsubseg *) NULL) {
+-      return (struct badsubseg *) NULL;
+-    }
+-  } while (newseg->subsegorg == (vertex) NULL);           /* Skip dead ones. */
+-  return newseg;
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  getvertex()   Get a specific vertex, by number, from the list.           */
+-/*                                                                           */
+-/*  The first vertex is number 'firstnumber'.                                */
+-/*                                                                           */
+-/*  Note that this takes O(n) time (with a small constant, if VERTEXPERBLOCK */
+-/*  is large).  I don't care to take the trouble to make it work in constant */
+-/*  time.                                                                    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-vertex getvertex(struct mesh *m, struct behavior *b, int number)
+-#else /* not ANSI_DECLARATORS */
+-vertex getvertex(m, b, number)
+-struct mesh *m;
+-struct behavior *b;
+-int number;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  void **getblock;
+-  char *foundvertex;
+-  TRIANGLE_PTRINT alignptr;
+-  int current;
+-
+-  getblock = m->vertices.firstblock;
+-  current = b->firstnumber;
+-
+-  /* Find the right block. */
+-  if (current + m->vertices.itemsfirstblock <= number) {
+-    getblock = (void **) *getblock;
+-    current += m->vertices.itemsfirstblock;
+-    while (current + m->vertices.itemsperblock <= number) {
+-      getblock = (void **) *getblock;
+-      current += m->vertices.itemsperblock;
+-    }
+-  }
+-
+-  /* Now find the right vertex. */
+-  alignptr = (TRIANGLE_PTRINT) (getblock + 1);
+-  foundvertex = (char *) (alignptr + (TRIANGLE_PTRINT) m->vertices.alignbytes -
+-                          (alignptr % (TRIANGLE_PTRINT) m->vertices.alignbytes));
+-  return (vertex) (foundvertex + m->vertices.itembytes * (number - current));
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  triangledeinit()   Free all remaining allocated memory.                  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void triangledeinit(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void triangledeinit(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  pooldeinit(&m->triangles);
+-  trifree((void *) m->dummytribase);
+-  if (b->usesegments) {
+-    pooldeinit(&m->subsegs);
+-    trifree((void *) m->dummysubbase);
+-  }
+-  pooldeinit(&m->vertices);
+-#ifndef CDT_ONLY
+-  if (b->quality) {
+-    pooldeinit(&m->badsubsegs);
+-    if ((b->minangle > 0.0) || b->vararea || b->fixedarea || b->usertest) {
+-      pooldeinit(&m->badtriangles);
+-      pooldeinit(&m->flipstackers);
+-    }
+-  }
+-#endif /* not CDT_ONLY */
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Memory management routines end here                       *********/
+-
+-/********* Constructors begin here                                   *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  maketriangle()   Create a new triangle with orientation zero.            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void maketriangle(struct mesh *m, struct behavior *b, struct otri *newotri)
+-#else /* not ANSI_DECLARATORS */
+-void maketriangle(m, b, newotri)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *newotri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int i;
+-
+-  newotri->tri = (triangle *) poolalloc(&m->triangles);
+-  /* Initialize the three adjoining triangles to be "outer space". */
+-  newotri->tri[0] = (triangle) m->dummytri;
+-  newotri->tri[1] = (triangle) m->dummytri;
+-  newotri->tri[2] = (triangle) m->dummytri;
+-  /* Three NULL vertices. */
+-  newotri->tri[3] = (triangle) NULL;
+-  newotri->tri[4] = (triangle) NULL;
+-  newotri->tri[5] = (triangle) NULL;
+-  if (b->usesegments) {
+-    /* Initialize the three adjoining subsegments to be the omnipresent */
+-    /*   subsegment.                                                    */
+-    newotri->tri[6] = (triangle) m->dummysub;
+-    newotri->tri[7] = (triangle) m->dummysub;
+-    newotri->tri[8] = (triangle) m->dummysub;
+-  }
+-  for (i = 0; i < m->eextras; i++) {
+-    setelemattribute(*newotri, i, 0.0);
+-  }
+-  if (b->vararea) {
+-    setareabound(*newotri, -1.0);
+-  }
+-
+-  newotri->orient = 0;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  makesubseg()   Create a new subsegment with orientation zero.            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void makesubseg(struct mesh *m, struct osub *newsubseg)
+-#else /* not ANSI_DECLARATORS */
+-void makesubseg(m, newsubseg)
+-struct mesh *m;
+-struct osub *newsubseg;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  newsubseg->ss = (subseg *) poolalloc(&m->subsegs);
+-  /* Initialize the two adjoining subsegments to be the omnipresent */
+-  /*   subsegment.                                                  */
+-  newsubseg->ss[0] = (subseg) m->dummysub;
+-  newsubseg->ss[1] = (subseg) m->dummysub;
+-  /* Four NULL vertices. */
+-  newsubseg->ss[2] = (subseg) NULL;
+-  newsubseg->ss[3] = (subseg) NULL;
+-  newsubseg->ss[4] = (subseg) NULL;
+-  newsubseg->ss[5] = (subseg) NULL;
+-  /* Initialize the two adjoining triangles to be "outer space." */
+-  newsubseg->ss[6] = (subseg) m->dummytri;
+-  newsubseg->ss[7] = (subseg) m->dummytri;
+-  /* Set the boundary marker to zero. */
+-  setmark(*newsubseg, 0);
+-
+-  newsubseg->ssorient = 0;
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Constructors end here                                     *********/
+-
+-/********* Geometric primitives begin here                           *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/* The adaptive exact arithmetic geometric predicates implemented herein are */
+-/*   described in detail in my paper, "Adaptive Precision Floating-Point     */
+-/*   Arithmetic and Fast Robust Geometric Predicates."  See the header for a */
+-/*   full citation.                                                          */
+-
+-/* Which of the following two methods of finding the absolute values is      */
+-/*   fastest is compiler-dependent.  A few compilers can inline and optimize */
+-/*   the fabs() call; but most will incur the overhead of a function call,   */
+-/*   which is disastrously slow.  A faster way on IEEE machines might be to  */
+-/*   mask the appropriate bit, but that's difficult to do in C without       */
+-/*   forcing the value to be stored to memory (rather than be kept in the    */
+-/*   register to which the optimizer assigned it).                           */
+-
+-#define Absolute(a)  ((a) >= 0.0 ? (a) : -(a))
+-/* #define Absolute(a)  fabs(a) */
+-
+-/* Many of the operations are broken up into two pieces, a main part that    */
+-/*   performs an approximate operation, and a "tail" that computes the       */
+-/*   roundoff error of that operation.                                       */
+-/*                                                                           */
+-/* The operations Fast_Two_Sum(), Fast_Two_Diff(), Two_Sum(), Two_Diff(),    */
+-/*   Split(), and Two_Product() are all implemented as described in the      */
+-/*   reference.  Each of these macros requires certain variables to be       */
+-/*   defined in the calling routine.  The variables `bvirt', `c', `abig',    */
+-/*   `_i', `_j', `_k', `_l', `_m', and `_n' are declared `INEXACT' because   */
+-/*   they store the result of an operation that may incur roundoff error.    */
+-/*   The input parameter `x' (or the highest numbered `x_' parameter) must   */
+-/*   also be declared `INEXACT'.                                             */
+-
+-#define Fast_Two_Sum_Tail(a, b, x, y) \
+-  bvirt = x - a; \
+-  y = b - bvirt
+-
+-#define Fast_Two_Sum(a, b, x, y) \
+-  x = (REAL) (a + b); \
+-  Fast_Two_Sum_Tail(a, b, x, y)
+-
+-#define Two_Sum_Tail(a, b, x, y) \
+-  bvirt = (REAL) (x - a); \
+-  avirt = x - bvirt; \
+-  bround = b - bvirt; \
+-  around = a - avirt; \
+-  y = around + bround
+-
+-#define Two_Sum(a, b, x, y) \
+-  x = (REAL) (a + b); \
+-  Two_Sum_Tail(a, b, x, y)
+-
+-#define Two_Diff_Tail(a, b, x, y) \
+-  bvirt = (REAL) (a - x); \
+-  avirt = x + bvirt; \
+-  bround = bvirt - b; \
+-  around = a - avirt; \
+-  y = around + bround
+-
+-#define Two_Diff(a, b, x, y) \
+-  x = (REAL) (a - b); \
+-  Two_Diff_Tail(a, b, x, y)
+-
+-#define Split(a, ahi, alo) \
+-  c = (REAL) (splitter * a); \
+-  abig = (REAL) (c - a); \
+-  ahi = c - abig; \
+-  alo = a - ahi
+-
+-#define Two_Product_Tail(a, b, x, y) \
+-  Split(a, ahi, alo); \
+-  Split(b, bhi, blo); \
+-  err1 = x - (ahi * bhi); \
+-  err2 = err1 - (alo * bhi); \
+-  err3 = err2 - (ahi * blo); \
+-  y = (alo * blo) - err3
+-
+-#define Two_Product(a, b, x, y) \
+-  x = (REAL) (a * b); \
+-  Two_Product_Tail(a, b, x, y)
+-
+-/* Two_Product_Presplit() is Two_Product() where one of the inputs has       */
+-/*   already been split.  Avoids redundant splitting.                        */
+-
+-#define Two_Product_Presplit(a, b, bhi, blo, x, y) \
+-  x = (REAL) (a * b); \
+-  Split(a, ahi, alo); \
+-  err1 = x - (ahi * bhi); \
+-  err2 = err1 - (alo * bhi); \
+-  err3 = err2 - (ahi * blo); \
+-  y = (alo * blo) - err3
+-
+-/* Square() can be done more quickly than Two_Product().                     */
+-
+-#define Square_Tail(a, x, y) \
+-  Split(a, ahi, alo); \
+-  err1 = x - (ahi * ahi); \
+-  err3 = err1 - ((ahi + ahi) * alo); \
+-  y = (alo * alo) - err3
+-
+-#define Square(a, x, y) \
+-  x = (REAL) (a * a); \
+-  Square_Tail(a, x, y)
+-
+-/* Macros for summing expansions of various fixed lengths.  These are all    */
+-/*   unrolled versions of Expansion_Sum().                                   */
+-
+-#define Two_One_Sum(a1, a0, b, x2, x1, x0) \
+-  Two_Sum(a0, b , _i, x0); \
+-  Two_Sum(a1, _i, x2, x1)
+-
+-#define Two_One_Diff(a1, a0, b, x2, x1, x0) \
+-  Two_Diff(a0, b , _i, x0); \
+-  Two_Sum( a1, _i, x2, x1)
+-
+-#define Two_Two_Sum(a1, a0, b1, b0, x3, x2, x1, x0) \
+-  Two_One_Sum(a1, a0, b0, _j, _0, x0); \
+-  Two_One_Sum(_j, _0, b1, x3, x2, x1)
+-
+-#define Two_Two_Diff(a1, a0, b1, b0, x3, x2, x1, x0) \
+-  Two_One_Diff(a1, a0, b0, _j, _0, x0); \
+-  Two_One_Diff(_j, _0, b1, x3, x2, x1)
+-
+-/* Macro for multiplying a two-component expansion by a single component.    */
+-
+-#define Two_One_Product(a1, a0, b, x3, x2, x1, x0) \
+-  Split(b, bhi, blo); \
+-  Two_Product_Presplit(a0, b, bhi, blo, _i, x0); \
+-  Two_Product_Presplit(a1, b, bhi, blo, _j, _0); \
+-  Two_Sum(_i, _0, _k, x1); \
+-  Fast_Two_Sum(_j, _k, x3, x2)
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  exactinit()   Initialize the variables used for exact arithmetic.        */
+-/*                                                                           */
+-/*  `epsilon' is the largest power of two such that 1.0 + epsilon = 1.0 in   */
+-/*  floating-point arithmetic.  `epsilon' bounds the relative roundoff       */
+-/*  error.  It is used for floating-point error analysis.                    */
+-/*                                                                           */
+-/*  `splitter' is used to split floating-point numbers into two half-        */
+-/*  length significands for exact multiplication.                            */
+-/*                                                                           */
+-/*  I imagine that a highly optimizing compiler might be too smart for its   */
+-/*  own good, and somehow cause this routine to fail, if it pretends that    */
+-/*  floating-point arithmetic is too much like real arithmetic.              */
+-/*                                                                           */
+-/*  Don't change this routine unless you fully understand it.                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-void exactinit()
+-{
+-  REAL half;
+-  REAL check, lastcheck;
+-  int every_other;
+-#ifdef LINUX
+-  int cword;
+-#endif /* LINUX */
+-
+-#ifdef CPU86
+-#ifdef SINGLE
+-  _control87(_PC_24, _MCW_PC); /* Set FPU control word for single precision. */
+-#else /* not SINGLE */
+-  _control87(_PC_53, _MCW_PC); /* Set FPU control word for double precision. */
+-#endif /* not SINGLE */
+-#endif /* CPU86 */
+-#ifdef LINUX
+-#ifdef SINGLE
+-  /*  cword = 4223; */
+-  cword = 4210;                 /* set FPU control word for single precision */
+-#else /* not SINGLE */
+-  /*  cword = 4735; */
+-  cword = 4722;                 /* set FPU control word for double precision */
+-#endif /* not SINGLE */
+-  _FPU_SETCW(cword);
+-#endif /* LINUX */
+-
+-  every_other = 1;
+-  half = 0.5;
+-  epsilon = 1.0;
+-  splitter = 1.0;
+-  check = 1.0;
+-  /* Repeatedly divide `epsilon' by two until it is too small to add to      */
+-  /*   one without causing roundoff.  (Also check if the sum is equal to     */
+-  /*   the previous sum, for machines that round up instead of using exact   */
+-  /*   rounding.  Not that these routines will work on such machines.)       */
+-  do {
+-    lastcheck = check;
+-    epsilon *= half;
+-    if (every_other) {
+-      splitter *= 2.0;
+-    }
+-    every_other = !every_other;
+-    check = 1.0 + epsilon;
+-  } while ((check != 1.0) && (check != lastcheck));
+-  splitter += 1.0;
+-  /* Error bounds for orientation and incircle tests. */
+-  resulterrbound = (3.0 + 8.0 * epsilon) * epsilon;
+-  ccwerrboundA = (3.0 + 16.0 * epsilon) * epsilon;
+-  ccwerrboundB = (2.0 + 12.0 * epsilon) * epsilon;
+-  ccwerrboundC = (9.0 + 64.0 * epsilon) * epsilon * epsilon;
+-  iccerrboundA = (10.0 + 96.0 * epsilon) * epsilon;
+-  iccerrboundB = (4.0 + 48.0 * epsilon) * epsilon;
+-  iccerrboundC = (44.0 + 576.0 * epsilon) * epsilon * epsilon;
+-  o3derrboundA = (7.0 + 56.0 * epsilon) * epsilon;
+-  o3derrboundB = (3.0 + 28.0 * epsilon) * epsilon;
+-  o3derrboundC = (26.0 + 288.0 * epsilon) * epsilon * epsilon;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  fast_expansion_sum_zeroelim()   Sum two expansions, eliminating zero     */
+-/*                                  components from the output expansion.    */
+-/*                                                                           */
+-/*  Sets h = e + f.  See my Robust Predicates paper for details.             */
+-/*                                                                           */
+-/*  If round-to-even is used (as with IEEE 754), maintains the strongly      */
+-/*  nonoverlapping property.  (That is, if e is strongly nonoverlapping, h   */
+-/*  will be also.)  Does NOT maintain the nonoverlapping or nonadjacent      */
+-/*  properties.                                                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-static int fast_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f, REAL *h)
+-#else /* not ANSI_DECLARATORS */
+-int fast_expansion_sum_zeroelim(elen, e, flen, f, h)  /* h cannot be e or f. */
+-int elen;
+-REAL *e;
+-int flen;
+-REAL *f;
+-REAL *h;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL Q;
+-  INEXACT REAL Qnew;
+-  INEXACT REAL hh;
+-  INEXACT REAL bvirt;
+-  REAL avirt, bround, around;
+-  int eindex, findex, hindex;
+-  REAL enow, fnow;
+-
+-  enow = e[0];
+-  fnow = f[0];
+-  eindex = findex = 0;
+-  if ( (fnow > enow) == (fnow > -enow) ) {
+-    Q = enow;
+-    enow = e[++eindex];
+-  } else {
+-    Q = fnow;
+-    fnow = f[++findex];
+-  }
+-  hindex = 0;
+-  if ((eindex < elen) && (findex < flen)) {
+-    if ((fnow > enow) == (fnow > -enow)) {
+-      Fast_Two_Sum(enow, Q, Qnew, hh);
+-      enow = e[++eindex];
+-    } else {
+-      Fast_Two_Sum(fnow, Q, Qnew, hh);
+-      fnow = f[++findex];
+-    }
+-    Q = Qnew;
+-    if (hh != 0.0) {
+-      h[hindex++] = hh;
+-    }
+-    while ((eindex < elen) && (findex < flen)) {
+-      if ((fnow > enow) == (fnow > -enow)) {
+-        Two_Sum(Q, enow, Qnew, hh);
+-        enow = e[++eindex];
+-      } else {
+-        Two_Sum(Q, fnow, Qnew, hh);
+-        fnow = f[++findex];
+-      }
+-      Q = Qnew;
+-      if (hh != 0.0) {
+-        h[hindex++] = hh;
+-      }
+-    }
+-  }
+-  while (eindex < elen) {
+-    Two_Sum(Q, enow, Qnew, hh);
+-    enow = e[++eindex];
+-    Q = Qnew;
+-    if (hh != 0.0) {
+-      h[hindex++] = hh;
+-    }
+-  }
+-  while (findex < flen) {
+-    Two_Sum(Q, fnow, Qnew, hh);
+-    fnow = f[++findex];
+-    Q = Qnew;
+-    if (hh != 0.0) {
+-      h[hindex++] = hh;
+-    }
+-  }
+-  if ((Q != 0.0) || (hindex == 0)) {
+-    h[hindex++] = Q;
+-  }
+-  return hindex;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  scale_expansion_zeroelim()   Multiply an expansion by a scalar,          */
+-/*                               eliminating zero components from the        */
+-/*                               output expansion.                           */
+-/*                                                                           */
+-/*  Sets h = be.  See my Robust Predicates paper for details.                */
+-/*                                                                           */
+-/*  Maintains the nonoverlapping property.  If round-to-even is used (as     */
+-/*  with IEEE 754), maintains the strongly nonoverlapping and nonadjacent    */
+-/*  properties as well.  (That is, if e has one of these properties, so      */
+-/*  will h.)                                                                 */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-int scale_expansion_zeroelim(int elen, REAL *e, REAL b, REAL *h)
+-#else /* not ANSI_DECLARATORS */
+-int scale_expansion_zeroelim(elen, e, b, h)   /* e and h cannot be the same. */
+-int elen;
+-REAL *e;
+-REAL b;
+-REAL *h;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  INEXACT REAL Q, sum;
+-  REAL hh;
+-  INEXACT REAL product1;
+-  REAL product0;
+-  int eindex, hindex;
+-  REAL enow;
+-  INEXACT REAL bvirt;
+-  REAL avirt, bround, around;
+-  INEXACT REAL c;
+-  INEXACT REAL abig;
+-  REAL ahi, alo, bhi, blo;
+-  REAL err1, err2, err3;
+-
+-  Split(b, bhi, blo);
+-  Two_Product_Presplit(e[0], b, bhi, blo, Q, hh);
+-  hindex = 0;
+-  if (hh != 0) {
+-    h[hindex++] = hh;
+-  }
+-  for (eindex = 1; eindex < elen; eindex++) {
+-    enow = e[eindex];
+-    Two_Product_Presplit(enow, b, bhi, blo, product1, product0);
+-    Two_Sum(Q, product0, sum, hh);
+-    if (hh != 0) {
+-      h[hindex++] = hh;
+-    }
+-    Fast_Two_Sum(product1, sum, Q, hh);
+-    if (hh != 0) {
+-      h[hindex++] = hh;
+-    }
+-  }
+-  if ((Q != 0.0) || (hindex == 0)) {
+-    h[hindex++] = Q;
+-  }
+-  return hindex;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  estimate()   Produce a one-word estimate of an expansion's value.        */
+-/*                                                                           */
+-/*  See my Robust Predicates paper for details.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-REAL estimate(int elen, REAL *e)
+-#else /* not ANSI_DECLARATORS */
+-REAL estimate(elen, e)
+-int elen;
+-REAL *e;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL Q;
+-  int eindex;
+-
+-  Q = e[0];
+-  for (eindex = 1; eindex < elen; eindex++) {
+-    Q += e[eindex];
+-  }
+-  return Q;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  counterclockwise()   Return a positive value if the points pa, pb, and   */
+-/*                       pc occur in counterclockwise order; a negative      */
+-/*                       value if they occur in clockwise order; and zero    */
+-/*                       if they are collinear.  The result is also a rough  */
+-/*                       approximation of twice the signed area of the       */
+-/*                       triangle defined by the three points.               */
+-/*                                                                           */
+-/*  Uses exact arithmetic if necessary to ensure a correct answer.  The      */
+-/*  result returned is the determinant of a matrix.  This determinant is     */
+-/*  computed adaptively, in the sense that exact arithmetic is used only to  */
+-/*  the degree it is needed to ensure that the returned value has the        */
+-/*  correct sign.  Hence, this function is usually quite fast, but will run  */
+-/*  more slowly when the input points are collinear or nearly so.            */
+-/*                                                                           */
+-/*  See my Robust Predicates paper for details.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-REAL counterclockwiseadapt(vertex pa, vertex pb, vertex pc, REAL detsum)
+-#else /* not ANSI_DECLARATORS */
+-REAL counterclockwiseadapt(pa, pb, pc, detsum)
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-REAL detsum;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  INEXACT REAL acx, acy, bcx, bcy;
+-  REAL acxtail, acytail, bcxtail, bcytail;
+-  INEXACT REAL detleft, detright;
+-  REAL detlefttail, detrighttail;
+-  REAL det, errbound;
+-  REAL B[4] = {0.}, C1[8] = {0.}, C2[12] = {0.}, D[16] = {0.};
+-  INEXACT REAL B3;
+-  int C1length, C2length, Dlength;
+-  REAL u[4] = {0.};
+-  INEXACT REAL u3;
+-  INEXACT REAL s1, t1;
+-  REAL s0, t0;
+-
+-  INEXACT REAL bvirt;
+-  REAL avirt, bround, around;
+-  INEXACT REAL c;
+-  INEXACT REAL abig;
+-  REAL ahi, alo, bhi, blo;
+-  REAL err1, err2, err3;
+-  INEXACT REAL _i, _j;
+-  REAL _0;
+-
+-  acx = (REAL) (pa[0] - pc[0]);
+-  bcx = (REAL) (pb[0] - pc[0]);
+-  acy = (REAL) (pa[1] - pc[1]);
+-  bcy = (REAL) (pb[1] - pc[1]);
+-
+-  Two_Product(acx, bcy, detleft, detlefttail);
+-  Two_Product(acy, bcx, detright, detrighttail);
+-
+-  Two_Two_Diff(detleft, detlefttail, detright, detrighttail,
+-               B3, B[2], B[1], B[0]);
+-  B[3] = B3;
+-
+-  det = estimate(4, B);
+-  errbound = ccwerrboundB * detsum;
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  Two_Diff_Tail(pa[0], pc[0], acx, acxtail);
+-  Two_Diff_Tail(pb[0], pc[0], bcx, bcxtail);
+-  Two_Diff_Tail(pa[1], pc[1], acy, acytail);
+-  Two_Diff_Tail(pb[1], pc[1], bcy, bcytail);
+-
+-  if ((acxtail == 0.0) && (acytail == 0.0)
+-      && (bcxtail == 0.0) && (bcytail == 0.0)) {
+-    return det;
+-  }
+-
+-  errbound = ccwerrboundC * detsum + resulterrbound * Absolute(det);
+-  det += (acx * bcytail + bcy * acxtail)
+-       - (acy * bcxtail + bcx * acytail);
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  Two_Product(acxtail, bcy, s1, s0);
+-  Two_Product(acytail, bcx, t1, t0);
+-  Two_Two_Diff(s1, s0, t1, t0, u3, u[2], u[1], u[0]);
+-  u[3] = u3;
+-  C1length = fast_expansion_sum_zeroelim(4, B, 4, u, C1);
+-
+-  Two_Product(acx, bcytail, s1, s0);
+-  Two_Product(acy, bcxtail, t1, t0);
+-  Two_Two_Diff(s1, s0, t1, t0, u3, u[2], u[1], u[0]);
+-  u[3] = u3;
+-  C2length = fast_expansion_sum_zeroelim(C1length, C1, 4, u, C2);
+-
+-  Two_Product(acxtail, bcytail, s1, s0);
+-  Two_Product(acytail, bcxtail, t1, t0);
+-  Two_Two_Diff(s1, s0, t1, t0, u3, u[2], u[1], u[0]);
+-  u[3] = u3;
+-  Dlength = fast_expansion_sum_zeroelim(C2length, C2, 4, u, D);
+-
+-  return(D[Dlength - 1]);
+-}
+-
+-#ifdef ANSI_DECLARATORS
+-REAL counterclockwise(struct mesh *m, struct behavior *b,
+-                      vertex pa, vertex pb, vertex pc)
+-#else /* not ANSI_DECLARATORS */
+-REAL counterclockwise(m, b, pa, pb, pc)
+-struct mesh *m;
+-struct behavior *b;
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL detleft, detright, det;
+-  REAL detsum, errbound;
+-
+-  m->counterclockcount++;
+-
+-  detleft = (pa[0] - pc[0]) * (pb[1] - pc[1]);
+-  detright = (pa[1] - pc[1]) * (pb[0] - pc[0]);
+-  det = detleft - detright;
+-
+-  if (b->noexact) {
+-    return det;
+-  }
+-
+-  if (detleft > 0.0) {
+-    if (detright <= 0.0) {
+-      return det;
+-    } else {
+-      detsum = detleft + detright;
+-    }
+-  } else if (detleft < 0.0) {
+-    if (detright >= 0.0) {
+-      return det;
+-    } else {
+-      detsum = -detleft - detright;
+-    }
+-  } else {
+-    return det;
+-  }
+-
+-  errbound = ccwerrboundA * detsum;
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  return counterclockwiseadapt(pa, pb, pc, detsum);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  incircle()   Return a positive value if the point pd lies inside the     */
+-/*               circle passing through pa, pb, and pc; a negative value if  */
+-/*               it lies outside; and zero if the four points are cocircular.*/
+-/*               The points pa, pb, and pc must be in counterclockwise       */
+-/*               order, or the sign of the result will be reversed.          */
+-/*                                                                           */
+-/*  Uses exact arithmetic if necessary to ensure a correct answer.  The      */
+-/*  result returned is the determinant of a matrix.  This determinant is     */
+-/*  computed adaptively, in the sense that exact arithmetic is used only to  */
+-/*  the degree it is needed to ensure that the returned value has the        */
+-/*  correct sign.  Hence, this function is usually quite fast, but will run  */
+-/*  more slowly when the input points are cocircular or nearly so.           */
+-/*                                                                           */
+-/*  See my Robust Predicates paper for details.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-REAL incircleadapt(vertex pa, vertex pb, vertex pc, vertex pd, REAL permanent)
+-#else /* not ANSI_DECLARATORS */
+-REAL incircleadapt(pa, pb, pc, pd, permanent)
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-vertex pd;
+-REAL permanent;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  INEXACT REAL adx, bdx, cdx, ady, bdy, cdy;
+-  REAL det, errbound;
+-
+-  INEXACT REAL bdxcdy1, cdxbdy1, cdxady1, adxcdy1, adxbdy1, bdxady1;
+-  REAL bdxcdy0, cdxbdy0, cdxady0, adxcdy0, adxbdy0, bdxady0;
+-  REAL bc[4], ca[4], ab[4];
+-  INEXACT REAL bc3, ca3, ab3;
+-  REAL axbc[8], axxbc[16] ={0.}, aybc[8], ayybc[16] = {0.}, adet[32] = {0.};
+-  int axbclen, axxbclen, aybclen, ayybclen, alen;
+-  REAL bxca[8], bxxca[16] = {0.}, byca[8], byyca[16] = {0.}, bdet[32] = {0.};
+-  int bxcalen, bxxcalen, bycalen, byycalen, blen;
+-  REAL cxab[8], cxxab[16] = {0.}, cyab[8], cyyab[16] = {0.}, cdet[32] = {0.};
+-  int cxablen, cxxablen, cyablen, cyyablen, clen;
+-  REAL abdet[64] = {0,};
+-  int ablen;
+-  REAL fin1[1152] = {0.}, fin2[1152] = {0.};
+-  REAL *finnow, *finother, *finswap;
+-  int finlength;
+-
+-  REAL adxtail, bdxtail, cdxtail, adytail, bdytail, cdytail;
+-  INEXACT REAL adxadx1, adyady1, bdxbdx1, bdybdy1, cdxcdx1, cdycdy1;
+-  REAL adxadx0, adyady0, bdxbdx0, bdybdy0, cdxcdx0, cdycdy0;
+-  REAL aa[4], bb[4], cc[4];
+-  INEXACT REAL aa3, bb3, cc3;
+-  INEXACT REAL ti1, tj1;
+-  REAL ti0, tj0;
+-  REAL u[4] = {0.}, v[4] = {0.};
+-  INEXACT REAL u3, v3;
+-  REAL temp8[8], temp16a[16] = {0.}, temp16b[16] = {0.}, temp16c[16] = {0.};
+-  REAL temp32a[32] = {0.}, temp32b[32] = {0.}, temp48[48] = {0.}, temp64[64] = {0.};
+-  int temp8len, temp16alen, temp16blen, temp16clen;
+-  int temp32alen, temp32blen, temp48len, temp64len;
+-  REAL axtbb[8], axtcc[8], aytbb[8], aytcc[8];
+-  int axtbblen, axtcclen, aytbblen, aytcclen;
+-  REAL bxtaa[8], bxtcc[8], bytaa[8], bytcc[8];
+-  int bxtaalen, bxtcclen, bytaalen, bytcclen;
+-  REAL cxtaa[8], cxtbb[8], cytaa[8], cytbb[8];
+-  int cxtaalen, cxtbblen, cytaalen, cytbblen;
+-  REAL axtbc[8], aytbc[8], bxtca[8], bytca[8], cxtab[8], cytab[8];
+-  int axtbclen = 8, aytbclen = 8, bxtcalen = 8, bytcalen = 8, cxtablen = 8, cytablen = 8;
+-  REAL axtbct[16], aytbct[16], bxtcat[16], bytcat[16], cxtabt[16], cytabt[16];
+-  int axtbctlen, aytbctlen, bxtcatlen, bytcatlen, cxtabtlen, cytabtlen;
+-  REAL axtbctt[8], aytbctt[8], bxtcatt[8];
+-  REAL bytcatt[8], cxtabtt[8], cytabtt[8];
+-  int axtbcttlen, aytbcttlen, bxtcattlen, bytcattlen, cxtabttlen, cytabttlen;
+-  REAL abt[8], bct[8], cat[8];
+-  int abtlen, bctlen, catlen;
+-  REAL abtt[4], bctt[4], catt[4];
+-  int abttlen, bcttlen, cattlen;
+-  INEXACT REAL abtt3, bctt3, catt3;
+-  REAL negate;
+-
+-  INEXACT REAL bvirt;
+-  REAL avirt, bround, around;
+-  INEXACT REAL c;
+-  INEXACT REAL abig;
+-  REAL ahi, alo, bhi, blo;
+-  REAL err1, err2, err3;
+-  INEXACT REAL _i, _j;
+-  REAL _0;
+-
+-  adx = (REAL) (pa[0] - pd[0]);
+-  bdx = (REAL) (pb[0] - pd[0]);
+-  cdx = (REAL) (pc[0] - pd[0]);
+-  ady = (REAL) (pa[1] - pd[1]);
+-  bdy = (REAL) (pb[1] - pd[1]);
+-  cdy = (REAL) (pc[1] - pd[1]);
+-
+-  Two_Product(bdx, cdy, bdxcdy1, bdxcdy0);
+-  Two_Product(cdx, bdy, cdxbdy1, cdxbdy0);
+-  Two_Two_Diff(bdxcdy1, bdxcdy0, cdxbdy1, cdxbdy0, bc3, bc[2], bc[1], bc[0]);
+-  bc[3] = bc3;
+-  axbclen = scale_expansion_zeroelim(4, bc, adx, axbc);
+-  axxbclen = scale_expansion_zeroelim(axbclen, axbc, adx, axxbc);
+-  aybclen = scale_expansion_zeroelim(4, bc, ady, aybc);
+-  ayybclen = scale_expansion_zeroelim(aybclen, aybc, ady, ayybc);
+-  alen = fast_expansion_sum_zeroelim(axxbclen, axxbc, ayybclen, ayybc, adet);
+-
+-  Two_Product(cdx, ady, cdxady1, cdxady0);
+-  Two_Product(adx, cdy, adxcdy1, adxcdy0);
+-  Two_Two_Diff(cdxady1, cdxady0, adxcdy1, adxcdy0, ca3, ca[2], ca[1], ca[0]);
+-  ca[3] = ca3;
+-  bxcalen = scale_expansion_zeroelim(4, ca, bdx, bxca);
+-  bxxcalen = scale_expansion_zeroelim(bxcalen, bxca, bdx, bxxca);
+-  bycalen = scale_expansion_zeroelim(4, ca, bdy, byca);
+-  byycalen = scale_expansion_zeroelim(bycalen, byca, bdy, byyca);
+-  blen = fast_expansion_sum_zeroelim(bxxcalen, bxxca, byycalen, byyca, bdet);
+-
+-  Two_Product(adx, bdy, adxbdy1, adxbdy0);
+-  Two_Product(bdx, ady, bdxady1, bdxady0);
+-  Two_Two_Diff(adxbdy1, adxbdy0, bdxady1, bdxady0, ab3, ab[2], ab[1], ab[0]);
+-  ab[3] = ab3;
+-  cxablen = scale_expansion_zeroelim(4, ab, cdx, cxab);
+-  cxxablen = scale_expansion_zeroelim(cxablen, cxab, cdx, cxxab);
+-  cyablen = scale_expansion_zeroelim(4, ab, cdy, cyab);
+-  cyyablen = scale_expansion_zeroelim(cyablen, cyab, cdy, cyyab);
+-  clen = fast_expansion_sum_zeroelim(cxxablen, cxxab, cyyablen, cyyab, cdet);
+-
+-  ablen = fast_expansion_sum_zeroelim(alen, adet, blen, bdet, abdet);
+-  finlength = fast_expansion_sum_zeroelim(ablen, abdet, clen, cdet, fin1);
+-
+-  det = estimate(finlength, fin1);
+-  errbound = iccerrboundB * permanent;
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  Two_Diff_Tail(pa[0], pd[0], adx, adxtail);
+-  Two_Diff_Tail(pa[1], pd[1], ady, adytail);
+-  Two_Diff_Tail(pb[0], pd[0], bdx, bdxtail);
+-  Two_Diff_Tail(pb[1], pd[1], bdy, bdytail);
+-  Two_Diff_Tail(pc[0], pd[0], cdx, cdxtail);
+-  Two_Diff_Tail(pc[1], pd[1], cdy, cdytail);
+-  if ((adxtail == 0.0) && (bdxtail == 0.0) && (cdxtail == 0.0)
+-      && (adytail == 0.0) && (bdytail == 0.0) && (cdytail == 0.0)) {
+-    return det;
+-  }
+-
+-  errbound = iccerrboundC * permanent + resulterrbound * Absolute(det);
+-  det += ((adx * adx + ady * ady) * ((bdx * cdytail + cdy * bdxtail)
+-                                     - (bdy * cdxtail + cdx * bdytail))
+-          + 2.0 * (adx * adxtail + ady * adytail) * (bdx * cdy - bdy * cdx))
+-       + ((bdx * bdx + bdy * bdy) * ((cdx * adytail + ady * cdxtail)
+-                                     - (cdy * adxtail + adx * cdytail))
+-          + 2.0 * (bdx * bdxtail + bdy * bdytail) * (cdx * ady - cdy * adx))
+-       + ((cdx * cdx + cdy * cdy) * ((adx * bdytail + bdy * adxtail)
+-                                     - (ady * bdxtail + bdx * adytail))
+-          + 2.0 * (cdx * cdxtail + cdy * cdytail) * (adx * bdy - ady * bdx));
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  finnow = fin1;
+-  finother = fin2;
+-
+-  if ((bdxtail != 0.0) || (bdytail != 0.0)
+-      || (cdxtail != 0.0) || (cdytail != 0.0)) {
+-    Square(adx, adxadx1, adxadx0);
+-    Square(ady, adyady1, adyady0);
+-    Two_Two_Sum(adxadx1, adxadx0, adyady1, adyady0, aa3, aa[2], aa[1], aa[0]);
+-    aa[3] = aa3;
+-  }
+-  if ((cdxtail != 0.0) || (cdytail != 0.0)
+-      || (adxtail != 0.0) || (adytail != 0.0)) {
+-    Square(bdx, bdxbdx1, bdxbdx0);
+-    Square(bdy, bdybdy1, bdybdy0);
+-    Two_Two_Sum(bdxbdx1, bdxbdx0, bdybdy1, bdybdy0, bb3, bb[2], bb[1], bb[0]);
+-    bb[3] = bb3;
+-  }
+-  if ((adxtail != 0.0) || (adytail != 0.0)
+-      || (bdxtail != 0.0) || (bdytail != 0.0)) {
+-    Square(cdx, cdxcdx1, cdxcdx0);
+-    Square(cdy, cdycdy1, cdycdy0);
+-    Two_Two_Sum(cdxcdx1, cdxcdx0, cdycdy1, cdycdy0, cc3, cc[2], cc[1], cc[0]);
+-    cc[3] = cc3;
+-  }
+-
+-  if (adxtail != 0.0) {
+-    axtbclen = scale_expansion_zeroelim(4, bc, adxtail, axtbc);
+-    temp16alen = scale_expansion_zeroelim(axtbclen, axtbc, 2.0 * adx,
+-                                          temp16a);
+-
+-    axtcclen = scale_expansion_zeroelim(4, cc, adxtail, axtcc);
+-    temp16blen = scale_expansion_zeroelim(axtcclen, axtcc, bdy, temp16b);
+-
+-    axtbblen = scale_expansion_zeroelim(4, bb, adxtail, axtbb);
+-    temp16clen = scale_expansion_zeroelim(axtbblen, axtbb, -cdy, temp16c);
+-
+-    temp32alen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                            temp16blen, temp16b, temp32a);
+-    temp48len = fast_expansion_sum_zeroelim(temp16clen, temp16c,
+-                                            temp32alen, temp32a, temp48);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                            temp48, finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (adytail != 0.0) {
+-    aytbclen = scale_expansion_zeroelim(4, bc, adytail, aytbc);
+-    temp16alen = scale_expansion_zeroelim(aytbclen, aytbc, 2.0 * ady,
+-                                          temp16a);
+-
+-    aytbblen = scale_expansion_zeroelim(4, bb, adytail, aytbb);
+-    temp16blen = scale_expansion_zeroelim(aytbblen, aytbb, cdx, temp16b);
+-
+-    aytcclen = scale_expansion_zeroelim(4, cc, adytail, aytcc);
+-    temp16clen = scale_expansion_zeroelim(aytcclen, aytcc, -bdx, temp16c);
+-
+-    temp32alen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                            temp16blen, temp16b, temp32a);
+-    temp48len = fast_expansion_sum_zeroelim(temp16clen, temp16c,
+-                                            temp32alen, temp32a, temp48);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                            temp48, finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (bdxtail != 0.0) {
+-    bxtcalen = scale_expansion_zeroelim(4, ca, bdxtail, bxtca);
+-    temp16alen = scale_expansion_zeroelim(bxtcalen, bxtca, 2.0 * bdx,
+-                                          temp16a);
+-
+-    bxtaalen = scale_expansion_zeroelim(4, aa, bdxtail, bxtaa);
+-    temp16blen = scale_expansion_zeroelim(bxtaalen, bxtaa, cdy, temp16b);
+-
+-    bxtcclen = scale_expansion_zeroelim(4, cc, bdxtail, bxtcc);
+-    temp16clen = scale_expansion_zeroelim(bxtcclen, bxtcc, -ady, temp16c);
+-
+-    temp32alen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                            temp16blen, temp16b, temp32a);
+-    temp48len = fast_expansion_sum_zeroelim(temp16clen, temp16c,
+-                                            temp32alen, temp32a, temp48);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                            temp48, finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (bdytail != 0.0) {
+-    bytcalen = scale_expansion_zeroelim(4, ca, bdytail, bytca);
+-    temp16alen = scale_expansion_zeroelim(bytcalen, bytca, 2.0 * bdy,
+-                                          temp16a);
+-
+-    bytcclen = scale_expansion_zeroelim(4, cc, bdytail, bytcc);
+-    temp16blen = scale_expansion_zeroelim(bytcclen, bytcc, adx, temp16b);
+-
+-    bytaalen = scale_expansion_zeroelim(4, aa, bdytail, bytaa);
+-    temp16clen = scale_expansion_zeroelim(bytaalen, bytaa, -cdx, temp16c);
+-
+-    temp32alen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                            temp16blen, temp16b, temp32a);
+-    temp48len = fast_expansion_sum_zeroelim(temp16clen, temp16c,
+-                                            temp32alen, temp32a, temp48);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                            temp48, finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (cdxtail != 0.0) {
+-    cxtablen = scale_expansion_zeroelim(4, ab, cdxtail, cxtab);
+-    temp16alen = scale_expansion_zeroelim(cxtablen, cxtab, 2.0 * cdx,
+-                                          temp16a);
+-
+-    cxtbblen = scale_expansion_zeroelim(4, bb, cdxtail, cxtbb);
+-    temp16blen = scale_expansion_zeroelim(cxtbblen, cxtbb, ady, temp16b);
+-
+-    cxtaalen = scale_expansion_zeroelim(4, aa, cdxtail, cxtaa);
+-    temp16clen = scale_expansion_zeroelim(cxtaalen, cxtaa, -bdy, temp16c);
+-
+-    temp32alen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                            temp16blen, temp16b, temp32a);
+-    temp48len = fast_expansion_sum_zeroelim(temp16clen, temp16c,
+-                                            temp32alen, temp32a, temp48);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                            temp48, finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (cdytail != 0.0) {
+-    cytablen = scale_expansion_zeroelim(4, ab, cdytail, cytab);
+-    temp16alen = scale_expansion_zeroelim(cytablen, cytab, 2.0 * cdy,
+-                                          temp16a);
+-
+-    cytaalen = scale_expansion_zeroelim(4, aa, cdytail, cytaa);
+-    temp16blen = scale_expansion_zeroelim(cytaalen, cytaa, bdx, temp16b);
+-
+-    cytbblen = scale_expansion_zeroelim(4, bb, cdytail, cytbb);
+-    temp16clen = scale_expansion_zeroelim(cytbblen, cytbb, -adx, temp16c);
+-
+-    temp32alen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                            temp16blen, temp16b, temp32a);
+-    temp48len = fast_expansion_sum_zeroelim(temp16clen, temp16c,
+-                                            temp32alen, temp32a, temp48);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                            temp48, finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-
+-  if ((adxtail != 0.0) || (adytail != 0.0)) {
+-    if ((bdxtail != 0.0) || (bdytail != 0.0)
+-        || (cdxtail != 0.0) || (cdytail != 0.0)) {
+-      Two_Product(bdxtail, cdy, ti1, ti0);
+-      Two_Product(bdx, cdytail, tj1, tj0);
+-      Two_Two_Sum(ti1, ti0, tj1, tj0, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      negate = -bdy;
+-      Two_Product(cdxtail, negate, ti1, ti0);
+-      negate = -bdytail;
+-      Two_Product(cdx, negate, tj1, tj0);
+-      Two_Two_Sum(ti1, ti0, tj1, tj0, v3, v[2], v[1], v[0]);
+-      v[3] = v3;
+-      bctlen = fast_expansion_sum_zeroelim(4, u, 4, v, bct);
+-
+-      Two_Product(bdxtail, cdytail, ti1, ti0);
+-      Two_Product(cdxtail, bdytail, tj1, tj0);
+-      Two_Two_Diff(ti1, ti0, tj1, tj0, bctt3, bctt[2], bctt[1], bctt[0]);
+-      bctt[3] = bctt3;
+-      bcttlen = 4;
+-    } else {
+-      bct[0] = 0.0;
+-      bctlen = 1;
+-      bctt[0] = 0.0;
+-      bcttlen = 1;
+-    }
+-
+-    if (adxtail != 0.0) {
+-      temp16alen = scale_expansion_zeroelim(axtbclen, axtbc, adxtail, temp16a);
+-      axtbctlen = scale_expansion_zeroelim(bctlen, bct, adxtail, axtbct);
+-      temp32alen = scale_expansion_zeroelim(axtbctlen, axtbct, 2.0 * adx,
+-                                            temp32a);
+-      temp48len = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp32alen, temp32a, temp48);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                              temp48, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (bdytail != 0.0) {
+-        temp8len = scale_expansion_zeroelim(4, cc, adxtail, temp8);
+-        temp16alen = scale_expansion_zeroelim(temp8len, temp8, bdytail,
+-                                              temp16a);
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp16alen,
+-                                                temp16a, finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-      if (cdytail != 0.0) {
+-        temp8len = scale_expansion_zeroelim(4, bb, -adxtail, temp8);
+-        temp16alen = scale_expansion_zeroelim(temp8len, temp8, cdytail,
+-                                              temp16a);
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp16alen,
+-                                                temp16a, finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-
+-      temp32alen = scale_expansion_zeroelim(axtbctlen, axtbct, adxtail,
+-                                            temp32a);
+-      axtbcttlen = scale_expansion_zeroelim(bcttlen, bctt, adxtail, axtbctt);
+-      temp16alen = scale_expansion_zeroelim(axtbcttlen, axtbctt, 2.0 * adx,
+-                                            temp16a);
+-      temp16blen = scale_expansion_zeroelim(axtbcttlen, axtbctt, adxtail,
+-                                            temp16b);
+-      temp32blen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp16blen, temp16b, temp32b);
+-      temp64len = fast_expansion_sum_zeroelim(temp32alen, temp32a,
+-                                              temp32blen, temp32b, temp64);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp64len,
+-                                              temp64, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-    }
+-    if (adytail != 0.0) {
+-      temp16alen = scale_expansion_zeroelim(aytbclen, aytbc, adytail, temp16a);
+-      aytbctlen = scale_expansion_zeroelim(bctlen, bct, adytail, aytbct);
+-      temp32alen = scale_expansion_zeroelim(aytbctlen, aytbct, 2.0 * ady,
+-                                            temp32a);
+-      temp48len = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp32alen, temp32a, temp48);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                              temp48, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-
+-
+-      temp32alen = scale_expansion_zeroelim(aytbctlen, aytbct, adytail,
+-                                            temp32a);
+-      aytbcttlen = scale_expansion_zeroelim(bcttlen, bctt, adytail, aytbctt);
+-      temp16alen = scale_expansion_zeroelim(aytbcttlen, aytbctt, 2.0 * ady,
+-                                            temp16a);
+-      temp16blen = scale_expansion_zeroelim(aytbcttlen, aytbctt, adytail,
+-                                            temp16b);
+-      temp32blen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp16blen, temp16b, temp32b);
+-      temp64len = fast_expansion_sum_zeroelim(temp32alen, temp32a,
+-                                              temp32blen, temp32b, temp64);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp64len,
+-                                              temp64, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-    }
+-  }
+-  if ((bdxtail != 0.0) || (bdytail != 0.0)) {
+-    if ((cdxtail != 0.0) || (cdytail != 0.0)
+-        || (adxtail != 0.0) || (adytail != 0.0)) {
+-      Two_Product(cdxtail, ady, ti1, ti0);
+-      Two_Product(cdx, adytail, tj1, tj0);
+-      Two_Two_Sum(ti1, ti0, tj1, tj0, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      negate = -cdy;
+-      Two_Product(adxtail, negate, ti1, ti0);
+-      negate = -cdytail;
+-      Two_Product(adx, negate, tj1, tj0);
+-      Two_Two_Sum(ti1, ti0, tj1, tj0, v3, v[2], v[1], v[0]);
+-      v[3] = v3;
+-      catlen = fast_expansion_sum_zeroelim(4, u, 4, v, cat);
+-
+-      Two_Product(cdxtail, adytail, ti1, ti0);
+-      Two_Product(adxtail, cdytail, tj1, tj0);
+-      Two_Two_Diff(ti1, ti0, tj1, tj0, catt3, catt[2], catt[1], catt[0]);
+-      catt[3] = catt3;
+-      cattlen = 4;
+-    } else {
+-      cat[0] = 0.0;
+-      catlen = 1;
+-      catt[0] = 0.0;
+-      cattlen = 1;
+-    }
+-
+-    if (bdxtail != 0.0) {
+-      temp16alen = scale_expansion_zeroelim(bxtcalen, bxtca, bdxtail, temp16a);
+-      bxtcatlen = scale_expansion_zeroelim(catlen, cat, bdxtail, bxtcat);
+-      temp32alen = scale_expansion_zeroelim(bxtcatlen, bxtcat, 2.0 * bdx,
+-                                            temp32a);
+-      temp48len = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp32alen, temp32a, temp48);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                              temp48, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (cdytail != 0.0) {
+-        temp8len = scale_expansion_zeroelim(4, aa, bdxtail, temp8);
+-        temp16alen = scale_expansion_zeroelim(temp8len, temp8, cdytail,
+-                                              temp16a);
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp16alen,
+-                                                temp16a, finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-      if (adytail != 0.0) {
+-        temp8len = scale_expansion_zeroelim(4, cc, -bdxtail, temp8);
+-        temp16alen = scale_expansion_zeroelim(temp8len, temp8, adytail,
+-                                              temp16a);
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp16alen,
+-                                                temp16a, finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-
+-      temp32alen = scale_expansion_zeroelim(bxtcatlen, bxtcat, bdxtail,
+-                                            temp32a);
+-      bxtcattlen = scale_expansion_zeroelim(cattlen, catt, bdxtail, bxtcatt);
+-      temp16alen = scale_expansion_zeroelim(bxtcattlen, bxtcatt, 2.0 * bdx,
+-                                            temp16a);
+-      temp16blen = scale_expansion_zeroelim(bxtcattlen, bxtcatt, bdxtail,
+-                                            temp16b);
+-      temp32blen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp16blen, temp16b, temp32b);
+-      temp64len = fast_expansion_sum_zeroelim(temp32alen, temp32a,
+-                                              temp32blen, temp32b, temp64);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp64len,
+-                                              temp64, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-    }
+-    if (bdytail != 0.0) {
+-      temp16alen = scale_expansion_zeroelim(bytcalen, bytca, bdytail, temp16a);
+-      bytcatlen = scale_expansion_zeroelim(catlen, cat, bdytail, bytcat);
+-      temp32alen = scale_expansion_zeroelim(bytcatlen, bytcat, 2.0 * bdy,
+-                                            temp32a);
+-      temp48len = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp32alen, temp32a, temp48);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                              temp48, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-
+-
+-      temp32alen = scale_expansion_zeroelim(bytcatlen, bytcat, bdytail,
+-                                            temp32a);
+-      bytcattlen = scale_expansion_zeroelim(cattlen, catt, bdytail, bytcatt);
+-      temp16alen = scale_expansion_zeroelim(bytcattlen, bytcatt, 2.0 * bdy,
+-                                            temp16a);
+-      temp16blen = scale_expansion_zeroelim(bytcattlen, bytcatt, bdytail,
+-                                            temp16b);
+-      temp32blen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp16blen, temp16b, temp32b);
+-      temp64len = fast_expansion_sum_zeroelim(temp32alen, temp32a,
+-                                              temp32blen, temp32b, temp64);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp64len,
+-                                              temp64, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-    }
+-  }
+-  if ((cdxtail != 0.0) || (cdytail != 0.0)) {
+-    if ((adxtail != 0.0) || (adytail != 0.0)
+-        || (bdxtail != 0.0) || (bdytail != 0.0)) {
+-      Two_Product(adxtail, bdy, ti1, ti0);
+-      Two_Product(adx, bdytail, tj1, tj0);
+-      Two_Two_Sum(ti1, ti0, tj1, tj0, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      negate = -ady;
+-      Two_Product(bdxtail, negate, ti1, ti0);
+-      negate = -adytail;
+-      Two_Product(bdx, negate, tj1, tj0);
+-      Two_Two_Sum(ti1, ti0, tj1, tj0, v3, v[2], v[1], v[0]);
+-      v[3] = v3;
+-      abtlen = fast_expansion_sum_zeroelim(4, u, 4, v, abt);
+-
+-      Two_Product(adxtail, bdytail, ti1, ti0);
+-      Two_Product(bdxtail, adytail, tj1, tj0);
+-      Two_Two_Diff(ti1, ti0, tj1, tj0, abtt3, abtt[2], abtt[1], abtt[0]);
+-      abtt[3] = abtt3;
+-      abttlen = 4;
+-    } else {
+-      abt[0] = 0.0;
+-      abtlen = 1;
+-      abtt[0] = 0.0;
+-      abttlen = 1;
+-    }
+-
+-    if (cdxtail != 0.0) {
+-      temp16alen = scale_expansion_zeroelim(cxtablen, cxtab, cdxtail, temp16a);
+-      cxtabtlen = scale_expansion_zeroelim(abtlen, abt, cdxtail, cxtabt);
+-      temp32alen = scale_expansion_zeroelim(cxtabtlen, cxtabt, 2.0 * cdx,
+-                                            temp32a);
+-      temp48len = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp32alen, temp32a, temp48);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                              temp48, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (adytail != 0.0) {
+-        temp8len = scale_expansion_zeroelim(4, bb, cdxtail, temp8);
+-        temp16alen = scale_expansion_zeroelim(temp8len, temp8, adytail,
+-                                              temp16a);
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp16alen,
+-                                                temp16a, finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-      if (bdytail != 0.0) {
+-        temp8len = scale_expansion_zeroelim(4, aa, -cdxtail, temp8);
+-        temp16alen = scale_expansion_zeroelim(temp8len, temp8, bdytail,
+-                                              temp16a);
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp16alen,
+-                                                temp16a, finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-
+-      temp32alen = scale_expansion_zeroelim(cxtabtlen, cxtabt, cdxtail,
+-                                            temp32a);
+-      cxtabttlen = scale_expansion_zeroelim(abttlen, abtt, cdxtail, cxtabtt);
+-      temp16alen = scale_expansion_zeroelim(cxtabttlen, cxtabtt, 2.0 * cdx,
+-                                            temp16a);
+-      temp16blen = scale_expansion_zeroelim(cxtabttlen, cxtabtt, cdxtail,
+-                                            temp16b);
+-      temp32blen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp16blen, temp16b, temp32b);
+-      temp64len = fast_expansion_sum_zeroelim(temp32alen, temp32a,
+-                                              temp32blen, temp32b, temp64);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp64len,
+-                                              temp64, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-    }
+-    if (cdytail != 0.0) {
+-      temp16alen = scale_expansion_zeroelim(cytablen, cytab, cdytail, temp16a);
+-      cytabtlen = scale_expansion_zeroelim(abtlen, abt, cdytail, cytabt);
+-      temp32alen = scale_expansion_zeroelim(cytabtlen, cytabt, 2.0 * cdy,
+-                                            temp32a);
+-      temp48len = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp32alen, temp32a, temp48);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp48len,
+-                                              temp48, finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-
+-
+-      temp32alen = scale_expansion_zeroelim(cytabtlen, cytabt, cdytail,
+-                                            temp32a);
+-      cytabttlen = scale_expansion_zeroelim(abttlen, abtt, cdytail, cytabtt);
+-      temp16alen = scale_expansion_zeroelim(cytabttlen, cytabtt, 2.0 * cdy,
+-                                            temp16a);
+-      temp16blen = scale_expansion_zeroelim(cytabttlen, cytabtt, cdytail,
+-                                            temp16b);
+-      temp32blen = fast_expansion_sum_zeroelim(temp16alen, temp16a,
+-                                              temp16blen, temp16b, temp32b);
+-      temp64len = fast_expansion_sum_zeroelim(temp32alen, temp32a,
+-                                              temp32blen, temp32b, temp64);
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, temp64len,
+-                                              temp64, finother);
+-      finnow = finother;
+-    }
+-  }
+-
+-  return finnow[finlength - 1];
+-}
+-
+-#ifdef ANSI_DECLARATORS
+-REAL incircle(struct mesh *m, struct behavior *b,
+-              vertex pa, vertex pb, vertex pc, vertex pd)
+-#else /* not ANSI_DECLARATORS */
+-REAL incircle(m, b, pa, pb, pc, pd)
+-struct mesh *m;
+-struct behavior *b;
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-vertex pd;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL adx, bdx, cdx, ady, bdy, cdy;
+-  REAL bdxcdy, cdxbdy, cdxady, adxcdy, adxbdy, bdxady;
+-  REAL alift, blift, clift;
+-  REAL det;
+-  REAL permanent, errbound;
+-
+-  m->incirclecount++;
+-
+-  adx = pa[0] - pd[0];
+-  bdx = pb[0] - pd[0];
+-  cdx = pc[0] - pd[0];
+-  ady = pa[1] - pd[1];
+-  bdy = pb[1] - pd[1];
+-  cdy = pc[1] - pd[1];
+-
+-  bdxcdy = bdx * cdy;
+-  cdxbdy = cdx * bdy;
+-  alift = adx * adx + ady * ady;
+-
+-  cdxady = cdx * ady;
+-  adxcdy = adx * cdy;
+-  blift = bdx * bdx + bdy * bdy;
+-
+-  adxbdy = adx * bdy;
+-  bdxady = bdx * ady;
+-  clift = cdx * cdx + cdy * cdy;
+-
+-  det = alift * (bdxcdy - cdxbdy)
+-      + blift * (cdxady - adxcdy)
+-      + clift * (adxbdy - bdxady);
+-
+-  if (b->noexact) {
+-    return det;
+-  }
+-
+-  permanent = (Absolute(bdxcdy) + Absolute(cdxbdy)) * alift
+-            + (Absolute(cdxady) + Absolute(adxcdy)) * blift
+-            + (Absolute(adxbdy) + Absolute(bdxady)) * clift;
+-  errbound = iccerrboundA * permanent;
+-  if ((det > errbound) || (-det > errbound)) {
+-    return det;
+-  }
+-
+-  return incircleadapt(pa, pb, pc, pd, permanent);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  orient3d()   Return a positive value if the point pd lies below the      */
+-/*               plane passing through pa, pb, and pc; "below" is defined so */
+-/*               that pa, pb, and pc appear in counterclockwise order when   */
+-/*               viewed from above the plane.  Returns a negative value if   */
+-/*               pd lies above the plane.  Returns zero if the points are    */
+-/*               coplanar.  The result is also a rough approximation of six  */
+-/*               times the signed volume of the tetrahedron defined by the   */
+-/*               four points.                                                */
+-/*                                                                           */
+-/*  Uses exact arithmetic if necessary to ensure a correct answer.  The      */
+-/*  result returned is the determinant of a matrix.  This determinant is     */
+-/*  computed adaptively, in the sense that exact arithmetic is used only to  */
+-/*  the degree it is needed to ensure that the returned value has the        */
+-/*  correct sign.  Hence, this function is usually quite fast, but will run  */
+-/*  more slowly when the input points are coplanar or nearly so.             */
+-/*                                                                           */
+-/*  See my Robust Predicates paper for details.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-REAL orient3dadapt(vertex pa, vertex pb, vertex pc, vertex pd,
+-                   REAL aheight, REAL bheight, REAL cheight, REAL dheight,
+-                   REAL permanent)
+-#else /* not ANSI_DECLARATORS */
+-REAL orient3dadapt(pa, pb, pc, pd,
+-                   aheight, bheight, cheight, dheight, permanent)
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-vertex pd;
+-REAL aheight;
+-REAL bheight;
+-REAL cheight;
+-REAL dheight;
+-REAL permanent;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  INEXACT REAL adx, bdx, cdx, ady, bdy, cdy, adheight, bdheight, cdheight;
+-  REAL det, errbound;
+-
+-  INEXACT REAL bdxcdy1, cdxbdy1, cdxady1, adxcdy1, adxbdy1, bdxady1;
+-  REAL bdxcdy0, cdxbdy0, cdxady0, adxcdy0, adxbdy0, bdxady0;
+-  REAL bc[4], ca[4], ab[4];
+-  INEXACT REAL bc3, ca3, ab3;
+-  REAL adet[8]={0.}, bdet[8]={0.}, cdet[8]={0.};
+-  int alen, blen, clen;
+-  REAL abdet[16]={0.};
+-  int ablen;
+-  REAL *finnow, *finother, *finswap;
+-  REAL fin1[192], fin2[192];
+-  int finlength;
+-
+-  REAL adxtail, bdxtail, cdxtail;
+-  REAL adytail, bdytail, cdytail;
+-  REAL adheighttail, bdheighttail, cdheighttail;
+-  INEXACT REAL at_blarge, at_clarge;
+-  INEXACT REAL bt_clarge, bt_alarge;
+-  INEXACT REAL ct_alarge, ct_blarge;
+-  REAL at_b[4]={0.}, at_c[4]={0.}, bt_c[4]={0.}, bt_a[4]={0.}, ct_a[4]={0.}, ct_b[4]={0.};
+-  int at_blen, at_clen, bt_clen, bt_alen, ct_alen, ct_blen;
+-  INEXACT REAL bdxt_cdy1, cdxt_bdy1, cdxt_ady1;
+-  INEXACT REAL adxt_cdy1, adxt_bdy1, bdxt_ady1;
+-  REAL bdxt_cdy0, cdxt_bdy0, cdxt_ady0;
+-  REAL adxt_cdy0, adxt_bdy0, bdxt_ady0;
+-  INEXACT REAL bdyt_cdx1, cdyt_bdx1, cdyt_adx1;
+-  INEXACT REAL adyt_cdx1, adyt_bdx1, bdyt_adx1;
+-  REAL bdyt_cdx0, cdyt_bdx0, cdyt_adx0;
+-  REAL adyt_cdx0, adyt_bdx0, bdyt_adx0;
+-  REAL bct[8], cat[8], abt[8];
+-  int bctlen, catlen, abtlen;
+-  INEXACT REAL bdxt_cdyt1, cdxt_bdyt1, cdxt_adyt1;
+-  INEXACT REAL adxt_cdyt1, adxt_bdyt1, bdxt_adyt1;
+-  REAL bdxt_cdyt0, cdxt_bdyt0, cdxt_adyt0;
+-  REAL adxt_cdyt0, adxt_bdyt0, bdxt_adyt0;
+-  REAL u[4]={0.}, v[12]={0.}, w[16]={0.};
+-  INEXACT REAL u3;
+-  int vlength, wlength;
+-  REAL negate;
+-
+-  INEXACT REAL bvirt;
+-  REAL avirt, bround, around;
+-  INEXACT REAL c;
+-  INEXACT REAL abig;
+-  REAL ahi, alo, bhi, blo;
+-  REAL err1, err2, err3;
+-  INEXACT REAL _i, _j, _k;
+-  REAL _0;
+-
+-  adx = (REAL) (pa[0] - pd[0]);
+-  bdx = (REAL) (pb[0] - pd[0]);
+-  cdx = (REAL) (pc[0] - pd[0]);
+-  ady = (REAL) (pa[1] - pd[1]);
+-  bdy = (REAL) (pb[1] - pd[1]);
+-  cdy = (REAL) (pc[1] - pd[1]);
+-  adheight = (REAL) (aheight - dheight);
+-  bdheight = (REAL) (bheight - dheight);
+-  cdheight = (REAL) (cheight - dheight);
+-
+-  Two_Product(bdx, cdy, bdxcdy1, bdxcdy0);
+-  Two_Product(cdx, bdy, cdxbdy1, cdxbdy0);
+-  Two_Two_Diff(bdxcdy1, bdxcdy0, cdxbdy1, cdxbdy0, bc3, bc[2], bc[1], bc[0]);
+-  bc[3] = bc3;
+-  alen = scale_expansion_zeroelim(4, bc, adheight, adet);
+-
+-  Two_Product(cdx, ady, cdxady1, cdxady0);
+-  Two_Product(adx, cdy, adxcdy1, adxcdy0);
+-  Two_Two_Diff(cdxady1, cdxady0, adxcdy1, adxcdy0, ca3, ca[2], ca[1], ca[0]);
+-  ca[3] = ca3;
+-  blen = scale_expansion_zeroelim(4, ca, bdheight, bdet);
+-
+-  Two_Product(adx, bdy, adxbdy1, adxbdy0);
+-  Two_Product(bdx, ady, bdxady1, bdxady0);
+-  Two_Two_Diff(adxbdy1, adxbdy0, bdxady1, bdxady0, ab3, ab[2], ab[1], ab[0]);
+-  ab[3] = ab3;
+-  clen = scale_expansion_zeroelim(4, ab, cdheight, cdet);
+-
+-  ablen = fast_expansion_sum_zeroelim(alen, adet, blen, bdet, abdet);
+-  finlength = fast_expansion_sum_zeroelim(ablen, abdet, clen, cdet, fin1);
+-
+-  det = estimate(finlength, fin1);
+-  errbound = o3derrboundB * permanent;
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  Two_Diff_Tail(pa[0], pd[0], adx, adxtail);
+-  Two_Diff_Tail(pb[0], pd[0], bdx, bdxtail);
+-  Two_Diff_Tail(pc[0], pd[0], cdx, cdxtail);
+-  Two_Diff_Tail(pa[1], pd[1], ady, adytail);
+-  Two_Diff_Tail(pb[1], pd[1], bdy, bdytail);
+-  Two_Diff_Tail(pc[1], pd[1], cdy, cdytail);
+-  Two_Diff_Tail(aheight, dheight, adheight, adheighttail);
+-  Two_Diff_Tail(bheight, dheight, bdheight, bdheighttail);
+-  Two_Diff_Tail(cheight, dheight, cdheight, cdheighttail);
+-
+-  if ((adxtail == 0.0) && (bdxtail == 0.0) && (cdxtail == 0.0) &&
+-      (adytail == 0.0) && (bdytail == 0.0) && (cdytail == 0.0) &&
+-      (adheighttail == 0.0) &&
+-      (bdheighttail == 0.0) &&
+-      (cdheighttail == 0.0)) {
+-    return det;
+-  }
+-
+-  errbound = o3derrboundC * permanent + resulterrbound * Absolute(det);
+-  det += (adheight * ((bdx * cdytail + cdy * bdxtail) -
+-                      (bdy * cdxtail + cdx * bdytail)) +
+-          adheighttail * (bdx * cdy - bdy * cdx)) +
+-         (bdheight * ((cdx * adytail + ady * cdxtail) -
+-                      (cdy * adxtail + adx * cdytail)) +
+-          bdheighttail * (cdx * ady - cdy * adx)) +
+-         (cdheight * ((adx * bdytail + bdy * adxtail) -
+-                      (ady * bdxtail + bdx * adytail)) +
+-          cdheighttail * (adx * bdy - ady * bdx));
+-  if ((det >= errbound) || (-det >= errbound)) {
+-    return det;
+-  }
+-
+-  finnow = fin1;
+-  finother = fin2;
+-
+-  if (adxtail == 0.0) {
+-    if (adytail == 0.0) {
+-      at_b[0] = 0.0;
+-      at_blen = 1;
+-      at_c[0] = 0.0;
+-      at_clen = 1;
+-    } else {
+-      negate = -adytail;
+-      Two_Product(negate, bdx, at_blarge, at_b[0]);
+-      at_b[1] = at_blarge;
+-      at_blen = 2;
+-      Two_Product(adytail, cdx, at_clarge, at_c[0]);
+-      at_c[1] = at_clarge;
+-      at_clen = 2;
+-    }
+-  } else {
+-    if (adytail == 0.0) {
+-      Two_Product(adxtail, bdy, at_blarge, at_b[0]);
+-      at_b[1] = at_blarge;
+-      at_blen = 2;
+-      negate = -adxtail;
+-      Two_Product(negate, cdy, at_clarge, at_c[0]);
+-      at_c[1] = at_clarge;
+-      at_clen = 2;
+-    } else {
+-      Two_Product(adxtail, bdy, adxt_bdy1, adxt_bdy0);
+-      Two_Product(adytail, bdx, adyt_bdx1, adyt_bdx0);
+-      Two_Two_Diff(adxt_bdy1, adxt_bdy0, adyt_bdx1, adyt_bdx0,
+-                   at_blarge, at_b[2], at_b[1], at_b[0]);
+-      at_b[3] = at_blarge;
+-      at_blen = 4;
+-      Two_Product(adytail, cdx, adyt_cdx1, adyt_cdx0);
+-      Two_Product(adxtail, cdy, adxt_cdy1, adxt_cdy0);
+-      Two_Two_Diff(adyt_cdx1, adyt_cdx0, adxt_cdy1, adxt_cdy0,
+-                   at_clarge, at_c[2], at_c[1], at_c[0]);
+-      at_c[3] = at_clarge;
+-      at_clen = 4;
+-    }
+-  }
+-  if (bdxtail == 0.0) {
+-    if (bdytail == 0.0) {
+-      bt_c[0] = 0.0;
+-      bt_clen = 1;
+-      bt_a[0] = 0.0;
+-      bt_alen = 1;
+-    } else {
+-      negate = -bdytail;
+-      Two_Product(negate, cdx, bt_clarge, bt_c[0]);
+-      bt_c[1] = bt_clarge;
+-      bt_clen = 2;
+-      Two_Product(bdytail, adx, bt_alarge, bt_a[0]);
+-      bt_a[1] = bt_alarge;
+-      bt_alen = 2;
+-    }
+-  } else {
+-    if (bdytail == 0.0) {
+-      Two_Product(bdxtail, cdy, bt_clarge, bt_c[0]);
+-      bt_c[1] = bt_clarge;
+-      bt_clen = 2;
+-      negate = -bdxtail;
+-      Two_Product(negate, ady, bt_alarge, bt_a[0]);
+-      bt_a[1] = bt_alarge;
+-      bt_alen = 2;
+-    } else {
+-      Two_Product(bdxtail, cdy, bdxt_cdy1, bdxt_cdy0);
+-      Two_Product(bdytail, cdx, bdyt_cdx1, bdyt_cdx0);
+-      Two_Two_Diff(bdxt_cdy1, bdxt_cdy0, bdyt_cdx1, bdyt_cdx0,
+-                   bt_clarge, bt_c[2], bt_c[1], bt_c[0]);
+-      bt_c[3] = bt_clarge;
+-      bt_clen = 4;
+-      Two_Product(bdytail, adx, bdyt_adx1, bdyt_adx0);
+-      Two_Product(bdxtail, ady, bdxt_ady1, bdxt_ady0);
+-      Two_Two_Diff(bdyt_adx1, bdyt_adx0, bdxt_ady1, bdxt_ady0,
+-                  bt_alarge, bt_a[2], bt_a[1], bt_a[0]);
+-      bt_a[3] = bt_alarge;
+-      bt_alen = 4;
+-    }
+-  }
+-  if (cdxtail == 0.0) {
+-    if (cdytail == 0.0) {
+-      ct_a[0] = 0.0;
+-      ct_alen = 1;
+-      ct_b[0] = 0.0;
+-      ct_blen = 1;
+-    } else {
+-      negate = -cdytail;
+-      Two_Product(negate, adx, ct_alarge, ct_a[0]);
+-      ct_a[1] = ct_alarge;
+-      ct_alen = 2;
+-      Two_Product(cdytail, bdx, ct_blarge, ct_b[0]);
+-      ct_b[1] = ct_blarge;
+-      ct_blen = 2;
+-    }
+-  } else {
+-    if (cdytail == 0.0) {
+-      Two_Product(cdxtail, ady, ct_alarge, ct_a[0]);
+-      ct_a[1] = ct_alarge;
+-      ct_alen = 2;
+-      negate = -cdxtail;
+-      Two_Product(negate, bdy, ct_blarge, ct_b[0]);
+-      ct_b[1] = ct_blarge;
+-      ct_blen = 2;
+-    } else {
+-      Two_Product(cdxtail, ady, cdxt_ady1, cdxt_ady0);
+-      Two_Product(cdytail, adx, cdyt_adx1, cdyt_adx0);
+-      Two_Two_Diff(cdxt_ady1, cdxt_ady0, cdyt_adx1, cdyt_adx0,
+-                   ct_alarge, ct_a[2], ct_a[1], ct_a[0]);
+-      ct_a[3] = ct_alarge;
+-      ct_alen = 4;
+-      Two_Product(cdytail, bdx, cdyt_bdx1, cdyt_bdx0);
+-      Two_Product(cdxtail, bdy, cdxt_bdy1, cdxt_bdy0);
+-      Two_Two_Diff(cdyt_bdx1, cdyt_bdx0, cdxt_bdy1, cdxt_bdy0,
+-                   ct_blarge, ct_b[2], ct_b[1], ct_b[0]);
+-      ct_b[3] = ct_blarge;
+-      ct_blen = 4;
+-    }
+-  }
+-
+-  bctlen = fast_expansion_sum_zeroelim(bt_clen, bt_c, ct_blen, ct_b, bct);
+-  wlength = scale_expansion_zeroelim(bctlen, bct, adheight, w);
+-  finlength = fast_expansion_sum_zeroelim(finlength, finnow, wlength, w,
+-                                          finother);
+-  finswap = finnow; finnow = finother; finother = finswap;
+-
+-  catlen = fast_expansion_sum_zeroelim(ct_alen, ct_a, at_clen, at_c, cat);
+-  wlength = scale_expansion_zeroelim(catlen, cat, bdheight, w);
+-  finlength = fast_expansion_sum_zeroelim(finlength, finnow, wlength, w,
+-                                          finother);
+-  finswap = finnow; finnow = finother; finother = finswap;
+-
+-  abtlen = fast_expansion_sum_zeroelim(at_blen, at_b, bt_alen, bt_a, abt);
+-  wlength = scale_expansion_zeroelim(abtlen, abt, cdheight, w);
+-  finlength = fast_expansion_sum_zeroelim(finlength, finnow, wlength, w,
+-                                          finother);
+-  finswap = finnow; finnow = finother; finother = finswap;
+-
+-  if (adheighttail != 0.0) {
+-    vlength = scale_expansion_zeroelim(4, bc, adheighttail, v);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, vlength, v,
+-                                            finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (bdheighttail != 0.0) {
+-    vlength = scale_expansion_zeroelim(4, ca, bdheighttail, v);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, vlength, v,
+-                                            finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (cdheighttail != 0.0) {
+-    vlength = scale_expansion_zeroelim(4, ab, cdheighttail, v);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, vlength, v,
+-                                            finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-
+-  if (adxtail != 0.0) {
+-    if (bdytail != 0.0) {
+-      Two_Product(adxtail, bdytail, adxt_bdyt1, adxt_bdyt0);
+-      Two_One_Product(adxt_bdyt1, adxt_bdyt0, cdheight, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                              finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (cdheighttail != 0.0) {
+-        Two_One_Product(adxt_bdyt1, adxt_bdyt0, cdheighttail,
+-                        u3, u[2], u[1], u[0]);
+-        u[3] = u3;
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                                finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-    }
+-    if (cdytail != 0.0) {
+-      negate = -adxtail;
+-      Two_Product(negate, cdytail, adxt_cdyt1, adxt_cdyt0);
+-      Two_One_Product(adxt_cdyt1, adxt_cdyt0, bdheight, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                              finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (bdheighttail != 0.0) {
+-        Two_One_Product(adxt_cdyt1, adxt_cdyt0, bdheighttail,
+-                        u3, u[2], u[1], u[0]);
+-        u[3] = u3;
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                                finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-    }
+-  }
+-  if (bdxtail != 0.0) {
+-    if (cdytail != 0.0) {
+-      Two_Product(bdxtail, cdytail, bdxt_cdyt1, bdxt_cdyt0);
+-      Two_One_Product(bdxt_cdyt1, bdxt_cdyt0, adheight, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                              finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (adheighttail != 0.0) {
+-        Two_One_Product(bdxt_cdyt1, bdxt_cdyt0, adheighttail,
+-                        u3, u[2], u[1], u[0]);
+-        u[3] = u3;
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                                finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-    }
+-    if (adytail != 0.0) {
+-      negate = -bdxtail;
+-      Two_Product(negate, adytail, bdxt_adyt1, bdxt_adyt0);
+-      Two_One_Product(bdxt_adyt1, bdxt_adyt0, cdheight, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                              finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (cdheighttail != 0.0) {
+-        Two_One_Product(bdxt_adyt1, bdxt_adyt0, cdheighttail,
+-                        u3, u[2], u[1], u[0]);
+-        u[3] = u3;
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                                finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-    }
+-  }
+-  if (cdxtail != 0.0) {
+-    if (adytail != 0.0) {
+-      Two_Product(cdxtail, adytail, cdxt_adyt1, cdxt_adyt0);
+-      Two_One_Product(cdxt_adyt1, cdxt_adyt0, bdheight, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                              finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (bdheighttail != 0.0) {
+-        Two_One_Product(cdxt_adyt1, cdxt_adyt0, bdheighttail,
+-                        u3, u[2], u[1], u[0]);
+-        u[3] = u3;
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                                finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-    }
+-    if (bdytail != 0.0) {
+-      negate = -cdxtail;
+-      Two_Product(negate, bdytail, cdxt_bdyt1, cdxt_bdyt0);
+-      Two_One_Product(cdxt_bdyt1, cdxt_bdyt0, adheight, u3, u[2], u[1], u[0]);
+-      u[3] = u3;
+-      finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                              finother);
+-      finswap = finnow; finnow = finother; finother = finswap;
+-      if (adheighttail != 0.0) {
+-        Two_One_Product(cdxt_bdyt1, cdxt_bdyt0, adheighttail,
+-                        u3, u[2], u[1], u[0]);
+-        u[3] = u3;
+-        finlength = fast_expansion_sum_zeroelim(finlength, finnow, 4, u,
+-                                                finother);
+-        finswap = finnow; finnow = finother; finother = finswap;
+-      }
+-    }
+-  }
+-
+-  if (adheighttail != 0.0) {
+-    wlength = scale_expansion_zeroelim(bctlen, bct, adheighttail, w);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, wlength, w,
+-                                            finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (bdheighttail != 0.0) {
+-    wlength = scale_expansion_zeroelim(catlen, cat, bdheighttail, w);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, wlength, w,
+-                                            finother);
+-    finswap = finnow; finnow = finother; finother = finswap;
+-  }
+-  if (cdheighttail != 0.0) {
+-    wlength = scale_expansion_zeroelim(abtlen, abt, cdheighttail, w);
+-    finlength = fast_expansion_sum_zeroelim(finlength, finnow, wlength, w,
+-                                            finother);
+-    finnow = finother;
+-  }
+-
+-  return finnow[finlength - 1];
+-}
+-
+-#ifdef ANSI_DECLARATORS
+-REAL orient3d(struct mesh *m, struct behavior *b,
+-              vertex pa, vertex pb, vertex pc, vertex pd,
+-              REAL aheight, REAL bheight, REAL cheight, REAL dheight)
+-#else /* not ANSI_DECLARATORS */
+-REAL orient3d(m, b, pa, pb, pc, pd, aheight, bheight, cheight, dheight)
+-struct mesh *m;
+-struct behavior *b;
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-vertex pd;
+-REAL aheight;
+-REAL bheight;
+-REAL cheight;
+-REAL dheight;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL adx, bdx, cdx, ady, bdy, cdy, adheight, bdheight, cdheight;
+-  REAL bdxcdy, cdxbdy, cdxady, adxcdy, adxbdy, bdxady;
+-  REAL det;
+-  REAL permanent, errbound;
+-
+-  m->orient3dcount++;
+-
+-  adx = pa[0] - pd[0];
+-  bdx = pb[0] - pd[0];
+-  cdx = pc[0] - pd[0];
+-  ady = pa[1] - pd[1];
+-  bdy = pb[1] - pd[1];
+-  cdy = pc[1] - pd[1];
+-  adheight = aheight - dheight;
+-  bdheight = bheight - dheight;
+-  cdheight = cheight - dheight;
+-
+-  bdxcdy = bdx * cdy;
+-  cdxbdy = cdx * bdy;
+-
+-  cdxady = cdx * ady;
+-  adxcdy = adx * cdy;
+-
+-  adxbdy = adx * bdy;
+-  bdxady = bdx * ady;
+-
+-  det = adheight * (bdxcdy - cdxbdy)
+-      + bdheight * (cdxady - adxcdy)
+-      + cdheight * (adxbdy - bdxady);
+-
+-  if (b->noexact) {
+-    return det;
+-  }
+-
+-  permanent = (Absolute(bdxcdy) + Absolute(cdxbdy)) * Absolute(adheight)
+-            + (Absolute(cdxady) + Absolute(adxcdy)) * Absolute(bdheight)
+-            + (Absolute(adxbdy) + Absolute(bdxady)) * Absolute(cdheight);
+-  errbound = o3derrboundA * permanent;
+-  if ((det > errbound) || (-det > errbound)) {
+-    return det;
+-  }
+-
+-  return orient3dadapt(pa, pb, pc, pd, aheight, bheight, cheight, dheight,
+-                       permanent);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  nonregular()   Return a positive value if the point pd is incompatible   */
+-/*                 with the circle or plane passing through pa, pb, and pc   */
+-/*                 (meaning that pd is inside the circle or below the        */
+-/*                 plane); a negative value if it is compatible; and zero if */
+-/*                 the four points are cocircular/coplanar.  The points pa,  */
+-/*                 pb, and pc must be in counterclockwise order, or the sign */
+-/*                 of the result will be reversed.                           */
+-/*                                                                           */
+-/*  If the -w switch is used, the points are lifted onto the parabolic       */
+-/*  lifting map, then they are dropped according to their weights, then the  */
+-/*  3D orientation test is applied.  If the -W switch is used, the points'   */
+-/*  heights are already provided, so the 3D orientation test is applied      */
+-/*  directly.  If neither switch is used, the incircle test is applied.      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-REAL nonregular(struct mesh *m, struct behavior *b,
+-                vertex pa, vertex pb, vertex pc, vertex pd)
+-#else /* not ANSI_DECLARATORS */
+-REAL nonregular(m, b, pa, pb, pc, pd)
+-struct mesh *m;
+-struct behavior *b;
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-vertex pd;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  if (b->weighted == 0) {
+-    return incircle(m, b, pa, pb, pc, pd);
+-  } else if (b->weighted == 1) {
+-    return orient3d(m, b, pa, pb, pc, pd,
+-                    pa[0] * pa[0] + pa[1] * pa[1] - pa[2],
+-                    pb[0] * pb[0] + pb[1] * pb[1] - pb[2],
+-                    pc[0] * pc[0] + pc[1] * pc[1] - pc[2],
+-                    pd[0] * pd[0] + pd[1] * pd[1] - pd[2]);
+-  } else {
+-    return orient3d(m, b, pa, pb, pc, pd, pa[2], pb[2], pc[2], pd[2]);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  findcircumcenter()   Find the circumcenter of a triangle.                */
+-/*                                                                           */
+-/*  The result is returned both in terms of x-y coordinates and xi-eta       */
+-/*  (barycentric) coordinates.  The xi-eta coordinate system is defined in   */
+-/*  terms of the triangle:  the origin of the triangle is the origin of the  */
+-/*  coordinate system; the destination of the triangle is one unit along the */
+-/*  xi axis; and the apex of the triangle is one unit along the eta axis.    */
+-/*  This procedure also returns the square of the length of the triangle's   */
+-/*  shortest edge.                                                           */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void findcircumcenter(struct mesh *m, struct behavior *b,
+-                      vertex torg, vertex tdest, vertex tapex,
+-                      vertex circumcenter, REAL *xi, REAL *eta, int offcenter)
+-#else /* not ANSI_DECLARATORS */
+-void findcircumcenter(m, b, torg, tdest, tapex, circumcenter, xi, eta,
+-                      offcenter)
+-struct mesh *m;
+-struct behavior *b;
+-vertex torg;
+-vertex tdest;
+-vertex tapex;
+-vertex circumcenter;
+-REAL *xi;
+-REAL *eta;
+-int offcenter;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL xdo, ydo, xao, yao;
+-  REAL dodist, aodist, dadist;
+-  REAL denominator;
+-  REAL dx, dy, dxoff, dyoff;
+-
+-  m->circumcentercount++;
+-
+-  /* Compute the circumcenter of the triangle. */
+-  xdo = tdest[0] - torg[0];
+-  ydo = tdest[1] - torg[1];
+-  xao = tapex[0] - torg[0];
+-  yao = tapex[1] - torg[1];
+-  dodist = xdo * xdo + ydo * ydo;
+-  aodist = xao * xao + yao * yao;
+-  dadist = (tdest[0] - tapex[0]) * (tdest[0] - tapex[0]) +
+-           (tdest[1] - tapex[1]) * (tdest[1] - tapex[1]);
+-  if (b->noexact) {
+-    denominator = 0.5 / (xdo * yao - xao * ydo);
+-  } else {
+-    /* Use the counterclockwise() routine to ensure a positive (and */
+-    /*   reasonably accurate) result, avoiding any possibility of   */
+-    /*   division by zero.                                          */
+-    denominator = 0.5 / counterclockwise(m, b, tdest, tapex, torg);
+-    /* Don't count the above as an orientation test. */
+-    m->counterclockcount--;
+-  }
+-  dx = (yao * dodist - ydo * aodist) * denominator;
+-  dy = (xdo * aodist - xao * dodist) * denominator;
+-
+-  /* Find the (squared) length of the triangle's shortest edge.  This   */
+-  /*   serves as a conservative estimate of the insertion radius of the */
+-  /*   circumcenter's parent.  The estimate is used to ensure that      */
+-  /*   the algorithm terminates even if very small angles appear in     */
+-  /*   the input PSLG.                                                  */
+-  if ((dodist < aodist) && (dodist < dadist)) {
+-    if (offcenter && (b->offconstant > 0.0)) {
+-      /* Find the position of the off-center, as described by Alper Ungor. */
+-      dxoff = 0.5 * xdo - b->offconstant * ydo;
+-      dyoff = 0.5 * ydo + b->offconstant * xdo;
+-      /* If the off-center is closer to the origin than the */
+-      /*   circumcenter, use the off-center instead.        */
+-      if (dxoff * dxoff + dyoff * dyoff < dx * dx + dy * dy) {
+-        dx = dxoff;
+-        dy = dyoff;
+-      }
+-    }
+-  } else if (aodist < dadist) {
+-    if (offcenter && (b->offconstant > 0.0)) {
+-      dxoff = 0.5 * xao + b->offconstant * yao;
+-      dyoff = 0.5 * yao - b->offconstant * xao;
+-      /* If the off-center is closer to the origin than the */
+-      /*   circumcenter, use the off-center instead.        */
+-      if (dxoff * dxoff + dyoff * dyoff < dx * dx + dy * dy) {
+-        dx = dxoff;
+-        dy = dyoff;
+-      }
+-    }
+-  } else {
+-    if (offcenter && (b->offconstant > 0.0)) {
+-      dxoff = 0.5 * (tapex[0] - tdest[0]) -
+-              b->offconstant * (tapex[1] - tdest[1]);
+-      dyoff = 0.5 * (tapex[1] - tdest[1]) +
+-              b->offconstant * (tapex[0] - tdest[0]);
+-      /* If the off-center is closer to the destination than the */
+-      /*   circumcenter, use the off-center instead.             */
+-      if (dxoff * dxoff + dyoff * dyoff <
+-          (dx - xdo) * (dx - xdo) + (dy - ydo) * (dy - ydo)) {
+-        dx = xdo + dxoff;
+-        dy = ydo + dyoff;
+-      }
+-    }
+-  }
+-
+-  circumcenter[0] = torg[0] + dx;
+-  circumcenter[1] = torg[1] + dy;
+-
+-  /* To interpolate vertex attributes for the new vertex inserted at */
+-  /*   the circumcenter, define a coordinate system with a xi-axis,  */
+-  /*   directed from the triangle's origin to its destination, and   */
+-  /*   an eta-axis, directed from its origin to its apex.            */
+-  /*   Calculate the xi and eta coordinates of the circumcenter.     */
+-  *xi = (yao * dx - xao * dy) * (2.0 * denominator);
+-  *eta = (xdo * dy - ydo * dx) * (2.0 * denominator);
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Geometric primitives end here                             *********/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  triangleinit()   Initialize some variables.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void triangleinit(struct mesh *m)
+-#else /* not ANSI_DECLARATORS */
+-void triangleinit(m)
+-struct mesh *m;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  poolzero(&m->vertices);
+-  poolzero(&m->triangles);
+-  poolzero(&m->subsegs);
+-  poolzero(&m->viri);
+-  poolzero(&m->badsubsegs);
+-  poolzero(&m->badtriangles);
+-  poolzero(&m->flipstackers);
+-  poolzero(&m->splaynodes);
+-
+-  m->recenttri.tri = (triangle *) NULL; /* No triangle has been visited yet. */
+-  m->undeads = 0;                       /* No eliminated input vertices yet. */
+-  m->samples = 1;         /* Point location should take at least one sample. */
+-  m->checksegments = 0;   /* There are no segments in the triangulation yet. */
+-  m->checkquality = 0;     /* The quality triangulation stage has not begun. */
+-  m->incirclecount = m->counterclockcount = m->orient3dcount = 0;
+-  m->hyperbolacount = m->circletopcount = m->circumcentercount = 0;
+-  randomseed = 1;
+-
+-  exactinit();                     /* Initialize exact arithmetic constants. */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  randomnation()   Generate a random number between 0 and `choices' - 1.   */
+-/*                                                                           */
+-/*  This is a simple linear congruential random number generator.  Hence, it */
+-/*  is a bad random number generator, but good enough for most randomized    */
+-/*  geometric algorithms.                                                    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-TRIANGLE_PTRINT randomnation(unsigned int choices)
+-#else /* not ANSI_DECLARATORS */
+-TRIANGLE_PTRINT randomnation(choices)
+-unsigned int choices;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  randomseed = (randomseed * 1366l + 150889l) % 714025l;
+-  return ( randomseed * (choices + 1 ) )/ 714025l;
+-}
+-
+-/********* Mesh quality testing routines begin here                  *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  checkmesh()   Test the mesh for topological consistency.                 */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void checkmesh(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void checkmesh(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri triangleloop;
+-  struct otri oppotri, oppooppotri;
+-  vertex triorg, tridest, triapex;
+-  vertex oppoorg, oppodest;
+-  int horrors;
+-  int saveexact;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  /* Temporarily turn on exact arithmetic if it's off. */
+-  saveexact = b->noexact;
+-  b->noexact = 0;
+-  if (!b->quiet) {
+-    printf("  Checking consistency of mesh...\n");
+-  }
+-  horrors = 0;
+-  /* Run through the list of triangles, checking each one. */
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    /* Check all three edges of the triangle. */
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      org(triangleloop, triorg);
+-      dest(triangleloop, tridest);
+-      if (triangleloop.orient == 0) {       /* Only test for inversion once. */
+-        /* Test if the triangle is flat or inverted. */
+-        apex(triangleloop, triapex);
+-        if (counterclockwise(m, b, triorg, tridest, triapex) <= 0.0) {
+-          printf("  !! !! Inverted ");
+-          printtriangle(m, b, &triangleloop);
+-          horrors++;
+-        }
+-      }
+-      /* Find the neighboring triangle on this edge. */
+-      sym(triangleloop, oppotri);
+-      if (oppotri.tri != m->dummytri) {
+-        /* Check that the triangle's neighbor knows it's a neighbor. */
+-        sym(oppotri, oppooppotri);
+-        if ((triangleloop.tri != oppooppotri.tri)
+-            || (triangleloop.orient != oppooppotri.orient)) {
+-          printf("  !! !! Asymmetric triangle-triangle bond:\n");
+-          if (triangleloop.tri == oppooppotri.tri) {
+-            printf("   (Right triangle, wrong orientation)\n");
+-          }
+-          printf("    First ");
+-          printtriangle(m, b, &triangleloop);
+-          printf("    Second (nonreciprocating) ");
+-          printtriangle(m, b, &oppotri);
+-          horrors++;
+-        }
+-        /* Check that both triangles agree on the identities */
+-        /*   of their shared vertices.                       */
+-        org(oppotri, oppoorg);
+-        dest(oppotri, oppodest);
+-        if ((triorg != oppodest) || (tridest != oppoorg)) {
+-          printf("  !! !! Mismatched edge coordinates between two triangles:\n"
+-                 );
+-          printf("    First mismatched ");
+-          printtriangle(m, b, &triangleloop);
+-          printf("    Second mismatched ");
+-          printtriangle(m, b, &oppotri);
+-          horrors++;
+-        }
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-  if (horrors == 0) {
+-    if (!b->quiet) {
+-      printf("  In my studied opinion, the mesh appears to be consistent.\n");
+-    }
+-  } else if (horrors == 1) {
+-    printf("  !! !! !! !! Precisely one festering wound discovered.\n");
+-  } else {
+-    printf("  !! !! !! !! %d abominations witnessed.\n", horrors);
+-  }
+-  /* Restore the status of exact arithmetic. */
+-  b->noexact = saveexact;
+-}
+-
+-#endif /* not REDUCED */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  checkdelaunay()   Ensure that the mesh is (constrained) Delaunay.        */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void checkdelaunay(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void checkdelaunay(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri triangleloop;
+-  struct otri oppotri;
+-  struct osub opposubseg;
+-  vertex triorg, tridest, triapex;
+-  vertex oppoapex;
+-  int shouldbedelaunay;
+-  int horrors;
+-  int saveexact;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  /* Temporarily turn on exact arithmetic if it's off. */
+-  saveexact = b->noexact;
+-  b->noexact = 0;
+-  if (!b->quiet) {
+-    printf("  Checking Delaunay property of mesh...\n");
+-  }
+-  horrors = 0;
+-  /* Run through the list of triangles, checking each one. */
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    /* Check all three edges of the triangle. */
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      org(triangleloop, triorg);
+-      dest(triangleloop, tridest);
+-      apex(triangleloop, triapex);
+-      sym(triangleloop, oppotri);
+-      apex(oppotri, oppoapex);
+-      /* Only test that the edge is locally Delaunay if there is an   */
+-      /*   adjoining triangle whose pointer is larger (to ensure that */
+-      /*   each pair isn't tested twice).                             */
+-      shouldbedelaunay = (oppotri.tri != m->dummytri) &&
+-            !deadtri(oppotri.tri) && (triangleloop.tri < oppotri.tri) &&
+-            (triorg != m->infvertex1) && (triorg != m->infvertex2) &&
+-            (triorg != m->infvertex3) &&
+-            (tridest != m->infvertex1) && (tridest != m->infvertex2) &&
+-            (tridest != m->infvertex3) &&
+-            (triapex != m->infvertex1) && (triapex != m->infvertex2) &&
+-            (triapex != m->infvertex3) &&
+-            (oppoapex != m->infvertex1) && (oppoapex != m->infvertex2) &&
+-            (oppoapex != m->infvertex3);
+-      if (m->checksegments && shouldbedelaunay) {
+-        /* If a subsegment separates the triangles, then the edge is */
+-        /*   constrained, so no local Delaunay test should be done.  */
+-        tspivot(triangleloop, opposubseg);
+-        if (opposubseg.ss != m->dummysub){
+-          shouldbedelaunay = 0;
+-        }
+-      }
+-      if (shouldbedelaunay) {
+-        if (nonregular(m, b, triorg, tridest, triapex, oppoapex) > 0.0) {
+-          if (!b->weighted) {
+-            printf("  !! !! Non-Delaunay pair of triangles:\n");
+-            printf("    First non-Delaunay ");
+-            printtriangle(m, b, &triangleloop);
+-            printf("    Second non-Delaunay ");
+-          } else {
+-            printf("  !! !! Non-regular pair of triangles:\n");
+-            printf("    First non-regular ");
+-            printtriangle(m, b, &triangleloop);
+-            printf("    Second non-regular ");
+-          }
+-          printtriangle(m, b, &oppotri);
+-          horrors++;
+-        }
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-  if (horrors == 0) {
+-    if (!b->quiet) {
+-      printf(
+-  "  By virtue of my perceptive intelligence, I declare the mesh Delaunay.\n");
+-    }
+-  } else if (horrors == 1) {
+-    printf(
+-         "  !! !! !! !! Precisely one terrifying transgression identified.\n");
+-  } else {
+-    printf("  !! !! !! !! %d obscenities viewed with horror.\n", horrors);
+-  }
+-  /* Restore the status of exact arithmetic. */
+-  b->noexact = saveexact;
+-}
+-
+-#endif /* not REDUCED */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  enqueuebadtriang()   Add a bad triangle data structure to the end of a   */
+-/*                       queue.                                              */
+-/*                                                                           */
+-/*  The queue is actually a set of 4096 queues.  I use multiple queues to    */
+-/*  give priority to smaller angles.  I originally implemented a heap, but   */
+-/*  the queues are faster by a larger margin than I'd suspected.             */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void enqueuebadtriang(struct mesh *m, struct behavior *b,
+-                      struct badtriang *badtri)
+-#else /* not ANSI_DECLARATORS */
+-void enqueuebadtriang(m, b, badtri)
+-struct mesh *m;
+-struct behavior *b;
+-struct badtriang *badtri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL length, multiplier;
+-  int exponent, expincrement;
+-  int queuenumber;
+-  int posexponent;
+-  int i;
+-
+-  if (b->verbose > 2) {
+-    printf("  Queueing bad triangle:\n");
+-    printf("    (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-           badtri->triangorg[0], badtri->triangorg[1],
+-           badtri->triangdest[0], badtri->triangdest[1],
+-           badtri->triangapex[0], badtri->triangapex[1]);
+-  }
+-
+-  /* Determine the appropriate queue to put the bad triangle into.    */
+-  /*   Recall that the key is the square of its shortest edge length. */
+-  if (badtri->key >= 1.0) {
+-    length = badtri->key;
+-    posexponent = 1;
+-  } else {
+-    /* `badtri->key' is 2.0 to a negative exponent, so we'll record that */
+-    /*   fact and use the reciprocal of `badtri->key', which is > 1.0.   */
+-    length = 1.0 / badtri->key;
+-    posexponent = 0;
+-  }
+-  /* `length' is approximately 2.0 to what exponent?  The following code */
+-  /*   determines the answer in time logarithmic in the exponent.        */
+-  exponent = 0;
+-  while (length > 2.0) {
+-    /* Find an approximation by repeated squaring of two. */
+-    expincrement = 1;
+-    multiplier = 0.5;
+-    while (length * multiplier * multiplier > 1.0) {
+-      expincrement *= 2;
+-      multiplier *= multiplier;
+-    }
+-    /* Reduce the value of `length', then iterate if necessary. */
+-    exponent += expincrement;
+-    length *= multiplier;
+-  }
+-  /* `length' is approximately squareroot(2.0) to what exponent? */
+-  exponent = (int) ( 2.0 * exponent + (length > SQUAREROOTTWO) );
+-  /* `exponent' is now in the range 0...2047 for IEEE double precision.   */
+-  /*   Choose a queue in the range 0...4095.  The shortest edges have the */
+-  /*   highest priority (queue 4095).                                     */
+-  if (posexponent) {
+-    queuenumber = 2047 - exponent;
+-  } else {
+-    queuenumber = 2048 + exponent;
+-  }
+-
+-  /* Are we inserting into an empty queue? */
+-  if (m->queuefront[queuenumber] == (struct badtriang *) NULL) {
+-    /* Yes, we are inserting into an empty queue.     */
+-    /*   Will this become the highest-priority queue? */
+-    if (queuenumber > m->firstnonemptyq) {
+-      /* Yes, this is the highest-priority queue. */
+-      m->nextnonemptyq[queuenumber] = m->firstnonemptyq;
+-      m->firstnonemptyq = queuenumber;
+-    } else {
+-      /* No, this is not the highest-priority queue. */
+-      /*   Find the queue with next higher priority. */
+-      i = queuenumber + 1;
+-      while (m->queuefront[i] == (struct badtriang *) NULL) {
+-        i++;
+-      }
+-      /* Mark the newly nonempty queue as following a higher-priority queue. */
+-      m->nextnonemptyq[queuenumber] = m->nextnonemptyq[i];
+-      m->nextnonemptyq[i] = queuenumber;
+-    }
+-    /* Put the bad triangle at the beginning of the (empty) queue. */
+-    m->queuefront[queuenumber] = badtri;
+-  } else {
+-    /* Add the bad triangle to the end of an already nonempty queue. */
+-    m->queuetail[queuenumber]->nexttriang = badtri;
+-  }
+-  /* Maintain a pointer to the last triangle of the queue. */
+-  m->queuetail[queuenumber] = badtri;
+-  /* Newly enqueued bad triangle has no successor in the queue. */
+-  badtri->nexttriang = (struct badtriang *) NULL;
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  enqueuebadtri()   Add a bad triangle to the end of a queue.              */
+-/*                                                                           */
+-/*  Allocates a badtriang data structure for the triangle, then passes it to */
+-/*  enqueuebadtriang().                                                      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void enqueuebadtri(struct mesh *m, struct behavior *b, struct otri *enqtri,
+-                   REAL minedge, vertex enqapex, vertex enqorg, vertex enqdest)
+-#else /* not ANSI_DECLARATORS */
+-void enqueuebadtri(m, b, enqtri, minedge, enqapex, enqorg, enqdest)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *enqtri;
+-REAL minedge;
+-vertex enqapex;
+-vertex enqorg;
+-vertex enqdest;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct badtriang *newbad;
+-
+-  /* Allocate space for the bad triangle. */
+-  newbad = (struct badtriang *) poolalloc(&m->badtriangles);
+-  newbad->poortri = encode(*enqtri);
+-  newbad->key = minedge;
+-  newbad->triangapex = enqapex;
+-  newbad->triangorg = enqorg;
+-  newbad->triangdest = enqdest;
+-  enqueuebadtriang(m, b, newbad);
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  dequeuebadtriang()   Remove a triangle from the front of the queue.      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-struct badtriang *dequeuebadtriang(struct mesh *m)
+-#else /* not ANSI_DECLARATORS */
+-struct badtriang *dequeuebadtriang(m)
+-struct mesh *m;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct badtriang *result;
+-
+-  /* If no queues are nonempty, return NULL. */
+-  if (m->firstnonemptyq < 0) {
+-    return (struct badtriang *) NULL;
+-  }
+-  /* Find the first triangle of the highest-priority queue. */
+-  result = m->queuefront[m->firstnonemptyq];
+-  /* Remove the triangle from the queue. */
+-  m->queuefront[m->firstnonemptyq] = result->nexttriang;
+-  /* If this queue is now empty, note the new highest-priority */
+-  /*   nonempty queue.                                         */
+-  if (result == m->queuetail[m->firstnonemptyq]) {
+-    m->firstnonemptyq = m->nextnonemptyq[m->firstnonemptyq];
+-  }
+-  return result;
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  checkseg4encroach()   Check a subsegment to see if it is encroached; add */
+-/*                        it to the list if it is.                           */
+-/*                                                                           */
+-/*  A subsegment is encroached if there is a vertex in its diametral lens.   */
+-/*  For Ruppert's algorithm (-D switch), the "diametral lens" is the         */
+-/*  diametral circle.  For Chew's algorithm (default), the diametral lens is */
+-/*  just big enough to enclose two isosceles triangles whose bases are the   */
+-/*  subsegment.  Each of the two isosceles triangles has two angles equal    */
+-/*  to `b->minangle'.                                                        */
+-/*                                                                           */
+-/*  Chew's algorithm does not require diametral lenses at all--but they save */
+-/*  time.  Any vertex inside a subsegment's diametral lens implies that the  */
+-/*  triangle adjoining the subsegment will be too skinny, so it's only a     */
+-/*  matter of time before the encroaching vertex is deleted by Chew's        */
+-/*  algorithm.  It's faster to simply not insert the doomed vertex in the    */
+-/*  first place, which is why I use diametral lenses with Chew's algorithm.  */
+-/*                                                                           */
+-/*  Returns a nonzero value if the subsegment is encroached.                 */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-int checkseg4encroach(struct mesh *m, struct behavior *b,
+-                      struct osub *testsubseg)
+-#else /* not ANSI_DECLARATORS */
+-int checkseg4encroach(m, b, testsubseg)
+-struct mesh *m;
+-struct behavior *b;
+-struct osub *testsubseg;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri neighbortri;
+-  struct osub testsym;
+-  struct badsubseg *encroachedseg;
+-  REAL dotproduct;
+-  int encroached;
+-  int sides;
+-  vertex eorg, edest, eapex;
+-  triangle ptr;                     /* Temporary variable used by stpivot(). */
+-
+-  encroached = 0;
+-  sides = 0;
+-
+-  sorg(*testsubseg, eorg);
+-  sdest(*testsubseg, edest);
+-  /* Check one neighbor of the subsegment. */
+-  stpivot(*testsubseg, neighbortri);
+-  /* Does the neighbor exist, or is this a boundary edge? */
+-  if (neighbortri.tri != m->dummytri) {
+-    sides++;
+-    /* Find a vertex opposite this subsegment. */
+-    apex(neighbortri, eapex);
+-    /* Check whether the apex is in the diametral lens of the subsegment */
+-    /*   (the diametral circle if `conformdel' is set).  A dot product   */
+-    /*   of two sides of the triangle is used to check whether the angle */
+-    /*   at the apex is greater than (180 - 2 `minangle') degrees (for   */
+-    /*   lenses; 90 degrees for diametral circles).                      */
+-    dotproduct = (eorg[0] - eapex[0]) * (edest[0] - eapex[0]) +
+-                 (eorg[1] - eapex[1]) * (edest[1] - eapex[1]);
+-    if (dotproduct < 0.0) {
+-      if (b->conformdel ||
+-          (dotproduct * dotproduct >=
+-           (2.0 * b->goodangle - 1.0) * (2.0 * b->goodangle - 1.0) *
+-           ((eorg[0] - eapex[0]) * (eorg[0] - eapex[0]) +
+-            (eorg[1] - eapex[1]) * (eorg[1] - eapex[1])) *
+-           ((edest[0] - eapex[0]) * (edest[0] - eapex[0]) +
+-            (edest[1] - eapex[1]) * (edest[1] - eapex[1])))) {
+-        encroached = 1;
+-      }
+-    }
+-  }
+-  /* Check the other neighbor of the subsegment. */
+-  ssym(*testsubseg, testsym);
+-  stpivot(testsym, neighbortri);
+-  /* Does the neighbor exist, or is this a boundary edge? */
+-  if (neighbortri.tri != m->dummytri) {
+-    sides++;
+-    /* Find the other vertex opposite this subsegment. */
+-    apex(neighbortri, eapex);
+-    /* Check whether the apex is in the diametral lens of the subsegment */
+-    /*   (or the diametral circle, if `conformdel' is set).              */
+-    dotproduct = (eorg[0] - eapex[0]) * (edest[0] - eapex[0]) +
+-                 (eorg[1] - eapex[1]) * (edest[1] - eapex[1]);
+-    if (dotproduct < 0.0) {
+-      if (b->conformdel ||
+-          (dotproduct * dotproduct >=
+-           (2.0 * b->goodangle - 1.0) * (2.0 * b->goodangle - 1.0) *
+-           ((eorg[0] - eapex[0]) * (eorg[0] - eapex[0]) +
+-            (eorg[1] - eapex[1]) * (eorg[1] - eapex[1])) *
+-           ((edest[0] - eapex[0]) * (edest[0] - eapex[0]) +
+-            (edest[1] - eapex[1]) * (edest[1] - eapex[1])))) {
+-        encroached += 2;
+-      }
+-    }
+-  }
+-
+-  if (encroached && (!b->nobisect || ((b->nobisect == 1) && (sides == 2)))) {
+-    if (b->verbose > 2) {
+-      printf(
+-        "  Queueing encroached subsegment (%.12g, %.12g) (%.12g, %.12g).\n",
+-        eorg[0], eorg[1], edest[0], edest[1]);
+-    }
+-    /* Add the subsegment to the list of encroached subsegments. */
+-    /*   Be sure to get the orientation right.                   */
+-    encroachedseg = (struct badsubseg *) poolalloc(&m->badsubsegs);
+-    if (encroached == 1) {
+-      encroachedseg->encsubseg = sencode(*testsubseg);
+-      encroachedseg->subsegorg = eorg;
+-      encroachedseg->subsegdest = edest;
+-    } else {
+-      encroachedseg->encsubseg = sencode(testsym);
+-      encroachedseg->subsegorg = edest;
+-      encroachedseg->subsegdest = eorg;
+-    }
+-  }
+-
+-  return encroached;
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  testtriangle()   Test a triangle for quality and size.                   */
+-/*                                                                           */
+-/*  Tests a triangle to see if it satisfies the minimum angle condition and  */
+-/*  the maximum area condition.  Triangles that aren't up to spec are added  */
+-/*  to the bad triangle queue.                                               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void testtriangle(struct mesh *m, struct behavior *b, struct otri *testtri)
+-#else /* not ANSI_DECLARATORS */
+-void testtriangle(m, b, testtri)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *testtri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri tri1, tri2;
+-  struct osub testsub;
+-  vertex torg, tdest, tapex;
+-  vertex base1, base2;
+-  vertex org1, dest1, org2, dest2;
+-  vertex joinvertex;
+-  REAL dxod, dyod, dxda, dyda, dxao, dyao;
+-  REAL dxod2, dyod2, dxda2, dyda2, dxao2, dyao2;
+-  REAL apexlen, orglen, destlen, minedge;
+-  REAL angle;
+-  REAL area;
+-  REAL dist1, dist2;
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-  triangle ptr;           /* Temporary variable used by oprev() and dnext(). */
+-
+-  org(*testtri, torg);
+-  dest(*testtri, tdest);
+-  apex(*testtri, tapex);
+-  dxod = torg[0] - tdest[0];
+-  dyod = torg[1] - tdest[1];
+-  dxda = tdest[0] - tapex[0];
+-  dyda = tdest[1] - tapex[1];
+-  dxao = tapex[0] - torg[0];
+-  dyao = tapex[1] - torg[1];
+-  dxod2 = dxod * dxod;
+-  dyod2 = dyod * dyod;
+-  dxda2 = dxda * dxda;
+-  dyda2 = dyda * dyda;
+-  dxao2 = dxao * dxao;
+-  dyao2 = dyao * dyao;
+-  /* Find the lengths of the triangle's three edges. */
+-  apexlen = dxod2 + dyod2;
+-  orglen = dxda2 + dyda2;
+-  destlen = dxao2 + dyao2;
+-
+-  if ((apexlen < orglen) && (apexlen < destlen)) {
+-    /* The edge opposite the apex is shortest. */
+-    minedge = apexlen;
+-    /* Find the square of the cosine of the angle at the apex. */
+-    angle = dxda * dxao + dyda * dyao;
+-    angle = angle * angle / (orglen * destlen);
+-    base1 = torg;
+-    base2 = tdest;
+-    otricopy(*testtri, tri1);
+-  } else if (orglen < destlen) {
+-    /* The edge opposite the origin is shortest. */
+-    minedge = orglen;
+-    /* Find the square of the cosine of the angle at the origin. */
+-    angle = dxod * dxao + dyod * dyao;
+-    angle = angle * angle / (apexlen * destlen);
+-    base1 = tdest;
+-    base2 = tapex;
+-    lnext(*testtri, tri1);
+-  } else {
+-    /* The edge opposite the destination is shortest. */
+-    minedge = destlen;
+-    /* Find the square of the cosine of the angle at the destination. */
+-    angle = dxod * dxda + dyod * dyda;
+-    angle = angle * angle / (apexlen * orglen);
+-    base1 = tapex;
+-    base2 = torg;
+-    lprev(*testtri, tri1);
+-  }
+-
+-  if (b->vararea || b->fixedarea || b->usertest) {
+-    /* Check whether the area is larger than permitted. */
+-    area = 0.5 * (dxod * dyda - dyod * dxda);
+-    if (b->fixedarea && (area > b->maxarea)) {
+-      /* Add this triangle to the list of bad triangles. */
+-      enqueuebadtri(m, b, testtri, minedge, tapex, torg, tdest);
+-      return;
+-    }
+-
+-    /* Nonpositive area constraints are treated as unconstrained. */
+-    if ((b->vararea) && (area > areabound(*testtri)) &&
+-        (areabound(*testtri) > 0.0)) {
+-      /* Add this triangle to the list of bad triangles. */
+-      enqueuebadtri(m, b, testtri, minedge, tapex, torg, tdest);
+-      return;
+-    }
+-
+-    if (b->usertest) {
+-      /* Check whether the user thinks this triangle is too large. */
+-      if (triunsuitable(torg, tdest, tapex, area)) {
+-        enqueuebadtri(m, b, testtri, minedge, tapex, torg, tdest);
+-        return;
+-      }
+-    }
+-  }
+-
+-  /* Check whether the angle is smaller than permitted. */
+-  if (angle > b->goodangle) {
+-    /* Use the rules of Miller, Pav, and Walkington to decide that certain */
+-    /*   triangles should not be split, even if they have bad angles.      */
+-    /*   A skinny triangle is not split if its shortest edge subtends a    */
+-    /*   small input angle, and both endpoints of the edge lie on a        */
+-    /*   concentric circular shell.  For convenience, I make a small       */
+-    /*   adjustment to that rule:  I check if the endpoints of the edge    */
+-    /*   both lie in segment interiors, equidistant from the apex where    */
+-    /*   the two segments meet.                                            */
+-    /* First, check if both points lie in segment interiors.               */
+-    if ((vertextype(base1) == SEGMENTVERTEX) &&
+-        (vertextype(base2) == SEGMENTVERTEX)) {
+-      /* Check if both points lie in a common segment.  If they do, the */
+-      /*   skinny triangle is enqueued to be split as usual.            */
+-      tspivot(tri1, testsub);
+-      if (testsub.ss == m->dummysub) {
+-        /* No common segment.  Find a subsegment that contains `torg'. */
+-        otricopy(tri1, tri2);
+-        do {
+-          oprevself(tri1);
+-          tspivot(tri1, testsub);
+-        } while (testsub.ss == m->dummysub);
+-        /* Find the endpoints of the containing segment. */
+-        segorg(testsub, org1);
+-        segdest(testsub, dest1);
+-        /* Find a subsegment that contains `tdest'. */
+-        do {
+-          dnextself(tri2);
+-          tspivot(tri2, testsub);
+-        } while (testsub.ss == m->dummysub);
+-        /* Find the endpoints of the containing segment. */
+-        segorg(testsub, org2);
+-        segdest(testsub, dest2);
+-        /* Check if the two containing segments have an endpoint in common. */
+-        joinvertex = (vertex) NULL;
+-        if ((dest1[0] == org2[0]) && (dest1[1] == org2[1])) {
+-          joinvertex = dest1;
+-        } else if ((org1[0] == dest2[0]) && (org1[1] == dest2[1])) {
+-          joinvertex = org1;
+-        }
+-        if (joinvertex != (vertex) NULL) {
+-          /* Compute the distance from the common endpoint (of the two  */
+-          /*   segments) to each of the endpoints of the shortest edge. */
+-          dist1 = ((base1[0] - joinvertex[0]) * (base1[0] - joinvertex[0]) +
+-                   (base1[1] - joinvertex[1]) * (base1[1] - joinvertex[1]));
+-          dist2 = ((base2[0] - joinvertex[0]) * (base2[0] - joinvertex[0]) +
+-                   (base2[1] - joinvertex[1]) * (base2[1] - joinvertex[1]));
+-          /* If the two distances are equal, don't split the triangle. */
+-          if ((dist1 < 1.001 * dist2) && (dist1 > 0.999 * dist2)) {
+-            /* Return now to avoid enqueueing the bad triangle. */
+-            return;
+-          }
+-        }
+-      }
+-    }
+-
+-    /* Add this triangle to the list of bad triangles. */
+-    enqueuebadtri(m, b, testtri, minedge, tapex, torg, tdest);
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Mesh quality testing routines end here                    *********/
+-
+-/********* Point location routines begin here                        *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  makevertexmap()   Construct a mapping from vertices to triangles to      */
+-/*                    improve the speed of point location for segment        */
+-/*                    insertion.                                             */
+-/*                                                                           */
+-/*  Traverses all the triangles, and provides each corner of each triangle   */
+-/*  with a pointer to that triangle.  Of course, pointers will be            */
+-/*  overwritten by other pointers because (almost) each vertex is a corner   */
+-/*  of several triangles, but in the end every vertex will point to some     */
+-/*  triangle that contains it.                                               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void makevertexmap(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void makevertexmap(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri triangleloop;
+-  vertex triorg;
+-
+-  if (b->verbose) {
+-    printf("    Constructing mapping from vertices to triangles.\n");
+-  }
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    /* Check all three vertices of the triangle. */
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      org(triangleloop, triorg);
+-      setvertex2tri(triorg, encode(triangleloop));
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  preciselocate()   Find a triangle or edge containing a given point.      */
+-/*                                                                           */
+-/*  Begins its search from `searchtri'.  It is important that `searchtri'    */
+-/*  be a handle with the property that `searchpoint' is strictly to the left */
+-/*  of the edge denoted by `searchtri', or is collinear with that edge and   */
+-/*  does not intersect that edge.  (In particular, `searchpoint' should not  */
+-/*  be the origin or destination of that edge.)                              */
+-/*                                                                           */
+-/*  These conditions are imposed because preciselocate() is normally used in */
+-/*  one of two situations:                                                   */
+-/*                                                                           */
+-/*  (1)  To try to find the location to insert a new point.  Normally, we    */
+-/*       know an edge that the point is strictly to the left of.  In the     */
+-/*       incremental Delaunay algorithm, that edge is a bounding box edge.   */
+-/*       In Ruppert's Delaunay refinement algorithm for quality meshing,     */
+-/*       that edge is the shortest edge of the triangle whose circumcenter   */
+-/*       is being inserted.                                                  */
+-/*                                                                           */
+-/*  (2)  To try to find an existing point.  In this case, any edge on the    */
+-/*       convex hull is a good starting edge.  You must screen out the       */
+-/*       possibility that the vertex sought is an endpoint of the starting   */
+-/*       edge before you call preciselocate().                               */
+-/*                                                                           */
+-/*  On completion, `searchtri' is a triangle that contains `searchpoint'.    */
+-/*                                                                           */
+-/*  This implementation differs from that given by Guibas and Stolfi.  It    */
+-/*  walks from triangle to triangle, crossing an edge only if `searchpoint'  */
+-/*  is on the other side of the line containing that edge.  After entering   */
+-/*  a triangle, there are two edges by which one can leave that triangle.    */
+-/*  If both edges are valid (`searchpoint' is on the other side of both      */
+-/*  edges), one of the two is chosen by drawing a line perpendicular to      */
+-/*  the entry edge (whose endpoints are `forg' and `fdest') passing through  */
+-/*  `fapex'.  Depending on which side of this perpendicular `searchpoint'    */
+-/*  falls on, an exit edge is chosen.                                        */
+-/*                                                                           */
+-/*  This implementation is empirically faster than the Guibas and Stolfi     */
+-/*  point location routine (which I originally used), which tends to spiral  */
+-/*  in toward its target.                                                    */
+-/*                                                                           */
+-/*  Returns ONVERTEX if the point lies on an existing vertex.  `searchtri'   */
+-/*  is a handle whose origin is the existing vertex.                         */
+-/*                                                                           */
+-/*  Returns ONEDGE if the point lies on a mesh edge.  `searchtri' is a       */
+-/*  handle whose primary edge is the edge on which the point lies.           */
+-/*                                                                           */
+-/*  Returns INTRIANGLE if the point lies strictly within a triangle.         */
+-/*  `searchtri' is a handle on the triangle that contains the point.         */
+-/*                                                                           */
+-/*  Returns OUTSIDE if the point lies outside the mesh.  `searchtri' is a    */
+-/*  handle whose primary edge the point is to the right of.  This might      */
+-/*  occur when the circumcenter of a triangle falls just slightly outside    */
+-/*  the mesh due to floating-point roundoff error.  It also occurs when      */
+-/*  seeking a hole or region point that a foolish user has placed outside    */
+-/*  the mesh.                                                                */
+-/*                                                                           */
+-/*  If `stopatsubsegment' is nonzero, the search will stop if it tries to    */
+-/*  walk through a subsegment, and will return OUTSIDE.                      */
+-/*                                                                           */
+-/*  WARNING:  This routine is designed for convex triangulations, and will   */
+-/*  not generally work after the holes and concavities have been carved.     */
+-/*  However, it can still be used to find the circumcenter of a triangle, as */
+-/*  long as the search is begun from the triangle in question.               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-enum locateresult preciselocate(struct mesh *m, struct behavior *b,
+-                                vertex searchpoint, struct otri *searchtri,
+-                                int stopatsubsegment)
+-#else /* not ANSI_DECLARATORS */
+-enum locateresult preciselocate(m, b, searchpoint, searchtri, stopatsubsegment)
+-struct mesh *m;
+-struct behavior *b;
+-vertex searchpoint;
+-struct otri *searchtri;
+-int stopatsubsegment;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri backtracktri;
+-  struct osub checkedge;
+-  vertex forg, fdest, fapex;
+-  REAL orgorient, destorient;
+-  int moveleft;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  if (b->verbose > 2) {
+-    printf("  Searching for point (%.12g, %.12g).\n",
+-           searchpoint[0], searchpoint[1]);
+-  }
+-  /* Where are we? */
+-  org(*searchtri, forg);
+-  dest(*searchtri, fdest);
+-  apex(*searchtri, fapex);
+-  while (1) {
+-    if (b->verbose > 2) {
+-      printf("    At (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-             forg[0], forg[1], fdest[0], fdest[1], fapex[0], fapex[1]);
+-    }
+-    /* Check whether the apex is the point we seek. */
+-    if ((fapex[0] == searchpoint[0]) && (fapex[1] == searchpoint[1])) {
+-      lprevself(*searchtri);
+-      return ONVERTEX;
+-    }
+-    /* Does the point lie on the other side of the line defined by the */
+-    /*   triangle edge opposite the triangle's destination?            */
+-    destorient = counterclockwise(m, b, forg, fapex, searchpoint);
+-    /* Does the point lie on the other side of the line defined by the */
+-    /*   triangle edge opposite the triangle's origin?                 */
+-    orgorient = counterclockwise(m, b, fapex, fdest, searchpoint);
+-    if (destorient > 0.0) {
+-      if (orgorient > 0.0) {
+-        /* Move left if the inner product of (fapex - searchpoint) and  */
+-        /*   (fdest - forg) is positive.  This is equivalent to drawing */
+-        /*   a line perpendicular to the line (forg, fdest) and passing */
+-        /*   through `fapex', and determining which side of this line   */
+-        /*   `searchpoint' falls on.                                    */
+-        moveleft = (fapex[0] - searchpoint[0]) * (fdest[0] - forg[0]) +
+-                   (fapex[1] - searchpoint[1]) * (fdest[1] - forg[1]) > 0.0;
+-      } else {
+-        moveleft = 1;
+-      }
+-    } else {
+-      if (orgorient > 0.0) {
+-        moveleft = 0;
+-      } else {
+-        /* The point we seek must be on the boundary of or inside this */
+-        /*   triangle.                                                 */
+-        if (destorient == 0.0) {
+-          lprevself(*searchtri);
+-          return ONEDGE;
+-        }
+-        if (orgorient == 0.0) {
+-          lnextself(*searchtri);
+-          return ONEDGE;
+-        }
+-        return INTRIANGLE;
+-      }
+-    }
+-
+-    /* Move to another triangle.  Leave a trace `backtracktri' in case */
+-    /*   floating-point roundoff or some such bogey causes us to walk  */
+-    /*   off a boundary of the triangulation.                          */
+-    if (moveleft) {
+-      lprev(*searchtri, backtracktri);
+-      fdest = fapex;
+-    } else {
+-      lnext(*searchtri, backtracktri);
+-      forg = fapex;
+-    }
+-    sym(backtracktri, *searchtri);
+-
+-    if (m->checksegments && stopatsubsegment) {
+-      /* Check for walking through a subsegment. */
+-      tspivot(backtracktri, checkedge);
+-      if (checkedge.ss != m->dummysub) {
+-        /* Go back to the last triangle. */
+-        otricopy(backtracktri, *searchtri);
+-        return OUTSIDE;
+-      }
+-    }
+-    /* Check for walking right out of the triangulation. */
+-    if (searchtri->tri == m->dummytri) {
+-      /* Go back to the last triangle. */
+-      otricopy(backtracktri, *searchtri);
+-      return OUTSIDE;
+-    }
+-
+-    apex(*searchtri, fapex);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  locate()   Find a triangle or edge containing a given point.             */
+-/*                                                                           */
+-/*  Searching begins from one of:  the input `searchtri', a recently         */
+-/*  encountered triangle `recenttri', or from a triangle chosen from a       */
+-/*  random sample.  The choice is made by determining which triangle's       */
+-/*  origin is closest to the point we are searching for.  Normally,          */
+-/*  `searchtri' should be a handle on the convex hull of the triangulation.  */
+-/*                                                                           */
+-/*  Details on the random sampling method can be found in the Mucke, Saias,  */
+-/*  and Zhu paper cited in the header of this code.                          */
+-/*                                                                           */
+-/*  On completion, `searchtri' is a triangle that contains `searchpoint'.    */
+-/*                                                                           */
+-/*  Returns ONVERTEX if the point lies on an existing vertex.  `searchtri'   */
+-/*  is a handle whose origin is the existing vertex.                         */
+-/*                                                                           */
+-/*  Returns ONEDGE if the point lies on a mesh edge.  `searchtri' is a       */
+-/*  handle whose primary edge is the edge on which the point lies.           */
+-/*                                                                           */
+-/*  Returns INTRIANGLE if the point lies strictly within a triangle.         */
+-/*  `searchtri' is a handle on the triangle that contains the point.         */
+-/*                                                                           */
+-/*  Returns OUTSIDE if the point lies outside the mesh.  `searchtri' is a    */
+-/*  handle whose primary edge the point is to the right of.  This might      */
+-/*  occur when the circumcenter of a triangle falls just slightly outside    */
+-/*  the mesh due to floating-point roundoff error.  It also occurs when      */
+-/*  seeking a hole or region point that a foolish user has placed outside    */
+-/*  the mesh.                                                                */
+-/*                                                                           */
+-/*  WARNING:  This routine is designed for convex triangulations, and will   */
+-/*  not generally work after the holes and concavities have been carved.     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-enum locateresult locate(struct mesh *m, struct behavior *b,
+-                         vertex searchpoint, struct otri *searchtri)
+-#else /* not ANSI_DECLARATORS */
+-enum locateresult locate(m, b, searchpoint, searchtri)
+-struct mesh *m;
+-struct behavior *b;
+-vertex searchpoint;
+-struct otri *searchtri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  void **sampleblock;
+-  char *firsttri;
+-  struct otri sampletri;
+-  vertex torg, tdest;
+-  TRIANGLE_PTRINT alignptr;
+-  REAL searchdist, dist;
+-  REAL ahead;
+-  long samplesperblock, totalsamplesleft, samplesleft;
+-  long population, totalpopulation;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  if (b->verbose > 2) {
+-    printf("  Randomly sampling for a triangle near point (%.12g, %.12g).\n",
+-           searchpoint[0], searchpoint[1]);
+-  }
+-  /* Record the distance from the suggested starting triangle to the */
+-  /*   point we seek.                                                */
+-  org(*searchtri, torg);
+-  searchdist = (searchpoint[0] - torg[0]) * (searchpoint[0] - torg[0]) +
+-               (searchpoint[1] - torg[1]) * (searchpoint[1] - torg[1]);
+-  if (b->verbose > 2) {
+-    printf("    Boundary triangle has origin (%.12g, %.12g).\n",
+-           torg[0], torg[1]);
+-  }
+-
+-  /* If a recently encountered triangle has been recorded and has not been */
+-  /*   deallocated, test it as a good starting point.                      */
+-  if (m->recenttri.tri != (triangle *) NULL) {
+-    if (!deadtri(m->recenttri.tri)) {
+-      org(m->recenttri, torg);
+-      if ((torg[0] == searchpoint[0]) && (torg[1] == searchpoint[1])) {
+-        otricopy(m->recenttri, *searchtri);
+-        return ONVERTEX;
+-      }
+-      dist = (searchpoint[0] - torg[0]) * (searchpoint[0] - torg[0]) +
+-             (searchpoint[1] - torg[1]) * (searchpoint[1] - torg[1]);
+-      if (dist < searchdist) {
+-        otricopy(m->recenttri, *searchtri);
+-        searchdist = dist;
+-        if (b->verbose > 2) {
+-          printf("    Choosing recent triangle with origin (%.12g, %.12g).\n",
+-                 torg[0], torg[1]);
+-        }
+-      }
+-    }
+-  }
+-
+-  /* The number of random samples taken is proportional to the cube root of */
+-  /*   the number of triangles in the mesh.  The next bit of code assumes   */
+-  /*   that the number of triangles increases monotonically (or at least    */
+-  /*   doesn't decrease enough to matter).                                  */
+-  while (SAMPLEFACTOR * m->samples * m->samples * m->samples <
+-         m->triangles.items) {
+-    m->samples++;
+-  }
+-
+-  /* We'll draw ceiling(samples * TRIPERBLOCK / maxitems) random samples  */
+-  /*   from each block of triangles (except the first)--until we meet the */
+-  /*   sample quota.  The ceiling means that blocks at the end might be   */
+-  /*   neglected, but I don't care.                                       */
+-  samplesperblock = (m->samples * TRIPERBLOCK - 1) / m->triangles.maxitems + 1;
+-  /* We'll draw ceiling(samples * itemsfirstblock / maxitems) random samples */
+-  /*   from the first block of triangles.                                    */
+-  samplesleft = (m->samples * m->triangles.itemsfirstblock - 1) /
+-                m->triangles.maxitems + 1;
+-  totalsamplesleft = m->samples;
+-  population = m->triangles.itemsfirstblock;
+-  totalpopulation = m->triangles.maxitems;
+-  sampleblock = m->triangles.firstblock;
+-  sampletri.orient = 0;
+-  while (totalsamplesleft > 0) {
+-    /* If we're in the last block, `population' needs to be corrected. */
+-    if (population > totalpopulation) {
+-      population = totalpopulation;
+-    }
+-    /* Find a pointer to the first triangle in the block. */
+-    alignptr = (TRIANGLE_PTRINT) (sampleblock + 1);
+-    firsttri = (char *) (alignptr +
+-                         (TRIANGLE_PTRINT) m->triangles.alignbytes -
+-                         (alignptr %
+-                          (TRIANGLE_PTRINT) m->triangles.alignbytes));
+-
+-    /* Choose `samplesleft' randomly sampled triangles in this block. */
+-    do {
+-      sampletri.tri = (triangle *) (firsttri +
+-                                    (randomnation((unsigned int) population) *
+-                                     m->triangles.itembytes));
+-      if (!deadtri(sampletri.tri)) {
+-        org(sampletri, torg);
+-        dist = (searchpoint[0] - torg[0]) * (searchpoint[0] - torg[0]) +
+-               (searchpoint[1] - torg[1]) * (searchpoint[1] - torg[1]);
+-        if (dist < searchdist) {
+-          otricopy(sampletri, *searchtri);
+-          searchdist = dist;
+-          if (b->verbose > 2) {
+-            printf("    Choosing triangle with origin (%.12g, %.12g).\n",
+-                   torg[0], torg[1]);
+-          }
+-        }
+-      }
+-
+-      samplesleft--;
+-      totalsamplesleft--;
+-    } while ((samplesleft > 0) && (totalsamplesleft > 0));
+-
+-    if (totalsamplesleft > 0) {
+-      sampleblock = (void **) *sampleblock;
+-      samplesleft = samplesperblock;
+-      totalpopulation -= population;
+-      population = TRIPERBLOCK;
+-    }
+-  }
+-
+-  /* Where are we? */
+-  org(*searchtri, torg);
+-  dest(*searchtri, tdest);
+-  /* Check the starting triangle's vertices. */
+-  if ((torg[0] == searchpoint[0]) && (torg[1] == searchpoint[1])) {
+-    return ONVERTEX;
+-  }
+-  if ((tdest[0] == searchpoint[0]) && (tdest[1] == searchpoint[1])) {
+-    lnextself(*searchtri);
+-    return ONVERTEX;
+-  }
+-  /* Orient `searchtri' to fit the preconditions of calling preciselocate(). */
+-  ahead = counterclockwise(m, b, torg, tdest, searchpoint);
+-  if (ahead < 0.0) {
+-    /* Turn around so that `searchpoint' is to the left of the */
+-    /*   edge specified by `searchtri'.                        */
+-    symself(*searchtri);
+-  } else if (ahead == 0.0) {
+-    /* Check if `searchpoint' is between `torg' and `tdest'. */
+-    if (((torg[0] < searchpoint[0]) == (searchpoint[0] < tdest[0])) &&
+-        ((torg[1] < searchpoint[1]) == (searchpoint[1] < tdest[1]))) {
+-      return ONEDGE;
+-    }
+-  }
+-  return preciselocate(m, b, searchpoint, searchtri, 0);
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Point location routines end here                          *********/
+-
+-/********* Mesh transformation routines begin here                   *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  insertsubseg()   Create a new subsegment and insert it between two       */
+-/*                   triangles.                                              */
+-/*                                                                           */
+-/*  The new subsegment is inserted at the edge described by the handle       */
+-/*  `tri'.  Its vertices are properly initialized.  The marker `subsegmark'  */
+-/*  is applied to the subsegment and, if appropriate, its vertices.          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void insertsubseg(struct mesh *m, struct behavior *b, struct otri *tri,
+-                  int subsegmark)
+-#else /* not ANSI_DECLARATORS */
+-void insertsubseg(m, b, tri, subsegmark)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *tri;             /* Edge at which to insert the new subsegment. */
+-int subsegmark;                            /* Marker for the new subsegment. */
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri oppotri;
+-  struct osub newsubseg;
+-  vertex triorg, tridest;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  org(*tri, triorg);
+-  dest(*tri, tridest);
+-  /* Mark vertices if possible. */
+-  if (vertexmark(triorg) == 0) {
+-    setvertexmark(triorg, subsegmark);
+-  }
+-  if (vertexmark(tridest) == 0) {
+-    setvertexmark(tridest, subsegmark);
+-  }
+-  /* Check if there's already a subsegment here. */
+-  tspivot(*tri, newsubseg);
+-  if (newsubseg.ss == m->dummysub) {
+-    /* Make new subsegment and initialize its vertices. */
+-    makesubseg(m, &newsubseg);
+-    setsorg(newsubseg, tridest);
+-    setsdest(newsubseg, triorg);
+-    setsegorg(newsubseg, tridest);
+-    setsegdest(newsubseg, triorg);
+-    /* Bond new subsegment to the two triangles it is sandwiched between. */
+-    /*   Note that the facing triangle `oppotri' might be equal to        */
+-    /*   `dummytri' (outer space), but the new subsegment is bonded to it */
+-    /*   all the same.                                                    */
+-    tsbond(*tri, newsubseg);
+-    sym(*tri, oppotri);
+-    ssymself(newsubseg);
+-    tsbond(oppotri, newsubseg);
+-    setmark(newsubseg, subsegmark);
+-    if (b->verbose > 2) {
+-      printf("  Inserting new ");
+-      printsubseg(m, b, &newsubseg);
+-    }
+-  } else {
+-    if (mark(newsubseg) == 0) {
+-      setmark(newsubseg, subsegmark);
+-    }
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  Terminology                                                              */
+-/*                                                                           */
+-/*  A "local transformation" replaces a small set of triangles with another  */
+-/*  set of triangles.  This may or may not involve inserting or deleting a   */
+-/*  vertex.                                                                  */
+-/*                                                                           */
+-/*  The term "casing" is used to describe the set of triangles that are      */
+-/*  attached to the triangles being transformed, but are not transformed     */
+-/*  themselves.  Think of the casing as a fixed hollow structure inside      */
+-/*  which all the action happens.  A "casing" is only defined relative to    */
+-/*  a single transformation; each occurrence of a transformation will        */
+-/*  involve a different casing.                                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  flip()   Transform two triangles to two different triangles by flipping  */
+-/*           an edge counterclockwise within a quadrilateral.                */
+-/*                                                                           */
+-/*  Imagine the original triangles, abc and bad, oriented so that the        */
+-/*  shared edge ab lies in a horizontal plane, with the vertex b on the left */
+-/*  and the vertex a on the right.  The vertex c lies below the edge, and    */
+-/*  the vertex d lies above the edge.  The `flipedge' handle holds the edge  */
+-/*  ab of triangle abc, and is directed left, from vertex a to vertex b.     */
+-/*                                                                           */
+-/*  The triangles abc and bad are deleted and replaced by the triangles cdb  */
+-/*  and dca.  The triangles that represent abc and bad are NOT deallocated;  */
+-/*  they are reused for dca and cdb, respectively.  Hence, any handles that  */
+-/*  may have held the original triangles are still valid, although not       */
+-/*  directed as they were before.                                            */
+-/*                                                                           */
+-/*  Upon completion of this routine, the `flipedge' handle holds the edge    */
+-/*  dc of triangle dca, and is directed down, from vertex d to vertex c.     */
+-/*  (Hence, the two triangles have rotated counterclockwise.)                */
+-/*                                                                           */
+-/*  WARNING:  This transformation is geometrically valid only if the         */
+-/*  quadrilateral adbc is convex.  Furthermore, this transformation is       */
+-/*  valid only if there is not a subsegment between the triangles abc and    */
+-/*  bad.  This routine does not check either of these preconditions, and     */
+-/*  it is the responsibility of the calling routine to ensure that they are  */
+-/*  met.  If they are not, the streets shall be filled with wailing and      */
+-/*  gnashing of teeth.                                                       */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void flip(struct mesh *m, struct behavior *b, struct otri *flipedge)
+-#else /* not ANSI_DECLARATORS */
+-void flip(m, b, flipedge)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *flipedge;                    /* Handle for the triangle abc. */
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri botleft, botright;
+-  struct otri topleft, topright;
+-  struct otri top;
+-  struct otri botlcasing, botrcasing;
+-  struct otri toplcasing, toprcasing;
+-  struct osub botlsubseg, botrsubseg;
+-  struct osub toplsubseg, toprsubseg;
+-  vertex leftvertex, rightvertex, botvertex;
+-  vertex farvertex;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  /* Identify the vertices of the quadrilateral. */
+-  org(*flipedge, rightvertex);
+-  dest(*flipedge, leftvertex);
+-  apex(*flipedge, botvertex);
+-  sym(*flipedge, top);
+-#ifdef SELF_CHECK
+-  if (top.tri == m->dummytri) {
+-    printf("Internal error in flip():  Attempt to flip on boundary.\n");
+-    lnextself(*flipedge);
+-    return;
+-  }
+-  if (m->checksegments) {
+-    tspivot(*flipedge, toplsubseg);
+-    if (toplsubseg.ss != m->dummysub) {
+-      printf("Internal error in flip():  Attempt to flip a segment.\n");
+-      lnextself(*flipedge);
+-      return;
+-    }
+-  }
+-#endif /* SELF_CHECK */
+-  apex(top, farvertex);
+-
+-  /* Identify the casing of the quadrilateral. */
+-  lprev(top, topleft);
+-  sym(topleft, toplcasing);
+-  lnext(top, topright);
+-  sym(topright, toprcasing);
+-  lnext(*flipedge, botleft);
+-  sym(botleft, botlcasing);
+-  lprev(*flipedge, botright);
+-  sym(botright, botrcasing);
+-  /* Rotate the quadrilateral one-quarter turn counterclockwise. */
+-  bond(topleft, botlcasing);
+-  bond(botleft, botrcasing);
+-  bond(botright, toprcasing);
+-  bond(topright, toplcasing);
+-
+-  if (m->checksegments) {
+-    /* Check for subsegments and rebond them to the quadrilateral. */
+-    tspivot(topleft, toplsubseg);
+-    tspivot(botleft, botlsubseg);
+-    tspivot(botright, botrsubseg);
+-    tspivot(topright, toprsubseg);
+-    if (toplsubseg.ss == m->dummysub) {
+-      tsdissolve(topright);
+-    } else {
+-      tsbond(topright, toplsubseg);
+-    }
+-    if (botlsubseg.ss == m->dummysub) {
+-      tsdissolve(topleft);
+-    } else {
+-      tsbond(topleft, botlsubseg);
+-    }
+-    if (botrsubseg.ss == m->dummysub) {
+-      tsdissolve(botleft);
+-    } else {
+-      tsbond(botleft, botrsubseg);
+-    }
+-    if (toprsubseg.ss == m->dummysub) {
+-      tsdissolve(botright);
+-    } else {
+-      tsbond(botright, toprsubseg);
+-    }
+-  }
+-
+-  /* New vertex assignments for the rotated quadrilateral. */
+-  setorg(*flipedge, farvertex);
+-  setdest(*flipedge, botvertex);
+-  setapex(*flipedge, rightvertex);
+-  setorg(top, botvertex);
+-  setdest(top, farvertex);
+-  setapex(top, leftvertex);
+-  if (b->verbose > 2) {
+-    printf("  Edge flip results in left ");
+-    printtriangle(m, b, &top);
+-    printf("  and right ");
+-    printtriangle(m, b, flipedge);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  unflip()   Transform two triangles to two different triangles by         */
+-/*             flipping an edge clockwise within a quadrilateral.  Reverses  */
+-/*             the flip() operation so that the data structures representing */
+-/*             the triangles are back where they were before the flip().     */
+-/*                                                                           */
+-/*  Imagine the original triangles, abc and bad, oriented so that the        */
+-/*  shared edge ab lies in a horizontal plane, with the vertex b on the left */
+-/*  and the vertex a on the right.  The vertex c lies below the edge, and    */
+-/*  the vertex d lies above the edge.  The `flipedge' handle holds the edge  */
+-/*  ab of triangle abc, and is directed left, from vertex a to vertex b.     */
+-/*                                                                           */
+-/*  The triangles abc and bad are deleted and replaced by the triangles cdb  */
+-/*  and dca.  The triangles that represent abc and bad are NOT deallocated;  */
+-/*  they are reused for cdb and dca, respectively.  Hence, any handles that  */
+-/*  may have held the original triangles are still valid, although not       */
+-/*  directed as they were before.                                            */
+-/*                                                                           */
+-/*  Upon completion of this routine, the `flipedge' handle holds the edge    */
+-/*  cd of triangle cdb, and is directed up, from vertex c to vertex d.       */
+-/*  (Hence, the two triangles have rotated clockwise.)                       */
+-/*                                                                           */
+-/*  WARNING:  This transformation is geometrically valid only if the         */
+-/*  quadrilateral adbc is convex.  Furthermore, this transformation is       */
+-/*  valid only if there is not a subsegment between the triangles abc and    */
+-/*  bad.  This routine does not check either of these preconditions, and     */
+-/*  it is the responsibility of the calling routine to ensure that they are  */
+-/*  met.  If they are not, the streets shall be filled with wailing and      */
+-/*  gnashing of teeth.                                                       */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void unflip(struct mesh *m, struct behavior *b, struct otri *flipedge)
+-#else /* not ANSI_DECLARATORS */
+-void unflip(m, b, flipedge)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *flipedge;                    /* Handle for the triangle abc. */
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri botleft, botright;
+-  struct otri topleft, topright;
+-  struct otri top;
+-  struct otri botlcasing, botrcasing;
+-  struct otri toplcasing, toprcasing;
+-  struct osub botlsubseg, botrsubseg;
+-  struct osub toplsubseg, toprsubseg;
+-  vertex leftvertex, rightvertex, botvertex;
+-  vertex farvertex;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  /* Identify the vertices of the quadrilateral. */
+-  org(*flipedge, rightvertex);
+-  dest(*flipedge, leftvertex);
+-  apex(*flipedge, botvertex);
+-  sym(*flipedge, top);
+-#ifdef SELF_CHECK
+-  if (top.tri == m->dummytri) {
+-    printf("Internal error in unflip():  Attempt to flip on boundary.\n");
+-    lnextself(*flipedge);
+-    return;
+-  }
+-  if (m->checksegments) {
+-    tspivot(*flipedge, toplsubseg);
+-    if (toplsubseg.ss != m->dummysub) {
+-      printf("Internal error in unflip():  Attempt to flip a subsegment.\n");
+-      lnextself(*flipedge);
+-      return;
+-    }
+-  }
+-#endif /* SELF_CHECK */
+-  apex(top, farvertex);
+-
+-  /* Identify the casing of the quadrilateral. */
+-  lprev(top, topleft);
+-  sym(topleft, toplcasing);
+-  lnext(top, topright);
+-  sym(topright, toprcasing);
+-  lnext(*flipedge, botleft);
+-  sym(botleft, botlcasing);
+-  lprev(*flipedge, botright);
+-  sym(botright, botrcasing);
+-  /* Rotate the quadrilateral one-quarter turn clockwise. */
+-  bond(topleft, toprcasing);
+-  bond(botleft, toplcasing);
+-  bond(botright, botlcasing);
+-  bond(topright, botrcasing);
+-
+-  if (m->checksegments) {
+-    /* Check for subsegments and rebond them to the quadrilateral. */
+-    tspivot(topleft, toplsubseg);
+-    tspivot(botleft, botlsubseg);
+-    tspivot(botright, botrsubseg);
+-    tspivot(topright, toprsubseg);
+-    if (toplsubseg.ss == m->dummysub) {
+-      tsdissolve(botleft);
+-    } else {
+-      tsbond(botleft, toplsubseg);
+-    }
+-    if (botlsubseg.ss == m->dummysub) {
+-      tsdissolve(botright);
+-    } else {
+-      tsbond(botright, botlsubseg);
+-    }
+-    if (botrsubseg.ss == m->dummysub) {
+-      tsdissolve(topright);
+-    } else {
+-      tsbond(topright, botrsubseg);
+-    }
+-    if (toprsubseg.ss == m->dummysub) {
+-      tsdissolve(topleft);
+-    } else {
+-      tsbond(topleft, toprsubseg);
+-    }
+-  }
+-
+-  /* New vertex assignments for the rotated quadrilateral. */
+-  setorg(*flipedge, botvertex);
+-  setdest(*flipedge, farvertex);
+-  setapex(*flipedge, leftvertex);
+-  setorg(top, farvertex);
+-  setdest(top, botvertex);
+-  setapex(top, rightvertex);
+-  if (b->verbose > 2) {
+-    printf("  Edge unflip results in left ");
+-    printtriangle(m, b, flipedge);
+-    printf("  and right ");
+-    printtriangle(m, b, &top);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  insertvertex()   Insert a vertex into a Delaunay triangulation,          */
+-/*                   performing flips as necessary to maintain the Delaunay  */
+-/*                   property.                                               */
+-/*                                                                           */
+-/*  The point `insertvertex' is located.  If `searchtri.tri' is not NULL,    */
+-/*  the search for the containing triangle begins from `searchtri'.  If      */
+-/*  `searchtri.tri' is NULL, a full point location procedure is called.      */
+-/*  If `insertvertex' is found inside a triangle, the triangle is split into */
+-/*  three; if `insertvertex' lies on an edge, the edge is split in two,      */
+-/*  thereby splitting the two adjacent triangles into four.  Edge flips are  */
+-/*  used to restore the Delaunay property.  If `insertvertex' lies on an     */
+-/*  existing vertex, no action is taken, and the value DUPLICATEVERTEX is    */
+-/*  returned.  On return, `searchtri' is set to a handle whose origin is the */
+-/*  existing vertex.                                                         */
+-/*                                                                           */
+-/*  Normally, the parameter `splitseg' is set to NULL, implying that no      */
+-/*  subsegment should be split.  In this case, if `insertvertex' is found to */
+-/*  lie on a segment, no action is taken, and the value VIOLATINGVERTEX is   */
+-/*  returned.  On return, `searchtri' is set to a handle whose primary edge  */
+-/*  is the violated subsegment.                                              */
+-/*                                                                           */
+-/*  If the calling routine wishes to split a subsegment by inserting a       */
+-/*  vertex in it, the parameter `splitseg' should be that subsegment.  In    */
+-/*  this case, `searchtri' MUST be the triangle handle reached by pivoting   */
+-/*  from that subsegment; no point location is done.                         */
+-/*                                                                           */
+-/*  `segmentflaws' and `triflaws' are flags that indicate whether or not     */
+-/*  there should be checks for the creation of encroached subsegments or bad */
+-/*  quality triangles.  If a newly inserted vertex encroaches upon           */
+-/*  subsegments, these subsegments are added to the list of subsegments to   */
+-/*  be split if `segmentflaws' is set.  If bad triangles are created, these  */
+-/*  are added to the queue if `triflaws' is set.                             */
+-/*                                                                           */
+-/*  If a duplicate vertex or violated segment does not prevent the vertex    */
+-/*  from being inserted, the return value will be ENCROACHINGVERTEX if the   */
+-/*  vertex encroaches upon a subsegment (and checking is enabled), or        */
+-/*  SUCCESSFULVERTEX otherwise.  In either case, `searchtri' is set to a     */
+-/*  handle whose origin is the newly inserted vertex.                        */
+-/*                                                                           */
+-/*  insertvertex() does not use flip() for reasons of speed; some            */
+-/*  information can be reused from edge flip to edge flip, like the          */
+-/*  locations of subsegments.                                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-enum insertvertexresult insertvertex(struct mesh *m, struct behavior *b,
+-                                     vertex newvertex, struct otri *searchtri,
+-                                     struct osub *splitseg,
+-                                     int segmentflaws, int triflaws)
+-#else /* not ANSI_DECLARATORS */
+-enum insertvertexresult insertvertex(m, b, newvertex, searchtri, splitseg,
+-                                     segmentflaws, triflaws)
+-struct mesh *m;
+-struct behavior *b;
+-vertex newvertex;
+-struct otri *searchtri;
+-struct osub *splitseg;
+-int segmentflaws;
+-int triflaws;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri horiz;
+-  struct otri top;
+-  struct otri botleft, botright;
+-  struct otri topleft, topright;
+-  struct otri newbotleft, newbotright;
+-  struct otri newtopright;
+-  struct otri botlcasing, botrcasing;
+-  struct otri toplcasing, toprcasing;
+-  struct otri testtri;
+-  struct osub botlsubseg, botrsubseg;
+-  struct osub toplsubseg, toprsubseg;
+-  struct osub brokensubseg;
+-  struct osub checksubseg;
+-  struct osub rightsubseg;
+-  struct osub newsubseg;
+-  struct badsubseg *encroached;
+-  struct flipstacker *newflip;
+-  vertex first;
+-  vertex leftvertex, rightvertex, botvertex, topvertex, farvertex;
+-  vertex segmentorg, segmentdest;
+-  REAL attrib;
+-  REAL area;
+-  enum insertvertexresult success;
+-  enum locateresult intersect;
+-  int doflip;
+-  int mirrorflag;
+-  int enq;
+-  int i;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;         /* Temporary variable used by spivot() and tspivot(). */
+-
+-  if (b->verbose > 1) {
+-    printf("  Inserting (%.12g, %.12g).\n", newvertex[0], newvertex[1]);
+-  }
+-
+-  if (splitseg == (struct osub *) NULL) {
+-    /* Find the location of the vertex to be inserted.  Check if a good */
+-    /*   starting triangle has already been provided by the caller.     */
+-    if (searchtri->tri == m->dummytri) {
+-      /* Find a boundary triangle. */
+-      horiz.tri = m->dummytri;
+-      horiz.orient = 0;
+-      symself(horiz);
+-      /* Search for a triangle containing `newvertex'. */
+-      intersect = locate(m, b, newvertex, &horiz);
+-    } else {
+-      /* Start searching from the triangle provided by the caller. */
+-      otricopy(*searchtri, horiz);
+-      intersect = preciselocate(m, b, newvertex, &horiz, 1);
+-    }
+-  } else {
+-    /* The calling routine provides the subsegment in which */
+-    /*   the vertex is inserted.                             */
+-    otricopy(*searchtri, horiz);
+-    intersect = ONEDGE;
+-  }
+-
+-  if (intersect == ONVERTEX) {
+-    /* There's already a vertex there.  Return in `searchtri' a triangle */
+-    /*   whose origin is the existing vertex.                            */
+-    otricopy(horiz, *searchtri);
+-    otricopy(horiz, m->recenttri);
+-    return DUPLICATEVERTEX;
+-  }
+-  if ((intersect == ONEDGE) || (intersect == OUTSIDE)) {
+-    /* The vertex falls on an edge or boundary. */
+-    if (m->checksegments && (splitseg == (struct osub *) NULL)) {
+-      /* Check whether the vertex falls on a subsegment. */
+-      tspivot(horiz, brokensubseg);
+-      if (brokensubseg.ss != m->dummysub) {
+-        /* The vertex falls on a subsegment, and hence will not be inserted. */
+-        if (segmentflaws) {
+-          enq = b->nobisect != 2;
+-          if (enq && (b->nobisect == 1)) {
+-            /* This subsegment may be split only if it is an */
+-            /*   internal boundary.                          */
+-            sym(horiz, testtri);
+-            enq = testtri.tri != m->dummytri;
+-          }
+-          if (enq) {
+-            /* Add the subsegment to the list of encroached subsegments. */
+-            encroached = (struct badsubseg *) poolalloc(&m->badsubsegs);
+-            encroached->encsubseg = sencode(brokensubseg);
+-            sorg(brokensubseg, encroached->subsegorg);
+-            sdest(brokensubseg, encroached->subsegdest);
+-            if (b->verbose > 2) {
+-              printf(
+-          "  Queueing encroached subsegment (%.12g, %.12g) (%.12g, %.12g).\n",
+-                     encroached->subsegorg[0], encroached->subsegorg[1],
+-                     encroached->subsegdest[0], encroached->subsegdest[1]);
+-            }
+-          }
+-        }
+-        /* Return a handle whose primary edge contains the vertex, */
+-        /*   which has not been inserted.                          */
+-        otricopy(horiz, *searchtri);
+-        otricopy(horiz, m->recenttri);
+-        return VIOLATINGVERTEX;
+-      }
+-    }
+-
+-    /* Insert the vertex on an edge, dividing one triangle into two (if */
+-    /*   the edge lies on a boundary) or two triangles into four.       */
+-    lprev(horiz, botright);
+-    sym(botright, botrcasing);
+-    sym(horiz, topright);
+-    /* Is there a second triangle?  (Or does this edge lie on a boundary?) */
+-    mirrorflag = topright.tri != m->dummytri;
+-    if (mirrorflag) {
+-      lnextself(topright);
+-      sym(topright, toprcasing);
+-      maketriangle(m, b, &newtopright);
+-    } else {
+-      /* Splitting a boundary edge increases the number of boundary edges. */
+-      m->hullsize++;
+-    }
+-    maketriangle(m, b, &newbotright);
+-
+-    /* Set the vertices of changed and new triangles. */
+-    org(horiz, rightvertex);
+-    dest(horiz, leftvertex);
+-    apex(horiz, botvertex);
+-    setorg(newbotright, botvertex);
+-    setdest(newbotright, rightvertex);
+-    setapex(newbotright, newvertex);
+-    setorg(horiz, newvertex);
+-    for (i = 0; i < m->eextras; i++) {
+-      /* Set the element attributes of a new triangle. */
+-      setelemattribute(newbotright, i, elemattribute(botright, i));
+-    }
+-    if (b->vararea) {
+-      /* Set the area constraint of a new triangle. */
+-      setareabound(newbotright, areabound(botright));
+-    }
+-    if (mirrorflag) {
+-      dest(topright, topvertex);
+-      setorg(newtopright, rightvertex);
+-      setdest(newtopright, topvertex);
+-      setapex(newtopright, newvertex);
+-      setorg(topright, newvertex);
+-      for (i = 0; i < m->eextras; i++) {
+-        /* Set the element attributes of another new triangle. */
+-        setelemattribute(newtopright, i, elemattribute(topright, i));
+-      }
+-      if (b->vararea) {
+-        /* Set the area constraint of another new triangle. */
+-        setareabound(newtopright, areabound(topright));
+-      }
+-    }
+-
+-    /* There may be subsegments that need to be bonded */
+-    /*   to the new triangle(s).                       */
+-    if (m->checksegments) {
+-      tspivot(botright, botrsubseg);
+-      if (botrsubseg.ss != m->dummysub) {
+-        tsdissolve(botright);
+-        tsbond(newbotright, botrsubseg);
+-      }
+-      if (mirrorflag) {
+-        tspivot(topright, toprsubseg);
+-        if (toprsubseg.ss != m->dummysub) {
+-          tsdissolve(topright);
+-          tsbond(newtopright, toprsubseg);
+-        }
+-      }
+-    }
+-
+-    /* Bond the new triangle(s) to the surrounding triangles. */
+-    bond(newbotright, botrcasing);
+-    lprevself(newbotright);
+-    bond(newbotright, botright);
+-    lprevself(newbotright);
+-    if (mirrorflag) {
+-      bond(newtopright, toprcasing);
+-      lnextself(newtopright);
+-      bond(newtopright, topright);
+-      lnextself(newtopright);
+-      bond(newtopright, newbotright);
+-    }
+-
+-    if (splitseg != (struct osub *) NULL) {
+-      /* Split the subsegment into two. */
+-      setsdest(*splitseg, newvertex);
+-      segorg(*splitseg, segmentorg);
+-      segdest(*splitseg, segmentdest);
+-      ssymself(*splitseg);
+-      spivot(*splitseg, rightsubseg);
+-      insertsubseg(m, b, &newbotright, mark(*splitseg));
+-      tspivot(newbotright, newsubseg);
+-      setsegorg(newsubseg, segmentorg);
+-      setsegdest(newsubseg, segmentdest);
+-      sbond(*splitseg, newsubseg);
+-      ssymself(newsubseg);
+-      sbond(newsubseg, rightsubseg);
+-      ssymself(*splitseg);
+-      /* Transfer the subsegment's boundary marker to the vertex */
+-      /*   if required.                                          */
+-      if (vertexmark(newvertex) == 0) {
+-        setvertexmark(newvertex, mark(*splitseg));
+-      }
+-    }
+-
+-    if (m->checkquality) {
+-      poolrestart(&m->flipstackers);
+-      m->lastflip = (struct flipstacker *) poolalloc(&m->flipstackers);
+-      m->lastflip->flippedtri = encode(horiz);
+-      m->lastflip->prevflip = (struct flipstacker *) &insertvertex;
+-    }
+-
+-#ifdef SELF_CHECK
+-    if (counterclockwise(m, b, rightvertex, leftvertex, botvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf(
+-            "  Clockwise triangle prior to edge vertex insertion (bottom).\n");
+-    }
+-    if (mirrorflag) {
+-      if (counterclockwise(m, b, leftvertex, rightvertex, topvertex) < 0.0) {
+-        printf("Internal error in insertvertex():\n");
+-        printf("  Clockwise triangle prior to edge vertex insertion (top).\n");
+-      }
+-      if (counterclockwise(m, b, rightvertex, topvertex, newvertex) < 0.0) {
+-        printf("Internal error in insertvertex():\n");
+-        printf(
+-            "  Clockwise triangle after edge vertex insertion (top right).\n");
+-      }
+-      if (counterclockwise(m, b, topvertex, leftvertex, newvertex) < 0.0) {
+-        printf("Internal error in insertvertex():\n");
+-        printf(
+-            "  Clockwise triangle after edge vertex insertion (top left).\n");
+-      }
+-    }
+-    if (counterclockwise(m, b, leftvertex, botvertex, newvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf(
+-          "  Clockwise triangle after edge vertex insertion (bottom left).\n");
+-    }
+-    if (counterclockwise(m, b, botvertex, rightvertex, newvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf(
+-        "  Clockwise triangle after edge vertex insertion (bottom right).\n");
+-    }
+-#endif /* SELF_CHECK */
+-    if (b->verbose > 2) {
+-      printf("  Updating bottom left ");
+-      printtriangle(m, b, &botright);
+-      if (mirrorflag) {
+-        printf("  Updating top left ");
+-        printtriangle(m, b, &topright);
+-        printf("  Creating top right ");
+-        printtriangle(m, b, &newtopright);
+-      }
+-      printf("  Creating bottom right ");
+-      printtriangle(m, b, &newbotright);
+-    }
+-
+-    /* Position `horiz' on the first edge to check for */
+-    /*   the Delaunay property.                        */
+-    lnextself(horiz);
+-  } else {
+-    /* Insert the vertex in a triangle, splitting it into three. */
+-    lnext(horiz, botleft);
+-    lprev(horiz, botright);
+-    sym(botleft, botlcasing);
+-    sym(botright, botrcasing);
+-    maketriangle(m, b, &newbotleft);
+-    maketriangle(m, b, &newbotright);
+-
+-    /* Set the vertices of changed and new triangles. */
+-    org(horiz, rightvertex);
+-    dest(horiz, leftvertex);
+-    apex(horiz, botvertex);
+-    setorg(newbotleft, leftvertex);
+-    setdest(newbotleft, botvertex);
+-    setapex(newbotleft, newvertex);
+-    setorg(newbotright, botvertex);
+-    setdest(newbotright, rightvertex);
+-    setapex(newbotright, newvertex);
+-    setapex(horiz, newvertex);
+-    for (i = 0; i < m->eextras; i++) {
+-      /* Set the element attributes of the new triangles. */
+-      attrib = elemattribute(horiz, i);
+-      setelemattribute(newbotleft, i, attrib);
+-      setelemattribute(newbotright, i, attrib);
+-    }
+-    if (b->vararea) {
+-      /* Set the area constraint of the new triangles. */
+-      area = areabound(horiz);
+-      setareabound(newbotleft, area);
+-      setareabound(newbotright, area);
+-    }
+-
+-    /* There may be subsegments that need to be bonded */
+-    /*   to the new triangles.                         */
+-    if (m->checksegments) {
+-      tspivot(botleft, botlsubseg);
+-      if (botlsubseg.ss != m->dummysub) {
+-        tsdissolve(botleft);
+-        tsbond(newbotleft, botlsubseg);
+-      }
+-      tspivot(botright, botrsubseg);
+-      if (botrsubseg.ss != m->dummysub) {
+-        tsdissolve(botright);
+-        tsbond(newbotright, botrsubseg);
+-      }
+-    }
+-
+-    /* Bond the new triangles to the surrounding triangles. */
+-    bond(newbotleft, botlcasing);
+-    bond(newbotright, botrcasing);
+-    lnextself(newbotleft);
+-    lprevself(newbotright);
+-    bond(newbotleft, newbotright);
+-    lnextself(newbotleft);
+-    bond(botleft, newbotleft);
+-    lprevself(newbotright);
+-    bond(botright, newbotright);
+-
+-    if (m->checkquality) {
+-      poolrestart(&m->flipstackers);
+-      m->lastflip = (struct flipstacker *) poolalloc(&m->flipstackers);
+-      m->lastflip->flippedtri = encode(horiz);
+-      m->lastflip->prevflip = (struct flipstacker *) NULL;
+-    }
+-
+-#ifdef SELF_CHECK
+-    if (counterclockwise(m, b, rightvertex, leftvertex, botvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf("  Clockwise triangle prior to vertex insertion.\n");
+-    }
+-    if (counterclockwise(m, b, rightvertex, leftvertex, newvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf("  Clockwise triangle after vertex insertion (top).\n");
+-    }
+-    if (counterclockwise(m, b, leftvertex, botvertex, newvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf("  Clockwise triangle after vertex insertion (left).\n");
+-    }
+-    if (counterclockwise(m, b, botvertex, rightvertex, newvertex) < 0.0) {
+-      printf("Internal error in insertvertex():\n");
+-      printf("  Clockwise triangle after vertex insertion (right).\n");
+-    }
+-#endif /* SELF_CHECK */
+-    if (b->verbose > 2) {
+-      printf("  Updating top ");
+-      printtriangle(m, b, &horiz);
+-      printf("  Creating left ");
+-      printtriangle(m, b, &newbotleft);
+-      printf("  Creating right ");
+-      printtriangle(m, b, &newbotright);
+-    }
+-  }
+-
+-  /* The insertion is successful by default, unless an encroached */
+-  /*   subsegment is found.                                       */
+-  success = SUCCESSFULVERTEX;
+-  /* Circle around the newly inserted vertex, checking each edge opposite */
+-  /*   it for the Delaunay property.  Non-Delaunay edges are flipped.     */
+-  /*   `horiz' is always the edge being checked.  `first' marks where to  */
+-  /*   stop circling.                                                     */
+-  org(horiz, first);
+-  rightvertex = first;
+-  dest(horiz, leftvertex);
+-  /* Circle until finished. */
+-  while (1) {
+-    /* By default, the edge will be flipped. */
+-    doflip = 1;
+-
+-    if (m->checksegments) {
+-      /* Check for a subsegment, which cannot be flipped. */
+-      tspivot(horiz, checksubseg);
+-      if (checksubseg.ss != m->dummysub) {
+-        /* The edge is a subsegment and cannot be flipped. */
+-        doflip = 0;
+-#ifndef CDT_ONLY
+-        if (segmentflaws) {
+-          /* Does the new vertex encroach upon this subsegment? */
+-          if (checkseg4encroach(m, b, &checksubseg)) {
+-            success = ENCROACHINGVERTEX;
+-          }
+-        }
+-#endif /* not CDT_ONLY */
+-      }
+-    }
+-
+-    if (doflip) {
+-      /* Check if the edge is a boundary edge. */
+-      sym(horiz, top);
+-      if (top.tri == m->dummytri) {
+-        /* The edge is a boundary edge and cannot be flipped. */
+-        doflip = 0;
+-      } else {
+-        /* Find the vertex on the other side of the edge. */
+-        apex(top, farvertex);
+-        /* In the incremental Delaunay triangulation algorithm, any of      */
+-        /*   `leftvertex', `rightvertex', and `farvertex' could be vertices */
+-        /*   of the triangular bounding box.  These vertices must be        */
+-        /*   treated as if they are infinitely distant, even though their   */
+-        /*   "coordinates" are not.                                         */
+-        if ((leftvertex == m->infvertex1) || (leftvertex == m->infvertex2) ||
+-            (leftvertex == m->infvertex3)) {
+-          /* `leftvertex' is infinitely distant.  Check the convexity of  */
+-          /*   the boundary of the triangulation.  'farvertex' might be   */
+-          /*   infinite as well, but trust me, this same condition should */
+-          /*   be applied.                                                */
+-          doflip = counterclockwise(m, b, newvertex, rightvertex, farvertex)
+-                   > 0.0;
+-        } else if ((rightvertex == m->infvertex1) ||
+-                   (rightvertex == m->infvertex2) ||
+-                   (rightvertex == m->infvertex3)) {
+-          /* `rightvertex' is infinitely distant.  Check the convexity of */
+-          /*   the boundary of the triangulation.  'farvertex' might be   */
+-          /*   infinite as well, but trust me, this same condition should */
+-          /*   be applied.                                                */
+-          doflip = counterclockwise(m, b, farvertex, leftvertex, newvertex)
+-                   > 0.0;
+-        } else if ((farvertex == m->infvertex1) ||
+-                   (farvertex == m->infvertex2) ||
+-                   (farvertex == m->infvertex3)) {
+-          /* `farvertex' is infinitely distant and cannot be inside */
+-          /*   the circumcircle of the triangle `horiz'.            */
+-          doflip = 0;
+-        } else {
+-          /* Test whether the edge is locally Delaunay. */
+-          doflip = incircle(m, b, leftvertex, newvertex, rightvertex,
+-                            farvertex) > 0.0;
+-        }
+-        if (doflip) {
+-          /* We made it!  Flip the edge `horiz' by rotating its containing */
+-          /*   quadrilateral (the two triangles adjacent to `horiz').      */
+-          /* Identify the casing of the quadrilateral. */
+-          lprev(top, topleft);
+-          sym(topleft, toplcasing);
+-          lnext(top, topright);
+-          sym(topright, toprcasing);
+-          lnext(horiz, botleft);
+-          sym(botleft, botlcasing);
+-          lprev(horiz, botright);
+-          sym(botright, botrcasing);
+-          /* Rotate the quadrilateral one-quarter turn counterclockwise. */
+-          bond(topleft, botlcasing);
+-          bond(botleft, botrcasing);
+-          bond(botright, toprcasing);
+-          bond(topright, toplcasing);
+-          if (m->checksegments) {
+-            /* Check for subsegments and rebond them to the quadrilateral. */
+-            tspivot(topleft, toplsubseg);
+-            tspivot(botleft, botlsubseg);
+-            tspivot(botright, botrsubseg);
+-            tspivot(topright, toprsubseg);
+-            if (toplsubseg.ss == m->dummysub) {
+-              tsdissolve(topright);
+-            } else {
+-              tsbond(topright, toplsubseg);
+-            }
+-            if (botlsubseg.ss == m->dummysub) {
+-              tsdissolve(topleft);
+-            } else {
+-              tsbond(topleft, botlsubseg);
+-            }
+-            if (botrsubseg.ss == m->dummysub) {
+-              tsdissolve(botleft);
+-            } else {
+-              tsbond(botleft, botrsubseg);
+-            }
+-            if (toprsubseg.ss == m->dummysub) {
+-              tsdissolve(botright);
+-            } else {
+-              tsbond(botright, toprsubseg);
+-            }
+-          }
+-          /* New vertex assignments for the rotated quadrilateral. */
+-          setorg(horiz, farvertex);
+-          setdest(horiz, newvertex);
+-          setapex(horiz, rightvertex);
+-          setorg(top, newvertex);
+-          setdest(top, farvertex);
+-          setapex(top, leftvertex);
+-          for (i = 0; i < m->eextras; i++) {
+-            /* Take the average of the two triangles' attributes. */
+-            attrib = 0.5 * (elemattribute(top, i) + elemattribute(horiz, i));
+-            setelemattribute(top, i, attrib);
+-            setelemattribute(horiz, i, attrib);
+-          }
+-          if (b->vararea) {
+-            if ((areabound(top) <= 0.0) || (areabound(horiz) <= 0.0)) {
+-              area = -1.0;
+-            } else {
+-              /* Take the average of the two triangles' area constraints.    */
+-              /*   This prevents small area constraints from migrating a     */
+-              /*   long, long way from their original location due to flips. */
+-              area = 0.5 * (areabound(top) + areabound(horiz));
+-            }
+-            setareabound(top, area);
+-            setareabound(horiz, area);
+-          }
+-
+-          if (m->checkquality) {
+-            newflip = (struct flipstacker *) poolalloc(&m->flipstackers);
+-            newflip->flippedtri = encode(horiz);
+-            newflip->prevflip = m->lastflip;
+-            m->lastflip = newflip;
+-          }
+-
+-#ifdef SELF_CHECK
+-          if (newvertex != (vertex) NULL) {
+-            if (counterclockwise(m, b, leftvertex, newvertex, rightvertex) <
+-                0.0) {
+-              printf("Internal error in insertvertex():\n");
+-              printf("  Clockwise triangle prior to edge flip (bottom).\n");
+-            }
+-            /* The following test has been removed because constrainededge() */
+-            /*   sometimes generates inverted triangles that insertvertex()  */
+-            /*   removes.                                                    */
+-/*
+-            if (counterclockwise(m, b, rightvertex, farvertex, leftvertex) <
+-                0.0) {
+-              printf("Internal error in insertvertex():\n");
+-              printf("  Clockwise triangle prior to edge flip (top).\n");
+-            }
+-*/
+-            if (counterclockwise(m, b, farvertex, leftvertex, newvertex) <
+-                0.0) {
+-              printf("Internal error in insertvertex():\n");
+-              printf("  Clockwise triangle after edge flip (left).\n");
+-            }
+-            if (counterclockwise(m, b, newvertex, rightvertex, farvertex) <
+-                0.0) {
+-              printf("Internal error in insertvertex():\n");
+-              printf("  Clockwise triangle after edge flip (right).\n");
+-            }
+-          }
+-#endif /* SELF_CHECK */
+-          if (b->verbose > 2) {
+-            printf("  Edge flip results in left ");
+-            lnextself(topleft);
+-            printtriangle(m, b, &topleft);
+-            printf("  and right ");
+-            printtriangle(m, b, &horiz);
+-          }
+-          /* On the next iterations, consider the two edges that were  */
+-          /*   exposed (this is, are now visible to the newly inserted */
+-          /*   vertex) by the edge flip.                               */
+-          lprevself(horiz);
+-          leftvertex = farvertex;
+-        }
+-      }
+-    }
+-    if (!doflip) {
+-      /* The handle `horiz' is accepted as locally Delaunay. */
+-#ifndef CDT_ONLY
+-      if (triflaws) {
+-        /* Check the triangle `horiz' for quality. */
+-        testtriangle(m, b, &horiz);
+-      }
+-#endif /* not CDT_ONLY */
+-      /* Look for the next edge around the newly inserted vertex. */
+-      lnextself(horiz);
+-      sym(horiz, testtri);
+-      /* Check for finishing a complete revolution about the new vertex, or */
+-      /*   falling outside  of the triangulation.  The latter will happen   */
+-      /*   when a vertex is inserted at a boundary.                         */
+-      if ((leftvertex == first) || (testtri.tri == m->dummytri)) {
+-        /* We're done.  Return a triangle whose origin is the new vertex. */
+-        lnext(horiz, *searchtri);
+-        lnext(horiz, m->recenttri);
+-        return success;
+-      }
+-      /* Finish finding the next edge around the newly inserted vertex. */
+-      lnext(testtri, horiz);
+-      rightvertex = leftvertex;
+-      dest(horiz, leftvertex);
+-    }
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  triangulatepolygon()   Find the Delaunay triangulation of a polygon that */
+-/*                         has a certain "nice" shape.  This includes the    */
+-/*                         polygons that result from deletion of a vertex or */
+-/*                         insertion of a segment.                           */
+-/*                                                                           */
+-/*  This is a conceptually difficult routine.  The starting assumption is    */
+-/*  that we have a polygon with n sides.  n - 1 of these sides are currently */
+-/*  represented as edges in the mesh.  One side, called the "base", need not */
+-/*  be.                                                                      */
+-/*                                                                           */
+-/*  Inside the polygon is a structure I call a "fan", consisting of n - 1    */
+-/*  triangles that share a common origin.  For each of these triangles, the  */
+-/*  edge opposite the origin is one of the sides of the polygon.  The        */
+-/*  primary edge of each triangle is the edge directed from the origin to    */
+-/*  the destination; note that this is not the same edge that is a side of   */
+-/*  the polygon.  `firstedge' is the primary edge of the first triangle.     */
+-/*  From there, the triangles follow in counterclockwise order about the     */
+-/*  polygon, until `lastedge', the primary edge of the last triangle.        */
+-/*  `firstedge' and `lastedge' are probably connected to other triangles     */
+-/*  beyond the extremes of the fan, but their identity is not important, as  */
+-/*  long as the fan remains connected to them.                               */
+-/*                                                                           */
+-/*  Imagine the polygon oriented so that its base is at the bottom.  This    */
+-/*  puts `firstedge' on the far right, and `lastedge' on the far left.       */
+-/*  The right vertex of the base is the destination of `firstedge', and the  */
+-/*  left vertex of the base is the apex of `lastedge'.                       */
+-/*                                                                           */
+-/*  The challenge now is to find the right sequence of edge flips to         */
+-/*  transform the fan into a Delaunay triangulation of the polygon.  Each    */
+-/*  edge flip effectively removes one triangle from the fan, committing it   */
+-/*  to the polygon.  The resulting polygon has one fewer edge.  If `doflip'  */
+-/*  is set, the final flip will be performed, resulting in a fan of one      */
+-/*  (useless?) triangle.  If `doflip' is not set, the final flip is not      */
+-/*  performed, resulting in a fan of two triangles, and an unfinished        */
+-/*  triangular polygon that is not yet filled out with a single triangle.    */
+-/*  On completion of the routine, `lastedge' is the last remaining triangle, */
+-/*  or the leftmost of the last two.                                         */
+-/*                                                                           */
+-/*  Although the flips are performed in the order described above, the       */
+-/*  decisions about what flips to perform are made in precisely the reverse  */
+-/*  order.  The recursive triangulatepolygon() procedure makes a decision,   */
+-/*  uses up to two recursive calls to triangulate the "subproblems"          */
+-/*  (polygons with fewer edges), and then performs an edge flip.             */
+-/*                                                                           */
+-/*  The "decision" it makes is which vertex of the polygon should be         */
+-/*  connected to the base.  This decision is made by testing every possible  */
+-/*  vertex.  Once the best vertex is found, the two edges that connect this  */
+-/*  vertex to the base become the bases for two smaller polygons.  These     */
+-/*  are triangulated recursively.  Unfortunately, this approach can take     */
+-/*  O(n^2) time not only in the worst case, but in many common cases.  It's  */
+-/*  rarely a big deal for vertex deletion, where n is rarely larger than     */
+-/*  ten, but it could be a big deal for segment insertion, especially if     */
+-/*  there's a lot of long segments that each cut many triangles.  I ought to */
+-/*  code a faster algorithm some day.                                        */
+-/*                                                                           */
+-/*  The `edgecount' parameter is the number of sides of the polygon,         */
+-/*  including its base.  `triflaws' is a flag that determines whether the    */
+-/*  new triangles should be tested for quality, and enqueued if they are     */
+-/*  bad.                                                                     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void triangulatepolygon(struct mesh *m, struct behavior *b,
+-                        struct otri *firstedge, struct otri *lastedge,
+-                        int edgecount, int doflip, int triflaws)
+-#else /* not ANSI_DECLARATORS */
+-void triangulatepolygon(m, b, firstedge, lastedge, edgecount, doflip, triflaws)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *firstedge;
+-struct otri *lastedge;
+-int edgecount;
+-int doflip;
+-int triflaws;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri testtri;
+-  struct otri besttri;
+-  struct otri tempedge;
+-  vertex leftbasevertex, rightbasevertex;
+-  vertex testvertex;
+-  vertex bestvertex;
+-  int bestnumber;
+-  int i;
+-  triangle ptr;   /* Temporary variable used by sym(), onext(), and oprev(). */
+-
+-  /* Identify the base vertices. */
+-  apex(*lastedge, leftbasevertex);
+-  dest(*firstedge, rightbasevertex);
+-  if (b->verbose > 2) {
+-    printf("  Triangulating interior polygon at edge\n");
+-    printf("    (%.12g, %.12g) (%.12g, %.12g)\n", leftbasevertex[0],
+-           leftbasevertex[1], rightbasevertex[0], rightbasevertex[1]);
+-  }
+-  /* Find the best vertex to connect the base to. */
+-  onext(*firstedge, besttri);
+-  dest(besttri, bestvertex);
+-  otricopy(besttri, testtri);
+-  bestnumber = 1;
+-  for (i = 2; i <= edgecount - 2; i++) {
+-    onextself(testtri);
+-    dest(testtri, testvertex);
+-    /* Is this a better vertex? */
+-    if (incircle(m, b, leftbasevertex, rightbasevertex, bestvertex,
+-                 testvertex) > 0.0) {
+-      otricopy(testtri, besttri);
+-      bestvertex = testvertex;
+-      bestnumber = i;
+-    }
+-  }
+-  if (b->verbose > 2) {
+-    printf("    Connecting edge to (%.12g, %.12g)\n", bestvertex[0],
+-           bestvertex[1]);
+-  }
+-  if (bestnumber > 1) {
+-    /* Recursively triangulate the smaller polygon on the right. */
+-    oprev(besttri, tempedge);
+-    triangulatepolygon(m, b, firstedge, &tempedge, bestnumber + 1, 1,
+-                       triflaws);
+-  }
+-  if (bestnumber < edgecount - 2) {
+-    /* Recursively triangulate the smaller polygon on the left. */
+-    sym(besttri, tempedge);
+-    triangulatepolygon(m, b, &besttri, lastedge, edgecount - bestnumber, 1,
+-                       triflaws);
+-    /* Find `besttri' again; it may have been lost to edge flips. */
+-    sym(tempedge, besttri);
+-  }
+-  if (doflip) {
+-    /* Do one final edge flip. */
+-    flip(m, b, &besttri);
+-#ifndef CDT_ONLY
+-    if (triflaws) {
+-      /* Check the quality of the newly committed triangle. */
+-      sym(besttri, testtri);
+-      testtriangle(m, b, &testtri);
+-    }
+-#endif /* not CDT_ONLY */
+-  }
+-  /* Return the base triangle. */
+-  otricopy(besttri, *lastedge);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  deletevertex()   Delete a vertex from a Delaunay triangulation, ensuring */
+-/*                   that the triangulation remains Delaunay.                */
+-/*                                                                           */
+-/*  The origin of `deltri' is deleted.  The union of the triangles adjacent  */
+-/*  to this vertex is a polygon, for which the Delaunay triangulation is     */
+-/*  found.  Two triangles are removed from the mesh.                         */
+-/*                                                                           */
+-/*  Only interior vertices that do not lie on segments or boundaries may be  */
+-/*  deleted.                                                                 */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void deletevertex(struct mesh *m, struct behavior *b, struct otri *deltri)
+-#else /* not ANSI_DECLARATORS */
+-void deletevertex(m, b, deltri)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *deltri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri countingtri;
+-  struct otri firstedge, lastedge;
+-  struct otri deltriright;
+-  struct otri lefttri, righttri;
+-  struct otri leftcasing, rightcasing;
+-  struct osub leftsubseg, rightsubseg;
+-  vertex delvertex;
+-  vertex neworg;
+-  int edgecount;
+-  triangle ptr;   /* Temporary variable used by sym(), onext(), and oprev(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  org(*deltri, delvertex);
+-  if (b->verbose > 1) {
+-    printf("  Deleting (%.12g, %.12g).\n", delvertex[0], delvertex[1]);
+-  }
+-  vertexdealloc(m, delvertex);
+-
+-  /* Count the degree of the vertex being deleted. */
+-  onext(*deltri, countingtri);
+-  edgecount = 1;
+-  while (!otriequal(*deltri, countingtri)) {
+-#ifdef SELF_CHECK
+-    if (countingtri.tri == m->dummytri) {
+-      printf("Internal error in deletevertex():\n");
+-      printf("  Attempt to delete boundary vertex.\n");
+-      internalerror();
+-    }
+-#endif /* SELF_CHECK */
+-    edgecount++;
+-    onextself(countingtri);
+-  }
+-
+-#ifdef SELF_CHECK
+-  if (edgecount < 3) {
+-    printf("Internal error in deletevertex():\n  Vertex has degree %d.\n",
+-           edgecount);
+-    internalerror();
+-  }
+-#endif /* SELF_CHECK */
+-  if (edgecount > 3) {
+-    /* Triangulate the polygon defined by the union of all triangles */
+-    /*   adjacent to the vertex being deleted.  Check the quality of */
+-    /*   the resulting triangles.                                    */
+-    onext(*deltri, firstedge);
+-    oprev(*deltri, lastedge);
+-    triangulatepolygon(m, b, &firstedge, &lastedge, edgecount, 0,
+-                       !b->nobisect);
+-  }
+-  /* Splice out two triangles. */
+-  lprev(*deltri, deltriright);
+-  dnext(*deltri, lefttri);
+-  sym(lefttri, leftcasing);
+-  oprev(deltriright, righttri);
+-  sym(righttri, rightcasing);
+-  bond(*deltri, leftcasing);
+-  bond(deltriright, rightcasing);
+-  tspivot(lefttri, leftsubseg);
+-  if (leftsubseg.ss != m->dummysub) {
+-    tsbond(*deltri, leftsubseg);
+-  }
+-  tspivot(righttri, rightsubseg);
+-  if (rightsubseg.ss != m->dummysub) {
+-    tsbond(deltriright, rightsubseg);
+-  }
+-
+-  /* Set the new origin of `deltri' and check its quality. */
+-  org(lefttri, neworg);
+-  setorg(*deltri, neworg);
+-  if (!b->nobisect) {
+-    testtriangle(m, b, deltri);
+-  }
+-
+-  /* Delete the two spliced-out triangles. */
+-  triangledealloc(m, lefttri.tri);
+-  triangledealloc(m, righttri.tri);
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  undovertex()   Undo the most recent vertex insertion.                    */
+-/*                                                                           */
+-/*  Walks through the list of transformations (flips and a vertex insertion) */
+-/*  in the reverse of the order in which they were done, and undoes them.    */
+-/*  The inserted vertex is removed from the triangulation and deallocated.   */
+-/*  Two triangles (possibly just one) are also deallocated.                  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void undovertex(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void undovertex(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri fliptri;
+-  struct otri botleft, botright, topright;
+-  struct otri botlcasing, botrcasing, toprcasing;
+-  struct otri gluetri;
+-  struct osub botlsubseg, botrsubseg, toprsubseg;
+-  vertex botvertex, rightvertex;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  /* Walk through the list of transformations (flips and a vertex insertion) */
+-  /*   in the reverse of the order in which they were done, and undo them.   */
+-  while (m->lastflip != (struct flipstacker *) NULL) {
+-    /* Find a triangle involved in the last unreversed transformation. */
+-    decode(m->lastflip->flippedtri, fliptri);
+-
+-    /* We are reversing one of three transformations:  a trisection of one */
+-    /*   triangle into three (by inserting a vertex in the triangle), a    */
+-    /*   bisection of two triangles into four (by inserting a vertex in an */
+-    /*   edge), or an edge flip.                                           */
+-    if (m->lastflip->prevflip == (struct flipstacker *) NULL) {
+-      /* Restore a triangle that was split into three triangles, */
+-      /*   so it is again one triangle.                          */
+-      dprev(fliptri, botleft);
+-      lnextself(botleft);
+-      onext(fliptri, botright);
+-      lprevself(botright);
+-      sym(botleft, botlcasing);
+-      sym(botright, botrcasing);
+-      dest(botleft, botvertex);
+-
+-      setapex(fliptri, botvertex);
+-      lnextself(fliptri);
+-      bond(fliptri, botlcasing);
+-      tspivot(botleft, botlsubseg);
+-      tsbond(fliptri, botlsubseg);
+-      lnextself(fliptri);
+-      bond(fliptri, botrcasing);
+-      tspivot(botright, botrsubseg);
+-      tsbond(fliptri, botrsubseg);
+-
+-      /* Delete the two spliced-out triangles. */
+-      triangledealloc(m, botleft.tri);
+-      triangledealloc(m, botright.tri);
+-    } else if (m->lastflip->prevflip == (struct flipstacker *) &insertvertex) {
+-      /* Restore two triangles that were split into four triangles, */
+-      /*   so they are again two triangles.                         */
+-      lprev(fliptri, gluetri);
+-      sym(gluetri, botright);
+-      lnextself(botright);
+-      sym(botright, botrcasing);
+-      dest(botright, rightvertex);
+-
+-      setorg(fliptri, rightvertex);
+-      bond(gluetri, botrcasing);
+-      tspivot(botright, botrsubseg);
+-      tsbond(gluetri, botrsubseg);
+-
+-      /* Delete the spliced-out triangle. */
+-      triangledealloc(m, botright.tri);
+-
+-      sym(fliptri, gluetri);
+-      if (gluetri.tri != m->dummytri) {
+-        lnextself(gluetri);
+-        dnext(gluetri, topright);
+-        sym(topright, toprcasing);
+-
+-        setorg(gluetri, rightvertex);
+-        bond(gluetri, toprcasing);
+-        tspivot(topright, toprsubseg);
+-        tsbond(gluetri, toprsubseg);
+-
+-        /* Delete the spliced-out triangle. */
+-        triangledealloc(m, topright.tri);
+-      }
+-
+-      /* This is the end of the list, sneakily encoded. */
+-      m->lastflip->prevflip = (struct flipstacker *) NULL;
+-    } else {
+-      /* Undo an edge flip. */
+-      unflip(m, b, &fliptri);
+-    }
+-
+-    /* Go on and process the next transformation. */
+-    m->lastflip = m->lastflip->prevflip;
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Mesh transformation routines end here                     *********/
+-
+-/********* Divide-and-conquer Delaunay triangulation begins here     *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  The divide-and-conquer bounding box                                      */
+-/*                                                                           */
+-/*  I originally implemented the divide-and-conquer and incremental Delaunay */
+-/*  triangulations using the edge-based data structure presented by Guibas   */
+-/*  and Stolfi.  Switching to a triangle-based data structure doubled the    */
+-/*  speed.  However, I had to think of a few extra tricks to maintain the    */
+-/*  elegance of the original algorithms.                                     */
+-/*                                                                           */
+-/*  The "bounding box" used by my variant of the divide-and-conquer          */
+-/*  algorithm uses one triangle for each edge of the convex hull of the      */
+-/*  triangulation.  These bounding triangles all share a common apical       */
+-/*  vertex, which is represented by NULL and which represents nothing.       */
+-/*  The bounding triangles are linked in a circular fan about this NULL      */
+-/*  vertex, and the edges on the convex hull of the triangulation appear     */
+-/*  opposite the NULL vertex.  You might find it easiest to imagine that     */
+-/*  the NULL vertex is a point in 3D space behind the center of the          */
+-/*  triangulation, and that the bounding triangles form a sort of cone.      */
+-/*                                                                           */
+-/*  This bounding box makes it easy to represent degenerate cases.  For      */
+-/*  instance, the triangulation of two vertices is a single edge.  This edge */
+-/*  is represented by two bounding box triangles, one on each "side" of the  */
+-/*  edge.  These triangles are also linked together in a fan about the NULL  */
+-/*  vertex.                                                                  */
+-/*                                                                           */
+-/*  The bounding box also makes it easy to traverse the convex hull, as the  */
+-/*  divide-and-conquer algorithm needs to do.                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  vertexsort()   Sort an array of vertices by x-coordinate, using the      */
+-/*                 y-coordinate as a secondary key.                          */
+-/*                                                                           */
+-/*  Uses quicksort.  Randomized O(n log n) time.  No, I did not make any of  */
+-/*  the usual quicksort mistakes.                                            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void vertexsort(vertex *sortarray, int arraysize)
+-#else /* not ANSI_DECLARATORS */
+-void vertexsort(sortarray, arraysize)
+-vertex *sortarray;
+-int arraysize;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int left, right;
+-  int pivot;
+-  REAL pivotx, pivoty;
+-  vertex temp;
+-
+-  if (arraysize == 2) {
+-    /* Recursive base case. */
+-    if ((sortarray[0][0] > sortarray[1][0]) ||
+-        ((sortarray[0][0] == sortarray[1][0]) &&
+-         (sortarray[0][1] > sortarray[1][1]))) {
+-      temp = sortarray[1];
+-      sortarray[1] = sortarray[0];
+-      sortarray[0] = temp;
+-    }
+-    return;
+-  }
+-  /* Choose a random pivot to split the array. */
+-  pivot = (int) randomnation((unsigned int) arraysize);
+-  if (pivot == arraysize)//JLM without this test, pivot can equal arraysize and segfault
+-	  pivot--;
+-  pivotx = sortarray[pivot][0];
+-  pivoty = sortarray[pivot][1];
+-  /* Split the array. */
+-  left = -1;
+-  right = arraysize;
+-  while (left < right) {
+-    /* Search for a vertex whose x-coordinate is too large for the left. */
+-    do {
+-      left++;
+-    } while ((left <= right) && ((sortarray[left][0] < pivotx) ||
+-                                 ((sortarray[left][0] == pivotx) &&
+-                                  (sortarray[left][1] < pivoty))));
+-    /* Search for a vertex whose x-coordinate is too small for the right. */
+-    do {
+-      right--;
+-    } while ((left <= right) && ((sortarray[right][0] > pivotx) ||
+-                                 ((sortarray[right][0] == pivotx) &&
+-                                  (sortarray[right][1] > pivoty))));
+-    if (left < right) {
+-      /* Swap the left and right vertices. */
+-      temp = sortarray[left];
+-      sortarray[left] = sortarray[right];
+-      sortarray[right] = temp;
+-    }
+-  }
+-  if (left > 1) {
+-    /* Recursively sort the left subset. */
+-    vertexsort(sortarray, left);
+-  }
+-  if (right < arraysize - 2) {
+-    /* Recursively sort the right subset. */
+-    vertexsort(&sortarray[right + 1], arraysize - right - 1);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  vertexmedian()   An order statistic algorithm, almost.  Shuffles an      */
+-/*                   array of vertices so that the first `median' vertices   */
+-/*                   occur lexicographically before the remaining vertices.  */
+-/*                                                                           */
+-/*  Uses the x-coordinate as the primary key if axis == 0; the y-coordinate  */
+-/*  if axis == 1.  Very similar to the vertexsort() procedure, but runs in   */
+-/*  randomized linear time.                                                  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void vertexmedian(vertex *sortarray, int arraysize, int median, int axis)
+-#else /* not ANSI_DECLARATORS */
+-void vertexmedian(sortarray, arraysize, median, axis)
+-vertex *sortarray;
+-int arraysize;
+-int median;
+-int axis;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int left, right;
+-  int pivot;
+-  REAL pivot1, pivot2;
+-  vertex temp;
+-
+-  if (arraysize == 2) {
+-    /* Recursive base case. */
+-    if ((sortarray[0][axis] > sortarray[1][axis]) ||
+-        ((sortarray[0][axis] == sortarray[1][axis]) &&
+-         (sortarray[0][1 - axis] > sortarray[1][1 - axis]))) {
+-      temp = sortarray[1];
+-      sortarray[1] = sortarray[0];
+-      sortarray[0] = temp;
+-    }
+-    return;
+-  }
+-  /* Choose a random pivot to split the array. */
+-  pivot = (int) randomnation((unsigned int) arraysize);
+-  if (pivot == arraysize)//JLM/SES without this test, pivot can equal arraysize and segfault
+-	  pivot--;
+-  pivot1 = sortarray[pivot][axis];
+-  pivot2 = sortarray[pivot][1 - axis];
+-  /* Split the array. */
+-  left = -1;
+-  right = arraysize;
+-  while (left < right) {
+-    /* Search for a vertex whose x-coordinate is too large for the left. */
+-    do {
+-      left++;
+-    } while ((left <= right) && ((sortarray[left][axis] < pivot1) ||
+-                                 ((sortarray[left][axis] == pivot1) &&
+-                                  (sortarray[left][1 - axis] < pivot2))));
+-    /* Search for a vertex whose x-coordinate is too small for the right. */
+-    do {
+-      right--;
+-    } while ((left <= right) && ((sortarray[right][axis] > pivot1) ||
+-                                 ((sortarray[right][axis] == pivot1) &&
+-                                  (sortarray[right][1 - axis] > pivot2))));
+-    if (left < right) {
+-      /* Swap the left and right vertices. */
+-      temp = sortarray[left];
+-      sortarray[left] = sortarray[right];
+-      sortarray[right] = temp;
+-    }
+-  }
+-  /* Unlike in vertexsort(), at most one of the following */
+-  /*   conditionals is true.                             */
+-  if (left > median) {
+-    /* Recursively shuffle the left subset. */
+-    vertexmedian(sortarray, left, median, axis);
+-  }
+-  if (right < median - 1) {
+-    /* Recursively shuffle the right subset. */
+-    vertexmedian(&sortarray[right + 1], arraysize - right - 1,
+-                 median - right - 1, axis);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  alternateaxes()   Sorts the vertices as appropriate for the divide-and-  */
+-/*                    conquer algorithm with alternating cuts.               */
+-/*                                                                           */
+-/*  Partitions by x-coordinate if axis == 0; by y-coordinate if axis == 1.   */
+-/*  For the base case, subsets containing only two or three vertices are     */
+-/*  always sorted by x-coordinate.                                           */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void alternateaxes(vertex *sortarray, int arraysize, int axis)
+-#else /* not ANSI_DECLARATORS */
+-void alternateaxes(sortarray, arraysize, axis)
+-vertex *sortarray;
+-int arraysize;
+-int axis;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int divider;
+-
+-  divider = arraysize >> 1;
+-  if (arraysize <= 3) {
+-    /* Recursive base case:  subsets of two or three vertices will be    */
+-    /*   handled specially, and should always be sorted by x-coordinate. */
+-    axis = 0;
+-  }
+-  /* Partition with a horizontal or vertical cut. */
+-  vertexmedian(sortarray, arraysize, divider, axis);
+-  /* Recursively partition the subsets with a cross cut. */
+-  if (arraysize - divider >= 2) {
+-    if (divider >= 2) {
+-      alternateaxes(sortarray, divider, 1 - axis);
+-    }
+-    alternateaxes(&sortarray[divider], arraysize - divider, 1 - axis);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  mergehulls()   Merge two adjacent Delaunay triangulations into a         */
+-/*                 single Delaunay triangulation.                            */
+-/*                                                                           */
+-/*  This is similar to the algorithm given by Guibas and Stolfi, but uses    */
+-/*  a triangle-based, rather than edge-based, data structure.                */
+-/*                                                                           */
+-/*  The algorithm walks up the gap between the two triangulations, knitting  */
+-/*  them together.  As they are merged, some of their bounding triangles     */
+-/*  are converted into real triangles of the triangulation.  The procedure   */
+-/*  pulls each hull's bounding triangles apart, then knits them together     */
+-/*  like the teeth of two gears.  The Delaunay property determines, at each  */
+-/*  step, whether the next "tooth" is a bounding triangle of the left hull   */
+-/*  or the right.  When a bounding triangle becomes real, its apex is        */
+-/*  changed from NULL to a real vertex.                                      */
+-/*                                                                           */
+-/*  Only two new triangles need to be allocated.  These become new bounding  */
+-/*  triangles at the top and bottom of the seam.  They are used to connect   */
+-/*  the remaining bounding triangles (those that have not been converted     */
+-/*  into real triangles) into a single fan.                                  */
+-/*                                                                           */
+-/*  On entry, `farleft' and `innerleft' are bounding triangles of the left   */
+-/*  triangulation.  The origin of `farleft' is the leftmost vertex, and      */
+-/*  the destination of `innerleft' is the rightmost vertex of the            */
+-/*  triangulation.  Similarly, `innerright' and `farright' are bounding      */
+-/*  triangles of the right triangulation.  The origin of `innerright' and    */
+-/*  destination of `farright' are the leftmost and rightmost vertices.       */
+-/*                                                                           */
+-/*  On completion, the origin of `farleft' is the leftmost vertex of the     */
+-/*  merged triangulation, and the destination of `farright' is the rightmost */
+-/*  vertex.                                                                  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void mergehulls(struct mesh *m, struct behavior *b, struct otri *farleft,
+-                struct otri *innerleft, struct otri *innerright,
+-                struct otri *farright, int axis)
+-#else /* not ANSI_DECLARATORS */
+-void mergehulls(m, b, farleft, innerleft, innerright, farright, axis)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *farleft;
+-struct otri *innerleft;
+-struct otri *innerright;
+-struct otri *farright;
+-int axis;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri leftcand, rightcand;
+-  struct otri baseedge;
+-  struct otri nextedge;
+-  struct otri sidecasing, topcasing, outercasing;
+-  struct otri checkedge;
+-  vertex innerleftdest;
+-  vertex innerrightorg;
+-  vertex innerleftapex, innerrightapex;
+-  vertex farleftpt, farrightpt;
+-  vertex farleftapex, farrightapex;
+-  vertex lowerleft, lowerright;
+-  vertex upperleft, upperright;
+-  vertex nextapex;
+-  vertex checkvertex;
+-  int changemade;
+-  int badedge;
+-  int leftfinished, rightfinished;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  dest(*innerleft, innerleftdest);
+-  apex(*innerleft, innerleftapex);
+-  org(*innerright, innerrightorg);
+-  apex(*innerright, innerrightapex);
+-  /* Special treatment for horizontal cuts. */
+-  if (b->dwyer && (axis == 1)) {
+-    org(*farleft, farleftpt);
+-    apex(*farleft, farleftapex);
+-    dest(*farright, farrightpt);
+-    apex(*farright, farrightapex);
+-    /* The pointers to the extremal vertices are shifted to point to the */
+-    /*   topmost and bottommost vertex of each hull, rather than the     */
+-    /*   leftmost and rightmost vertices.                                */
+-    while (farleftapex[1] < farleftpt[1]) {
+-      lnextself(*farleft);
+-      symself(*farleft);
+-      farleftpt = farleftapex;
+-      apex(*farleft, farleftapex);
+-    }
+-    sym(*innerleft, checkedge);
+-    apex(checkedge, checkvertex);
+-    while (checkvertex[1] > innerleftdest[1]) {
+-      lnext(checkedge, *innerleft);
+-      innerleftapex = innerleftdest;
+-      innerleftdest = checkvertex;
+-      sym(*innerleft, checkedge);
+-      apex(checkedge, checkvertex);
+-    }
+-    while (innerrightapex[1] < innerrightorg[1]) {
+-      lnextself(*innerright);
+-      symself(*innerright);
+-      innerrightorg = innerrightapex;
+-      apex(*innerright, innerrightapex);
+-    }
+-    sym(*farright, checkedge);
+-    apex(checkedge, checkvertex);
+-    while (checkvertex[1] > farrightpt[1]) {
+-      lnext(checkedge, *farright);
+-      farrightpt = checkvertex;
+-      sym(*farright, checkedge);
+-      apex(checkedge, checkvertex);
+-    }
+-  }
+-  /* Find a line tangent to and below both hulls. */
+-  do {
+-    changemade = 0;
+-    /* Make innerleftdest the "bottommost" vertex of the left hull. */
+-    if (counterclockwise(m, b, innerleftdest, innerleftapex, innerrightorg) >
+-        0.0) {
+-      lprevself(*innerleft);
+-      symself(*innerleft);
+-      innerleftdest = innerleftapex;
+-      apex(*innerleft, innerleftapex);
+-      changemade = 1;
+-    }
+-    /* Make innerrightorg the "bottommost" vertex of the right hull. */
+-    if (counterclockwise(m, b, innerrightapex, innerrightorg, innerleftdest) >
+-        0.0) {
+-      lnextself(*innerright);
+-      symself(*innerright);
+-      innerrightorg = innerrightapex;
+-      apex(*innerright, innerrightapex);
+-      changemade = 1;
+-    }
+-  } while (changemade);
+-  /* Find the two candidates to be the next "gear tooth." */
+-  sym(*innerleft, leftcand);
+-  sym(*innerright, rightcand);
+-  /* Create the bottom new bounding triangle. */
+-  maketriangle(m, b, &baseedge);
+-  /* Connect it to the bounding boxes of the left and right triangulations. */
+-  bond(baseedge, *innerleft);
+-  lnextself(baseedge);
+-  bond(baseedge, *innerright);
+-  lnextself(baseedge);
+-  setorg(baseedge, innerrightorg);
+-  setdest(baseedge, innerleftdest);
+-  /* Apex is intentionally left NULL. */
+-  if (b->verbose > 2) {
+-    printf("  Creating base bounding ");
+-    printtriangle(m, b, &baseedge);
+-  }
+-  /* Fix the extreme triangles if necessary. */
+-  org(*farleft, farleftpt);
+-  if (innerleftdest == farleftpt) {
+-    lnext(baseedge, *farleft);
+-  }
+-  dest(*farright, farrightpt);
+-  if (innerrightorg == farrightpt) {
+-    lprev(baseedge, *farright);
+-  }
+-  /* The vertices of the current knitting edge. */
+-  lowerleft = innerleftdest;
+-  lowerright = innerrightorg;
+-  /* The candidate vertices for knitting. */
+-  apex(leftcand, upperleft);
+-  apex(rightcand, upperright);
+-  /* Walk up the gap between the two triangulations, knitting them together. */
+-  while (1) {
+-    /* Have we reached the top?  (This isn't quite the right question,       */
+-    /*   because even though the left triangulation might seem finished now, */
+-    /*   moving up on the right triangulation might reveal a new vertex of   */
+-    /*   the left triangulation.  And vice-versa.)                           */
+-    leftfinished = counterclockwise(m, b, upperleft, lowerleft, lowerright) <=
+-                   0.0;
+-    rightfinished = counterclockwise(m, b, upperright, lowerleft, lowerright)
+-                 <= 0.0;
+-    if (leftfinished && rightfinished) {
+-      /* Create the top new bounding triangle. */
+-      maketriangle(m, b, &nextedge);
+-      setorg(nextedge, lowerleft);
+-      setdest(nextedge, lowerright);
+-      /* Apex is intentionally left NULL. */
+-      /* Connect it to the bounding boxes of the two triangulations. */
+-      bond(nextedge, baseedge);
+-      lnextself(nextedge);
+-      bond(nextedge, rightcand);
+-      lnextself(nextedge);
+-      bond(nextedge, leftcand);
+-      if (b->verbose > 2) {
+-        printf("  Creating top bounding ");
+-        printtriangle(m, b, &nextedge);
+-      }
+-      /* Special treatment for horizontal cuts. */
+-      if (b->dwyer && (axis == 1)) {
+-        org(*farleft, farleftpt);
+-        apex(*farleft, farleftapex);
+-        dest(*farright, farrightpt);
+-        apex(*farright, farrightapex);
+-        sym(*farleft, checkedge);
+-        apex(checkedge, checkvertex);
+-        /* The pointers to the extremal vertices are restored to the  */
+-        /*   leftmost and rightmost vertices (rather than topmost and */
+-        /*   bottommost).                                             */
+-        while (checkvertex[0] < farleftpt[0]) {
+-          lprev(checkedge, *farleft);
+-          farleftpt = checkvertex;
+-          sym(*farleft, checkedge);
+-          apex(checkedge, checkvertex);
+-        }
+-        while (farrightapex[0] > farrightpt[0]) {
+-          lprevself(*farright);
+-          symself(*farright);
+-          farrightpt = farrightapex;
+-          apex(*farright, farrightapex);
+-        }
+-      }
+-      return;
+-    }
+-    /* Consider eliminating edges from the left triangulation. */
+-    if (!leftfinished) {
+-      /* What vertex would be exposed if an edge were deleted? */
+-      lprev(leftcand, nextedge);
+-      symself(nextedge);
+-      apex(nextedge, nextapex);
+-      /* If nextapex is NULL, then no vertex would be exposed; the */
+-      /*   triangulation would have been eaten right through.      */
+-      if (nextapex != (vertex) NULL) {
+-        /* Check whether the edge is Delaunay. */
+-        badedge = incircle(m, b, lowerleft, lowerright, upperleft, nextapex) >
+-                  0.0;
+-        while (badedge) {
+-          /* Eliminate the edge with an edge flip.  As a result, the    */
+-          /*   left triangulation will have one more boundary triangle. */
+-          lnextself(nextedge);
+-          sym(nextedge, topcasing);
+-          lnextself(nextedge);
+-          sym(nextedge, sidecasing);
+-          bond(nextedge, topcasing);
+-          bond(leftcand, sidecasing);
+-          lnextself(leftcand);
+-          sym(leftcand, outercasing);
+-          lprevself(nextedge);
+-          bond(nextedge, outercasing);
+-          /* Correct the vertices to reflect the edge flip. */
+-          setorg(leftcand, lowerleft);
+-          setdest(leftcand, NULL);
+-          setapex(leftcand, nextapex);
+-          setorg(nextedge, NULL);
+-          setdest(nextedge, upperleft);
+-          setapex(nextedge, nextapex);
+-          /* Consider the newly exposed vertex. */
+-          upperleft = nextapex;
+-          /* What vertex would be exposed if another edge were deleted? */
+-          otricopy(sidecasing, nextedge);
+-          apex(nextedge, nextapex);
+-          if (nextapex != (vertex) NULL) {
+-            /* Check whether the edge is Delaunay. */
+-            badedge = incircle(m, b, lowerleft, lowerright, upperleft,
+-                               nextapex) > 0.0;
+-          } else {
+-            /* Avoid eating right through the triangulation. */
+-            badedge = 0;
+-          }
+-        }
+-      }
+-    }
+-    /* Consider eliminating edges from the right triangulation. */
+-    if (!rightfinished) {
+-      /* What vertex would be exposed if an edge were deleted? */
+-      lnext(rightcand, nextedge);
+-      symself(nextedge);
+-      apex(nextedge, nextapex);
+-      /* If nextapex is NULL, then no vertex would be exposed; the */
+-      /*   triangulation would have been eaten right through.      */
+-      if (nextapex != (vertex) NULL) {
+-        /* Check whether the edge is Delaunay. */
+-        badedge = incircle(m, b, lowerleft, lowerright, upperright, nextapex) >
+-                  0.0;
+-        while (badedge) {
+-          /* Eliminate the edge with an edge flip.  As a result, the     */
+-          /*   right triangulation will have one more boundary triangle. */
+-          lprevself(nextedge);
+-          sym(nextedge, topcasing);
+-          lprevself(nextedge);
+-          sym(nextedge, sidecasing);
+-          bond(nextedge, topcasing);
+-          bond(rightcand, sidecasing);
+-          lprevself(rightcand);
+-          sym(rightcand, outercasing);
+-          lnextself(nextedge);
+-          bond(nextedge, outercasing);
+-          /* Correct the vertices to reflect the edge flip. */
+-          setorg(rightcand, NULL);
+-          setdest(rightcand, lowerright);
+-          setapex(rightcand, nextapex);
+-          setorg(nextedge, upperright);
+-          setdest(nextedge, NULL);
+-          setapex(nextedge, nextapex);
+-          /* Consider the newly exposed vertex. */
+-          upperright = nextapex;
+-          /* What vertex would be exposed if another edge were deleted? */
+-          otricopy(sidecasing, nextedge);
+-          apex(nextedge, nextapex);
+-          if (nextapex != (vertex) NULL) {
+-            /* Check whether the edge is Delaunay. */
+-            badedge = incircle(m, b, lowerleft, lowerright, upperright,
+-                               nextapex) > 0.0;
+-          } else {
+-            /* Avoid eating right through the triangulation. */
+-            badedge = 0;
+-          }
+-        }
+-      }
+-    }
+-    if (leftfinished || (!rightfinished &&
+-           (incircle(m, b, upperleft, lowerleft, lowerright, upperright) >
+-            0.0))) {
+-      /* Knit the triangulations, adding an edge from `lowerleft' */
+-      /*   to `upperright'.                                       */
+-      bond(baseedge, rightcand);
+-      lprev(rightcand, baseedge);
+-      setdest(baseedge, lowerleft);
+-      lowerright = upperright;
+-      sym(baseedge, rightcand);
+-      apex(rightcand, upperright);
+-    } else {
+-      /* Knit the triangulations, adding an edge from `upperleft' */
+-      /*   to `lowerright'.                                       */
+-      bond(baseedge, leftcand);
+-      lnext(leftcand, baseedge);
+-      setorg(baseedge, lowerright);
+-      lowerleft = upperleft;
+-      sym(baseedge, leftcand);
+-      apex(leftcand, upperleft);
+-    }
+-    if (b->verbose > 2) {
+-      printf("  Connecting ");
+-      printtriangle(m, b, &baseedge);
+-    }
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  divconqrecurse()   Recursively form a Delaunay triangulation by the      */
+-/*                     divide-and-conquer method.                            */
+-/*                                                                           */
+-/*  Recursively breaks down the problem into smaller pieces, which are       */
+-/*  knitted together by mergehulls().  The base cases (problems of two or    */
+-/*  three vertices) are handled specially here.                              */
+-/*                                                                           */
+-/*  On completion, `farleft' and `farright' are bounding triangles such that */
+-/*  the origin of `farleft' is the leftmost vertex (breaking ties by         */
+-/*  choosing the highest leftmost vertex), and the destination of            */
+-/*  `farright' is the rightmost vertex (breaking ties by choosing the        */
+-/*  lowest rightmost vertex).                                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void divconqrecurse(struct mesh *m, struct behavior *b, vertex *sortarray,
+-                    int vertices, int axis,
+-                    struct otri *farleft, struct otri *farright)
+-#else /* not ANSI_DECLARATORS */
+-void divconqrecurse(m, b, sortarray, vertices, axis, farleft, farright)
+-struct mesh *m;
+-struct behavior *b;
+-vertex *sortarray;
+-int vertices;
+-int axis;
+-struct otri *farleft;
+-struct otri *farright;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri midtri, tri1, tri2, tri3;
+-  struct otri innerleft, innerright;
+-  REAL area;
+-  int divider;
+-
+-  if (b->verbose > 2) {
+-    printf("  Triangulating %d vertices.\n", vertices);
+-  }
+-  if (vertices == 2) {
+-    /* The triangulation of two vertices is an edge.  An edge is */
+-    /*   represented by two bounding triangles.                  */
+-    maketriangle(m, b, farleft);
+-    setorg(*farleft, sortarray[0]);
+-    setdest(*farleft, sortarray[1]);
+-    /* The apex is intentionally left NULL. */
+-    maketriangle(m, b, farright);
+-    setorg(*farright, sortarray[1]);
+-    setdest(*farright, sortarray[0]);
+-    /* The apex is intentionally left NULL. */
+-    bond(*farleft, *farright);
+-    lprevself(*farleft);
+-    lnextself(*farright);
+-    bond(*farleft, *farright);
+-    lprevself(*farleft);
+-    lnextself(*farright);
+-    bond(*farleft, *farright);
+-    if (b->verbose > 2) {
+-      printf("  Creating ");
+-      printtriangle(m, b, farleft);
+-      printf("  Creating ");
+-      printtriangle(m, b, farright);
+-    }
+-    /* Ensure that the origin of `farleft' is sortarray[0]. */
+-    lprev(*farright, *farleft);
+-    return;
+-  } else if (vertices == 3) {
+-    /* The triangulation of three vertices is either a triangle (with */
+-    /*   three bounding triangles) or two edges (with four bounding   */
+-    /*   triangles).  In either case, four triangles are created.     */
+-    maketriangle(m, b, &midtri);
+-    maketriangle(m, b, &tri1);
+-    maketriangle(m, b, &tri2);
+-    maketriangle(m, b, &tri3);
+-    area = counterclockwise(m, b, sortarray[0], sortarray[1], sortarray[2]);
+-    if (area == 0.0) {
+-      /* Three collinear vertices; the triangulation is two edges. */
+-      setorg(midtri, sortarray[0]);
+-      setdest(midtri, sortarray[1]);
+-      setorg(tri1, sortarray[1]);
+-      setdest(tri1, sortarray[0]);
+-      setorg(tri2, sortarray[2]);
+-      setdest(tri2, sortarray[1]);
+-      setorg(tri3, sortarray[1]);
+-      setdest(tri3, sortarray[2]);
+-      /* All apices are intentionally left NULL. */
+-      bond(midtri, tri1);
+-      bond(tri2, tri3);
+-      lnextself(midtri);
+-      lprevself(tri1);
+-      lnextself(tri2);
+-      lprevself(tri3);
+-      bond(midtri, tri3);
+-      bond(tri1, tri2);
+-      lnextself(midtri);
+-      lprevself(tri1);
+-      lnextself(tri2);
+-      lprevself(tri3);
+-      bond(midtri, tri1);
+-      bond(tri2, tri3);
+-      /* Ensure that the origin of `farleft' is sortarray[0]. */
+-      otricopy(tri1, *farleft);
+-      /* Ensure that the destination of `farright' is sortarray[2]. */
+-      otricopy(tri2, *farright);
+-    } else {
+-      /* The three vertices are not collinear; the triangulation is one */
+-      /*   triangle, namely `midtri'.                                   */
+-      setorg(midtri, sortarray[0]);
+-      setdest(tri1, sortarray[0]);
+-      setorg(tri3, sortarray[0]);
+-      /* Apices of tri1, tri2, and tri3 are left NULL. */
+-      if (area > 0.0) {
+-        /* The vertices are in counterclockwise order. */
+-        setdest(midtri, sortarray[1]);
+-        setorg(tri1, sortarray[1]);
+-        setdest(tri2, sortarray[1]);
+-        setapex(midtri, sortarray[2]);
+-        setorg(tri2, sortarray[2]);
+-        setdest(tri3, sortarray[2]);
+-      } else {
+-        /* The vertices are in clockwise order. */
+-        setdest(midtri, sortarray[2]);
+-        setorg(tri1, sortarray[2]);
+-        setdest(tri2, sortarray[2]);
+-        setapex(midtri, sortarray[1]);
+-        setorg(tri2, sortarray[1]);
+-        setdest(tri3, sortarray[1]);
+-      }
+-      /* The topology does not depend on how the vertices are ordered. */
+-      bond(midtri, tri1);
+-      lnextself(midtri);
+-      bond(midtri, tri2);
+-      lnextself(midtri);
+-      bond(midtri, tri3);
+-      lprevself(tri1);
+-      lnextself(tri2);
+-      bond(tri1, tri2);
+-      lprevself(tri1);
+-      lprevself(tri3);
+-      bond(tri1, tri3);
+-      lnextself(tri2);
+-      lprevself(tri3);
+-      bond(tri2, tri3);
+-      /* Ensure that the origin of `farleft' is sortarray[0]. */
+-      otricopy(tri1, *farleft);
+-      /* Ensure that the destination of `farright' is sortarray[2]. */
+-      if (area > 0.0) {
+-        otricopy(tri2, *farright);
+-      } else {
+-        lnext(*farleft, *farright);
+-      }
+-    }
+-    if (b->verbose > 2) {
+-      printf("  Creating ");
+-      printtriangle(m, b, &midtri);
+-      printf("  Creating ");
+-      printtriangle(m, b, &tri1);
+-      printf("  Creating ");
+-      printtriangle(m, b, &tri2);
+-      printf("  Creating ");
+-      printtriangle(m, b, &tri3);
+-    }
+-    return;
+-  } else {
+-    /* Split the vertices in half. */
+-    divider = vertices >> 1;
+-    /* Recursively triangulate each half. */
+-    divconqrecurse(m, b, sortarray, divider, 1 - axis, farleft, &innerleft);
+-    divconqrecurse(m, b, &sortarray[divider], vertices - divider, 1 - axis,
+-                   &innerright, farright);
+-    if (b->verbose > 1) {
+-      printf("  Joining triangulations with %d and %d vertices.\n", divider,
+-             vertices - divider);
+-    }
+-    /* Merge the two triangulations into one. */
+-    mergehulls(m, b, farleft, &innerleft, &innerright, farright, axis);
+-  }
+-}
+-
+-#ifdef ANSI_DECLARATORS
+-long removeghosts(struct mesh *m, struct behavior *b, struct otri *startghost)
+-#else /* not ANSI_DECLARATORS */
+-long removeghosts(m, b, startghost)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *startghost;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri searchedge;
+-  struct otri dissolveedge;
+-  struct otri deadtriangle;
+-  vertex markorg;
+-  long hullsize;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  if (b->verbose) {
+-    printf("  Removing ghost triangles.\n");
+-  }
+-  /* Find an edge on the convex hull to start point location from. */
+-  lprev(*startghost, searchedge);
+-  symself(searchedge);
+-  m->dummytri[0] = encode(searchedge);
+-  /* Remove the bounding box and count the convex hull edges. */
+-  otricopy(*startghost, dissolveedge);
+-  hullsize = 0;
+-  do {
+-    hullsize++;
+-    lnext(dissolveedge, deadtriangle);
+-    lprevself(dissolveedge);
+-    symself(dissolveedge);
+-    /* If no PSLG is involved, set the boundary markers of all the vertices */
+-    /*   on the convex hull.  If a PSLG is used, this step is done later.   */
+-    if (!b->poly) {
+-      /* Watch out for the case where all the input vertices are collinear. */
+-      if (dissolveedge.tri != m->dummytri) {
+-        org(dissolveedge, markorg);
+-        if (vertexmark(markorg) == 0) {
+-          setvertexmark(markorg, 1);
+-        }
+-      }
+-    }
+-    /* Remove a bounding triangle from a convex hull triangle. */
+-    dissolve(dissolveedge);
+-    /* Find the next bounding triangle. */
+-    sym(deadtriangle, dissolveedge);
+-    /* Delete the bounding triangle. */
+-    triangledealloc(m, deadtriangle.tri);
+-  } while (!otriequal(dissolveedge, *startghost));
+-  return hullsize;
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  divconqdelaunay()   Form a Delaunay triangulation by the divide-and-     */
+-/*                      conquer method.                                      */
+-/*                                                                           */
+-/*  Sorts the vertices, calls a recursive procedure to triangulate them, and */
+-/*  removes the bounding box, setting boundary markers as appropriate.       */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-long divconqdelaunay(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-long divconqdelaunay(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  vertex *sortarray;
+-  struct otri hullleft, hullright;
+-  int divider;
+-  int i, j;
+-
+-  if (b->verbose) {
+-    printf("  Sorting vertices.\n");
+-  }
+-
+-  /* Allocate an array of pointers to vertices for sorting. */
+-  sortarray = (vertex *) trimalloc(m->invertices * (int) sizeof(vertex));
+-  traversalinit(&m->vertices);
+-  for (i = 0; i < m->invertices; i++) {
+-    sortarray[i] = vertextraverse(m);
+-  }
+-  /* Sort the vertices. */
+-  vertexsort(sortarray, m->invertices);
+-  /* Discard duplicate vertices, which can really mess up the algorithm. */
+-  i = 0;
+-  for (j = 1; j < m->invertices; j++) {
+-    if ((sortarray[i][0] == sortarray[j][0])
+-        && (sortarray[i][1] == sortarray[j][1])) {
+-      if (!b->quiet) {
+-        printf(
+-"Warning:  A duplicate vertex at (%.12g, %.12g) appeared and was ignored.\n",
+-               sortarray[j][0], sortarray[j][1]);
+-      }
+-      setvertextype(sortarray[j], UNDEADVERTEX);
+-      m->undeads++;
+-    } else {
+-      i++;
+-      sortarray[i] = sortarray[j];
+-    }
+-  }
+-  i++;
+-  if (b->dwyer) {
+-    /* Re-sort the array of vertices to accommodate alternating cuts. */
+-    divider = i >> 1;
+-    if (i - divider >= 2) {
+-      if (divider >= 2) {
+-        alternateaxes(sortarray, divider, 1);
+-      }
+-      alternateaxes(&sortarray[divider], i - divider, 1);
+-    }
+-  }
+-
+-  if (b->verbose) {
+-    printf("  Forming triangulation.\n");
+-  }
+-
+-  /* Form the Delaunay triangulation. */
+-  divconqrecurse(m, b, sortarray, i, 0, &hullleft, &hullright);
+-  trifree((void *) sortarray);
+-
+-  return removeghosts(m, b, &hullleft);
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Divide-and-conquer Delaunay triangulation ends here       *********/
+-
+-/********* Incremental Delaunay triangulation begins here            *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  boundingbox()   Form an "infinite" bounding triangle to insert vertices  */
+-/*                  into.                                                    */
+-/*                                                                           */
+-/*  The vertices at "infinity" are assigned finite coordinates, which are    */
+-/*  used by the point location routines, but (mostly) ignored by the         */
+-/*  Delaunay edge flip routines.                                             */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void boundingbox(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void boundingbox(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri inftri;          /* Handle for the triangular bounding box. */
+-  REAL width;
+-
+-  if (b->verbose) {
+-    printf("  Creating triangular bounding box.\n");
+-  }
+-  /* Find the width (or height, whichever is larger) of the triangulation. */
+-  width = m->xmax - m->xmin;
+-  if (m->ymax - m->ymin > width) {
+-    width = m->ymax - m->ymin;
+-  }
+-  if (width == 0.0) {
+-    width = 1.0;
+-  }
+-  /* Create the vertices of the bounding box. */
+-  m->infvertex1 = (vertex) trimalloc(m->vertices.itembytes);
+-  m->infvertex2 = (vertex) trimalloc(m->vertices.itembytes);
+-  m->infvertex3 = (vertex) trimalloc(m->vertices.itembytes);
+-  m->infvertex1[0] = m->xmin - 50.0 * width;
+-  m->infvertex1[1] = m->ymin - 40.0 * width;
+-  m->infvertex2[0] = m->xmax + 50.0 * width;
+-  m->infvertex2[1] = m->ymin - 40.0 * width;
+-  m->infvertex3[0] = 0.5 * (m->xmin + m->xmax);
+-  m->infvertex3[1] = m->ymax + 60.0 * width;
+-
+-  /* Create the bounding box. */
+-  maketriangle(m, b, &inftri);
+-  setorg(inftri, m->infvertex1);
+-  setdest(inftri, m->infvertex2);
+-  setapex(inftri, m->infvertex3);
+-  /* Link dummytri to the bounding box so we can always find an */
+-  /*   edge to begin searching (point location) from.           */
+-  m->dummytri[0] = (triangle) inftri.tri;
+-  if (b->verbose > 2) {
+-    printf("  Creating ");
+-    printtriangle(m, b, &inftri);
+-  }
+-}
+-
+-#endif /* not REDUCED */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  removebox()   Remove the "infinite" bounding triangle, setting boundary  */
+-/*                markers as appropriate.                                    */
+-/*                                                                           */
+-/*  The triangular bounding box has three boundary triangles (one for each   */
+-/*  side of the bounding box), and a bunch of triangles fanning out from     */
+-/*  the three bounding box vertices (one triangle for each edge of the       */
+-/*  convex hull of the inner mesh).  This routine removes these triangles.   */
+-/*                                                                           */
+-/*  Returns the number of edges on the convex hull of the triangulation.     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-long removebox(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-long removebox(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri deadtriangle;
+-  struct otri searchedge;
+-  struct otri checkedge;
+-  struct otri nextedge, finaledge, dissolveedge;
+-  vertex markorg;
+-  long hullsize;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  if (b->verbose) {
+-    printf("  Removing triangular bounding box.\n");
+-  }
+-  /* Find a boundary triangle. */
+-  nextedge.tri = m->dummytri;
+-  nextedge.orient = 0;
+-  symself(nextedge);
+-  /* Mark a place to stop. */
+-  lprev(nextedge, finaledge);
+-  lnextself(nextedge);
+-  symself(nextedge);
+-  /* Find a triangle (on the boundary of the vertex set) that isn't */
+-  /*   a bounding box triangle.                                     */
+-  lprev(nextedge, searchedge);
+-  symself(searchedge);
+-  /* Check whether nextedge is another boundary triangle */
+-  /*   adjacent to the first one.                        */
+-  lnext(nextedge, checkedge);
+-  symself(checkedge);
+-  if (checkedge.tri == m->dummytri) {
+-    /* Go on to the next triangle.  There are only three boundary   */
+-    /*   triangles, and this next triangle cannot be the third one, */
+-    /*   so it's safe to stop here.                                 */
+-    lprevself(searchedge);
+-    symself(searchedge);
+-  }
+-  /* Find a new boundary edge to search from, as the current search */
+-  /*   edge lies on a bounding box triangle and will be deleted.    */
+-  m->dummytri[0] = encode(searchedge);
+-  hullsize = -2l;
+-  while (!otriequal(nextedge, finaledge)) {
+-    hullsize++;
+-    lprev(nextedge, dissolveedge);
+-    symself(dissolveedge);
+-    /* If not using a PSLG, the vertices should be marked now. */
+-    /*   (If using a PSLG, markhull() will do the job.)        */
+-    if (!b->poly) {
+-      /* Be careful!  One must check for the case where all the input     */
+-      /*   vertices are collinear, and thus all the triangles are part of */
+-      /*   the bounding box.  Otherwise, the setvertexmark() call below   */
+-      /*   will cause a bad pointer reference.                            */
+-      if (dissolveedge.tri != m->dummytri) {
+-        org(dissolveedge, markorg);
+-        if (vertexmark(markorg) == 0) {
+-          setvertexmark(markorg, 1);
+-        }
+-      }
+-    }
+-    /* Disconnect the bounding box triangle from the mesh triangle. */
+-    dissolve(dissolveedge);
+-    lnext(nextedge, deadtriangle);
+-    sym(deadtriangle, nextedge);
+-    /* Get rid of the bounding box triangle. */
+-    triangledealloc(m, deadtriangle.tri);
+-    /* Do we need to turn the corner? */
+-    if (nextedge.tri == m->dummytri) {
+-      /* Turn the corner. */
+-      otricopy(dissolveedge, nextedge);
+-    }
+-  }
+-  triangledealloc(m, finaledge.tri);
+-
+-  trifree((void *) m->infvertex1);  /* Deallocate the bounding box vertices. */
+-  trifree((void *) m->infvertex2);
+-  trifree((void *) m->infvertex3);
+-
+-  return hullsize;
+-}
+-
+-#endif /* not REDUCED */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  incrementaldelaunay()   Form a Delaunay triangulation by incrementally   */
+-/*                          inserting vertices.                              */
+-/*                                                                           */
+-/*  Returns the number of edges on the convex hull of the triangulation.     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-long incrementaldelaunay(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-long incrementaldelaunay(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri starttri;
+-  vertex vertexloop;
+-
+-  /* Create a triangular bounding box. */
+-  boundingbox(m, b);
+-  if (b->verbose) {
+-    printf("  Incrementally inserting vertices.\n");
+-  }
+-  traversalinit(&m->vertices);
+-  vertexloop = vertextraverse(m);
+-  while (vertexloop != (vertex) NULL) {
+-    starttri.tri = m->dummytri;
+-    if (insertvertex(m, b, vertexloop, &starttri, (struct osub *) NULL, 0, 0)
+-        == DUPLICATEVERTEX) {
+-      if (!b->quiet) {
+-        printf(
+-"Warning:  A duplicate vertex at (%.12g, %.12g) appeared and was ignored.\n",
+-               vertexloop[0], vertexloop[1]);
+-      }
+-      setvertextype(vertexloop, UNDEADVERTEX);
+-      m->undeads++;
+-    }
+-    vertexloop = vertextraverse(m);
+-  }
+-  /* Remove the bounding box. */
+-  return removebox(m, b);
+-}
+-
+-#endif /* not REDUCED */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Incremental Delaunay triangulation ends here              *********/
+-
+-/********* Sweepline Delaunay triangulation begins here              *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void eventheapinsert(struct event **heap, int heapsize, struct event *newevent)
+-#else /* not ANSI_DECLARATORS */
+-void eventheapinsert(heap, heapsize, newevent)
+-struct event **heap;
+-int heapsize;
+-struct event *newevent;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL eventx, eventy;
+-  int eventnum;
+-  int parent;
+-  int notdone;
+-
+-  eventx = newevent->xkey;
+-  eventy = newevent->ykey;
+-  eventnum = heapsize;
+-  notdone = eventnum > 0;
+-  while (notdone) {
+-    parent = (eventnum - 1) >> 1;
+-    if ((heap[parent]->ykey < eventy) ||
+-        ((heap[parent]->ykey == eventy)
+-         && (heap[parent]->xkey <= eventx))) {
+-      notdone = 0;
+-    } else {
+-      heap[eventnum] = heap[parent];
+-      heap[eventnum]->heapposition = eventnum;
+-
+-      eventnum = parent;
+-      notdone = eventnum > 0;
+-    }
+-  }
+-  heap[eventnum] = newevent;
+-  newevent->heapposition = eventnum;
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void eventheapify(struct event **heap, int heapsize, int eventnum)
+-#else /* not ANSI_DECLARATORS */
+-void eventheapify(heap, heapsize, eventnum)
+-struct event **heap;
+-int heapsize;
+-int eventnum;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct event *thisevent;
+-  REAL eventx, eventy;
+-  int leftchild, rightchild;
+-  int smallest;
+-  int notdone;
+-
+-  thisevent = heap[eventnum];
+-  eventx = thisevent->xkey;
+-  eventy = thisevent->ykey;
+-  leftchild = 2 * eventnum + 1;
+-  notdone = leftchild < heapsize;
+-  while (notdone) {
+-    if ((heap[leftchild]->ykey < eventy) ||
+-        ((heap[leftchild]->ykey == eventy)
+-         && (heap[leftchild]->xkey < eventx))) {
+-      smallest = leftchild;
+-    } else {
+-      smallest = eventnum;
+-    }
+-    rightchild = leftchild + 1;
+-    if (rightchild < heapsize) {
+-      if ((heap[rightchild]->ykey < heap[smallest]->ykey) ||
+-          ((heap[rightchild]->ykey == heap[smallest]->ykey)
+-           && (heap[rightchild]->xkey < heap[smallest]->xkey))) {
+-        smallest = rightchild;
+-      }
+-    }
+-    if (smallest == eventnum) {
+-      notdone = 0;
+-    } else {
+-      heap[eventnum] = heap[smallest];
+-      heap[eventnum]->heapposition = eventnum;
+-      heap[smallest] = thisevent;
+-      thisevent->heapposition = smallest;
+-
+-      eventnum = smallest;
+-      leftchild = 2 * eventnum + 1;
+-      notdone = leftchild < heapsize;
+-    }
+-  }
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void eventheapdelete(struct event **heap, int heapsize, int eventnum)
+-#else /* not ANSI_DECLARATORS */
+-void eventheapdelete(heap, heapsize, eventnum)
+-struct event **heap;
+-int heapsize;
+-int eventnum;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct event *moveevent;
+-  REAL eventx, eventy;
+-  int parent;
+-  int notdone;
+-
+-  moveevent = heap[heapsize - 1];
+-  if (eventnum > 0) {
+-    eventx = moveevent->xkey;
+-    eventy = moveevent->ykey;
+-    do {
+-      parent = (eventnum - 1) >> 1;
+-      if ((heap[parent]->ykey < eventy) ||
+-          ((heap[parent]->ykey == eventy)
+-           && (heap[parent]->xkey <= eventx))) {
+-        notdone = 0;
+-      } else {
+-        heap[eventnum] = heap[parent];
+-        heap[eventnum]->heapposition = eventnum;
+-
+-        eventnum = parent;
+-        notdone = eventnum > 0;
+-      }
+-    } while (notdone);
+-  }
+-  heap[eventnum] = moveevent;
+-  moveevent->heapposition = eventnum;
+-  eventheapify(heap, heapsize - 1, eventnum);
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void createeventheap(struct mesh *m, struct event ***eventheap,
+-                     struct event **events, struct event **freeevents)
+-#else /* not ANSI_DECLARATORS */
+-void createeventheap(m, eventheap, events, freeevents)
+-struct mesh *m;
+-struct event ***eventheap;
+-struct event **events;
+-struct event **freeevents;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  vertex thisvertex;
+-  int maxevents;
+-  int i;
+-
+-  maxevents = (3 * m->invertices) / 2;
+-  *eventheap = (struct event **) trimalloc(maxevents *
+-                                           (int) sizeof(struct event *));
+-  *events = (struct event *) trimalloc(maxevents * (int) sizeof(struct event));
+-  traversalinit(&m->vertices);
+-  for (i = 0; i < m->invertices; i++) {
+-    thisvertex = vertextraverse(m);
+-    (*events)[i].eventptr = (void *) thisvertex;
+-    (*events)[i].xkey = thisvertex[0];
+-    (*events)[i].ykey = thisvertex[1];
+-    eventheapinsert(*eventheap, i, *events + i);
+-  }
+-  *freeevents = (struct event *) NULL;
+-  for (i = maxevents - 1; i >= m->invertices; i--) {
+-    (*events)[i].eventptr = (void *) *freeevents;
+-    *freeevents = *events + i;
+-  }
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-int rightofhyperbola(struct mesh *m, struct otri *fronttri, vertex newsite)
+-#else /* not ANSI_DECLARATORS */
+-int rightofhyperbola(m, fronttri, newsite)
+-struct mesh *m;
+-struct otri *fronttri;
+-vertex newsite;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  vertex leftvertex, rightvertex;
+-  REAL dxa, dya, dxb, dyb;
+-
+-  m->hyperbolacount++;
+-
+-  dest(*fronttri, leftvertex);
+-  apex(*fronttri, rightvertex);
+-  if ((leftvertex[1] < rightvertex[1]) ||
+-      ((leftvertex[1] == rightvertex[1]) &&
+-       (leftvertex[0] < rightvertex[0]))) {
+-    if (newsite[0] >= rightvertex[0]) {
+-      return 1;
+-    }
+-  } else {
+-    if (newsite[0] <= leftvertex[0]) {
+-      return 0;
+-    }
+-  }
+-  dxa = leftvertex[0] - newsite[0];
+-  dya = leftvertex[1] - newsite[1];
+-  dxb = rightvertex[0] - newsite[0];
+-  dyb = rightvertex[1] - newsite[1];
+-  return dya * (dxb * dxb + dyb * dyb) > dyb * (dxa * dxa + dya * dya);
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-REAL circletop(struct mesh *m, vertex pa, vertex pb, vertex pc, REAL ccwabc)
+-#else /* not ANSI_DECLARATORS */
+-REAL circletop(m, pa, pb, pc, ccwabc)
+-struct mesh *m;
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-REAL ccwabc;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL xac, yac, xbc, ybc, xab, yab;
+-  REAL aclen2, bclen2, ablen2;
+-
+-  m->circletopcount++;
+-
+-  xac = pa[0] - pc[0];
+-  yac = pa[1] - pc[1];
+-  xbc = pb[0] - pc[0];
+-  ybc = pb[1] - pc[1];
+-  xab = pa[0] - pb[0];
+-  yab = pa[1] - pb[1];
+-  aclen2 = xac * xac + yac * yac;
+-  bclen2 = xbc * xbc + ybc * ybc;
+-  ablen2 = xab * xab + yab * yab;
+-  return pc[1] + (xac * bclen2 - xbc * aclen2 + sqrt(aclen2 * bclen2 * ablen2))
+-               / (2.0 * ccwabc);
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-void check4deadevent(struct otri *checktri, struct event **freeevents,
+-                     struct event **eventheap, int *heapsize)
+-#else /* not ANSI_DECLARATORS */
+-void check4deadevent(checktri, freeevents, eventheap, heapsize)
+-struct otri *checktri;
+-struct event **freeevents;
+-struct event **eventheap;
+-int *heapsize;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct event *deadevent;
+-  vertex eventvertex;
+-  int eventnum;
+-
+-  org(*checktri, eventvertex);
+-  if (eventvertex != (vertex) NULL) {
+-    deadevent = (struct event *) eventvertex;
+-    eventnum = deadevent->heapposition;
+-    deadevent->eventptr = (void *) *freeevents;
+-    *freeevents = deadevent;
+-    eventheapdelete(eventheap, *heapsize, eventnum);
+-    (*heapsize)--;
+-    setorg(*checktri, NULL);
+-  }
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-struct splaynode *splay(struct mesh *m, struct splaynode *splaytree,
+-                        vertex searchpoint, struct otri *searchtri)
+-#else /* not ANSI_DECLARATORS */
+-struct splaynode *splay(m, splaytree, searchpoint, searchtri)
+-struct mesh *m;
+-struct splaynode *splaytree;
+-vertex searchpoint;
+-struct otri *searchtri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct splaynode *child, *grandchild;
+-  struct splaynode *lefttree, *righttree;
+-  struct splaynode *leftright;
+-  vertex checkvertex;
+-  int rightofroot, rightofchild;
+-
+-  if (splaytree == (struct splaynode *) NULL) {
+-    return (struct splaynode *) NULL;
+-  }
+-  dest(splaytree->keyedge, checkvertex);
+-  if (checkvertex == splaytree->keydest) {
+-    rightofroot = rightofhyperbola(m, &splaytree->keyedge, searchpoint);
+-    if (rightofroot) {
+-      otricopy(splaytree->keyedge, *searchtri);
+-      child = splaytree->rchild;
+-    } else {
+-      child = splaytree->lchild;
+-    }
+-    if (child == (struct splaynode *) NULL) {
+-      return splaytree;
+-    }
+-    dest(child->keyedge, checkvertex);
+-    if (checkvertex != child->keydest) {
+-      child = splay(m, child, searchpoint, searchtri);
+-      if (child == (struct splaynode *) NULL) {
+-        if (rightofroot) {
+-          splaytree->rchild = (struct splaynode *) NULL;
+-        } else {
+-          splaytree->lchild = (struct splaynode *) NULL;
+-        }
+-        return splaytree;
+-      }
+-    }
+-    rightofchild = rightofhyperbola(m, &child->keyedge, searchpoint);
+-    if (rightofchild) {
+-      otricopy(child->keyedge, *searchtri);
+-      grandchild = splay(m, child->rchild, searchpoint, searchtri);
+-      child->rchild = grandchild;
+-    } else {
+-      grandchild = splay(m, child->lchild, searchpoint, searchtri);
+-      child->lchild = grandchild;
+-    }
+-    if (grandchild == (struct splaynode *) NULL) {
+-      if (rightofroot) {
+-        splaytree->rchild = child->lchild;
+-        child->lchild = splaytree;
+-      } else {
+-        splaytree->lchild = child->rchild;
+-        child->rchild = splaytree;
+-      }
+-      return child;
+-    }
+-    if (rightofchild) {
+-      if (rightofroot) {
+-        splaytree->rchild = child->lchild;
+-        child->lchild = splaytree;
+-      } else {
+-        splaytree->lchild = grandchild->rchild;
+-        grandchild->rchild = splaytree;
+-      }
+-      child->rchild = grandchild->lchild;
+-      grandchild->lchild = child;
+-    } else {
+-      if (rightofroot) {
+-        splaytree->rchild = grandchild->lchild;
+-        grandchild->lchild = splaytree;
+-      } else {
+-        splaytree->lchild = child->rchild;
+-        child->rchild = splaytree;
+-      }
+-      child->lchild = grandchild->rchild;
+-      grandchild->rchild = child;
+-    }
+-    return grandchild;
+-  } else {
+-    lefttree = splay(m, splaytree->lchild, searchpoint, searchtri);
+-    righttree = splay(m, splaytree->rchild, searchpoint, searchtri);
+-
+-    pooldealloc(&m->splaynodes, (void *) splaytree);
+-    if (lefttree == (struct splaynode *) NULL) {
+-      return righttree;
+-    } else if (righttree == (struct splaynode *) NULL) {
+-      return lefttree;
+-    } else if (lefttree->rchild == (struct splaynode *) NULL) {
+-      lefttree->rchild = righttree->lchild;
+-      righttree->lchild = lefttree;
+-      return righttree;
+-    } else if (righttree->lchild == (struct splaynode *) NULL) {
+-      righttree->lchild = lefttree->rchild;
+-      lefttree->rchild = righttree;
+-      return lefttree;
+-    } else {
+-/*      printf("Holy Toledo!!!\n"); */
+-      leftright = lefttree->rchild;
+-      while (leftright->rchild != (struct splaynode *) NULL) {
+-        leftright = leftright->rchild;
+-      }
+-      leftright->rchild = righttree;
+-      return lefttree;
+-    }
+-  }
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-struct splaynode *splayinsert(struct mesh *m, struct splaynode *splayroot,
+-                              struct otri *newkey, vertex searchpoint)
+-#else /* not ANSI_DECLARATORS */
+-struct splaynode *splayinsert(m, splayroot, newkey, searchpoint)
+-struct mesh *m;
+-struct splaynode *splayroot;
+-struct otri *newkey;
+-vertex searchpoint;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct splaynode *newsplaynode;
+-
+-  newsplaynode = (struct splaynode *) poolalloc(&m->splaynodes);
+-  otricopy(*newkey, newsplaynode->keyedge);
+-  dest(*newkey, newsplaynode->keydest);
+-  if (splayroot == (struct splaynode *) NULL) {
+-    newsplaynode->lchild = (struct splaynode *) NULL;
+-    newsplaynode->rchild = (struct splaynode *) NULL;
+-  } else if (rightofhyperbola(m, &splayroot->keyedge, searchpoint)) {
+-    newsplaynode->lchild = splayroot;
+-    newsplaynode->rchild = splayroot->rchild;
+-    splayroot->rchild = (struct splaynode *) NULL;
+-  } else {
+-    newsplaynode->lchild = splayroot->lchild;
+-    newsplaynode->rchild = splayroot;
+-    splayroot->lchild = (struct splaynode *) NULL;
+-  }
+-  return newsplaynode;
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-struct splaynode *circletopinsert(struct mesh *m, struct behavior *b,
+-                                  struct splaynode *splayroot,
+-                                  struct otri *newkey,
+-                                  vertex pa, vertex pb, vertex pc, REAL topy)
+-#else /* not ANSI_DECLARATORS */
+-struct splaynode *circletopinsert(m, b, splayroot, newkey, pa, pb, pc, topy)
+-struct mesh *m;
+-struct behavior *b;
+-struct splaynode *splayroot;
+-struct otri *newkey;
+-vertex pa;
+-vertex pb;
+-vertex pc;
+-REAL topy;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL ccwabc;
+-  REAL xac, yac, xbc, ybc;
+-  REAL aclen2, bclen2;
+-  REAL searchpoint[2];
+-  struct otri dummytri;
+-
+-  ccwabc = counterclockwise(m, b, pa, pb, pc);
+-  xac = pa[0] - pc[0];
+-  yac = pa[1] - pc[1];
+-  xbc = pb[0] - pc[0];
+-  ybc = pb[1] - pc[1];
+-  aclen2 = xac * xac + yac * yac;
+-  bclen2 = xbc * xbc + ybc * ybc;
+-  searchpoint[0] = pc[0] - (yac * bclen2 - ybc * aclen2) / (2.0 * ccwabc);
+-  searchpoint[1] = topy;
+-  return splayinsert(m, splay(m, splayroot, (vertex) searchpoint, &dummytri),
+-                     newkey, (vertex) searchpoint);
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-struct splaynode *frontlocate(struct mesh *m, struct splaynode *splayroot,
+-                              struct otri *bottommost, vertex searchvertex,
+-                              struct otri *searchtri, int *farright)
+-#else /* not ANSI_DECLARATORS */
+-struct splaynode *frontlocate(m, splayroot, bottommost, searchvertex,
+-                              searchtri, farright)
+-struct mesh *m;
+-struct splaynode *splayroot;
+-struct otri *bottommost;
+-vertex searchvertex;
+-struct otri *searchtri;
+-int *farright;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int farrightflag;
+-  triangle ptr;                       /* Temporary variable used by onext(). */
+-
+-  otricopy(*bottommost, *searchtri);
+-  splayroot = splay(m, splayroot, searchvertex, searchtri);
+-
+-  farrightflag = 0;
+-  while (!farrightflag && rightofhyperbola(m, searchtri, searchvertex)) {
+-    onextself(*searchtri);
+-    farrightflag = otriequal(*searchtri, *bottommost);
+-  }
+-  *farright = farrightflag;
+-  return splayroot;
+-}
+-
+-#endif /* not REDUCED */
+-
+-#ifndef REDUCED
+-
+-#ifdef ANSI_DECLARATORS
+-long sweeplinedelaunay(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-long sweeplinedelaunay(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct event **eventheap;
+-  struct event *events;
+-  struct event *freeevents;
+-  struct event *nextevent;
+-  struct event *newevent;
+-  struct splaynode *splayroot;
+-  struct otri bottommost;
+-  struct otri searchtri;
+-  struct otri fliptri;
+-  struct otri lefttri, righttri, farlefttri, farrighttri;
+-  struct otri inserttri;
+-  vertex firstvertex, secondvertex;
+-  vertex nextvertex, lastvertex;
+-  vertex connectvertex;
+-  vertex leftvertex, midvertex, rightvertex;
+-  REAL lefttest, righttest;
+-  int heapsize;
+-  int check4events, farrightflag;
+-  triangle ptr;   /* Temporary variable used by sym(), onext(), and oprev(). */
+-
+-  poolinit(&m->splaynodes, sizeof(struct splaynode), SPLAYNODEPERBLOCK,
+-           SPLAYNODEPERBLOCK, 0);
+-  splayroot = (struct splaynode *) NULL;
+-
+-  if (b->verbose) {
+-    printf("  Placing vertices in event heap.\n");
+-  }
+-  createeventheap(m, &eventheap, &events, &freeevents);
+-  heapsize = m->invertices;
+-
+-  if (b->verbose) {
+-    printf("  Forming triangulation.\n");
+-  }
+-  maketriangle(m, b, &lefttri);
+-  maketriangle(m, b, &righttri);
+-  bond(lefttri, righttri);
+-  lnextself(lefttri);
+-  lprevself(righttri);
+-  bond(lefttri, righttri);
+-  lnextself(lefttri);
+-  lprevself(righttri);
+-  bond(lefttri, righttri);
+-  firstvertex = (vertex) eventheap[0]->eventptr;
+-  eventheap[0]->eventptr = (void *) freeevents;
+-  freeevents = eventheap[0];
+-  eventheapdelete(eventheap, heapsize, 0);
+-  heapsize--;
+-  do {
+-    if (heapsize == 0) {
+-      printf("Error:  Input vertices are all identical.\n");
+-      triexit(1);
+-    }
+-    secondvertex = (vertex) eventheap[0]->eventptr;
+-    eventheap[0]->eventptr = (void *) freeevents;
+-    freeevents = eventheap[0];
+-    eventheapdelete(eventheap, heapsize, 0);
+-    heapsize--;
+-    if ((firstvertex[0] == secondvertex[0]) &&
+-        (firstvertex[1] == secondvertex[1])) {
+-      if (!b->quiet) {
+-        printf(
+-"Warning:  A duplicate vertex at (%.12g, %.12g) appeared and was ignored.\n",
+-               secondvertex[0], secondvertex[1]);
+-      }
+-      setvertextype(secondvertex, UNDEADVERTEX);
+-      m->undeads++;
+-    }
+-  } while ((firstvertex[0] == secondvertex[0]) &&
+-           (firstvertex[1] == secondvertex[1]));
+-  setorg(lefttri, firstvertex);
+-  setdest(lefttri, secondvertex);
+-  setorg(righttri, secondvertex);
+-  setdest(righttri, firstvertex);
+-  lprev(lefttri, bottommost);
+-  lastvertex = secondvertex;
+-  while (heapsize > 0) {
+-    nextevent = eventheap[0];
+-    eventheapdelete(eventheap, heapsize, 0);
+-    heapsize--;
+-    check4events = 1;
+-    if (nextevent->xkey < m->xmin) {
+-      decode(nextevent->eventptr, fliptri);
+-      oprev(fliptri, farlefttri);
+-      check4deadevent(&farlefttri, &freeevents, eventheap, &heapsize);
+-      onext(fliptri, farrighttri);
+-      check4deadevent(&farrighttri, &freeevents, eventheap, &heapsize);
+-
+-      if (otriequal(farlefttri, bottommost)) {
+-        lprev(fliptri, bottommost);
+-      }
+-      flip(m, b, &fliptri);
+-      setapex(fliptri, NULL);
+-      lprev(fliptri, lefttri);
+-      lnext(fliptri, righttri);
+-      sym(lefttri, farlefttri);
+-
+-      if (randomnation(SAMPLERATE) == 0) {
+-        symself(fliptri);
+-        dest(fliptri, leftvertex);
+-        apex(fliptri, midvertex);
+-        org(fliptri, rightvertex);
+-        splayroot = circletopinsert(m, b, splayroot, &lefttri, leftvertex,
+-                                    midvertex, rightvertex, nextevent->ykey);
+-      }
+-    } else {
+-      nextvertex = (vertex) nextevent->eventptr;
+-      if ((nextvertex[0] == lastvertex[0]) &&
+-          (nextvertex[1] == lastvertex[1])) {
+-        if (!b->quiet) {
+-          printf(
+-"Warning:  A duplicate vertex at (%.12g, %.12g) appeared and was ignored.\n",
+-                 nextvertex[0], nextvertex[1]);
+-        }
+-        setvertextype(nextvertex, UNDEADVERTEX);
+-        m->undeads++;
+-        check4events = 0;
+-      } else {
+-        lastvertex = nextvertex;
+-
+-        splayroot = frontlocate(m, splayroot, &bottommost, nextvertex,
+-                                &searchtri, &farrightflag);
+-/*
+-        otricopy(bottommost, searchtri);
+-        farrightflag = 0;
+-        while (!farrightflag && rightofhyperbola(m, &searchtri, nextvertex)) {
+-          onextself(searchtri);
+-          farrightflag = otriequal(searchtri, bottommost);
+-        }
+-*/
+-
+-        check4deadevent(&searchtri, &freeevents, eventheap, &heapsize);
+-
+-        otricopy(searchtri, farrighttri);
+-        sym(searchtri, farlefttri);
+-        maketriangle(m, b, &lefttri);
+-        maketriangle(m, b, &righttri);
+-        dest(farrighttri, connectvertex);
+-        setorg(lefttri, connectvertex);
+-        setdest(lefttri, nextvertex);
+-        setorg(righttri, nextvertex);
+-        setdest(righttri, connectvertex);
+-        bond(lefttri, righttri);
+-        lnextself(lefttri);
+-        lprevself(righttri);
+-        bond(lefttri, righttri);
+-        lnextself(lefttri);
+-        lprevself(righttri);
+-        bond(lefttri, farlefttri);
+-        bond(righttri, farrighttri);
+-        if (!farrightflag && otriequal(farrighttri, bottommost)) {
+-          otricopy(lefttri, bottommost);
+-        }
+-
+-        if (randomnation(SAMPLERATE) == 0) {
+-          splayroot = splayinsert(m, splayroot, &lefttri, nextvertex);
+-        } else if (randomnation(SAMPLERATE) == 0) {
+-          lnext(righttri, inserttri);
+-          splayroot = splayinsert(m, splayroot, &inserttri, nextvertex);
+-        }
+-      }
+-    }
+-    nextevent->eventptr = (void *) freeevents;
+-    freeevents = nextevent;
+-
+-    if (check4events) {
+-      apex(farlefttri, leftvertex);
+-      dest(lefttri, midvertex);
+-      apex(lefttri, rightvertex);
+-      lefttest = counterclockwise(m, b, leftvertex, midvertex, rightvertex);
+-      if (lefttest > 0.0) {
+-        newevent = freeevents;
+-        freeevents = (struct event *) freeevents->eventptr;
+-        newevent->xkey = m->xminextreme;
+-        newevent->ykey = circletop(m, leftvertex, midvertex, rightvertex,
+-                                   lefttest);
+-        newevent->eventptr = (void *) encode(lefttri);
+-        eventheapinsert(eventheap, heapsize, newevent);
+-        heapsize++;
+-        setorg(lefttri, newevent);
+-      }
+-      apex(righttri, leftvertex);
+-      org(righttri, midvertex);
+-      apex(farrighttri, rightvertex);
+-      righttest = counterclockwise(m, b, leftvertex, midvertex, rightvertex);
+-      if (righttest > 0.0) {
+-        newevent = freeevents;
+-        freeevents = (struct event *) freeevents->eventptr;
+-        newevent->xkey = m->xminextreme;
+-        newevent->ykey = circletop(m, leftvertex, midvertex, rightvertex,
+-                                   righttest);
+-        newevent->eventptr = (void *) encode(farrighttri);
+-        eventheapinsert(eventheap, heapsize, newevent);
+-        heapsize++;
+-        setorg(farrighttri, newevent);
+-      }
+-    }
+-  }
+-
+-  pooldeinit(&m->splaynodes);
+-  lprevself(bottommost);
+-  return removeghosts(m, b, &bottommost);
+-}
+-
+-#endif /* not REDUCED */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Sweepline Delaunay triangulation ends here                *********/
+-
+-/********* General mesh construction routines begin here             *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  delaunay()   Form a Delaunay triangulation.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-long delaunay(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-long delaunay(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  long hulledges;
+-
+-  m->eextras = 0;
+-  initializetrisubpools(m, b);
+-
+-#ifdef REDUCED
+-  if (!b->quiet) {
+-    printf(
+-      "Constructing Delaunay triangulation by divide-and-conquer method.\n");
+-  }
+-  hulledges = divconqdelaunay(m, b);
+-#else /* not REDUCED */
+-  if (!b->quiet) {
+-    printf("Constructing Delaunay triangulation ");
+-    if (b->incremental) {
+-      printf("by incremental method.\n");
+-    } else if (b->sweepline) {
+-      printf("by sweepline method.\n");
+-    } else {
+-      printf("by divide-and-conquer method.\n");
+-    }
+-  }
+-  if (b->incremental) {
+-    hulledges = incrementaldelaunay(m, b);
+-  } else if (b->sweepline) {
+-    hulledges = sweeplinedelaunay(m, b);
+-  } else {
+-    hulledges = divconqdelaunay(m, b);
+-  }
+-#endif /* not REDUCED */
+-
+-  if (m->triangles.items == 0) {
+-    /* The input vertices were all collinear, so there are no triangles. */
+-    return 0l;
+-  } else {
+-    return hulledges;
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  reconstruct()   Reconstruct a triangulation from its .ele (and possibly  */
+-/*                  .poly) file.  Used when the -r switch is used.           */
+-/*                                                                           */
+-/*  Reads an .ele file and reconstructs the original mesh.  If the -p switch */
+-/*  is used, this procedure will also read a .poly file and reconstruct the  */
+-/*  subsegments of the original mesh.  If the -a switch is used, this        */
+-/*  procedure will also read an .area file and set a maximum area constraint */
+-/*  on each triangle.                                                        */
+-/*                                                                           */
+-/*  Vertices that are not corners of triangles, such as nodes on edges of    */
+-/*  subparametric elements, are discarded.                                   */
+-/*                                                                           */
+-/*  This routine finds the adjacencies between triangles (and subsegments)   */
+-/*  by forming one stack of triangles for each vertex.  Each triangle is on  */
+-/*  three different stacks simultaneously.  Each triangle's subsegment       */
+-/*  pointers are used to link the items in each stack.  This memory-saving   */
+-/*  feature makes the code harder to read.  The most important thing to keep */
+-/*  in mind is that each triangle is removed from a stack precisely when     */
+-/*  the corresponding pointer is adjusted to refer to a subsegment rather    */
+-/*  than the next triangle of the stack.                                     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-int reconstruct(struct mesh *m, struct behavior *b, int *trianglelist,
+-                REAL *triangleattriblist, REAL *trianglearealist,
+-                int elements, int corners, int attribs,
+-                int *segmentlist,int *segmentmarkerlist, int numberofsegments)
+-#else /* not ANSI_DECLARATORS */
+-int reconstruct(m, b, trianglelist, triangleattriblist, trianglearealist,
+-                elements, corners, attribs, segmentlist, segmentmarkerlist,
+-                numberofsegments)
+-struct mesh *m;
+-struct behavior *b;
+-int *trianglelist;
+-REAL *triangleattriblist;
+-REAL *trianglearealist;
+-int elements;
+-int corners;
+-int attribs;
+-int *segmentlist;
+-int *segmentmarkerlist;
+-int numberofsegments;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-long reconstruct(struct mesh *m, struct behavior *b, char *elefilename,
+-                 char *areafilename, char *polyfilename, FILE *polyfile)
+-#else /* not ANSI_DECLARATORS */
+-long reconstruct(m, b, elefilename, areafilename, polyfilename, polyfile)
+-struct mesh *m;
+-struct behavior *b;
+-char *elefilename;
+-char *areafilename;
+-char *polyfilename;
+-FILE *polyfile;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  int vertexindex;
+-  int attribindex;
+-#else /* not TRILIBRARY */
+-  FILE *elefile;
+-  FILE *areafile;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int areaelements;
+-#endif /* not TRILIBRARY */
+-  struct otri triangleloop;
+-  struct otri triangleleft;
+-  struct otri checktri;
+-  struct otri checkleft;
+-  struct otri checkneighbor;
+-  struct osub subsegloop;
+-  triangle *vertexarray;
+-  triangle *prevlink;
+-  triangle nexttri;
+-  vertex tdest, tapex;
+-  vertex checkdest, checkapex;
+-  vertex shorg;
+-  vertex killvertex;
+-  vertex segmentorg, segmentdest;
+-  REAL area;
+-  int corner[3];
+-  int end[2];
+-  int killvertexindex;
+-  int incorners;
+-  int segmentmarkers;
+-  int boundmarker;
+-  int aroundvertex;
+-  long hullsize;
+-  int notfound;
+-  long elementnumber, segmentnumber;
+-  int i, j;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-#ifdef TRILIBRARY
+-  m->inelements = elements;
+-  incorners = corners;
+-  if (incorners < 3) {
+-    printf("Error:  Triangles must have at least 3 vertices.\n");
+-    triexit(1);
+-  }
+-  m->eextras = attribs;
+-#else /* not TRILIBRARY */
+-  /* Read the triangles from an .ele file. */
+-  if (!b->quiet) {
+-    printf("Opening %s.\n", elefilename);
+-  }
+-  elefile = fopen(elefilename, "r");
+-  if (elefile == (FILE *) NULL) {
+-    printf("  Error:  Cannot access file %s.\n", elefilename);
+-    triexit(1);
+-  }
+-  /* Read number of triangles, number of vertices per triangle, and */
+-  /*   number of triangle attributes from .ele file.                */
+-  stringptr = readline(inputline, elefile, elefilename);
+-  m->inelements = (int) strtol(stringptr, &stringptr, 0);
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    incorners = 3;
+-  } else {
+-    incorners = (int) strtol(stringptr, &stringptr, 0);
+-    if (incorners < 3) {
+-      printf("Error:  Triangles in %s must have at least 3 vertices.\n",
+-             elefilename);
+-      triexit(1);
+-    }
+-  }
+-  stringptr = findfield(stringptr);
+-  if (*stringptr == '\0') {
+-    m->eextras = 0;
+-  } else {
+-    m->eextras = (int) strtol(stringptr, &stringptr, 0);
+-  }
+-#endif /* not TRILIBRARY */
+-
+-  initializetrisubpools(m, b);
+-
+-  /* Create the triangles. */
+-  for (elementnumber = 1; elementnumber <= m->inelements; elementnumber++) {
+-    maketriangle(m, b, &triangleloop);
+-    /* Mark the triangle as living. */
+-    triangleloop.tri[3] = (triangle) triangleloop.tri;
+-  }
+-
+-  segmentmarkers = 0;
+-  if (b->poly) {
+-#ifdef TRILIBRARY
+-    m->insegments = numberofsegments;
+-    segmentmarkers = segmentmarkerlist != (int *) NULL;
+-#else /* not TRILIBRARY */
+-    /* Read number of segments and number of segment */
+-    /*   boundary markers from .poly file.           */
+-    stringptr = readline(inputline, polyfile, b->inpolyfilename);
+-    m->insegments = (int) strtol(stringptr, &stringptr, 0);
+-    stringptr = findfield(stringptr);
+-    if (*stringptr != '\0') {
+-      segmentmarkers = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-#endif /* not TRILIBRARY */
+-
+-    /* Create the subsegments. */
+-    for (segmentnumber = 1; segmentnumber <= m->insegments; segmentnumber++) {
+-      makesubseg(m, &subsegloop);
+-      /* Mark the subsegment as living. */
+-      subsegloop.ss[2] = (subseg) subsegloop.ss;
+-    }
+-  }
+-
+-#ifdef TRILIBRARY
+-  vertexindex = 0;
+-  attribindex = 0;
+-#else /* not TRILIBRARY */
+-  if (b->vararea) {
+-    /* Open an .area file, check for consistency with the .ele file. */
+-    if (!b->quiet) {
+-      printf("Opening %s.\n", areafilename);
+-    }
+-    areafile = fopen(areafilename, "r");
+-    if (areafile == (FILE *) NULL) {
+-      printf("  Error:  Cannot access file %s.\n", areafilename);
+-      triexit(1);
+-    }
+-    stringptr = readline(inputline, areafile, areafilename);
+-    areaelements = (int) strtol(stringptr, &stringptr, 0);
+-    if (areaelements != m->inelements) {
+-      printf("Error:  %s and %s disagree on number of triangles.\n",
+-             elefilename, areafilename);
+-      triexit(1);
+-    }
+-  }
+-#endif /* not TRILIBRARY */
+-
+-  if (!b->quiet) {
+-    printf("Reconstructing mesh.\n");
+-  }
+-  /* Allocate a temporary array that maps each vertex to some adjacent */
+-  /*   triangle.  I took care to allocate all the permanent memory for */
+-  /*   triangles and subsegments first.                                */
+-  vertexarray = (triangle *) trimalloc(m->vertices.items *
+-                                       (int) sizeof(triangle));
+-  /* Each vertex is initially unrepresented. */
+-  for (i = 0; i < m->vertices.items; i++) {
+-    vertexarray[i] = (triangle) m->dummytri;
+-  }
+-
+-  if (b->verbose) {
+-    printf("  Assembling triangles.\n");
+-  }
+-  /* Read the triangles from the .ele file, and link */
+-  /*   together those that share an edge.            */
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  elementnumber = b->firstnumber;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-#ifdef TRILIBRARY
+-    /* Copy the triangle's three corners. */
+-    for (j = 0; j < 3; j++) {
+-      corner[j] = trianglelist[vertexindex++];
+-      if ((corner[j] < b->firstnumber) ||
+-          (corner[j] >= b->firstnumber + m->invertices)) {
+-        printf("Error:  Triangle %ld has an invalid vertex index.\n",
+-               elementnumber);
+-        triexit(1);
+-      }
+-    }
+-#else /* not TRILIBRARY */
+-    /* Read triangle number and the triangle's three corners. */
+-    stringptr = readline(inputline, elefile, elefilename);
+-    for (j = 0; j < 3; j++) {
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Triangle %ld is missing vertex %d in %s.\n",
+-               elementnumber, j + 1, elefilename);
+-        triexit(1);
+-      } else {
+-        corner[j] = (int) strtol(stringptr, &stringptr, 0);
+-        if ((corner[j] < b->firstnumber) ||
+-            (corner[j] >= b->firstnumber + m->invertices)) {
+-          printf("Error:  Triangle %ld has an invalid vertex index.\n",
+-                 elementnumber);
+-          triexit(1);
+-        }
+-      }
+-    }
+-#endif /* not TRILIBRARY */
+-
+-    /* Find out about (and throw away) extra nodes. */
+-    for (j = 3; j < incorners; j++) {
+-#ifdef TRILIBRARY
+-      killvertexindex = trianglelist[vertexindex++];
+-#else /* not TRILIBRARY */
+-      stringptr = findfield(stringptr);
+-      if (*stringptr != '\0') {
+-        killvertexindex = (int) strtol(stringptr, &stringptr, 0);
+-#endif /* not TRILIBRARY */
+-        if ((killvertexindex >= b->firstnumber) &&
+-            (killvertexindex < b->firstnumber + m->invertices)) {
+-          /* Delete the non-corner vertex if it's not already deleted. */
+-          killvertex = getvertex(m, b, killvertexindex);
+-          if (vertextype(killvertex) != DEADVERTEX) {
+-            vertexdealloc(m, killvertex);
+-          }
+-        }
+-#ifndef TRILIBRARY
+-      }
+-#endif /* not TRILIBRARY */
+-    }
+-
+-    /* Read the triangle's attributes. */
+-    for (j = 0; j < m->eextras; j++) {
+-#ifdef TRILIBRARY
+-      setelemattribute(triangleloop, j, triangleattriblist[attribindex++]);
+-#else /* not TRILIBRARY */
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        setelemattribute(triangleloop, j, 0);
+-      } else {
+-        setelemattribute(triangleloop, j,
+-                         (REAL) strtod(stringptr, &stringptr));
+-      }
+-#endif /* not TRILIBRARY */
+-    }
+-
+-    if (b->vararea) {
+-#ifdef TRILIBRARY
+-      area = trianglearealist[elementnumber - b->firstnumber];
+-#else /* not TRILIBRARY */
+-      /* Read an area constraint from the .area file. */
+-      stringptr = readline(inputline, areafile, areafilename);
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        area = -1.0;                      /* No constraint on this triangle. */
+-      } else {
+-        area = (REAL) strtod(stringptr, &stringptr);
+-      }
+-#endif /* not TRILIBRARY */
+-      setareabound(triangleloop, area);
+-    }
+-
+-    /* Set the triangle's vertices. */
+-    triangleloop.orient = 0;
+-    setorg(triangleloop, getvertex(m, b, corner[0]));
+-    setdest(triangleloop, getvertex(m, b, corner[1]));
+-    setapex(triangleloop, getvertex(m, b, corner[2]));
+-    /* Try linking the triangle to others that share these vertices. */
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      /* Take the number for the origin of triangleloop. */
+-      aroundvertex = corner[triangleloop.orient];
+-      /* Look for other triangles having this vertex. */
+-      nexttri = vertexarray[aroundvertex - b->firstnumber];
+-      /* Link the current triangle to the next one in the stack. */
+-      triangleloop.tri[6 + triangleloop.orient] = nexttri;
+-      /* Push the current triangle onto the stack. */
+-      vertexarray[aroundvertex - b->firstnumber] = encode(triangleloop);
+-      decode(nexttri, checktri);
+-      if (checktri.tri != m->dummytri) {
+-        dest(triangleloop, tdest);
+-        apex(triangleloop, tapex);
+-        /* Look for other triangles that share an edge. */
+-        do {
+-          dest(checktri, checkdest);
+-          apex(checktri, checkapex);
+-          if (tapex == checkdest) {
+-            /* The two triangles share an edge; bond them together. */
+-            lprev(triangleloop, triangleleft);
+-            bond(triangleleft, checktri);
+-          }
+-          if (tdest == checkapex) {
+-            /* The two triangles share an edge; bond them together. */
+-            lprev(checktri, checkleft);
+-            bond(triangleloop, checkleft);
+-          }
+-          /* Find the next triangle in the stack. */
+-          nexttri = checktri.tri[6 + checktri.orient];
+-          decode(nexttri, checktri);
+-        } while (checktri.tri != m->dummytri);
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-    elementnumber++;
+-  }
+-
+-#ifdef TRILIBRARY
+-  vertexindex = 0;
+-#else /* not TRILIBRARY */
+-  fclose(elefile);
+-  if (b->vararea) {
+-    fclose(areafile);
+-  }
+-#endif /* not TRILIBRARY */
+-
+-  hullsize = 0;                      /* Prepare to count the boundary edges. */
+-  if (b->poly) {
+-    if (b->verbose) {
+-      printf("  Marking segments in triangulation.\n");
+-    }
+-    /* Read the segments from the .poly file, and link them */
+-    /*   to their neighboring triangles.                    */
+-    boundmarker = 0;
+-    traversalinit(&m->subsegs);
+-    subsegloop.ss = subsegtraverse(m);
+-    segmentnumber = b->firstnumber;
+-    while (subsegloop.ss != (subseg *) NULL) {
+-#ifdef TRILIBRARY
+-      end[0] = segmentlist[vertexindex++];
+-      end[1] = segmentlist[vertexindex++];
+-      if (segmentmarkers) {
+-        boundmarker = segmentmarkerlist[segmentnumber - b->firstnumber];
+-      }
+-#else /* not TRILIBRARY */
+-      /* Read the endpoints of each segment, and possibly a boundary marker. */
+-      stringptr = readline(inputline, polyfile, b->inpolyfilename);
+-      /* Skip the first (segment number) field. */
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Segment %ld has no endpoints in %s.\n", segmentnumber,
+-               polyfilename);
+-        triexit(1);
+-      } else {
+-        end[0] = (int) strtol(stringptr, &stringptr, 0);
+-      }
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Segment %ld is missing its second endpoint in %s.\n",
+-               segmentnumber, polyfilename);
+-        triexit(1);
+-      } else {
+-        end[1] = (int) strtol(stringptr, &stringptr, 0);
+-      }
+-      if (segmentmarkers) {
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          boundmarker = 0;
+-        } else {
+-          boundmarker = (int) strtol(stringptr, &stringptr, 0);
+-        }
+-      }
+-#endif /* not TRILIBRARY */
+-      for (j = 0; j < 2; j++) {
+-        if ((end[j] < b->firstnumber) ||
+-            (end[j] >= b->firstnumber + m->invertices)) {
+-          printf("Error:  Segment %ld has an invalid vertex index.\n",
+-                 segmentnumber);
+-          triexit(1);
+-        }
+-      }
+-
+-      /* set the subsegment's vertices. */
+-      subsegloop.ssorient = 0;
+-      segmentorg = getvertex(m, b, end[0]);
+-      segmentdest = getvertex(m, b, end[1]);
+-      setsorg(subsegloop, segmentorg);
+-      setsdest(subsegloop, segmentdest);
+-      setsegorg(subsegloop, segmentorg);
+-      setsegdest(subsegloop, segmentdest);
+-      setmark(subsegloop, boundmarker);
+-      /* Try linking the subsegment to triangles that share these vertices. */
+-      for (subsegloop.ssorient = 0; subsegloop.ssorient < 2;
+-           subsegloop.ssorient++) {
+-        /* Take the number for the destination of subsegloop. */
+-        aroundvertex = end[1 - subsegloop.ssorient];
+-        /* Look for triangles having this vertex. */
+-        prevlink = &vertexarray[aroundvertex - b->firstnumber];
+-        nexttri = vertexarray[aroundvertex - b->firstnumber];
+-        decode(nexttri, checktri);
+-        sorg(subsegloop, shorg);
+-        notfound = 1;
+-        /* Look for triangles having this edge.  Note that I'm only       */
+-        /*   comparing each triangle's destination with the subsegment;   */
+-        /*   each triangle's apex is handled through a different vertex.  */
+-        /*   Because each triangle appears on three vertices' lists, each */
+-        /*   occurrence of a triangle on a list can (and does) represent  */
+-        /*   an edge.  In this way, most edges are represented twice, and */
+-        /*   every triangle-subsegment bond is represented once.          */
+-        while (notfound && (checktri.tri != m->dummytri)) {
+-          dest(checktri, checkdest);
+-          if (shorg == checkdest) {
+-            /* We have a match.  Remove this triangle from the list. */
+-            *prevlink = checktri.tri[6 + checktri.orient];
+-            /* Bond the subsegment to the triangle. */
+-            tsbond(checktri, subsegloop);
+-            /* Check if this is a boundary edge. */
+-            sym(checktri, checkneighbor);
+-            if (checkneighbor.tri == m->dummytri) {
+-              /* The next line doesn't insert a subsegment (because there's */
+-              /*   already one there), but it sets the boundary markers of  */
+-              /*   the existing subsegment and its vertices.                */
+-              insertsubseg(m, b, &checktri, 1);
+-              hullsize++;
+-            }
+-            notfound = 0;
+-          }
+-          /* Find the next triangle in the stack. */
+-          prevlink = &checktri.tri[6 + checktri.orient];
+-          nexttri = checktri.tri[6 + checktri.orient];
+-          decode(nexttri, checktri);
+-        }
+-      }
+-      subsegloop.ss = subsegtraverse(m);
+-      segmentnumber++;
+-    }
+-  }
+-
+-  /* Mark the remaining edges as not being attached to any subsegment. */
+-  /* Also, count the (yet uncounted) boundary edges.                   */
+-  for (i = 0; i < m->vertices.items; i++) {
+-    /* Search the stack of triangles adjacent to a vertex. */
+-    nexttri = vertexarray[i];
+-    decode(nexttri, checktri);
+-    while (checktri.tri != m->dummytri) {
+-      /* Find the next triangle in the stack before this */
+-      /*   information gets overwritten.                 */
+-      nexttri = checktri.tri[6 + checktri.orient];
+-      /* No adjacent subsegment.  (This overwrites the stack info.) */
+-      tsdissolve(checktri);
+-      sym(checktri, checkneighbor);
+-      if (checkneighbor.tri == m->dummytri) {
+-        insertsubseg(m, b, &checktri, 1);
+-        hullsize++;
+-      }
+-      decode(nexttri, checktri);
+-    }
+-  }
+-
+-  trifree((void *) vertexarray);
+-  return hullsize;
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* General mesh construction routines end here               *********/
+-
+-/********* Segment insertion begins here                             *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  finddirection()   Find the first triangle on the path from one point     */
+-/*                    to another.                                            */
+-/*                                                                           */
+-/*  Finds the triangle that intersects a line segment drawn from the         */
+-/*  origin of `searchtri' to the point `searchpoint', and returns the result */
+-/*  in `searchtri'.  The origin of `searchtri' does not change, even though  */
+-/*  the triangle returned may differ from the one passed in.  This routine   */
+-/*  is used to find the direction to move in to get from one point to        */
+-/*  another.                                                                 */
+-/*                                                                           */
+-/*  The return value notes whether the destination or apex of the found      */
+-/*  triangle is collinear with the two points in question.                   */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-enum finddirectionresult finddirection(struct mesh *m, struct behavior *b,
+-                                       struct otri *searchtri,
+-                                       vertex searchpoint)
+-#else /* not ANSI_DECLARATORS */
+-enum finddirectionresult finddirection(m, b, searchtri, searchpoint)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *searchtri;
+-vertex searchpoint;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri checktri;
+-  vertex startvertex;
+-  vertex leftvertex, rightvertex;
+-  REAL leftccw, rightccw;
+-  int leftflag, rightflag;
+-  triangle ptr;           /* Temporary variable used by onext() and oprev(). */
+-
+-  org(*searchtri, startvertex);
+-  dest(*searchtri, rightvertex);
+-  apex(*searchtri, leftvertex);
+-  /* Is `searchpoint' to the left? */
+-  leftccw = counterclockwise(m, b, searchpoint, startvertex, leftvertex);
+-  leftflag = leftccw > 0.0;
+-  /* Is `searchpoint' to the right? */
+-  rightccw = counterclockwise(m, b, startvertex, searchpoint, rightvertex);
+-  rightflag = rightccw > 0.0;
+-  if (leftflag && rightflag) {
+-    /* `searchtri' faces directly away from `searchpoint'.  We could go left */
+-    /*   or right.  Ask whether it's a triangle or a boundary on the left.   */
+-    onext(*searchtri, checktri);
+-    if (checktri.tri == m->dummytri) {
+-      leftflag = 0;
+-    } else {
+-      rightflag = 0;
+-    }
+-  }
+-  while (leftflag) {
+-    /* Turn left until satisfied. */
+-    onextself(*searchtri);
+-    if (searchtri->tri == m->dummytri) {
+-      printf("Internal error in finddirection():  Unable to find a\n");
+-      printf("  triangle leading from (%.12g, %.12g) to", startvertex[0],
+-             startvertex[1]);
+-      printf("  (%.12g, %.12g).\n", searchpoint[0], searchpoint[1]);
+-      internalerror();
+-    }
+-    apex(*searchtri, leftvertex);
+-    rightccw = leftccw;
+-    leftccw = counterclockwise(m, b, searchpoint, startvertex, leftvertex);
+-    leftflag = leftccw > 0.0;
+-  }
+-  while (rightflag) {
+-    /* Turn right until satisfied. */
+-    oprevself(*searchtri);
+-    if (searchtri->tri == m->dummytri) {
+-      printf("Internal error in finddirection():  Unable to find a\n");
+-      printf("  triangle leading from (%.12g, %.12g) to", startvertex[0],
+-             startvertex[1]);
+-      printf("  (%.12g, %.12g).\n", searchpoint[0], searchpoint[1]);
+-      internalerror();
+-    }
+-    dest(*searchtri, rightvertex);
+-    leftccw = rightccw;
+-    rightccw = counterclockwise(m, b, startvertex, searchpoint, rightvertex);
+-    rightflag = rightccw > 0.0;
+-  }
+-  if (leftccw == 0.0) {
+-    return LEFTCOLLINEAR;
+-  } else if (rightccw == 0.0) {
+-    return RIGHTCOLLINEAR;
+-  } else {
+-    return WITHIN;
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  segmentintersection()   Find the intersection of an existing segment     */
+-/*                          and a segment that is being inserted.  Insert    */
+-/*                          a vertex at the intersection, splitting an       */
+-/*                          existing subsegment.                             */
+-/*                                                                           */
+-/*  The segment being inserted connects the apex of splittri to endpoint2.   */
+-/*  splitsubseg is the subsegment being split, and MUST adjoin splittri.     */
+-/*  Hence, endpoints of the subsegment being split are the origin and        */
+-/*  destination of splittri.                                                 */
+-/*                                                                           */
+-/*  On completion, splittri is a handle having the newly inserted            */
+-/*  intersection point as its origin, and endpoint1 as its destination.      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void segmentintersection(struct mesh *m, struct behavior *b,
+-                         struct otri *splittri, struct osub *splitsubseg,
+-                         vertex endpoint2)
+-#else /* not ANSI_DECLARATORS */
+-void segmentintersection(m, b, splittri, splitsubseg, endpoint2)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *splittri;
+-struct osub *splitsubseg;
+-vertex endpoint2;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct osub opposubseg;
+-  vertex endpoint1;
+-  vertex torg, tdest;
+-  vertex leftvertex, rightvertex;
+-  vertex newvertex;
+-  enum insertvertexresult success;
+-  REAL ex, ey;
+-  REAL tx, ty;
+-  REAL etx, ety;
+-  REAL split, denom;
+-  int i;
+-  triangle ptr;                       /* Temporary variable used by onext(). */
+-  subseg sptr;                        /* Temporary variable used by snext(). */
+-
+-  /* Find the other three segment endpoints. */
+-  apex(*splittri, endpoint1);
+-  org(*splittri, torg);
+-  dest(*splittri, tdest);
+-  /* Segment intersection formulae; see the Antonio reference. */
+-  tx = tdest[0] - torg[0];
+-  ty = tdest[1] - torg[1];
+-  ex = endpoint2[0] - endpoint1[0];
+-  ey = endpoint2[1] - endpoint1[1];
+-  etx = torg[0] - endpoint2[0];
+-  ety = torg[1] - endpoint2[1];
+-  denom = ty * ex - tx * ey;
+-  if (denom == 0.0) {
+-    printf("Internal error in segmentintersection():");
+-    printf("  Attempt to find intersection of parallel segments.\n");
+-    internalerror();
+-  }
+-  split = (ey * etx - ex * ety) / denom;
+-  /* Create the new vertex. */
+-  newvertex = (vertex) poolalloc(&m->vertices);
+-  /* Interpolate its coordinate and attributes. */
+-  for (i = 0; i < 2 + m->nextras; i++) {
+-    newvertex[i] = torg[i] + split * (tdest[i] - torg[i]);
+-  }
+-  setvertexmark(newvertex, mark(*splitsubseg));
+-  setvertextype(newvertex, INPUTVERTEX);
+-  if (b->verbose > 1) {
+-    printf(
+-  "  Splitting subsegment (%.12g, %.12g) (%.12g, %.12g) at (%.12g, %.12g).\n",
+-           torg[0], torg[1], tdest[0], tdest[1], newvertex[0], newvertex[1]);
+-  }
+-  /* Insert the intersection vertex.  This should always succeed. */
+-  success = insertvertex(m, b, newvertex, splittri, splitsubseg, 0, 0);
+-  if (success != SUCCESSFULVERTEX) {
+-    printf("Internal error in segmentintersection():\n");
+-    printf("  Failure to split a segment.\n");
+-    internalerror();
+-  }
+-  /* Record a triangle whose origin is the new vertex. */
+-  setvertex2tri(newvertex, encode(*splittri));
+-  if (m->steinerleft > 0) {
+-    m->steinerleft--;
+-  }
+-
+-  /* Divide the segment into two, and correct the segment endpoints. */
+-  ssymself(*splitsubseg);
+-  spivot(*splitsubseg, opposubseg);
+-  sdissolve(*splitsubseg);
+-  sdissolve(opposubseg);
+-  do {
+-    setsegorg(*splitsubseg, newvertex);
+-    snextself(*splitsubseg);
+-  } while (splitsubseg->ss != m->dummysub);
+-  do {
+-    setsegorg(opposubseg, newvertex);
+-    snextself(opposubseg);
+-  } while (opposubseg.ss != m->dummysub);
+-
+-  /* Inserting the vertex may have caused edge flips.  We wish to rediscover */
+-  /*   the edge connecting endpoint1 to the new intersection vertex.         */
+-  finddirection(m, b, splittri, endpoint1);
+-  dest(*splittri, rightvertex);
+-  apex(*splittri, leftvertex);
+-  if ((leftvertex[0] == endpoint1[0]) && (leftvertex[1] == endpoint1[1])) {
+-    onextself(*splittri);
+-  } else if ((rightvertex[0] != endpoint1[0]) ||
+-             (rightvertex[1] != endpoint1[1])) {
+-    printf("Internal error in segmentintersection():\n");
+-    printf("  Topological inconsistency after splitting a segment.\n");
+-    internalerror();
+-  }
+-  /* `splittri' should have destination endpoint1. */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  scoutsegment()   Scout the first triangle on the path from one endpoint  */
+-/*                   to another, and check for completion (reaching the      */
+-/*                   second endpoint), a collinear vertex, or the            */
+-/*                   intersection of two segments.                           */
+-/*                                                                           */
+-/*  Returns one if the entire segment is successfully inserted, and zero if  */
+-/*  the job must be finished by conformingedge() or constrainededge().       */
+-/*                                                                           */
+-/*  If the first triangle on the path has the second endpoint as its         */
+-/*  destination or apex, a subsegment is inserted and the job is done.       */
+-/*                                                                           */
+-/*  If the first triangle on the path has a destination or apex that lies on */
+-/*  the segment, a subsegment is inserted connecting the first endpoint to   */
+-/*  the collinear vertex, and the search is continued from the collinear     */
+-/*  vertex.                                                                  */
+-/*                                                                           */
+-/*  If the first triangle on the path has a subsegment opposite its origin,  */
+-/*  then there is a segment that intersects the segment being inserted.      */
+-/*  Their intersection vertex is inserted, splitting the subsegment.         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-int scoutsegment(struct mesh *m, struct behavior *b, struct otri *searchtri,
+-                 vertex endpoint2, int newmark)
+-#else /* not ANSI_DECLARATORS */
+-int scoutsegment(m, b, searchtri, endpoint2, newmark)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *searchtri;
+-vertex endpoint2;
+-int newmark;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri crosstri;
+-  struct osub crosssubseg;
+-  vertex leftvertex, rightvertex;
+-  enum finddirectionresult collinear;
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  collinear = finddirection(m, b, searchtri, endpoint2);
+-  dest(*searchtri, rightvertex);
+-  apex(*searchtri, leftvertex);
+-  if (((leftvertex[0] == endpoint2[0]) && (leftvertex[1] == endpoint2[1])) ||
+-      ((rightvertex[0] == endpoint2[0]) && (rightvertex[1] == endpoint2[1]))) {
+-    /* The segment is already an edge in the mesh. */
+-    if ((leftvertex[0] == endpoint2[0]) && (leftvertex[1] == endpoint2[1])) {
+-      lprevself(*searchtri);
+-    }
+-    /* Insert a subsegment, if there isn't already one there. */
+-    insertsubseg(m, b, searchtri, newmark);
+-    return 1;
+-  } else if (collinear == LEFTCOLLINEAR) {
+-    /* We've collided with a vertex between the segment's endpoints. */
+-    /* Make the collinear vertex be the triangle's origin. */
+-    lprevself(*searchtri);
+-    insertsubseg(m, b, searchtri, newmark);
+-    /* Insert the remainder of the segment. */
+-    return scoutsegment(m, b, searchtri, endpoint2, newmark);
+-  } else if (collinear == RIGHTCOLLINEAR) {
+-    /* We've collided with a vertex between the segment's endpoints. */
+-    insertsubseg(m, b, searchtri, newmark);
+-    /* Make the collinear vertex be the triangle's origin. */
+-    lnextself(*searchtri);
+-    /* Insert the remainder of the segment. */
+-    return scoutsegment(m, b, searchtri, endpoint2, newmark);
+-  } else {
+-    lnext(*searchtri, crosstri);
+-    tspivot(crosstri, crosssubseg);
+-    /* Check for a crossing segment. */
+-    if (crosssubseg.ss == m->dummysub) {
+-      return 0;
+-    } else {
+-      /* Insert a vertex at the intersection. */
+-      segmentintersection(m, b, &crosstri, &crosssubseg, endpoint2);
+-      otricopy(crosstri, *searchtri);
+-      insertsubseg(m, b, searchtri, newmark);
+-      /* Insert the remainder of the segment. */
+-      return scoutsegment(m, b, searchtri, endpoint2, newmark);
+-    }
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  conformingedge()   Force a segment into a conforming Delaunay            */
+-/*                     triangulation by inserting a vertex at its midpoint,  */
+-/*                     and recursively forcing in the two half-segments if   */
+-/*                     necessary.                                            */
+-/*                                                                           */
+-/*  Generates a sequence of subsegments connecting `endpoint1' to            */
+-/*  `endpoint2'.  `newmark' is the boundary marker of the segment, assigned  */
+-/*  to each new splitting vertex and subsegment.                             */
+-/*                                                                           */
+-/*  Note that conformingedge() does not always maintain the conforming       */
+-/*  Delaunay property.  Once inserted, segments are locked into place;       */
+-/*  vertices inserted later (to force other segments in) may render these    */
+-/*  fixed segments non-Delaunay.  The conforming Delaunay property will be   */
+-/*  restored by enforcequality() by splitting encroached subsegments.        */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef REDUCED
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void conformingedge(struct mesh *m, struct behavior *b,
+-                    vertex endpoint1, vertex endpoint2, int newmark)
+-#else /* not ANSI_DECLARATORS */
+-void conformingedge(m, b, endpoint1, endpoint2, newmark)
+-struct mesh *m;
+-struct behavior *b;
+-vertex endpoint1;
+-vertex endpoint2;
+-int newmark;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri searchtri1, searchtri2;
+-  struct osub brokensubseg;
+-  vertex newvertex;
+-  vertex midvertex1, midvertex2;
+-  enum insertvertexresult success;
+-  int i;
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  if (b->verbose > 2) {
+-    printf("Forcing segment into triangulation by recursive splitting:\n");
+-    printf("  (%.12g, %.12g) (%.12g, %.12g)\n", endpoint1[0], endpoint1[1],
+-           endpoint2[0], endpoint2[1]);
+-  }
+-  /* Create a new vertex to insert in the middle of the segment. */
+-  newvertex = (vertex) poolalloc(&m->vertices);
+-  /* Interpolate coordinates and attributes. */
+-  for (i = 0; i < 2 + m->nextras; i++) {
+-    newvertex[i] = 0.5 * (endpoint1[i] + endpoint2[i]);
+-  }
+-  setvertexmark(newvertex, newmark);
+-  setvertextype(newvertex, SEGMENTVERTEX);
+-  /* No known triangle to search from. */
+-  searchtri1.tri = m->dummytri;
+-  /* Attempt to insert the new vertex. */
+-  success = insertvertex(m, b, newvertex, &searchtri1, (struct osub *) NULL,
+-                         0, 0);
+-  if (success == DUPLICATEVERTEX) {
+-    if (b->verbose > 2) {
+-      printf("  Segment intersects existing vertex (%.12g, %.12g).\n",
+-             newvertex[0], newvertex[1]);
+-    }
+-    /* Use the vertex that's already there. */
+-    vertexdealloc(m, newvertex);
+-    org(searchtri1, newvertex);
+-  } else {
+-    if (success == VIOLATINGVERTEX) {
+-      if (b->verbose > 2) {
+-        printf("  Two segments intersect at (%.12g, %.12g).\n",
+-               newvertex[0], newvertex[1]);
+-      }
+-      /* By fluke, we've landed right on another segment.  Split it. */
+-      tspivot(searchtri1, brokensubseg);
+-      success = insertvertex(m, b, newvertex, &searchtri1, &brokensubseg,
+-                             0, 0);
+-      if (success != SUCCESSFULVERTEX) {
+-        printf("Internal error in conformingedge():\n");
+-        printf("  Failure to split a segment.\n");
+-        internalerror();
+-      }
+-    }
+-    /* The vertex has been inserted successfully. */
+-    if (m->steinerleft > 0) {
+-      m->steinerleft--;
+-    }
+-  }
+-  otricopy(searchtri1, searchtri2);
+-  /* `searchtri1' and `searchtri2' are fastened at their origins to         */
+-  /*   `newvertex', and will be directed toward `endpoint1' and `endpoint2' */
+-  /*   respectively.  First, we must get `searchtri2' out of the way so it  */
+-  /*   won't be invalidated during the insertion of the first half of the   */
+-  /*   segment.                                                             */
+-  finddirection(m, b, &searchtri2, endpoint2);
+-  if (!scoutsegment(m, b, &searchtri1, endpoint1, newmark)) {
+-    /* The origin of searchtri1 may have changed if a collision with an */
+-    /*   intervening vertex on the segment occurred.                    */
+-    org(searchtri1, midvertex1);
+-    conformingedge(m, b, midvertex1, endpoint1, newmark);
+-  }
+-  if (!scoutsegment(m, b, &searchtri2, endpoint2, newmark)) {
+-    /* The origin of searchtri2 may have changed if a collision with an */
+-    /*   intervening vertex on the segment occurred.                    */
+-    org(searchtri2, midvertex2);
+-    conformingedge(m, b, midvertex2, endpoint2, newmark);
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-#endif /* not REDUCED */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  delaunayfixup()   Enforce the Delaunay condition at an edge, fanning out */
+-/*                    recursively from an existing vertex.  Pay special      */
+-/*                    attention to stacking inverted triangles.              */
+-/*                                                                           */
+-/*  This is a support routine for inserting segments into a constrained      */
+-/*  Delaunay triangulation.                                                  */
+-/*                                                                           */
+-/*  The origin of fixuptri is treated as if it has just been inserted, and   */
+-/*  the local Delaunay condition needs to be enforced.  It is only enforced  */
+-/*  in one sector, however, that being the angular range defined by          */
+-/*  fixuptri.                                                                */
+-/*                                                                           */
+-/*  This routine also needs to make decisions regarding the "stacking" of    */
+-/*  triangles.  (Read the description of constrainededge() below before      */
+-/*  reading on here, so you understand the algorithm.)  If the position of   */
+-/*  the new vertex (the origin of fixuptri) indicates that the vertex before */
+-/*  it on the polygon is a reflex vertex, then "stack" the triangle by       */
+-/*  doing nothing.  (fixuptri is an inverted triangle, which is how stacked  */
+-/*  triangles are identified.)                                               */
+-/*                                                                           */
+-/*  Otherwise, check whether the vertex before that was a reflex vertex.     */
+-/*  If so, perform an edge flip, thereby eliminating an inverted triangle    */
+-/*  (popping it off the stack).  The edge flip may result in the creation    */
+-/*  of a new inverted triangle, depending on whether or not the new vertex   */
+-/*  is visible to the vertex three edges behind on the polygon.              */
+-/*                                                                           */
+-/*  If neither of the two vertices behind the new vertex are reflex          */
+-/*  vertices, fixuptri and fartri, the triangle opposite it, are not         */
+-/*  inverted; hence, ensure that the edge between them is locally Delaunay.  */
+-/*                                                                           */
+-/*  `leftside' indicates whether or not fixuptri is to the left of the       */
+-/*  segment being inserted.  (Imagine that the segment is pointing up from   */
+-/*  endpoint1 to endpoint2.)                                                 */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void delaunayfixup(struct mesh *m, struct behavior *b,
+-                   struct otri *fixuptri, int leftside)
+-#else /* not ANSI_DECLARATORS */
+-void delaunayfixup(m, b, fixuptri, leftside)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *fixuptri;
+-int leftside;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri neartri;
+-  struct otri fartri;
+-  struct osub faredge;
+-  vertex nearvertex, leftvertex, rightvertex, farvertex;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  lnext(*fixuptri, neartri);
+-  sym(neartri, fartri);
+-  /* Check if the edge opposite the origin of fixuptri can be flipped. */
+-  if (fartri.tri == m->dummytri) {
+-    return;
+-  }
+-  tspivot(neartri, faredge);
+-  if (faredge.ss != m->dummysub) {
+-    return;
+-  }
+-  /* Find all the relevant vertices. */
+-  apex(neartri, nearvertex);
+-  org(neartri, leftvertex);
+-  dest(neartri, rightvertex);
+-  apex(fartri, farvertex);
+-  /* Check whether the previous polygon vertex is a reflex vertex. */
+-  if (leftside) {
+-    if (counterclockwise(m, b, nearvertex, leftvertex, farvertex) <= 0.0) {
+-      /* leftvertex is a reflex vertex too.  Nothing can */
+-      /*   be done until a convex section is found.      */
+-      return;
+-    }
+-  } else {
+-    if (counterclockwise(m, b, farvertex, rightvertex, nearvertex) <= 0.0) {
+-      /* rightvertex is a reflex vertex too.  Nothing can */
+-      /*   be done until a convex section is found.       */
+-      return;
+-    }
+-  }
+-  if (counterclockwise(m, b, rightvertex, leftvertex, farvertex) > 0.0) {
+-    /* fartri is not an inverted triangle, and farvertex is not a reflex */
+-    /*   vertex.  As there are no reflex vertices, fixuptri isn't an     */
+-    /*   inverted triangle, either.  Hence, test the edge between the    */
+-    /*   triangles to ensure it is locally Delaunay.                     */
+-    if (incircle(m, b, leftvertex, farvertex, rightvertex, nearvertex) <=
+-        0.0) {
+-      return;
+-    }
+-    /* Not locally Delaunay; go on to an edge flip. */
+-  }        /* else fartri is inverted; remove it from the stack by flipping. */
+-  flip(m, b, &neartri);
+-  lprevself(*fixuptri);    /* Restore the origin of fixuptri after the flip. */
+-  /* Recursively process the two triangles that result from the flip. */
+-  delaunayfixup(m, b, fixuptri, leftside);
+-  delaunayfixup(m, b, &fartri, leftside);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  constrainededge()   Force a segment into a constrained Delaunay          */
+-/*                      triangulation by deleting the triangles it           */
+-/*                      intersects, and triangulating the polygons that      */
+-/*                      form on each side of it.                             */
+-/*                                                                           */
+-/*  Generates a single subsegment connecting `endpoint1' to `endpoint2'.     */
+-/*  The triangle `starttri' has `endpoint1' as its origin.  `newmark' is the */
+-/*  boundary marker of the segment.                                          */
+-/*                                                                           */
+-/*  To insert a segment, every triangle whose interior intersects the        */
+-/*  segment is deleted.  The union of these deleted triangles is a polygon   */
+-/*  (which is not necessarily monotone, but is close enough), which is       */
+-/*  divided into two polygons by the new segment.  This routine's task is    */
+-/*  to generate the Delaunay triangulation of these two polygons.            */
+-/*                                                                           */
+-/*  You might think of this routine's behavior as a two-step process.  The   */
+-/*  first step is to walk from endpoint1 to endpoint2, flipping each edge    */
+-/*  encountered.  This step creates a fan of edges connected to endpoint1,   */
+-/*  including the desired edge to endpoint2.  The second step enforces the   */
+-/*  Delaunay condition on each side of the segment in an incremental manner: */
+-/*  proceeding along the polygon from endpoint1 to endpoint2 (this is done   */
+-/*  independently on each side of the segment), each vertex is "enforced"    */
+-/*  as if it had just been inserted, but affecting only the previous         */
+-/*  vertices.  The result is the same as if the vertices had been inserted   */
+-/*  in the order they appear on the polygon, so the result is Delaunay.      */
+-/*                                                                           */
+-/*  In truth, constrainededge() interleaves these two steps.  The procedure  */
+-/*  walks from endpoint1 to endpoint2, and each time an edge is encountered  */
+-/*  and flipped, the newly exposed vertex (at the far end of the flipped     */
+-/*  edge) is "enforced" upon the previously flipped edges, usually affecting */
+-/*  only one side of the polygon (depending upon which side of the segment   */
+-/*  the vertex falls on).                                                    */
+-/*                                                                           */
+-/*  The algorithm is complicated by the need to handle polygons that are not */
+-/*  convex.  Although the polygon is not necessarily monotone, it can be     */
+-/*  triangulated in a manner similar to the stack-based algorithms for       */
+-/*  monotone polygons.  For each reflex vertex (local concavity) of the      */
+-/*  polygon, there will be an inverted triangle formed by one of the edge    */
+-/*  flips.  (An inverted triangle is one with negative area - that is, its   */
+-/*  vertices are arranged in clockwise order - and is best thought of as a   */
+-/*  wrinkle in the fabric of the mesh.)  Each inverted triangle can be       */
+-/*  thought of as a reflex vertex pushed on the stack, waiting to be fixed   */
+-/*  later.                                                                   */
+-/*                                                                           */
+-/*  A reflex vertex is popped from the stack when a vertex is inserted that  */
+-/*  is visible to the reflex vertex.  (However, if the vertex behind the     */
+-/*  reflex vertex is not visible to the reflex vertex, a new inverted        */
+-/*  triangle will take its place on the stack.)  These details are handled   */
+-/*  by the delaunayfixup() routine above.                                    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void constrainededge(struct mesh *m, struct behavior *b,
+-                     struct otri *starttri, vertex endpoint2, int newmark)
+-#else /* not ANSI_DECLARATORS */
+-void constrainededge(m, b, starttri, endpoint2, newmark)
+-struct mesh *m;
+-struct behavior *b;
+-struct otri *starttri;
+-vertex endpoint2;
+-int newmark;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri fixuptri, fixuptri2;
+-  struct osub crosssubseg;
+-  vertex endpoint1;
+-  vertex farvertex;
+-  REAL area;
+-  int collision;
+-  int done;
+-  triangle ptr;             /* Temporary variable used by sym() and oprev(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  org(*starttri, endpoint1);
+-  lnext(*starttri, fixuptri);
+-  flip(m, b, &fixuptri);
+-  /* `collision' indicates whether we have found a vertex directly */
+-  /*   between endpoint1 and endpoint2.                            */
+-  collision = 0;
+-  done = 0;
+-  do {
+-    org(fixuptri, farvertex);
+-    /* `farvertex' is the extreme point of the polygon we are "digging" */
+-    /*   to get from endpoint1 to endpoint2.                           */
+-    if ((farvertex[0] == endpoint2[0]) && (farvertex[1] == endpoint2[1])) {
+-      oprev(fixuptri, fixuptri2);
+-      /* Enforce the Delaunay condition around endpoint2. */
+-      delaunayfixup(m, b, &fixuptri, 0);
+-      delaunayfixup(m, b, &fixuptri2, 1);
+-      done = 1;
+-    } else {
+-      /* Check whether farvertex is to the left or right of the segment */
+-      /*   being inserted, to decide which edge of fixuptri to dig      */
+-      /*   through next.                                                */
+-      area = counterclockwise(m, b, endpoint1, endpoint2, farvertex);
+-      if (area == 0.0) {
+-        /* We've collided with a vertex between endpoint1 and endpoint2. */
+-        collision = 1;
+-        oprev(fixuptri, fixuptri2);
+-        /* Enforce the Delaunay condition around farvertex. */
+-        delaunayfixup(m, b, &fixuptri, 0);
+-        delaunayfixup(m, b, &fixuptri2, 1);
+-        done = 1;
+-      } else {
+-        if (area > 0.0) {        /* farvertex is to the left of the segment. */
+-          oprev(fixuptri, fixuptri2);
+-          /* Enforce the Delaunay condition around farvertex, on the */
+-          /*   left side of the segment only.                        */
+-          delaunayfixup(m, b, &fixuptri2, 1);
+-          /* Flip the edge that crosses the segment.  After the edge is */
+-          /*   flipped, one of its endpoints is the fan vertex, and the */
+-          /*   destination of fixuptri is the fan vertex.               */
+-          lprevself(fixuptri);
+-        } else {                /* farvertex is to the right of the segment. */
+-          delaunayfixup(m, b, &fixuptri, 0);
+-          /* Flip the edge that crosses the segment.  After the edge is */
+-          /*   flipped, one of its endpoints is the fan vertex, and the */
+-          /*   destination of fixuptri is the fan vertex.               */
+-          oprevself(fixuptri);
+-        }
+-        /* Check for two intersecting segments. */
+-        tspivot(fixuptri, crosssubseg);
+-        if (crosssubseg.ss == m->dummysub) {
+-          flip(m, b, &fixuptri);    /* May create inverted triangle at left. */
+-        } else {
+-          /* We've collided with a segment between endpoint1 and endpoint2. */
+-          collision = 1;
+-          /* Insert a vertex at the intersection. */
+-          segmentintersection(m, b, &fixuptri, &crosssubseg, endpoint2);
+-          done = 1;
+-        }
+-      }
+-    }
+-  } while (!done);
+-  /* Insert a subsegment to make the segment permanent. */
+-  insertsubseg(m, b, &fixuptri, newmark);
+-  /* If there was a collision with an interceding vertex, install another */
+-  /*   segment connecting that vertex with endpoint2.                     */
+-  if (collision) {
+-    /* Insert the remainder of the segment. */
+-    if (!scoutsegment(m, b, &fixuptri, endpoint2, newmark)) {
+-      constrainededge(m, b, &fixuptri, endpoint2, newmark);
+-    }
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  insertsegment()   Insert a PSLG segment into a triangulation.            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void insertsegment(struct mesh *m, struct behavior *b,
+-                   vertex endpoint1, vertex endpoint2, int newmark)
+-#else /* not ANSI_DECLARATORS */
+-void insertsegment(m, b, endpoint1, endpoint2, newmark)
+-struct mesh *m;
+-struct behavior *b;
+-vertex endpoint1;
+-vertex endpoint2;
+-int newmark;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri searchtri1, searchtri2;
+-  triangle encodedtri;
+-  vertex checkvertex;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  if (b->verbose > 1) {
+-    printf("  Connecting (%.12g, %.12g) to (%.12g, %.12g).\n",
+-           endpoint1[0], endpoint1[1], endpoint2[0], endpoint2[1]);
+-  }
+-
+-  /* Find a triangle whose origin is the segment's first endpoint. */
+-  checkvertex = (vertex) NULL;
+-  encodedtri = vertex2tri(endpoint1);
+-  if (encodedtri != (triangle) NULL) {
+-    decode(encodedtri, searchtri1);
+-    org(searchtri1, checkvertex);
+-  }
+-  if (checkvertex != endpoint1) {
+-    /* Find a boundary triangle to search from. */
+-    searchtri1.tri = m->dummytri;
+-    searchtri1.orient = 0;
+-    symself(searchtri1);
+-    /* Search for the segment's first endpoint by point location. */
+-    if (locate(m, b, endpoint1, &searchtri1) != ONVERTEX) {
+-      printf(
+-        "Internal error in insertsegment():  Unable to locate PSLG vertex\n");
+-      printf("  (%.12g, %.12g) in triangulation.\n",
+-             endpoint1[0], endpoint1[1]);
+-      internalerror();
+-    }
+-  }
+-  /* Remember this triangle to improve subsequent point location. */
+-  otricopy(searchtri1, m->recenttri);
+-  /* Scout the beginnings of a path from the first endpoint */
+-  /*   toward the second.                                   */
+-  if (scoutsegment(m, b, &searchtri1, endpoint2, newmark)) {
+-    /* The segment was easily inserted. */
+-    return;
+-  }
+-  /* The first endpoint may have changed if a collision with an intervening */
+-  /*   vertex on the segment occurred.                                      */
+-  org(searchtri1, endpoint1);
+-
+-  /* Find a triangle whose origin is the segment's second endpoint. */
+-  checkvertex = (vertex) NULL;
+-  encodedtri = vertex2tri(endpoint2);
+-  if (encodedtri != (triangle) NULL) {
+-    decode(encodedtri, searchtri2);
+-    org(searchtri2, checkvertex);
+-  }
+-  if (checkvertex != endpoint2) {
+-    /* Find a boundary triangle to search from. */
+-    searchtri2.tri = m->dummytri;
+-    searchtri2.orient = 0;
+-    symself(searchtri2);
+-    /* Search for the segment's second endpoint by point location. */
+-    if (locate(m, b, endpoint2, &searchtri2) != ONVERTEX) {
+-      printf(
+-        "Internal error in insertsegment():  Unable to locate PSLG vertex\n");
+-      printf("  (%.12g, %.12g) in triangulation.\n",
+-             endpoint2[0], endpoint2[1]);
+-      internalerror();
+-    }
+-  }
+-  /* Remember this triangle to improve subsequent point location. */
+-  otricopy(searchtri2, m->recenttri);
+-  /* Scout the beginnings of a path from the second endpoint */
+-  /*   toward the first.                                     */
+-  if (scoutsegment(m, b, &searchtri2, endpoint1, newmark)) {
+-    /* The segment was easily inserted. */
+-    return;
+-  }
+-  /* The second endpoint may have changed if a collision with an intervening */
+-  /*   vertex on the segment occurred.                                       */
+-  org(searchtri2, endpoint2);
+-
+-#ifndef REDUCED
+-#ifndef CDT_ONLY
+-  if (b->splitseg) {
+-    /* Insert vertices to force the segment into the triangulation. */
+-    conformingedge(m, b, endpoint1, endpoint2, newmark);
+-  } else {
+-#endif /* not CDT_ONLY */
+-#endif /* not REDUCED */
+-    /* Insert the segment directly into the triangulation. */
+-    constrainededge(m, b, &searchtri1, endpoint2, newmark);
+-#ifndef REDUCED
+-#ifndef CDT_ONLY
+-  }
+-#endif /* not CDT_ONLY */
+-#endif /* not REDUCED */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  markhull()   Cover the convex hull of a triangulation with subsegments.  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void markhull(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void markhull(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri hulltri;
+-  struct otri nexttri;
+-  struct otri starttri;
+-  triangle ptr;             /* Temporary variable used by sym() and oprev(). */
+-
+-  /* Find a triangle handle on the hull. */
+-  hulltri.tri = m->dummytri;
+-  hulltri.orient = 0;
+-  symself(hulltri);
+-  /* Remember where we started so we know when to stop. */
+-  otricopy(hulltri, starttri);
+-  /* Go once counterclockwise around the convex hull. */
+-  do {
+-    /* Create a subsegment if there isn't already one here. */
+-    insertsubseg(m, b, &hulltri, 1);
+-    /* To find the next hull edge, go clockwise around the next vertex. */
+-    lnextself(hulltri);
+-    oprev(hulltri, nexttri);
+-    while (nexttri.tri != m->dummytri) {
+-      otricopy(nexttri, hulltri);
+-      oprev(hulltri, nexttri);
+-    }
+-  } while (!otriequal(hulltri, starttri));
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  formskeleton()   Create the segments of a triangulation, including PSLG  */
+-/*                   segments and edges on the convex hull.                  */
+-/*                                                                           */
+-/*  The PSLG segments are read from a .poly file.  The return value is the   */
+-/*  number of segments in the file.                                          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void formskeleton(struct mesh *m, struct behavior *b, int *segmentlist,
+-                  int *segmentmarkerlist, int numberofsegments)
+-#else /* not ANSI_DECLARATORS */
+-void formskeleton(m, b, segmentlist, segmentmarkerlist, numberofsegments)
+-struct mesh *m;
+-struct behavior *b;
+-int *segmentlist;
+-int *segmentmarkerlist;
+-int numberofsegments;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void formskeleton(struct mesh *m, struct behavior *b,
+-                  FILE *polyfile, char *polyfilename)
+-#else /* not ANSI_DECLARATORS */
+-void formskeleton(m, b, polyfile, polyfilename)
+-struct mesh *m;
+-struct behavior *b;
+-FILE *polyfile;
+-char *polyfilename;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  char polyfilename[6];
+-  int index;
+-#else /* not TRILIBRARY */
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-#endif /* not TRILIBRARY */
+-  vertex endpoint1, endpoint2;
+-  int segmentmarkers;
+-  int end1, end2;
+-  int boundmarker;
+-  int i;
+-
+-  if (b->poly) {
+-    if (!b->quiet) {
+-      printf("Recovering segments in Delaunay triangulation.\n");
+-    }
+-#ifdef TRILIBRARY
+-    strcpy(polyfilename, "input");
+-    m->insegments = numberofsegments;
+-    segmentmarkers = segmentmarkerlist != (int *) NULL;
+-    index = 0;
+-#else /* not TRILIBRARY */
+-    /* Read the segments from a .poly file. */
+-    /* Read number of segments and number of boundary markers. */
+-    stringptr = readline(inputline, polyfile, polyfilename);
+-    m->insegments = (int) strtol(stringptr, &stringptr, 0);
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      segmentmarkers = 0;
+-    } else {
+-      segmentmarkers = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-#endif /* not TRILIBRARY */
+-    /* If the input vertices are collinear, there is no triangulation, */
+-    /*   so don't try to insert segments.                              */
+-    if (m->triangles.items == 0) {
+-      return;
+-    }
+-
+-    /* If segments are to be inserted, compute a mapping */
+-    /*   from vertices to triangles.                     */
+-    if (m->insegments > 0) {
+-      makevertexmap(m, b);
+-      if (b->verbose) {
+-        printf("  Recovering PSLG segments.\n");
+-      }
+-    }
+-
+-    boundmarker = 0;
+-    /* Read and insert the segments. */
+-    for (i = 0; i < m->insegments; i++) {
+-#ifdef TRILIBRARY
+-      end1 = segmentlist[index++];
+-      end2 = segmentlist[index++];
+-      if (segmentmarkers) {
+-        boundmarker = segmentmarkerlist[i];
+-      }
+-#else /* not TRILIBRARY */
+-      stringptr = readline(inputline, polyfile, b->inpolyfilename);
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Segment %d has no endpoints in %s.\n",
+-               b->firstnumber + i, polyfilename);
+-        triexit(1);
+-      } else {
+-        end1 = (int) strtol(stringptr, &stringptr, 0);
+-      }
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Segment %d is missing its second endpoint in %s.\n",
+-               b->firstnumber + i, polyfilename);
+-        triexit(1);
+-      } else {
+-        end2 = (int) strtol(stringptr, &stringptr, 0);
+-      }
+-      if (segmentmarkers) {
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          boundmarker = 0;
+-        } else {
+-          boundmarker = (int) strtol(stringptr, &stringptr, 0);
+-        }
+-      }
+-#endif /* not TRILIBRARY */
+-      if ((end1 < b->firstnumber) ||
+-          (end1 >= b->firstnumber + m->invertices)) {
+-        if (!b->quiet) {
+-          printf("Warning:  Invalid first endpoint of segment %d in %s.\n",
+-                 b->firstnumber + i, polyfilename);
+-        }
+-      } else if ((end2 < b->firstnumber) ||
+-                 (end2 >= b->firstnumber + m->invertices)) {
+-        if (!b->quiet) {
+-          printf("Warning:  Invalid second endpoint of segment %d in %s.\n",
+-                 b->firstnumber + i, polyfilename);
+-        }
+-      } else {
+-        /* Find the vertices numbered `end1' and `end2'. */
+-        endpoint1 = getvertex(m, b, end1);
+-        endpoint2 = getvertex(m, b, end2);
+-        if ((endpoint1[0] == endpoint2[0]) && (endpoint1[1] == endpoint2[1])) {
+-          if (!b->quiet) {
+-            printf("Warning:  Endpoints of segment %d are coincident in %s.\n",
+-                   b->firstnumber + i, polyfilename);
+-          }
+-        } else {
+-          insertsegment(m, b, endpoint1, endpoint2, boundmarker);
+-        }
+-      }
+-    }
+-  } else {
+-    m->insegments = 0;
+-  }
+-  if (b->convex || !b->poly) {
+-    /* Enclose the convex hull with subsegments. */
+-    if (b->verbose) {
+-      printf("  Enclosing convex hull with segments.\n");
+-    }
+-    markhull(m, b);
+-  }
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Segment insertion ends here                               *********/
+-
+-/********* Carving out holes and concavities begins here             *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  infecthull()   Virally infect all of the triangles of the convex hull    */
+-/*                 that are not protected by subsegments.  Where there are   */
+-/*                 subsegments, set boundary markers as appropriate.         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void infecthull(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void infecthull(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri hulltri;
+-  struct otri nexttri;
+-  struct otri starttri;
+-  struct osub hullsubseg;
+-  triangle **deadtriangle;
+-  vertex horg, hdest;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  if (b->verbose) {
+-    printf("  Marking concavities (external triangles) for elimination.\n");
+-  }
+-  /* Find a triangle handle on the hull. */
+-  hulltri.tri = m->dummytri;
+-  hulltri.orient = 0;
+-  symself(hulltri);
+-  /* Remember where we started so we know when to stop. */
+-  otricopy(hulltri, starttri);
+-  /* Go once counterclockwise around the convex hull. */
+-  do {
+-    /* Ignore triangles that are already infected. */
+-    if (!infected(hulltri)) {
+-      /* Is the triangle protected by a subsegment? */
+-      tspivot(hulltri, hullsubseg);
+-      if (hullsubseg.ss == m->dummysub) {
+-        /* The triangle is not protected; infect it. */
+-        if (!infected(hulltri)) {
+-          infect(hulltri);
+-          deadtriangle = (triangle **) poolalloc(&m->viri);
+-          *deadtriangle = hulltri.tri;
+-        }
+-      } else {
+-        /* The triangle is protected; set boundary markers if appropriate. */
+-        if (mark(hullsubseg) == 0) {
+-          setmark(hullsubseg, 1);
+-          org(hulltri, horg);
+-          dest(hulltri, hdest);
+-          if (vertexmark(horg) == 0) {
+-            setvertexmark(horg, 1);
+-          }
+-          if (vertexmark(hdest) == 0) {
+-            setvertexmark(hdest, 1);
+-          }
+-        }
+-      }
+-    }
+-    /* To find the next hull edge, go clockwise around the next vertex. */
+-    lnextself(hulltri);
+-    oprev(hulltri, nexttri);
+-    while (nexttri.tri != m->dummytri) {
+-      otricopy(nexttri, hulltri);
+-      oprev(hulltri, nexttri);
+-    }
+-  } while (!otriequal(hulltri, starttri));
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  plague()   Spread the virus from all infected triangles to any neighbors */
+-/*             not protected by subsegments.  Delete all infected triangles. */
+-/*                                                                           */
+-/*  This is the procedure that actually creates holes and concavities.       */
+-/*                                                                           */
+-/*  This procedure operates in two phases.  The first phase identifies all   */
+-/*  the triangles that will die, and marks them as infected.  They are       */
+-/*  marked to ensure that each triangle is added to the virus pool only      */
+-/*  once, so the procedure will terminate.                                   */
+-/*                                                                           */
+-/*  The second phase actually eliminates the infected triangles.  It also    */
+-/*  eliminates orphaned vertices.                                            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void plague(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void plague(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri testtri;
+-  struct otri neighbor;
+-  triangle **virusloop;
+-  triangle **deadtriangle;
+-  struct osub neighborsubseg;
+-  vertex testvertex;
+-  vertex norg, ndest;
+-  vertex deadorg, deaddest, deadapex;
+-  int killorg;
+-  triangle ptr;             /* Temporary variable used by sym() and onext(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  if (b->verbose) {
+-    printf("  Marking neighbors of marked triangles.\n");
+-  }
+-  /* Loop through all the infected triangles, spreading the virus to */
+-  /*   their neighbors, then to their neighbors' neighbors.          */
+-  traversalinit(&m->viri);
+-  virusloop = (triangle **) traverse(&m->viri);
+-  while (virusloop != (triangle **) NULL) {
+-    testtri.tri = *virusloop;
+-    /* A triangle is marked as infected by messing with one of its pointers */
+-    /*   to subsegments, setting it to an illegal value.  Hence, we have to */
+-    /*   temporarily uninfect this triangle so that we can examine its      */
+-    /*   adjacent subsegments.                                              */
+-    uninfect(testtri);
+-    if (b->verbose > 2) {
+-      /* Assign the triangle an orientation for convenience in */
+-      /*   checking its vertices.                              */
+-      testtri.orient = 0;
+-      org(testtri, deadorg);
+-      dest(testtri, deaddest);
+-      apex(testtri, deadapex);
+-      printf("    Checking (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-             deadorg[0], deadorg[1], deaddest[0], deaddest[1],
+-             deadapex[0], deadapex[1]);
+-    }
+-    /* Check each of the triangle's three neighbors. */
+-    for (testtri.orient = 0; testtri.orient < 3; testtri.orient++) {
+-      /* Find the neighbor. */
+-      sym(testtri, neighbor);
+-      /* Check for a subsegment between the triangle and its neighbor. */
+-      tspivot(testtri, neighborsubseg);
+-      /* Check if the neighbor is nonexistent or already infected. */
+-      if ((neighbor.tri == m->dummytri) || infected(neighbor)) {
+-        if (neighborsubseg.ss != m->dummysub) {
+-          /* There is a subsegment separating the triangle from its      */
+-          /*   neighbor, but both triangles are dying, so the subsegment */
+-          /*   dies too.                                                 */
+-          subsegdealloc(m, neighborsubseg.ss);
+-          if (neighbor.tri != m->dummytri) {
+-            /* Make sure the subsegment doesn't get deallocated again */
+-            /*   later when the infected neighbor is visited.         */
+-            uninfect(neighbor);
+-            tsdissolve(neighbor);
+-            infect(neighbor);
+-          }
+-        }
+-      } else {                   /* The neighbor exists and is not infected. */
+-        if (neighborsubseg.ss == m->dummysub) {
+-          /* There is no subsegment protecting the neighbor, so */
+-          /*   the neighbor becomes infected.                   */
+-          if (b->verbose > 2) {
+-            org(neighbor, deadorg);
+-            dest(neighbor, deaddest);
+-            apex(neighbor, deadapex);
+-            printf(
+-              "    Marking (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-                   deadorg[0], deadorg[1], deaddest[0], deaddest[1],
+-                   deadapex[0], deadapex[1]);
+-          }
+-          infect(neighbor);
+-          /* Ensure that the neighbor's neighbors will be infected. */
+-          deadtriangle = (triangle **) poolalloc(&m->viri);
+-          *deadtriangle = neighbor.tri;
+-        } else {               /* The neighbor is protected by a subsegment. */
+-          /* Remove this triangle from the subsegment. */
+-          stdissolve(neighborsubseg);
+-          /* The subsegment becomes a boundary.  Set markers accordingly. */
+-          if (mark(neighborsubseg) == 0) {
+-            setmark(neighborsubseg, 1);
+-          }
+-          org(neighbor, norg);
+-          dest(neighbor, ndest);
+-          if (vertexmark(norg) == 0) {
+-            setvertexmark(norg, 1);
+-          }
+-          if (vertexmark(ndest) == 0) {
+-            setvertexmark(ndest, 1);
+-          }
+-        }
+-      }
+-    }
+-    /* Remark the triangle as infected, so it doesn't get added to the */
+-    /*   virus pool again.                                             */
+-    infect(testtri);
+-    virusloop = (triangle **) traverse(&m->viri);
+-  }
+-
+-  if (b->verbose) {
+-    printf("  Deleting marked triangles.\n");
+-  }
+-
+-  traversalinit(&m->viri);
+-  virusloop = (triangle **) traverse(&m->viri);
+-  while (virusloop != (triangle **) NULL) {
+-    testtri.tri = *virusloop;
+-
+-    /* Check each of the three corners of the triangle for elimination. */
+-    /*   This is done by walking around each vertex, checking if it is  */
+-    /*   still connected to at least one live triangle.                 */
+-    for (testtri.orient = 0; testtri.orient < 3; testtri.orient++) {
+-      org(testtri, testvertex);
+-      /* Check if the vertex has already been tested. */
+-      if (testvertex != (vertex) NULL) {
+-        killorg = 1;
+-        /* Mark the corner of the triangle as having been tested. */
+-        setorg(testtri, NULL);
+-        /* Walk counterclockwise about the vertex. */
+-        onext(testtri, neighbor);
+-        /* Stop upon reaching a boundary or the starting triangle. */
+-        while ((neighbor.tri != m->dummytri) &&
+-               (!otriequal(neighbor, testtri))) {
+-          if (infected(neighbor)) {
+-            /* Mark the corner of this triangle as having been tested. */
+-            setorg(neighbor, NULL);
+-          } else {
+-            /* A live triangle.  The vertex survives. */
+-            killorg = 0;
+-          }
+-          /* Walk counterclockwise about the vertex. */
+-          onextself(neighbor);
+-        }
+-        /* If we reached a boundary, we must walk clockwise as well. */
+-        if (neighbor.tri == m->dummytri) {
+-          /* Walk clockwise about the vertex. */
+-          oprev(testtri, neighbor);
+-          /* Stop upon reaching a boundary. */
+-          while (neighbor.tri != m->dummytri) {
+-            if (infected(neighbor)) {
+-            /* Mark the corner of this triangle as having been tested. */
+-              setorg(neighbor, NULL);
+-            } else {
+-              /* A live triangle.  The vertex survives. */
+-              killorg = 0;
+-            }
+-            /* Walk clockwise about the vertex. */
+-            oprevself(neighbor);
+-          }
+-        }
+-        if (killorg) {
+-          if (b->verbose > 1) {
+-            printf("    Deleting vertex (%.12g, %.12g)\n",
+-                   testvertex[0], testvertex[1]);
+-          }
+-          setvertextype(testvertex, UNDEADVERTEX);
+-          m->undeads++;
+-        }
+-      }
+-    }
+-
+-    /* Record changes in the number of boundary edges, and disconnect */
+-    /*   dead triangles from their neighbors.                         */
+-    for (testtri.orient = 0; testtri.orient < 3; testtri.orient++) {
+-      sym(testtri, neighbor);
+-      if (neighbor.tri == m->dummytri) {
+-        /* There is no neighboring triangle on this edge, so this edge    */
+-        /*   is a boundary edge.  This triangle is being deleted, so this */
+-        /*   boundary edge is deleted.                                    */
+-        m->hullsize--;
+-      } else {
+-        /* Disconnect the triangle from its neighbor. */
+-        dissolve(neighbor);
+-        /* There is a neighboring triangle on this edge, so this edge */
+-        /*   becomes a boundary edge when this triangle is deleted.   */
+-        m->hullsize++;
+-      }
+-    }
+-    /* Return the dead triangle to the pool of triangles. */
+-    triangledealloc(m, testtri.tri);
+-    virusloop = (triangle **) traverse(&m->viri);
+-  }
+-  /* Empty the virus pool. */
+-  poolrestart(&m->viri);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  regionplague()   Spread regional attributes and/or area constraints      */
+-/*                   (from a .poly file) throughout the mesh.                */
+-/*                                                                           */
+-/*  This procedure operates in two phases.  The first phase spreads an       */
+-/*  attribute and/or an area constraint through a (segment-bounded) region.  */
+-/*  The triangles are marked to ensure that each triangle is added to the    */
+-/*  virus pool only once, so the procedure will terminate.                   */
+-/*                                                                           */
+-/*  The second phase uninfects all infected triangles, returning them to     */
+-/*  normal.                                                                  */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void regionplague(struct mesh *m, struct behavior *b,
+-                  REAL attribute, REAL area)
+-#else /* not ANSI_DECLARATORS */
+-void regionplague(m, b, attribute, area)
+-struct mesh *m;
+-struct behavior *b;
+-REAL attribute;
+-REAL area;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri testtri;
+-  struct otri neighbor;
+-  triangle **virusloop;
+-  triangle **regiontri;
+-  struct osub neighborsubseg;
+-  vertex regionorg, regiondest, regionapex;
+-  triangle ptr;             /* Temporary variable used by sym() and onext(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  if (b->verbose > 1) {
+-    printf("  Marking neighbors of marked triangles.\n");
+-  }
+-  /* Loop through all the infected triangles, spreading the attribute      */
+-  /*   and/or area constraint to their neighbors, then to their neighbors' */
+-  /*   neighbors.                                                          */
+-  traversalinit(&m->viri);
+-  virusloop = (triangle **) traverse(&m->viri);
+-  while (virusloop != (triangle **) NULL) {
+-    testtri.tri = *virusloop;
+-    /* A triangle is marked as infected by messing with one of its pointers */
+-    /*   to subsegments, setting it to an illegal value.  Hence, we have to */
+-    /*   temporarily uninfect this triangle so that we can examine its      */
+-    /*   adjacent subsegments.                                              */
+-    uninfect(testtri);
+-    if (b->regionattrib) {
+-      /* Set an attribute. */
+-      setelemattribute(testtri, m->eextras, attribute);
+-    }
+-    if (b->vararea) {
+-      /* Set an area constraint. */
+-      setareabound(testtri, area);
+-    }
+-    if (b->verbose > 2) {
+-      /* Assign the triangle an orientation for convenience in */
+-      /*   checking its vertices.                              */
+-      testtri.orient = 0;
+-      org(testtri, regionorg);
+-      dest(testtri, regiondest);
+-      apex(testtri, regionapex);
+-      printf("    Checking (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-             regionorg[0], regionorg[1], regiondest[0], regiondest[1],
+-             regionapex[0], regionapex[1]);
+-    }
+-    /* Check each of the triangle's three neighbors. */
+-    for (testtri.orient = 0; testtri.orient < 3; testtri.orient++) {
+-      /* Find the neighbor. */
+-      sym(testtri, neighbor);
+-      /* Check for a subsegment between the triangle and its neighbor. */
+-      tspivot(testtri, neighborsubseg);
+-      /* Make sure the neighbor exists, is not already infected, and */
+-      /*   isn't protected by a subsegment.                          */
+-      if ((neighbor.tri != m->dummytri) && !infected(neighbor)
+-          && (neighborsubseg.ss == m->dummysub)) {
+-        if (b->verbose > 2) {
+-          org(neighbor, regionorg);
+-          dest(neighbor, regiondest);
+-          apex(neighbor, regionapex);
+-          printf("    Marking (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-                 regionorg[0], regionorg[1], regiondest[0], regiondest[1],
+-                 regionapex[0], regionapex[1]);
+-        }
+-        /* Infect the neighbor. */
+-        infect(neighbor);
+-        /* Ensure that the neighbor's neighbors will be infected. */
+-        regiontri = (triangle **) poolalloc(&m->viri);
+-        *regiontri = neighbor.tri;
+-      }
+-    }
+-    /* Remark the triangle as infected, so it doesn't get added to the */
+-    /*   virus pool again.                                             */
+-    infect(testtri);
+-    virusloop = (triangle **) traverse(&m->viri);
+-  }
+-
+-  /* Uninfect all triangles. */
+-  if (b->verbose > 1) {
+-    printf("  Unmarking marked triangles.\n");
+-  }
+-  traversalinit(&m->viri);
+-  virusloop = (triangle **) traverse(&m->viri);
+-  while (virusloop != (triangle **) NULL) {
+-    testtri.tri = *virusloop;
+-    uninfect(testtri);
+-    virusloop = (triangle **) traverse(&m->viri);
+-  }
+-  /* Empty the virus pool. */
+-  poolrestart(&m->viri);
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  carveholes()   Find the holes and infect them.  Find the area            */
+-/*                 constraints and infect them.  Infect the convex hull.     */
+-/*                 Spread the infection and kill triangles.  Spread the      */
+-/*                 area constraints.                                         */
+-/*                                                                           */
+-/*  This routine mainly calls other routines to carry out all these          */
+-/*  functions.                                                               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void carveholes(struct mesh *m, struct behavior *b, REAL *holelist, int holes,
+-                REAL *regionlist, int regions)
+-#else /* not ANSI_DECLARATORS */
+-void carveholes(m, b, holelist, holes, regionlist, regions)
+-struct mesh *m;
+-struct behavior *b;
+-REAL *holelist;
+-int holes;
+-REAL *regionlist;
+-int regions;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri searchtri;
+-  struct otri triangleloop;
+-  struct otri *regiontris;
+-  triangle **holetri;
+-  triangle **regiontri;
+-  vertex searchorg, searchdest;
+-  enum locateresult intersect;
+-  int i;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-  if (!(b->quiet || (b->noholes && b->convex))) {
+-    printf("Removing unwanted triangles.\n");
+-    if (b->verbose && (holes > 0)) {
+-      printf("  Marking holes for elimination.\n");
+-    }
+-  }
+-
+-  if (regions > 0) {
+-    /* Allocate storage for the triangles in which region points fall. */
+-    regiontris = (struct otri *) trimalloc(regions *
+-                                           (int) sizeof(struct otri));
+-  } else {
+-    regiontris = (struct otri *) NULL;
+-  }
+-
+-  if (((holes > 0) && !b->noholes) || !b->convex || (regions > 0)) {
+-    /* Initialize a pool of viri to be used for holes, concavities, */
+-    /*   regional attributes, and/or regional area constraints.     */
+-    poolinit(&m->viri, sizeof(triangle *), VIRUSPERBLOCK, VIRUSPERBLOCK, 0);
+-  }
+-
+-  if (!b->convex) {
+-    /* Mark as infected any unprotected triangles on the boundary. */
+-    /*   This is one way by which concavities are created.         */
+-    infecthull(m, b);
+-  }
+-
+-  if ((holes > 0) && !b->noholes) {
+-    /* Infect each triangle in which a hole lies. */
+-    for (i = 0; i < 2 * holes; i += 2) {
+-      /* Ignore holes that aren't within the bounds of the mesh. */
+-      if ((holelist[i] >= m->xmin) && (holelist[i] <= m->xmax)
+-          && (holelist[i + 1] >= m->ymin) && (holelist[i + 1] <= m->ymax)) {
+-        /* Start searching from some triangle on the outer boundary. */
+-        searchtri.tri = m->dummytri;
+-        searchtri.orient = 0;
+-        symself(searchtri);
+-        /* Ensure that the hole is to the left of this boundary edge; */
+-        /*   otherwise, locate() will falsely report that the hole    */
+-        /*   falls within the starting triangle.                      */
+-        org(searchtri, searchorg);
+-        dest(searchtri, searchdest);
+-        if (counterclockwise(m, b, searchorg, searchdest, &holelist[i]) >
+-            0.0) {
+-          /* Find a triangle that contains the hole. */
+-          intersect = locate(m, b, &holelist[i], &searchtri);
+-          if ((intersect != OUTSIDE) && (!infected(searchtri))) {
+-            /* Infect the triangle.  This is done by marking the triangle  */
+-            /*   as infected and including the triangle in the virus pool. */
+-            infect(searchtri);
+-            holetri = (triangle **) poolalloc(&m->viri);
+-            *holetri = searchtri.tri;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  /* Now, we have to find all the regions BEFORE we carve the holes, because */
+-  /*   locate() won't work when the triangulation is no longer convex.       */
+-  /*   (Incidentally, this is the reason why regional attributes and area    */
+-  /*   constraints can't be used when refining a preexisting mesh, which     */
+-  /*   might not be convex; they can only be used with a freshly             */
+-  /*   triangulated PSLG.)                                                   */
+-  if (regions > 0) {
+-    /* Find the starting triangle for each region. */
+-    for (i = 0; i < regions; i++) {
+-      regiontris[i].tri = m->dummytri;
+-      /* Ignore region points that aren't within the bounds of the mesh. */
+-      if ((regionlist[4 * i] >= m->xmin) && (regionlist[4 * i] <= m->xmax) &&
+-          (regionlist[4 * i + 1] >= m->ymin) &&
+-          (regionlist[4 * i + 1] <= m->ymax)) {
+-        /* Start searching from some triangle on the outer boundary. */
+-        searchtri.tri = m->dummytri;
+-        searchtri.orient = 0;
+-        symself(searchtri);
+-        /* Ensure that the region point is to the left of this boundary */
+-        /*   edge; otherwise, locate() will falsely report that the     */
+-        /*   region point falls within the starting triangle.           */
+-        org(searchtri, searchorg);
+-        dest(searchtri, searchdest);
+-        if (counterclockwise(m, b, searchorg, searchdest, &regionlist[4 * i]) >
+-            0.0) {
+-          /* Find a triangle that contains the region point. */
+-          intersect = locate(m, b, &regionlist[4 * i], &searchtri);
+-          if ((intersect != OUTSIDE) && (!infected(searchtri))) {
+-            /* Record the triangle for processing after the */
+-            /*   holes have been carved.                    */
+-            otricopy(searchtri, regiontris[i]);
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  if (m->viri.items > 0) {
+-    /* Carve the holes and concavities. */
+-    plague(m, b);
+-  }
+-  /* The virus pool should be empty now. */
+-
+-  if (regions > 0) {
+-    if (!b->quiet) {
+-      if (b->regionattrib) {
+-        if (b->vararea) {
+-          printf("Spreading regional attributes and area constraints.\n");
+-        } else {
+-          printf("Spreading regional attributes.\n");
+-        }
+-      } else {
+-        printf("Spreading regional area constraints.\n");
+-      }
+-    }
+-    if (b->regionattrib && !b->refine) {
+-      /* Assign every triangle a regional attribute of zero. */
+-      traversalinit(&m->triangles);
+-      triangleloop.orient = 0;
+-      triangleloop.tri = triangletraverse(m);
+-      while (triangleloop.tri != (triangle *) NULL) {
+-        setelemattribute(triangleloop, m->eextras, 0.0);
+-        triangleloop.tri = triangletraverse(m);
+-      }
+-    }
+-    for (i = 0; i < regions; i++) {
+-      if (regiontris[i].tri != m->dummytri) {
+-        /* Make sure the triangle under consideration still exists. */
+-        /*   It may have been eaten by the virus.                   */
+-        if (!deadtri(regiontris[i].tri)) {
+-          /* Put one triangle in the virus pool. */
+-          infect(regiontris[i]);
+-          regiontri = (triangle **) poolalloc(&m->viri);
+-          *regiontri = regiontris[i].tri;
+-          /* Apply one region's attribute and/or area constraint. */
+-          regionplague(m, b, regionlist[4 * i + 2], regionlist[4 * i + 3]);
+-          /* The virus pool should be empty now. */
+-        }
+-      }
+-    }
+-    if (b->regionattrib && !b->refine) {
+-      /* Note the fact that each triangle has an additional attribute. */
+-      m->eextras++;
+-    }
+-  }
+-
+-  /* Free up memory. */
+-  if (((holes > 0) && !b->noholes) || !b->convex || (regions > 0)) {
+-    pooldeinit(&m->viri);
+-  }
+-  if (regions > 0) {
+-    trifree((void *) regiontris);
+-  }
+-}
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Carving out holes and concavities ends here               *********/
+-
+-/********* Mesh quality maintenance begins here                      *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  tallyencs()   Traverse the entire list of subsegments, and check each    */
+-/*                to see if it is encroached.  If so, add it to the list.    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void tallyencs(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void tallyencs(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct osub subsegloop;
+-
+-  traversalinit(&m->subsegs);
+-  subsegloop.ssorient = 0;
+-  subsegloop.ss = subsegtraverse(m);
+-  while (subsegloop.ss != (subseg *) NULL) {
+-    /* If the segment is encroached, add it to the list. */
+-    checkseg4encroach(m, b, &subsegloop);
+-    subsegloop.ss = subsegtraverse(m);
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  precisionerror()  Print an error message for precision problems.         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-void precisionerror()
+-{
+-  printf("Try increasing the area criterion and/or reducing the minimum\n");
+-  printf("  allowable angle so that tiny triangles are not created.\n");
+-#ifdef SINGLE
+-  printf("Alternatively, try recompiling me with double precision\n");
+-  printf("  arithmetic (by removing \"#define SINGLE\" from the\n");
+-  printf("  source file or \"-DSINGLE\" from the makefile).\n");
+-#endif /* SINGLE */
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  splitencsegs()   Split all the encroached subsegments.                   */
+-/*                                                                           */
+-/*  Each encroached subsegment is repaired by splitting it - inserting a     */
+-/*  vertex at or near its midpoint.  Newly inserted vertices may encroach    */
+-/*  upon other subsegments; these are also repaired.                         */
+-/*                                                                           */
+-/*  `triflaws' is a flag that specifies whether one should take note of new  */
+-/*  bad triangles that result from inserting vertices to repair encroached   */
+-/*  subsegments.                                                             */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void splitencsegs(struct mesh *m, struct behavior *b, int triflaws)
+-#else /* not ANSI_DECLARATORS */
+-void splitencsegs(m, b, triflaws)
+-struct mesh *m;
+-struct behavior *b;
+-int triflaws;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri enctri;
+-  struct otri testtri;
+-  struct osub testsh;
+-  struct osub currentenc;
+-  struct badsubseg *encloop;
+-  vertex eorg, edest, eapex;
+-  vertex newvertex;
+-  enum insertvertexresult success;
+-  REAL segmentlength, nearestpoweroftwo;
+-  REAL split;
+-  REAL multiplier, divisor;
+-  int acuteorg, acuteorg2, acutedest, acutedest2;
+-  int i;
+-  triangle ptr;                     /* Temporary variable used by stpivot(). */
+-  subseg sptr;                        /* Temporary variable used by snext(). */
+-
+-  /* Note that steinerleft == -1 if an unlimited number */
+-  /*   of Steiner points is allowed.                    */
+-  while ((m->badsubsegs.items > 0) && (m->steinerleft != 0)) {
+-    traversalinit(&m->badsubsegs);
+-    encloop = badsubsegtraverse(m);
+-    while ((encloop != (struct badsubseg *) NULL) && (m->steinerleft != 0)) {
+-      sdecode(encloop->encsubseg, currentenc);
+-      sorg(currentenc, eorg);
+-      sdest(currentenc, edest);
+-      /* Make sure that this segment is still the same segment it was   */
+-      /*   when it was determined to be encroached.  If the segment was */
+-      /*   enqueued multiple times (because several newly inserted      */
+-      /*   vertices encroached it), it may have already been split.     */
+-      if (!deadsubseg(currentenc.ss) &&
+-          (eorg == encloop->subsegorg) && (edest == encloop->subsegdest)) {
+-        /* To decide where to split a segment, we need to know if the   */
+-        /*   segment shares an endpoint with an adjacent segment.       */
+-        /*   The concern is that, if we simply split every encroached   */
+-        /*   segment in its center, two adjacent segments with a small  */
+-        /*   angle between them might lead to an infinite loop; each    */
+-        /*   vertex added to split one segment will encroach upon the   */
+-        /*   other segment, which must then be split with a vertex that */
+-        /*   will encroach upon the first segment, and so on forever.   */
+-        /* To avoid this, imagine a set of concentric circles, whose    */
+-        /*   radii are powers of two, about each segment endpoint.      */
+-        /*   These concentric circles determine where the segment is    */
+-        /*   split.  (If both endpoints are shared with adjacent        */
+-        /*   segments, split the segment in the middle, and apply the   */
+-        /*   concentric circles for later splittings.)                  */
+-
+-        /* Is the origin shared with another segment? */
+-        stpivot(currentenc, enctri);
+-        lnext(enctri, testtri);
+-        tspivot(testtri, testsh);
+-        acuteorg = testsh.ss != m->dummysub;
+-        /* Is the destination shared with another segment? */
+-        lnextself(testtri);
+-        tspivot(testtri, testsh);
+-        acutedest = testsh.ss != m->dummysub;
+-
+-        /* If we're using Chew's algorithm (rather than Ruppert's) */
+-        /*   to define encroachment, delete free vertices from the */
+-        /*   subsegment's diametral circle.                        */
+-        if (!b->conformdel && !acuteorg && !acutedest) {
+-          apex(enctri, eapex);
+-          while ((vertextype(eapex) == FREEVERTEX) &&
+-                 ((eorg[0] - eapex[0]) * (edest[0] - eapex[0]) +
+-                  (eorg[1] - eapex[1]) * (edest[1] - eapex[1]) < 0.0)) {
+-            deletevertex(m, b, &testtri);
+-            stpivot(currentenc, enctri);
+-            apex(enctri, eapex);
+-            lprev(enctri, testtri);
+-          }
+-        }
+-
+-        /* Now, check the other side of the segment, if there's a triangle */
+-        /*   there.                                                        */
+-        sym(enctri, testtri);
+-        if (testtri.tri != m->dummytri) {
+-          /* Is the destination shared with another segment? */
+-          lnextself(testtri);
+-          tspivot(testtri, testsh);
+-          acutedest2 = testsh.ss != m->dummysub;
+-          acutedest = acutedest || acutedest2;
+-          /* Is the origin shared with another segment? */
+-          lnextself(testtri);
+-          tspivot(testtri, testsh);
+-          acuteorg2 = testsh.ss != m->dummysub;
+-          acuteorg = acuteorg || acuteorg2;
+-
+-          /* Delete free vertices from the subsegment's diametral circle. */
+-          if (!b->conformdel && !acuteorg2 && !acutedest2) {
+-            org(testtri, eapex);
+-            while ((vertextype(eapex) == FREEVERTEX) &&
+-                   ((eorg[0] - eapex[0]) * (edest[0] - eapex[0]) +
+-                    (eorg[1] - eapex[1]) * (edest[1] - eapex[1]) < 0.0)) {
+-              deletevertex(m, b, &testtri);
+-              sym(enctri, testtri);
+-              apex(testtri, eapex);
+-              lprevself(testtri);
+-            }
+-          }
+-        }
+-
+-        /* Use the concentric circles if exactly one endpoint is shared */
+-        /*   with another adjacent segment.                             */
+-        if (acuteorg || acutedest) {
+-          segmentlength = sqrt((edest[0] - eorg[0]) * (edest[0] - eorg[0]) +
+-                               (edest[1] - eorg[1]) * (edest[1] - eorg[1]));
+-          /* Find the power of two that most evenly splits the segment.  */
+-          /*   The worst case is a 2:1 ratio between subsegment lengths. */
+-          nearestpoweroftwo = 1.0;
+-          while (segmentlength > 3.0 * nearestpoweroftwo) {
+-            nearestpoweroftwo *= 2.0;
+-          }
+-          while (segmentlength < 1.5 * nearestpoweroftwo) {
+-            nearestpoweroftwo *= 0.5;
+-          }
+-          /* Where do we split the segment? */
+-          split = nearestpoweroftwo / segmentlength;
+-          if (acutedest) {
+-            split = 1.0 - split;
+-          }
+-        } else {
+-          /* If we're not worried about adjacent segments, split */
+-          /*   this segment in the middle.                       */
+-          split = 0.5;
+-        }
+-
+-        /* Create the new vertex. */
+-        newvertex = (vertex) poolalloc(&m->vertices);
+-        /* Interpolate its coordinate and attributes. */
+-        for (i = 0; i < 2 + m->nextras; i++) {
+-          newvertex[i] = eorg[i] + split * (edest[i] - eorg[i]);
+-        }
+-
+-        if (!b->noexact) {
+-          /* Roundoff in the above calculation may yield a `newvertex'   */
+-          /*   that is not precisely collinear with `eorg' and `edest'.  */
+-          /*   Improve collinearity by one step of iterative refinement. */
+-          multiplier = counterclockwise(m, b, eorg, edest, newvertex);
+-          divisor = ((eorg[0] - edest[0]) * (eorg[0] - edest[0]) +
+-                     (eorg[1] - edest[1]) * (eorg[1] - edest[1]));
+-          if ((multiplier != 0.0) && (divisor != 0.0)) {
+-            multiplier = multiplier / divisor;
+-            /* Watch out for NANs. */
+-            if (multiplier == multiplier) {
+-              newvertex[0] += multiplier * (edest[1] - eorg[1]);
+-              newvertex[1] += multiplier * (eorg[0] - edest[0]);
+-            }
+-          }
+-        }
+-
+-        setvertexmark(newvertex, mark(currentenc));
+-        setvertextype(newvertex, SEGMENTVERTEX);
+-        if (b->verbose > 1) {
+-          printf(
+-  "  Splitting subsegment (%.12g, %.12g) (%.12g, %.12g) at (%.12g, %.12g).\n",
+-                 eorg[0], eorg[1], edest[0], edest[1],
+-                 newvertex[0], newvertex[1]);
+-        }
+-        /* Check whether the new vertex lies on an endpoint. */
+-        if (((newvertex[0] == eorg[0]) && (newvertex[1] == eorg[1])) ||
+-            ((newvertex[0] == edest[0]) && (newvertex[1] == edest[1]))) {
+-          printf("Error:  Ran out of precision at (%.12g, %.12g).\n",
+-                 newvertex[0], newvertex[1]);
+-          printf("I attempted to split a segment to a smaller size than\n");
+-          printf("  can be accommodated by the finite precision of\n");
+-          printf("  floating point arithmetic.\n");
+-          precisionerror();
+-          triexit(1);
+-        }
+-        /* Insert the splitting vertex.  This should always succeed. */
+-        success = insertvertex(m, b, newvertex, &enctri, &currentenc,
+-                               1, triflaws);
+-        if ((success != SUCCESSFULVERTEX) && (success != ENCROACHINGVERTEX)) {
+-          printf("Internal error in splitencsegs():\n");
+-          printf("  Failure to split a segment.\n");
+-          internalerror();
+-        }
+-        if (m->steinerleft > 0) {
+-          m->steinerleft--;
+-        }
+-        /* Check the two new subsegments to see if they're encroached. */
+-        checkseg4encroach(m, b, &currentenc);
+-        snextself(currentenc);
+-        checkseg4encroach(m, b, &currentenc);
+-      }
+-
+-      badsubsegdealloc(m, encloop);
+-      encloop = badsubsegtraverse(m);
+-    }
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  tallyfaces()   Test every triangle in the mesh for quality measures.     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void tallyfaces(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void tallyfaces(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri triangleloop;
+-
+-  if (b->verbose) {
+-    printf("  Making a list of bad triangles.\n");
+-  }
+-  traversalinit(&m->triangles);
+-  triangleloop.orient = 0;
+-  triangleloop.tri = triangletraverse(m);
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    /* If the triangle is bad, enqueue it. */
+-    testtriangle(m, b, &triangleloop);
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  splittriangle()   Inserts a vertex at the circumcenter of a triangle.    */
+-/*                    Deletes the newly inserted vertex if it encroaches     */
+-/*                    upon a segment.                                        */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void splittriangle(struct mesh *m, struct behavior *b,
+-                   struct badtriang *badtri)
+-#else /* not ANSI_DECLARATORS */
+-void splittriangle(m, b, badtri)
+-struct mesh *m;
+-struct behavior *b;
+-struct badtriang *badtri;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri badotri;
+-  vertex borg, bdest, bapex;
+-  vertex newvertex;
+-  REAL xi, eta;
+-  enum insertvertexresult success;
+-  int errorflag;
+-  int i;
+-
+-  decode(badtri->poortri, badotri);
+-  org(badotri, borg);
+-  dest(badotri, bdest);
+-  apex(badotri, bapex);
+-  /* Make sure that this triangle is still the same triangle it was      */
+-  /*   when it was tested and determined to be of bad quality.           */
+-  /*   Subsequent transformations may have made it a different triangle. */
+-  if (!deadtri(badotri.tri) && (borg == badtri->triangorg) &&
+-      (bdest == badtri->triangdest) && (bapex == badtri->triangapex)) {
+-    if (b->verbose > 1) {
+-      printf("  Splitting this triangle at its circumcenter:\n");
+-      printf("    (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n", borg[0],
+-             borg[1], bdest[0], bdest[1], bapex[0], bapex[1]);
+-    }
+-
+-    errorflag = 0;
+-    /* Create a new vertex at the triangle's circumcenter. */
+-    newvertex = (vertex) poolalloc(&m->vertices);
+-    findcircumcenter(m, b, borg, bdest, bapex, newvertex, &xi, &eta, 1);
+-
+-    /* Check whether the new vertex lies on a triangle vertex. */
+-    if (((newvertex[0] == borg[0]) && (newvertex[1] == borg[1])) ||
+-        ((newvertex[0] == bdest[0]) && (newvertex[1] == bdest[1])) ||
+-        ((newvertex[0] == bapex[0]) && (newvertex[1] == bapex[1]))) {
+-      if (!b->quiet) {
+-        printf(
+-             "Warning:  New vertex (%.12g, %.12g) falls on existing vertex.\n",
+-               newvertex[0], newvertex[1]);
+-        errorflag = 1;
+-      }
+-      vertexdealloc(m, newvertex);
+-    } else {
+-      for (i = 2; i < 2 + m->nextras; i++) {
+-        /* Interpolate the vertex attributes at the circumcenter. */
+-        newvertex[i] = borg[i] + xi * (bdest[i] - borg[i])
+-                              + eta * (bapex[i] - borg[i]);
+-      }
+-      /* The new vertex must be in the interior, and therefore is a */
+-      /*   free vertex with a marker of zero.                       */
+-      setvertexmark(newvertex, 0);
+-      setvertextype(newvertex, FREEVERTEX);
+-
+-      /* Ensure that the handle `badotri' does not represent the longest  */
+-      /*   edge of the triangle.  This ensures that the circumcenter must */
+-      /*   fall to the left of this edge, so point location will work.    */
+-      /*   (If the angle org-apex-dest exceeds 90 degrees, then the       */
+-      /*   circumcenter lies outside the org-dest edge, and eta is        */
+-      /*   negative.  Roundoff error might prevent eta from being         */
+-      /*   negative when it should be, so I test eta against xi.)         */
+-      if (eta < xi) {
+-        lprevself(badotri);
+-      }
+-
+-      /* Insert the circumcenter, searching from the edge of the triangle, */
+-      /*   and maintain the Delaunay property of the triangulation.        */
+-      success = insertvertex(m, b, newvertex, &badotri, (struct osub *) NULL,
+-                             1, 1);
+-      if (success == SUCCESSFULVERTEX) {
+-        if (m->steinerleft > 0) {
+-          m->steinerleft--;
+-        }
+-      } else if (success == ENCROACHINGVERTEX) {
+-        /* If the newly inserted vertex encroaches upon a subsegment, */
+-        /*   delete the new vertex.                                   */
+-        undovertex(m, b);
+-        if (b->verbose > 1) {
+-          printf("  Rejecting (%.12g, %.12g).\n", newvertex[0], newvertex[1]);
+-        }
+-        vertexdealloc(m, newvertex);
+-      } else if (success == VIOLATINGVERTEX) {
+-        /* Failed to insert the new vertex, but some subsegment was */
+-        /*   marked as being encroached.                            */
+-        vertexdealloc(m, newvertex);
+-      } else {                                 /* success == DUPLICATEVERTEX */
+-        /* Couldn't insert the new vertex because a vertex is already there. */
+-        if (!b->quiet) {
+-          printf(
+-            "Warning:  New vertex (%.12g, %.12g) falls on existing vertex.\n",
+-                 newvertex[0], newvertex[1]);
+-          errorflag = 1;
+-        }
+-        vertexdealloc(m, newvertex);
+-      }
+-    }
+-    if (errorflag) {
+-      if (b->verbose) {
+-        printf("  The new vertex is at the circumcenter of triangle\n");
+-        printf("    (%.12g, %.12g) (%.12g, %.12g) (%.12g, %.12g)\n",
+-               borg[0], borg[1], bdest[0], bdest[1], bapex[0], bapex[1]);
+-      }
+-      printf("This probably means that I am trying to refine triangles\n");
+-      printf("  to a smaller size than can be accommodated by the finite\n");
+-      printf("  precision of floating point arithmetic.  (You can be\n");
+-      printf("  sure of this if I fail to terminate.)\n");
+-      precisionerror();
+-    }
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  enforcequality()   Remove all the encroached subsegments and bad         */
+-/*                     triangles from the triangulation.                     */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef CDT_ONLY
+-
+-#ifdef ANSI_DECLARATORS
+-void enforcequality(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void enforcequality(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct badtriang *badtri;
+-  int i;
+-
+-  if (!b->quiet) {
+-    printf("Adding Steiner points to enforce quality.\n");
+-  }
+-  /* Initialize the pool of encroached subsegments. */
+-  poolinit(&m->badsubsegs, sizeof(struct badsubseg), BADSUBSEGPERBLOCK,
+-           BADSUBSEGPERBLOCK, 0);
+-  if (b->verbose) {
+-    printf("  Looking for encroached subsegments.\n");
+-  }
+-  /* Test all segments to see if they're encroached. */
+-  tallyencs(m, b);
+-  if (b->verbose && (m->badsubsegs.items > 0)) {
+-    printf("  Splitting encroached subsegments.\n");
+-  }
+-  /* Fix encroached subsegments without noting bad triangles. */
+-  splitencsegs(m, b, 0);
+-  /* At this point, if we haven't run out of Steiner points, the */
+-  /*   triangulation should be (conforming) Delaunay.            */
+-
+-  /* Next, we worry about enforcing triangle quality. */
+-  if ((b->minangle > 0.0) || b->vararea || b->fixedarea || b->usertest) {
+-    /* Initialize the pool of bad triangles. */
+-    poolinit(&m->badtriangles, sizeof(struct badtriang), BADTRIPERBLOCK,
+-             BADTRIPERBLOCK, 0);
+-    /* Initialize the queues of bad triangles. */
+-    for (i = 0; i < 4096; i++) {
+-      m->queuefront[i] = (struct badtriang *) NULL;
+-    }
+-    m->firstnonemptyq = -1;
+-    /* Test all triangles to see if they're bad. */
+-    tallyfaces(m, b);
+-    /* Initialize the pool of recently flipped triangles. */
+-    poolinit(&m->flipstackers, sizeof(struct flipstacker), FLIPSTACKERPERBLOCK,
+-             FLIPSTACKERPERBLOCK, 0);
+-    m->checkquality = 1;
+-    if (b->verbose) {
+-      printf("  Splitting bad triangles.\n");
+-    }
+-    while ((m->badtriangles.items > 0) && (m->steinerleft != 0)) {
+-      /* Fix one bad triangle by inserting a vertex at its circumcenter. */
+-      badtri = dequeuebadtriang(m);
+-      splittriangle(m, b, badtri);
+-      if (m->badsubsegs.items > 0) {
+-        /* Put bad triangle back in queue for another try later. */
+-        enqueuebadtriang(m, b, badtri);
+-        /* Fix any encroached subsegments that resulted. */
+-        /*   Record any new bad triangles that result.   */
+-        splitencsegs(m, b, 1);
+-      } else {
+-        /* Return the bad triangle to the pool. */
+-        pooldealloc(&m->badtriangles, (void *) badtri);
+-      }
+-    }
+-  }
+-  /* At this point, if the "-D" switch was selected and we haven't run out  */
+-  /*   of Steiner points, the triangulation should be (conforming) Delaunay */
+-  /*   and have no low-quality triangles.                                   */
+-
+-  /* Might we have run out of Steiner points too soon? */
+-  if (!b->quiet && b->conformdel && (m->badsubsegs.items > 0) &&
+-      (m->steinerleft == 0)) {
+-    printf("\nWarning:  I ran out of Steiner points, but the mesh has\n");
+-    if (m->badsubsegs.items == 1) {
+-      printf("  one encroached subsegment, and therefore might not be truly\n"
+-             );
+-    } else {
+-      printf("  %ld encroached subsegments, and therefore might not be truly\n"
+-             , m->badsubsegs.items);
+-    }
+-    printf("  Delaunay.  If the Delaunay property is important to you,\n");
+-    printf("  try increasing the number of Steiner points (controlled by\n");
+-    printf("  the -S switch) slightly and try again.\n\n");
+-  }
+-}
+-
+-#endif /* not CDT_ONLY */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* Mesh quality maintenance ends here                        *********/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  highorder()   Create extra nodes for quadratic subparametric elements.   */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void highorder(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void highorder(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri triangleloop, trisym;
+-  struct osub checkmark;
+-  vertex newvertex;
+-  vertex torg, tdest;
+-  int i;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-  if (!b->quiet) {
+-    printf("Adding vertices for second-order triangles.\n");
+-  }
+-  /* The following line ensures that dead items in the pool of nodes    */
+-  /*   cannot be allocated for the extra nodes associated with high     */
+-  /*   order elements.  This ensures that the primary nodes (at the     */
+-  /*   corners of elements) will occur earlier in the output files, and */
+-  /*   have lower indices, than the extra nodes.                        */
+-  m->vertices.deaditemstack = (void *) NULL;
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  /* To loop over the set of edges, loop over all triangles, and look at   */
+-  /*   the three edges of each triangle.  If there isn't another triangle  */
+-  /*   adjacent to the edge, operate on the edge.  If there is another     */
+-  /*   adjacent triangle, operate on the edge only if the current triangle */
+-  /*   has a smaller pointer than its neighbor.  This way, each edge is    */
+-  /*   considered only once.                                               */
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      sym(triangleloop, trisym);
+-      if ((triangleloop.tri < trisym.tri) || (trisym.tri == m->dummytri)) {
+-        org(triangleloop, torg);
+-        dest(triangleloop, tdest);
+-        /* Create a new node in the middle of the edge.  Interpolate */
+-        /*   its attributes.                                         */
+-        newvertex = (vertex) poolalloc(&m->vertices);
+-        for (i = 0; i < 2 + m->nextras; i++) {
+-          newvertex[i] = 0.5 * (torg[i] + tdest[i]);
+-        }
+-        /* Set the new node's marker to zero or one, depending on */
+-        /*   whether it lies on a boundary.                       */
+-        setvertexmark(newvertex, trisym.tri == m->dummytri);
+-        setvertextype(newvertex,
+-                      trisym.tri == m->dummytri ? FREEVERTEX : SEGMENTVERTEX);
+-        if (b->usesegments) {
+-          tspivot(triangleloop, checkmark);
+-          /* If this edge is a segment, transfer the marker to the new node. */
+-          if (checkmark.ss != m->dummysub) {
+-            setvertexmark(newvertex, mark(checkmark));
+-            setvertextype(newvertex, SEGMENTVERTEX);
+-          }
+-        }
+-        if (b->verbose > 1) {
+-          printf("  Creating (%.12g, %.12g).\n", newvertex[0], newvertex[1]);
+-        }
+-        /* Record the new node in the (one or two) adjacent elements. */
+-        triangleloop.tri[m->highorderindex + triangleloop.orient] =
+-                (triangle) newvertex;
+-        if (trisym.tri != m->dummytri) {
+-          trisym.tri[m->highorderindex + trisym.orient] = (triangle) newvertex;
+-        }
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-}
+-
+-/********* File I/O routines begin here                              *********/
+-/**                                                                         **/
+-/**                                                                         **/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  readline()   Read a nonempty line from a file.                           */
+-/*                                                                           */
+-/*  A line is considered "nonempty" if it contains something that looks like */
+-/*  a number.  Comments (prefaced by `#') are ignored.                       */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-char *readline(char *string, FILE *infile, char *infilename)
+-#else /* not ANSI_DECLARATORS */
+-char *readline(string, infile, infilename)
+-char *string;
+-FILE *infile;
+-char *infilename;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  char *result;
+-
+-  /* Search for something that looks like a number. */
+-  do {
+-    result = fgets(string, INPUTLINESIZE, infile);
+-    if (result == (char *) NULL) {
+-      printf("  Error:  Unexpected end of file in %s.\n", infilename);
+-      triexit(1);
+-    }
+-    /* Skip anything that doesn't look like a number, a comment, */
+-    /*   or the end of a line.                                   */
+-    while ((*result != '\0') && (*result != '#')
+-           && (*result != '.') && (*result != '+') && (*result != '-')
+-           && ((*result < '0') || (*result > '9'))) {
+-      result++;
+-    }
+-  /* If it's a comment or end of line, read another line and try again. */
+-  } while ((*result == '#') || (*result == '\0'));
+-  return result;
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  findfield()   Find the next field of a string.                           */
+-/*                                                                           */
+-/*  Jumps past the current field by searching for whitespace, then jumps     */
+-/*  past the whitespace to find the next field.                              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-char *findfield(char *string)
+-#else /* not ANSI_DECLARATORS */
+-char *findfield(string)
+-char *string;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  char *result;
+-
+-  result = string;
+-  /* Skip the current field.  Stop upon reaching whitespace. */
+-  while ((*result != '\0') && (*result != '#')
+-         && (*result != ' ') && (*result != '\t')) {
+-    result++;
+-  }
+-  /* Now skip the whitespace and anything else that doesn't look like a */
+-  /*   number, a comment, or the end of a line.                         */
+-  while ((*result != '\0') && (*result != '#')
+-         && (*result != '.') && (*result != '+') && (*result != '-')
+-         && ((*result < '0') || (*result > '9'))) {
+-    result++;
+-  }
+-  /* Check for a comment (prefixed with `#'). */
+-  if (*result == '#') {
+-    *result = '\0';
+-  }
+-  return result;
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  readnodes()   Read the vertices from a file, which may be a .node or     */
+-/*                .poly file.                                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void readnodes(struct mesh *m, struct behavior *b, char *nodefilename,
+-               char *polyfilename, FILE **polyfile)
+-#else /* not ANSI_DECLARATORS */
+-void readnodes(m, b, nodefilename, polyfilename, polyfile)
+-struct mesh *m;
+-struct behavior *b;
+-char *nodefilename;
+-char *polyfilename;
+-FILE **polyfile;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  FILE *infile;
+-  vertex vertexloop;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  char *infilename;
+-  REAL x, y;
+-  int firstnode;
+-  int nodemarkers;
+-  int currentmarker;
+-  int i, j;
+-
+-  if (b->poly) {
+-    /* Read the vertices from a .poly file. */
+-    if (!b->quiet) {
+-      printf("Opening %s.\n", polyfilename);
+-    }
+-    *polyfile = fopen(polyfilename, "r");
+-    if (*polyfile == (FILE *) NULL) {
+-      printf("  Error:  Cannot access file %s.\n", polyfilename);
+-      triexit(1);
+-    }
+-    /* Read number of vertices, number of dimensions, number of vertex */
+-    /*   attributes, and number of boundary markers.                   */
+-    stringptr = readline(inputline, *polyfile, polyfilename);
+-    m->invertices = (int) strtol(stringptr, &stringptr, 0);
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      m->mesh_dim = 2;
+-    } else {
+-      m->mesh_dim = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      m->nextras = 0;
+-    } else {
+-      m->nextras = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      nodemarkers = 0;
+-    } else {
+-      nodemarkers = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-    if (m->invertices > 0) {
+-      infile = *polyfile;
+-      infilename = polyfilename;
+-      m->readnodefile = 0;
+-    } else {
+-      /* If the .poly file claims there are zero vertices, that means that */
+-      /*   the vertices should be read from a separate .node file.         */
+-      m->readnodefile = 1;
+-      infilename = nodefilename;
+-    }
+-  } else {
+-    m->readnodefile = 1;
+-    infilename = nodefilename;
+-    *polyfile = (FILE *) NULL;
+-  }
+-
+-  if (m->readnodefile) {
+-    /* Read the vertices from a .node file. */
+-    if (!b->quiet) {
+-      printf("Opening %s.\n", nodefilename);
+-    }
+-    infile = fopen(nodefilename, "r");
+-    if (infile == (FILE *) NULL) {
+-      printf("  Error:  Cannot access file %s.\n", nodefilename);
+-      triexit(1);
+-    }
+-    /* Read number of vertices, number of dimensions, number of vertex */
+-    /*   attributes, and number of boundary markers.                   */
+-    stringptr = readline(inputline, infile, nodefilename);
+-    m->invertices = (int) strtol(stringptr, &stringptr, 0);
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      m->mesh_dim = 2;
+-    } else {
+-      m->mesh_dim = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      m->nextras = 0;
+-    } else {
+-      m->nextras = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      nodemarkers = 0;
+-    } else {
+-      nodemarkers = (int) strtol(stringptr, &stringptr, 0);
+-    }
+-  }
+-
+-  if (m->invertices < 3) {
+-    printf("Error:  Input must have at least three input vertices.\n");
+-    triexit(1);
+-  }
+-  if (m->mesh_dim != 2) {
+-    printf("Error:  Triangle only works with two-dimensional meshes.\n");
+-    triexit(1);
+-  }
+-  if (m->nextras == 0) {
+-    b->weighted = 0;
+-  }
+-
+-  initializevertexpool(m, b);
+-
+-  /* Read the vertices. */
+-  for (i = 0; i < m->invertices; i++) {
+-    vertexloop = (vertex) poolalloc(&m->vertices);
+-    stringptr = readline(inputline, infile, infilename);
+-    if (i == 0) {
+-      firstnode = (int) strtol(stringptr, &stringptr, 0);
+-      if ((firstnode == 0) || (firstnode == 1)) {
+-        b->firstnumber = firstnode;
+-      }
+-    }
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Vertex %d has no x coordinate.\n", b->firstnumber + i);
+-      triexit(1);
+-    }
+-    x = (REAL) strtod(stringptr, &stringptr);
+-    stringptr = findfield(stringptr);
+-    if (*stringptr == '\0') {
+-      printf("Error:  Vertex %d has no y coordinate.\n", b->firstnumber + i);
+-      triexit(1);
+-    }
+-    y = (REAL) strtod(stringptr, &stringptr);
+-    vertexloop[0] = x;
+-    vertexloop[1] = y;
+-    /* Read the vertex attributes. */
+-    for (j = 2; j < 2 + m->nextras; j++) {
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        vertexloop[j] = 0.0;
+-      } else {
+-        vertexloop[j] = (REAL) strtod(stringptr, &stringptr);
+-      }
+-    }
+-    if (nodemarkers) {
+-      /* Read a vertex marker. */
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        setvertexmark(vertexloop, 0);
+-      } else {
+-        currentmarker = (int) strtol(stringptr, &stringptr, 0);
+-        setvertexmark(vertexloop, currentmarker);
+-      }
+-    } else {
+-      /* If no markers are specified in the file, they default to zero. */
+-      setvertexmark(vertexloop, 0);
+-    }
+-    setvertextype(vertexloop, INPUTVERTEX);
+-    /* Determine the smallest and largest x and y coordinates. */
+-    if (i == 0) {
+-      m->xmin = m->xmax = x;
+-      m->ymin = m->ymax = y;
+-    } else {
+-      m->xmin = (x < m->xmin) ? x : m->xmin;
+-      m->xmax = (x > m->xmax) ? x : m->xmax;
+-      m->ymin = (y < m->ymin) ? y : m->ymin;
+-      m->ymax = (y > m->ymax) ? y : m->ymax;
+-    }
+-  }
+-  if (m->readnodefile) {
+-    fclose(infile);
+-  }
+-
+-  /* Nonexistent x value used as a flag to mark circle events in sweepline */
+-  /*   Delaunay algorithm.                                                 */
+-  m->xminextreme = 10 * m->xmin - 9 * m->xmax;
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  transfernodes()   Read the vertices from memory.                         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void transfernodes(struct mesh *m, struct behavior *b, REAL *pointlist,
+-                   REAL *pointattriblist, int *pointmarkerlist,
+-                   int numberofpoints, int numberofpointattribs)
+-#else /* not ANSI_DECLARATORS */
+-void transfernodes(m, b, pointlist, pointattriblist, pointmarkerlist,
+-                   numberofpoints, numberofpointattribs)
+-struct mesh *m;
+-struct behavior *b;
+-REAL *pointlist;
+-REAL *pointattriblist;
+-int *pointmarkerlist;
+-int numberofpoints;
+-int numberofpointattribs;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  vertex vertexloop;
+-  REAL x, y;
+-  int i, j;
+-  int coordindex;
+-  int attribindex;
+-
+-  m->invertices = numberofpoints;
+-  m->mesh_dim = 2;
+-  m->nextras = numberofpointattribs;
+-  m->readnodefile = 0;
+-  if (m->invertices < 3) {
+-    printf("Error:  Input must have at least three input vertices.\n");
+-    triexit(1);
+-  }
+-  if (m->nextras == 0) {
+-    b->weighted = 0;
+-  }
+-
+-  initializevertexpool(m, b);
+-
+-  /* Read the vertices. */
+-  coordindex = 0;
+-  attribindex = 0;
+-  for (i = 0; i < m->invertices; i++) {
+-    vertexloop = (vertex) poolalloc(&m->vertices);
+-    /* Read the vertex coordinates. */
+-    x = vertexloop[0] = pointlist[coordindex++];
+-    y = vertexloop[1] = pointlist[coordindex++];
+-    /* Read the vertex attributes. */
+-    for (j = 0; j < numberofpointattribs; j++) {
+-      vertexloop[2 + j] = pointattriblist[attribindex++];
+-    }
+-    if (pointmarkerlist != (int *) NULL) {
+-      /* Read a vertex marker. */
+-      setvertexmark(vertexloop, pointmarkerlist[i]);
+-    } else {
+-      /* If no markers are specified, they default to zero. */
+-      setvertexmark(vertexloop, 0);
+-    }
+-    setvertextype(vertexloop, INPUTVERTEX);
+-    /* Determine the smallest and largest x and y coordinates. */
+-    if (i == 0) {
+-      m->xmin = m->xmax = x;
+-      m->ymin = m->ymax = y;
+-    } else {
+-      m->xmin = (x < m->xmin) ? x : m->xmin;
+-      m->xmax = (x > m->xmax) ? x : m->xmax;
+-      m->ymin = (y < m->ymin) ? y : m->ymin;
+-      m->ymax = (y > m->ymax) ? y : m->ymax;
+-    }
+-  }
+-
+-  /* Nonexistent x value used as a flag to mark circle events in sweepline */
+-  /*   Delaunay algorithm.                                                 */
+-  m->xminextreme = 10 * m->xmin - 9 * m->xmax;
+-}
+-
+-#endif /* TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  readholes()   Read the holes, and possibly regional attributes and area  */
+-/*                constraints, from a .poly file.                            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void readholes(struct mesh *m, struct behavior *b,
+-               FILE *polyfile, char *polyfilename, REAL **hlist, int *holes,
+-               REAL **rlist, int *regions)
+-#else /* not ANSI_DECLARATORS */
+-void readholes(m, b, polyfile, polyfilename, hlist, holes, rlist, regions)
+-struct mesh *m;
+-struct behavior *b;
+-FILE *polyfile;
+-char *polyfilename;
+-REAL **hlist;
+-int *holes;
+-REAL **rlist;
+-int *regions;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  REAL *holelist;
+-  REAL *regionlist;
+-  char inputline[INPUTLINESIZE];
+-  char *stringptr;
+-  int index;
+-  int i;
+-
+-  /* Read the holes. */
+-  stringptr = readline(inputline, polyfile, polyfilename);
+-  *holes = (int) strtol(stringptr, &stringptr, 0);
+-  if (*holes > 0) {
+-    holelist = (REAL *) trimalloc(2 * *holes * (int) sizeof(REAL));
+-    *hlist = holelist;
+-    for (i = 0; i < 2 * *holes; i += 2) {
+-      stringptr = readline(inputline, polyfile, polyfilename);
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Hole %d has no x coordinate.\n",
+-               b->firstnumber + (i >> 1));
+-        triexit(1);
+-      } else {
+-        holelist[i] = (REAL) strtod(stringptr, &stringptr);
+-      }
+-      stringptr = findfield(stringptr);
+-      if (*stringptr == '\0') {
+-        printf("Error:  Hole %d has no y coordinate.\n",
+-               b->firstnumber + (i >> 1));
+-        triexit(1);
+-      } else {
+-        holelist[i + 1] = (REAL) strtod(stringptr, &stringptr);
+-      }
+-    }
+-  } else {
+-    *hlist = (REAL *) NULL;
+-  }
+-
+-#ifndef CDT_ONLY
+-  if ((b->regionattrib || b->vararea) && !b->refine) {
+-    /* Read the area constraints. */
+-    stringptr = readline(inputline, polyfile, polyfilename);
+-    *regions = (int) strtol(stringptr, &stringptr, 0);
+-    if (*regions > 0) {
+-      regionlist = (REAL *) trimalloc(4 * *regions * (int) sizeof(REAL));
+-      *rlist = regionlist;
+-      index = 0;
+-      for (i = 0; i < *regions; i++) {
+-        stringptr = readline(inputline, polyfile, polyfilename);
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          printf("Error:  Region %d has no x coordinate.\n",
+-                 b->firstnumber + i);
+-          triexit(1);
+-        } else {
+-          regionlist[index++] = (REAL) strtod(stringptr, &stringptr);
+-        }
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          printf("Error:  Region %d has no y coordinate.\n",
+-                 b->firstnumber + i);
+-          triexit(1);
+-        } else {
+-          regionlist[index++] = (REAL) strtod(stringptr, &stringptr);
+-        }
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          printf(
+-            "Error:  Region %d has no region attribute or area constraint.\n",
+-                 b->firstnumber + i);
+-          triexit(1);
+-        } else {
+-          regionlist[index++] = (REAL) strtod(stringptr, &stringptr);
+-        }
+-        stringptr = findfield(stringptr);
+-        if (*stringptr == '\0') {
+-          regionlist[index] = regionlist[index - 1];
+-        } else {
+-          regionlist[index] = (REAL) strtod(stringptr, &stringptr);
+-        }
+-        index++;
+-      }
+-    }
+-  } else {
+-    /* Set `*regions' to zero to avoid an accidental free() later. */
+-    *regions = 0;
+-    *rlist = (REAL *) NULL;
+-  }
+-#endif /* not CDT_ONLY */
+-
+-  fclose(polyfile);
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  finishfile()   Write the command line to the output file so the user     */
+-/*                 can remember how the file was generated.  Close the file. */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void finishfile(FILE *outfile, int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void finishfile(outfile, argc, argv)
+-FILE *outfile;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  int i;
+-
+-  fprintf(outfile, "# Generated by");
+-  for (i = 0; i < argc; i++) {
+-    fprintf(outfile, " ");
+-    fputs(argv[i], outfile);
+-  }
+-  fprintf(outfile, "\n");
+-  fclose(outfile);
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  writenodes()   Number the vertices and write them to a .node file.       */
+-/*                                                                           */
+-/*  To save memory, the vertex numbers are written over the boundary markers */
+-/*  after the vertices are written to a file.                                */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writenodes(struct mesh *m, struct behavior *b, REAL **pointlist,
+-                REAL **pointattriblist, int **pointmarkerlist)
+-#else /* not ANSI_DECLARATORS */
+-void writenodes(m, b, pointlist, pointattriblist, pointmarkerlist)
+-struct mesh *m;
+-struct behavior *b;
+-REAL **pointlist;
+-REAL **pointattriblist;
+-int **pointmarkerlist;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void writenodes(struct mesh *m, struct behavior *b, char *nodefilename,
+-                int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writenodes(m, b, nodefilename, argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *nodefilename;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  REAL *plist;
+-  REAL *palist;
+-  int *pmlist;
+-  int coordindex;
+-  int attribindex;
+-#else /* not TRILIBRARY */
+-  FILE *outfile;
+-#endif /* not TRILIBRARY */
+-  vertex vertexloop;
+-  long outvertices;
+-  int vertexnumber;
+-  int i;
+-
+-  if (b->jettison) {
+-    outvertices = m->vertices.items - m->undeads;
+-  } else {
+-    outvertices = m->vertices.items;
+-  }
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing vertices.\n");
+-  }
+-  /* Allocate memory for output vertices if necessary. */
+-  if (*pointlist == (REAL *) NULL) {
+-    *pointlist = (REAL *) trimalloc((int) (outvertices * 2 * sizeof(REAL)));
+-  }
+-  /* Allocate memory for output vertex attributes if necessary. */
+-  if ((m->nextras > 0) && (*pointattriblist == (REAL *) NULL)) {
+-    *pointattriblist = (REAL *) trimalloc((int) (outvertices * m->nextras *
+-                                                 sizeof(REAL)));
+-  }
+-  /* Allocate memory for output vertex markers if necessary. */
+-  if (!b->nobound && (*pointmarkerlist == (int *) NULL)) {
+-    *pointmarkerlist = (int *) trimalloc((int) (outvertices * sizeof(int)));
+-  }
+-  plist = *pointlist;
+-  palist = *pointattriblist;
+-  pmlist = *pointmarkerlist;
+-  coordindex = 0;
+-  attribindex = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", nodefilename);
+-  }
+-  outfile = fopen(nodefilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", nodefilename);
+-    triexit(1);
+-  }
+-  /* Number of vertices, number of dimensions, number of vertex attributes, */
+-  /*   and number of boundary markers (zero or one).                        */
+-  fprintf(outfile, "%ld  %d  %d  %d\n", outvertices, m->mesh_dim,
+-          m->nextras, 1 - b->nobound);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->vertices);
+-  vertexnumber = b->firstnumber;
+-  vertexloop = vertextraverse(m);
+-  while (vertexloop != (vertex) NULL) {
+-    if (!b->jettison || (vertextype(vertexloop) != UNDEADVERTEX)) {
+-#ifdef TRILIBRARY
+-      /* X and y coordinates. */
+-      plist[coordindex++] = vertexloop[0];
+-      plist[coordindex++] = vertexloop[1];
+-      /* Vertex attributes. */
+-      for (i = 0; i < m->nextras; i++) {
+-        palist[attribindex++] = vertexloop[2 + i];
+-      }
+-      if (!b->nobound) {
+-        /* Copy the boundary marker. */
+-        pmlist[vertexnumber - b->firstnumber] = vertexmark(vertexloop);
+-      }
+-#else /* not TRILIBRARY */
+-      /* Vertex number, x and y coordinates. */
+-      fprintf(outfile, "%4d    %.17g  %.17g", vertexnumber, vertexloop[0],
+-              vertexloop[1]);
+-      for (i = 0; i < m->nextras; i++) {
+-        /* Write an attribute. */
+-        fprintf(outfile, "  %.17g", vertexloop[i + 2]);
+-      }
+-      if (b->nobound) {
+-        fprintf(outfile, "\n");
+-      } else {
+-        /* Write the boundary marker. */
+-        fprintf(outfile, "    %d\n", vertexmark(vertexloop));
+-      }
+-#endif /* not TRILIBRARY */
+-
+-      setvertexmark(vertexloop, vertexnumber);
+-      vertexnumber++;
+-    }
+-    vertexloop = vertextraverse(m);
+-  }
+-
+-#ifndef TRILIBRARY
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  numbernodes()   Number the vertices.                                     */
+-/*                                                                           */
+-/*  Each vertex is assigned a marker equal to its number.                    */
+-/*                                                                           */
+-/*  Used when writenodes() is not called because no .node file is written.   */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void numbernodes(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void numbernodes(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  vertex vertexloop;
+-  int vertexnumber;
+-
+-  traversalinit(&m->vertices);
+-  vertexnumber = b->firstnumber;
+-  vertexloop = vertextraverse(m);
+-  while (vertexloop != (vertex) NULL) {
+-    setvertexmark(vertexloop, vertexnumber);
+-    if (!b->jettison || (vertextype(vertexloop) != UNDEADVERTEX)) {
+-      vertexnumber++;
+-    }
+-    vertexloop = vertextraverse(m);
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  writeelements()   Write the triangles to an .ele file.                   */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writeelements(struct mesh *m, struct behavior *b,
+-                   int **trianglelist, REAL **triangleattriblist)
+-#else /* not ANSI_DECLARATORS */
+-void writeelements(m, b, trianglelist, triangleattriblist)
+-struct mesh *m;
+-struct behavior *b;
+-int **trianglelist;
+-REAL **triangleattriblist;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void writeelements(struct mesh *m, struct behavior *b, char *elefilename,
+-                   int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writeelements(m, b, elefilename, argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *elefilename;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  int *tlist;
+-  REAL *talist;
+-  int vertexindex;
+-  int attribindex;
+-#else /* not TRILIBRARY */
+-  FILE *outfile;
+-#endif /* not TRILIBRARY */
+-  struct otri triangleloop;
+-  vertex p1, p2, p3;
+-  vertex mid1, mid2, mid3;
+-  long elementnumber;
+-  int i;
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing triangles.\n");
+-  }
+-  /* Allocate memory for output triangles if necessary. */
+-  if (*trianglelist == (int *) NULL) {
+-    *trianglelist = (int *) trimalloc((int) (m->triangles.items *
+-                                             ((b->order + 1) * (b->order + 2) /
+-                                              2) * sizeof(int)));
+-  }
+-  /* Allocate memory for output triangle attributes if necessary. */
+-  if ((m->eextras > 0) && (*triangleattriblist == (REAL *) NULL)) {
+-    *triangleattriblist = (REAL *) trimalloc((int) (m->triangles.items *
+-                                                    m->eextras *
+-                                                    sizeof(REAL)));
+-  }
+-  tlist = *trianglelist;
+-  talist = *triangleattriblist;
+-  vertexindex = 0;
+-  attribindex = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", elefilename);
+-  }
+-  outfile = fopen(elefilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", elefilename);
+-    triexit(1);
+-  }
+-  /* Number of triangles, vertices per triangle, attributes per triangle. */
+-  fprintf(outfile, "%ld  %d  %d\n", m->triangles.items,
+-          (b->order + 1) * (b->order + 2) / 2, m->eextras);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  triangleloop.orient = 0;
+-  elementnumber = b->firstnumber;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    org(triangleloop, p1);
+-    dest(triangleloop, p2);
+-    apex(triangleloop, p3);
+-    if (b->order == 1) {
+-#ifdef TRILIBRARY
+-      tlist[vertexindex++] = vertexmark(p1);
+-      tlist[vertexindex++] = vertexmark(p2);
+-      tlist[vertexindex++] = vertexmark(p3);
+-#else /* not TRILIBRARY */
+-      /* Triangle number, indices for three vertices. */
+-      fprintf(outfile, "%4ld    %4d  %4d  %4d", elementnumber,
+-              vertexmark(p1), vertexmark(p2), vertexmark(p3));
+-#endif /* not TRILIBRARY */
+-    } else {
+-      mid1 = (vertex) triangleloop.tri[m->highorderindex + 1];
+-      mid2 = (vertex) triangleloop.tri[m->highorderindex + 2];
+-      mid3 = (vertex) triangleloop.tri[m->highorderindex];
+-#ifdef TRILIBRARY
+-      tlist[vertexindex++] = vertexmark(p1);
+-      tlist[vertexindex++] = vertexmark(p2);
+-      tlist[vertexindex++] = vertexmark(p3);
+-      tlist[vertexindex++] = vertexmark(mid1);
+-      tlist[vertexindex++] = vertexmark(mid2);
+-      tlist[vertexindex++] = vertexmark(mid3);
+-#else /* not TRILIBRARY */
+-      /* Triangle number, indices for six vertices. */
+-      fprintf(outfile, "%4ld    %4d  %4d  %4d  %4d  %4d  %4d", elementnumber,
+-              vertexmark(p1), vertexmark(p2), vertexmark(p3), vertexmark(mid1),
+-              vertexmark(mid2), vertexmark(mid3));
+-#endif /* not TRILIBRARY */
+-    }
+-
+-#ifdef TRILIBRARY
+-    for (i = 0; i < m->eextras; i++) {
+-      talist[attribindex++] = elemattribute(triangleloop, i);
+-    }
+-#else /* not TRILIBRARY */
+-    for (i = 0; i < m->eextras; i++) {
+-      fprintf(outfile, "  %.17g", elemattribute(triangleloop, i));
+-    }
+-    fprintf(outfile, "\n");
+-#endif /* not TRILIBRARY */
+-
+-    triangleloop.tri = triangletraverse(m);
+-    elementnumber++;
+-  }
+-
+-#ifndef TRILIBRARY
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  writepoly()   Write the segments and holes to a .poly file.              */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writepoly(struct mesh *m, struct behavior *b,
+-               int **segmentlist, int **segmentmarkerlist)
+-#else /* not ANSI_DECLARATORS */
+-void writepoly(m, b, segmentlist, segmentmarkerlist)
+-struct mesh *m;
+-struct behavior *b;
+-int **segmentlist;
+-int **segmentmarkerlist;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void writepoly(struct mesh *m, struct behavior *b, char *polyfilename,
+-               REAL *holelist, int holes, REAL *regionlist, int regions,
+-               int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writepoly(m, b, polyfilename, holelist, holes, regionlist, regions,
+-               argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *polyfilename;
+-REAL *holelist;
+-int holes;
+-REAL *regionlist;
+-int regions;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  int *slist;
+-  int *smlist;
+-  int index;
+-#else /* not TRILIBRARY */
+-  FILE *outfile;
+-  long holenumber, regionnumber;
+-#endif /* not TRILIBRARY */
+-  struct osub subsegloop;
+-  vertex endpoint1, endpoint2;
+-  long subsegnumber;
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing segments.\n");
+-  }
+-  /* Allocate memory for output segments if necessary. */
+-  if (*segmentlist == (int *) NULL) {
+-    *segmentlist = (int *) trimalloc((int) (m->subsegs.items * 2 *
+-                                            sizeof(int)));
+-  }
+-  /* Allocate memory for output segment markers if necessary. */
+-  if (!b->nobound && (*segmentmarkerlist == (int *) NULL)) {
+-    *segmentmarkerlist = (int *) trimalloc((int) (m->subsegs.items *
+-                                                  sizeof(int)));
+-  }
+-  slist = *segmentlist;
+-  smlist = *segmentmarkerlist;
+-  index = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", polyfilename);
+-  }
+-  outfile = fopen(polyfilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", polyfilename);
+-    triexit(1);
+-  }
+-  /* The zero indicates that the vertices are in a separate .node file. */
+-  /*   Followed by number of dimensions, number of vertex attributes,   */
+-  /*   and number of boundary markers (zero or one).                    */
+-  fprintf(outfile, "%d  %d  %d  %d\n", 0, m->mesh_dim, m->nextras,
+-          1 - b->nobound);
+-  /* Number of segments, number of boundary markers (zero or one). */
+-  fprintf(outfile, "%ld  %d\n", m->subsegs.items, 1 - b->nobound);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->subsegs);
+-  subsegloop.ss = subsegtraverse(m);
+-  subsegloop.ssorient = 0;
+-  subsegnumber = b->firstnumber;
+-  while (subsegloop.ss != (subseg *) NULL) {
+-    sorg(subsegloop, endpoint1);
+-    sdest(subsegloop, endpoint2);
+-#ifdef TRILIBRARY
+-    /* Copy indices of the segment's two endpoints. */
+-    slist[index++] = vertexmark(endpoint1);
+-    slist[index++] = vertexmark(endpoint2);
+-    if (!b->nobound) {
+-      /* Copy the boundary marker. */
+-      smlist[subsegnumber - b->firstnumber] = mark(subsegloop);
+-    }
+-#else /* not TRILIBRARY */
+-    /* Segment number, indices of its two endpoints, and possibly a marker. */
+-    if (b->nobound) {
+-      fprintf(outfile, "%4ld    %4d  %4d\n", subsegnumber,
+-              vertexmark(endpoint1), vertexmark(endpoint2));
+-    } else {
+-      fprintf(outfile, "%4ld    %4d  %4d    %4d\n", subsegnumber,
+-              vertexmark(endpoint1), vertexmark(endpoint2), mark(subsegloop));
+-    }
+-#endif /* not TRILIBRARY */
+-
+-    subsegloop.ss = subsegtraverse(m);
+-    subsegnumber++;
+-  }
+-
+-#ifndef TRILIBRARY
+-#ifndef CDT_ONLY
+-  fprintf(outfile, "%d\n", holes);
+-  if (holes > 0) {
+-    for (holenumber = 0; holenumber < holes; holenumber++) {
+-      /* Hole number, x and y coordinates. */
+-      fprintf(outfile, "%4ld   %.17g  %.17g\n", b->firstnumber + holenumber,
+-              holelist[2 * holenumber], holelist[2 * holenumber + 1]);
+-    }
+-  }
+-  if (regions > 0) {
+-    fprintf(outfile, "%d\n", regions);
+-    for (regionnumber = 0; regionnumber < regions; regionnumber++) {
+-      /* Region number, x and y coordinates, attribute, maximum area. */
+-      fprintf(outfile, "%4ld   %.17g  %.17g  %.17g  %.17g\n",
+-              b->firstnumber + regionnumber,
+-              regionlist[4 * regionnumber], regionlist[4 * regionnumber + 1],
+-              regionlist[4 * regionnumber + 2],
+-              regionlist[4 * regionnumber + 3]);
+-    }
+-  }
+-#endif /* not CDT_ONLY */
+-
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  writeedges()   Write the edges to an .edge file.                         */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writeedges(struct mesh *m, struct behavior *b,
+-                int **edgelist, int **edgemarkerlist)
+-#else /* not ANSI_DECLARATORS */
+-void writeedges(m, b, edgelist, edgemarkerlist)
+-struct mesh *m;
+-struct behavior *b;
+-int **edgelist;
+-int **edgemarkerlist;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void writeedges(struct mesh *m, struct behavior *b, char *edgefilename,
+-                int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writeedges(m, b, edgefilename, argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *edgefilename;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  int *elist;
+-  int *emlist;
+-  int index;
+-#else /* not TRILIBRARY */
+-  FILE *outfile;
+-#endif /* not TRILIBRARY */
+-  struct otri triangleloop, trisym;
+-  struct osub checkmark;
+-  vertex p1, p2;
+-  long edgenumber;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-  subseg sptr;                      /* Temporary variable used by tspivot(). */
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing edges.\n");
+-  }
+-  /* Allocate memory for edges if necessary. */
+-  if (*edgelist == (int *) NULL) {
+-    *edgelist = (int *) trimalloc((int) (m->edges * 2 * sizeof(int)));
+-  }
+-  /* Allocate memory for edge markers if necessary. */
+-  if (!b->nobound && (*edgemarkerlist == (int *) NULL)) {
+-    *edgemarkerlist = (int *) trimalloc((int) (m->edges * sizeof(int)));
+-  }
+-  elist = *edgelist;
+-  emlist = *edgemarkerlist;
+-  index = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", edgefilename);
+-  }
+-  outfile = fopen(edgefilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", edgefilename);
+-    triexit(1);
+-  }
+-  /* Number of edges, number of boundary markers (zero or one). */
+-  fprintf(outfile, "%ld  %d\n", m->edges, 1 - b->nobound);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  edgenumber = b->firstnumber;
+-  /* To loop over the set of edges, loop over all triangles, and look at   */
+-  /*   the three edges of each triangle.  If there isn't another triangle  */
+-  /*   adjacent to the edge, operate on the edge.  If there is another     */
+-  /*   adjacent triangle, operate on the edge only if the current triangle */
+-  /*   has a smaller pointer than its neighbor.  This way, each edge is    */
+-  /*   considered only once.                                               */
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      sym(triangleloop, trisym);
+-      if ((triangleloop.tri < trisym.tri) || (trisym.tri == m->dummytri)) {
+-        org(triangleloop, p1);
+-        dest(triangleloop, p2);
+-#ifdef TRILIBRARY
+-        elist[index++] = vertexmark(p1);
+-        elist[index++] = vertexmark(p2);
+-#endif /* TRILIBRARY */
+-        if (b->nobound) {
+-#ifndef TRILIBRARY
+-          /* Edge number, indices of two endpoints. */
+-          fprintf(outfile, "%4ld   %d  %d\n", edgenumber,
+-                  vertexmark(p1), vertexmark(p2));
+-#endif /* not TRILIBRARY */
+-        } else {
+-          /* Edge number, indices of two endpoints, and a boundary marker. */
+-          /*   If there's no subsegment, the boundary marker is zero.      */
+-          if (b->usesegments) {
+-            tspivot(triangleloop, checkmark);
+-            if (checkmark.ss == m->dummysub) {
+-#ifdef TRILIBRARY
+-              emlist[edgenumber - b->firstnumber] = 0;
+-#else /* not TRILIBRARY */
+-              fprintf(outfile, "%4ld   %d  %d  %d\n", edgenumber,
+-                      vertexmark(p1), vertexmark(p2), 0);
+-#endif /* not TRILIBRARY */
+-            } else {
+-#ifdef TRILIBRARY
+-              emlist[edgenumber - b->firstnumber] = mark(checkmark);
+-#else /* not TRILIBRARY */
+-              fprintf(outfile, "%4ld   %d  %d  %d\n", edgenumber,
+-                      vertexmark(p1), vertexmark(p2), mark(checkmark));
+-#endif /* not TRILIBRARY */
+-            }
+-          } else {
+-#ifdef TRILIBRARY
+-            emlist[edgenumber - b->firstnumber] = trisym.tri == m->dummytri;
+-#else /* not TRILIBRARY */
+-            fprintf(outfile, "%4ld   %d  %d  %d\n", edgenumber,
+-                    vertexmark(p1), vertexmark(p2), trisym.tri == m->dummytri);
+-#endif /* not TRILIBRARY */
+-          }
+-        }
+-        edgenumber++;
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-
+-#ifndef TRILIBRARY
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  writevoronoi()   Write the Voronoi diagram to a .v.node and .v.edge      */
+-/*                   file.                                                   */
+-/*                                                                           */
+-/*  The Voronoi diagram is the geometric dual of the Delaunay triangulation. */
+-/*  Hence, the Voronoi vertices are listed by traversing the Delaunay        */
+-/*  triangles, and the Voronoi edges are listed by traversing the Delaunay   */
+-/*  edges.                                                                   */
+-/*                                                                           */
+-/*  WARNING:  In order to assign numbers to the Voronoi vertices, this       */
+-/*  procedure messes up the subsegments or the extra nodes of every          */
+-/*  element.  Hence, you should call this procedure last.                    */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writevoronoi(struct mesh *m, struct behavior *b, REAL **vpointlist,
+-                  REAL **vpointattriblist, int **vpointmarkerlist,
+-                  int **vedgelist, int **vedgemarkerlist, REAL **vnormlist)
+-#else /* not ANSI_DECLARATORS */
+-void writevoronoi(m, b, vpointlist, vpointattriblist, vpointmarkerlist,
+-                  vedgelist, vedgemarkerlist, vnormlist)
+-struct mesh *m;
+-struct behavior *b;
+-REAL **vpointlist;
+-REAL **vpointattriblist;
+-int **vpointmarkerlist;
+-int **vedgelist;
+-int **vedgemarkerlist;
+-REAL **vnormlist;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void writevoronoi(struct mesh *m, struct behavior *b, char *vnodefilename,
+-                  char *vedgefilename, int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writevoronoi(m, b, vnodefilename, vedgefilename, argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *vnodefilename;
+-char *vedgefilename;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  REAL *plist;
+-  REAL *palist;
+-  int *elist;
+-  REAL *normlist;
+-  int coordindex;
+-  int attribindex;
+-#else /* not TRILIBRARY */
+-  FILE *outfile;
+-#endif /* not TRILIBRARY */
+-  struct otri triangleloop, trisym;
+-  vertex torg, tdest, tapex;
+-  REAL circumcenter[2];
+-  REAL xi, eta;
+-  long vnodenumber, vedgenumber;
+-  int p1, p2;
+-  int i;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing Voronoi vertices.\n");
+-  }
+-  /* Allocate memory for Voronoi vertices if necessary. */
+-  if (*vpointlist == (REAL *) NULL) {
+-    *vpointlist = (REAL *) trimalloc((int) (m->triangles.items * 2 *
+-                                            sizeof(REAL)));
+-  }
+-  /* Allocate memory for Voronoi vertex attributes if necessary. */
+-  if (*vpointattriblist == (REAL *) NULL) {
+-    *vpointattriblist = (REAL *) trimalloc((int) (m->triangles.items *
+-                                                  m->nextras * sizeof(REAL)));
+-  }
+-  *vpointmarkerlist = (int *) NULL;
+-  plist = *vpointlist;
+-  palist = *vpointattriblist;
+-  coordindex = 0;
+-  attribindex = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", vnodefilename);
+-  }
+-  outfile = fopen(vnodefilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", vnodefilename);
+-    triexit(1);
+-  }
+-  /* Number of triangles, two dimensions, number of vertex attributes, */
+-  /*   no markers.                                                     */
+-  fprintf(outfile, "%ld  %d  %d  %d\n", m->triangles.items, 2, m->nextras, 0);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  triangleloop.orient = 0;
+-  vnodenumber = b->firstnumber;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    org(triangleloop, torg);
+-    dest(triangleloop, tdest);
+-    apex(triangleloop, tapex);
+-    findcircumcenter(m, b, torg, tdest, tapex, circumcenter, &xi, &eta, 0);
+-#ifdef TRILIBRARY
+-    /* X and y coordinates. */
+-    plist[coordindex++] = circumcenter[0];
+-    plist[coordindex++] = circumcenter[1];
+-    for (i = 2; i < 2 + m->nextras; i++) {
+-      /* Interpolate the vertex attributes at the circumcenter. */
+-      palist[attribindex++] = torg[i] + xi * (tdest[i] - torg[i])
+-                                     + eta * (tapex[i] - torg[i]);
+-    }
+-#else /* not TRILIBRARY */
+-    /* Voronoi vertex number, x and y coordinates. */
+-    fprintf(outfile, "%4ld    %.17g  %.17g", vnodenumber, circumcenter[0],
+-            circumcenter[1]);
+-    for (i = 2; i < 2 + m->nextras; i++) {
+-      /* Interpolate the vertex attributes at the circumcenter. */
+-      fprintf(outfile, "  %.17g", torg[i] + xi * (tdest[i] - torg[i])
+-                                         + eta * (tapex[i] - torg[i]));
+-    }
+-    fprintf(outfile, "\n");
+-#endif /* not TRILIBRARY */
+-
+-    * (int *) (triangleloop.tri + 6) = (int) vnodenumber;
+-    triangleloop.tri = triangletraverse(m);
+-    vnodenumber++;
+-  }
+-
+-#ifndef TRILIBRARY
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing Voronoi edges.\n");
+-  }
+-  /* Allocate memory for output Voronoi edges if necessary. */
+-  if (*vedgelist == (int *) NULL) {
+-    *vedgelist = (int *) trimalloc((int) (m->edges * 2 * sizeof(int)));
+-  }
+-  *vedgemarkerlist = (int *) NULL;
+-  /* Allocate memory for output Voronoi norms if necessary. */
+-  if (*vnormlist == (REAL *) NULL) {
+-    *vnormlist = (REAL *) trimalloc((int) (m->edges * 2 * sizeof(REAL)));
+-  }
+-  elist = *vedgelist;
+-  normlist = *vnormlist;
+-  coordindex = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", vedgefilename);
+-  }
+-  outfile = fopen(vedgefilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", vedgefilename);
+-    triexit(1);
+-  }
+-  /* Number of edges, zero boundary markers. */
+-  fprintf(outfile, "%ld  %d\n", m->edges, 0);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  vedgenumber = b->firstnumber;
+-  /* To loop over the set of edges, loop over all triangles, and look at   */
+-  /*   the three edges of each triangle.  If there isn't another triangle  */
+-  /*   adjacent to the edge, operate on the edge.  If there is another     */
+-  /*   adjacent triangle, operate on the edge only if the current triangle */
+-  /*   has a smaller pointer than its neighbor.  This way, each edge is    */
+-  /*   considered only once.                                               */
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    for (triangleloop.orient = 0; triangleloop.orient < 3;
+-         triangleloop.orient++) {
+-      sym(triangleloop, trisym);
+-      if ((triangleloop.tri < trisym.tri) || (trisym.tri == m->dummytri)) {
+-        /* Find the number of this triangle (and Voronoi vertex). */
+-        p1 = * (int *) (triangleloop.tri + 6);
+-        if (trisym.tri == m->dummytri) {
+-          org(triangleloop, torg);
+-          dest(triangleloop, tdest);
+-#ifdef TRILIBRARY
+-          /* Copy an infinite ray.  Index of one endpoint, and -1. */
+-          elist[coordindex] = p1;
+-          normlist[coordindex++] = tdest[1] - torg[1];
+-          elist[coordindex] = -1;
+-          normlist[coordindex++] = torg[0] - tdest[0];
+-#else /* not TRILIBRARY */
+-          /* Write an infinite ray.  Edge number, index of one endpoint, -1, */
+-          /*   and x and y coordinates of a vector representing the          */
+-          /*   direction of the ray.                                         */
+-          fprintf(outfile, "%4ld   %d  %d   %.17g  %.17g\n", vedgenumber,
+-                  p1, -1, tdest[1] - torg[1], torg[0] - tdest[0]);
+-#endif /* not TRILIBRARY */
+-        } else {
+-          /* Find the number of the adjacent triangle (and Voronoi vertex). */
+-          p2 = * (int *) (trisym.tri + 6);
+-          /* Finite edge.  Write indices of two endpoints. */
+-#ifdef TRILIBRARY
+-          elist[coordindex] = p1;
+-          normlist[coordindex++] = 0.0;
+-          elist[coordindex] = p2;
+-          normlist[coordindex++] = 0.0;
+-#else /* not TRILIBRARY */
+-          fprintf(outfile, "%4ld   %d  %d\n", vedgenumber, p1, p2);
+-#endif /* not TRILIBRARY */
+-        }
+-        vedgenumber++;
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-
+-#ifndef TRILIBRARY
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-}
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writeneighbors(struct mesh *m, struct behavior *b, int **neighborlist)
+-#else /* not ANSI_DECLARATORS */
+-void writeneighbors(m, b, neighborlist)
+-struct mesh *m;
+-struct behavior *b;
+-int **neighborlist;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-void writeneighbors(struct mesh *m, struct behavior *b, char *neighborfilename,
+-                    int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writeneighbors(m, b, neighborfilename, argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *neighborfilename;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-#ifdef TRILIBRARY
+-  int *nlist;
+-  int index;
+-#else /* not TRILIBRARY */
+-  FILE *outfile;
+-#endif /* not TRILIBRARY */
+-  struct otri triangleloop, trisym;
+-  long elementnumber;
+-  int neighbor1, neighbor2, neighbor3;
+-  triangle ptr;                         /* Temporary variable used by sym(). */
+-
+-#ifdef TRILIBRARY
+-  if (!b->quiet) {
+-    printf("Writing neighbors.\n");
+-  }
+-  /* Allocate memory for neighbors if necessary. */
+-  if (*neighborlist == (int *) NULL) {
+-    *neighborlist = (int *) trimalloc((int) (m->triangles.items * 3 *
+-                                             sizeof(int)));
+-  }
+-  nlist = *neighborlist;
+-  index = 0;
+-#else /* not TRILIBRARY */
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", neighborfilename);
+-  }
+-  outfile = fopen(neighborfilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", neighborfilename);
+-    triexit(1);
+-  }
+-  /* Number of triangles, three neighbors per triangle. */
+-  fprintf(outfile, "%ld  %d\n", m->triangles.items, 3);
+-#endif /* not TRILIBRARY */
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  triangleloop.orient = 0;
+-  elementnumber = b->firstnumber;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    * (int *) (triangleloop.tri + 6) = (int) elementnumber;
+-    triangleloop.tri = triangletraverse(m);
+-    elementnumber++;
+-  }
+-  * (int *) (m->dummytri + 6) = -1;
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  elementnumber = b->firstnumber;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    triangleloop.orient = 1;
+-    sym(triangleloop, trisym);
+-    neighbor1 = * (int *) (trisym.tri + 6);
+-    triangleloop.orient = 2;
+-    sym(triangleloop, trisym);
+-    neighbor2 = * (int *) (trisym.tri + 6);
+-    triangleloop.orient = 0;
+-    sym(triangleloop, trisym);
+-    neighbor3 = * (int *) (trisym.tri + 6);
+-#ifdef TRILIBRARY
+-    nlist[index++] = neighbor1;
+-    nlist[index++] = neighbor2;
+-    nlist[index++] = neighbor3;
+-#else /* not TRILIBRARY */
+-    /* Triangle number, neighboring triangle numbers. */
+-    fprintf(outfile, "%4ld    %d  %d  %d\n", elementnumber,
+-            neighbor1, neighbor2, neighbor3);
+-#endif /* not TRILIBRARY */
+-
+-    triangleloop.tri = triangletraverse(m);
+-    elementnumber++;
+-  }
+-
+-#ifndef TRILIBRARY
+-  finishfile(outfile, argc, argv);
+-#endif /* not TRILIBRARY */
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  writeoff()   Write the triangulation to an .off file.                    */
+-/*                                                                           */
+-/*  OFF stands for the Object File Format, a format used by the Geometry     */
+-/*  Center's Geomview package.                                               */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifndef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void writeoff(struct mesh *m, struct behavior *b, char *offfilename,
+-              int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-void writeoff(m, b, offfilename, argc, argv)
+-struct mesh *m;
+-struct behavior *b;
+-char *offfilename;
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  FILE *outfile;
+-  struct otri triangleloop;
+-  vertex vertexloop;
+-  vertex p1, p2, p3;
+-  long outvertices;
+-
+-  if (!b->quiet) {
+-    printf("Writing %s.\n", offfilename);
+-  }
+-
+-  if (b->jettison) {
+-    outvertices = m->vertices.items - m->undeads;
+-  } else {
+-    outvertices = m->vertices.items;
+-  }
+-
+-  outfile = fopen(offfilename, "w");
+-  if (outfile == (FILE *) NULL) {
+-    printf("  Error:  Cannot create file %s.\n", offfilename);
+-    triexit(1);
+-  }
+-  /* Number of vertices, triangles, and edges. */
+-  fprintf(outfile, "OFF\n%ld  %ld  %ld\n", outvertices, m->triangles.items,
+-          m->edges);
+-
+-  /* Write the vertices. */
+-  traversalinit(&m->vertices);
+-  vertexloop = vertextraverse(m);
+-  while (vertexloop != (vertex) NULL) {
+-    if (!b->jettison || (vertextype(vertexloop) != UNDEADVERTEX)) {
+-      /* The "0.0" is here because the OFF format uses 3D coordinates. */
+-      fprintf(outfile, " %.17g  %.17g  %.17g\n", vertexloop[0], vertexloop[1],
+-              0.0);
+-    }
+-    vertexloop = vertextraverse(m);
+-  }
+-
+-  /* Write the triangles. */
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  triangleloop.orient = 0;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    org(triangleloop, p1);
+-    dest(triangleloop, p2);
+-    apex(triangleloop, p3);
+-    /* The "3" means a three-vertex polygon. */
+-    fprintf(outfile, " 3   %4d  %4d  %4d\n", vertexmark(p1) - b->firstnumber,
+-            vertexmark(p2) - b->firstnumber, vertexmark(p3) - b->firstnumber);
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-  finishfile(outfile, argc, argv);
+-}
+-
+-#endif /* not TRILIBRARY */
+-
+-/**                                                                         **/
+-/**                                                                         **/
+-/********* File I/O routines end here                                *********/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  quality_statistics()   Print statistics about the quality of the mesh.   */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void quality_statistics(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void quality_statistics(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  struct otri triangleloop;
+-  vertex p[3];
+-  REAL cossquaretable[8];
+-  REAL ratiotable[16];
+-  REAL dx[3], dy[3];
+-  REAL edgelength[3];
+-  REAL dotproduct;
+-  REAL cossquare;
+-  REAL triarea;
+-  REAL shortest, longest;
+-  REAL trilongest2;
+-  REAL smallestarea, biggestarea;
+-  REAL triminaltitude2;
+-  REAL minaltitude;
+-  REAL triaspect2;
+-  REAL worstaspect;
+-  REAL smallestangle, biggestangle;
+-  REAL radconst, degconst;
+-  int angletable[18];
+-  int aspecttable[16];
+-  int aspectindex;
+-  int tendegree;
+-  int acutebiggest;
+-  int i, ii, j, k;
+-
+-  printf("Mesh quality statistics:\n\n");
+-  radconst = PI / 18.0;
+-  degconst = 180.0 / PI;
+-  for (i = 0; i < 8; i++) {
+-    cossquaretable[i] = cos(radconst * (REAL) (i + 1));
+-    cossquaretable[i] = cossquaretable[i] * cossquaretable[i];
+-  }
+-  for (i = 0; i < 18; i++) {
+-    angletable[i] = 0;
+-  }
+-
+-  ratiotable[0]  =      1.5;      ratiotable[1]  =     2.0;
+-  ratiotable[2]  =      2.5;      ratiotable[3]  =     3.0;
+-  ratiotable[4]  =      4.0;      ratiotable[5]  =     6.0;
+-  ratiotable[6]  =     10.0;      ratiotable[7]  =    15.0;
+-  ratiotable[8]  =     25.0;      ratiotable[9]  =    50.0;
+-  ratiotable[10] =    100.0;      ratiotable[11] =   300.0;
+-  ratiotable[12] =   1000.0;      ratiotable[13] = 10000.0;
+-  ratiotable[14] = 100000.0;      ratiotable[15] =     0.0;
+-  for (i = 0; i < 16; i++) {
+-    aspecttable[i] = 0;
+-  }
+-
+-  minaltitude = m->xmax - m->xmin + m->ymax - m->ymin;
+-  minaltitude = minaltitude * minaltitude;
+-  shortest = minaltitude;
+-  longest = 0.0;
+-  smallestarea = minaltitude;
+-  biggestarea = 0.0;
+-  worstaspect = 0.0;
+-  smallestangle = 0.0;
+-  biggestangle = 2.0;
+-  acutebiggest = 1;
+-
+-  traversalinit(&m->triangles);
+-  triangleloop.tri = triangletraverse(m);
+-  triangleloop.orient = 0;
+-  while (triangleloop.tri != (triangle *) NULL) {
+-    org(triangleloop, p[0]);
+-    dest(triangleloop, p[1]);
+-    apex(triangleloop, p[2]);
+-    trilongest2 = 0.0;
+-
+-    for (i = 0; i < 3; i++) {
+-      j = plus1mod3[i];
+-      k = minus1mod3[i];
+-      dx[i] = p[j][0] - p[k][0];
+-      dy[i] = p[j][1] - p[k][1];
+-      edgelength[i] = dx[i] * dx[i] + dy[i] * dy[i];
+-      if (edgelength[i] > trilongest2) {
+-        trilongest2 = edgelength[i];
+-      }
+-      if (edgelength[i] > longest) {
+-        longest = edgelength[i];
+-      }
+-      if (edgelength[i] < shortest) {
+-        shortest = edgelength[i];
+-      }
+-    }
+-
+-    triarea = counterclockwise(m, b, p[0], p[1], p[2]);
+-    if (triarea < smallestarea) {
+-      smallestarea = triarea;
+-    }
+-    if (triarea > biggestarea) {
+-      biggestarea = triarea;
+-    }
+-    triminaltitude2 = triarea * triarea / trilongest2;
+-    if (triminaltitude2 < minaltitude) {
+-      minaltitude = triminaltitude2;
+-    }
+-    triaspect2 = trilongest2 / triminaltitude2;
+-    if (triaspect2 > worstaspect) {
+-      worstaspect = triaspect2;
+-    }
+-    aspectindex = 0;
+-    while ((triaspect2 > ratiotable[aspectindex] * ratiotable[aspectindex])
+-           && (aspectindex < 15)) {
+-      aspectindex++;
+-    }
+-    aspecttable[aspectindex]++;
+-
+-    for (i = 0; i < 3; i++) {
+-      j = plus1mod3[i];
+-      k = minus1mod3[i];
+-      dotproduct = dx[j] * dx[k] + dy[j] * dy[k];
+-      cossquare = dotproduct * dotproduct / (edgelength[j] * edgelength[k]);
+-      tendegree = 8;
+-      for (ii = 7; ii >= 0; ii--) {
+-        if (cossquare > cossquaretable[ii]) {
+-          tendegree = ii;
+-        }
+-      }
+-      if (dotproduct <= 0.0) {
+-        angletable[tendegree]++;
+-        if (cossquare > smallestangle) {
+-          smallestangle = cossquare;
+-        }
+-        if (acutebiggest && (cossquare < biggestangle)) {
+-          biggestangle = cossquare;
+-        }
+-      } else {
+-        angletable[17 - tendegree]++;
+-        if (acutebiggest || (cossquare > biggestangle)) {
+-          biggestangle = cossquare;
+-          acutebiggest = 0;
+-        }
+-      }
+-    }
+-    triangleloop.tri = triangletraverse(m);
+-  }
+-
+-  shortest = sqrt(shortest);
+-  longest = sqrt(longest);
+-  minaltitude = sqrt(minaltitude);
+-  worstaspect = sqrt(worstaspect);
+-  smallestarea *= 0.5;
+-  biggestarea *= 0.5;
+-  if (smallestangle >= 1.0) {
+-    smallestangle = 0.0;
+-  } else {
+-    smallestangle = degconst * acos(sqrt(smallestangle));
+-  }
+-  if (biggestangle >= 1.0) {
+-    biggestangle = 180.0;
+-  } else {
+-    if (acutebiggest) {
+-      biggestangle = degconst * acos(sqrt(biggestangle));
+-    } else {
+-      biggestangle = 180.0 - degconst * acos(sqrt(biggestangle));
+-    }
+-  }
+-
+-  printf("  Smallest area: %16.5g   |  Largest area: %16.5g\n",
+-         smallestarea, biggestarea);
+-  printf("  Shortest edge: %16.5g   |  Longest edge: %16.5g\n",
+-         shortest, longest);
+-  printf("  Shortest altitude: %12.5g   |  Largest aspect ratio: %8.5g\n\n",
+-         minaltitude, worstaspect);
+-
+-  printf("  Triangle aspect ratio histogram:\n");
+-  printf("  1.1547 - %-6.6g    :  %8d    | %6.6g - %-6.6g     :  %8d\n",
+-         ratiotable[0], aspecttable[0], ratiotable[7], ratiotable[8],
+-         aspecttable[8]);
+-  for (i = 1; i < 7; i++) {
+-    printf("  %6.6g - %-6.6g    :  %8d    | %6.6g - %-6.6g     :  %8d\n",
+-           ratiotable[i - 1], ratiotable[i], aspecttable[i],
+-           ratiotable[i + 7], ratiotable[i + 8], aspecttable[i + 8]);
+-  }
+-  printf("  %6.6g - %-6.6g    :  %8d    | %6.6g -            :  %8d\n",
+-         ratiotable[6], ratiotable[7], aspecttable[7], ratiotable[14],
+-         aspecttable[15]);
+-  printf("  (Aspect ratio is longest edge divided by shortest altitude)\n\n");
+-
+-  printf("  Smallest angle: %15.5g   |  Largest angle: %15.5g\n\n",
+-         smallestangle, biggestangle);
+-
+-  printf("  Angle histogram:\n");
+-  for (i = 0; i < 9; i++) {
+-    printf("    %3d - %3d degrees:  %8d    |    %3d - %3d degrees:  %8d\n",
+-           i * 10, i * 10 + 10, angletable[i],
+-           i * 10 + 90, i * 10 + 100, angletable[i + 9]);
+-  }
+-  printf("\n");
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  statistics()   Print all sorts of cool facts.                            */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef ANSI_DECLARATORS
+-void statistics(struct mesh *m, struct behavior *b)
+-#else /* not ANSI_DECLARATORS */
+-void statistics(m, b)
+-struct mesh *m;
+-struct behavior *b;
+-#endif /* not ANSI_DECLARATORS */
+-
+-{
+-  printf("\nStatistics:\n\n");
+-  printf("  Input vertices: %d\n", m->invertices);
+-  if (b->refine) {
+-    printf("  Input triangles: %d\n", m->inelements);
+-  }
+-  if (b->poly) {
+-    printf("  Input segments: %d\n", m->insegments);
+-    if (!b->refine) {
+-      printf("  Input holes: %d\n", m->holes);
+-    }
+-  }
+-
+-  printf("\n  Mesh vertices: %ld\n", m->vertices.items - m->undeads);
+-  printf("  Mesh triangles: %ld\n", m->triangles.items);
+-  printf("  Mesh edges: %ld\n", m->edges);
+-  printf("  Mesh exterior boundary edges: %ld\n", m->hullsize);
+-  if (b->poly || b->refine) {
+-    printf("  Mesh interior boundary edges: %ld\n",
+-           m->subsegs.items - m->hullsize);
+-    printf("  Mesh subsegments (constrained edges): %ld\n",
+-           m->subsegs.items);
+-  }
+-  printf("\n");
+-
+-  if (b->verbose) {
+-    quality_statistics(m, b);
+-    printf("Memory allocation statistics:\n\n");
+-    printf("  Maximum number of vertices: %ld\n", m->vertices.maxitems);
+-    printf("  Maximum number of triangles: %ld\n", m->triangles.maxitems);
+-    if (m->subsegs.maxitems > 0) {
+-      printf("  Maximum number of subsegments: %ld\n", m->subsegs.maxitems);
+-    }
+-    if (m->viri.maxitems > 0) {
+-      printf("  Maximum number of viri: %ld\n", m->viri.maxitems);
+-    }
+-    if (m->badsubsegs.maxitems > 0) {
+-      printf("  Maximum number of encroached subsegments: %ld\n",
+-             m->badsubsegs.maxitems);
+-    }
+-    if (m->badtriangles.maxitems > 0) {
+-      printf("  Maximum number of bad triangles: %ld\n",
+-             m->badtriangles.maxitems);
+-    }
+-    if (m->flipstackers.maxitems > 0) {
+-      printf("  Maximum number of stacked triangle flips: %ld\n",
+-             m->flipstackers.maxitems);
+-    }
+-    if (m->splaynodes.maxitems > 0) {
+-      printf("  Maximum number of splay tree nodes: %ld\n",
+-             m->splaynodes.maxitems);
+-    }
+-    printf("  Approximate heap memory use (bytes): %ld\n\n",
+-           m->vertices.maxitems * m->vertices.itembytes +
+-           m->triangles.maxitems * m->triangles.itembytes +
+-           m->subsegs.maxitems * m->subsegs.itembytes +
+-           m->viri.maxitems * m->viri.itembytes +
+-           m->badsubsegs.maxitems * m->badsubsegs.itembytes +
+-           m->badtriangles.maxitems * m->badtriangles.itembytes +
+-           m->flipstackers.maxitems * m->flipstackers.itembytes +
+-           m->splaynodes.maxitems * m->splaynodes.itembytes);
+-
+-    printf("Algorithmic statistics:\n\n");
+-    if (!b->weighted) {
+-      printf("  Number of incircle tests: %ld\n", m->incirclecount);
+-    } else {
+-      printf("  Number of 3D orientation tests: %ld\n", m->orient3dcount);
+-    }
+-    printf("  Number of 2D orientation tests: %ld\n", m->counterclockcount);
+-    if (m->hyperbolacount > 0) {
+-      printf("  Number of right-of-hyperbola tests: %ld\n",
+-             m->hyperbolacount);
+-    }
+-    if (m->circletopcount > 0) {
+-      printf("  Number of circle top computations: %ld\n",
+-             m->circletopcount);
+-    }
+-    if (m->circumcentercount > 0) {
+-      printf("  Number of triangle circumcenter computations: %ld\n",
+-             m->circumcentercount);
+-    }
+-    printf("\n");
+-  }
+-}
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  main() or triangulate()   Gosh, do everything.                           */
+-/*                                                                           */
+-/*  The sequence is roughly as follows.  Many of these steps can be skipped, */
+-/*  depending on the command line switches.                                  */
+-/*                                                                           */
+-/*  - Initialize constants and parse the command line.                       */
+-/*  - Read the vertices from a file and either                               */
+-/*    - triangulate them (no -r), or                                         */
+-/*    - read an old mesh from files and reconstruct it (-r).                 */
+-/*  - Insert the PSLG segments (-p), and possibly segments on the convex     */
+-/*      hull (-c).                                                           */
+-/*  - Read the holes (-p), regional attributes (-pA), and regional area      */
+-/*      constraints (-pa).  Carve the holes and concavities, and spread the  */
+-/*      regional attributes and area constraints.                            */
+-/*  - Enforce the constraints on minimum angle (-q) and maximum area (-a).   */
+-/*      Also enforce the conforming Delaunay property (-q and -a).           */
+-/*  - Compute the number of edges in the resulting mesh.                     */
+-/*  - Promote the mesh's linear triangles to higher order elements (-o).     */
+-/*  - Write the output files and print the statistics.                       */
+-/*  - Check the consistency and Delaunay property of the mesh (-C).          */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-#ifdef TRILIBRARY
+-
+-#ifdef ANSI_DECLARATORS
+-void triangulate(const char *const triswitches, struct triangulateio *in,
+-                 struct triangulateio *out, struct triangulateio *vorout)
+-#else /* not ANSI_DECLARATORS */
+-void triangulate(triswitches, in, out, vorout)
+-const char *const triswitches;
+-struct triangulateio *in;
+-struct triangulateio *out;
+-struct triangulateio *vorout;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#else /* not TRILIBRARY */
+-
+-#ifdef ANSI_DECLARATORS
+-int main(int argc, char **argv)
+-#else /* not ANSI_DECLARATORS */
+-int main(argc, argv)
+-int argc;
+-char **argv;
+-#endif /* not ANSI_DECLARATORS */
+-
+-#endif /* not TRILIBRARY */
+-
+-{
+-  struct mesh m;
+-  struct behavior b;
+-  REAL *holearray;                                        /* Array of holes. */
+-  REAL *regionarray;   /* Array of regional attributes and area constraints. */
+-#ifndef TRILIBRARY
+-  FILE *polyfile;
+-#endif /* not TRILIBRARY */
+-#ifndef NO_TIMER
+-  /* Variables for timing the performance of Triangle.  The types are */
+-  /*   defined in sys/time.h.                                         */
+-  struct timeval tv0, tv1, tv2, tv3, tv4, tv5, tv6;
+-  struct timezone tz;
+-#endif /* not NO_TIMER */
+-
+-#ifndef NO_TIMER
+-  gettimeofday(&tv0, &tz);
+-#endif /* not NO_TIMER */
+-
+-  triangleinit(&m);
+-#ifdef TRILIBRARY
+-  parsecommandline(1, &triswitches, &b);
+-#else /* not TRILIBRARY */
+-  parsecommandline(argc, argv, &b);
+-#endif /* not TRILIBRARY */
+-  m.steinerleft = b.steiner;
+-
+-#ifdef TRILIBRARY
+-  transfernodes(&m, &b, in->pointlist, in->pointattributelist,
+-                in->pointmarkerlist, in->numberofpoints,
+-                in->numberofpointattributes);
+-#else /* not TRILIBRARY */
+-  readnodes(&m, &b, b.innodefilename, b.inpolyfilename, &polyfile);
+-#endif /* not TRILIBRARY */
+-
+-#ifndef NO_TIMER
+-  if (!b.quiet) {
+-    gettimeofday(&tv1, &tz);
+-  }
+-#endif /* not NO_TIMER */
+-
+-#ifdef CDT_ONLY
+-  m.hullsize = delaunay(&m, &b);                /* Triangulate the vertices. */
+-#else /* not CDT_ONLY */
+-  if (b.refine) {
+-    /* Read and reconstruct a mesh. */
+-#ifdef TRILIBRARY
+-    m.hullsize = reconstruct(&m, &b, in->trianglelist,
+-                             in->triangleattributelist, in->trianglearealist,
+-                             in->numberoftriangles, in->numberofcorners,
+-                             in->numberoftriangleattributes,
+-                             in->segmentlist, in->segmentmarkerlist,
+-                             in->numberofsegments);
+-#else /* not TRILIBRARY */
+-    m.hullsize = reconstruct(&m, &b, b.inelefilename, b.areafilename,
+-                             b.inpolyfilename, polyfile);
+-#endif /* not TRILIBRARY */
+-  } else {
+-    m.hullsize = delaunay(&m, &b);              /* Triangulate the vertices. */
+-  }
+-#endif /* not CDT_ONLY */
+-
+-#ifndef NO_TIMER
+-  if (!b.quiet) {
+-    gettimeofday(&tv2, &tz);
+-    if (b.refine) {
+-      printf("Mesh reconstruction");
+-    } else {
+-      printf("Delaunay");
+-    }
+-    printf(" milliseconds:  %ld\n", 1000l * (tv2.tv_sec - tv1.tv_sec) +
+-           (tv2.tv_usec - tv1.tv_usec) / 1000l);
+-  }
+-#endif /* not NO_TIMER */
+-
+-  /* Ensure that no vertex can be mistaken for a triangular bounding */
+-  /*   box vertex in insertvertex().                                 */
+-  m.infvertex1 = (vertex) NULL;
+-  m.infvertex2 = (vertex) NULL;
+-  m.infvertex3 = (vertex) NULL;
+-
+-  if (b.usesegments) {
+-    m.checksegments = 1;                /* Segments will be introduced next. */
+-    if (!b.refine) {
+-      /* Insert PSLG segments and/or convex hull segments. */
+-#ifdef TRILIBRARY
+-      formskeleton(&m, &b, in->segmentlist,
+-                   in->segmentmarkerlist, in->numberofsegments);
+-#else /* not TRILIBRARY */
+-      formskeleton(&m, &b, polyfile, b.inpolyfilename);
+-#endif /* not TRILIBRARY */
+-    }
+-  }
+-
+-#ifndef NO_TIMER
+-  if (!b.quiet) {
+-    gettimeofday(&tv3, &tz);
+-    if (b.usesegments && !b.refine) {
+-      printf("Segment milliseconds:  %ld\n",
+-             1000l * (tv3.tv_sec - tv2.tv_sec) +
+-             (tv3.tv_usec - tv2.tv_usec) / 1000l);
+-    }
+-  }
+-#endif /* not NO_TIMER */
+-
+-  if (b.poly && (m.triangles.items > 0)) {
+-#ifdef TRILIBRARY
+-    holearray = in->holelist;
+-    m.holes = in->numberofholes;
+-    regionarray = in->regionlist;
+-    m.regions = in->numberofregions;
+-#else /* not TRILIBRARY */
+-    readholes(&m, &b, polyfile, b.inpolyfilename, &holearray, &m.holes,
+-              &regionarray, &m.regions);
+-#endif /* not TRILIBRARY */
+-    if (!b.refine) {
+-      /* Carve out holes and concavities. */
+-      carveholes(&m, &b, holearray, m.holes, regionarray, m.regions);
+-    }
+-  } else {
+-    /* Without a PSLG, there can be no holes or regional attributes   */
+-    /*   or area constraints.  The following are set to zero to avoid */
+-    /*   an accidental free() later.                                  */
+-    m.holes = 0;
+-    m.regions = 0;
+-  }
+-
+-#ifndef NO_TIMER
+-  if (!b.quiet) {
+-    gettimeofday(&tv4, &tz);
+-    if (b.poly && !b.refine) {
+-      printf("Hole milliseconds:  %ld\n", 1000l * (tv4.tv_sec - tv3.tv_sec) +
+-             (tv4.tv_usec - tv3.tv_usec) / 1000l);
+-    }
+-  }
+-#endif /* not NO_TIMER */
+-
+-#ifndef CDT_ONLY
+-  if (b.quality && (m.triangles.items > 0)) {
+-    enforcequality(&m, &b);           /* Enforce angle and area constraints. */
+-  }
+-#endif /* not CDT_ONLY */
+-
+-#ifndef NO_TIMER
+-  if (!b.quiet) {
+-    gettimeofday(&tv5, &tz);
+-#ifndef CDT_ONLY
+-    if (b.quality) {
+-      printf("Quality milliseconds:  %ld\n",
+-             1000l * (tv5.tv_sec - tv4.tv_sec) +
+-             (tv5.tv_usec - tv4.tv_usec) / 1000l);
+-    }
+-#endif /* not CDT_ONLY */
+-  }
+-#endif /* not NO_TIMER */
+-
+-  /* Calculate the number of edges. */
+-  m.edges = (3l * m.triangles.items + m.hullsize) / 2l;
+-
+-  if (b.order > 1) {
+-    highorder(&m, &b);       /* Promote elements to higher polynomial order. */
+-  }
+-  if (!b.quiet) {
+-    printf("\n");
+-  }
+-
+-#ifdef TRILIBRARY
+-  if (b.jettison) {
+-    out->numberofpoints = m.vertices.items - m.undeads;
+-  } else {
+-    out->numberofpoints = m.vertices.items;
+-  }
+-  out->numberofpointattributes = m.nextras;
+-  out->numberoftriangles = m.triangles.items;
+-  out->numberofcorners = (b.order + 1) * (b.order + 2) / 2;
+-  out->numberoftriangleattributes = m.eextras;
+-  out->numberofedges = m.edges;
+-  if (b.usesegments) {
+-    out->numberofsegments = m.subsegs.items;
+-  } else {
+-    out->numberofsegments = m.hullsize;
+-  }
+-  if (vorout != (struct triangulateio *) NULL) {
+-    vorout->numberofpoints = m.triangles.items;
+-    vorout->numberofpointattributes = m.nextras;
+-    vorout->numberofedges = m.edges;
+-  }
+-#endif /* TRILIBRARY */
+-  /* If not using iteration numbers, don't write a .node file if one was */
+-  /*   read, because the original one would be overwritten!              */
+-  if (b.nonodewritten || (b.noiterationnum && m.readnodefile)) {
+-    if (!b.quiet) {
+-#ifdef TRILIBRARY
+-      printf("NOT writing vertices.\n");
+-#else /* not TRILIBRARY */
+-      printf("NOT writing a .node file.\n");
+-#endif /* not TRILIBRARY */
+-    }
+-    numbernodes(&m, &b);         /* We must remember to number the vertices. */
+-  } else {
+-    /* writenodes() numbers the vertices too. */
+-#ifdef TRILIBRARY
+-    writenodes(&m, &b, &out->pointlist, &out->pointattributelist,
+-               &out->pointmarkerlist);
+-#else /* not TRILIBRARY */
+-    writenodes(&m, &b, b.outnodefilename, argc, argv);
+-#endif /* TRILIBRARY */
+-  }
+-  if (b.noelewritten) {
+-    if (!b.quiet) {
+-#ifdef TRILIBRARY
+-      printf("NOT writing triangles.\n");
+-#else /* not TRILIBRARY */
+-      printf("NOT writing an .ele file.\n");
+-#endif /* not TRILIBRARY */
+-    }
+-  } else {
+-#ifdef TRILIBRARY
+-    writeelements(&m, &b, &out->trianglelist, &out->triangleattributelist);
+-#else /* not TRILIBRARY */
+-    writeelements(&m, &b, b.outelefilename, argc, argv);
+-#endif /* not TRILIBRARY */
+-  }
+-  /* The -c switch (convex switch) causes a PSLG to be written */
+-  /*   even if none was read.                                  */
+-  if (b.poly || b.convex) {
+-    /* If not using iteration numbers, don't overwrite the .poly file. */
+-    if (b.nopolywritten || b.noiterationnum) {
+-      if (!b.quiet) {
+-#ifdef TRILIBRARY
+-        printf("NOT writing segments.\n");
+-#else /* not TRILIBRARY */
+-        printf("NOT writing a .poly file.\n");
+-#endif /* not TRILIBRARY */
+-      }
+-    } else {
+-#ifdef TRILIBRARY
+-      writepoly(&m, &b, &out->segmentlist, &out->segmentmarkerlist);
+-      out->numberofholes = m.holes;
+-      out->numberofregions = m.regions;
+-      if (b.poly) {
+-        out->holelist = in->holelist;
+-        out->regionlist = in->regionlist;
+-      } else {
+-        out->holelist = (REAL *) NULL;
+-        out->regionlist = (REAL *) NULL;
+-      }
+-#else /* not TRILIBRARY */
+-      writepoly(&m, &b, b.outpolyfilename, holearray, m.holes, regionarray,
+-                m.regions, argc, argv);
+-#endif /* not TRILIBRARY */
+-    }
+-  }
+-#ifndef TRILIBRARY
+-#ifndef CDT_ONLY
+-  if (m.regions > 0) {
+-    trifree((void *) regionarray);
+-  }
+-#endif /* not CDT_ONLY */
+-  if (m.holes > 0) {
+-    trifree((void *) holearray);
+-  }
+-  if (b.geomview) {
+-    writeoff(&m, &b, b.offfilename, argc, argv);
+-  }
+-#endif /* not TRILIBRARY */
+-  if (b.edgesout) {
+-#ifdef TRILIBRARY
+-    writeedges(&m, &b, &out->edgelist, &out->edgemarkerlist);
+-#else /* not TRILIBRARY */
+-    writeedges(&m, &b, b.edgefilename, argc, argv);
+-#endif /* not TRILIBRARY */
+-  }
+-  if (b.voronoi) {
+-#ifdef TRILIBRARY
+-    writevoronoi(&m, &b, &vorout->pointlist, &vorout->pointattributelist,
+-                 &vorout->pointmarkerlist, &vorout->edgelist,
+-                 &vorout->edgemarkerlist, &vorout->normlist);
+-#else /* not TRILIBRARY */
+-    writevoronoi(&m, &b, b.vnodefilename, b.vedgefilename, argc, argv);
+-#endif /* not TRILIBRARY */
+-  }
+-  if (b.neighbors) {
+-#ifdef TRILIBRARY
+-    writeneighbors(&m, &b, &out->neighborlist);
+-#else /* not TRILIBRARY */
+-    writeneighbors(&m, &b, b.neighborfilename, argc, argv);
+-#endif /* not TRILIBRARY */
+-  }
+-
+-  if (!b.quiet) {
+-#ifndef NO_TIMER
+-    gettimeofday(&tv6, &tz);
+-    printf("\nOutput milliseconds:  %ld\n",
+-           1000l * (tv6.tv_sec - tv5.tv_sec) +
+-           (tv6.tv_usec - tv5.tv_usec) / 1000l);
+-    printf("Total running milliseconds:  %ld\n",
+-           1000l * (tv6.tv_sec - tv0.tv_sec) +
+-           (tv6.tv_usec - tv0.tv_usec) / 1000l);
+-#endif /* not NO_TIMER */
+-
+-    statistics(&m, &b);
+-  }
+-
+-#ifndef REDUCED
+-  if (b.docheck) {
+-    checkmesh(&m, &b);
+-    checkdelaunay(&m, &b);
+-  }
+-#endif /* not REDUCED */
+-
+-  triangledeinit(&m, &b);
+-#ifndef TRILIBRARY
+-  return 0;
+-#endif /* not TRILIBRARY */
+-};
+diff --git a/v3p/netlib/triangle.h b/v3p/netlib/triangle.h
+deleted file mode 100644
+index de14cb5395..0000000000
+--- a/v3p/netlib/triangle.h
++++ /dev/null
+@@ -1,299 +0,0 @@
+-#ifndef netlib_triangle_h_
+-#define netlib_triangle_h_
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  (triangle.h)                                                             */
+-/*                                                                           */
+-/*  Include file for programs that call Triangle.                            */
+-/*                                                                           */
+-/*  Accompanies Triangle Version 1.6                                         */
+-/*  July 28, 2005                                                            */
+-/*                                                                           */
+-/*  Copyright 1996, 2005                                                     */
+-/*  Jonathan Richard Shewchuk                                                */
+-/*  2360 Woolsey #H                                                          */
+-/*  Berkeley, California  94705-1927                                         */
+-/*  jrs@cs.berkeley.edu                                                      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  How to call Triangle from another program                                */
+-/*                                                                           */
+-/*                                                                           */
+-/*  If you haven't read Triangle's instructions (run "triangle -h" to read   */
+-/*  them), you won't understand what follows.                                */
+-/*                                                                           */
+-/*  Triangle must be compiled into an object file (triangle.o) with the      */
+-/*  TRILIBRARY symbol defined (generally by using the -DTRILIBRARY compiler  */
+-/*  switch).  The makefile included with Triangle will do this for you if    */
+-/*  you run "make trilibrary".  The resulting object file can be called via  */
+-/*  the procedure triangulate().                                             */
+-/*                                                                           */
+-/*  If the size of the object file is important to you, you may wish to      */
+-/*  generate a reduced version of triangle.o.  The REDUCED symbol gets rid   */
+-/*  of all features that are primarily of research interest.  Specifically,  */
+-/*  the -DREDUCED switch eliminates Triangle's -i, -F, -s, and -C switches.  */
+-/*  The CDT_ONLY symbol gets rid of all meshing algorithms above and beyond  */
+-/*  constrained Delaunay triangulation.  Specifically, the -DCDT_ONLY switch */
+-/*  eliminates Triangle's -r, -q, -a, -u, -D, -Y, -S, and -s switches.       */
+-/*                                                                           */
+-/*  IMPORTANT:  These definitions (TRILIBRARY, REDUCED, CDT_ONLY) must be    */
+-/*  made in the makefile or in triangle.c itself.  Putting these definitions */
+-/*  in this file (triangle.h) will not create the desired effect.            */
+-/*                                                                           */
+-/*                                                                           */
+-/*  The calling convention for triangulate() follows.                        */
+-/*                                                                           */
+-/*      void triangulate(triswitches, in, out, vorout)                       */
+-/*      char *triswitches;                                                   */
+-/*      struct triangulateio *in;                                            */
+-/*      struct triangulateio *out;                                           */
+-/*      struct triangulateio *vorout;                                        */
+-/*                                                                           */
+-/*  `triswitches' is a string containing the command line switches you wish  */
+-/*  to invoke.  No initial dash is required.  Some suggestions:              */
+-/*                                                                           */
+-/*  - You'll probably find it convenient to use the `z' switch so that       */
+-/*    points (and other items) are numbered from zero.  This simplifies      */
+-/*    indexing, because the first item of any type always starts at index    */
+-/*    [0] of the corresponding array, whether that item's number is zero or  */
+-/*    one.                                                                   */
+-/*  - You'll probably want to use the `Q' (quiet) switch in your final code, */
+-/*    but you can take advantage of Triangle's printed output (including the */
+-/*    `V' switch) while debugging.                                           */
+-/*  - If you are not using the `q', `a', `u', `D', `j', or `s' switches,     */
+-/*    then the output points will be identical to the input points, except   */
+-/*    possibly for the boundary markers.  If you don't need the boundary     */
+-/*    markers, you should use the `N' (no nodes output) switch to save       */
+-/*    memory.  (If you do need boundary markers, but need to save memory, a  */
+-/*    good nasty trick is to set out->pointlist equal to in->pointlist       */
+-/*    before calling triangulate(), so that Triangle overwrites the input    */
+-/*    points with identical copies.)                                         */
+-/*  - The `I' (no iteration numbers) and `g' (.off file output) switches     */
+-/*    have no effect when Triangle is compiled with TRILIBRARY defined.      */
+-/*                                                                           */
+-/*  `in', `out', and `vorout' are descriptions of the input, the output,     */
+-/*  and the Voronoi output.  If the `v' (Voronoi output) switch is not used, */
+-/*  `vorout' may be NULL.  `in' and `out' may never be NULL.                 */
+-/*                                                                           */
+-/*  Certain fields of the input and output structures must be initialized,   */
+-/*  as described below.                                                      */
+-/*                                                                           */
+-/*****************************************************************************/
+-
+-/*****************************************************************************/
+-/*                                                                           */
+-/*  The `triangulateio' structure.                                           */
+-/*                                                                           */
+-/*  Used to pass data into and out of the triangulate() procedure.           */
+-/*                                                                           */
+-/*                                                                           */
+-/*  Arrays are used to store points, triangles, markers, and so forth.  In   */
+-/*  all cases, the first item in any array is stored starting at index [0].  */
+-/*  However, that item is item number `1' unless the `z' switch is used, in  */
+-/*  which case it is item number `0'.  Hence, you may find it easier to      */
+-/*  index points (and triangles in the neighbor list) if you use the `z'     */
+-/*  switch.  Unless, of course, you're calling Triangle from a Fortran       */
+-/*  program.                                                                 */
+-/*                                                                           */
+-/*  Description of fields (except the `numberof' fields, which are obvious): */
+-/*                                                                           */
+-/*  `pointlist':  An array of point coordinates.  The first point's x        */
+-/*    coordinate is at index [0] and its y coordinate at index [1], followed */
+-/*    by the coordinates of the remaining points.  Each point occupies two   */
+-/*    REALs.                                                                 */
+-/*  `pointattributelist':  An array of point attributes.  Each point's       */
+-/*    attributes occupy `numberofpointattributes' REALs.                     */
+-/*  `pointmarkerlist':  An array of point markers; one int per point.        */
+-/*                                                                           */
+-/*  `trianglelist':  An array of triangle corners.  The first triangle's     */
+-/*    first corner is at index [0], followed by its other two corners in     */
+-/*    counterclockwise order, followed by any other nodes if the triangle    */
+-/*    represents a nonlinear element.  Each triangle occupies                */
+-/*    `numberofcorners' ints.                                                */
+-/*  `triangleattributelist':  An array of triangle attributes.  Each         */
+-/*    triangle's attributes occupy `numberoftriangleattributes' REALs.       */
+-/*  `trianglearealist':  An array of triangle area constraints; one REAL per */
+-/*    triangle.  Input only.                                                 */
+-/*  `neighborlist':  An array of triangle neighbors; three ints per          */
+-/*    triangle.  Output only.                                                */
+-/*                                                                           */
+-/*  `segmentlist':  An array of segment endpoints.  The first segment's      */
+-/*    endpoints are at indices [0] and [1], followed by the remaining        */
+-/*    segments.  Two ints per segment.                                       */
+-/*  `segmentmarkerlist':  An array of segment markers; one int per segment.  */
+-/*                                                                           */
+-/*  `holelist':  An array of holes.  The first hole's x and y coordinates    */
+-/*    are at indices [0] and [1], followed by the remaining holes.  Two      */
+-/*    REALs per hole.  Input only, although the pointer is copied to the     */
+-/*    output structure for your convenience.                                 */
+-/*                                                                           */
+-/*  `regionlist':  An array of regional attributes and area constraints.     */
+-/*    The first constraint's x and y coordinates are at indices [0] and [1], */
+-/*    followed by the regional attribute at index [2], followed by the       */
+-/*    maximum area at index [3], followed by the remaining area constraints. */
+-/*    Four REALs per area constraint.  Note that each regional attribute is  */
+-/*    used only if you select the `A' switch, and each area constraint is    */
+-/*    used only if you select the `a' switch (with no number following), but */
+-/*    omitting one of these switches does not change the memory layout.      */
+-/*    Input only, although the pointer is copied to the output structure for */
+-/*    your convenience.                                                      */
+-/*                                                                           */
+-/*  `edgelist':  An array of edge endpoints.  The first edge's endpoints are */
+-/*    at indices [0] and [1], followed by the remaining edges.  Two ints per */
+-/*    edge.  Output only.                                                    */
+-/*  `edgemarkerlist':  An array of edge markers; one int per edge.  Output   */
+-/*    only.                                                                  */
+-/*  `normlist':  An array of normal vectors, used for infinite rays in       */
+-/*    Voronoi diagrams.  The first normal vector's x and y magnitudes are    */
+-/*    at indices [0] and [1], followed by the remaining vectors.  For each   */
+-/*    finite edge in a Voronoi diagram, the normal vector written is the     */
+-/*    zero vector.  Two REALs per edge.  Output only.                        */
+-/*                                                                           */
+-/*                                                                           */
+-/*  Any input fields that Triangle will examine must be initialized.         */
+-/*  Furthermore, for each output array that Triangle will write to, you      */
+-/*  must either provide space by setting the appropriate pointer to point    */
+-/*  to the space you want the data written to, or you must initialize the    */
+-/*  pointer to NULL, which tells Triangle to allocate space for the results. */
+-/*  The latter option is preferable, because Triangle always knows exactly   */
+-/*  how much space to allocate.  The former option is provided mainly for    */
+-/*  people who need to call Triangle from Fortran code, though it also makes */
+-/*  possible some nasty space-saving tricks, like writing the output to the  */
+-/*  same arrays as the input.                                                */
+-/*                                                                           */
+-/*  Triangle will not free() any input or output arrays, including those it  */
+-/*  allocates itself; that's up to you.  You should free arrays allocated by */
+-/*  Triangle by calling the trifree() procedure defined below.  (By default, */
+-/*  trifree() just calls the standard free() library procedure, but          */
+-/*  applications that call triangulate() may replace trimalloc() and         */
+-/*  trifree() in triangle.c to use specialized memory allocators.)           */
+-/*                                                                           */
+-/*  Here's a guide to help you decide which fields you must initialize       */
+-/*  before you call triangulate().                                           */
+-/*                                                                           */
+-/*  `in':                                                                    */
+-/*                                                                           */
+-/*    - `pointlist' must always point to a list of points; `numberofpoints'  */
+-/*      and `numberofpointattributes' must be properly set.                  */
+-/*      `pointmarkerlist' must either be set to NULL (in which case all      */
+-/*      markers default to zero), or must point to a list of markers.  If    */
+-/*      `numberofpointattributes' is not zero, `pointattributelist' must     */
+-/*      point to a list of point attributes.                                 */
+-/*    - If the `r' switch is used, `trianglelist' must point to a list of    */
+-/*      triangles, and `numberoftriangles', `numberofcorners', and           */
+-/*      `numberoftriangleattributes' must be properly set.  If               */
+-/*      `numberoftriangleattributes' is not zero, `triangleattributelist'    */
+-/*      must point to a list of triangle attributes.  If the `a' switch is   */
+-/*      used (with no number following), `trianglearealist' must point to a  */
+-/*      list of triangle area constraints.  `neighborlist' may be ignored.   */
+-/*    - If the `p' switch is used, `segmentlist' must point to a list of     */
+-/*      segments, `numberofsegments' must be properly set, and               */
+-/*      `segmentmarkerlist' must either be set to NULL (in which case all    */
+-/*      markers default to zero), or must point to a list of markers.        */
+-/*    - If the `p' switch is used without the `r' switch, then               */
+-/*      `numberofholes' and `numberofregions' must be properly set.  If      */
+-/*      `numberofholes' is not zero, `holelist' must point to a list of      */
+-/*      holes.  If `numberofregions' is not zero, `regionlist' must point to */
+-/*      a list of region constraints.                                        */
+-/*    - If the `p' switch is used, `holelist', `numberofholes',              */
+-/*      `regionlist', and `numberofregions' is copied to `out'.  (You can    */
+-/*      nonetheless get away with not initializing them if the `r' switch is */
+-/*      used.)                                                               */
+-/*    - `edgelist', `edgemarkerlist', `normlist', and `numberofedges' may be */
+-/*      ignored.                                                             */
+-/*                                                                           */
+-/*  `out':                                                                   */
+-/*                                                                           */
+-/*    - `pointlist' must be initialized (NULL or pointing to memory) unless  */
+-/*      the `N' switch is used.  `pointmarkerlist' must be initialized       */
+-/*      unless the `N' or `B' switch is used.  If `N' is not used and        */
+-/*      `in->numberofpointattributes' is not zero, `pointattributelist' must */
+-/*      be initialized.                                                      */
+-/*    - `trianglelist' must be initialized unless the `E' switch is used.    */
+-/*      `neighborlist' must be initialized if the `n' switch is used.  If    */
+-/*      the `E' switch is not used and (`in->numberofelementattributes' is   */
+-/*      not zero or the `A' switch is used), `elementattributelist' must be  */
+-/*      initialized.  `trianglearealist' may be ignored.                     */
+-/*    - `segmentlist' must be initialized if the `p' or `c' switch is used,  */
+-/*      and the `P' switch is not used.  `segmentmarkerlist' must also be    */
+-/*      initialized under these circumstances unless the `B' switch is used. */
+-/*    - `edgelist' must be initialized if the `e' switch is used.            */
+-/*      `edgemarkerlist' must be initialized if the `e' switch is used and   */
+-/*      the `B' switch is not.                                               */
+-/*    - `holelist', `regionlist', `normlist', and all scalars may be ignored.*/
+-/*                                                                           */
+-/*  `vorout' (only needed if `v' switch is used):                            */
+-/*                                                                           */
+-/*    - `pointlist' must be initialized.  If `in->numberofpointattributes'   */
+-/*      is not zero, `pointattributelist' must be initialized.               */
+-/*      `pointmarkerlist' may be ignored.                                    */
+-/*    - `edgelist' and `normlist' must both be initialized.                  */
+-/*      `edgemarkerlist' may be ignored.                                     */
+-/*    - Everything else may be ignored.                                      */
+-/*                                                                           */
+-/*  After a call to triangulate(), the valid fields of `out' and `vorout'    */
+-/*  will depend, in an obvious way, on the choice of switches used.  Note    */
+-/*  that when the `p' switch is used, the pointers `holelist' and            */
+-/*  `regionlist' are copied from `in' to `out', but no new space is          */
+-/*  allocated; be careful that you don't free() the same array twice.  On    */
+-/*  the other hand, Triangle will never copy the `pointlist' pointer (or any */
+-/*  others); new space is allocated for `out->pointlist', or if the `N'      */
+-/*  switch is used, `out->pointlist' remains uninitialized.                  */
+-/*                                                                           */
+-/*  All of the meaningful `numberof' fields will be properly set; for        */
+-/*  instance, `numberofedges' will represent the number of edges in the      */
+-/*  triangulation whether or not the edges were written.  If segments are    */
+-/*  not used, `numberofsegments' will indicate the number of boundary edges. */
+-/*                                                                           */
+-/*****************************************************************************/
+-#undef REAL
+-#ifdef SINGLE
+-#define REAL float
+-#else /* not SINGLE */
+-#define REAL double
+-#endif /* not SINGLE */
+-
+-struct triangulateio {
+-  REAL *pointlist;                                               /* In / out */
+-  REAL *pointattributelist;                                      /* In / out */
+-  int *pointmarkerlist;                                          /* In / out */
+-  int numberofpoints;                                            /* In / out */
+-  int numberofpointattributes;                                   /* In / out */
+-
+-  int *trianglelist;                                             /* In / out */
+-  REAL *triangleattributelist;                                   /* In / out */
+-  REAL *trianglearealist;                                         /* In only */
+-  int *neighborlist;                                             /* Out only */
+-  int numberoftriangles;                                         /* In / out */
+-  int numberofcorners;                                           /* In / out */
+-  int numberoftriangleattributes;                                /* In / out */
+-
+-  int *segmentlist;                                              /* In / out */
+-  int *segmentmarkerlist;                                        /* In / out */
+-  int numberofsegments;                                          /* In / out */
+-
+-  REAL *holelist;                        /* In / pointer to array copied out */
+-  int numberofholes;                                      /* In / copied out */
+-
+-  REAL *regionlist;                      /* In / pointer to array copied out */
+-  int numberofregions;                                    /* In / copied out */
+-
+-  int *edgelist;                                                 /* Out only */
+-  int *edgemarkerlist;            /* Not used with Voronoi diagram; out only */
+-  REAL *normlist;                /* Used only with Voronoi diagram; out only */
+-  int numberofedges;                                             /* Out only */
+-};
+-
+-#define ANSI_DECLARATORS
+-#ifdef ANSI_DECLARATORS
+-void triangulate(const char * const, struct triangulateio *, struct triangulateio *,
+-                 struct triangulateio *);
+-void trifree(void *memptr);
+-#else /* not ANSI_DECLARATORS */
+-void triangulate();
+-void trifree();
+-#endif /* not ANSI_DECLARATORS */
+-#endif /* netlib_triangle_h_ */
+-- 
+2.41.0
+
diff --git a/0008-v3.5.0-remove-bits-using-triangle.patch b/0008-v3.5.0-remove-bits-using-triangle.patch
new file mode 100644
index 0000000..cd64871
--- /dev/null
+++ b/0008-v3.5.0-remove-bits-using-triangle.patch
@@ -0,0 +1,2051 @@
+From e06da0ba5eac36a06f00f45055ab7e9ba690d0da Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 11:31:49 +0100
+Subject: [PATCH 08/11] v3.5.0: remove bits using triangle
+
+---
+ contrib/brl/bbas/imesh/algo/CMakeLists.txt    |  11 -
+ .../bbas/imesh/algo/imesh_generate_mesh.cxx   | 282 ------
+ .../brl/bbas/imesh/algo/imesh_generate_mesh.h |  34 -
+ .../brl/bbas/imesh/algo/tests/CMakeLists.txt  |  10 -
+ .../brl/bbas/imesh/algo/tests/test_driver.cxx |  12 -
+ .../imesh/algo/tests/test_generate_mesh.cxx   |  53 --
+ .../bbas/imesh/algo/tests/test_include.cxx    |   1 -
+ contrib/brl/bseg/boxm2/pro/boxm2_processes.h  |   1 -
+ contrib/brl/bseg/boxm2/pro/boxm2_register.cxx |   1 -
+ .../processes/boxm2_texture_mesh_process.cxx  | 842 ------------------
+ contrib/brl/bseg/sdet/CMakeLists.txt          |   1 -
+ contrib/brl/bseg/sdet/sdet_image_mesh.cxx     | 327 -------
+ contrib/brl/bseg/sdet/sdet_image_mesh.h       |  63 --
+ contrib/brl/bseg/sdet/tests/test_include.cxx  |   1 -
+ contrib/gel/gtrl/CMakeLists.txt               |  13 -
+ contrib/gel/gtrl/examples/.NoDartCoverage     |   0
+ contrib/gel/gtrl/examples/CMakeLists.txt      |   2 -
+ contrib/gel/gtrl/examples/triangulate.cxx     |  45 -
+ contrib/gel/gtrl/gtrl_triangulation.cxx       | 110 ---
+ contrib/gel/gtrl/gtrl_triangulation.h         |  31 -
+ contrib/gel/gtrl/tests/test_include.cxx       |   1 -
+ 21 files changed, 1841 deletions(-)
+ delete mode 100644 contrib/brl/bbas/imesh/algo/imesh_generate_mesh.cxx
+ delete mode 100644 contrib/brl/bbas/imesh/algo/imesh_generate_mesh.h
+ delete mode 100644 contrib/brl/bbas/imesh/algo/tests/test_driver.cxx
+ delete mode 100644 contrib/brl/bbas/imesh/algo/tests/test_generate_mesh.cxx
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_texture_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/sdet/sdet_image_mesh.cxx
+ delete mode 100644 contrib/brl/bseg/sdet/sdet_image_mesh.h
+ delete mode 100644 contrib/gel/gtrl/examples/.NoDartCoverage
+ delete mode 100644 contrib/gel/gtrl/examples/CMakeLists.txt
+ delete mode 100644 contrib/gel/gtrl/examples/triangulate.cxx
+ delete mode 100644 contrib/gel/gtrl/gtrl_triangulation.cxx
+ delete mode 100644 contrib/gel/gtrl/gtrl_triangulation.h
+
+diff --git a/contrib/brl/bbas/imesh/algo/CMakeLists.txt b/contrib/brl/bbas/imesh/algo/CMakeLists.txt
+index cdf5af2819..38efa0d264 100644
+--- a/contrib/brl/bbas/imesh/algo/CMakeLists.txt
++++ b/contrib/brl/bbas/imesh/algo/CMakeLists.txt
+@@ -16,20 +16,9 @@ set(imesh_algo_sources
+    )
+ aux_source_directory(Templates imesh_algo_sources)
+ 
+-if(NETLIB_FOUND)
+-  include_directories( ${NETLIB_INCLUDE_DIR} )
+-  set(imesh_algo_sources ${imesh_algo_sources}
+-      imesh_generate_mesh.cxx     imesh_generate_mesh.h)
+-endif()
+-
+ vxl_add_library(LIBRARY_NAME imesh_algo LIBRARY_SOURCES ${imesh_algo_sources} )
+ 
+-if(NETLIB_FOUND)
+-
+-target_link_libraries( imesh_algo imesh ${VXL_LIB_PREFIX}vpgl bpgl bpgl_algo ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vil netlib)
+-else()
+ target_link_libraries( imesh_algo imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vil )
+-endif()
+ 
+ 
+ if( BUILD_TESTING )
+diff --git a/contrib/brl/bbas/imesh/algo/imesh_generate_mesh.cxx b/contrib/brl/bbas/imesh/algo/imesh_generate_mesh.cxx
+deleted file mode 100644
+index 423a673bb3..0000000000
+--- a/contrib/brl/bbas/imesh/algo/imesh_generate_mesh.cxx
++++ /dev/null
+@@ -1,282 +0,0 @@
+-// This is brl/bbas/imesh/algo/imesh_generate_mesh.cxx
+-#include <iostream>
+-#include "imesh_generate_mesh.h"
+-//:
+-// \file
+-extern "C" {
+-#include <triangle.h>
+-}
+-#include <cassert>
+-#include "vgl/vgl_point_2d.h"
+-#include "vgl/vgl_line_segment_2d.h"
+-#include "vgl/vgl_box_2d.h"
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vil/vil_image_view.h"
+-#define GRID_SIZE 1000 // defined by the tolerance for equal vertices
+-
+-// a grid index to find coincident vertices
+-class point_index
+-{
+- public:
+-  point_index(vgl_box_2d<double> const&  bb)
+-  : vi_(0), x_min_(bb.min_x()), y_min_(bb.min_y()),
+-    x_size_(bb.width()), y_size_(bb.height())
+-  {
+-    img_.set_size(GRID_SIZE, GRID_SIZE);
+-    img_.fill(-1);//no vert at location
+-  }
+-
+-  void pt_to_img(vgl_point_2d<double> const& pt, unsigned& i, unsigned& j)
+-  {
+-    double xi = pt.x()-x_min_, yi = pt.y()-y_min_;
+-    i = static_cast<unsigned>((xi*GRID_SIZE)/x_size_);
+-    j = static_cast<unsigned>((yi*GRID_SIZE)/y_size_);
+-    if (i>=GRID_SIZE) i=GRID_SIZE-1;
+-    if (j>=GRID_SIZE) j=GRID_SIZE-1;
+-  }
+-
+-  void insert_point(vgl_point_2d<double> const& pt)
+-  {
+-    unsigned i=0, j=0;
+-    pt_to_img(pt, i, j);
+-    if (img_(i,j)>=0)
+-      return;//point already exists
+-    //insert vertex index
+-    img_(i,j) = vi_++;
+-  }
+-
+-  int vert_index(vgl_point_2d<double> const& pt)
+-  {
+-    unsigned i=0, j=0;
+-    pt_to_img(pt, i, j);
+-    int index = img_(i,j);
+-    assert(index>=0);
+-    return index;
+-  }
+-
+-  unsigned size() const {return vi_;}
+-
+- private:
+-  unsigned vi_;
+-  double x_min_;
+-  double y_min_;
+-  double x_size_;
+-  double y_size_;
+-  vil_image_view<int> img_;
+-};
+-
+-void
+-imesh_generate_mesh_2d(std::vector<vgl_point_2d<double> > const& convex_hull,
+-                       std::vector<vgl_line_segment_2d<double> > const& segs,
+-                       imesh_mesh& mesh)
+-{
+-  // form a grid to store vertex indices in order to detect
+-  // shared vertices
+-  unsigned nch = convex_hull.size();
+-  vgl_box_2d<double> bb;
+-  for (unsigned i = 0; i<nch; ++i)
+-    bb.add(convex_hull[i]);
+-  //insert all points into a grid index
+-  point_index pindx(bb);
+-  for (unsigned i =0; i<nch; ++i)
+-    pindx.insert_point(convex_hull[i]);
+-  unsigned nsegs = segs.size();
+-  for (unsigned i = 0; i<nsegs; ++i) {
+-    pindx.insert_point(segs[i].point1());
+-    pindx.insert_point(segs[i].point2());
+-  }
+-  // pindx now contains a single vertex pointer for each pair
+-  // of coincident line segment endpoints as well as for each
+-  // isolated endpoint
+-  unsigned npts = pindx.size();
+-  //set up the Delunay constrained triangulation input parameters
+-  struct triangulateio in, out, vorout;
+-  in.numberofholes = 0;
+-  in.numberofregions = 0;
+-  in.numberofpointattributes = 0;
+-  in.numberofpoints = npts;
+-  in.pointlist = (REAL *) malloc(in.numberofpoints * 2 * sizeof(REAL));
+-  for (unsigned i = 0; i<nch; ++i) {
+-    unsigned pi = pindx.vert_index(convex_hull[i]);
+-    in.pointlist[2*pi]=convex_hull[i].x();
+-    in.pointlist[2*pi+1]=convex_hull[i].y();
+-  }
+-  // line segments to be inserted into the triangulation
+-  in.numberofsegments = nsegs;
+-  in.segmentlist = (int *) malloc(in.numberofsegments * 2 * sizeof(int));
+-  unsigned m = 0;
+-  for (unsigned i = 0; i<nsegs; ++i) {
+-    unsigned pi1 = pindx.vert_index(segs[i].point1());
+-    unsigned pi2 = pindx.vert_index(segs[i].point2());
+-    in.pointlist[2*pi1]   = segs[i].point1().x();
+-    in.pointlist[2*pi1+1] = segs[i].point1().y();
+-    in.pointlist[2*pi2]   = segs[i].point2().x();
+-    in.pointlist[2*pi2+1] = segs[i].point2().y();
+-    in.segmentlist[m]=pi1;     in.segmentlist[m+1]=pi2;
+-  }
+-  //attributes and markers are not used in this algorithm
+-  in.pointattributelist = nullptr;
+-  in.pointmarkerlist = (int*)malloc(in.numberofpoints * sizeof(int));
+-  for (int i = 0; i<in.numberofpoints; ++i)
+-    in.pointmarkerlist[i]=0;
+-  in.segmentmarkerlist = (int *) malloc(in.numberofsegments * sizeof(int));;
+-  for (int i = 0; i<in.numberofsegments; ++i)
+-    in.segmentmarkerlist[i]=0;
+-
+-  out.pointlist = (REAL *) nullptr;            // Not needed if -N switch used.
+-  // Not needed if -N switch used or number of point attributes is zero:
+-  out.pointattributelist = (REAL *) nullptr;
+-  out.pointmarkerlist = (int *) nullptr; // Not needed if -N or -B switch used.
+-  out.trianglelist = (int *) nullptr;          // Not needed if -E switch used.
+-  out.neighborlist = (int *) nullptr;         // Needed only if -n switch used.
+-  // Needed only if segments are output (-p or -c) and -P not used:
+-  out.segmentlist = (int *) (REAL *) malloc(in.numberofsegments * 2 * sizeof(REAL)); // Suspicious. Why the double cast? and why sizeof(REAL) if it's really int*?
+-  // Needed only if segments are output (-p or -c) and -P and -B not used:
+-  out.segmentmarkerlist = (int *) nullptr;
+-  out.edgelist = (int *) nullptr;             // Needed only if -e switch used.
+-  out.edgemarkerlist = (int *) nullptr;   // Needed if -e used and -B not used.
+-
+-  //A string of switch characters must be provided
+-  // Triangulate the points.  Switches are chosen to read and write a
+-  //   PSLG (p), preserve the convex hull (c), number everything from
+-  //   zero (z), produce an edge list (e), and a triangle neighbor list (n)
+-
+-  triangulate("Qpczen", &in, &out, &vorout);
+-
+-  // construct the imesh data structure
+-  //construct vertices
+-  auto* verts = new imesh_vertex_array<2>();
+-  unsigned k = 0;
+-  for (unsigned i = 0; i<npts; ++i, k+=2)
+-    verts->push_back(imesh_vertex<2>(out.pointlist[k], out.pointlist[k+1]));
+-  std::unique_ptr<imesh_vertex_array_base> v(verts);
+-  mesh.set_vertices(std::move(v));
+-  //construct triangular faces
+-  auto ntri = static_cast<unsigned>(out.numberoftriangles);
+-  auto* faces = new imesh_regular_face_array<3>();
+-  for (unsigned t = 0; t<ntri; ++t)
+-  {
+-    imesh_tri tri(out.trianglelist[t*3],
+-                  out.trianglelist[t*3+1],
+-                  out.trianglelist[t*3+2]);
+-    faces->push_back(tri);
+-  }
+-  //set the faces on the mesh
+-  std::unique_ptr<imesh_face_array_base> f(faces);
+-  mesh.set_faces(std::move(f));
+-}
+-
+-
+-void
+-imesh_generate_mesh_2d_2(std::vector<vgl_point_2d<double> > const& convex_hull,
+-                         std::vector<vgl_line_segment_2d<double> > const& segs,
+-                         std::vector<vgl_point_2d<double> > const & points,
+-                         imesh_mesh& mesh)
+-{
+-  // form a grid to store vertex indices in order to detect
+-  // shared vertices
+-  unsigned nch = convex_hull.size();
+-  vgl_box_2d<double> bb;
+-  for (unsigned i = 0; i<nch; ++i)
+-    bb.add(convex_hull[i]);
+-  //insert all points into a grid index
+-  point_index pindx(bb);
+-  for (unsigned i =0; i<nch; ++i)
+-    pindx.insert_point(convex_hull[i]);
+-  unsigned nsegs = segs.size();
+-  for (unsigned i = 0; i<nsegs; ++i) {
+-    pindx.insert_point(segs[i].point1());
+-    pindx.insert_point(segs[i].point2());
+-  }
+-
+-  for (auto point : points) {
+-      pindx.insert_point(point);
+-  }
+-  // pindx now contains a single vertex pointer for each pair
+-  // of coincident line segment endpoints as well as for each
+-  // isolated endpoint
+-  unsigned npts = pindx.size();
+-  //set up the Delunay constrained triangulation input parameters
+-  struct triangulateio in, out, vorout;
+-  in.numberofholes = 0;
+-  in.numberofregions = 0;
+-  in.numberofpointattributes = 0;
+-  in.numberofpoints = npts;
+-  in.pointlist = (REAL *) malloc(in.numberofpoints * 2 * sizeof(REAL));
+-  for (unsigned i = 0; i<nch; ++i) {
+-    unsigned pi = pindx.vert_index(convex_hull[i]);
+-    in.pointlist[2*pi]=convex_hull[i].x();
+-    in.pointlist[2*pi+1]=convex_hull[i].y();
+-  }
+-  for (auto point : points) {
+-    unsigned pi = pindx.vert_index(point);
+-    in.pointlist[2*pi]=point.x();
+-    in.pointlist[2*pi+1]=point.y();
+-  }
+-
+-  // line segments to be inserted into the triangulation
+-  in.numberofsegments = nsegs;
+-  in.segmentlist = (int *) malloc(in.numberofsegments * 2 * sizeof(int));
+-  unsigned m = 0;
+-  for (unsigned i = 0; i<nsegs; ++i) {
+-    unsigned pi1 = pindx.vert_index(segs[i].point1());
+-    unsigned pi2 = pindx.vert_index(segs[i].point2());
+-    in.pointlist[2*pi1]   = segs[i].point1().x();
+-    in.pointlist[2*pi1+1] = segs[i].point1().y();
+-    in.pointlist[2*pi2]   = segs[i].point2().x();
+-    in.pointlist[2*pi2+1] = segs[i].point2().y();
+-    in.segmentlist[m]=pi1;     in.segmentlist[m+1]=pi2;
+-  }
+-  //attributes and markers are not used in this algorithm
+-  in.pointattributelist = nullptr;
+-  in.pointmarkerlist = (int*)malloc(in.numberofpoints * sizeof(int));
+-  for (int i = 0; i<in.numberofpoints; ++i)
+-    in.pointmarkerlist[i]=0;
+-  in.segmentmarkerlist = (int *) malloc(in.numberofsegments * sizeof(int));;
+-  for (int i = 0; i<in.numberofsegments; ++i)
+-    in.segmentmarkerlist[i]=0;
+-
+-  out.pointlist = (REAL *) nullptr;            // Not needed if -N switch used.
+-  // Not needed if -N switch used or number of point attributes is zero:
+-  out.pointattributelist = (REAL *) nullptr;
+-  out.pointmarkerlist = (int *) nullptr; // Not needed if -N or -B switch used.
+-  out.trianglelist = (int *) nullptr;          // Not needed if -E switch used.
+-  out.neighborlist = (int *) nullptr;         // Needed only if -n switch used.
+-  // Needed only if segments are output (-p or -c) and -P not used:
+-  out.segmentlist = (int *) (REAL *) malloc(in.numberofsegments * 2 * sizeof(REAL)); // Suspicious. Why the double cast? and why sizeof(REAL) if it's really int*?
+-  // Needed only if segments are output (-p or -c) and -P and -B not used:
+-  out.segmentmarkerlist = (int *) nullptr;
+-  out.edgelist = (int *) nullptr;             // Needed only if -e switch used.
+-  out.edgemarkerlist = (int *) nullptr;   // Needed if -e used and -B not used.
+-
+-  //A string of switch characters must be provided
+-  // Triangulate the points.  Switches are chosen to read and write a
+-  //   PSLG (p), preserve the convex hull (c), number everything from
+-  //   zero (z), produce an edge list (e), and a triangle neighbor list (n)
+-
+-  triangulate("Qpczen", &in, &out, &vorout);
+-
+-  // construct the imesh data structure
+-  //construct vertices
+-  auto* verts = new imesh_vertex_array<2>();
+-  unsigned k = 0;
+-  for (unsigned i = 0; i<npts; ++i, k+=2)
+-    verts->push_back(imesh_vertex<2>(out.pointlist[k], out.pointlist[k+1]));
+-  std::unique_ptr<imesh_vertex_array_base> v(verts);
+-  mesh.set_vertices(std::move(v));
+-  //construct triangular faces
+-  auto ntri = static_cast<unsigned>(out.numberoftriangles);
+-  auto* faces = new imesh_regular_face_array<3>();
+-  for (unsigned t = 0; t<ntri; ++t)
+-  {
+-    imesh_tri tri(out.trianglelist[t*3],
+-                  out.trianglelist[t*3+1],
+-                  out.trianglelist[t*3+2]);
+-    faces->push_back(tri);
+-  }
+-  //set the faces on the mesh
+-  std::unique_ptr<imesh_face_array_base> f(faces);
+-  mesh.set_faces(std::move(f));
+-}
+diff --git a/contrib/brl/bbas/imesh/algo/imesh_generate_mesh.h b/contrib/brl/bbas/imesh/algo/imesh_generate_mesh.h
+deleted file mode 100644
+index 9736c69aad..0000000000
+--- a/contrib/brl/bbas/imesh/algo/imesh_generate_mesh.h
++++ /dev/null
+@@ -1,34 +0,0 @@
+-// This is brl/bbas/imesh/algo/imesh_generate_mesh.h
+-#ifndef imesh_generate_mesh_h_
+-#define imesh_generate_mesh_h_
+-//:
+-// \file
+-// \brief mesh generation functions
+-// \author J.L. Mundy
+-// \date March 16, 2011
+-//
+-// \verbatim
+-//  Modifications
+-//   <none yet>
+-// \endverbatim
+-
+-#include <iostream>
+-#include <vector>
+-#include <imesh/imesh_mesh.h>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vgl/vgl_fwd.h>
+-
+-//: Fill the convex hull with triangles, constrained by the line segments
+-void
+-imesh_generate_mesh_2d(std::vector<vgl_point_2d<double> > const& convex_hull,
+-                       std::vector< vgl_line_segment_2d<double> > const & segs,
+-                       imesh_mesh& mesh);
+-void
+-imesh_generate_mesh_2d_2(std::vector<vgl_point_2d<double> > const& convex_hull,
+-                       std::vector<vgl_line_segment_2d<double> > const& segs,
+-                       std::vector<vgl_point_2d<double> > const & points,
+-                       imesh_mesh& mesh);
+-
+-#endif // imesh_generate_mesh_h_
+diff --git a/contrib/brl/bbas/imesh/algo/tests/CMakeLists.txt b/contrib/brl/bbas/imesh/algo/tests/CMakeLists.txt
+index fe15f6b4a2..7d58eba683 100644
+--- a/contrib/brl/bbas/imesh/algo/tests/CMakeLists.txt
++++ b/contrib/brl/bbas/imesh/algo/tests/CMakeLists.txt
+@@ -5,13 +5,3 @@ add_executable( imesh_algo_test_template_include test_template_include.cxx )
+ target_link_libraries( imesh_algo_test_template_include imesh_algo)
+ 
+ include( ${VXL_CMAKE_DIR}/FindNetlib.cmake )
+-if(NETLIB_FOUND)
+-add_executable( imesh_algo_test_all
+-  test_driver.cxx
+-  test_generate_mesh.cxx
+-)
+-target_link_libraries( imesh_algo_test_all imesh imesh_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
+-if( VXL_RUN_FAILING_TESTS ) ## This test always fails in travis builds, segfault during memory free operation
+-add_test( NAME imesh_test_generate_mesh COMMAND $<TARGET_FILE:imesh_algo_test_all> test_generate_mesh)
+-endif()
+-endif()
+diff --git a/contrib/brl/bbas/imesh/algo/tests/test_driver.cxx b/contrib/brl/bbas/imesh/algo/tests/test_driver.cxx
+deleted file mode 100644
+index d21c4aefc0..0000000000
+--- a/contrib/brl/bbas/imesh/algo/tests/test_driver.cxx
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#include "testlib/testlib_register.h"
+-
+-
+-DECLARE( test_generate_mesh );
+-
+-void
+-register_tests()
+-{
+-  REGISTER( test_generate_mesh );
+-}
+-
+-DEFINE_MAIN;
+diff --git a/contrib/brl/bbas/imesh/algo/tests/test_generate_mesh.cxx b/contrib/brl/bbas/imesh/algo/tests/test_generate_mesh.cxx
+deleted file mode 100644
+index 94f57f46ef..0000000000
+--- a/contrib/brl/bbas/imesh/algo/tests/test_generate_mesh.cxx
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#include <vector>
+-#include <iostream>
+-#include "testlib/testlib_test.h"
+-#include <imesh/algo/imesh_generate_mesh.h>
+-#include "vgl/vgl_point_2d.h"
+-#include "vgl/vgl_line_segment_2d.h"
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-
+-static void test_generate_mesh()
+-{
+-  vgl_point_2d<double> p0(0.0, 0.0);
+-  vgl_point_2d<double> p1(1.0, 0.0);
+-  vgl_point_2d<double> p2(1.0, 10.0);
+-  vgl_point_2d<double> p3(0.0, 10.0);
+-  vgl_point_2d<double> p4(0.25, 5.0);
+-  vgl_point_2d<double> p5(0.75, 5.0);
+-  std::vector<vgl_point_2d<double> > c_hull;
+-  c_hull.push_back(p0);   c_hull.push_back(p1);
+-  c_hull.push_back(p2);   c_hull.push_back(p3);
+-  vgl_line_segment_2d<double> ls(p4, p5);
+-  std::vector<vgl_line_segment_2d<double> > segs;
+-  segs.push_back(ls);
+-  imesh_mesh mesh;
+-  imesh_generate_mesh_2d(c_hull, segs, mesh);
+-  TEST("num_verts, num_faces", mesh.num_verts()*mesh.num_faces(), 36);
+-  const imesh_face_array_base& faces = mesh.faces();
+-  TEST("face verts", faces(0,0)+faces(0,1)+faces(0,2), 7);
+-  vgl_point_2d<double> p6(0.25, 1);
+-  vgl_point_2d<double> p7(0.75, 1);
+-  vgl_line_segment_2d<double> l2(p5, p7);
+-  segs.push_back(l2);
+-  imesh_mesh mesh2;
+-  imesh_generate_mesh_2d(c_hull, segs,mesh2);
+-  unsigned nverts = mesh2.num_verts();
+-  unsigned ntris =  mesh2.num_faces();
+-  TEST("two segs", nverts*ntris, 56);
+-#if 0
+-  const imesh_regular_face_array<3>& tris =
+-    static_cast<const imesh_regular_face_array<3>&>(mesh2.faces());
+-  const imesh_vertex_array<2>& verts = mesh2.vertices<2>();
+-  std::cout << "verts\n";
+-  for (unsigned i = 0; i< nverts; ++i)
+-    std::cout << "v[" << i << "](" << verts[i][0] << ' ' << verts[i][1] << ")\n";
+-  std::cout << "faces\n";
+-  for (unsigned i = 0; i< ntris; ++i)
+-    std::cout << "f[" << i << "](" << tris[i][0]<< ' ' << tris[i][1]
+-             << ' ' << tris[i][2] << ")\n";
+-#endif
+-}
+-
+-TESTMAIN(test_generate_mesh);
+diff --git a/contrib/brl/bbas/imesh/algo/tests/test_include.cxx b/contrib/brl/bbas/imesh/algo/tests/test_include.cxx
+index bc7bcd02e4..bc5f817ebe 100644
+--- a/contrib/brl/bbas/imesh/algo/tests/test_include.cxx
++++ b/contrib/brl/bbas/imesh/algo/tests/test_include.cxx
+@@ -1,5 +1,4 @@
+ #include <imesh/algo/imesh_detect.h>
+-#include <imesh/algo/imesh_generate_mesh.h>
+ #include <imesh/algo/imesh_imls_surface.h>
+ #include <imesh/algo/imesh_intersect.h>
+ #include <imesh/algo/imesh_kd_tree.h>
+diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
+index feae6ae9b2..4d68be95b0 100644
+--- a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
++++ b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
+@@ -15,7 +15,6 @@ DECLARE_FUNC_CONS(boxm2_write_scene_xml_process);
+ DECLARE_FUNC_CONS(boxm2_add_block_process);
+ DECLARE_FUNC_CONS(boxm2_export_textured_mesh_process);
+ DECLARE_FUNC_CONS(boxm2_export_mesh_process);
+-DECLARE_FUNC_CONS(boxm2_texture_mesh_process);
+ DECLARE_FUNC_CONS(boxm2_describe_scene_process);
+ DECLARE_FUNC_CONS(boxm2_create_stream_cache_process);
+ DECLARE_FUNC_CONS(boxm2_roi_init_process);
+diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
+index ea5dfbd6e5..a05b9e5c58 100644
+--- a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
++++ b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
+@@ -35,7 +35,6 @@ void boxm2_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_add_block_process,       "boxm2AddBlockProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_textured_mesh_process,"boxm2ExportTexturedMeshProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_mesh_process,"boxm2ExportMeshProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_texture_mesh_process,"boxm2TextureMeshProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_describe_scene_process,"boxm2DescribeSceneProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_stream_cache_process, "boxm2CreateStreamCacheProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_roi_init_process, "boxm2RoiInitProcess");
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_texture_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_texture_mesh_process.cxx
+deleted file mode 100644
+index 8254869a0d..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_texture_mesh_process.cxx
++++ /dev/null
+@@ -1,842 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_texture_mesh_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for exporting a texture mapped mesh of a scene
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2011
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include "vul/vul_timer.h"
+-#include "vnl/vnl_random.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_save.h"
+-#include <vil/algo/vil_gauss_filter.h>
+-
+-//vgl
+-#include "vgl/vgl_distance.h"
+-#include "vgl/vgl_triangle_scan_iterator.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//vpgl camera stuff
+-#include "vpgl/vpgl_perspective_camera.h"
+-// for loading cameras from directory
+-#include <bpgl/bpgl_camera_utils.h>
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/algo/imesh_render.h>
+-
+-namespace boxm2_texture_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 0;
+-
+-  //struct for passing 3d triangles (couldn't find a 3d triangle in VGL...)
+-  struct triangle_3d {
+-    vgl_point_3d<double> points[3];
+-    unsigned face_id;
+-  };
+-
+-  //aux data structures (norm images, vis images)
+-  std::vector<vil_image_view<int>* > vis_images_;
+-  std::vector<vil_image_view<float>* > normx_, normy_, normz_;
+-
+-  //main helper method - fills out a map of imesh_mesh's, each texture mapped with a separate image
+-  void boxm2_texture_mesh_from_imgs(const std::string& im_dir,
+-                                    const std::string& cam_dir,
+-                                    const std::string& out_dir,
+-                                    imesh_mesh& in_mesh,
+-                                    std::map<std::string, imesh_mesh>& meshes);
+-
+-  //populates a vector of visibility images (by face id int)
+-  void boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                            imesh_mesh& in_mesh,  unsigned int ni, unsigned int nj);
+-
+-  //stores a norm image (3d face norm) for each of the texture images
+-  void compute_norm_images( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                            imesh_mesh& in_mesh,unsigned int ni, unsigned int nj);
+-
+-  //smooths the vector of norm images above
+-  void smooth_norm_images(double sigma);
+-
+-  //checks if a triangle in UV space is visible.  us and vs are double buffers of length 3
+-  bool face_is_visible( vpgl_perspective_camera<double>* cam,
+-                        vil_image_view<int>* vis_img,
+-                        triangle_3d& world_tri);
+-
+-  //matches textures
+-  void boxm2_match_textures(std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                            std::vector<std::string>& imfiles,
+-                            imesh_mesh& in_mesh,
+-                            std::map<std::string, std::vector<unsigned> >& app_faces,
+-                            std::map<std::string, vpgl_perspective_camera<double>* >& texture_cams);
+-
+-  //returns a list of visible triangles given a camera,
+-  //visibility image, and world coordinate 3d triangle
+-  std::vector<triangle_3d> get_visible_triangles(vpgl_perspective_camera<double>* cam,
+-                                                vil_image_view<int>* vis_img,
+-                                                triangle_3d& world_tri);
+-
+-  //given revised lists of visible images, norms, etc, return the index of the best view
+-  int get_best_view(std::vector<vpgl_perspective_camera<double>* >& cams,
+-                    std::vector<vil_image_view<int>* >& vis_images,
+-                    std::vector<vil_image_view<float>* >& normx,
+-                    std::vector<vil_image_view<float>* >& normy,
+-                    std::vector<vil_image_view<float>* >& normz,
+-                    triangle_3d& world_tri );
+-
+-  vgl_vector_3d<double> calc_smooth_norm( vpgl_perspective_camera<double>* cam,
+-                                          vil_image_view<int>* vis_img,
+-                                          vil_image_view<float>* normx,
+-                                          vil_image_view<float>* normy,
+-                                          vil_image_view<float>* normz,
+-                                          triangle_3d& world_tri);
+-}
+-
+-bool boxm2_texture_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_texture_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "imesh_mesh_sptr";  //depth image
+-  input_types_[i++] = "vcl_string";       //directory of scene images
+-  input_types_[i++] = "vcl_string";       //directory of corresponding cams
+-  input_types_[i++] = "vcl_string";       //output dir of saved mesh
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  //output_types_[0] = "boxm2_scene_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_texture_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_texture_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-  unsigned argIdx = 0;
+-  imesh_mesh_sptr mesh = pro.get_input<imesh_mesh_sptr>(argIdx++);
+-  std::string img_dir = pro.get_input<std::string>(argIdx++);
+-  std::string cam_dir = pro.get_input<std::string>(argIdx++);
+-  std::string out_dir = pro.get_input<std::string>(argIdx++);
+-
+-  //create the mesh directory
+-  if (out_dir != "") {
+-    if (!vul_file::make_directory_path(out_dir.c_str())) {
+-      std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
+-      return false;
+-    }
+-  }
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  //Texture map the mesh
+-  //////////////////////////////////////////////////////////////////////////////
+-  vul_timer t;
+-  std::map<std::string, imesh_mesh> meshes;
+-  boxm2_texture_mesh_from_imgs(img_dir, cam_dir, out_dir, *mesh, meshes);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// Write out in VRML format
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //output file and stream
+-  std::string vrfile = out_dir + "/vrmesh.wrl";
+-  std::ofstream os(vrfile.c_str());
+-
+-  //write each submesh into one file
+-  std::map<std::string, imesh_mesh>::iterator subMesh;
+-  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh)
+-  {
+-    imesh_mesh& sMesh = subMesh->second;
+-    std::cout<<"Writing sub mesh: "<<sMesh.tex_source()<<" has "<<sMesh.num_faces()<<" faces"<<std::endl;
+-    imesh_write_vrml(os, sMesh);
+-  }
+-  os.close();
+-  std::cout<<"Texture Mapping Mesh Time: "<<t.all()<<"ms"<<std::endl;
+-
+-  return true;
+-}
+-
+-
+-//: Given a directory of images, dir cams, an input mesh, this function creates a map of textured meshes
+-// (imesh doesn't ostensibly handle meshes from multiple textures)
+-void boxm2_texture_mesh_process_globals::boxm2_texture_mesh_from_imgs(const std::string& im_dir,
+-                                                                      const std::string& cam_dir,
+-                                                                      const std::string& out_dir,
+-                                                                      imesh_mesh& in_mesh,
+-                                                                      std::map<std::string, imesh_mesh>& meshes)
+-{
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // BEGIN TEXTURE MAPPING
+-  // Gather cameras and iamges that will contribute to the texture
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::vector<std::string> allims = boxm2_util::images_from_directory(im_dir);
+-
+-  //create blank texturemap image
+-  vil_image_view_base_sptr first_im = boxm2_util::prepare_input_image(allims[0]);
+-  auto* imptr = (vil_image_view<vil_rgba<vxl_byte> >*) first_im.ptr();
+-  vil_rgba<vxl_byte> mean = boxm2_util::mean_pixel(*imptr);
+-  vil_image_view<vil_rgba<vxl_byte> > def(4,4);
+-  def.fill( mean );
+-  vil_save(def, (out_dir + "/empty.png").c_str());
+-
+-  //chop paths to make mesh portable
+-  for (auto & allim : allims) {
+-    std::string full_path = allim;
+-    std::string rel_path = vul_file::basename(full_path);
+-    allim = rel_path;
+-  }
+-  std::vector<vpgl_perspective_camera<double>* > allcams = bpgl_camera_utils::cameras_from_directory(cam_dir);
+-  if (allims.size() != allcams.size()) {
+-    std::cout<<"Texture images are not 1 to 1 with cameras:: dirs "<<im_dir<<" and "<<cam_dir<<std::endl;
+-    return;
+-  }
+-
+-  //choose a few random images
+-  std::vector<std::string> imfiles;
+-  std::vector<vpgl_perspective_camera<double>* > cameras;
+-
+-  //unsigned int handpicked[] = {0,1,13,25,33,40,51,64,73,82,96,105,109,114,125,133,140,147,153,164,175};
+-  //int handpicked[] = { 0,1,13,25,33,51,73,96,109,114,133,147,164};
+-  //int handpicked[] = {0,12,18};
+-  //int handpicked[] = {0, 1, 26, 33, 56, 96, 114, 133 };
+-  //int handpicked[] = {0, 8, 16, 23 };
+-  for (unsigned int i=0; i<allims.size(); ++i) {
+-      imfiles.push_back(allims[i]);
+-      cameras.push_back(allcams[i]);
+-      std::cout<<"added image: "<<imfiles[i]<<std::endl;
+-  }
+-#if 0
+-  vnl_random rand(9667566);
+-  for (int i=0; i<5; ++i) {
+-    unsigned filenum = rand.lrand32(1, allims.size()-1);
+-    imfiles.push_back(allims[filenum]);
+-    cameras.push_back(allcams[filenum]);
+-  }
+-#endif
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // make sure mesh has computed vertex normals
+-  ////////////////////////////////////////////////////////////////////////////////
+-  in_mesh.compute_face_normals();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Render Visibility Images
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"calculating visibility images (for each textured image)"<<std::endl;
+-  boxm2_visible_faces(cameras, in_mesh,first_im->ni(),first_im->nj());
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Render norm images (and then smooth them)
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"calculating norm images (for each texture image)"<<std::endl;
+-  compute_norm_images(cameras, in_mesh,first_im->ni(),first_im->nj());
+-  smooth_norm_images(30.0);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // match each face to best image, store a list for each texture image
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"Populating faces for each texture"<<std::endl;
+-  std::map<std::string, std::vector<unsigned> > app_faces; //image_name to face_list
+-  std::map<std::string, vpgl_perspective_camera<double>* > texture_cams;
+-  boxm2_match_textures(cameras, imfiles, in_mesh, app_faces, texture_cams);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // For each image/appearance:
+-  //   - create a vert list
+-  //   - create a face list
+-  //   - create a sub mesh that is textured
+-  ////////////////////////////////////////////////////////////////////////////////
+-  auto& in_faces = (imesh_face_array&) in_mesh.faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-  //for each appearance (texture image), create an imesh_mesh (subMesh);
+-  std::cout<<"Creating Sub Meshes for each texture"<<std::endl;
+-  std::map<std::string, std::vector<unsigned> >::iterator apps;
+-  for (apps = app_faces.begin(); apps != app_faces.end(); ++apps)
+-  {
+-    //for each appearance, we're creating a whole new mesh
+-    // first create the face list
+-    auto* flist = new imesh_face_array();
+-
+-    //now create the vertex list
+-    auto* verts3 = new imesh_vertex_array<3>();
+-
+-    //get faces list corresponding to this texture
+-    std::vector<unsigned>& face_list = apps->second;
+-    for (unsigned int i=0; i<face_list.size(); ++i) {
+-      //get old face
+-      unsigned old_fIdx = face_list[i];
+-
+-      //old face vertices
+-      unsigned v1 = in_faces[old_fIdx][0];
+-      unsigned v2 = in_faces[old_fIdx][1];
+-      unsigned v3 = in_faces[old_fIdx][2];
+-
+-      //push these vertices onto the new vert list
+-      verts3->push_back( imesh_vertex<3>(in_verts[v1][0], in_verts[v1][1], in_verts[v1][2]) );
+-      verts3->push_back( imesh_vertex<3>(in_verts[v2][0], in_verts[v2][1], in_verts[v2][2]) );
+-      verts3->push_back( imesh_vertex<3>(in_verts[v3][0], in_verts[v3][1], in_verts[v3][2]) );
+-
+-      imesh_tri tri(3*i, 3*i+1, 3*i+2);
+-      flist->push_back(tri);
+-    }
+-
+-    //create the submesh using the auto ptrs
+-    std::unique_ptr<imesh_vertex_array_base> v3(verts3);
+-    std::unique_ptr<imesh_face_array_base> f3(flist);
+-    imesh_mesh subMesh(std::move(v3), std::move(f3));
+-
+-    std::cout<<"Setting tex source: "<<apps->first<<std::endl;
+-    meshes[apps->first] = subMesh;
+-    meshes[apps->first].set_tex_source(apps->first);
+-  }
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  //For each mesh, map each vertex
+-  //////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"Mapping sub meshes for each texture"<<std::endl;
+-  std::map<std::string, imesh_mesh>::iterator subMesh;
+-  auto txCam = texture_cams.begin();
+-  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh, ++txCam)
+-  {
+-    imesh_mesh& mesh = subMesh->second;
+-    imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-    unsigned nverts = mesh.num_verts();
+-
+-    //texture map the non empty appearances
+-    if (txCam->first != "empty.png")
+-    {
+-      std::vector<vgl_point_2d<double> > tex_coords(nverts, vgl_point_2d<double>(0.0,0.0));
+-      for (unsigned iv = 0; iv<nverts; ++iv)
+-      {
+-        //find camera corresponding to this texture
+-        vpgl_perspective_camera<double>* closest = txCam->second;
+-        vgl_point_2d<double> principal_point = closest->get_calibration().principal_point();
+-        double ni = principal_point.x()*2.0;
+-        double nj = principal_point.y()*2.0;
+-
+-        //project the vertex onto the camera, store the texture coordinate
+-        double x = verts[iv][0];
+-        double y = verts[iv][1];
+-        double z = verts[iv][2];
+-        double u,v;
+-        closest->project(x, y, z, u, v);
+-
+-        //flip v about the y axis
+-        v=nj-v;
+-
+-        //store the tex_coordinate
+-        vgl_point_2d<double> uv(u/ni,v/nj);
+-        tex_coords[iv] = uv;
+-      }
+-      mesh.set_tex_coords(tex_coords);
+-    }
+-    else {
+-      //otherwise put in default texture (grey)
+-      std::vector<vgl_point_2d<double> > tex_coords(nverts, vgl_point_2d<double>(0.0,0.0));
+-      for (unsigned iv = 0; iv<nverts; ++iv) {
+-        tex_coords[iv] = vgl_point_2d<double>(.5, .5);
+-      }
+-      mesh.set_tex_coords(tex_coords);
+-    }
+-  }
+-}
+-
+-
+-//image_name to face_list
+-void boxm2_texture_mesh_process_globals::boxm2_match_textures(std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                                                              std::vector<std::string>& imfiles,
+-                                                              imesh_mesh& in_mesh,
+-                                                              std::map<std::string, std::vector<unsigned> >& app_faces,
+-                                                              std::map<std::string, vpgl_perspective_camera<double>* >& texture_cams)
+-{
+-  //grab faces and vertices from the mesh
+-  auto& in_faces = (imesh_face_array&) in_mesh.faces();
+-  unsigned nfaces = in_mesh.num_faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-
+-  //for each face, determine which view is best
+-  for (unsigned iface = 0; iface<nfaces; ++iface)
+-  {
+-    //make a triangle_3d out of this face
+-    triangle_3d world_tri;
+-    world_tri.face_id = iface;
+-    for (int i=0; i<3; ++i) {
+-      unsigned vertexId = in_faces[iface][i];
+-      double x = in_verts[vertexId][0];
+-      double y = in_verts[vertexId][1];
+-      double z = in_verts[vertexId][2];
+-      world_tri.points[i] = vgl_point_3d<double>(x,y,z);
+-    }
+-
+-    //create list of cameras from which you can see this face
+-    std::vector<std::string> visible_imfiles;
+-    std::vector<vpgl_perspective_camera<double>* > visible_views;
+-    std::vector<vil_image_view<int>* > vis_images;
+-    std::vector<vil_image_view<float>* > normx, normy, normz;
+-    for (unsigned int i=0; i<vis_images_.size(); ++i) {
+-      if ( face_is_visible( cameras[i], vis_images_[i], world_tri) ) {
+-        visible_imfiles.push_back(imfiles[i]);
+-        visible_views.push_back(cameras[i]);
+-        vis_images.push_back(vis_images_[i]);
+-        normx.push_back(normx_[i]);
+-        normy.push_back(normy_[i]);
+-        normz.push_back(normz_[i]);
+-      }
+-    }
+-
+-    //now compare the normal to each of the visible view cameras
+-#ifdef DEBUG
+-    vgl_vector_3d<double>& normal = in_faces.normal(iface);
+-    std::cout<<"Face "<<iface<<" normal: "<<normal<<std::endl;
+-#endif
+-
+-    //find camera with the closest look vector to this normal
+-    //int closeIdx = boxm2_util::find_nearest_cam(normal, visible_views);
+-    int closeIdx = get_best_view(visible_views, vis_images, normx, normy, normz, world_tri);
+-    vpgl_perspective_camera<double>* closest = nullptr;
+-    std::string im_name = "empty.png";
+-    if (closeIdx >= 0) {
+-      closest = visible_views[closeIdx];
+-      im_name = visible_imfiles[closeIdx];
+-    }
+-
+-    //grab appropriate face list (create it if it's not there)
+-    auto iter = app_faces.find(im_name);
+-    if ( iter == app_faces.end() ) {
+-      std::cout<<"boxm2_match_textures:: Adding image "<<im_name<<" to texture list"<<std::endl;
+-      std::vector<unsigned> faceList;
+-      faceList.push_back(iface);
+-      app_faces[im_name] = faceList;
+-
+-      //keep track of the camera
+-      texture_cams[im_name] = closest;
+-    }
+-    else {
+-      app_faces[im_name].push_back(iface);
+-    }
+-  }
+-
+-#if 0
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Now there is a set of faces without textures,
+-  // for each face
+-  //    for each image
+-  //      - find visible portions of these faces, record area and angle from dist
+-  //    find angle < 60 degrees AND largest area patch
+-  //    cut the face such that the patch is exposed (patch may be some arbitrary polygon)
+-  //    triangulate the n-gon into n triangles
+-  //    add the *new* points to the mesh, as well as the new faces
+-  //    remember to not leave the old face in the mesh...
+-  ////////////////////////////////////////////////////////////////////////////////
+-  for (unsigned iface = 0; iface<nfaces; ++iface)
+-  {
+-    //whole first chunk figures out which set of triangles this face should be broken into
+-    double max_area = 0.0;
+-    double max_img = -1;
+-    std::vector<triangle_3d> final_triangles;
+-    for (int imIdx=0; imIdx<vis_images.size(); ++imIdx) {
+-      //if this angle is too large, just pass over it
+-      double midAngle = angle(in_faces.normal(iface), -1*cameras[imIdx]->principal_axis()); // return acos(cos_angle(a,b));
+-      if (midAngle > vnl_math::pi/3) continue;
+-
+-      //find visible portion of iface on this image, record area (make a 3d tri out of it first)
+-      triangle_3d world_tri;
+-      world_tri.face_id = iface;
+-      for (int i=0; i<3; ++i) {
+-        unsigned vertexId = in_faces[iface][i];
+-        double x = in_verts[vertexId][0];
+-        double y = in_verts[vertexId][1];
+-        double z = in_verts[vertexId][2];
+-        world_tri.points[i] = vgl_point_3d<double>(x,y,z);
+-      }
+-      std::vector<triangle_3d> vis_tris = get_visible_triangles(cameras[imIdx], vis_images[imIdx], world_tri);
+-
+-      //get the total area of the triangles
+-      double totalArea = 0;
+-      for (int tri_i = 0; tri_i < vis_tris.size(); ++tri_i) {
+-        totalArea+= vgl_triangle_3d_area(vis_tris[tri_i].points[0],
+-                                         vis_tris[tri_i].points[1],
+-                                         vis_tris[tri_i].points[2]);
+-      }
+-
+-      //store it if it's the biggest patch so far
+-      if (totalArea > max_area) {
+-        max_area = totalArea;
+-        max_img = imIdx;
+-        final_triangles = vis_tris;
+-      }
+-    }
+-
+-    //now that you have the visible triangles that will be mapped in your mesh...
+-    // 1. add the new vertices
+-    // 2. add the new faces
+-
+-    // 3. add the new faces to the correct texture list
+-    std::string im_name =
+-    app_faces[im_name].push_back(iface);
+-  }
+-
+-  //Be wary of this interpolation iterator - didn't match up with the imesh one
+-  bvgl_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *values, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
+-
+-  // Create a new face list with the faces split by visibility
+-  imesh_regular_face_array<3>* newFaces = new imesh_regular_face_array<3>();
+-#endif
+-}
+-
+-//: Compares each visible camera with the average normal from each norm image, chooses the one that most closely matches
+-int boxm2_texture_mesh_process_globals::get_best_view(std::vector<vpgl_perspective_camera<double>* >& cams,
+-                                                      std::vector<vil_image_view<int>* >& vis_images,
+-                                                      std::vector<vil_image_view<float>* >& normx,
+-                                                      std::vector<vil_image_view<float>* >& normy,
+-                                                      std::vector<vil_image_view<float>* >& normz,
+-                                                      triangle_3d& world_tri)
+-{
+-  if (cams.empty()) {
+-    return -1;
+-  }
+-
+-  //find minimal dot product amongst cams/images
+-  double minAngle = 10e20;
+-  int minCam = -1;
+-  for (unsigned int i=0; i<cams.size(); ++i) {
+-    //get the smooth norm corresponding to this camera view
+-    vgl_vector_3d<double> normal = calc_smooth_norm( cams[i], vis_images[i], normx[i], normy[i], normz[i], world_tri);
+-    //std::cout<<"   face "<<world_tri.face_id<<" image "<<i<<" normal: "<<normal<<std::endl;
+-
+-    double dotProd = dot_product( normal, -1*cams[i]->principal_axis());
+-    double ang = std::acos(dotProd);
+-#ifdef DEBUG
+-    if ( std::fabs(normal.z()) > .8 ) {
+-      std::cout<<"Face normal: "<<normal<<"  principal axis: "<<cams[i]->principal_axis()<<'\n'
+-              <<" and angle: " <<ang * vnl_math::deg_per_rad<<std::endl;
+-    }
+-#endif
+-    if (ang < minAngle && ang < vnl_math::pi/2.0) {
+-      minAngle = ang;
+-      minCam = i;
+-    }
+-  }
+-
+-  //return the min cam
+-  return minCam;
+-}
+-
+-vgl_vector_3d<double>
+-boxm2_texture_mesh_process_globals::calc_smooth_norm( vpgl_perspective_camera<double>* cam,
+-                                                      vil_image_view<int>* vis_img,
+-                                                      vil_image_view<float>* normx,
+-                                                      vil_image_view<float>* normy,
+-                                                      vil_image_view<float>* normz,
+-                                                      triangle_3d& world_tri)
+-{
+-  //project triangle
+-  double us[3], vs[3];
+-  for (int vIdx=0; vIdx<3; ++vIdx) {
+-    //project these verts into UV
+-    double x = world_tri.points[vIdx].x();
+-    double y = world_tri.points[vIdx].y();
+-    double z = world_tri.points[vIdx].z();
+-    double u,v;
+-    cam->project(x, y, z, u, v);
+-    us[vIdx] = u;
+-    vs[vIdx] = v;
+-  }
+-
+-  //now create a polygon, and find the integer image coordinates (U,V) that this polygon covers
+-  int ni = vis_img->ni();
+-  int nj = vis_img->nj();
+-  double nx=0.0, ny=0.0, nz=0.0; //initialize normal
+-  int numNormals = 0;
+-
+-  vgl_triangle_scan_iterator<double> tsi;
+-  tsi.a.x = us[0];  tsi.a.y = vs[0];
+-  tsi.b.x = us[1];  tsi.b.y = vs[1];
+-  tsi.c.x = us[2];  tsi.c.y = vs[2];
+-  for (tsi.reset(); tsi.next(); ) {
+-    int y = tsi.scany();
+-    if (y<0 || y>=nj) continue;
+-    int min_x = tsi.startx();
+-    int max_x = tsi.endx();
+-    if (min_x >= ni || max_x < 0)
+-      continue;
+-    if (min_x < 0) min_x = 0;
+-    if (max_x >= ni) max_x = ni-1;
+-    for (int x = min_x; x <= max_x; ++x) {
+-      if ( (*vis_img)(x,y) == int(world_tri.face_id) ) {
+-        nx += (*normx)(x,y);
+-        ny += (*normy)(x,y);
+-        nz += (*normz)(x,y);
+-        numNormals++;
+-      }
+-    }
+-  }
+-  return {nx/numNormals, ny/numNormals, nz/numNormals};
+-}
+-
+-
+-//:
+-// returns a list of visible triangles given a camera,
+-// visibility image, and world coordinate 3d triangle
+-std::vector<boxm2_texture_mesh_process_globals::triangle_3d>
+-boxm2_texture_mesh_process_globals::get_visible_triangles(vpgl_perspective_camera<double>* /*cam*/,
+-                                                          vil_image_view<int>* /*vis_img*/,
+-                                                          triangle_3d& /*world_tri*/)
+-{
+-  std::cerr << "TODO: boxm2_texture_mesh_process_globals::get_visible_triangles is not yet implemented\n";
+-  return std::vector<triangle_3d>();
+-}
+-
+-
+-//:
+-// given a camera, and an image with ID faces, this method returns true if the entire
+-// triangle (id face_id) is unoccluded from this point of view
+-bool boxm2_texture_mesh_process_globals::face_is_visible( vpgl_perspective_camera<double>* cam,
+-                                                          vil_image_view<int>* vis_img,
+-                                                          triangle_3d& world_tri)
+-{
+-  //project triangle
+-  double us[3], vs[3];
+-  for (int vIdx=0; vIdx<3; ++vIdx) {
+-    //project these verts into UV
+-    double x = world_tri.points[vIdx].x();
+-    double y = world_tri.points[vIdx].y();
+-    double z = world_tri.points[vIdx].z();
+-    double u,v;
+-    cam->project(x, y, z, u, v);
+-    us[vIdx] = u;
+-    vs[vIdx] = v;
+-  }
+-
+-  //now create a polygon, and find the integer image coordinates (U,V) that this polygon covers
+-  int ni = vis_img->ni();
+-  int nj = vis_img->nj();
+-  unsigned int numPixels = 0;
+-  unsigned int numMatches = 0;
+-
+-  vgl_triangle_scan_iterator<double> tsi;
+-  tsi.a.x = us[0];  tsi.a.y = vs[0];
+-  tsi.b.x = us[1];  tsi.b.y = vs[1];
+-  tsi.c.x = us[2];  tsi.c.y = vs[2];
+-  for (tsi.reset(); tsi.next(); ) {
+-    int y = tsi.scany();
+-    if (y<0 || y>=nj) continue;
+-    int min_x = tsi.startx();
+-    int max_x = tsi.endx();
+-    if (min_x >= ni || max_x < 0)
+-      continue;
+-    if (min_x < 0) min_x = 0;
+-    if (max_x >= ni) max_x = ni-1;
+-    for (int x = min_x; x <= max_x; ++x) {
+-      ++numPixels;
+-      if ( (*vis_img)(x,y) == int(world_tri.face_id) )
+-        ++numMatches;
+-    }
+-  }
+-
+-  //if the majority match, it's visible
+-  if ( (double) numMatches / (double) numPixels > .99)
+-    return true;
+-  else
+-    return false;
+-}
+-
+-//: Constructs vector of visibility images - images that identify which triangle is visible at which pixel.
+-// Function is more or less complete - not much more to it.
+-void boxm2_texture_mesh_process_globals::boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                                                              imesh_mesh& in_mesh, unsigned int ni=1024, unsigned int nj=768)
+-{
+-  auto& in_faces = (imesh_face_array&) in_mesh.faces();
+-
+-  unsigned nfaces = in_mesh.num_faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-
+-  // iterate over each camera, creating a visibility image for each
+-  for (auto pcam : cameras)
+-  {
+-    //// get the principal point of the cam for image size
+-    //std::cout<<(*pcam);
+-    //vgl_point_2d<double> principal_point = pcam->get_calibration().principal_point();
+-    //unsigned ni = (unsigned) (principal_point.x()*2.0);
+-    //unsigned nj = (unsigned) (principal_point.y()*2.0);
+-
+-    // render the face_id/distance image
+-    vil_image_view<double> depth_im(ni, nj);
+-    auto*   face_im = new vil_image_view<int>(ni, nj);
+-    depth_im.fill(10e100);  //Initial depth is huge,
+-    face_im->fill(-1); //initial face id is -1
+-    for (unsigned iface = 0; iface<nfaces; ++iface)
+-    {
+-      // get the vertices from the face, project into UVs
+-      double us[3], vs[3], dists[3];
+-
+-      for (int vIdx=0; vIdx<3; ++vIdx) {
+-        unsigned vertIdx = in_faces[iface][vIdx];
+-        // project these verts into UV
+-        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
+-        double u,v;
+-        pcam->project(x, y, z, u, v);
+-        us[vIdx] = u;
+-        vs[vIdx] = v;
+-        // keep track of distance to each vertex
+-        dists[vIdx] = vgl_distance(vgl_point_3d<double>(x,y,z), pcam->get_camera_center());
+-      }
+-
+-      // render the triangle label onto the label image, using the depth image
+-      vgl_point_3d<double> v1(us[0], vs[0], dists[0]);
+-      vgl_point_3d<double> v2(us[1], vs[1], dists[1]);
+-      vgl_point_3d<double> v3(us[2], vs[2], dists[2]);
+-      imesh_render_triangle_label<int>(v1, v2, v3, (int) iface, (*face_im), depth_im);
+-    } //end for iface
+-
+-    // keep the vis_image just calculated
+-    vis_images_.push_back(face_im);
+-  }
+-}
+-
+-//: Constructs vector of visibility images - images that identify which triangle is visible at which pixel.
+-// Function is more or less complete - not much more to it.
+-void boxm2_texture_mesh_process_globals::compute_norm_images( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                                                              imesh_mesh& in_mesh,unsigned int ni, unsigned int nj)
+-{
+-  auto& in_faces = (imesh_face_array&) in_mesh.faces();
+-  unsigned nfaces = in_mesh.num_faces();
+-
+-  for (unsigned int i=0; i<vis_images_.size(); ++i) {
+-#if 0
+-    // get the principal point/ni,nj
+-    vpgl_perspective_camera<double>* pcam = cameras[i];
+-    vgl_point_2d<double> principal_point = pcam->get_calibration().principal_point();
+-    unsigned ni = (unsigned) (principal_point.x()*2.0);
+-    unsigned nj = (unsigned) (principal_point.y()*2.0);
+-#endif // 0
+-    // create a norm x,y, and z image for each visibility image
+-    vil_image_view<int>* vis = vis_images_[i];
+-    auto* nx = new vil_image_view<float>(ni, nj);
+-    auto* ny = new vil_image_view<float>(ni, nj);
+-    auto* nz = new vil_image_view<float>(ni, nj);
+-    vgl_vector_3d<double> paxis = cameras[i]->principal_axis();
+-    nx->fill( (float) paxis.x());
+-    ny->fill( (float) paxis.y());
+-    nz->fill( (float) paxis.z());
+-    for (unsigned int x=0; x<ni; ++x) {
+-      for (unsigned int y=0; y<nj; ++y) {
+-        int face_id = (*vis)(x,y);
+-        if (face_id >= 0 && face_id < (int)nfaces) {
+-          vgl_vector_3d<double> fnorm = in_faces.normal(face_id);
+-          (*nx)(x,y) = (float) fnorm.x();
+-          (*ny)(x,y) = (float) fnorm.y();
+-          (*nz)(x,y) = (float) fnorm.z();
+-        }
+-      }
+-    }
+-
+-    //keep the vis_image just calculated
+-    normx_.push_back(nx);
+-    normy_.push_back(ny);
+-    normz_.push_back(nz);
+-  }
+-
+-#if 0 // commented out ...
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-  //iterate over each camera, creating a visibility image for each
+-  for (unsigned int i=0; i<cameras.size(); ++i)
+-  {
+-    //get the principal point of the cam for image size
+-    vpgl_perspective_camera<double>* pcam = cameras[i];
+-    vgl_point_2d<double> principal_point = pcam->get_calibration().principal_point();
+-    unsigned ni = (unsigned) (principal_point.x()*2.0);
+-    unsigned nj = (unsigned) (principal_point.y()*2.0);
+-
+-    // render the norm images in each dimension
+-    vil_image_view<float>* nx = new vil_image_view<float>(ni, nj);
+-    vil_image_view<float>* ny = new vil_image_view<float>(ni, nj);
+-    vil_image_view<float>* nz = new vil_image_view<float>(ni, nj);
+-    vgl_vector_3d<double> paxis = cameras[i]->principal_axis();
+-    nx->fill( (float) paxis.x());
+-    ny->fill( (float) paxis.y());
+-    nz->fill( (float) paxis.z());
+-    vil_image_view<double> depth_im(ni, nj);
+-    depth_im.fill(10e100);
+-    for (unsigned iface = 0; iface<nfaces; ++iface)
+-    {
+-      //get face normal - this will be the "ID"
+-      vgl_vector_3d<double> fnorm = in_faces.normal(iface);
+-
+-      //get the vertices from the face, project into UVs
+-      double us[3], vs[3], dists[3];
+-      for (int vIdx=0; vIdx<3; ++vIdx) {
+-        unsigned vertIdx = in_faces[iface][vIdx];
+-
+-        //project these verts into UV
+-        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
+-        double u,v;
+-        pcam->project(x, y, z, u, v);
+-        us[vIdx] = u;
+-        vs[vIdx] = v;
+-
+-        //keep track of distance to each vertex
+-        dists[vIdx] = vgl_distance(vgl_point_3d<double>(x,y,z), pcam->get_camera_center());
+-      }
+-
+-      //render the triangle label onto the label image, using the depth image
+-      vgl_point_3d<double> v1(us[0], vs[0], dists[0]);
+-      vgl_point_3d<double> v2(us[1], vs[1], dists[1]);
+-      vgl_point_3d<double> v3(us[2], vs[2], dists[2]);
+-      imesh_render_triangle_label<float>(v1, v2, v3, (float) fnorm.x(), (*nx), depth_im);
+-      imesh_render_triangle_label<float>(v1, v2, v3, (float) fnorm.y(), (*ny), depth_im);
+-      imesh_render_triangle_label<float>(v1, v2, v3, (float) fnorm.z(), (*nz), depth_im);
+-    } //end for iface
+-
+-    //keep the vis_image just calculated
+-    normx_.push_back(nx);
+-    normy_.push_back(ny);
+-    normz_.push_back(nz);
+-  }
+-#endif // 0
+-}
+-
+-void boxm2_texture_mesh_process_globals::smooth_norm_images(double sigma)
+-{
+-  vil_gauss_filter_5tap_params params(sigma); //set SIGMA
+-  for (unsigned int i=0; i<normx_.size(); ++i) {
+-    vil_image_view<float>* currX = normx_[i];
+-    auto* newX = new vil_image_view<float>(currX->ni(), currX->nj());
+-    vil_gauss_filter_5tap(*currX, *newX, params);
+-    //store the filtered image
+-    delete currX;
+-    normx_[i] = newX;
+-
+-    //repeat for y
+-    vil_image_view<float>* currY = normy_[i];
+-    auto* newY = new vil_image_view<float>(currY->ni(), currY->nj());
+-    vil_gauss_filter_5tap(*currY, *newY, params);
+-    delete currY;
+-    normy_[i] = newY;
+-
+-    //z
+-    vil_image_view<float>* currZ = normz_[i];
+-    auto* newZ = new vil_image_view<float>(currZ->ni(), currZ->nj());
+-    vil_gauss_filter_5tap(*currZ, *newZ, params);
+-    delete currZ;
+-    normz_[i] = newZ;
+-  }
+-}
+diff --git a/contrib/brl/bseg/sdet/CMakeLists.txt b/contrib/brl/bseg/sdet/CMakeLists.txt
+index 60a1da2706..081a0a6452 100644
+--- a/contrib/brl/bseg/sdet/CMakeLists.txt
++++ b/contrib/brl/bseg/sdet/CMakeLists.txt
+@@ -39,7 +39,6 @@ set(sdet_sources
+     sdet_nms.cxx                         sdet_nms.h
+     sdet_third_order_edge_det_params.cxx sdet_third_order_edge_det_params.h
+     sdet_third_order_edge_det.cxx        sdet_third_order_edge_det.h
+-    sdet_image_mesh.cxx                  sdet_image_mesh.h
+     sdet_image_mesh_params.cxx           sdet_image_mesh_params.h
+     sdet_denoise_mrf.cxx                 sdet_denoise_mrf.h
+     sdet_denoise_mrf_params.cxx          sdet_denoise_mrf_params.h
+diff --git a/contrib/brl/bseg/sdet/sdet_image_mesh.cxx b/contrib/brl/bseg/sdet/sdet_image_mesh.cxx
+deleted file mode 100644
+index 81af9ebb83..0000000000
+--- a/contrib/brl/bseg/sdet/sdet_image_mesh.cxx
++++ /dev/null
+@@ -1,327 +0,0 @@
+-// This is brl/bseg/sdet/sdet_image_mesh.cxx
+-#include "sdet_image_mesh.h"
+-#include "vgl/vgl_point_2d.h"
+-#include "vgl/vgl_line_segment_2d.h"
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_math.h"
+-#include "vil/vil_convert.h"
+-#include "vil/vil_new.h"
+-#include "vil/vil_pixel_format.h"
+-#include "vil/vil_save.h"
+-#include <vtol/vtol_edge_2d_sptr.h>
+-#include <vsol/vsol_line_2d.h>
+-#include <vtol/vtol_edge_2d.h>
+-#include <vdgl/vdgl_digital_curve.h>
+-#include <vdgl/vdgl_interpolator.h>
+-#include <vdgl/vdgl_interpolator_sptr.h>
+-#include <vdgl/vdgl_edgel_chain.h>
+-#include <vdgl/vdgl_edgel_chain_sptr.h>
+-
+-#include <brip/brip_vil_float_ops.h>
+-#include <brip/brip_line_generator.h>
+-
+-#include <sdet/sdet_detector_params.h>
+-#include <sdet/sdet_detector.h>
+-#include <sdet/sdet_fit_lines_params.h>
+-#include <sdet/sdet_fit_lines.h>
+-#include <bil/algo/bil_cedt.h>
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-#include <imesh/algo/imesh_generate_mesh.h>
+-
+-//note: this method is somewhat of a hack and should be replaced by
+-// a computed step function transition width, e.g. by a 2nd derivative
+-// operator
+-bool sdet_image_mesh:: step_boundary(vgl_line_segment_2d<double> const& parent,
+-                                     vgl_line_segment_2d<double>& child0,
+-                                     vgl_line_segment_2d<double>& child1)
+-{
+-  if (! resc_ ) return false;
+-  unsigned ni = resc_->ni(), nj = resc_->nj();
+-  vgl_vector_2d<double> n = parent.normal();
+-  vgl_point_2d<double> p1 = parent.point1();
+-  vgl_point_2d<double> p2 = parent.point2();
+-  vgl_point_2d<double> p10 = p1 - step_half_width_*n;
+-  vgl_point_2d<double> p11 = p1 + step_half_width_*n;
+-  vgl_point_2d<double> p20 = p2 - step_half_width_*n;
+-  vgl_point_2d<double> p21 = p2 + step_half_width_*n;
+-  if (p10.x()<0 || p10.y()<0||p20.x()<0||p20.y()<0||
+-      p10.x()>=ni ||p10.y()>=nj||p20.x()>=ni||p20.y()>=nj)
+-    return false;
+-  else
+-    child0 = vgl_line_segment_2d<double>(p10, p20);
+-  if (p11.x()<0 || p11.y()<0||p21.x()<0||p21.y()<0||
+-      p11.x()>=ni ||p11.y()>=nj||p21.x()>=ni||p21.y()>=nj)
+-    return false;
+-  else
+-    child1 = vgl_line_segment_2d<double>(p11, p21);
+-  return true;
+-}
+-
+-//---------------------------------------------------------------
+-// Constructors
+-//
+-//----------------------------------------------------------------
+-
+-// constructor from a parameter block (the only way)
+-sdet_image_mesh::sdet_image_mesh(sdet_image_mesh_params& imp)
+-  : sdet_image_mesh_params(imp), mesh_valid_(false), resc_(nullptr)
+-{
+-}
+-
+-// Destructor
+-sdet_image_mesh::~sdet_image_mesh()
+-= default;
+-
+-bool sdet_image_mesh::compute_line_segments(vil_image_resource_sptr const& resc,
+-                                            std::vector<vgl_line_segment_2d<double> > & segs)
+-{
+-  if (!resc) return false;
+-  mesh_valid_ = false;
+-  sdet_detector_params dp;
+-  dp.smooth= smooth_;
+-  dp.noise_multiplier = thresh_;
+-  dp.aggressive_junction_closure=0;
+-  dp.junctionp=false;
+-  sdet_detector det(dp);
+-  det.SetImage(resc);
+-  det.DoContour();
+-  std::vector<vtol_edge_2d_sptr>* edges = det.GetEdges();
+-  if (!edges) {
+-    std::cout<<"sdet_image_mesh:: could not detect edges in buffer"<<std::endl;
+-    return false;
+-  }
+-
+-  //fit lines on edges
+-  sdet_fit_lines_params flp;
+-  flp.min_fit_length_ = min_fit_length_;
+-  flp.rms_distance_ = rms_distance_;
+-  sdet_fit_lines fl(flp);
+-  fl.set_edges(*edges);
+-  bool fit_worked = fl.fit_lines();
+-  if (!fit_worked) {
+-    std::cout<<"sdet_image_mesh:: could not fit lines on edges"<<std::endl;
+-    return false;
+-  }
+-
+-  fl.get_line_segs(segs);
+-  return true;
+-}
+-
+-bool sdet_image_mesh::compute_mesh()
+-{
+-  vil_image_view<unsigned char> line_img(resc_->ni(),resc_->nj());//some resource
+-  line_img.fill(255);
+-
+-  std::vector<vgl_line_segment_2d<double> > segs, segs_pair;
+-  sdet_detector_params dp;
+-  dp.smooth= smooth_;
+-  dp.noise_multiplier = thresh_;
+-  dp.aggressive_junction_closure=0;
+-  dp.junctionp=false;
+-  sdet_detector det(dp);
+-  det.SetImage(resc_);
+-  det.DoContour();
+-  std::vector<vtol_edge_2d_sptr>* edges = det.GetEdges();
+-  for (auto & edge : *edges)
+-  {
+-    vsol_curve_2d_sptr c = edge->curve();
+-    vdgl_digital_curve_sptr dc = c->cast_to_vdgl_digital_curve();
+-    if (!dc)
+-      continue;
+-    vdgl_interpolator_sptr intp = dc->get_interpolator();
+-    vdgl_edgel_chain_sptr ec = intp->get_edgel_chain();
+-    int nedgl = ec->size();
+-    for (int i=0; i<nedgl; i++)
+-    {
+-      // anchor_points_.push_back(vgl_point_2d<double>((*ec)[i].x(),(*ec)[i].y()));
+-      line_img((int)(*ec)[i].x(),(int) (*ec)[i].y())=0;
+-    }
+-  }
+-
+- bil_cedt dt(line_img);
+- if (!dt.compute_cedt())
+-  std::cout<<"Error in computing DT"<<std::endl;
+-
+- vil_image_view<float> dtimg=dt.cedtimg();
+- vil_image_view<unsigned char> dtimg_threshed(dtimg.ni(),dtimg.nj());dtimg_threshed.fill(0);
+- for (unsigned i=0;i<dtimg.ni();i++)
+-   for (unsigned j=0;j<dtimg.nj();j++)
+-     if (dtimg(i,j)<2.0)
+-       dtimg_threshed(i,j)=255;
+- vil_save(dtimg_threshed,"F:/visdt/dt_thresh.png");
+-
+- //segs_pair.clear();
+- std::vector<vgl_line_segment_2d<double> > lines;
+- this->compute_line_segments(vil_new_image_resource_of_view(dtimg_threshed),lines);
+- segs_pair.insert(segs_pair.end(),lines.begin(),lines.end());
+- line_img.fill(255);
+-
+- for (auto & i : segs_pair)
+- {
+-   bool init = true;
+-   float xs= float(i.point1().x());
+-   float ys= float(i.point1().y());
+-   float xe= float(i.point2().x());
+-   float ye= float(i.point2().y());
+-   float x=0.0f;
+-   float y=0.0f;
+-   while (brip_line_generator::generate(init, xs, ys, xe, ye, x, y))
+-   {
+-     int xi = (int)x;
+-     int yi = (int)y; //convert the pixel location to integer
+-     line_img(xi, yi)=0;
+-   }
+- }
+- vil_save(line_img,"F:/visdt/line_img_more.png");
+-
+- bil_cedt dt1(line_img);
+- if (!dt1.compute_cedt())
+-   std::cout<<"Error in computing DT"<<std::endl;
+-
+-  //generate a 2d mesh based on the edges
+-  vgl_point_2d<double> ul(0.0, 0.0), ur(resc_->ni()-1,0.0);
+-  vgl_point_2d<double> lr(resc_->ni()-1, resc_->nj()-1), ll(0.0, resc_->nj()-1);
+-
+-  std::vector<vgl_point_2d<double> > convex_hull;
+-  convex_hull.push_back(ul);   convex_hull.push_back(ur);
+-  convex_hull.push_back(lr);   convex_hull.push_back(ll);
+-  std::vector<vgl_point_2d<double> > cvexh = convex_hull;
+-  imesh_mesh mesh_one;
+-  imesh_generate_mesh_2d_2(convex_hull, segs_pair,anchor_points_, mesh_one);
+-
+-  //lift vertices to 3-d
+-  const imesh_vertex_array<2>& verts = mesh_one.vertices<2>();
+-  auto* verts3 = new imesh_vertex_array<3>();
+-
+-  // convert image to float
+-  vil_image_view<float> view = brip_vil_float_ops::convert_to_float(resc_);
+-  unsigned ni = view.ni(), nj = view.nj();
+-  float minv=0, maxv=0;
+-  vil_math_value_range(view, minv, maxv);
+-  unsigned nverts = mesh_one.num_verts();
+-  for (unsigned iv = 0; iv<nverts; ++iv)
+-  {
+-    auto i = static_cast<unsigned>(verts[iv][0]);
+-    auto j = static_cast<unsigned>(verts[iv][1]);
+-    double height =maxv;
+-    if (i<ni && j<nj)
+-      height = static_cast<double>(view(i,j));
+-    height = maxv-height;
+-    imesh_vertex<3> v3(verts[iv][0], verts[iv][1], height);
+-    verts3->push_back(v3);
+-  }
+-  std::unique_ptr<imesh_vertex_array_base> v3(verts3);
+-  mesh_one.set_vertices(std::move(v3));
+-  //mesh_valid_ = true;
+-
+-  ///////////////////////////////////////////////////////
+-  //compute anchor points, and rerun generate_mesh_2d_2
+-  ///////////////////////////////////////////////////////
+-  this->set_anchor_points(mesh_one,dt1.cedtimg());
+-
+-  std::cout<<"Number of anchor points: "<<anchor_points_.size()<<std::endl;
+-  imesh_generate_mesh_2d_2(cvexh, segs_pair, anchor_points_, mesh_);
+-  const imesh_vertex_array<2>& verts2 = mesh_.vertices<2>();
+-  auto* newVerts = new imesh_vertex_array<3>();
+-
+-  // convert image to float
+-  ni = view.ni(), nj = view.nj();
+-  vil_math_value_range(view, minv, maxv);
+-  nverts = mesh_.num_verts();
+-  for (unsigned iv = 0; iv<nverts; ++iv)
+-  {
+-    auto i = static_cast<unsigned>(verts2[iv][0]);
+-    auto j = static_cast<unsigned>(verts2[iv][1]);
+-    double height =maxv;
+-    if (i<ni && j<nj)
+-      height = static_cast<double>(view(i,j));
+-    height = maxv-height;
+-    imesh_vertex<3> v3(verts2[iv][0], verts2[iv][1], height);
+-    newVerts->push_back(v3);
+-  }
+-  std::unique_ptr<imesh_vertex_array_base> v3_ptr(newVerts);
+-  mesh_.set_vertices(std::move(v3_ptr));
+-  mesh_valid_ = true;
+-
+-  return true;
+-}
+-
+-//takes the 3d mesh, calculates depth disparity map (from top)
+-void sdet_image_mesh::set_anchor_points(imesh_mesh& mesh, vil_image_view<float> dt_img)
+-{
+-  //create a tri_depth image
+-  int ni = resc_->ni();
+-  int nj = resc_->nj();
+-  vil_image_view<float> tri_depth(ni, nj);
+-
+-  //find the range of triangles in the Z direction
+-  auto& faces = (imesh_regular_face_array<3>&) mesh.faces();
+-  imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-  unsigned nfaces = mesh.num_faces();
+-  for (unsigned iface = 0; iface<nfaces; ++iface)
+-  {
+-    unsigned v1 = faces[iface][0];
+-    unsigned v2 = faces[iface][1];
+-    unsigned v3 = faces[iface][2];
+-    double verts_x[] = { verts[v1][0], verts[v2][0], verts[v3][0] };
+-    double verts_y[] = { verts[v1][1], verts[v2][1], verts[v3][1] };
+-    double verts_z[] = { verts[v1][2], verts[v2][2], verts[v3][2] };
+-    bvgl_triangle_interpolation_iterator<double> tsi(verts_x, verts_y, verts_z);
+-
+-    //scan the triangle, storing the depth
+-    for (tsi.reset(); tsi.next(); ) {
+-      int y = tsi.scany();
+-      if (y<0 || y>=nj) continue;
+-      int min_x = tsi.startx();
+-      int max_x = tsi.endx();
+-      if (min_x >= ni || max_x < 0)
+-        continue;
+-      if (min_x < 0) min_x = 0;
+-      if (max_x >= ni) max_x = ni-1;
+-      for (int x = min_x; x <= max_x; ++x) {
+-        tri_depth(x,y) = (float) tsi.value_at(x);
+-      }
+-    }
+-  }
+-
+-  //get range of triangle depths
+-  float minz, maxz;
+-  vil_math_value_range(tri_depth, minz, maxz);
+-
+-  //maximum z diff allowed for a triangle is 1/512 of the total z range
+-  vil_image_view<float> z_img = brip_vil_float_ops::convert_to_float(resc_);
+-
+-  //for ( unsigned niter=1;niter<16;niter*=2)
+-  {
+-    double max_z_diff = (maxz-minz)/64.0;
+-    for (int i=0; i<ni; i+=4)
+-      for (int j=0; j<nj; j+=4)
+-        if ( std::fabs( tri_depth(i,j)- z_img(i,j) ) > max_z_diff && dt_img(i,j) >= 3.5 )
+-          anchor_points_.emplace_back(i,j);
+-  }
+-}
+-
+-//ensure the image is a byte image (between 0 and 255)
+-void sdet_image_mesh::set_image(vil_image_resource_sptr const& resource)
+-{
+-  resc_ = resource;
+-  if (resc_->pixel_format() != VIL_PIXEL_FORMAT_BYTE )
+-  {
+-    std::cout<<"Converting image from "<<resc_->pixel_format()<<" to vxl_byte image"<<std::endl;
+-
+-    //make the float image on the range of [0,1];
+-    vil_image_view_base_sptr stretched = vil_convert_stretch_range( float(0.0f), resc_->get_view());
+-
+-    //makvil_image_view_base_sptr byte_img = vil_convert_cast<vxl_byte>(0, stretched*255.0f);
+-    vil_image_view_base_sptr dest_sptr = new vil_image_view<float>(stretched->ni(), stretched->nj());
+-    auto* dest = (vil_image_view<float>*) dest_sptr.ptr();
+-    auto* stf  = (vil_image_view<float>*) stretched.ptr();
+-    vil_convert_stretch_range<float>( *stf, *dest, 0.0f, 255.0f);
+-
+-    //now turn em into bytes
+-    vil_image_view_base_sptr converted = vil_convert_cast<vxl_byte>(0, dest_sptr);
+-
+-    //create new resource sptr
+-    resc_ = vil_new_image_resource_of_view(*converted.ptr());
+-  }
+-}
+diff --git a/contrib/brl/bseg/sdet/sdet_image_mesh.h b/contrib/brl/bseg/sdet/sdet_image_mesh.h
+deleted file mode 100644
+index 3f5a1129ef..0000000000
+--- a/contrib/brl/bseg/sdet/sdet_image_mesh.h
++++ /dev/null
+@@ -1,63 +0,0 @@
+-// This is brl/bseg/sdet/sdet_image_mesh.h
+-#ifndef sdet_image_mesh_h_
+-#define sdet_image_mesh_h_
+-//---------------------------------------------------------------------
+-//:
+-// \file
+-// \brief a processor for triangulating a images based on detected line segments
+-//
+-//  This algorithm triangulates an image into a 3-d mesh based on
+-//  detected line segments. The line segments are fit to edge detection
+-//  contour chains.
+-//
+-// \author
+-//  J.L. Mundy - March 21, 2011
+-//
+-// \verbatim
+-//  Modifications
+-//   <none>
+-// \endverbatim
+-//
+-//-------------------------------------------------------------------------
+-#include <iostream>
+-#include <vector>
+-#ifdef _MSC_VER
+-#  include <vcl_msvc_warnings.h>
+-#endif
+-#include <vgl/vgl_line_segment_2d.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_mesh.h>
+-#include <vil/vil_image_resource.h>
+-#include <vil/vil_image_view.h>
+-
+-class sdet_image_mesh : public sdet_image_mesh_params
+-{
+- public:
+-  // === Constructors/destructor ===
+-  sdet_image_mesh(sdet_image_mesh_params& imp);
+-  ~sdet_image_mesh() override;
+-
+-  // === Process methods ===
+-  void set_image(vil_image_resource_sptr const& resource);
+-  bool compute_mesh();
+-
+-  // === Accessors ===
+-  imesh_mesh& get_mesh() { return mesh_; }
+-  bool mesh_valid() const { return mesh_valid_; }
+-
+- protected:
+-  // === protected methods ===
+-  bool step_boundary(vgl_line_segment_2d<double> const& parent,
+-                     vgl_line_segment_2d<double>& child0,
+-                     vgl_line_segment_2d<double>& child1);
+-  void set_anchor_points(imesh_mesh& mesh, vil_image_view<float> dt_img);
+-  bool compute_line_segments(vil_image_resource_sptr const& resc,
+-                             std::vector<vgl_line_segment_2d<double> >& segs);
+-
+-  // === members ===
+-  bool mesh_valid_;      //: process state flag
+-  vil_image_resource_sptr resc_;
+-  imesh_mesh mesh_;
+-};
+-
+-#endif // sdet_image_mesh_h_
+diff --git a/contrib/brl/bseg/sdet/tests/test_include.cxx b/contrib/brl/bseg/sdet/tests/test_include.cxx
+index 01ca358991..0e4bcaf1f9 100644
+--- a/contrib/brl/bseg/sdet/tests/test_include.cxx
++++ b/contrib/brl/bseg/sdet/tests/test_include.cxx
+@@ -22,7 +22,6 @@
+ #include <sdet/sdet_grid_finder_params.h>
+ #include <sdet/sdet_harris_detector.h>
+ #include <sdet/sdet_harris_detector_params.h>
+-#include <sdet/sdet_image_mesh.h>
+ #include <sdet/sdet_image_mesh_params.h>
+ #include <sdet/sdet_img_edge.h>
+ #include <sdet/sdet_mrf_bp.h>
+diff --git a/contrib/gel/gtrl/CMakeLists.txt b/contrib/gel/gtrl/CMakeLists.txt
+index 13562bb93c..709e5b6b55 100644
+--- a/contrib/gel/gtrl/CMakeLists.txt
++++ b/contrib/gel/gtrl/CMakeLists.txt
+@@ -14,21 +14,8 @@ set(gtrl_sources
+ 
+ aux_source_directory(Templates gtrl_sources)
+ 
+-include( ${VXL_CMAKE_DIR}/FindNetlib.cmake )
+-
+-if(NETLIB_FOUND)
+-  include_directories(${NETLIB_INCLUDE_DIR})
+-
+-  set(gtrl_sources ${gtrl_sources}
+-    gtrl_triangulation.cxx gtrl_triangulation.h
+-  )
+-endif()
+-
+ vxl_add_library(LIBRARY_NAME gtrl LIBRARY_SOURCES ${gtrl_sources})
+ target_link_libraries(gtrl ${VXL_LIB_PREFIX}vbl)
+-if(NETLIB_FOUND)
+-  target_link_libraries(gtrl ${NETLIB_LIBRARIES})
+-endif()
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+diff --git a/contrib/gel/gtrl/examples/.NoDartCoverage b/contrib/gel/gtrl/examples/.NoDartCoverage
+deleted file mode 100644
+index e69de29bb2..0000000000
+diff --git a/contrib/gel/gtrl/examples/CMakeLists.txt b/contrib/gel/gtrl/examples/CMakeLists.txt
+deleted file mode 100644
+index ee97397685..0000000000
+--- a/contrib/gel/gtrl/examples/CMakeLists.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-add_executable( triangulate triangulate.cxx )
+-target_link_libraries( triangulate gtrl )
+diff --git a/contrib/gel/gtrl/examples/triangulate.cxx b/contrib/gel/gtrl/examples/triangulate.cxx
+deleted file mode 100644
+index fa8a0577b3..0000000000
+--- a/contrib/gel/gtrl/examples/triangulate.cxx
++++ /dev/null
+@@ -1,45 +0,0 @@
+-//:
+-// \file
+-// Simple example program to demonstrate the use of the gtrl_triangulation class
+-// \author Peter Vanroose
+-// \date   8 October 2002
+-
+-#include <iostream>
+-#include <gtrl/gtrl_triangulation.h>
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-
+-inline std::ostream& operator<<(std::ostream& os, gtrl_vertex const& v)
+-{
+-  return os << '(' << v.x() << ',' << v.y() << ')';
+-}
+-
+-inline std::ostream& operator<<(std::ostream& os, gtrl_triangle const& t)
+-{
+-  return os << '[' << *(t.p1()) << ',' << *(t.p2()) << ',' << *(t.p3()) << ']';
+-}
+-
+-int main()
+-{
+-  std::vector<gtrl_vertex_sptr> v(4);
+-  v[0] = new gtrl_vertex( 1.0, 1.0);
+-  v[1] = new gtrl_vertex(50.0, 1.0);
+-  v[2] = new gtrl_vertex(50.0,50.0);
+-  v[3] = new gtrl_vertex( 1.0,50.0);
+-  gtrl_polygon poly(v);
+-  gtrl_triangulation tri(poly); tri.run();
+-
+-  std::vector<gtrl_vertex_sptr> p = tri.get_points();
+-  std::vector<gtrl_triangle_sptr> t = tri.get_triangles();
+-
+-  std::cout << p.size() << " triangle points:\n";
+-  for (auto & i : p)
+-    std::cout << ' ' << *i << '\n';
+-
+-  std::cout << t.size() << " triangles:\n";
+-  for (auto & i : t)
+-    std::cout << ' ' << *i << '\n';
+-
+-  return 0;
+-}
+diff --git a/contrib/gel/gtrl/gtrl_triangulation.cxx b/contrib/gel/gtrl/gtrl_triangulation.cxx
+deleted file mode 100644
+index 52103988f8..0000000000
+--- a/contrib/gel/gtrl/gtrl_triangulation.cxx
++++ /dev/null
+@@ -1,110 +0,0 @@
+-// This is gel/gtrl/gtrl_triangulation.cxx
+-//:
+-// \file
+-// \author crossge@crd.ge.com
+-
+-#include <utility>
+-#include "gtrl_triangulation.h"
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-
+-// UNIX specific timer close
+-#ifdef _WIN32
+-#define NO_TIMER
+-#endif
+-
+-// triangulation library
+-extern "C" {
+-#ifdef SINGLE
+-#define REAL float
+-#else /* not SINGLE */
+-#define REAL double
+-#endif /* not SINGLE */
+-
+-#include <triangle.h> // from netlib, for triangulate()
+-}
+-
+-
+-gtrl_triangulation::gtrl_triangulation( gtrl_polygon poly)
+-  : poly_(std::move( poly))
+-{
+-}
+-
+-void gtrl_triangulation::run()
+-{
+-  REAL *points= new REAL[poly_.size()*2];
+-  int *markers= new int[poly_.size()];
+-
+-  // for some reason, the markers don't seem to
+-  //   like starting at 0
+-  constexpr int offset = 100;
+-
+-  std::vector<gtrl_vertex_sptr> pointlist;
+-
+-  for (int i=0; i< poly_.size(); i++)
+-    {
+-      gtrl_vertex_sptr p= poly_[i];
+-      pointlist.push_back( p);
+-
+-      points[i*2]  = p->x();
+-      points[i*2+1]= p->y();
+-      markers[i]= i+offset;
+-    }
+-
+-  // input
+-  triangulateio in;
+-  in.numberofpoints= poly_.size();
+-  in.pointlist= points;
+-  in.pointmarkerlist= markers;
+-  in.numberofpointattributes= 0;
+-  in.numberofholes= 0;
+-  in.trianglelist= nullptr;
+-
+-  // output
+-  triangulateio out;
+-  out.pointlist= nullptr;
+-  out.trianglelist= nullptr;
+-  out.pointmarkerlist= nullptr;
+-  out.numberofpointattributes= 0;
+-  out.numberofholes= 0;
+-  out.numberoftriangleattributes= 0;
+-
+-  // do triangulation
+-  triangulate( "-z -i -q", &in, &out, nullptr);
+-
+-  // create any new points that are necessary
+-  for (int i=0; i< out.numberofpoints; i++)
+-    {
+-      if (out.pointmarkerlist[i]< offset)
+-        {
+-          pointlist.push_back( new gtrl_vertex( out.pointlist[i*2],
+-                                                out.pointlist[i*2+1]));
+-
+-          out.pointmarkerlist[i]= pointlist.size()-1+ offset;
+-        }
+-    }
+-
+-  // clean up from previous triangulation
+-  tris_.clear();
+-
+-  // create the triangles
+-  for (int i=0; i< out.numberoftriangles; i++)
+-    {
+-      gtrl_triangle_sptr triangle= new gtrl_triangle( pointlist[ out.pointmarkerlist[ out.trianglelist[i*3]]- offset],
+-                                                     pointlist[ out.pointmarkerlist[ out.trianglelist[i*3+1]]- offset],
+-                                                     pointlist[ out.pointmarkerlist[ out.trianglelist[i*3+2]]- offset]);
+-
+-      if (poly_.inside( triangle->mid_point()))
+-        tris_.push_back( triangle);
+-    }
+-
+-  pts_= pointlist;
+-
+-  // clean memory
+-  delete[] out.pointlist;
+-  delete[] out.pointmarkerlist;
+-  delete[] out.trianglelist;
+-  delete[] points;
+-  delete[] markers;
+-}
+diff --git a/contrib/gel/gtrl/gtrl_triangulation.h b/contrib/gel/gtrl/gtrl_triangulation.h
+deleted file mode 100644
+index 5f63552278..0000000000
+--- a/contrib/gel/gtrl/gtrl_triangulation.h
++++ /dev/null
+@@ -1,31 +0,0 @@
+-// This is gel/gtrl/gtrl_triangulation.h
+-#ifndef gtrl_triangulation_h_
+-#define gtrl_triangulation_h_
+-//:
+-// \file
+-// \author crossge@crd.ge.com
+-
+-#include <gtrl/gtrl_polygon.h>
+-#include <gtrl/gtrl_triangle.h>
+-
+-//: triangulates holeless polygons
+-
+-class gtrl_triangulation
+-{
+- public:
+-  // constructors / destructors
+-  gtrl_triangulation( gtrl_polygon poly);
+-
+-  // implementation
+-  void run();
+-  std::vector<gtrl_triangle_sptr> get_triangles() const { return tris_; }
+-  std::vector<gtrl_vertex_sptr> get_points() const { return pts_; }
+-
+- protected:
+-  gtrl_polygon poly_;
+-
+-  std::vector<gtrl_triangle_sptr> tris_;
+-  std::vector<gtrl_vertex_sptr>   pts_;
+-};
+-
+-#endif // gtrl_triangulation_h_
+diff --git a/contrib/gel/gtrl/tests/test_include.cxx b/contrib/gel/gtrl/tests/test_include.cxx
+index df3ed4bd29..f3e98fca4c 100644
+--- a/contrib/gel/gtrl/tests/test_include.cxx
++++ b/contrib/gel/gtrl/tests/test_include.cxx
+@@ -1,5 +1,4 @@
+ #include <gtrl/gtrl_triangle.h>
+-#include <gtrl/gtrl_triangulation.h>
+ #include <gtrl/gtrl_vertex.h>
+ #include <gtrl/gtrl_polygon.h>
+ 
+-- 
+2.41.0
+
diff --git a/0009-removed-the-obsolete-octree-library-boxm.patch b/0009-removed-the-obsolete-octree-library-boxm.patch
deleted file mode 100644
index 75f635b..0000000
--- a/0009-removed-the-obsolete-octree-library-boxm.patch
+++ /dev/null
@@ -1,53224 +0,0 @@
-From 48437e3f454347c8348d4554d614cf2d27e545c3 Mon Sep 17 00:00:00 2001
-From: Joseph Mundy <jlm@visionsystemsinc.com>
-Date: Sat, 2 Feb 2019 10:43:26 -0500
-Subject: [PATCH 9/9] removed the obsolete octree library boxm
-
----
- contrib/brl/bseg/CMakeLists.txt               |   12 -
- contrib/brl/bseg/boxm/CMakeLists.txt          |   52 -
- ...ee+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
- ...ree+short.vnl_vector_fixed+double.10--.cxx |    9 -
- ...tree+short.vnl_vector_fixed+float.10--.cxx |    9 -
- ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
- ...ll+short.bsta_num_obs+bsta_gauss_sf1--.cxx |    9 -
- .../boxm_block+boct_tree+short.bool--.cxx     |    5 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    9 -
- .../boxm_block+boct_tree+short.char--.cxx     |    5 -
- .../boxm_block+boct_tree+short.float--.cxx    |    5 -
- .../boxm_block+boct_tree+short.int--.cxx      |    8 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...ee+short.vnl_vector_fixed+double.10---.cxx |   17 -
- ...ree+short.vnl_vector_fixed+float.10---.cxx |   17 -
- ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
- ..._block_iterator+boct_tree+short.bool--.cxx |    5 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
- ..._block_iterator+boct_tree+short.char--.cxx |    5 -
- ...block_iterator+boct_tree+short.float--.cxx |    5 -
- ...m_block_iterator+boct_tree+short.int--.cxx |    8 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- .../boxm_scene+boct_tree+short.bool--.cxx     |    5 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
- .../boxm_scene+boct_tree+short.char--.cxx     |    5 -
- .../boxm_scene+boct_tree+short.float--.cxx    |    5 -
- .../boxm_scene+boct_tree+short.int--.cxx      |    8 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
- ...3d+boxm_block+boct_tree+short.bool--~-.cxx |   11 -
- ...short.bsta_num_obs+bsta_gauss_sf1---~-.cxx |   10 -
- ...3d+boxm_block+boct_tree+short.char--~-.cxx |   11 -
- ...d+boxm_block+boct_tree+short.float--~-.cxx |   11 -
- ..._3d+boxm_block+boct_tree+short.int--~-.cxx |   14 -
- ...ct_tree+short.vgl_point_3d+double---~-.cxx |   12 -
- .../vbl_array_3d+vsl_b_ifstream~-.cxx         |    9 -
- .../vbl_io_smart_ptr+boxm_scene_base-.cxx     |    5 -
- .../vbl_smart_ptr+boxm_scene_base-.cxx        |    4 -
- contrib/brl/bseg/boxm/algo/CMakeLists.txt     |   38 -
- .../boxm/algo/boxm_compute_scene_difference.h |   98 -
- .../boxm/algo/boxm_compute_scene_statistics.h |  100 -
- contrib/brl/bseg/boxm/algo/boxm_crop_scene.h  |   95 -
- .../brl/bseg/boxm/algo/boxm_fill_in_mesh.h    |  316 ---
- .../bseg/boxm/algo/boxm_fill_internal_cells.h |   80 -
- contrib/brl/bseg/boxm/algo/boxm_init_scene.h  |   60 -
- .../bseg/boxm/algo/boxm_linear_operations.h   |   60 -
- contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx |  239 ---
- contrib/brl/bseg/boxm/algo/boxm_merge_mog.h   |   65 -
- contrib/brl/bseg/boxm/algo/boxm_refine.h      |  100 -
- .../brl/bseg/boxm/algo/boxm_save_block_raw.h  |  155 --
- .../brl/bseg/boxm/algo/boxm_save_scene_raw.h  |  277 ---
- .../boxm/algo/boxm_save_scene_raw_general.h   |  824 --------
- .../bseg/boxm/algo/boxm_scene_levels_utils.h  |   97 -
- .../brl/bseg/boxm/algo/boxm_split_sample.h    |  105 -
- contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h |  156 --
- contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |   40 -
- .../bseg/boxm/algo/pro/boxm_algo_processes.h  |   28 -
- .../bseg/boxm/algo/pro/boxm_algo_register.cxx |   35 -
- .../bseg/boxm/algo/pro/boxm_algo_register.h   |   11 -
- .../boxm_compute_entropy_process.cxx          |   83 -
- ...m_compute_expected_color_scene_process.cxx |   83 -
- .../boxm_compute_scene_difference_process.cxx |   91 -
- .../boxm_create_scene_from_ply_process.cxx    |  257 ---
- .../processes/boxm_describe_scene_process.cxx |  106 -
- .../boxm_explore_cells_at_level_process.cxx   |   61 -
- .../boxm_fill_internal_cells_process.cxx      |   72 -
- .../pro/processes/boxm_init_scene_process.cxx |  111 --
- .../boxm_line_backproject_process.cxx         |  259 ---
- .../boxm_linear_combination_process.cxx       |  102 -
- .../processes/boxm_merge_mixtures_process.cxx |   90 -
- .../processes/boxm_refine_scene_process.cxx   |  119 --
- .../processes/boxm_remove_level0_process.cxx  |   87 -
- ...boxm_render_expected_edge_vrml_process.cxx |  149 --
- .../boxm_replace_const_app_process.cxx        |   95 -
- .../pro/processes/boxm_roi_init_process.cxx   |  195 --
- .../boxm_roi_init_rational_camera_process.cxx |  310 ---
- .../boxm_save_occupancy_raw_process.cxx       |  229 ---
- .../processes/boxm_save_scene_raw_process.cxx |  140 --
- .../processes/boxm_split_scene_process.cxx    |   97 -
- .../bseg/boxm/algo/pro/tests/CMakeLists.txt   |    2 -
- .../bseg/boxm/algo/pro/tests/test_include.cxx |    4 -
- contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt  |   46 -
- ...dge_tangent_updater+short.float.float-.cxx |    4 -
- .../boxm_edge_updater+short.float.float-.cxx  |    3 -
- ....BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
- ...XM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx |    4 -
- ...t.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
- ...OXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx |    4 -
- ...OXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
- ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    4 -
- ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
- ..._APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx |    3 -
- ...or+short.boxm_inf_line_sample+float---.cxx |    7 -
- .../boxm/algo/rt/boxm_change_3d_functor.h     |  100 -
- .../algo/rt/boxm_change_probability_functor.h |   83 -
- .../rt/boxm_compute_num_rays_statistics.h     |   65 -
- .../boxm/algo/rt/boxm_edge_tangent_updater.h  |   76 -
- .../algo/rt/boxm_edge_tangent_updater.hxx     |  291 ---
- .../brl/bseg/boxm/algo/rt/boxm_edge_updater.h |   34 -
- .../bseg/boxm/algo/rt/boxm_edge_updater.hxx   |  110 -
- .../boxm/algo/rt/boxm_expected_edge_functor.h |   53 -
- .../rt/boxm_generate_edge_sample_functor.h    |   65 -
- ...oxm_generate_edge_tangent_sample_functor.h |   78 -
- .../rt/boxm_generate_opt2_sample_functor.h    |  197 --
- .../rt/boxm_generate_opt3_sample_functor.h    |  219 --
- .../rt/boxm_generate_opt_sample_functor.h     |  164 --
- .../rt/boxm_generate_shadow_sample_functor.h  |  212 --
- .../bseg/boxm/algo/rt/boxm_opt2_optimizer.h   |   37 -
- .../bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx |  152 --
- .../bseg/boxm/algo/rt/boxm_opt3_optimizer.h   |   37 -
- .../bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx |  172 --
- .../algo/rt/boxm_opt_appearance_estimator.h   |   85 -
- .../algo/rt/boxm_opt_rt_bayesian_optimizer.h  |   36 -
- .../rt/boxm_opt_rt_bayesian_optimizer.hxx     |  151 --
- .../boxm/algo/rt/boxm_pre_infinity_functor.h  |   67 -
- .../rt/boxm_render_expected_depth_functor.h   |  109 -
- .../boxm_render_expected_edge_image_functor.h |  109 -
- ...nder_expected_edge_tangent_image_functor.h |  126 --
- .../rt/boxm_render_expected_image_functor.h   |  103 -
- ...oxm_render_expected_shadow_image_functor.h |  120 --
- .../bseg/boxm/algo/rt/boxm_rpc_registration.h |  447 -----
- .../algo/rt/boxm_shadow_app_initializer.h     |   45 -
- .../algo/rt/boxm_shadow_app_initializer.hxx   |  122 --
- .../rt/boxm_shadow_appearance_estimator.h     |  114 --
- .../algo/rt/boxm_shadow_bayes_optimizer.h     |   51 -
- .../algo/rt/boxm_shadow_bayes_optimizer.hxx   |  195 --
- .../boxm/algo/rt/boxm_sun_vis_prob_functor.h  |  103 -
- .../boxm/algo/rt/boxm_update_image_functor.h  |  172 --
- contrib/brl/bseg/boxm/algo/rt/dummy.cxx       |    0
- .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |   29 -
- .../boxm/algo/rt/pro/boxm_algo_rt_processes.h |   29 -
- .../algo/rt/pro/boxm_algo_rt_register.cxx     |   33 -
- .../boxm/algo/rt/pro/boxm_algo_rt_register.h  |   11 -
- .../boxm_change_probabilty_process.cxx        |  120 --
- .../processes/boxm_edge_update_process.cxx    |  280 ---
- .../boxm_estimate_camera_process.cxx          |  199 --
- .../boxm_generate_edge_samples_process.cxx    |  139 --
- .../boxm_generate_opt2_samples_process.cxx    |  142 --
- .../boxm_generate_opt3_samples_process.cxx    |  114 --
- .../boxm_generate_opt_samples_process.cxx     |  102 -
- .../processes/boxm_opt2_update_process.cxx    |  153 --
- .../processes/boxm_opt3_update_process.cxx    |  153 --
- .../boxm_opt_bayesian_update_process.cxx      |  145 --
- .../processes/boxm_ray_statistics_process.cxx |  107 -
- .../boxm_render_expected_depth_rt_process.cxx |  114 --
- .../boxm_render_expected_edge_process.cxx     |  162 --
- .../boxm_render_expected_rt_process.cxx       |  143 --
- .../boxm_rpc_registration_process.cxx         |  119 --
- .../pro/processes/boxm_update_rt_process.cxx  |  136 --
- .../boxm/algo/rt/pro/tests/CMakeLists.txt     |    2 -
- .../boxm/algo/rt/pro/tests/test_include.cxx   |    4 -
- .../bseg/boxm/algo/rt/tests/CMakeLists.txt    |   16 -
- .../algo/rt/tests/test_bayesian_optimizer.cxx |  102 -
- .../bseg/boxm/algo/rt/tests/test_driver.cxx   |   15 -
- .../bseg/boxm/algo/rt/tests/test_edges.cxx    |   26 -
- .../bseg/boxm/algo/rt/tests/test_include.cxx  |   30 -
- .../algo/rt/tests/test_shadow_appearance.cxx  |   72 -
- .../algo/rt/tests/test_template_include.cxx   |    9 -
- contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt  |   22 -
- .../algo/sp/boxm_compute_volume_visibility.h  |  172 --
- .../boxm/algo/sp/boxm_depth_image_triangle.h  |  127 --
- .../brl/bseg/boxm/algo/sp/boxm_render_image.h |  166 --
- .../boxm/algo/sp/boxm_render_image_triangle.h |  167 --
- contrib/brl/bseg/boxm/algo/sp/boxm_update.h   |  374 ----
- .../bseg/boxm/algo/sp/boxm_update_triangle.h  |  356 ----
- contrib/brl/bseg/boxm/algo/sp/dummy.cxx       |    0
- .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |   27 -
- ...brdb_value_t+vil_image_view_base_sptr-.cxx |   10 -
- .../boxm/algo/sp/pro/boxm_algo_sp_processes.h |   14 -
- .../algo/sp/pro/boxm_algo_sp_register.cxx     |   18 -
- .../boxm/algo/sp/pro/boxm_algo_sp_register.h  |   11 -
- .../boxm_render_expected_process.cxx          |  117 --
- .../sp/pro/processes/boxm_update_process.cxx  |  107 -
- .../boxm_volume_visibility_process.cxx        |  129 --
- .../boxm/algo/sp/pro/tests/CMakeLists.txt     |    2 -
- .../boxm/algo/sp/pro/tests/test_include.cxx   |    4 -
- .../bseg/boxm/algo/sp/tests/CMakeLists.txt    |   19 -
- .../algo/sp/tests/test_compute_visibility.cxx |   90 -
- .../bseg/boxm/algo/sp/tests/test_driver.cxx   |   17 -
- .../bseg/boxm/algo/sp/tests/test_include.cxx  |    8 -
- .../boxm/algo/sp/tests/test_render_image.cxx  |  103 -
- .../bseg/boxm/algo/sp/tests/test_update.cxx   |  259 ---
- .../algo/sp/tests/test_update_multi_bin.cxx   |  262 ---
- .../brl/bseg/boxm/algo/tests/CMakeLists.txt   |   31 -
- .../tests/test_boxm_fill_internal_cells.cxx   |  112 --
- .../boxm/algo/tests/test_boxm_scene_crop.cxx  |  129 --
- .../brl/bseg/boxm/algo/tests/test_driver.cxx  |   23 -
- .../boxm/algo/tests/test_fill_in_mesh.cxx     |  121 --
- .../brl/bseg/boxm/algo/tests/test_include.cxx |   17 -
- .../algo/tests/test_linear_operations.cxx     |   82 -
- .../boxm/algo/tests/test_remove_level0.cxx    |   54 -
- .../boxm/algo/tests/test_save_scene_raw.cxx   |  122 --
- .../bseg/boxm/algo/tests/test_upload_mesh.cxx |  127 --
- .../brl/bseg/boxm/algo/tests/test_utils.cxx   |   71 -
- contrib/brl/bseg/boxm/algo/tests/test_utils.h |   18 -
- contrib/brl/bseg/boxm/basic/CMakeLists.txt    |   21 -
- ...e+short.bsta_num_obs+bsta_gauss_sf1---.cxx |    8 -
- ...block_iterator+boct_tree+short.float--.cxx |    5 -
- ...m_block_iterator+boct_tree+short.int--.cxx |    5 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |    6 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |   13 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |    7 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...boct_tree+short.vgl_point_3d+double---.cxx |    6 -
- ...terator+short.boxm_edge_sample+float--.cxx |    7 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
- ...tor+short.boxm_inf_line_sample+float--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    6 -
- ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...h_iterator+short.vgl_point_3d+double--.cxx |    5 -
- ...brdb_value_t+boxm_array_1d_float_sptr-.cxx |    4 -
- .../vbl_io_smart_ptr+boxm_array_1d_float-.cxx |    4 -
- .../vbl_smart_ptr+boxm_array_1d_float-.cxx    |    4 -
- .../basic/boxm_block_vis_graph_iterator.h     |   53 -
- .../basic/boxm_block_vis_graph_iterator.hxx   |  173 --
- .../boxm/basic/boxm_block_vis_graph_node.h    |   52 -
- .../boxm/basic/boxm_cell_vis_graph_iterator.h |   54 -
- .../basic/boxm_cell_vis_graph_iterator.hxx    |  131 --
- .../bseg/boxm/basic/boxm_num_rays_functor.h   |   44 -
- .../bseg/boxm/basic/boxm_raytrace_function.h  |  618 ------
- .../bseg/boxm/basic/boxm_seg_length_functor.h |   46 -
- .../bseg/boxm/basic/boxm_util_data_types.cxx  |   17 -
- .../bseg/boxm/basic/boxm_util_data_types.h    |   30 -
- .../brl/bseg/boxm/basic/tests/CMakeLists.txt  |   15 -
- .../boxm/basic/tests/test_block_vis_graph.cxx |   48 -
- .../boxm/basic/tests/test_cell_vis_graph.cxx  |   54 -
- .../brl/bseg/boxm/basic/tests/test_driver.cxx |   13 -
- .../bseg/boxm/basic/tests/test_include.cxx    |    9 -
- .../basic/tests/test_template_include.cxx     |    4 -
- contrib/brl/bseg/boxm/boxm_apm_traits.cxx     |   86 -
- contrib/brl/bseg/boxm/boxm_apm_traits.h       |  206 --
- contrib/brl/bseg/boxm/boxm_aux_scene.h        |   54 -
- contrib/brl/bseg/boxm/boxm_aux_scene.hxx      |  121 --
- contrib/brl/bseg/boxm/boxm_aux_traits.h       |   74 -
- contrib/brl/bseg/boxm/boxm_block.h            |   58 -
- contrib/brl/bseg/boxm/boxm_block.hxx          |   80 -
- contrib/brl/bseg/boxm/boxm_export.h           |   23 -
- contrib/brl/bseg/boxm/boxm_io_scene_base.cxx  |   25 -
- contrib/brl/bseg/boxm/boxm_io_scene_base.h    |   21 -
- contrib/brl/bseg/boxm/boxm_scene.h            |  559 ------
- contrib/brl/bseg/boxm/boxm_scene.hxx          | 1764 -----------------
- contrib/brl/bseg/boxm/boxm_scene_base.cxx     |   35 -
- contrib/brl/bseg/boxm/boxm_scene_base.h       |   85 -
- contrib/brl/bseg/boxm/boxm_scene_parser.cxx   |  277 ---
- contrib/brl/bseg/boxm/boxm_scene_parser.h     |  108 -
- contrib/brl/bseg/boxm/pro/CMakeLists.txt      |   29 -
- ..._tree+short.vnl_vector_fixed+float.3--.cxx |   10 -
- ...tree+short.vnl_vector_fixed+float.3---.cxx |   17 -
- ...tree+short.vnl_vector_fixed+float.3---.cxx |    6 -
- .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
- ...ee+short.vnl_vector_fixed+float.3---~-.cxx |   12 -
- contrib/brl/bseg/boxm/pro/boxm_processes.h    |   16 -
- contrib/brl/bseg/boxm/pro/boxm_register.cxx   |   27 -
- contrib/brl/bseg/boxm/pro/boxm_register.h     |   11 -
- .../boxm_camera_viewing_scene_process.cxx     |  131 --
- .../processes/boxm_clean_scene_process.cxx    |  102 -
- ...oxm_construct_scene_from_image_process.cxx |  219 --
- .../processes/boxm_create_scene_process.cxx   |  218 --
- .../boxm_force_write_blocks_process.cxx       |  102 -
- .../pro/processes/boxm_load_scene_process.cxx |   73 -
- .../processes/boxm_proj_local_cam_process.cxx |  103 -
- .../processes/boxm_upload_mesh_process.cxx    |  148 --
- .../brl/bseg/boxm/pro/tests/CMakeLists.txt    |    2 -
- .../brl/bseg/boxm/pro/tests/test_include.cxx  |    4 -
- contrib/brl/bseg/boxm/sample/CMakeLists.txt   |   29 -
- ...ct_tree+short.boxm_edge_sample+float--.cxx |    5 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
- ...ct_tree+short.boxm_opt2_sample+float--.cxx |    4 -
- ...boct_tree+short.boxm_rt_sample+float--.cxx |    4 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    5 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   12 -
- ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |    9 -
- ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    5 -
- ..._tree+short.boxm_scalar_sample+float--.cxx |    4 -
- ...ee_cell+short.boxm_edge_sample+float--.cxx |    5 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    6 -
- ...ee_cell+short.boxm_opt2_sample+float--.cxx |    4 -
- ...tree_cell+short.boxm_rt_sample+float--.cxx |    4 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |   11 -
- ...ort.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx |   10 -
- ...m_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx |    6 -
- ..._cell+short.boxm_scalar_sample+float--.cxx |    4 -
- ..._reader+short.boxm_edge_sample+float--.cxx |    8 -
- ...short.boxm_edge_tangent_sample+float--.cxx |    5 -
- ...der+short.boxm_inf_line_sample+float--.cxx |    5 -
- ..._reader+short.boxm_opt2_sample+float--.cxx |    5 -
- ...ll_reader+short.boxm_rt_sample+float--.cxx |    5 -
- ...+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx |    6 -
- ...+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...eader+short.boxm_scalar_sample+float--.cxx |    5 -
- ...le+float-.boxm_aux_edge_sample+float--.cxx |    5 -
- ...loat-.boxm_edge_tangent_sample+float--.cxx |    7 -
- ...M_APM_MOB_GREY-.boxm_rt_sample+float--.cxx |    7 -
- ...APM_MOG_GREY-.boxm_opt2_sample+float--.cxx |    7 -
- ...M_APM_MOG_GREY-.boxm_rt_sample+float--.cxx |    7 -
- ....boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx |    7 -
- ..._SIMPLE_GREY-.boxm_opt2_sample+float--.cxx |    7 -
- ...PM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx |    7 -
- ...IMPLE_GREY-.boxm_scalar_sample+float--.cxx |    8 -
- ...xm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx |    7 -
- ...float.boxm_edge_tangent_sample+float--.cxx |    7 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |   13 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |    6 -
- ...ee+short.boxm_inf_line_sample+float---.cxx |    6 -
- ...t_tree+short.boxm_opt2_sample+float---.cxx |    9 -
- ...oct_tree+short.boxm_rt_sample+float---.cxx |    9 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   12 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...tree+short.boxm_scalar_sample+float---.cxx |    9 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    7 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   11 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   12 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    7 -
- .../Templates/boxm_edge_sample+float-.cxx     |    4 -
- .../boxm_edge_tangent_sample+float-.cxx       |    3 -
- .../Templates/boxm_inf_line_sample+float-.cxx |    3 -
- .../Templates/boxm_opt2_sample+float-.cxx     |    4 -
- .../Templates/boxm_plane_obs+float-.cxx       |    3 -
- .../Templates/boxm_rt_sample+float-.cxx       |    3 -
- .../boxm_sample+BOXM_APM_MOB_GREY-.cxx        |    7 -
- .../boxm_sample+BOXM_APM_MOG_GREY-.cxx        |    9 -
- .../boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx     |    4 -
- ...xm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx |    4 -
- .../Templates/boxm_scalar_sample+float-.cxx   |    4 -
- ...t_tree+short.boxm_edge_sample+float---.cxx |    9 -
- ...hort.boxm_edge_tangent_sample+float---.cxx |   10 -
- ...t_tree+short.boxm_opt2_sample+float---.cxx |    6 -
- ...oct_tree+short.boxm_rt_sample+float---.cxx |    6 -
- ...short.boxm_sample+BOXM_APM_MOB_GREY---.cxx |    6 -
- ...short.boxm_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
- ...rt.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx |   11 -
- ..._sample_multi_bin+BOXM_APM_MOG_GREY---.cxx |    6 -
- ...tree+short.boxm_scalar_sample+float---.cxx |    6 -
- .../boxm_scene+boct_tree+short.int--.cxx      |    5 -
- ...tree+short.boxm_edge_sample+float---~-.cxx |   16 -
- ...rt.boxm_edge_tangent_sample+float---~-.cxx |   17 -
- ...tree+short.boxm_opt2_sample+float---~-.cxx |   13 -
- ...t_tree+short.boxm_rt_sample+float---~-.cxx |   13 -
- ...ort.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx |   13 -
- ...ort.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx |   17 -
- ....boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx |   18 -
- ...ample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx |   13 -
- ...ee+short.boxm_scalar_sample+float---~-.cxx |   13 -
- ...mage_view+boxm_inf_line_sample+float--.cxx |    5 -
- .../brl/bseg/boxm/sample/algo/CMakeLists.txt  |   18 -
- ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
- ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    5 -
- ...t.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    6 -
- ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
- ...-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx |    7 -
- ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |   10 -
- .../boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx   |    3 -
- ....boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx |    7 -
- ...oxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx |   14 -
- .../sample/algo/boxm_mob_grey_processor.cxx   |   83 -
- .../sample/algo/boxm_mob_grey_processor.h     |   35 -
- .../sample/algo/boxm_mog_grey_processor.cxx   |  286 ---
- .../sample/algo/boxm_mog_grey_processor.h     |   50 -
- .../sample/algo/boxm_sigma_normalizer.cxx     |  104 -
- .../boxm/sample/algo/boxm_sigma_normalizer.h  |   43 -
- .../algo/boxm_simple_grey_processor.cxx       |  437 ----
- .../sample/algo/boxm_simple_grey_processor.h  |   86 -
- .../boxm/sample/algo/tests/CMakeLists.txt     |   11 -
- .../boxm/sample/algo/tests/test_driver.cxx    |   11 -
- .../boxm/sample/algo/tests/test_include.cxx   |    6 -
- .../algo/tests/test_sigma_normalizer.cxx      |   59 -
- .../brl/bseg/boxm/sample/boxm_edge_sample.h   |   97 -
- .../brl/bseg/boxm/sample/boxm_edge_sample.hxx |  137 --
- .../boxm/sample/boxm_edge_tangent_sample.h    |   69 -
- .../boxm/sample/boxm_edge_tangent_sample.hxx  |   79 -
- .../bseg/boxm/sample/boxm_inf_line_sample.h   |   55 -
- .../bseg/boxm/sample/boxm_inf_line_sample.hxx |   79 -
- .../brl/bseg/boxm/sample/boxm_opt2_sample.h   |   72 -
- .../brl/bseg/boxm/sample/boxm_opt2_sample.hxx |   83 -
- .../brl/bseg/boxm/sample/boxm_opt3_sample.h   |   76 -
- .../brl/bseg/boxm/sample/boxm_opt3_sample.hxx |   92 -
- contrib/brl/bseg/boxm/sample/boxm_plane_obs.h |   45 -
- .../brl/bseg/boxm/sample/boxm_plane_obs.hxx   |   69 -
- contrib/brl/bseg/boxm/sample/boxm_rt_sample.h |   70 -
- .../brl/bseg/boxm/sample/boxm_rt_sample.hxx   |   81 -
- contrib/brl/bseg/boxm/sample/boxm_sample.h    |   68 -
- contrib/brl/bseg/boxm/sample/boxm_sample.hxx  |   71 -
- .../bseg/boxm/sample/boxm_sample_multi_bin.h  |   63 -
- .../boxm/sample/boxm_sample_multi_bin.hxx     |   98 -
- .../brl/bseg/boxm/sample/boxm_scalar_sample.h |   55 -
- .../bseg/boxm/sample/boxm_scalar_sample.hxx   |   70 -
- .../brl/bseg/boxm/sample/boxm_update_sample.h |   17 -
- .../boxm/sample/boxm_vis_implicit_sample.h    |   16 -
- contrib/brl/bseg/boxm/sample/dummy.cxx        |    0
- .../brl/bseg/boxm/sample/tests/CMakeLists.txt |    4 -
- .../bseg/boxm/sample/tests/test_include.cxx   |   14 -
- .../sample/tests/test_template_include.cxx    |   12 -
- contrib/brl/bseg/boxm/tests/CMakeLists.txt    |   32 -
- contrib/brl/bseg/boxm/tests/camera0.txt       |  104 -
- contrib/brl/bseg/boxm/tests/frame_00000.txt   |    7 -
- .../brl/bseg/boxm/tests/test_binary_io.cxx    |   75 -
- .../brl/bseg/boxm/tests/test_block_iter.cxx   |   47 -
- .../bseg/boxm/tests/test_cell_iterator.cxx    |   51 -
- contrib/brl/bseg/boxm/tests/test_driver.cxx   |   21 -
- contrib/brl/bseg/boxm/tests/test_include.cxx  |   10 -
- .../tests/test_load_neighboring_blocks.cxx    |   89 -
- .../bseg/boxm/tests/test_region_finder.cxx    |   80 -
- .../bseg/boxm/tests/test_template_include.cxx |    5 -
- contrib/brl/bseg/boxm/tests/test_utils.cxx    |   72 -
- contrib/brl/bseg/boxm/tests/test_utils.h      |   17 -
- contrib/brl/bseg/boxm/util/CMakeLists.txt     |   23 -
- ...triangle_interpolation_iterator+float-.cxx |    3 -
- .../bseg/boxm/util/boxm_cell_data_traits.cxx  |   25 -
- .../bseg/boxm/util/boxm_cell_data_traits.h    |   89 -
- .../brl/bseg/boxm/util/boxm_plane_ransac.h    |  126 --
- .../boxm/util/boxm_quad_scan_iterator.cxx     |  188 --
- .../bseg/boxm/util/boxm_quad_scan_iterator.h  |   66 -
- .../boxm/util/boxm_rational_camera_utils.cxx  |   36 -
- .../boxm/util/boxm_rational_camera_utils.h    |   30 -
- .../boxm/util/boxm_raytrace_operations.cxx    |  232 ---
- .../bseg/boxm/util/boxm_raytrace_operations.h |  452 -----
- contrib/brl/bseg/boxm/util/boxm_test_util.cxx |  141 --
- contrib/brl/bseg/boxm/util/boxm_test_util.h   |   37 -
- .../boxm_triangle_interpolation_iterator.h    |   53 -
- .../boxm_triangle_interpolation_iterator.hxx  |  100 -
- .../boxm/util/boxm_triangle_scan_iterator.cxx |   59 -
- .../boxm/util/boxm_triangle_scan_iterator.h   |   46 -
- contrib/brl/bseg/boxm/util/boxm_utils.cxx     | 1469 --------------
- contrib/brl/bseg/boxm/util/boxm_utils.h       |  168 --
- contrib/brl/bseg/boxm/util/boxm_vrml_util.h   |  214 --
- .../brl/bseg/boxm/util/tests/CMakeLists.txt   |   18 -
- contrib/brl/bseg/boxm/util/tests/camera0.txt  |  104 -
- .../brl/bseg/boxm/util/tests/frame_00000.txt  |    7 -
- .../util/tests/test_boxm_plane_ransac.cxx     |   79 -
- .../tests/test_boxm_rational_camera_utils.cxx |   24 -
- .../brl/bseg/boxm/util/tests/test_driver.cxx  |   15 -
- .../brl/bseg/boxm/util/tests/test_include.cxx |   12 -
- .../boxm/util/tests/test_quad_interpolate.cxx |  117 --
- .../boxm/util/tests/test_template_include.cxx |    3 -
- contrib/brl/bseg/boxm_batch/CMakeLists.txt    |   59 -
- contrib/brl/bseg/boxm_batch/reg_boxm.cxx      |  135 --
- contrib/brl/bseg/boxm_batch/reg_boxm.h        |   12 -
- .../brl/bseg/boxm_batch/tests/CMakeLists.txt  |    2 -
- .../bseg/boxm_batch/tests/test_include.cxx    |    3 -
- contrib/brl/bseg/boxm_bridge/CMakeLists.txt   |   25 -
- .../boxm_bridge/boxm2_normails_to_boxm.cxx    |  233 ---
- .../brl/bseg/boxm_bridge/boxm2_to_boxm.cxx    |  292 ---
- contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h  |   24 -
- .../boxm_bridge/boxm_normals_to_boxm2.cxx     |  326 ---
- .../brl/bseg/boxm_bridge/boxm_to_boxm2.cxx    |  262 ---
- contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h  |   30 -
- .../brl/bseg/boxm_bridge/tests/CMakeLists.txt |    2 -
- .../bseg/boxm_bridge/tests/test_include.cxx   |    4 -
- contrib/brl/bseg/bvpl/CMakeLists.txt          |    1 -
- .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |   71 -
- ..._sample+bsta_num_obs+bsta_gauss_sf1---.cxx |   11 -
- ..._tree+short.bvpl_octree_sample+float--.cxx |    6 -
- ..._tree+short.bvpl_pca_basis_sample+10--.cxx |    6 -
- ..._tree+short.bvpl_taylor_basis2_sample-.cxx |    6 -
- ...sample+bsta_num_obs+bsta_gauss_sf1----.cxx |   20 -
- ...tree+short.bvpl_octree_sample+float---.cxx |   17 -
- ...tree+short.bvpl_pca_basis_sample+10---.cxx |   11 -
- ...tree+short.bvpl_taylor_basis2_sample--.cxx |   12 -
- .../Templates/bvpl_global_pca+125-.cxx        |    2 -
- .../bvpl_global_taylor+double.10-.cxx         |    3 -
- .../Templates/bvpl_global_taylor+float.3-.cxx |    3 -
- ...l_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
- .../vbl_smart_ptr+bvpl_global_corners-.cxx    |    4 -
- .../vbl_smart_ptr+bvpl_global_pca+125--.cxx   |    5 -
- ...art_ptr+bvpl_global_taylor+double.10--.cxx |    5 -
- .../vbl_smart_ptr+bvpl_pca_error_scenes-.cxx  |    4 -
- .../vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
- .../vnl_matrix_fixed+double.125.125-.cxx      |    2 -
- .../bvpl_octree/bvpl_block_kernel_operator.h  |  134 --
- .../bvpl_octree/bvpl_block_vector_operator.h  |  146 --
- .../bvpl/bvpl_octree/bvpl_cell_data_traits.h  |   34 -
- .../bvpl/bvpl_octree/bvpl_corner_detector.h   |  299 ---
- .../bvpl/bvpl_octree/bvpl_corner_functors.h   |   68 -
- .../bvpl_octree/bvpl_discover_pca_kernels.cxx | 1028 ----------
- .../bvpl_octree/bvpl_discover_pca_kernels.h   |  309 ---
- .../bvpl_gauss3D_steerable_filters.cxx        |  512 -----
- .../bvpl_gauss3D_steerable_filters.h          |   61 -
- .../bvpl/bvpl_octree/bvpl_global_corners.cxx  |  475 -----
- .../bvpl/bvpl_octree/bvpl_global_corners.h    |   71 -
- .../bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx |    5 -
- .../bseg/bvpl/bvpl_octree/bvpl_global_pca.h   |  153 --
- .../bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx | 1018 ----------
- .../bvpl/bvpl_octree/bvpl_global_taylor.cxx   |   12 -
- .../bvpl/bvpl_octree/bvpl_global_taylor.h     |  100 -
- .../bvpl/bvpl_octree/bvpl_global_taylor.hxx   |  645 ------
- .../bvpl_octree/bvpl_octree_kernel_operator.h |  142 --
- .../bvpl/bvpl_octree/bvpl_octree_neighbors.h  |   78 -
- .../bvpl_octree/bvpl_octree_vector_operator.h |   84 -
- .../bvpl_octree_vector_operator_impl.h        |   30 -
- .../bvpl/bvpl_octree/bvpl_octree_vrml_util.h  |   84 -
- .../bvpl_octree/bvpl_pca_error_scenes.cxx     |   50 -
- .../bvpl/bvpl_octree/bvpl_pca_error_scenes.h  |   39 -
- .../bvpl_octree/bvpl_scene_kernel_operator.h  |  213 --
- .../bvpl_scene_neighborhood_operator.cxx      |    6 -
- .../bvpl_scene_neighborhood_operator.h        |   97 -
- .../bvpl_octree/bvpl_scene_statistics.cxx     |   80 -
- .../bvpl/bvpl_octree/bvpl_scene_statistics.h  |  102 -
- .../bvpl_octree/bvpl_scene_vector_operator.h  |  178 --
- .../bvpl/bvpl_octree/bvpl_taylor_basis.cxx    |  258 ---
- .../bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h |   50 -
- .../bvpl_octree/bvpl_taylor_scenes_map.cxx    |   61 -
- .../bvpl/bvpl_octree/bvpl_taylor_scenes_map.h |   41 -
- .../bseg/bvpl/bvpl_octree/io/CMakeLists.txt   |   20 -
- ...o_smart_ptr+bvpl_discover_pca_kernels-.cxx |    4 -
- .../vbl_io_smart_ptr+bvpl_global_corners-.cxx |    4 -
- ...vbl_io_smart_ptr+bvpl_global_pca+125--.cxx |    6 -
- ...art_ptr+bvpl_global_taylor+double.10--.cxx |    6 -
- ...bl_io_smart_ptr+bvpl_pca_error_scenes-.cxx |    4 -
- ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
- .../io/bvpl_io_discover_pca_kernels.cxx       |   50 -
- .../io/bvpl_io_discover_pca_kernels.h         |   43 -
- .../bvpl_octree/io/bvpl_io_global_corners.cxx |   50 -
- .../bvpl_octree/io/bvpl_io_global_corners.h   |   44 -
- .../bvpl_octree/io/bvpl_io_global_pca.cxx     |   50 -
- .../bvpl/bvpl_octree/io/bvpl_io_global_pca.h  |   44 -
- .../bvpl_octree/io/bvpl_io_global_taylor.h    |   75 -
- .../io/bvpl_io_pca_error_scenes.cxx           |   50 -
- .../bvpl_octree/io/bvpl_io_pca_error_scenes.h |   43 -
- .../io/bvpl_io_taylor_scenes_map.cxx          |   50 -
- .../io/bvpl_io_taylor_scenes_map.h            |   38 -
- .../bvpl/bvpl_octree/io/tests/CMakeLists.txt  |    2 -
- .../bvpl_octree/io/tests/test_include.cxx     |    8 -
- .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |   31 -
- .../brdb_value_t+boxm_scene_base_sptr-.cxx    |    4 -
- ...alue_t+bvpl_discover_pca_kernels_sptr-.cxx |    6 -
- ...brdb_value_t+bvpl_global_corners_sptr-.cxx |    6 -
- ...brdb_value_t+bvpl_global_pca_125_sptr-.cxx |    6 -
- ...db_value_t+bvpl_pca_error_scenes_sptr-.cxx |    6 -
- ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
- ...rt_ptr+bvpl_global_taylor+double.10---.cxx |    8 -
- .../bvpl_octree/pro/bvpl_octree_processes.h   |   61 -
- .../bvpl_octree/pro/bvpl_octree_register.cxx  |   81 -
- .../bvpl_octree/pro/bvpl_octree_register.h    |   11 -
- .../bvpl_block_avg_value_process.cxx          |   81 -
- .../bvpl_block_kernel_operator_process.cxx    |  208 --
- .../bvpl_compute_gauss_gradients.cxx          |   86 -
- .../processes/bvpl_create_scene_process.cxx   |   88 -
- .../bvpl_grad_scene_to_bin_process.cxx        |  136 --
- .../processes/bvpl_nonmax_supp_process.cxx    |  178 --
- .../bvpl_plane_propagate_process.cxx          |  209 --
- .../pro/processes/bvpl_save_vrml_process.cxx  |   89 -
- .../bvpl_scene_histogram_process.cxx          |   66 -
- .../bvpl_scene_kernel_operator_process.cxx    |  179 --
- .../bvpl_scene_vector_operator_process.cxx    |  151 --
- .../bvpl_compute_beaudet_measure_process.cxx  |   64 -
- .../bvpl_compute_harris_measure_process.cxx   |   65 -
- .../bvpl_corner_statistics_process.cxx        |   57 -
- .../bvpl_load_global_corners_process.cxx      |   50 -
- .../bvpl_threshold_corners_process.cxx        |   61 -
- .../pca/bvpl_add_pca_errors_process.cxx       |   94 -
- ...pl_combine_pairwise_statistics_process.cxx |   95 -
- .../bvpl_compute_pca_error_block_process.cxx  |   69 -
- .../bvpl_compute_pca_error_scene_process.cxx  |  132 --
- .../bvpl_compute_pca_test_error_process.cxx   |   59 -
- .../bvpl_discover_pca_features_process.cxx    |   98 -
- .../processes/pca/bvpl_global_pca_process.cxx |   64 -
- .../pca/bvpl_init_global_pca_process.cxx      |   50 -
- .../pca/bvpl_load_global_pca_process.cxx      |   50 -
- .../bvpl_load_pca_error_scenes_process.cxx    |   58 -
- .../pca/bvpl_load_pca_info_process.cxx        |   55 -
- ...l_normalize_pca_training_error_process.cxx |   61 -
- .../pca/bvpl_pca_global_add_error_process.cxx |   77 -
- .../bvpl_pca_global_proj_error_process.cxx    |   63 -
- .../bvpl_pca_global_statistics_process.cxx    |   75 -
- .../pca/bvpl_pca_project_process.cxx          |   63 -
- .../bvpl_compute_sf_raw_response_process.cxx  |   70 -
- .../bvpl_init_sf_response_scene_process.cxx   |   87 -
- .../taylor/bvpl_add_taylor_errors_process.cxx |   90 -
- ...pl_compute_taylor_coefficients_process.cxx |   80 -
- .../bvpl_compute_taylor_error_process.cxx     |   78 -
- ...bvpl_explore_coefficient_scene_process.cxx |   77 -
- .../bvpl_init_global_taylor_process.cxx       |   68 -
- .../bvpl_load_global_taylor_process.cxx       |   52 -
- .../bvpl_load_taylor_scenes_process.cxx       |   72 -
- .../bvpl_taylor_global_add_error_process.cxx  |   77 -
- .../bvpl_taylor_global_proj_error_process.cxx |   63 -
- .../bvpl/bvpl_octree/pro/tests/CMakeLists.txt |   16 -
- .../test_bvpl_plane_propagation_process.cxx   |  144 --
- .../bvpl_octree/pro/tests/test_driver.cxx     |   10 -
- .../bvpl_octree/pro/tests/test_include.cxx    |    4 -
- .../bvpl/bvpl_octree/python/pca/readme.txt    |    7 -
- .../pca/reconstruction_error/add_pca_error.py |  193 --
- .../compute_pca_error_scene.py                |  164 --
- .../extract_pca_kernels.py                    |   61 -
- .../python/pca/reconstruction_error/pca.sh    |   68 -
- .../pca/reconstruction_error/save_pca_raw.py  |  108 -
- .../pca/training_error/extract_pca_kernels.py |   66 -
- .../normalized_training_error.py              |   42 -
- .../python/pca/training_error/pca.sh          |   42 -
- .../bseg/bvpl/bvpl_octree/python/readme.txt   |    1 -
- .../reconstruction_error/add_taylor_error.py  |  183 --
- .../compute_taylor_error_scene.py             |  156 --
- .../reconstruction_error/explore_histogram.py |  113 --
- .../run_taylor_kernels.py                     |   98 -
- .../reconstruction_error/save_taylor_raw.py   |  146 --
- .../taylor/reconstruction_error/taylor.sh     |   67 -
- .../taylor_kernel_threads.py                  |   72 -
- .../bvpl/bvpl_octree/sample/CMakeLists.txt    |   16 -
- .../bsta_gaussian_sphere+float.1-.cxx         |    3 -
- ...e_sample+bsta_num_obs+bsta_gauss_sf1--.cxx |    7 -
- .../Templates/bvpl_octree_sample+float-.cxx   |    3 -
- .../Templates/bvpl_pca_basis_sample+10-.cxx   |    3 -
- .../bvpl_octree/sample/bvpl_octree_sample.h   |   57 -
- .../bvpl_octree/sample/bvpl_octree_sample.hxx |   70 -
- .../sample/bvpl_pca_basis_sample.h            |   57 -
- .../sample/bvpl_pca_basis_sample.hxx          |   72 -
- .../sample/bvpl_taylor_basis_sample.cxx       |   58 -
- .../sample/bvpl_taylor_basis_sample.h         |   59 -
- .../bvpl_octree/sample/tests/CMakeLists.txt   |    4 -
- .../bvpl_octree/sample/tests/test_include.cxx |    5 -
- .../sample/tests/test_template_include.cxx    |    4 -
- .../bvpl/bvpl_octree/tests/CMakeLists.txt     |   35 -
- .../bvpl/bvpl_octree/tests/test_driver.cxx    |   19 -
- .../tests/test_gauss3D_steerable_filters.cxx  |  127 --
- .../bvpl/bvpl_octree/tests/test_include.cxx   |   24 -
- .../tests/test_octree_kernel_operator.cxx     |  352 ----
- .../tests/test_octree_neighbors.cxx           |   92 -
- .../bvpl_octree/tests/test_pca_kernels.cxx    |  304 ---
- .../bvpl_octree/tests/test_taylor_basis.cxx   |  143 --
- .../tests/test_template_include.cxx           |    4 -
- .../bvpl/bvpl_octree/tests/test_utils.cxx     |   94 -
- .../bseg/bvpl/bvpl_octree/tests/test_utils.h  |   20 -
- .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |    2 +-
- ...b_value_t+bvpl_taylor_scenes_map_sptr-.cxx |    6 -
- ...l_io_smart_ptr+bvpl_taylor_scenes_map-.cxx |    4 -
- .../kernels/pro/bvpl_kernels_register.cxx     |    1 -
- .../bvpl_load_taylor_responses_process.cxx    |   53 -
- .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |   44 -
- .../bvpl_octree_batch/reg_bvpl_octree.cxx     |   61 -
- .../bseg/bvpl_octree_batch/reg_bvpl_octree.h  |   10 -
- .../bvpl_octree_batch/tests/CMakeLists.txt    |    2 -
- .../bvpl_octree_batch/tests/test_include.cxx  |    3 -
- contrib/brl/bseg/bvxm/algo/CMakeLists.txt     |    3 +-
- .../brl/bseg/bvxm/algo/bvxm_boxm_convert.h    |  152 --
- contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |    3 +-
- .../bseg/bvxm/algo/pro/bvxm_algo_processes.h  |    2 +-
- .../bseg/bvxm/algo/pro/bvxm_algo_register.cxx |    2 +-
- .../boxm_scene_to_bvxm_grid_process.cxx       |  129 --
- .../brl/bseg/bvxm/algo/tests/CMakeLists.txt   |    3 -
- .../tests/test_boxm_scene_to_bvxm_grid.cxx    |  111 --
- .../brl/bseg/bvxm/algo/tests/test_driver.cxx  |    4 +-
- .../brl/bseg/bvxm/algo/tests/test_include.cxx |    1 -
- 653 files changed, 7 insertions(+), 47919 deletions(-)
- delete mode 100644 contrib/brl/bseg/boxm/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_init_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_refine.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_split_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/dummy.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/dummy.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/algo/tests/test_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_apm_traits.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_scene.hxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_aux_traits.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_block.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_block.hxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_export.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_io_scene_base.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene.hxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_base.h
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.cxx
- delete mode 100644 contrib/brl/bseg/boxm/boxm_scene_parser.h
- delete mode 100644 contrib/brl/bseg/boxm/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_processes.h
- delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/boxm_register.h
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_update_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
- delete mode 100644 contrib/brl/bseg/boxm/sample/dummy.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/tests/camera0.txt
- delete mode 100644 contrib/brl/bseg/boxm/tests/frame_00000.txt
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_binary_io.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_block_iter.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_region_finder.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/tests/test_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/util/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_test_util.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_utils.h
- delete mode 100644 contrib/brl/bseg/boxm/util/boxm_vrml_util.h
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/camera0.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/frame_00000.txt
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
- delete mode 100644 contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm_batch/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.cxx
- delete mode 100644 contrib/brl/bseg/boxm_batch/reg_boxm.h
- delete mode 100644 contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_batch/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
- delete mode 100644 contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
- delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
- delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
- delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
- delete mode 100755 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
- delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
- delete mode 100644 contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
- delete mode 100644 contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
- delete mode 100644 contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
- delete mode 100644 contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
- delete mode 100644 contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
-
-diff --git a/contrib/brl/bseg/CMakeLists.txt b/contrib/brl/bseg/CMakeLists.txt
-index f2b53d63ae..0d20b12438 100644
---- a/contrib/brl/bseg/CMakeLists.txt
-+++ b/contrib/brl/bseg/CMakeLists.txt
-@@ -41,18 +41,12 @@ add_subdirectory(brec_batch)
- # octree
- add_subdirectory(boct)
- 
--# octree based modeling
--add_subdirectory(boxm)
--
- # updated, gpu compatible octree based modeling
- add_subdirectory(boxm2)
- 
- # updated, gpu compatible octree based modeling
- add_subdirectory(boxm2_batch)
- 
--# octree based modeling python interface
--add_subdirectory(boxm_batch)
--
- # semi-global matching
- add_subdirectory(bsgm)
- 
-@@ -62,15 +56,9 @@ add_subdirectory(bvpl)
- # voxel processing library python interface
- add_subdirectory(bvpl_batch)
- 
--# voxel processing library python interface for octrees
--add_subdirectory(bvpl_octree_batch)
--
- # Brown affine patch library, SIFT keypoint & descriptor
- add_subdirectory(bapl)
- 
--#the bridge lib to convert between boxm and boxm2 scenes
--add_subdirectory(boxm_bridge)
--
- #multi gpu library
- add_subdirectory(boxm2_multi)
- 
-diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
-deleted file mode 100644
-index 6a0e5159f4..0000000000
---- a/contrib/brl/bseg/boxm/CMakeLists.txt
-+++ /dev/null
-@@ -1,52 +0,0 @@
--# contrib/brl/bseg/boxm/CMakeLists.txt
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--
--include_directories( ${EXPAT_INCLUDE_DIR} )
--include_directories( ${GEL_INCLUDE_DIR} )
--include_directories( ${GEL_INCLUDE_DIR}/mrc )
--include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
--
--set(boxm_sources
--    boxm_export.h
--    boxm_block.hxx                         boxm_block.h
--    boxm_scene_base.cxx                    boxm_scene_base.h
--    boxm_scene.hxx                         boxm_scene.h
--    boxm_aux_scene.hxx                     boxm_aux_scene.h
--    boxm_scene_parser.cxx                  boxm_scene_parser.h
--    boxm_apm_traits.cxx                    boxm_apm_traits.h
--    boxm_aux_traits.h
--    boxm_io_scene_base.h                   boxm_io_scene_base.cxx
--)
--
--aux_source_directory(Templates boxm_sources)
--
--vxl_add_library(LIBRARY_NAME boxm LIBRARY_SOURCES  ${boxm_sources})
--
--target_link_libraries(boxm boct bsta brdb ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl_algo vsol expatpp ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vcl)
--
--#processes
--add_subdirectory(pro)
--
--#util
--add_subdirectory(util)
--
--#samples
--add_subdirectory(sample)
--
--#basic algorithms involving scenes
--add_subdirectory(algo)
--
--#basic structures
--add_subdirectory(basic)
--
--
--#tests
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--endif()
--
--#install the .h .hxx and libs
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-deleted file mode 100644
-index 3c4f37b302..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boct/boct_tree.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--BOCT_TREE_INSTANTIATE(short, gauss_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
-deleted file mode 100644
-index 7612eb4071..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+double.10--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<double,10> vector;
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
-deleted file mode 100644
-index 63921f9183..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.10--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<float,10> vector;
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-deleted file mode 100644
-index fb055c2df5..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<float,3> vector;
--
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-deleted file mode 100644
-index 1a7c7d6247..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boct_tree_cell+short.bsta_num_obs+bsta_gauss_sf1--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boct/boct_tree_cell.hxx>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--BOCT_TREE_CELL_INSTANTIATE(short, gauss_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
-deleted file mode 100644
-index c104d2eed5..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bool--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,bool>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index e629c522cb..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
-deleted file mode 100644
-index 562247092f..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.char--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,char>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
-deleted file mode 100644
-index 3c0bdbf155..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,float>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 247d59847c..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,int>  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
--
--typedef boct_tree<short,short int>  short_tree_type;
--BOXM_BLOCK_INSTANTIATE(short_tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 5bee916221..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
-deleted file mode 100644
-index 177fcfeeee..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+double.10---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<double,10> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
-deleted file mode 100644
-index 5f31529e08..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.10---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<float,10> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-deleted file mode 100644
-index ac40b5ec2d..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
-deleted file mode 100644
-index 5834cafab6..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bool--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,bool >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index b4bce045ed..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_scene.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
-deleted file mode 100644
-index 09f831722a..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.char--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,char >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-deleted file mode 100644
-index 4129f1a830..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,float >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 50ef71285a..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,int >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boct_tree<short,short int >  short_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(short_tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 2cd39a3534..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <vgl/vgl_point_3d.h>
--
--typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
-deleted file mode 100644
-index 02bbdc01a7..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bool--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,bool > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index 88886e65c2..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_scene.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_SCENE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
-deleted file mode 100644
-index 273a95c2a6..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.char--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,char > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
-deleted file mode 100644
-index cf8ef6a19e..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,float > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 234256af7c..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,int > tree;
--BOXM_SCENE_INSTANTIATE(tree);
--
--typedef boct_tree<short, short int > short_tree;
--BOXM_SCENE_INSTANTIATE(short_tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 4f9dff9071..0000000000
---- a/contrib/brl/bseg/boxm/Templates/boxm_scene+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short,vgl_point_3d<double> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-deleted file mode 100644
-index 5de38b0662..0000000000
---- a/contrib/brl/bseg/boxm/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/boxm_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.h>
--BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
-deleted file mode 100644
-index 08145d2ca1..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bool--~-.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, bool > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
-deleted file mode 100644
-index a84c7ef3e4..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---~-.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_block.hxx>
--#include <vbl/vbl_array_3d.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
-deleted file mode 100644
-index 0464e1208e..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.char--~-.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, char > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
-deleted file mode 100644
-index f3ea04b9df..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.float--~-.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,float> tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
-deleted file mode 100644
-index 01b86c0776..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.int--~-.cxx
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, int > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--typedef boct_tree<short, short > short_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<short_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
-deleted file mode 100644
-index ff3080df2c..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+boxm_block+boct_tree+short.vgl_point_3d+double---~-.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
-deleted file mode 100644
-index 912522b858..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_array_3d+vsl_b_ifstream~-.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vsl/vsl_binary_io.h>
--
--VBL_ARRAY_3D_INSTANTIATE(vsl_b_ifstream*);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
-deleted file mode 100644
-index 7158d38f30..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_io_smart_ptr+boxm_scene_base-.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_io_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(boxm_scene_base);
-diff --git a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx b/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
-deleted file mode 100644
-index f9544ebe70..0000000000
---- a/contrib/brl/bseg/boxm/Templates/vbl_smart_ptr+boxm_scene_base-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/boxm_scene_base.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(boxm_scene_base);
-diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-deleted file mode 100644
-index 16694fbbc4..0000000000
---- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
-+++ /dev/null
-@@ -1,38 +0,0 @@
--# brl/bseg/boxm/algo/CMakeLists.txt
--FIND_PACKAGE(RPLY REQUIRED)
--include_directories( ${MUL_INCLUDE_DIR} )
--include_directories( ${RPLY_INCLUDE_DIR} )
--set(boxm_algo_sources
--    boxm_compute_scene_statistics.h
--    boxm_crop_scene.h
--    boxm_fill_in_mesh.h
--    boxm_fill_internal_cells.h
--    boxm_init_scene.h
--    boxm_refine.h
--    boxm_save_block_raw.h
--    boxm_save_scene_raw.h
--    boxm_save_scene_raw_general.h
--    boxm_upload_mesh.h
--    boxm_merge_mog.h                        boxm_merge_mog.cxx
--    boxm_split_sample.h
--    boxm_compute_scene_difference.h
--    boxm_linear_operations.h
--    boxm_scene_levels_utils.h
--   )
--
--vxl_add_library(LIBRARY_NAME boxm_algo LIBRARY_SOURCES ${boxm_algo_sources})
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_algo boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--#raytracing algorithms
--add_subdirectory(rt)
--
--#splatting algorithms
--add_subdirectory(sp)
--
--#processes
--add_subdirectory(pro)
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
-deleted file mode 100644
-index 5043e4a2a3..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_difference.h
-+++ /dev/null
-@@ -1,98 +0,0 @@
--#ifndef boxm_compute_scene_difference_h_
--#define boxm_compute_scene_difference_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_operations.h>
--#include <vgl/vgl_point_3d.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--void boxm_compute_block_difference(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block1,
--                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * block2,
--                                   boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > * blockout,
--                                   float threshold)
--{
--  typedef boxm_sample<BOXM_APM_MOG_GREY> data_type;
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  typedef boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> > cell_type;
--
--  tree_type* tree1 = block1->get_tree();
--  tree_type* tree2 = block2->get_tree();
--  tree_type* treeout = blockout->get_tree();
--
--  std::vector<cell_type*> leaves=tree1->leaf_cells();
--  std::vector<cell_type*> leavesout=treeout->leaf_cells();
--
--  for (unsigned i=0;i<leaves.size();i++)
--  {
--    cell_type *cell1=leaves[i];
--    cell_type *cellout=leavesout[i];
--    vgl_point_3d<double> p=cell1->local_bounding_box(tree1->root_level()).centroid();
--    cell_type *cell2=tree2->locate_point(p);
--    if (cell2)
--    {
--      data_type data1=cell1->data();
--      double len1=tree1->cell_bounding_box(cell1).width();
--
--      data_type data2=cell2->data();
--      double len2=tree2->cell_bounding_box(cell2).width();
--
--      data_type dataout=cellout->data();
--
--      double p1=1-std::exp(-data1.alpha*len1);
--      double p2=1-std::exp(-data2.alpha*len2);
--
--      double p=p1+p2-2*p1*p2;
--
--      double alphaout=-std::log(1-p)/len1;
--      if (p<threshold)
--          alphaout=0.0;
--      dataout.alpha=(float)alphaout;
--      if (p1>p2)
--        dataout.appearance_=data1.appearance_;
--      else
--        dataout.appearance_=data2.appearance_;
--
--      cellout->set_data(dataout);
--    }
--  }
--}
--
--
--void boxm_compute_scene_difference(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene1,
--                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&scene2,
--                                   boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >&sceneout,
--                                   float threshold)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >tree_type;
--  boxm_block_iterator<tree_type> iter1(&scene1);
--  boxm_block_iterator<tree_type> iter2(&scene2);
--
--  // scene out is cloned as scene1.
--  scene1.clone_blocks(sceneout);
--  boxm_block_iterator<tree_type> iterout(&sceneout);
--
--  for (; !iter1.end(); iter1++,iter2++,iterout++) {
--    std::cout<<'.';
--    scene1.load_block(iter1.index());
--    scene2.load_block(iter2.index());
--    sceneout.load_block(iterout.index());
--
--    //boxm_block<tree_type>* block1 = *iter1;
--    //boxm_block<tree_type>* block2 = *iter2;
--    //boxm_block<tree_type>* blockout = *iterout;
--
--    boxm_compute_block_difference((*iter1),(*iter2),(*iterout), threshold);
--    sceneout.write_active_block();
--  }
--}
--
--#endif // boxm_compute_scene_difference_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h b/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
-deleted file mode 100644
-index c697a4e6b4..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_compute_scene_statistics.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_compute_scene_statistics_h
--#define boxm_compute_scene_statistics_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_histogram.h>
--
--//: Compute histogram of a simple-type scenes. e.g. T_data = float, double
--template <class T_loc, class T_data>
--bool boxm_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist )//, bsta_histogram<float>& level_hist, unsigned& n_leaves)
--{
--  std::cout << " Using compute_scene_statistics\n";
--
--  typedef boct_tree<T_loc, T_data> tree_type;
--
--  //(1) Traverse the leaves of the scene
--  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
--
--  iterator.begin();
--  float cell_count = 0;
--  float max = (float)(*iterator)->data();
--  float min = max;
--  float this_val = max;
--  while (!iterator.end()) {
--    cell_count++;
--    this_val = (float)(*iterator)->data();
--    if ( this_val > max)  max = this_val;
--    if ( this_val < min)  min = this_val;
--    ++iterator;
--  }
--
--  unsigned int nbins = (unsigned int)std::abs(max-min);// std::floor(std::sqrt(cell_count));
--  response_hist = bsta_histogram<float>(min, max, nbins);
--  scene->unload_active_blocks();
--  iterator.begin();
--  while (!iterator.end()) {
--    response_hist.upcount((float)(*iterator)->data(), 1.0f);
--    ++iterator;
--  }
--
--  scene->unload_active_blocks();
--
--  return true;
--}
--
--//: Compute histogram for appearance model scene - where alpha, omega etc are relevant
--template <class T_loc, class T_data>
--bool compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene, bsta_histogram<float>& omega_hist, bsta_histogram<float>& sigma_hist, bsta_histogram<float>& level_hist, unsigned& n_leaves)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc,T_data> cell_type;
--
--  omega_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
--  sigma_hist = bsta_histogram<float>(0.0f, 1.0f, 20);
--  level_hist = bsta_histogram<float>(0.0f, 10.0f, 10);
--  boxm_block_iterator<tree_type> bit = scene.iterator();
--  for (;!bit.end(); ++bit)
--  {
--    vgl_point_3d<int> block_index = bit.index();
--    scene.load_block(block_index);
--    boxm_block<tree_type> * block = scene.get_active_block();
--    tree_type* tree=block->get_tree();
--    if (!tree) return false;
--    int n_levels = tree->number_levels();
--    int fin_level = tree->finest_level();
--    for (int level = n_levels-1; level>=fin_level; --level)
--    {
--      std::vector<cell_type *> cells_at_level =
--        tree->leaf_cells_at_level(static_cast<unsigned>(level));
--      level_hist.upcount(static_cast<float>(level),
--                         static_cast<float>(cells_at_level.size()));
--    }
--    std::vector<cell_type *> leaves = tree->leaf_cells();
--    n_leaves = leaves.size();
--    for (typename std::vector<cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
--    {
--      T_data data = (*cit)->data();
--      vgl_box_3d<double> bb = tree->cell_bounding_box(*cit);
--      double dx = bb.width(), dy = bb.height(), dz = bb.depth();
--      double diag = std::sqrt(dx*dx + dy*dy + dz*dz);
--      double alpha = data.alpha;
--      double omega = 1.0 - std::exp(-alpha*diag);
--      omega_hist.upcount(static_cast<float>(omega), 1.0f);
--
--      if (scene.appearence_model() == BOXM_APM_SIMPLE_GREY)
--      {
--        float sigma = data.appearance_.sigma();
--        sigma_hist.upcount(sigma, 1.0f);
--      }
--    }
--  }
--  return true;
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h b/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
-deleted file mode 100644
-index 63aa888efa..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_crop_scene.h
-+++ /dev/null
-@@ -1,95 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_crop_scene.h
--#ifndef boxm_crop_scene_h
--#define boxm_crop_scene_h
--
--//:
--// \file
--// \brief  Template functions to create a new scene that is a cropped portion of another
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  January 11, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <class T_data>
--boxm_scene<boct_tree<short, T_data> > *  boxm_crop_scene(boxm_scene<boct_tree<short,T_data> > *scene_in,vgl_box_3d<double> bbox)
--{
--  //only one-block scenes are supported for now
--  if (!(scene_in->world_dim().x() == 1 && scene_in->world_dim().y()==1 && scene_in->world_dim().z()==1))
--  {
--    std::cerr << "In bvxm_crop_scene -- Input scene has more than one block, which is not supported\n";
--    return nullptr;
--  }
--
--  //get the tree inside the block and locate region
--  boxm_block_iterator<boct_tree<short, T_data> > iter_in = scene_in->iterator();
--  iter_in.begin();
--
--  //there is no need to increase iterator, since there should only be one block in the scene
--  scene_in->load_block(iter_in.index());
--  boct_tree<short, T_data>  *tree_in= (*iter_in)->get_tree();
--
--  boct_tree_cell<short,T_data>* root = tree_in->locate_region_global(bbox, true);
--
--  //most parameters of the output scene are the same as those of the input scene,
--  //except the ROI which is determined by the root node
--  double cell_length = 1.0/(double)(1<<(tree_in->root_level() - root->level()));
--  double cell_origin_x = (double)(root->get_code().x_loc_)/(double)(1<<(tree_in->root_level()));
--  double cell_origin_y = (double)(root->get_code().y_loc_)/(double)(1<<(tree_in->root_level()));
--  double cell_origin_z = (double)(root->get_code().z_loc_)/(double)(1<<(tree_in->root_level()));
--
--  vgl_box_3d<double> global_bbox = tree_in->bounding_box();
--
--  vgl_point_3d<double> origin(cell_origin_x, cell_origin_y, cell_origin_z);
--
--  vgl_point_3d<double> min_point((global_bbox.min_x() + global_bbox.width()*origin.x()),
--                                 (global_bbox.min_y() + global_bbox.height()*origin.y()),
--                                 (global_bbox.min_z() + global_bbox.depth()*origin.z()));
--
--  vgl_vector_3d<double> block_dim(cell_length*global_bbox.width(),
--                                  cell_length*global_bbox.height(),
--                                  cell_length*global_bbox.depth());
--
--  boxm_scene<boct_tree<short, T_data> > *scene_out =
--  new boxm_scene<boct_tree<short, T_data> >(scene_in->lvcs(),min_point,block_dim,scene_in->world_dim(), scene_in->save_internal_nodes());
--
--  scene_out->set_paths(scene_in->path(), "cropped");
--  scene_out->set_appearance_model(scene_in->appearence_model());
--  scene_out->clean_scene();
--  boxm_block_iterator<boct_tree<short, T_data> > iter_out = scene_out->iterator();
--  iter_out.begin();
--  scene_out->load_block(iter_out.index());
--
--
--  //Region of interest in [0,1)x[0,1)x[0,1) coordinates
--  vgl_point_3d<double> norm_bbox_min((bbox.min_x()-global_bbox.min_x())/global_bbox.width(),
--                                     (bbox.min_y()-global_bbox.min_y())/global_bbox.height(),
--                                     (bbox.min_z()-global_bbox.min_z())/global_bbox.depth());
--  vgl_point_3d<double> norm_bbox_max((bbox.max_x()-global_bbox.min_x())/global_bbox.width(),
--                                     (bbox.max_y()-global_bbox.min_y())/global_bbox.height(),
--                                     (bbox.max_z()-global_bbox.min_z())/global_bbox.depth());
--
--
--  //output tree
--  boct_tree<short, T_data >  *tree_out = tree_in->clone_and_intersect(root, tree_in->root_level(), vgl_box_3d<double>(norm_bbox_min,norm_bbox_max));
--
--  //write the output tree
--  (*iter_out)->init_tree(tree_out);
--  scene_out->write_active_block();
--  scene_out->write_scene("/cropped_scene.xml");
--
--  return scene_out;
--}
--
--
--#endif // boxm_crop_scene_h
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
-deleted file mode 100644
-index f41af5bca8..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_fill_in_mesh.h
-+++ /dev/null
-@@ -1,316 +0,0 @@
--#ifndef boxm_fill_in_mesh_h_
--#define boxm_fill_in_mesh_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_operations.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bool is_mesh_in_block(imesh_mesh & mesh, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
--{
--  imesh_face_array_base& fs = mesh.faces();
--  std::list<vgl_point_3d<double> > v_list;
--  vgl_box_3d<double> bb_global;
--
--  for (unsigned i=0; i < fs.size(); ++i)
--  {
--    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
--    for (unsigned j=0; j<fs.num_verts(i); ++j) {
--      unsigned int v_id = fs(i,j);
--      vgl_point_3d<double> v;
--      if (use_lvcs) {
--        double lx, ly, lz;
--        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                             vpgl_lvcs::wgs84,lx,ly,lz);
--        v=vgl_point_3d<double>(lx,ly,lz);
--      }
--      else
--        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--      bb_global.add(v);
--      v_list.push_back(v);
--    }
--  }
--
--  vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
--  if (inters.is_empty())
--    return false;
--
--  return true;
--}
--
--template <class T_loc, class T_data>
--bool are_meshes_in_block(std::vector<imesh_mesh>  meshes, vgl_box_3d<double> block_bbox,vpgl_lvcs& lvcs, bool use_lvcs)
--{
--  bool flag=false;
--  for (auto & meshe : meshes)
--  {
--    meshe.compute_face_normals(true);
--    imesh_face_array_base& fs = meshe.faces();
--    std::list<vgl_point_3d<double> > v_list;
--    vgl_box_3d<double> bb_global;
--
--    for (unsigned i=0; i < fs.size(); ++i)
--    {
--      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--      for (unsigned j=0; j<fs.num_verts(i); ++j) {
--        unsigned int v_id = fs(i,j);
--        vgl_point_3d<double> v;
--        if (use_lvcs) {
--          double lx, ly, lz;
--          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                               vpgl_lvcs::wgs84,lx,ly,lz);
--          v=vgl_point_3d<double>(lx,ly,lz);
--        }
--        else
--          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--        bb_global.add(v);
--        v_list.push_back(v);
--      }
--    }
--
--    vgl_box_3d<double> inters = vgl_intersection(block_bbox,bb_global);
--    if (!inters.is_empty())
--      flag=true;
--  }
--  return flag;
--}
--
--template <class T_loc, class T_data>
--void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
--                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  for (auto & meshe : meshes)
--  {
--    imesh_face_array_base& fs = meshe.faces();
--    std::list<vgl_point_3d<double> > v_list;
--    vgl_box_3d<double> bb_scale, bb_global;
--    for (unsigned i=0; i < fs.size(); ++i)
--    {
--      imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--      for (unsigned j=0; j<fs.num_verts(i); ++j) {
--        unsigned int v_id = fs(i,j);
--        vgl_point_3d<double> v;
--        if (use_lvcs) {
--          double lx, ly, lz;
--          lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                               vpgl_lvcs::wgs84,lx,ly,lz);
--          v=vgl_point_3d<double>(lx,ly,lz);
--        }
--        else
--          v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--        bb_global.add(v);
--        vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--        v.set(diff.x(), diff.y(), diff.z());
--        // the local coordinates inside the box region
--        v_list.push_back(v);
--        //convert the values into [0,1] range
--        v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--        bb_scale.add(v);
--      }
--    }
--    // check if polygon's bounding box intersects with the block
--    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--    if (inters.is_empty())
--      continue;
--
--    // locate the polygon bounding box in tree
--    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
--    if (region) {
--      // test all the children for intersection
--      std::vector<boct_tree_cell<T_loc,T_data>*> children;
--      if (!region->is_leaf())
--        region->leaf_children(children);
--      else // insert the node itself, if no children
--        children.push_back(region);
--      for (unsigned i=0; i<children.size(); i++) {
--        boct_tree_cell<T_loc,T_data>* cell=children[i];
--        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
--        if (contains_point(meshe,cell_bb.centroid())) {
--          cell->set_data(val);
--        }
--      }
--    }
--  }
--}
--
--//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
--template <>
--void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
--                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
--                                  bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  for (auto & meshe : meshes)
--  {
--    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
--    {
--      imesh_face_array_base& fs = meshe.faces();
--      std::list<vgl_point_3d<double> > v_list;
--      vgl_box_3d<double> bb_scale, bb_global;
--
--      for (unsigned i=0; i < fs.size(); ++i)
--      {
--        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--        for (unsigned j=0; j<fs.num_verts(i); ++j) {
--          unsigned int v_id = fs(i,j);
--          vgl_point_3d<double> v;
--          if (use_lvcs) {
--            double lx, ly, lz;
--            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                                 vpgl_lvcs::wgs84,lx,ly,lz);
--            v=vgl_point_3d<double>(lx,ly,lz);
--          }
--          else
--            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--          bb_global.add(v);
--          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--          v.set(diff.x(), diff.y(), diff.z());
--          // the local coordinates inside the box region
--          v_list.push_back(v);
--          //convert the values into [0,1] range
--          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--          bb_scale.add(v);
--        }
--      }
--
--      // check if polygon's bounding box intersects with the block
--      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--      if (inters.is_empty())
--        continue;
--
--      meshe.compute_face_normals();
--
--      // locate the polygon bounding box in tree
--      boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
--      if (region)
--      {
--        // test all the children for intersection
--        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
--        if (!region->is_leaf())
--          region->leaf_children(children);
--        else // insert the node itself, if no children
--          children.push_back(region);
--        for (auto cell : children) {
--          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
--
--          if (contains_point(meshe,cell_bb.centroid())) {
--            boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
--            tempdata.set_appearance(val.appearance());
--            tempdata.alpha*=val.alpha;
--            cell->set_data(tempdata);
--          }
--        }
--      }
--    }
--  }
--}
--
--template <>
--void boxm_fill_in_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > > *block,
--                                  std::vector<imesh_mesh> meshes, vpgl_lvcs& lvcs,
--                                  bool use_lvcs, boxm_sample<BOXM_APM_SIMPLE_GREY> val)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  for (auto & meshe : meshes)
--  {
--    if (is_mesh_in_block(meshe, block_bb,lvcs, use_lvcs))
--    {
--      imesh_face_array_base& fs = meshe.faces();
--      std::list<vgl_point_3d<double> > v_list;
--      vgl_box_3d<double> bb_scale, bb_global;
--
--      for (unsigned i=0; i < fs.size(); ++i)
--      {
--        imesh_vertex_array<3>& vertices = meshe.vertices<3>();
--        for (unsigned j=0; j<fs.num_verts(i); ++j) {
--          unsigned int v_id = fs(i,j);
--          vgl_point_3d<double> v;
--          if (use_lvcs) {
--            double lx, ly, lz;
--            lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                                 vpgl_lvcs::wgs84,lx,ly,lz);
--            v=vgl_point_3d<double>(lx,ly,lz);
--          }
--          else
--            v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--          bb_global.add(v);
--          vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--          v.set(diff.x(), diff.y(), diff.z());
--          // the local coordinates inside the box region
--          v_list.push_back(v);
--          //convert the values into [0,1] range
--          v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--          bb_scale.add(v);
--        }
--      }
--
--      // check if polygon's bounding box intersects with the block
--      vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--      if (inters.is_empty())
--        continue;
--
--      meshe.compute_face_normals();
--
--      // locate the polygon bounding box in tree
--      boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >* region=tree->locate_region(inters);
--      if (region)
--      {
--        // test all the children for intersection
--        std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >*> children;
--        if (!region->is_leaf())
--          region->leaf_children(children);
--        else // insert the node itself, if no children
--          children.push_back(region);
--        for (auto cell : children) {
--          vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
--
--          if (contains_point(meshe,cell_bb.centroid())) {
--            boxm_sample<BOXM_APM_SIMPLE_GREY> tempdata=cell->data();
--            tempdata.set_appearance(val.appearance());
--            tempdata.alpha*=val.alpha;
--            cell->set_data(tempdata);
--          }
--        }
--      }
--    }
--  }
--}
--
--template <class T_loc, class T_data>
--void boxm_fill_in_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                  std::vector<imesh_mesh> meshes, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--  vpgl_lvcs lvcs=scene.lvcs();
--  boxm_block_iterator<tree_type> iter(&scene);
--  for (; !iter.end(); iter++) {
--    vgl_box_3d<double> block_bb=scene.get_block_bbox(iter.index().x(),iter.index().y(),iter.index().z());
--    if (are_meshes_in_block<T_loc, T_data >(meshes,block_bb,lvcs,use_lvcs))
--    {
--      scene.load_block(iter.index());
--      boxm_block<tree_type>* block = *iter;
--      boxm_fill_in_mesh_into_block(block, meshes, lvcs, use_lvcs, val);
--      scene.write_active_block();
--    }
--  }
--}
--
--#endif // boxm_fill_in_mesh_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h b/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
-deleted file mode 100644
-index 6d81beef0f..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_fill_internal_cells.h
-+++ /dev/null
-@@ -1,80 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_fill_internal_cells.h
--#ifndef boxm_fill_internal_cells_h
--#define boxm_fill_internal_cells_h
--//:
--// \file
--// \brief Class in charged of filling the intermediate nodes of a tree.
--// \author Maria Isabel Restrepo mir@lems.brown.edu
--// \date  Feb 3, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: A class to combine children cells and fill intermediate nodes
--template <class T_data>
--class boxm_fill_internal_cells
--{
-- public:
--  typedef boct_tree<short,T_data> tree_type;
--
--  boxm_scene<boct_tree<short,T_data> > * traverse_and_fill(boxm_scene<boct_tree<short,T_data> > *scene_in)
--  {
--    // Most parameters of the output scene are the same as those of the input scene
--    // but we need to change the mode of the scene to be saving internal nodes
--    bool save_internal_nodes = true;
--    boxm_scene<tree_type> *scene_out = new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
--                                                                 scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
--                                                                 false, save_internal_nodes);
--    std::string block_pref = scene_in->block_prefix() + "_all_nodes";
--    scene_out->set_paths(scene_in->path(), block_pref);
--    scene_out->set_appearance_model(scene_in->appearence_model());
--
--    scene_out->write_scene(block_pref + ".xml");
--
--    //Iterate through the blocks
--    boxm_block_iterator<tree_type> iter_in = scene_in->iterator();
--    boxm_block_iterator<tree_type> iter_out = scene_out->iterator();
--
--    iter_in.begin();
--    iter_out.begin();
--
--    while (!iter_in.end() && !iter_out.end())
--    {
--      scene_in->load_block(iter_in.index());
--      scene_out->load_block(iter_out.index());
--
--      tree_type *tree_in= (*iter_in)->get_tree();
--      // Copy input tree into output tree and fill
--      tree_type *tree_out = tree_in->clone();
--      this->traverse_and_fill(tree_out);
--      (*iter_out)->init_tree(tree_out);
--      std::cout << "writing block: " << iter_out.index() <<std::endl;
--      scene_out->write_active_block();
--
--      iter_in++; iter_out++;
--    }
--
--    return scene_out;
--  }
--
-- protected:
--
--  //: Traverses a tree and fills intermediate cells with the average of the 8 children.
--  // If there is need to fill cells with something different to the average, this function can be made abstract and
--  // write specializations. As in the template method design pattern
--  void traverse_and_fill(tree_type *tree_to_fill)
--  {
--    tree_to_fill->fill_with_average();
--  }
--};
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h b/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
-deleted file mode 100644
-index 9325f47c46..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_init_scene.h
-+++ /dev/null
-@@ -1,60 +0,0 @@
--#ifndef boxm_init_scene_h_
--#define boxm_init_scene_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: This method inits the blocks (octrees) of the scene of type boxm_sample
--template <boxm_apm_type APM_TYPE>
--void boxm_init_scene(boxm_scene<boct_tree<short, boxm_sample<APM_TYPE> > > &scene)
--{
--  typedef boct_tree<short, boxm_sample<APM_TYPE> > tree_type;
--  boxm_block_iterator<tree_type> iter(&scene);
--  float pinit=scene.pinit();
--  float dimx=(float)scene.block_dim().x();
--  float numbercells=(float)(1<<(scene.init_level()-1));
--
--  float alpha_init=-std::log(1-pinit)*numbercells/dimx;
--  for (; !iter.end(); iter++) {
--       vgl_point_3d<int> index=iter.index();
--    if (!scene.discover_block(index.x(),index.y(),index.z()))
--    {
--      boxm_sample<APM_TYPE> initsample(alpha_init);
--      tree_type* tree= new tree_type(initsample,scene.max_level(),scene.init_level());
--      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
--      scene.set_block(index,block);
--      scene.write_active_block();
--    }
--  }
--}
--
--//: Initializes a general scene
--template <class T_data>
--void boxm_init_scene(boxm_scene<boct_tree<short, T_data> > &scene)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  boxm_block_iterator<tree_type> iter(&scene);
--  float dimx=(float)scene.block_dim().x();
--
--  for (; !iter.end(); iter++) {
--    vgl_point_3d<int> index=iter.index();
--    if (!scene.discover_block(index.x(),index.y(),index.z()))
--    {
--      T_data initdata;
--      tree_type* tree= new tree_type(initdata,scene.max_level(),scene.init_level());
--      boxm_block<tree_type> * block=new boxm_block<tree_type>(scene.get_block_bbox(index.x(),index.y(),index.z()),tree);
--      scene.set_block(index,block);
--      scene.write_active_block();
--    }
--  }
--}
--
--#endif // boxm_init_scene_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h b/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
-deleted file mode 100644
-index 01726ab977..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_linear_operations.h
-+++ /dev/null
-@@ -1,60 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_linear_operations.h
--#ifndef boxm_linear_operations_h
--#define boxm_linear_operations_h
--//:
--// \file
--// \brief Functions to perfoms linear operations on boxm scenes and/or blocks
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  2-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_block.h>
--#include <boct/boct_tree.h>
--#include <cassert>
--#ifdef DEBUG
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--//: Computes the linear combination of two blocks in place. i.e block1 = s1*block1 +  s2*block2
--template<class T_data>
--bool boxm_linear_combination(boxm_block<boct_tree<short, T_data> > *block1, boxm_block<boct_tree<short, T_data> > *block2, float s1, float s2)
--{
--  boct_tree<short, T_data> *tree1 = block1->get_tree();
--  boct_tree<short, T_data> *tree2 = block2->get_tree();
--
--  std::vector<boct_tree_cell<short, T_data>* > cells1 = tree1->leaf_cells();
--  std::vector<boct_tree_cell<short, T_data>* > cells2 = tree2->leaf_cells();
--
--  //iterators
--  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it1 = cells1.begin();
--  typename std::vector<boct_tree_cell<short, T_data>* >::iterator it2 = cells2.begin();
--
--  for (; (it1!=cells1.end())&&(it2!= cells2.end()); it1++, it2++)
--  {
--    boct_tree_cell<short,T_data> *cell1 = *it1;
--    boct_tree_cell<short,T_data> *cell2 = *it2;
--
--#ifdef DEBUG
--    //if level and location code of cells isn't the same quit
--    boct_loc_code<short> code1 = cell1->get_code();
--    boct_loc_code<short> code2 = cell2->get_code();
--    if (!(code1.isequal(code2)))
--    {
--      std::cerr << "In boxm_linear_combination: Blocks must have the same structure\n";
--      return false;
--    }
--#endif
--
--    cell1->set_data(s1*cell1->data() + s2*cell2->data());
--  }
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
-deleted file mode 100644
-index e7e2f6585c..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.cxx
-+++ /dev/null
-@@ -1,239 +0,0 @@
--#include <vector>
--#include <iostream>
--#include <limits>
--#include "boxm_merge_mog.h"
--//:
--// \file
--
--#include <boxm/boxm_scene.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vnl/vnl_math.h> // for vnl_math::sqr()
--
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--
--void boxm_merge_mog::kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian)
--{
--  //When merging components of gaussian mixtures, we need to perform the following calculations
--  //1. find the normalizing weight of the new component.
--  //   In this case this value is 1 because we are merging all the components
--  //2. find the mean
--  //3. find the variance
--
--  float mean = 0.0f;
--  float var = 0.0f;
--
--  //CAUTION: only mixtures of 3 modes are supported for now.
--  assert(mixture.num_components() == 3);
--  unsigned num_components = mixture.num_components();
--
--  for (unsigned i = 0; i<num_components; ++i)
--  {
--    // note: these equations omit the weight of the final distribution
--    // only because in this case it is 1
--    mean += mixture.weight(i) * mixture.distribution(i).mean();
--    var  += mixture.weight(i) *(mixture.distribution(i).var() +
--                                vnl_math::sqr(mixture.distribution(i).mean()));
--  }
--  if (var <  vnl_math::sqr(mean))
--    std::cout<< "This should not happen: " << mixture << std::endl;
--  var -= vnl_math::sqr(mean);
--  assert(var >= 0);
--
--  gaussian.set_mean(mean);
--  gaussian.set_var(var);
--  return;
--}
--
--//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
--//  Thus the resulting grid contains unimodal gaussians
--bool boxm_merge_mog::kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &mog_scene,
--                                    boxm_scene<boct_tree<short, gauss_type> > &gauss_scene)
--{
--    // iterate through the scene
--    boxm_block_iterator<mog_tree_type > mog_iter = mog_scene.iterator();
--    boxm_block_iterator<gauss_tree_type > gauss_iter = gauss_scene.iterator();
--
--    for (mog_iter.begin(), gauss_iter.begin(); !mog_iter.end(); ++mog_iter, ++gauss_iter) {
--      mog_scene.load_block(mog_iter.index());
--      gauss_scene.load_block(gauss_iter.index());
--      mog_tree_type  *mog_tree = (*mog_iter)->get_tree();
--      gauss_tree_type  *gauss_tree = mog_tree->clone_to_type<gauss_type>();
--#if 0
--      gauss_tree->init_cells(func_max.min_response());
--#endif
--      this->kl_merge_octree(mog_tree,gauss_tree);
--      (*gauss_iter)->init_tree(gauss_tree);
--      gauss_scene.write_active_block();
--    }
--
--    return true;
--}
--
--//: Merges the components of the gaussian mixtures at each voxel into a single gaussian
--//  Thus the resulting grid contains unimodal gaussians
--bool boxm_merge_mog::kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree,
--                                     boct_tree<short, gauss_type> *gauss_tree)
--{
--  // iterate through the trees
--  std::vector<mog_cell_type*> mog_cells = mog_tree->all_cells();
--  std::vector<gauss_cell_type*> gauss_cells = gauss_tree->all_cells();
--
--  if (mog_cells.size()!=gauss_cells.size() ) {
--    std::cerr << "Different size vectors in boxm_merge_mog::kl_merge_octree\n";
--    return false;
--  }
--
--
--  for (unsigned i = 0; i < mog_cells.size(); ++i)
--  {
--    gauss_type result_gauss;
--    this->kl_merge(mog_cells[i]->data(), result_gauss);
--    gauss_cells[i]->set_data(result_gauss);
--  }
--  return true;
--}
--
--/********************** Non-class functions************************************/
--
--//: Computes the differential entropy of a gaussian scene- only for leave cells
--bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene_in,boxm_scene<boct_tree<short, float> >& scene_out)
--{
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
--
--  //iterate through the leaf cells computing entropy
--  boxm_cell_iterator<boct_tree<short, gauss_type > > it_in =
--  scene_in.cell_iterator(&boxm_scene<boct_tree<short, gauss_type> >::load_block);
--
--  boxm_cell_iterator<boct_tree<short, float > > it_out =
--  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
--
--  it_in.begin();
--  it_out.begin();
--
--  while ( !(it_in.end() || it_out.end()) ) {
--    boct_tree_cell<short,gauss_type> *cell_in = *it_in;
--    boct_tree_cell<short,float> *cell_out = *it_out;
--
--    boct_loc_code<short> out_code = cell_in->get_code();
--    boct_loc_code<short> in_code = cell_out->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++it_in;
--      ++it_out;
--      continue;
--    }
--
--    double h = 0.5*std::log(vnl_math::pi*vnl_math::e*2*cell_in->data().var());
--    cell_out->set_data(float(h));
--    ++it_in;
--    ++it_out;
--  }
--
--  return true;
--}
--
--
--//: Compute expectation given that the voxel is occupied
--bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
--  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
--
--  //iterate through the leaf cells computing mean appearance
--  boxm_cell_iterator<scene_tree_type > it_in =
--  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
--
--  boxm_cell_iterator<boct_tree<short, float > > it_out =
--  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
--
--  it_in.begin();
--  it_out.begin();
--
--  while ( !(it_in.end() || it_out.end()) ) {
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
--    boct_tree_cell<short,float> *cell_out = *it_out;
--
--    boct_loc_code<short> out_code = cell_in->get_code();
--    boct_loc_code<short> in_code = cell_out->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++it_in;
--      ++it_out;
--      continue;
--    }
--
--    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
--    // update alpha integral
--    float vis_color = float(1.0 - std::exp(- cell_in->data().alpha * it_in.length()))*(mean_color+grey_offset);
--    cell_out->set_data(vis_color);
--    ++it_in;
--    ++it_out;
--  }
--
--  scene_in.unload_active_blocks();
--  scene_out.unload_active_blocks();
--
--  return true;
--}
--
--
--#if 0
--//: Compute total expectation E(I) = E(I| X \in S) P(X \in S) + E(I| X !\in S) P(X !\in S)
--//  Expected appearance of a non surface voxel is not defined. Every intensity is equally likely therefore E(I| X !\in S) = 127.5 for I in [0,255]
--bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene_in, boxm_scene<boct_tree<short, float > >& scene_out)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
--  scene_in.clone_blocks_to_type<boct_tree<short, float > >(scene_out, std::numeric_limits<float>::min());
--
--  //iterate through the leaf cells computing mean appearance
--  boxm_cell_iterator<scene_tree_type > it_in =
--  scene_in.cell_iterator(&boxm_scene<scene_tree_type >::load_block, true);
--
--  boxm_cell_iterator<boct_tree<short, float > > it_out =
--  scene_out.cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block);
--
--  it_in.begin();
--  it_out.begin();
--
--  while ( !(it_in.end() || it_out.end()) )
--  {
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *cell_in = *it_in;
--    boct_tree_cell<short,float> *cell_out = *it_out;
--
--    boct_loc_code<short> out_code = cell_in->get_code();
--    boct_loc_code<short> in_code = cell_out->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((cell_in->level() != cell_out->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++it_in;
--      ++it_out;
--      continue;
--    }
--
--    float mean_color = boxm_mog_grey_processor::expected_color(cell_in->data().appearance());
--    //alpha integral
--    float vis = std::exp(- cell_in->data().alpha * it_in.length());
--    float vis_color = (1.0f - vis) *mean_color;
--    float invis_color = vis * 0.5f; // E(I| X !\in S) = 127.5/255
--    cell_out->set_data(vis_color + invis_color);
--    ++it_in;
--    ++it_out;
--  }
--
--  scene_in.unload_active_blocks();
--  scene_out.unload_active_blocks();
--
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h b/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
-deleted file mode 100644
-index 1c39b9e84c..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_merge_mog.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_merge_mog.h
--#ifndef boxm_merge_mog_h_
--#define boxm_merge_mog_h_
--//:
--// \file
--// \brief class with methods to merge gaussian mixtures.
--// \author Isabel Restrepo
--// \date April 20, 2009
--//
--// \verbatim
--//  Modifications
--//   Nov 7 2009 - Isabel Restrepo: Copied from bvxm
--// \endverbatim
--
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gaussian_indep.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <boxm/boxm_scene.h>
--
--//:
--// Only floating point are supported for now and mixtures with 3 components.
--// This class can be further templated if necessary
--class boxm_merge_mog
--{
-- private:
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef bsta_mixture_fixed<gauss_type, 3> mix_gauss;
--  typedef bsta_num_obs<mix_gauss> mix_gauss_type;
--  typedef boct_tree<short, mix_gauss_type> mog_tree_type;
--  typedef boct_tree<short, gauss_type> gauss_tree_type;
--  typedef boct_tree_cell<short, mix_gauss_type> mog_cell_type;
--  typedef boct_tree_cell<short, gauss_type> gauss_cell_type;
--
-- public:
--
--  // === Scene operations ===
--
--  //: Merges the components of the gaussian mixtures at each voxel into a single gaussian, that minimizes KL divergence.
--  //  The resulting scene contains unimodal Gaussians.
--  bool kl_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> > &app_scene,  boxm_scene<boct_tree<short, gauss_type> > &gauss_app);
--
--  bool kl_merge_octree(boct_tree<short, mix_gauss_type> *mog_tree, boct_tree<short, gauss_type> *gauss_tree);
--
--#if 0
--  //: Converts a mixture of gaussians grid into an unimodal gaussian grid corresponding to the most probable mode
--  static bool mpm_merge_scene(boxm_scene<boct_tree<short, mix_gauss_type> app_scene,  boxm_scene<boct_tree<short, gauss_type> gauss_app);
--#endif
--
--  // === Distribution operations ===
--
--  //: Merges all the components in the mixture into one component that minimizes the KL divergence between the two distributions
--  static void kl_merge(mix_gauss_type const& mixture,bsta_gauss_sf1 &gaussian);
--};
--
--
--//: Computes the differential entropy of a gaussian scene- only for leave cells
--bool compute_differential_entropy(boxm_scene<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > >& scene,boxm_scene<boct_tree<short, float > >& scene_out);
--
--//: Computes expected color of a voxel as mean/occupancy
--bool compute_expected_color(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >& scene, boxm_scene<boct_tree<short, float > >& scene_out, float grey_offset);
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_refine.h b/contrib/brl/bseg/boxm/algo/boxm_refine.h
-deleted file mode 100644
-index c3f464f906..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_refine.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_refine_h_
--#define boxm_refine_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--void boxm_refine_block(boxm_block<boct_tree<T_loc, T_data> > *block,
--                       float occlusion_prob_thresh, unsigned & num_split, bool reset_appearance = true)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  tree_type* tree = block->get_tree();
--  float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
--  // get the leaf nodes of the block
--  std::vector<boct_tree_cell<T_loc, T_data>*> leaf_nodes = tree->leaf_cells();
--#ifdef DEBUG
--  std::cout << "  NUMBER OF LEAF NODES=" << leaf_nodes.size();
--#endif
--  std::vector<boct_tree_cell<T_loc, T_data >*> split_list;
--  for (unsigned i=0; i<leaf_nodes.size(); i++) {
--    boct_tree_cell<T_loc, T_data>* cell = leaf_nodes[i];
--    T_data data = cell->data();
--
--    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
--    float alpha_int = data.alpha * side_len;
--
--    if ((alpha_int > max_alpha_int) && (cell->level() > 0)) {
--      split_list.push_back(cell);
--      // make sure neighbor cells are not already coarser than this cell
--      // get all the faces;
--#if 0
--      boct_face_idx faces = ALL;
--      std::vector<boct_tree_cell<T_loc, T_data >*> neighbors;
--      cell->find_neighbors(faces, neighbors, cell->level()+1);
--      split_list.insert(split_list.end(), neighbors.begin(), neighbors.end());
--#endif
--    }
--  }
--  num_split+=(int)split_list.size();
--#ifdef DEBUG
--  std::cout<<" Splitting "<<split_list.size()<<" cells" << std::endl;
--#endif
--  // splitting
--  for (unsigned i=0; i<split_list.size(); i++) {
--    boct_tree_cell<T_loc, T_data>* cell = split_list[i];
--    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--    float side_len = (float) (cell_bb.max_z() - cell_bb.min_z());
--    float new_alpha = max_alpha_int / side_len;
--
--    T_data old_sample = cell->data();
--    typename T_data::apm_datatype app;
--    if (!reset_appearance) {
--      // if it is not set, transfer the old appearance to the new sample
--      T_data new_sample = old_sample;
--      new_sample.alpha=new_alpha;
--      cell->split(new_sample);
--    }
--    else {
--      T_data new_sample = T_data();
--      new_sample.alpha = new_alpha;
--      cell->split(new_sample);
--    }
--  }
--}
--
--//: This method refines the blocks (octrees) of the scene
--// If there are some cells with big values they are spitted into new child cells;
--// the data of the cell is copied to the children's data. The purpose of this
--// method is to elaborate the octree at the areas where more details exist.
--// returns the number of leaf nodes in the refined octree
--template <class T_loc, class T_data>
--unsigned int boxm_refine_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                               float occlusion_prob_thresh,
--                               bool reset_appearance = true)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  unsigned int nleaves = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--  //float max_alpha_int = (float)-std::log(1.0 - occlusion_prob_thresh);
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boxm_refine_block(block, occlusion_prob_thresh,nleaves, reset_appearance);
--    //nleaves += block->size();
--    scene.write_active_block();
--  }
--  std::cout<<"Total No of leaves split "<<nleaves<<std::endl;
--  return nleaves;
--}
--
--#endif // boxm_refine_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
-deleted file mode 100644
-index 65c03397ce..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_save_block_raw.h
-+++ /dev/null
-@@ -1,155 +0,0 @@
--#ifndef boxm_save_block_raw_h_
--#define boxm_save_block_raw_h_
--
--#include <vector>
--#include <new>
--#include <iostream>
--
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/util/boxm_cell_data_traits.h>
--
--#include <bsta/bsta_attributes.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--void boxm_save_block_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                         vgl_point_3d<int> block_idx,
--                         std::string filename,
--                         unsigned int resolution_level)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  scene.load_block(block_idx);
--  boxm_block<tree_type>* block = scene.get_block(block_idx);
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  tree_type* tree = block->get_tree();
--
--  // query the finest level of the tree and do not make the resolution smaller than that
--  if (tree->finest_level() > (int)resolution_level)
--    resolution_level = tree->finest_level();
--
--  // get origin of block
--  vgl_point_3d<double> min = block_bb.min_point();
--
--  const unsigned int ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--  // assume that bounding box is a cube
--  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--  // origin should specify center of first cell
--  vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--  int data_size = ncells*ncells*ncells;
--  int y_size = ncells*ncells;
--  float *data = nullptr;
--  data = new (std::nothrow)float[data_size];
--
--  if (data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--    return;
--  }
--  // init to zero
--  for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--    *dp = 0.0f;
--  }
--
--  double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--  out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--  std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--  for (unsigned i=0; i<cells.size(); i++)
--  {
--    vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--    float cell_val = boxm_cell_to_float(cells[i], step_len);
--
--    unsigned int level = cells[i]->get_code().level;
--
--    if (level == resolution_level) {
--      // just copy value to output array
--      int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
--      if (out_index >= data_size)
--        std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--      else
--        data[out_index] = cell_val;
--    }
--    else if (level > resolution_level) {
--      // cell is bigger than output cells.  copy value to all contained output cells.
--      const unsigned int us_factor = 1 << (level - resolution_level);
--      const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--      const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--      const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--      for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--        for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--          for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--            int out_index = z*y_size + y*ncells + x;
--            //std::cout << level << "  " << out_index << std::endl;
--            if (out_index >= data_size)
--              std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--            else
--              data[out_index] = cell_val;
--          }
--        }
--      }
--    }
--    else {
--      // cell is smaller than output cells. increment output cell value
--      unsigned int ds_factor = 1 << (resolution_level - level);
--      double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--      const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--      const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--      const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--      unsigned int out_index = static_cast<unsigned int>((node_z)*y_size + (node_y)*ncells + (node_x));
--      data[out_index] += float(cell_val*update_weight);
--    }
--  }
--  // convert float values to char
--
--  unsigned char *byte_data = nullptr;
--  byte_data = new (std::nothrow) unsigned char[data_size];
--  if (byte_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
--    return;
--  }
--
--  float* dp = data;
--  for (unsigned char* bdp = byte_data; dp < data + data_size; ++dp, ++bdp) {
--    //double P = 1.0 - std::exp(-*dp*step_len);
--    *bdp = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5)); // always positive so this is an ok way to round
--  }
--  delete[] data;
--
--  // write header
--  unsigned char data_type = 0; // 0 means unsigned byte
--
--  vxl_uint_32 nx = ncells;
--  vxl_uint_32 ny = ncells;
--  vxl_uint_32 nz = ncells;
--
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx),sizeof(nx));
--  os.write(reinterpret_cast<char*>(&ny),sizeof(ny));
--  os.write(reinterpret_cast<char*>(&nz),sizeof(nz));
--
--  os.write((char*)byte_data,data_size);
--  delete[] byte_data;
--
--  return;
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
-deleted file mode 100644
-index f3051e8f6e..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw.h
-+++ /dev/null
-@@ -1,277 +0,0 @@
--#ifndef boxm_save_scene_raw_h_
--#define boxm_save_scene_raw_h_
--//:
--// \file
--// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
--//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
--//         And then these sets of data combined and saved in a raw file.
--//
--// \author Gamze Tunali
--// \date   September 9, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vector>
--#include <new>
--#include <iostream>
--#include <sstream>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_cell_data_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--
--#include <bsta/bsta_histogram.h>
--#include <vbl/vbl_array_3d.hxx>
--#include <vsl/vsl_binary_io.h>
--#include <vpl/vpl.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--template <class T_loc, class T_data>
--void boxm_save_scene_raw(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                         std::string filename,
--                         unsigned int resolution_level)
--{
--  float minv = 1.0e10, maxv = 0.0;
--  bsta_histogram<float> h(0.0f, 1.0f, 20);
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  unsigned int finest_level=scene.finest_level();
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  if (resolution_level < finest_level)
--  resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    float *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)float[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--    // init to zero
--    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = 0.0f;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      float cell_val = boxm_cell_to_float(cells[i], step_len);
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              //int out_index=x*y_size + y*ncells + z;
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--              //////int out_index=z + y*ncells + x*ncells*ncells;
--              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
--
--        data[out_index] += float(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << fn << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    float* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      //double P = 1.0 - std::exp(-*dp*step_len);
--      // always positive so this is an ok way to round
--      float fv = *dp;
--      h.upcount(fv, 1.0f);
--      if (fv<minv) minv = fv;
--      if (fv>maxv) maxv = fv;
--      unsigned char c = (unsigned char)(std::floor((255.0 * (*dp)) + 0.5));
--      vsl_b_write(os, (char) c);
--    }
--    delete[] data;
--    os.close();
--    iter++;
--  }
--  scene.unload_active_blocks();
--
--  assert(ncells > 0);
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  char* byte_data = new (std::nothrow) char[row_data_size];
--  if (byte_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type = 0; // 0 means unsigned byte
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read(byte_data, ncells);
--            os.write((char*)byte_data,ncells);
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] byte_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--  std::cout << "Volume Histogram(" << minv << ' ' << maxv << "):[0->1]20bins\n";
--  h.print();
--  return;
--}
--
--#endif // boxm_save_scene_raw_h_
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h b/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
-deleted file mode 100644
-index 28753c4595..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
-+++ /dev/null
-@@ -1,824 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_save_scene_raw_general.h
--#ifndef boxm_save_scene_raw_general_h
--#define boxm_save_scene_raw_general_h
--
--//:
--// \file
--// \brief  Writes the 3D scene into a raw file by combining all the spatial data in a set of octrees.
--//         The octree data mapped to a 3D regular grid and kept in binary files temporarily.
--//         And then these sets of data combined and saved in a raw file.
--//
--// \author Gamze Tunali
--// \date   September 9, 2009
--// \verbatim
--//  Modifications
--//   February 17, 2011 Isabel Restrepo: Modified functions to use with more general scenes.
--//                                      Double, float values are not converted to byte, nor assumptions are made. Values are saves as they are
--// \endverbatim
--
--#include <vector>
--#include <new>
--#include <iostream>
--#include <sstream>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_cell_data_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <bsta/bsta_histogram.h>
--#include <vbl/vbl_array_3d.hxx>
--#include <vsl/vsl_binary_io.h>
--#include <vpl/vpl.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--#include <vul/vul_file.h>
--
--
--//: Traits for saving grids of different datatypes to Drishti .raw file
--template <class T>
--class boxm_dristhi_traits;
--
--//: Drishti datatypes for header:
--// * 0 : unsigned byte - 1 byte per voxel
--// * 1 : signed byte - 1 byte per voxel
--// * 2 : unsigned short - 2 bytes per voxel
--// * 3 : signed short - 2 bytes per voxel
--// * 4 : integer - 4 bytes per voxel
--// * 8 : float - 4 bytes per voxel
--
--//: Drishti traits specializations. Please extent as needed
--
--template <>
--class boxm_dristhi_traits<float>
--{
-- public:
--  static unsigned char dristhi_header() {return 8;}
--};
--
--
--template <>
--class boxm_dristhi_traits<unsigned char>
--{
-- public:
--  static unsigned char dristhi_header() {return 0;}
--};
--
--template <>
--class boxm_dristhi_traits<char>
--{
-- public:
--  static unsigned char dristhi_header() {return 1;}
--};
--
--template <>
--class boxm_dristhi_traits<short>
--{
-- public:
--  static unsigned char dristhi_header() {return 3;}
--};
--
--template <>
--class boxm_dristhi_traits<unsigned int>
--{
-- public:
--  static unsigned char dristhi_header() {return 4;}
--};
--
--template <>
--class boxm_dristhi_traits<bsta_num_obs<bsta_gauss_sf1> >
--{
-- public:
--  static unsigned char dristhi_header() {return 8;}
--};
--
--
--template <class T_loc>
--void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, bool > > &scene,
--                                 std::string filename,
--                                 unsigned int resolution_level)
--{
--  unsigned long n_zeros = 0;
--  unsigned long n_ones = 0;
--  unsigned long n_zeros_level0 = 0;
--  unsigned long n_ones_level0 = 0;
--
--  typedef boct_tree<T_loc, bool > tree_type;
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  unsigned int finest_level=scene.finest_level();
--
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end())
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    unsigned char *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)unsigned char[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--
--    // init to zero
--    for (unsigned char* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = (unsigned char)0.0;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, bool > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      unsigned char cell_val = (unsigned char)cells[i]->data()*255;
--      if (cells[i]->data()) {
--        n_ones++;
--        if (cells[i]->get_code().level ==0)
--          n_ones_level0++;
--      }
--      else {
--        n_zeros++;
--        if (cells[i]->get_code().level ==0)
--          n_zeros_level0++;
--      }
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--
--        data[out_index] += (unsigned char)(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << filename << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    unsigned char* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      unsigned char v = *dp;
--      vsl_b_write(os, (unsigned char)v);
--    }
--    delete[] data;
--    os.close();
--    iter++;
--  }
--
--  scene.unload_active_blocks();
--
--  assert(ncells > 0);
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  unsigned char* read_data = new (std::nothrow) unsigned char[row_data_size];
--  if (read_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type= 0;
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read(reinterpret_cast<char*>(read_data), ncells*sizeof(unsigned char));
--            os.write(reinterpret_cast<char*>(read_data),ncells*sizeof(unsigned char));
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] read_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--
--  std::cout << "Number of true cells : " << n_ones << "\n Number of false cells: " << n_zeros << std::endl;
--  std::cout << "Number of true cells at level 0 : " << n_ones_level0 << "\n Number of false cells at level 0: " << n_zeros_level0 << std::endl;
--
--  return;
--}
--
--
--template <class T_loc, class T_data>
--void boxm_save_scene_raw_general(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                 std::string filename,
--                                 unsigned int resolution_level)
--{
--  std::cout << " Using boxm_save_scene_raw_general\n";
--  bsta_histogram<float> hist;
--  boxm_compute_scene_statistics(&scene, hist);
--  hist.pretty_print();
--
--  std::stringstream ss;
--  ss << vul_file::strip_extension(filename) << "_hist_plot.txt" ;
--  std::ofstream hist_arrays_ofs((ss.str()).c_str());
--  hist.print_to_arrays(hist_arrays_ofs);
--  hist_arrays_ofs.close();
--
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  unsigned int finest_level=scene.finest_level();
--
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end())
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    T_data *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)T_data[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--
--    // init to zero
--    for (T_data* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = (T_data)0.0;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      T_data cell_val = cells[i]->data();
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--
--        data[out_index] += (T_data)(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << filename << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    T_data* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      T_data v = *dp;
--      if (v > 19 || v < -1)
--        std::cerr << "Error, v: " << v << '\n';
--      vsl_b_write(os, (T_data)v);
--    }
--    std::cerr << " Data Correct ? " << '\n';
--
--    delete[] data;
--    os.close();
--    iter++;
--  }
--
--  scene.unload_active_blocks();
--
--  assert(ncells > 0);
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  T_data* read_data = new (std::nothrow) T_data[row_data_size];
--  if (read_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate read data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type = boxm_dristhi_traits<T_data>::dristhi_header();
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read((char*)read_data, ncells*sizeof(T_data));
--            os.write((char*)read_data,ncells*sizeof(T_data));
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] read_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--  return;
--}
--
--
--template <class T_loc, class T_data>
--void boxm_save_scene_raw_general_to_byte(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                         std::string filename,
--                                         unsigned int resolution_level)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  std::cout << " Using boxm_save_scene_raw_general_to_byte\n";
--
--  bsta_histogram<float> hist;
--  boxm_compute_scene_statistics(&scene, hist);
--
--  // create an array for each block, and save in a binary file
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 0;
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  unsigned int finest_level=scene.finest_level();
--
--  // query the finest level of the tree and do not make the resolution
--  // smaller than that
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--  iter.begin();
--  while (!iter.end())
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    tree_type* tree = block->get_tree();
--
--    // get origin of block
--    vgl_point_3d<double> min = block_bb.min_point();
--
--    ncells = 1 << (tree->root_level() - (int)resolution_level);
--
--    // assume that bounding box is a cube
--    const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--
--    // origin should specify center of first cell
--    vgl_point_3d<double> data_og(min.x() + (step_len/2.0), min.y() + (step_len/2.0), min.z() + (step_len/2.0));
--
--    int data_size = ncells*ncells*ncells;
--    float *data = nullptr;
--    std::cout << "Data Size=" << data_size << std::endl;
--    data = new (std::nothrow)float[data_size];
--
--    if (data == nullptr) {
--      std::cout << "boxm_save_block_raw: Could not allocate data!" << std::endl;
--      return;
--    }
--    // init to zero
--    for (float* dp = data; dp < data + ncells*ncells*ncells; ++dp) {
--      *dp = 0.0f;
--    }
--
--    double out_cell_norm_volume = (tree->number_levels() - (int)resolution_level + 1);
--    out_cell_norm_volume = out_cell_norm_volume*out_cell_norm_volume*out_cell_norm_volume;
--
--    std::vector<boct_tree_cell<T_loc, T_data > *> cells = tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++)
--    {
--      vgl_point_3d<double> node = tree->cell_bounding_box_local(cells[i]).min_point();
--
--      float cell_val = boxm_cell_to_float(cells[i], step_len);
--
--      unsigned int level = cells[i]->get_code().level;
--      if (level == resolution_level) {
--        // just copy value to output array
--        //int out_index = static_cast<int>((node.x()/step_len)*ncells*ncells + (node.y()/step_len)*ncells + (node.z()/step_len));
--        int out_index=static_cast<int>(ncells-1-(node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>((node.z()/step_len) + (node.y()/step_len)*ncells + (node.x()/step_len)*ncells*ncells);
--        //////int out_index=static_cast<int>(ncells-(node.z()/step_len)-1 + (node.x()/step_len)*ncells + (node.y()/step_len)*ncells*ncells);
--
--        if (out_index >= data_size)
--          std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--        else
--          data[out_index] = cell_val;
--      }
--      else if (level > resolution_level) {
--        // cell is bigger than output cells.  copy value to all contained output cells.
--        const unsigned int us_factor = 1 << (level - resolution_level);
--        const unsigned int node_x_start = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y_start = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z_start = static_cast<unsigned int>(node.z()/step_len);
--        for (unsigned int z=node_z_start; z<node_z_start+us_factor; ++z) {
--          for (unsigned int y=node_y_start; y<node_y_start+us_factor; ++y) {
--            for (unsigned int x=node_x_start; x<node_x_start+us_factor; ++x) {
--              //int out_index=x*y_size + y*ncells + z;
--              int out_index=ncells-1-z + y*ncells + x*ncells*ncells;
--              //////int out_index=z + y*ncells + x*ncells*ncells;
--              //////int out_index=ncells-1-z + x*ncells + y*ncells*ncells;
--
--              if (out_index >= data_size)
--                std::cout << "boxm_save_block_raw, array out of index! " << out_index << " -- " << data_size << std::endl;
--              else
--                data[out_index] = cell_val;
--            }
--          }
--        }
--      }
--      else {
--        // cell is smaller than output cells. increment output cell value
--        unsigned int ds_factor = 1 << (resolution_level - level);
--        double update_weight = 1.0 / double(ds_factor*ds_factor*ds_factor);
--        const unsigned int node_x = static_cast<unsigned int>(node.x()/step_len);
--        const unsigned int node_y = static_cast<unsigned int>(node.y()/step_len);
--        const unsigned int node_z = static_cast<unsigned int>(node.z()/step_len);
--        //unsigned int out_index=node_x*y_size + node_y*ncells + node_z;
--        int out_index=ncells-1-node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=node_z + node_y*ncells + node_x*ncells*ncells;
--        //////int out_index=ncells-1-node_z + node_x*ncells + node_y*ncells*ncells;
--
--        data[out_index] += float(cell_val*update_weight);
--      }
--    }
--
--    // write the data into a bin file, generate a file name
--    std::stringstream strm;
--    strm << filename<< idx.x() << '_' << idx.y() << '_' << idx.z() << ".bin";
--    std::string fn(strm.str());
--    vsl_b_ofstream os(fn.c_str(),std::ios::binary);
--    if (!os.os().good()) {
--      std::cerr << "error opening " << filename << " for write!\n";
--      return;
--    }
--
--    vsl_b_write(os, (unsigned int) ncells);  // x dimension
--    vsl_b_write(os, (unsigned int) ncells);  // y dimension
--    vsl_b_write(os, (unsigned int) ncells);  // z dimension
--
--    T_data minv = hist.min();
--    T_data maxv = hist.max();
--    T_data rangev = maxv-minv;
--
--    float* dp = data;
--    for (; dp < data + data_size; ++dp) {
--      unsigned char c = (unsigned char)(std::floor((255.0f * float((*dp)-minv)/float(rangev)) + 0.5f));
--      vsl_b_write(os, (char) c);
--    }
--    delete[] data;
--    os.close();
--    iter++;
--  }
--  assert(ncells > 0);
--
--  scene.unload_active_blocks();
--
--  // combine the blocks
--  vgl_vector_3d<unsigned> dim = scene.world_dim();
--  unsigned dimx = dim.x()*ncells;
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  // we will read the data a column at a time and this is enough
--  int row_data_size = ncells;
--  char* byte_data = new (std::nothrow) char[row_data_size];
--  if (byte_data == nullptr) {
--    std::cout << "boxm_save_block_raw: Could not allocate byte data!" << std::endl;
--    return;
--  }
--
--  // open the binary files streams, saved earlier
--  unsigned int nx,ny,nz;
--  vbl_array_3d<vsl_b_ifstream*> streams(dim.x(), dim.y(), dim.z());
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        s = new vsl_b_ifstream(fn.c_str(),std::ios::binary);
--        vsl_b_read(*s, nx);
--        vsl_b_read(*s, ny);
--        vsl_b_read(*s, nz);
--      }
--    }
--  }
--
--  // start writing the raw header
--  unsigned char data_type = 0; // 0 means unsigned byte
--  vxl_uint_32 nx_uint = dimx;
--  vxl_uint_32 ny_uint = dimy;
--  vxl_uint_32 nz_uint = dimz;
--  std::ofstream os(filename.c_str(),std::ios::binary);
--  if (!os.good()) {
--    std::cerr << "error opening " << filename << " for write!\n";
--    return;
--  }
--
--  os.write(reinterpret_cast<char*>(&data_type),sizeof(data_type));
--  os.write(reinterpret_cast<char*>(&nx_uint),sizeof(nx_uint));
--  os.write(reinterpret_cast<char*>(&ny_uint),sizeof(ny_uint));
--  os.write(reinterpret_cast<char*>(&nz_uint),sizeof(nz_uint));
--
--  // combine the column from streams to generate one raw file
--  for (unsigned x=0; x<dim.x(); x++) {
--    unsigned k=0;
--    while (k<dim.y()*dim.z()*ncells*ncells*ncells) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        unsigned j=0;
--        while (j < ncells*ncells*dim.z()) {
--          for (unsigned z=dim.z();z>0; z--) {
--            vsl_b_ifstream* s=streams(x,y,z-1);
--            s->is().read(byte_data, ncells);
--            os.write((char*)byte_data,ncells);
--            j+=ncells;
--            k+=ncells;
--          }
--        }
--      }
--    }
--  }
--
--  os.close();
--  delete[] byte_data;
--
--  // remove the intermediate bin files
--  for (unsigned z=0; z<dim.z(); z++) {
--    for (unsigned y=0; y<dim.y(); y++) {
--      for (unsigned x=0; x<dim.x(); x++) {
--        vsl_b_ifstream*& s = streams(x,y,z);
--        s->close();
--        std::stringstream strm;
--        strm << filename << x << '_' << y << '_' << z << ".bin";
--        std::string fn(strm.str());
--        std::cout << "Deleting " << fn << std::endl;
--        vpl_unlink(fn.data());
--        delete s;
--      }
--    }
--  }
--  std::cout << "Volume Histogram\n";
--  hist.pretty_print();
--  return;
--}
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h b/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
-deleted file mode 100644
-index bdfb1db979..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_scene_levels_utils.h
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_scene_levels_utils.h
--#ifndef boxm_scene_levels_utils_h
--#define boxm_scene_levels_utils_h
--//:
--// \file
--// \brief Functions to explore the levels of an octre
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Sep-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_data>
--boxm_scene<boct_tree<short, bool> >* boxm_explore_cells_at_level(boxm_scene<boct_tree<short, T_data> > *scene_in, short level)
--{
--  //parameters and structure of the output scene are the same as those of the input scene
--  boxm_scene<boct_tree<short, bool> > *scene_out = new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--  scene_out->set_paths(scene_in->path(), "level");
--  scene_out->set_appearance_model(BOXM_BOOL);
--  scene_out->write_scene("level.xml");
--
--  scene_in->template clone_blocks_to_type<boct_tree<short, bool> >(*scene_out, false);
--
--  //iterate through the leaf cells
--  boxm_cell_iterator<boct_tree<short, T_data> > it_in =
--    scene_in->cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block, true);
--  boxm_cell_iterator<boct_tree<short, bool> > it_out =
--    scene_out->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
--
--  for (it_in.begin(), it_out.begin(); !it_in.end() && !it_out.end(); ++it_in, ++it_out)
--  {
--    boct_tree_cell<short,T_data > *cell_in = *it_in;
--    boct_tree_cell<short,bool > *cell_out = *it_out;
--
--    //check for level
--    if ((cell_in->level() == level)) {
--      cell_out->set_data(true);
--    }
--  }
--
--  scene_in->unload_active_blocks();
--  scene_out->unload_active_blocks();
--
--  return scene_out;
--}
--
--
--template <class T_data>
--void boxm_remove_level_0_leaves(boxm_scene<boct_tree<short, T_data> > *scene_in)
--{
--  typedef boct_tree<short,T_data> tree_type;
--
--  //Iterate through the blocks
--  boxm_block_iterator<tree_type> it_in = scene_in->iterator();
--  for (it_in.begin(); !it_in.end(); ++it_in)
--  {
--    scene_in->load_block(it_in.index());
--    tree_type *tree_in= (*it_in)->get_tree();
--
--    std::vector<boct_tree_cell<short, T_data> * > all_cells =  tree_in->all_cells();
--    typename std::vector<boct_tree_cell<short, T_data> * >::iterator cells_it = all_cells.begin();
--
--    for (; cells_it!=all_cells.end(); cells_it++) {
--      boct_tree_cell<short, T_data> * cell_in = *cells_it;
--      //check for level
--      short level = cell_in->level();
--      if (level == 0) {
--        cell_in = nullptr;
--      }
--      else {
--        if (level == 1)
--          cell_in->set_children_null();
--        //shift loccode one space to the rigth
--        boct_loc_code<short> shift_code;
--        shift_code.set_code(cell_in->get_code().x_loc_ >> 1, cell_in->get_code().y_loc_ >> 1, cell_in->get_code().z_loc_ >> 1);
--        shift_code.set_level(level - 1);
--        cell_in->set_code(shift_code);
--      }
--    }
--
--    tree_in->reset_num_levels(tree_in->number_levels() - 1);
--    scene_in->write_active_block();
--    std::cout << '.';
--  }
--  std::cout << "\nCleaning\n";
--  scene_in->unload_active_blocks();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h b/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
-deleted file mode 100644
-index eb982606db..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_split_sample.h
-+++ /dev/null
-@@ -1,105 +0,0 @@
--// This is brl/bseg/boxm/algo/boxm_split_sample.h
--#ifndef boxm_split_sample_h
--#define boxm_split_sample_h
--//:
--// \file
--// \brief  A class enclosing set of functions to split a boxm_sample scenes/trees into appearance and occupancy scenes/trees
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  December 3, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_apm_traits.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<boxm_apm_type APM_MODEL>
--class boxm_split_sample
--{
-- public:
--  typedef boct_tree<short, boxm_sample<APM_MODEL> > sample_tree_type;
--  typedef boct_tree_cell<short, boxm_sample<APM_MODEL> > sample_cell_type;
--
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
--  typedef boct_tree<short, apm_datatype> apm_tree_type;
--  typedef boct_tree_cell<short, apm_datatype> apm_cell_type;
--
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype alpha_datatype;
--  typedef boct_tree<short, alpha_datatype> alpha_tree_type;
--  typedef boct_tree_cell<short, alpha_datatype> alpha_cell_type;
--
--  //: A function to split an boxm_sample scene, into an appearance and an occupancy scene
--  void split_scene(boxm_scene<sample_tree_type> &scene_in, boxm_scene<apm_tree_type> &apm_scene, boxm_scene<alpha_tree_type > &alpha_scene);
--
--  //: A function to split an boxm_sample tree, into an appearance and an occupancy tree
--  void split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree);
--};
--
--
--//: A function to split an boxm_sample scene, into an appearance and an occupancy scene
--template<boxm_apm_type APM_MODEL>
--void boxm_split_sample<APM_MODEL>::split_scene(boxm_scene<sample_tree_type> &scene_in,
--                                               boxm_scene<apm_tree_type> &apm_scene,
--                                               boxm_scene<alpha_tree_type > &alpha_scene)
--{
--  //missing:check that dimensions of all scenes agree
--
--  //iterate through blocks in the scenes
--  boxm_block_iterator<sample_tree_type> iter_in = scene_in.iterator();
--  boxm_block_iterator<apm_tree_type> apm_iter = apm_scene.iterator();
--  boxm_block_iterator<alpha_tree_type> alpha_iter = alpha_scene.iterator();
--
--  iter_in.begin();
--  apm_iter.begin();
--  alpha_iter.begin();
--  while (!iter_in.end() || !apm_iter.end() ||!alpha_iter.end())
--  {
--    scene_in.load_block(iter_in.index());
--    apm_scene.load_block(apm_iter.index());
--    alpha_scene.load_block(alpha_iter.index());
--
--    sample_tree_type *tree_in= (*iter_in)->get_tree();
--    apm_tree_type *apm_tree = tree_in->template clone_to_type<apm_datatype>();
--    alpha_tree_type *alpha_tree = tree_in->template clone_to_type<alpha_datatype>();
--    this->split_tree(tree_in, apm_tree,alpha_tree);
--    (*apm_iter)->init_tree(apm_tree);
--    (*alpha_iter)->init_tree(alpha_tree);
--    apm_scene.write_active_block();
--    alpha_scene.write_active_block();
--
--    iter_in++; apm_iter++; alpha_iter++;
--  }
--}
--
--
--//: A function to split an boxm_sample tree, into an appearance and an occupancy tree
--template<boxm_apm_type APM_MODEL>
--void boxm_split_sample<APM_MODEL>::split_tree(sample_tree_type *tree_in, apm_tree_type *apm_tree, alpha_tree_type *alpha_tree)
--{
--  //iterate through the trees
--  std::vector<sample_cell_type*> sample_cells = tree_in->all_cells();
--  std::vector<apm_cell_type*> apm_cells = apm_tree->all_cells();
--  std::vector<alpha_cell_type*> alpha_cells = alpha_tree->all_cells();
--
--  if (sample_cells.size()!=apm_cells.size() || apm_cells.size()!=alpha_cells.size()){
--    std::cerr << "Different size vectors in split_sample_scene::split_tree\n";
--    return;
--  }
--
--  for (unsigned i = 0; i < sample_cells.size(); i++)
--  {
--    boxm_sample<APM_MODEL> sample = sample_cells[i]->data();
--    apm_cells[i]->set_data(sample.appearance_);
--    alpha_cells[i]->set_data(sample.alpha);
--  }
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h b/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
-deleted file mode 100644
-index 63fe2ff02b..0000000000
---- a/contrib/brl/bseg/boxm/algo/boxm_upload_mesh.h
-+++ /dev/null
-@@ -1,156 +0,0 @@
--#ifndef boxm_render_mesh_h_
--#define boxm_render_mesh_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <imesh/imesh_mesh.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--void boxm_upload_mesh_into_block(boxm_block<boct_tree<T_loc, T_data> > *block,
--                                 imesh_mesh& mesh, vpgl_lvcs& lvcs, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  imesh_face_array_base& fs = mesh.faces();
--  for (unsigned i=0; i < fs.size(); ++i)
--  {
--    std::list<vgl_point_3d<double> > v_list;
--    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
--    vgl_box_3d<double> bb_scale, bb_global;
--    for (unsigned j=0; j<fs.num_verts(i); ++j) {
--      unsigned int v_id = fs(i,j);
--      vgl_point_3d<double> v;
--      if (use_lvcs) {
--        double lx, ly, lz;
--        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                             vpgl_lvcs::wgs84,lx,ly,lz);
--        v=vgl_point_3d<double>(lx,ly,lz);
--      }
--      else
--        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--      bb_global.add(v);
--      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--      v.set(diff.x(), diff.y(), diff.z());
--      // the local coordinates inside the box region
--      v_list.push_back(v);
--      //convert the values into [0,1] range
--      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--      bb_scale.add(v);
--    }
--    // check if polygon's bounding box intersects with the block
--    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,1,1,1), bb_scale);
--    if (inters.is_empty())
--      return;
--
--    // locate the polygon bounding box in tree
--    boct_tree_cell<T_loc,T_data>* region=tree->locate_region(inters);
--    if (region) {
--      // test all the children for intersection
--      std::vector<boct_tree_cell<T_loc,T_data>*> children;
--      if (!region->is_leaf())
--        region->leaf_children(children);
--      else // insert the node itself, if no children
--        children.push_back(region);
--      for (unsigned i=0; i<children.size(); i++) {
--        boct_tree_cell<T_loc,T_data>* cell=children[i];
--        vgl_box_3d<double> cell_bb=tree->cell_bounding_box_local(cell);
--        if (vgl_intersection<double>(cell_bb, v_list)) {
--          cell->set_data(val);
--        }
--      }
--    }
--  }
--}
--
--//: this is to copy mesh into existing tree and replacing the appearance model of the existing tree.
--template <>
--void boxm_upload_mesh_into_block(boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > *block,
--                                 imesh_mesh& mesh, vpgl_lvcs& lvcs,
--                                 bool use_lvcs, boxm_sample<BOXM_APM_MOG_GREY> val)
--{
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  tree_type* tree = block->get_tree();
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  imesh_face_array_base& fs = mesh.faces();
--  for (unsigned i=0; i < fs.size(); ++i)
--  {
--    std::list<vgl_point_3d<double> > v_list;
--    imesh_vertex_array<3>& vertices = mesh.vertices<3>();
--    vgl_box_3d<double> bb_scale, bb_global;
--    for (unsigned j=0; j<fs.num_verts(i); ++j) {
--      unsigned int v_id = fs(i,j);
--      vgl_point_3d<double> v;
--      if (use_lvcs) {
--        double lx, ly, lz;
--        lvcs.global_to_local(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2),
--                             vpgl_lvcs::wgs84,lx,ly,lz);
--        v=vgl_point_3d<double>(lx,ly,lz);
--      }
--      else
--        v=vgl_point_3d<double>(vertices(v_id,0), vertices(v_id,1), vertices(v_id,2));
--      bb_global.add(v);
--      vgl_vector_3d<double> diff = v-block_bb.min_point();   // get the value according to the block origin
--      v.set(diff.x(), diff.y(), diff.z());
--      // the local coordinates inside the box region
--      v_list.push_back(v);
--      //convert the values into [0,1] range
--      v.set(diff.x()/block_bb.width(),diff.y()/ block_bb.height(),diff.z()/ block_bb.depth());
--      bb_scale.add(v);
--    }
--    // check if polygon's bounding box intersects with the block
--    vgl_box_3d<double> inters = vgl_intersection(vgl_box_3d<double>(0,0,0,0.999,0.999,0.999), bb_scale);
--    if (inters.is_empty())
--      return;
--
--    // locate the polygon bounding box in tree
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* region=tree->locate_region(inters);
--    if (region) {
--      // test all the children for intersection
--      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> children;
--      if (!region->is_leaf())
--        region->leaf_children(children);
--      else // insert the node itself, if no children
--        children.push_back(region);
--      for (auto cell : children) {
--        vgl_box_3d<double> cell_bb=tree->cell_bounding_box(cell);
--        if (vgl_intersection<double>(cell_bb, v_list)) {
--          boxm_sample<BOXM_APM_MOG_GREY> tempdata=cell->data();
--          tempdata.set_appearance(val.appearance());
--          tempdata.alpha*=val.alpha;
--          cell->set_data(tempdata);
--        }
--      }
--    }
--  }
--}
--
--//: calls all the blocks for drawing meshes
--template <class T_loc, class T_data>
--void boxm_upload_mesh_into_scene(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                 imesh_mesh& mesh, bool use_lvcs, T_data val)
--{
--  typedef boct_tree<T_loc, T_data > tree_type;
--  vpgl_lvcs lvcs=scene.lvcs();
--  boxm_block_iterator<tree_type> iter(&scene);
--  mesh.compute_face_normals(true);
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boxm_upload_mesh_into_block(block, mesh, lvcs, use_lvcs, val);
--    scene.write_active_block();
--  }
--}
--
--#endif // boxm_render_mesh_h_
-diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-deleted file mode 100644
-index 2a41c2db1a..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and bvxm_pro depends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--FIND_PACKAGE(RPLY REQUIRED)
--if(RPLY_FOUND)
--  include_directories( ${RPLY_INCLUDE_DIR} )
--else()
--  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
--endif()
--
--  set(boxm_algo_pro_sources
--      boxm_algo_processes.h
--      boxm_algo_register.h   boxm_algo_register.cxx
--  )
--
--  #aux_source_directory(Templates boxm_algo_pro_sources)
--  aux_source_directory(processes boxm_algo_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_algo_pro LIBRARY_SOURCES ${boxm_algo_pro_sources} )
--
--  target_link_libraries(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil vsol ${VXL_LIB_PREFIX}vgl brip ${VXL_LIB_PREFIX}vcl rply)
--  # Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
--  # Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
--  # Need vil_pro  only for the instantiation of brdb_value_t<vil_smart_ptr<vil_image_view_base> >
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
-deleted file mode 100644
-index f22427eeed..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_processes.h
-+++ /dev/null
-@@ -1,28 +0,0 @@
--#ifndef boxm_algo_processes_h_
--#define boxm_algo_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_describe_scene_process);
--DECLARE_FUNC_CONS(boxm_init_scene_process);
--DECLARE_FUNC_CONS(boxm_line_backproject_process);
--DECLARE_FUNC_CONS(boxm_refine_scene_process);
--DECLARE_FUNC_CONS(boxm_replace_const_app_process);
--DECLARE_FUNC_CONS(boxm_roi_init_process);
--DECLARE_FUNC_CONS(boxm_roi_init_rational_camera_process);
--DECLARE_FUNC_CONS(boxm_save_occupancy_raw_process);
--DECLARE_FUNC_CONS(boxm_save_scene_raw_process);
--DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
--DECLARE_FUNC_CONS(boxm_merge_mixtures_process);
--DECLARE_FUNC_CONS(boxm_split_scene_process);
--DECLARE_FUNC_CONS(boxm_compute_scene_difference_process);
--DECLARE_FUNC_CONS(boxm_compute_entropy_process);
--DECLARE_FUNC_CONS(boxm_compute_expected_color_scene_process);
--DECLARE_FUNC_CONS(boxm_linear_combination_process);
--DECLARE_FUNC_CONS(boxm_explore_cells_at_level_process);
--DECLARE_FUNC_CONS(boxm_fill_internal_cells_process);
--DECLARE_FUNC_CONS(boxm_remove_level0_process);
--DECLARE_FUNC_CONS(boxm_create_scene_from_ply_process);
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
-deleted file mode 100644
-index b883c164fa..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.cxx
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#include "boxm_algo_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "boxm_algo_processes.h"
--
--void boxm_algo_register::register_datatype()
--{
--}
--
--void boxm_algo_register::register_process()
--{
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_describe_scene_process,"boxmDescribeSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_init_scene_process,"boxmInitSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process,"boxmLineBackprojectProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_refine_scene_process, "boxmRefineSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_replace_const_app_process,"boxmReplaceConstAppProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_process, "boxmROIInitProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_roi_init_rational_camera_process, "boxmROIInitRationalCameraProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_occupancy_raw_process, "boxmSaveOccupancyRawProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_save_scene_raw_process, "boxmSaveSceneRawProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_vrml_process, "boxmRenderExpectedEdgeVRMLProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_merge_mixtures_process, "boxmMergeMixturesProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_split_scene_process ,"boxmSplitSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_scene_difference_process, "boxmComputeSceneDifferenceProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_entropy_process, "boxmComputeEntropyProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_compute_expected_color_scene_process, "boxmComputeExpectedColorSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_linear_combination_process, "boxmLinearCombinationProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_explore_cells_at_level_process, "boxmExploreCellsAtLevelProcess");
--  REG_PROCESS_FUNC_CONS2(boxm_fill_internal_cells_process);
--  REG_PROCESS_FUNC_CONS2(boxm_remove_level0_process);
--  REG_PROCESS_FUNC_CONS2(boxm_create_scene_from_ply_process);
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h b/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
-deleted file mode 100644
-index 3c21937894..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/boxm_algo_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_algo_register_h_
--#define boxm_algo_register_h_
--
--class boxm_algo_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_algo_register_h_
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
-deleted file mode 100644
-index 1b8cf32459..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_entropy_process.cxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--//:
--// \file
--// \brief A process that outputs the differential entropy of the gaussian stored at every leave cell
--// \author Isabel Restrepo
--// \date 15-Nov-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/algo/boxm_merge_mog.h>
--
--
--//:global variables
--namespace boxm_compute_entropy_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_compute_entropy_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_compute_entropy_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_compute_entropy_process(bprb_func_process& pro)
--{
--  using namespace boxm_compute_entropy_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Scene is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef boct_tree<short, gauss_type> gauss_tree_type;
--
--  auto *gauss_scene = dynamic_cast<boxm_scene<gauss_tree_type>* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!gauss_scene) {
--    std::cout <<  " :-- Scene is not of valid type!\n";
--    return false;
--  }
--
--  //parameters and structure of the output scene are the same as those of the input scene
--  boxm_scene<boct_tree<short, float> > *entropy_scene = new boxm_scene<boct_tree<short, float> >(gauss_scene->lvcs(), gauss_scene->origin(), gauss_scene->block_dim(), gauss_scene->world_dim(), gauss_scene->max_level(), gauss_scene->init_level());
--  entropy_scene->set_paths(gauss_scene->path(), "entropy");
--  entropy_scene->set_appearance_model(BOXM_FLOAT);
--
--  compute_differential_entropy(*gauss_scene, *entropy_scene);
--  gauss_scene->write_scene("entropy_scene.xml");
--  pro.set_output_val<boxm_scene_base_sptr>(0, entropy_scene);
--  std::cout<<"Exiting" << std::endl;
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
-deleted file mode 100644
-index e99f978d28..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_expected_color_scene_process.cxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--//:
--// \file
--// \brief A process that computes the "expected visible color"  at each voxel
--// \author Isabel Restrepo
--// \date 17-Nov-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/algo/boxm_merge_mog.h>
--
--
--//:global variables
--namespace boxm_compute_expected_color_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_compute_expected_color_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_compute_expected_color_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float"; //offset for appearance values
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_compute_expected_color_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_compute_expected_color_scene_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  auto grey_offset = pro.get_input<float>(1);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Scene is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > scene_tree_type;
--
--  auto *scene = dynamic_cast<boxm_scene<scene_tree_type>* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!scene) {
--    std::cout <<  " :-- Scene is not of valid type!\n";
--    return false;
--  }
--
--  //parameters and structure of the output scene are the same as those of the input scene
--  boxm_scene<boct_tree<short, float> > *mean_color_scene = new boxm_scene<boct_tree<short, float> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  mean_color_scene->set_paths(scene->path(), "mean_color");
--  mean_color_scene->set_appearance_model(BOXM_FLOAT);
--
--  compute_expected_color(*scene, *mean_color_scene, grey_offset);
--  mean_color_scene->write_scene("mean_color_scene.xml");
--  pro.set_output_val<boxm_scene_base_sptr>(0, mean_color_scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
-deleted file mode 100644
-index f7efed8c52..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
-+++ /dev/null
-@@ -1,91 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_compute_scene_difference_process.cxx
--
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for computing the difference between two scenes.
--//
--// \author Vishal Jain
--// \date Sept 8, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_parser.h>
--#include <boxm/algo/boxm_compute_scene_difference.h>
--
--//: global variables
--namespace boxm_compute_scene_difference_process_globals
--{
--  //this process takes no outputs
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: sets input and output types
--bool boxm_compute_scene_difference_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_compute_scene_difference_process_globals;
--
--  // process takes 1 input and no outputs
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "boxm_scene_base_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "float";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//: creates a scene from parameters
--bool boxm_compute_scene_difference_process(bprb_func_process& pro)
--{
--  using namespace boxm_compute_scene_difference_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_compute_scene_difference_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene1_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr scene2_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr sceneout_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto t = pro.get_input<float>(i++);
--
--  if (scene1_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
--      scene2_ptr->appearence_model() == BOXM_APM_MOG_GREY &&
--      sceneout_ptr->appearence_model() == BOXM_APM_MOG_GREY )
--  {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *scene1 = static_cast<boxm_scene<tree_type>*> (scene1_ptr.as_pointer());
--      auto *scene2 = static_cast<boxm_scene<tree_type>*> (scene2_ptr.as_pointer());
--      auto *sceneout = static_cast<boxm_scene<tree_type>*> (sceneout_ptr.as_pointer());
--
--    boxm_compute_scene_difference(*scene1,*scene2,*sceneout,t);
--  }
--  else {
--    std::cout << "boxm_compute_scene_difference_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
-deleted file mode 100644
-index fdf40edf0e..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_create_scene_from_ply_process.cxx
-+++ /dev/null
-@@ -1,257 +0,0 @@
--//:
--// \file
--// \brief A process that creates a boxm scene from a .ply file
--// \author Isabel Restrepo
--// \date 2-Jan-2012
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <rply.h>   //.ply parser
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boct/util/boct_construct_tree.h>
--#define DEBUG_PLY
--
--class boxm_vgl_point_3d_coord_compare
--{
-- public:
--  boxm_vgl_point_3d_coord_compare() = default;
--  ~boxm_vgl_point_3d_coord_compare() = default;
--
--  bool operator() ( vgl_point_3d<int> const& pa, vgl_point_3d<int> pb ) const
--  {
--    if      ( pa.x() != pb.x() ) return pa.x() < pb.x();
--    else if ( pa.y() != pb.y() ) return pa.y() < pb.y();
--    else                         return pa.z() < pb.z();
--  }
--};
--
--
--class boxm_apperace_fileio_parsed_ply_
--{
-- public:
--  double p[3];  //holds location
--  unsigned char color; //holds color
--  double grey_offset; //offset the floating point (0,1) color value
--  //accumulated data in the shape of leaf cells
--  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
--  boxm_scene<boct_tree<short, float> > *scene;
--};
--
--bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
--                         std::map<vgl_point_3d<int>,
--                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
--                         const float &grey_offset);
--
--//: Call-back function for a "vertex" element
--int boxm_plyio_vertex_cb_(p_ply_argument argument);
--
--//: global variables
--namespace boxm_create_scene_from_ply_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool boxm_create_scene_from_ply_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_from_ply_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; //path to .ply file
--  input_types_[1] = "boxm_scene_base_sptr"; //the scene to fill up
--  input_types_[2] = "float"; //offset for appearance values
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool boxm_create_scene_from_ply_process(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_from_ply_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  std::string ply_file = pro.get_input<std::string>(0);
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(1);
--  auto grey_offset = pro.get_input<float>(2);
--
--  // Note initial implementation is for fixed types, but this can be changed if more cases are needed
--  // cast input scene
--  auto *scene = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Scene is not valid!\n";
--    return false;
--  }
--
--  // Map to hold the index of block and the cell containing appearance (0,1)
--  std::map<vgl_point_3d<int>, std::vector<boct_tree_cell<short, float> >, boxm_vgl_point_3d_coord_compare > data;
--
--  boxm_block_iterator<boct_tree<short, float> > block_iter = scene->iterator();
--
--  for (block_iter.begin(); !block_iter.end(); ++block_iter)
--  {
--    data[block_iter.index()]= std::vector<boct_tree_cell<short, float> >();
--  }
--
--  if (!boxm_load_color_ply(ply_file, scene, data, grey_offset)){
--    pro.set_output_val<boxm_scene_base_sptr>(0, nullptr);
--    return false;
--  }
--
--
--  //construct trees
--  for (block_iter.begin(); !block_iter.end(); ++block_iter)
--  {
--    std::cout << "In block: " << block_iter.index() << "Number of leaves: " <<data[block_iter.index()].size() << std::endl;
--    boct_tree_cell<short, float>* root = boct_construct_tree(data[block_iter.index()], scene->max_level(), 0.0f );
--    auto* tree = new boct_tree<short,float>(root,  scene->max_level());
--    vgl_box_3d<double> tree_bbox= scene->get_block_bbox(block_iter.index());
--    tree->set_bbox(tree_bbox);
--
--    scene->load_block(block_iter.index());
--    (*block_iter)->init_tree(tree);
--    scene->write_active_block();
--    data[block_iter.index()].clear();
--  }
--
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
--
--  return true;
--}
--
--
--// ============================== PLY ==============================
--
--
--bool boxm_load_color_ply(const std::string &ply_file,  boxm_scene<boct_tree<short, float> > *scene,
--                         std::map<vgl_point_3d<int>,
--                         std::vector<boct_tree_cell<short, float> >,boxm_vgl_point_3d_coord_compare > &data,
--                         const float &grey_offset)
--{
--  long nvertices;
--
--  boxm_apperace_fileio_parsed_ply_ parsed_ply;
--  parsed_ply.grey_offset = grey_offset;
--  parsed_ply.data = data;
--  parsed_ply.scene = scene;
--
--
--  // OPEN file
--#ifdef DEBUG_PLY
--  std::cerr << " loading " << ply_file << " :\n";
--  std::cerr << " gray_offset " << parsed_ply.grey_offset << grey_offset << " :\n";
--
--#endif
--
--  p_ply ply = ply_open(ply_file.c_str(), nullptr, 0, nullptr);
--  if (!ply){
--    std::cerr << "Couldn't open ply file: " << ply_file << '\n';
--    return false;
--  }
--
--  // Read HEADER
--  if (!ply_read_header(ply)) return false;
--
--  // vertex
--  nvertices =
--  ply_set_read_cb(ply, "vertex", "x",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 0);
--  ply_set_read_cb(ply, "vertex", "y",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 1);
--  ply_set_read_cb(ply, "vertex", "z",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 2);
--  ply_set_read_cb(ply, "vertex", "diffuse_red",
--                  boxm_plyio_vertex_cb_, (void*) (&parsed_ply), 3);
--
--#ifdef DEBUG_PLY
--  std::cerr << nvertices << " points\n";
--#endif
--
--  // Read DATA
--  if (!ply_read(ply)) return false;
--
--  // CLOSE file
--  ply_close(ply);
--
--  data=parsed_ply.data;
--
--#ifdef DEBUG_PLY
--  std::cerr << "  done.\n";
--#endif
--
--  return true;
--}
--
--
--//: Call-back function for a "vertex" element
--int boxm_plyio_vertex_cb_(p_ply_argument argument)
--{
--  long index;
--  void* temp;
--  ply_get_argument_user_data(argument, &temp, &index);
--
--  auto* parsed_ply =  (boxm_apperace_fileio_parsed_ply_*) temp;
--  //std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
--
--  switch (index)
--  {
--    case 0: // "x" coordinate
--      parsed_ply->p[0] = ply_get_argument_value(argument);
--      break;
--    case 1: // "y" coordinate
--      parsed_ply->p[1] = ply_get_argument_value(argument);
--      break;
--    case 2: // "z" coordinate
--      parsed_ply->p[2] = ply_get_argument_value(argument);
--      break;
--    case 3:
--    {
--      parsed_ply->color = (unsigned char)ply_get_argument_value(argument);
--      //insert data
--      vgl_point_3d<int> block_index(-1,-1,-1);
--      if (parsed_ply->scene->get_block_index(vgl_point_3d<double>(parsed_ply->p), block_index))
--      {
--        //convert point into local(tree coordinates)
--        vgl_box_3d<double> global_bbox= parsed_ply->scene->get_block_bbox(block_index);
--        vgl_point_3d<double> norm_p((parsed_ply->p[0]-global_bbox.min_x())/global_bbox.width(),
--                                    (parsed_ply->p[1]-global_bbox.min_y())/global_bbox.height(),
--                                    (parsed_ply->p[2]-global_bbox.min_z())/global_bbox.depth());
--        // convert point to location code.
--        boct_loc_code<short> loc_code(norm_p, parsed_ply->scene->max_level()-1);
--        boct_tree_cell<short, float> leaf_cell(loc_code);
--        float expected_color = float(parsed_ply->color)/255.0f + float(parsed_ply->grey_offset);
--        if (expected_color > 2.0f || expected_color < 0.0f)
--          std::cout << "color: " <<  parsed_ply->grey_offset << std::endl;
--        leaf_cell.set_data(expected_color);
--        parsed_ply->data[block_index].push_back(leaf_cell);
--      }
--      break;
--    }
--    default:
--      assert(!"This should not happen: index out of range");
--      break;
--  }
--  return 1;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
-deleted file mode 100644
-index 2fb47d460f..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
-+++ /dev/null
-@@ -1,106 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_describe_scene_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A process for describing the attributes of a scene
--//
--// \author J.L. Mundy
--// \date January 24, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <boxm/boxm_apm_traits.h>
--#include <bsta/bsta_histogram_sptr.h>
--
--namespace boxm_describe_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 4;
--}
--
--bool boxm_describe_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_describe_scene_process_globals;
--
--  //process takes 1 input
--  //input[0]: scene binary file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  // process has 4 outputs:
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "bsta_histogram_sptr"; // Omega Histogram
--  output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
--  output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
--  output_types_[3] = "unsigned";            // Number of leaves
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--// This process produces four outputs
--//  1) The distribution of "Omega" values where Omega = 1-e^( alpha x length )
--//  2) The distribution of "Sigma" values where Sigma is the std_dev of
--//     the appearance model. (currently implemented only for simple grey)
--//  3) The histogram of levels for leaves in the octree
--//  4) The number of leaves in the tree
--//
--bool boxm_describe_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_describe_scene_process_globals;
--
--  if ( !pro.verify_inputs() ) {
--    std::cerr << pro.name() << ": invalid inputs\n";
--    return false;
--  }
--  unsigned n_leaves = 0;
--  //assign tree type
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      std::cerr<<"boxm_describe_scene_process not yet implemented for Gaussian mixture\n";
--      return false;//not implemented
--    }
--    else
--    {
--      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/Gaussian mixture\n";
--      return false;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
--  {
--    if (!scene_ptr->multi_bin()) {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
--
--      bsta_histogram<float> omega_hist, sigma_hist, level_hist;
--      if (!compute_scene_statistics(*scene, omega_hist, sigma_hist,
--                                    level_hist, n_leaves))
--        return false;
--      std::cout << "Omega Hist\n";
--      omega_hist.print_vals_prob();
--      std::cout << "Sigma Hist\n";
--      sigma_hist.print_vals_prob();
--      std::cout << "Level Hist\n";
--      level_hist.print_vals_prob();
--      std::cout << "Number of Leaves " << n_leaves << '\n';
--      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(omega_hist));
--      pro.set_output_val<bsta_histogram_sptr>(1, new bsta_histogram<float>(sigma_hist));
--      pro.set_output_val<bsta_histogram_sptr>(2, new bsta_histogram<float>(level_hist));
--      pro.set_output_val<unsigned>(3, n_leaves);
--    }
--    else {
--      std::cerr<<"boxm_describe_scene_process not yet implemented for multi-bin/simple_grey\n";
--      return false;
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
-deleted file mode 100644
-index 1dfc74a8ee..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_explore_cells_at_level_process.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \brief A process to label cells at a given leve
--// \author Isabel Restrepo
--// \date 15-Sep-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <boxm/algo/boxm_scene_levels_utils.h>
--
--
--//:global variables
--namespace boxm_explore_cells_at_level_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_explore_cells_at_level_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_explore_cells_at_level_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr"; //scene in
--  input_types_[1] = "unsigned"; //octree level
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr"; //label scene
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_explore_cells_at_level_process(bprb_func_process& pro)
--{
--  using namespace boxm_explore_cells_at_level_process_globals;
--
--  //get inputs
--  boxm_scene_base_sptr scene_in_base = pro.get_input<boxm_scene_base_sptr>(0);
--  auto level = pro.get_input<unsigned>(1);
--
--  if (scene_in_base->appearence_model() == BOXM_FLOAT)
--  {
--    typedef boct_tree<short, float > type;
--
--    auto* scene = dynamic_cast<boxm_scene<type>*>(scene_in_base.as_pointer());
--
--    if (!scene)
--      return false;
--
--    //store output
--    pro.set_output_val<boxm_scene_base_sptr>(0, boxm_explore_cells_at_level(scene,level));
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
-deleted file mode 100644
-index c222d74cd7..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_fill_internal_cells_process.cxx
--//:
--// \file
--// \brief process fills the internal cells of the octrees in the scene
--//
--// \author Isabel Restrepo
--// \date December 3, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <boxm/algo/boxm_fill_internal_cells.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace boxm_fill_internal_cells_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 1 input and 1 output.
--// input[0]: The input scene
--// output[0]: The output scene
--
--bool boxm_fill_internal_cells_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_fill_internal_cells_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_fill_internal_cells_process(bprb_func_process& pro)
--{
--  using namespace boxm_fill_internal_cells_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
--  {
--    boxm_fill_internal_cells<float> filler;
--    pro.set_output_val<boxm_scene_base_sptr>(0, filler.traverse_and_fill(scene_in));
--    return true;
--  }
--
--  std::cerr << "In boxm_fill_internal_cells_process: Unsupportted scene type\n";
--  return false;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
-deleted file mode 100644
-index e023ca2500..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
-+++ /dev/null
-@@ -1,111 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_init_scene_process.cxx
--
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for initializing a new boxm_scene when there is not a saved one.
--//        It receives the parameters from a parameter file in XML
--//
--// \author Vishal Jain
--// \date Feb 8, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene_parser.h>
--#include <boxm/algo/boxm_init_scene.h>
--
--//: global variables
--namespace boxm_init_scene_process_globals
--{
--  //this process takes no outputs
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: sets input and output types
--bool boxm_init_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_init_scene_process_globals;
--
--  // process takes 1 input and no outputs
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//: creates a scene from parameters
--bool boxm_init_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_init_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_init_scene_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_init_scene_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene->multi_bin()) {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_init_scene<BOXM_APM_MOG_GREY>(*s);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_init_scene<BOXM_APM_SIMPLE_GREY>(*s);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_init_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_init_scene<BOXM_APM_MOB_GREY >(*s);
--    }
--  }
--  else {
--    std::cout << "boxm_init_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
-deleted file mode 100644
-index b8767b24bc..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
-+++ /dev/null
-@@ -1,259 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_line_backproject_process.cxx
--#include <iostream>
--#include <cstdio>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for computing the backprojection of lines.
--//         Lines are represented as an image with 3 plane images (plane 0=a, plane1=b,
--//         plane2=c, line is defined as ax+by=c). The backprojection, which is a plane
--//         is stored as an other image with 4 planes (ax+by+cz=d) as the output.
--//
--// \author Gamze Tunali
--// \date   Feb 4, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <vpgl/vpgl_proj_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--#include <vpgl/algo/vpgl_ray.h>
--
--#include <vgl/vgl_plane_3d.h>
--
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: globals
--namespace boxm_line_backproject_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: set input and output types
--// process takes 2 inputs and has 1 output:
--// input[0]: The edge image (vil_image_view<float> with three planes for (a,b,c))
--// input[1]: camera
--// output[0]: The plane image
--bool boxm_line_backproject_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_line_backproject_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vil_image_view_base_sptr";
--  input_types_[i++] = "vpgl_camera_double_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j = 0;
--  output_types_[j++] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--vpgl_rational_camera<double>
--perspective_to_rational(vpgl_perspective_camera<double>&cam_pers)
--{
--  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
--  std::vector<double> neu_u,den_u,neu_v,den_v;
--  double x_scale = 1.0, x_off = 0.0, y_scale = 1.0, y_off = 0.0, z_scale = 1.0, z_off = 0.0, u_scale = 1.0, u_off = 0.0, v_scale = 1.0, v_off = 0.0;
--
--  for (int i=0; i<20; i++) {
--    neu_u.push_back(0.0);
--    neu_v.push_back(0.0);
--    den_u.push_back(0.0);
--    den_v.push_back(0.0);
--  }
--
--  int vector_map[] = {9,15,18,19};
--
--  for (int i=0; i<4; i++) {
--    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
--    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
--    den_u[vector_map[i]] = cam_pers_matrix(2,i);
--    den_v[vector_map[i]] = cam_pers_matrix(2,i);
--  }
--
--  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
--                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
--                                       u_scale,u_off,v_scale,v_off);
--  return cam_rat;
--}
--
--//: optimizes rpc camera parameters based on edges
--bool boxm_line_backproject_process(bprb_func_process& pro)
--{
--  using namespace boxm_line_backproject_process_globals;
--
--  // check number of inputs
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The number of inputs should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs
--  unsigned i = 0;
--
--  // image
--  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--
--  // make sure that image has 3 planes
--  if (edge_image_sptr->nplanes() != 3) {
--    std::cerr << "boxm_line_backproject_process: The edge image is expected to have 3 planes!\n";
--    return false;
--  }
--
--  vil_image_view<float> *plane_image;
--  if (edge_image_sptr->pixel_format() == VIL_PIXEL_FORMAT_FLOAT) {
--    vil_image_view<float> edge_image(edge_image_sptr);
--    unsigned ni=edge_image.ni();
--    unsigned nj=edge_image.nj();
--
--    // the output image
--    plane_image = new vil_image_view<float>(ni,nj,4);
--    float col, row, theta;
--
--    if (camera->type_name() == "vpgl_proj_camera") {
--      auto* cam = dynamic_cast<vpgl_proj_camera<double>*>(camera.ptr());
--
--      for (unsigned i=0; i<ni; i++) {
--        for (unsigned j=0; j<nj; j++) {
--          col =edge_image(i,j,0); // sub-pixel column
--          row =edge_image(i,j,1); // sub_pixel row
--          theta=edge_image(i,j,2); // orientation in radians
--
--          if (col<0 || row<0) // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
--            (*plane_image)(i,j) = 0.0f;
--          else {
--            // get two points on the line
--            vgl_point_2d<double> p1(col,row);
--
--            float x = col + 0.5f*std::cos(theta);
--            float y = row + 0.5f*std::sin(theta);
--            vgl_point_2d<double> p2(x,y);
--
--            vgl_line_2d<double> line(p1,p2);
--
--            //create a line and backproject it
--            vgl_homg_line_2d<double> image_line(line);
--            vgl_homg_plane_3d<double> plane = cam->backproject(image_line);
--            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
--            std::cout << "ZERO a,b,c,d" << std::endl;
--            (*plane_image)(i,j,0)=float(plane.a());
--            (*plane_image)(i,j,1)=float(plane.b());
--            (*plane_image)(i,j,2)=float(plane.c());
--            (*plane_image)(i,j,3)=float(plane.d());
--          }
--        }
--      }
--    }
--    else if (camera->type_name() == "vpgl_local_rational_camera") {
--      auto* cam = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
--      for (unsigned i=0; i<ni; i++) {
--        for (unsigned j=0; j<nj; j++) {
--          col =edge_image(i,j,0); // sub-pixel column
--          row =edge_image(i,j,1); // sub_pixel row
--          theta=edge_image(i,j,2); // orientation in radians
--
--          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
--            (*plane_image)(i,j,0) = 0.0f;
--            (*plane_image)(i,j,1) = 0.0f;
--            (*plane_image)(i,j,2) = 0.0f;
--            (*plane_image)(i,j,3) = 0.0f;
--          }
--          else {
--            // get two point on the line
--            vgl_point_2d<double> p1(col, row);
--
--            float x = col + 0.5f*std::cos(theta);
--            float y = row + 0.5f*std::sin(theta);
--            vgl_point_2d<double> p2(x,y);
--
--            //backproject it
--            vgl_plane_3d<double> plane;
--            if (vpgl_ray::plane_ray(*cam, p1, p2, plane)) {
--              (*plane_image)(i,j,0)=float(plane.a());
--              (*plane_image)(i,j,1)=float(plane.b());
--              (*plane_image)(i,j,2)=float(plane.c());
--              (*plane_image)(i,j,3)=float(plane.d());
--            }
--            else { // the backprojection was unsuccessful
--              std::cout << i << ',' << j << "NO PLANE!!!!!" << std::endl;
--              (*plane_image)(i,j,0) = 0.0f;
--              (*plane_image)(i,j,1) = 0.0f;
--              (*plane_image)(i,j,2) = 0.0f;
--              (*plane_image)(i,j,3) = 0.0f;
--            }
--          }
--        }
--      }
--    }
--    else if (camera->type_name() == "vpgl_perspective_camera") {
--      auto* cam = dynamic_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--      auto* proj_cam = static_cast<vpgl_proj_camera<double>*>(cam);
--      for (unsigned i=0; i<ni; i++) {
--        for (unsigned j=0; j<nj; j++) {
--          col =edge_image(i,j,0); // sub-pixel column
--          row =edge_image(i,j,1); // sub_pixel row
--          theta=edge_image(i,j,2); // orientation in radians
--
--          if (col<0 || row<0) { // no edge is present, check sdet_pro/sdet_detect_edge_tangent_process.h
--            (*plane_image)(i,j,0) = 0.0f;
--            (*plane_image)(i,j,1) = 0.0f;
--            (*plane_image)(i,j,2) = 0.0f;
--            (*plane_image)(i,j,3) = 0.0f;
--          }
--          else {
--            // get two point on the line
--            vgl_point_2d<double> p1(col, row);
--
--            float x = col + 0.5f*std::cos(theta);
--            float y = row + 0.5f*std::sin(theta);
--            vgl_point_2d<double> p2(x,y);
--
--            vgl_line_2d<double> line(p1,p2);
--
--            //create a line and backproject it
--            vgl_homg_line_2d<double> image_line(line);
--
--            vgl_homg_plane_3d<double> plane = proj_cam->backproject(image_line);
--            if (plane.a()==0 && plane.b()==0 && plane.c()==0 && plane.d()==0)
--            std::cout << "ZERO a,b,c,d" << std::endl;
--            (*plane_image)(i,j,0)=float(plane.a());
--            (*plane_image)(i,j,1)=float(plane.b());
--            (*plane_image)(i,j,2)=float(plane.c());
--            (*plane_image)(i,j,3)=float(plane.d());
--          }
--        }
--      }
--    }
--    else {
--      std::cerr << "boxm_line_backproject_process: The camera type [" << camera->type_name() << "]is not defined yet!\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_line_backproject_process: This pixel format is not supported yet!\n";
--    return false;
--  }
--  // output
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<vil_image_view_base_sptr>(j++, plane_image);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
-deleted file mode 100644
-index 3cdbcbe8e4..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_linear_combination_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--//:
--// \file
--// \brief A process to perform linear combination of blocks in situ i.e block1 = s1*block1+ s2*block2
--// \author Isabel Restrepo
--// \date 2-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_linear_operations.h>
--
--//:global variables
--namespace boxm_linear_combination_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool boxm_linear_combination_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_linear_combination_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr" ; //scene1
--  input_types_[i++] = "boxm_scene_base_sptr" ; //scene2
--  input_types_[i++] = "float" ; //s1
--  input_types_[i++] = "float" ; //s2
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool boxm_linear_combination_process(bprb_func_process& pro)
--{
--  using namespace boxm_linear_combination_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base1 = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr scene_base2 = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto s1 = pro.get_input<float>(i++);
--  auto s2 = pro.get_input<float>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!(scene_base1 && scene_base2))
--  {
--    std::cerr << "In boxm_linear_combination_process: Null input scene\n";
--    return false;
--  }
--
--  switch (scene_base1->appearence_model())
--  {
--    case BOXM_FLOAT:
--    {
--      if (scene_base2->appearence_model()!= BOXM_FLOAT)
--      {
--        std::cerr << "In boxm_linear_combination_process, datatype not supported\n";
--        return false;
--      }
--      auto *scene1 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base1.as_pointer());
--      auto *scene2 = static_cast<boxm_scene<boct_tree<short, float> >*> (scene_base2.as_pointer());
--
--      scene1->load_block(block_i,block_j,block_k);
--      scene2->load_block(block_i,block_j,block_k);
--
--      boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(block_i,block_j,block_k);
--      boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(block_i,block_j,block_k);
--
--      //The result is block1 = s1*block1+ s2*block2
--      boxm_linear_combination(block1, block2, s1, s2);
--
--      //make sure to write the block back to disk
--      scene1->write_active_block();
--
--      //clean memory
--      scene1->unload_active_blocks();
--      scene2->unload_active_blocks();
--
--      break;
--    }
--    default:
--      std::cerr << "In boxm_linear_combination_process: Invalid datatype\n";
--      return false;
--      break;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
-deleted file mode 100644
-index 700f8bba5c..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
-+++ /dev/null
-@@ -1,90 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_merge_mixtures_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief process that merges all gaussian mixtures in a  boxm_scene into unimodal gaussians
--//
--// \author Isabel Restrepo
--// \date December 8, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/algo/boxm_merge_mog.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace boxm_merge_mixtures_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 1 input and 1 output.
--// input[0]: The sample scene
--// output[0]: The appearance scene
--
--bool boxm_merge_mixtures_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_merge_mixtures_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_merge_mixtures_process(bprb_func_process& pro)
--{
--  using namespace boxm_merge_mixtures_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--  typedef boct_tree<short, apm_datatype> mog_tree_type;
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef boct_tree<short, gauss_type> gauss_tree_type;
--
--  auto *mog_scene = dynamic_cast<boxm_scene<mog_tree_type>* > (scene_base.as_pointer());
--
--  //check input's validity
--  if (!mog_scene) {
--    std::cout <<  " :-- Grid is not of valid type!\n";
--    return false;
--  }
--
--  //parameters of the output scene are the same as those of the input scene
--  boxm_scene<gauss_tree_type> *gauss_scene = new boxm_scene<gauss_tree_type>(mog_scene->lvcs(), mog_scene->origin(), mog_scene->block_dim(), mog_scene->world_dim());
--  gauss_scene->set_paths(mog_scene->path(), "bsta_gauss_sf1");
--  gauss_scene->set_appearance_model(BSTA_GAUSS_F1);
--
--  boxm_merge_mog merger;
--  merger.kl_merge_scene( *mog_scene, *gauss_scene);
--  gauss_scene->write_scene("gaussf1_scene.xml");
--  pro.set_output_val<boxm_scene_base_sptr>(0, gauss_scene);
--  std::cout<<"Exiting" << std::endl;
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
-deleted file mode 100644
-index 6b3f53a79c..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
-+++ /dev/null
-@@ -1,119 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_refine_scene_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to refine the block (octrees) of the scene
--//        If there are some cells with big values they are spit into
--//        new child cells; the data of the cell is copied to the
--//        children's data. The purpose of this process is to elaborate
--//        the octree at the areas where more details exist.
--//
--// \author Gamze Tunali
--// \date April 24, 2009
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--namespace boxm_refine_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_refine_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_refine_scene_process_globals;
--
--  //process takes 3 inputs
--  //input[0]: The scene
--  //input[1]: The threshold for splitting
--  //input[2]: bool for resetting the appearence model
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float";
--  input_types_[2] = "bool";
--
--  //process has 1 output
--  //output[0]: The number of leaf cells in the refined scene
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "int";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_refine_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_refine_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_refine_scene_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto thresh = pro.get_input<float>(i++);
--  bool reset = pro.get_input<bool>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_refine_scene_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  unsigned int ncells = 0;
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (scene->multi_bin()) {
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, thresh, reset);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, thresh, reset);
--    }
--  }
--  else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
--    if (scene->multi_bin()) {
--      std::cout << "boxm_refine_scene_process: multibin case is not implemented for BOXM_APM_SIMPLE_GREY yet" << std::endl;
--      return false;
--    }
--    else {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      ncells = boxm_refine_scene<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, thresh, reset);
--    }
--  }
--  else {
--    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  // set output
--  pro.set_output_val<int>(0,ncells);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
-deleted file mode 100644
-index 67086ac142..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_remove_level0_process.cxx
-+++ /dev/null
-@@ -1,87 +0,0 @@
--//:
--// \file
--// \brief A process to remove level 0 of the octrees
--// \author Isabel Restrepo
--// \date Nov 23 2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_scene_levels_utils.h>
--
--//:global variables
--namespace boxm_remove_level0_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool boxm_remove_level0_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_remove_level0_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr"; //scene_in
--  input_types_[1] = "vcl_string"; //block_prefix for scene out
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr"; //scene_out
--
--  return pro.set_input_types(input_types_)
--      && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool boxm_remove_level0_process(bprb_func_process& pro)
--{
--  using namespace boxm_remove_level0_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the number of inputs should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string block_pref = pro.get_input<std::string>(1);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if (auto *scene_in = dynamic_cast<boxm_scene<boct_tree<short, float> >* > (scene_base.as_pointer()))
--  {
--    //clone the input scene
--    boxm_scene<boct_tree<short, float> > *scene_out = new boxm_scene<boct_tree<short, float> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(),
--                                                                                               scene_in->world_dim(), scene_in->max_level(), scene_in->init_level(),
--                                                                                               scene_in->load_all_blocks(), scene_in->save_internal_nodes());
--
--    scene_out->set_paths(scene_in->path(), block_pref);
--    scene_out->set_appearance_model(scene_in->appearence_model());
--    std::cout << "Cloning\n";
--    scene_in->clone_blocks(*scene_out);
--
--    std::cout << "Restructuring\n";
--    boxm_remove_level_0_leaves(scene_out);
--    std::cout << "Done\n";
--
--    //write the scene after the number of levels has been adjusted
--    scene_out->set_octree_levels(scene_in->max_level() - 1, scene_in->init_level());
--    scene_out->write_scene(block_pref + ".xml");
--
--    pro.set_output_val<boxm_scene_base_sptr>(0, scene_out);
--    return true;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
-deleted file mode 100644
-index c14dfbda09..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
-+++ /dev/null
-@@ -1,149 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_render_expected_edge_vrml_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <bvrml/bvrml_write.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_intersection.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--namespace boxm_render_expected_edge_vrml_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_render_expected_edge_vrml_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_vrml_process_globals;
--
--  // process takes 4 inputs and no output
--  //input[0]: scene binary file
--  //input[1]: the path for vrml file
--  //input[2]: threshold
--  //input[3]: s (to write every s cell)
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "float";
--  input_types_[3] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_edge_vrml_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_vrml_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< '\n';
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  //vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  std::string path = pro.get_input<std::string>(i++);
--  auto threshold = pro.get_input<float>(i++);
--  int s = pro.get_input<int>(i++); // FIXME - unused!
--
--  std::ofstream stream(path.c_str());
--
--  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE)
--  {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cout << "boxm_render_expected_edge_process: the scene is not of expected type" << std::endl;
--        return false;
--      }
--      bvrml_write::write_vrml_header(stream);
--#if 0
--      vgl_point_3d<double> origin(0.0,0.0,0.0);
--      vgl_vector_3d<double> dirx(1,0,0);
--      vgl_vector_3d<double> diry(0,1,0);
--      vgl_vector_3d<double> dirz(0,0,1);
--      bvrml_write::write_vrml_line(stream,origin,dirx,3,1,0,0);
--      bvrml_write::write_vrml_line(stream,origin,diry,3,0,1,0);
--      bvrml_write::write_vrml_line(stream,origin,dirz,3,0,0,1);
--#endif
--      // for each block
--      boxm_block_iterator<type> iter(scene);
--      iter.begin();
--      while (!iter.end())
--      {
--        scene->load_block(iter.index());
--        boxm_block<type>* block = *iter;
--        type* tree = block->get_tree();
--        std::vector<boct_tree_cell<short,boxm_inf_line_sample<float> >*> cells = tree->leaf_cells();
--
--        // iterate over cells
--        for (auto cell : cells)
--        {
--          boxm_inf_line_sample<float> data = cell->data();
--          vgl_infinite_line_3d<float> line = data.line_;
--          vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
--          // TODO: revise with segment length
--          if (!(line.x0().x()==0 && line.x0().y()==0)) {
--            //if (data.num_obs_ > threshold)
--            {
--              vgl_point_3d<double> p0,p1;
--              vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
--              // convert to line type (from float to double)
--              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
--
--              vgl_infinite_line_3d<double> dline(x0,dir);
--              if (vgl_intersection<double>(bb, dline, p0, p1)) {
--                vgl_vector_3d<double> dir(p1-p0);
--                double length=dir.length();
--                dir/=length;
--                std::cout<<data.residual_<<' ';
--                if (data.residual_<threshold)
--                {
--                  bvrml_write::write_vrml_line(stream, p0,dir,float(length),1.f,0.f,0.f);
--                  //bvrml_write::write_vrml_disk(stream,p0,dir,data.residual_,0.f,1.0f,0.f);
--                }
--              }
--            }
--          }
--        }
--        iter++;
--      }
--    }
--    else
--    {
--      std::cerr << "Ray tracing version not yet implemented\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_render_expected_edge_vrml_process: undefined APM type\n";
--    return false;
--  }
--
--  // no output
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
-deleted file mode 100644
-index 1ca0a383ac..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
-+++ /dev/null
-@@ -1,95 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_replace_const_app_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to replace the appearance model for the whole scene by a constant appearance model
--// \author Vishal Jain
--// \date July 28, 2009
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/util/boxm_utils.h>
--
--void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean);
--
--namespace boxm_replace_const_app_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_replace_const_app_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_replace_const_app_process_globals;
--
--  //process takes 2 inputs and no output
--  //input[0]: The scene
--  //input[1]: mean value for appearance
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_replace_const_app_process(bprb_func_process& pro)
--{
--  using namespace boxm_replace_const_app_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_replace_const_app_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto meanval = pro.get_input<float>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_replace_const_app_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--    boxm_replace_constant_app(*s,meanval );
--  }
--  else {
--    std::cout << "boxm_replace_const_app_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
--
--void boxm_replace_constant_app(boxm_scene<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > &scene, float mean)
--{
--  boxm_block_iterator<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype app=boxm_utils::obtain_mog_grey_single_mode(mean);
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > >* block = *iter;
--    boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >* tree = block->get_tree();
--
--    std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >*> leaf_cells=tree->leaf_cells();
--    for (auto & leaf_cell : leaf_cells)
--    {
--      boxm_sample<BOXM_APM_MOG_GREY> new_data(leaf_cell->data().alpha,app);
--      leaf_cell->set_data(new_data);
--    }
--    scene.write_active_block();
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
-deleted file mode 100644
-index ce50f795ba..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
-+++ /dev/null
-@@ -1,195 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for clipping and image based on a 3D bounding box.
--//        -  Input:
--//             - Image path (string)
--//             - boxm_voxel_world_sptr
--//
--//        -  Output:
--//             - modified rational camera "vpgl_camera_double_sptr"
--//             - clipped image area (NITF) "vil_image_view_base_sptr"
--//
--//        -  Params:
--//             -geographic uncertainty (error) in meters
--//
--// \author  Copied from boxm/pro
--// \date    May 5, 2008
--// \verbatim
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--
--#include <vsol/vsol_box_2d_sptr.h>
--#include <vsol/vsol_box_2d.h>
--
--#include <brip/brip_roi.h>
--
--#include <vil/vil_load.h>
--#include <vil/vil_crop.h>
--#include <vil/file_formats/vil_nitf2_image.h>
--#include <vil/vil_image_view_base.h>
--#include <vpgl/vpgl_camera.h>
--
--#include <bprb/bprb_parameters.h>
--
--//: globals variables and functions
--namespace boxm_roi_init_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 3;
--
--  //functions
--  bool roi_init(const std::string& img_path,
--                const vpgl_camera_double_sptr& camera,
--                vgl_box_3d<double> box,
--                vil_image_view<unsigned char> & roi_img);
--
--  //: projects the box on the image by taking the union of all the projected corners
--  vgl_box_2d<double>* project_box(const vpgl_camera_double_sptr& cam,
--                                  vgl_box_3d<double> box);
--}
--
--//: set input and output types
--bool boxm_roi_init_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_process_globals;
--
--  //this process takes 3 input:
--  //the filename of the image, the camera and the voxel world
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned  i=0;
--  input_types_[i++] = "vcl_string";                // image path
--  input_types_[i++] = "vpgl_camera_double_sptr";   //  camera
--  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
--
--  //output
--  unsigned j = 0;
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
--  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
--  output_types_[j++] = "float"; // uncertainty
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--bool boxm_roi_init_process(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_process_globals;
--  //static const parameters
--  static const std::string error = "error";
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs:
--  unsigned i = 0;
--  // image
--  std::string image_path = pro.get_input<std::string>(i++);
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  //voxel_world
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  vil_image_view_base_sptr img_ptr=vil_load(image_path.c_str());
--  auto *temp=new vil_image_view<unsigned char>();
--  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
--  {
--    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
--    {
--        vgl_box_2d<double>* roi_box = project_box(camera, scene->get_world_bbox());
--        brip_roi broi(img->ni(), img->nj());
--        vsol_box_2d_sptr bb = new vsol_box_2d();
--        bb->add_point(roi_box->min_x(), roi_box->min_y());
--        bb->add_point(roi_box->max_x(), roi_box->max_y());
--        bb = broi.clip_to_image_bounds(bb);
--        if (bb->width() <= 0 || bb->height() <= 0) {
--            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
--            return false;
--        }
--        temp->set_size(int(bb->width()),int(bb->height()));
--        temp->deep_copy(vil_crop(*img,(unsigned int)bb->get_min_x(),
--                            (unsigned int)bb->width(),
--                            (unsigned int)bb->get_min_y(),
--                            (unsigned int)bb->height()));
--    }
--  }
--  if (temp->ni() == 0 || temp->nj() == 0)
--    return false;
--
--  //Store outputs
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<vpgl_camera_double_sptr >(j++, camera);
--  // store image output
--  pro.set_output_val<vil_image_view_base_sptr>(j++, temp);
--  // store uncertainty
--  pro.set_output_val<float>(j++, 0);
--
--  return true;
--}
--
--//: roi_init function
--bool boxm_roi_init_process_globals::roi_init(const std::string&  img_path,
--                                             const vpgl_camera_double_sptr& camera,
--                                             vgl_box_3d<double> box,
--                                             vil_image_view<unsigned char> & roi_img)
--{
--  vil_image_view_base_sptr img_ptr=vil_load(img_path.c_str());
--  if (img_ptr->pixel_format()==VIL_PIXEL_FORMAT_BYTE)
--  {
--    if (auto *img=dynamic_cast<vil_image_view<unsigned char> * > (img_ptr.ptr()))
--    {
--        vgl_box_2d<double>* roi_box = project_box(camera, box);
--        brip_roi broi(img->ni(), img->nj());
--        vsol_box_2d_sptr bb = new vsol_box_2d();
--        bb->add_point(roi_box->min_x(), roi_box->min_y());
--        bb->add_point(roi_box->max_x(), roi_box->max_y());
--        bb = broi.clip_to_image_bounds(bb);
--        if (bb->width() <= 0 || bb->height() <= 0) {
--            std::cerr << "boxm_roi_init_process::roi_init()-- clipping box is out of image boundaries\n";
--            return false;
--        }
--
--         vil_image_view<unsigned char> temp=vil_crop(*img,
--                                                     (unsigned int)bb->get_min_x(),
--                                                     (unsigned int)bb->width(),
--                                                     (unsigned int)bb->get_min_y(),
--                                                     (unsigned int)bb->height());
--        roi_img=temp;
--        return true;
--    }
--    else
--      return false;
--  }
--  else // non-supported pixel format
--    return false;
--}
--
--//: project_box function
--vgl_box_2d<double>* boxm_roi_init_process_globals::project_box( const vpgl_camera_double_sptr& cam,
--                                                                vgl_box_3d<double> box)
--{
--  // create a box with uncertainty
--  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
--
--  auto* roi = new vgl_box_2d<double>();
--
--  for (auto & box_corner : box_corners) {
--      double u,v;
--      cam->project(box_corner.x(),box_corner.y(),box_corner.z(),u,v);
--      vgl_point_2d<double> p2d(u,v);
--      std::cout<<u<<' '<<v<<'\n';
--      roi->add(p2d);
--  }
--  return roi;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
-deleted file mode 100644
-index fbfe3b9704..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
-+++ /dev/null
-@@ -1,310 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_roi_init_rational_camera_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for clipping and image based on a 3D bounding box.
--// *  Input:
--//   - Image path (string)
--//   - boxm_voxel_world_sptr
--//
--// *  Output:
--//   - modified rational camera "vpgl_camera_double_sptr"
--//   - clipped image area (NITF) "vil_image_view_base_sptr"
--//
--// *  Params:
--//   - geographic uncertainty (error) in meters
--//
--// \author  Copied from boxm/pro
--// \date    May 5, 2008
--
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--
--#include <vsol/vsol_box_2d_sptr.h>
--#include <vsol/vsol_box_2d.h>
--
--#include <brip/brip_roi.h>
--
--#include <vil/vil_load.h>
--#include <vil/file_formats/vil_nitf2_image.h>
--#include <vil/vil_image_view_base.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--#include <vpgl/vpgl_lvcs.h>
--
--#include <bprb/bprb_parameters.h>
--
--//: globals variables and functions
--namespace boxm_roi_init_rational_camera_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 3;
--
--  // functions
--  bool roi_init(std::string const& image_path,
--                vpgl_rational_camera<double>* camera,
--                vgl_box_3d<double> box,
--                const vpgl_lvcs& lvcs,
--                float uncertainty,
--                vil_image_view<unsigned char>* nitf_image_unsigned_char,
--                vpgl_local_rational_camera<double>& local_camera);
--
--  //: projects the box on the image by taking the union of all the projected corners
--  vgl_box_2d<double>* project_box(vpgl_rational_camera<double>* cam,
--                                  vpgl_lvcs lvcs,
--                                  vgl_box_3d<double> box,
--                                  float r);
--}
--
--//:set input and output types
--bool boxm_roi_init_rational_camera_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_rational_camera_process_globals;
--
--  //this process takes 3 input:
--  //the filename of the image, the camera and the voxel world
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned  i=0;
--  input_types_[i++] = "vcl_string";                // NITF image path
--  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
--  input_types_[i++] = "boxm_scene_base_sptr";     // voxel world spec
--
--  //output
--  unsigned j = 0;
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[j++] = "vpgl_camera_double_sptr"; // unadjusted local rational camera
--  output_types_[j++] = "vil_image_view_base_sptr";  // image ROI
--  output_types_[j++] = "float"; // uncertainty
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--bool boxm_roi_init_rational_camera_process(bprb_func_process& pro)
--{
--  using namespace boxm_roi_init_rational_camera_process_globals;
--  //static const parameters
--  static const std::string error = "error";
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--  // uncertainty (meters) -- SHOULD BE A PARAM
--  float uncertainty=10.0;
--  if ( !pro.parameters()->get_value(error, uncertainty) ) {
--    std::cout << pro.name() << ": error in retrieving parameters\n";
--    return false;
--  }
--
--  // get the inputs:
--  unsigned i = 0;
--  // image
--  std::string image_path = pro.get_input<std::string>(i++);
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  //voxel_world
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  auto* img_ptr = new vil_image_view<unsigned char>();
--  auto* rat_camera =
--  dynamic_cast<vpgl_rational_camera<double>*> (camera.as_pointer());
--
--  if (!rat_camera) {
--    std::cerr << "The camera input is not a rational camera\n";
--    return false;
--  }
--
--  vpgl_local_rational_camera<double> local_camera;
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY ||
--      scene->appearence_model() == BOXM_EDGE_FLOAT ||
--      scene->appearence_model() == BOXM_EDGE_LINE) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--    auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--
--    if (!roi_init(image_path, rat_camera, s->get_world_bbox(),(s->lvcs()), uncertainty, img_ptr, local_camera)) {
--      std::cerr << "The process has failed!\n";
--      return false;
--    }
--
--    if (img_ptr->ni() == 0 || img_ptr->nj() == 0)
--      return false;
--
--    //Store outputs
--    unsigned j = 0;
--    // update the camera and store
--    pro.set_output_val<vpgl_camera_double_sptr >(j++, new vpgl_local_rational_camera<double> (local_camera));
--    // store image output
--    pro.set_output_val<vil_image_view_base_sptr>(j++, img_ptr);
--    // store uncertainty
--    pro.set_output_val<float>(j++, uncertainty);
--  }
--  else {
--    std::cout << "boxm_refine_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
--
--//: roi_init function
--bool boxm_roi_init_rational_camera_process_globals::roi_init(std::string const& image_path,
--                                                             vpgl_rational_camera<double>* camera,
--                                                             vgl_box_3d<double> box,
--                                                             const vpgl_lvcs& lvcs,
--                                                             float uncertainty,
--                                                             vil_image_view<unsigned char>* nitf_image_unsigned_char,
--                                                             vpgl_local_rational_camera<double>& local_camera)
--{
--  // read the image and extract the camera
--  vil_image_resource_sptr img = vil_load_image_resource(image_path.c_str());
--  std::string format = img->file_format();
--  std::string prefix = format.substr(0,4);
--  if (prefix.compare("nitf") != 0) {
--    std::cerr << "boxm_roi_init_rational_camera_process::execute - The image should be an NITF\n";
--    return false;
--  }
--
--  auto* nitf =  static_cast<vil_nitf2_image*> (img.ptr());
--
--  vgl_box_2d<double>* roi_box = project_box(camera, lvcs, box, uncertainty);
--
--  brip_roi broi(nitf->ni(), nitf->nj());
--  vsol_box_2d_sptr bb = new vsol_box_2d();
--  bb->add_point(roi_box->min_x(), roi_box->min_y());
--  bb->add_point(roi_box->max_x(), roi_box->max_y());
--  bb = broi.clip_to_image_bounds(bb);
--
--  if (bb->width() <= 0 || bb->height() <= 0) {
--    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
--    return false;
--  }
--
--  vil_image_view_base_sptr roi = nitf->get_copy_view((unsigned int)bb->get_min_x(),
--                                                     (unsigned int)bb->width(),
--                                                     (unsigned int)bb->get_min_y(),
--                                                     (unsigned int)bb->height());
--  if (!roi) {
--    std::cerr << "boxm_roi_init_rational_camera_process::roi_init()-- clipping box is out of image boundaries\n";
--    return false;
--  }
--
--  if (!roi.as_pointer())
--    return false;
--
--  if (roi->pixel_format() == VIL_PIXEL_FORMAT_UINT_16)
--  {
--    vil_image_view<vxl_uint_16> nitf_image_vxl_uint_16(roi);
--
--    *nitf_image_unsigned_char = vil_image_view<unsigned char> (roi->ni(),roi->nj(),roi->nplanes());
--
--    int bigendian = 0;
--    { union { unsigned int i; char c[4]; } u; u.i = 1; bigendian = u.c[0] == 0; }
--    for (unsigned m=0; m<nitf_image_unsigned_char->ni(); ++m)
--    {
--      for (unsigned n=0; n<nitf_image_unsigned_char->nj(); ++n)
--      {
--        for (unsigned p=0; p<nitf_image_unsigned_char->nplanes(); ++p)
--        {
--          // we will ignore the most significant 5 bits and less significant 3 bits
--          vxl_uint_16 curr_pixel_val = nitf_image_vxl_uint_16(m,n,p);
--
--          if (bigendian) {
--            auto* arr = (unsigned char*) &curr_pixel_val;
--            // [defgh3][5abc]
--            // --> [abcdefgh]
--            unsigned char big = *arr;
--            unsigned char small = *(++arr);
--            big >>= 3;
--            small <<= 5;
--            curr_pixel_val = big || small;
--          }
--          else { // little endian
--            // [5abc][defgh3]
--            // --> [abcdefgh]
--            curr_pixel_val <<= 5;
--            // [defgh3][5abc]
--            // --> [abcdefgh]
--            curr_pixel_val >>= 8;
--          }
--
--          auto pixel_val = static_cast<unsigned char> (curr_pixel_val);
--
--#if 0
--          //This is how Thom uses to get the region
--          int temp_pix_val = int(int(curr_pixel_val)*255.0/1500.0);
--          if (temp_pix_val > 255)
--            temp_pix_val =255;
--          unsigned char pixel_val = static_cast<unsigned char>(temp_pix_val);
--          //end hack
--#endif
--
--          (*nitf_image_unsigned_char)(m,n,p) = pixel_val;
--        }
--      }
--    }
--  }
--  else if (roi->pixel_format() == VIL_PIXEL_FORMAT_BYTE) {
--    *nitf_image_unsigned_char = vil_image_view<unsigned char>(roi);
--  }
--  else
--    std::cout << "boxm_roi_init_rational_camera_process - Unsupported Pixel Format = " << roi->pixel_format() << std::endl;
--
--  double u, v;
--  camera->image_offset(u, v);
--  double tu =  u - roi_box->min_x();
--  double tv =  v - roi_box->min_y();
--  camera->set_image_offset(tu, tv);
--  local_camera = vpgl_local_rational_camera<double> (lvcs, *camera);
--  delete roi_box;
--
--  return true;
--}
--
--//:project_box function
--vgl_box_2d<double>*boxm_roi_init_rational_camera_process_globals::project_box( vpgl_rational_camera<double>* cam,
--                                                                               vpgl_lvcs lvcs,
--                                                                               vgl_box_3d<double> box,
--                                                                               float r)
--{
--  double xoff, yoff, zoff;
--  xoff = cam->offset(vpgl_rational_camera<double>::X_INDX);
--  yoff = cam->offset(vpgl_rational_camera<double>::Y_INDX);
--  zoff = cam->offset(vpgl_rational_camera<double>::Z_INDX);
--
--  // global to local
--  double lx, ly, lz;
--  lvcs.global_to_local(xoff, yoff, zoff, vpgl_lvcs::wgs84, lx, ly, lz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  double center[3];
--  center[0] = lx;
--  center[1] = ly;
--  center[2] = lz;
--
--  // create a box with uncertainty
--  vgl_box_3d<double> cam_box(center, 2*r, 2*r, 2*r, vgl_box_3d<double>::centre);
--  std::vector<vgl_point_3d<double> > cam_corners = boxm_utils::corners_of_box_3d(cam_box);
--  std::vector<vgl_point_3d<double> > box_corners = boxm_utils::corners_of_box_3d(box);
--  auto* roi = new vgl_box_2d<double>();
--
--  double lon, lat, gz;
--  for (auto cam_corner : cam_corners) {
--    lvcs.local_to_global(cam_corner.x(), cam_corner.y(), cam_corner.z(),
--                         vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--    vpgl_rational_camera<double>* new_cam = cam->clone();
--    new_cam->set_offset(vpgl_rational_camera<double>::X_INDX, lon);
--    new_cam->set_offset(vpgl_rational_camera<double>::Y_INDX, lat);
--    new_cam->set_offset(vpgl_rational_camera<double>::Z_INDX, gz);
--
--    // project the box
--    for (auto & box_corner : box_corners) {
--      // convert the box corners to world coordinates
--      lvcs.local_to_global(box_corner.x(), box_corner.y(), box_corner.z(),
--                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--      vgl_point_2d<double> p2d = new_cam->project(vgl_point_3d<double>(lon, lat, gz));
--      roi->add(p2d);
--    }
--  }
--  return roi;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
-deleted file mode 100644
-index 8c8b260f04..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
-+++ /dev/null
-@@ -1,229 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_save_occupancy_raw_process.cxx
--#include <iostream>
--#include <fstream>
--#include <sstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for writing the occupancy probability of scenes to drishti raw files
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   Sep 11, 2009   Gamze Tunali
--//                  Added scene writing option, input number is increased to 4 and if 4th
--//                  input is 0, blocks saved as raw files separately, if 1, then blocks
--//                  combined to generate 1 raw file for the whole scene
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boxm/algo/boxm_save_scene_raw.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--namespace boxm_save_occupancy_raw_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_save_occupancy_raw_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_save_occupancy_raw_process_globals;
--
--  // process takes 4 inputs but has no outputs
--  //input[0]: scene binary file
--  //input[1]: output file (raw) path
--  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
--  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_save_occupancy_raw_process(bprb_func_process& pro)
--{
--  using namespace boxm_save_occupancy_raw_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string filepath = pro.get_input<std::string>(i++);
--  auto resolution =  pro.get_input<unsigned>(i++);
--  auto whole = pro.get_input<unsigned>(i++);
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
--      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if (!whole) {
--        boxm_block_iterator<type> it(scene);
--        it.begin();
--        while (!it.end()) {
--          std::stringstream strm;
--          vgl_point_3d<int> index = it.index();
--          strm << index.x() << '_' << index.y() << '_' << index.z();
--          std::string str(strm.str());
--          std::string s = filepath + str + ".raw";
--          boxm_save_block_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
--          it++;
--        }
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
--      }
--    }
--    else
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if (!whole) {
--        boxm_block_iterator<type> it(scene);
--        it.begin();
--        while (!it.end()) {
--          std::stringstream strm;
--          vgl_point_3d<int> index = it.index();
--          strm << index.x() << '_' << index.y() << '_' << index.z();
--          std::string str(strm.str());
--          std::string s = filepath + str + ".raw";
--          boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, it.index(), s, resolution);
--          it++;
--        }
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    if (!whole) {
--      boxm_block_iterator<type> it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_ptr.as_pointer())) {
--    if (!whole) {
--      boxm_block_iterator<boct_tree<short, float> > it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,float >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,float >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if (scene_ptr->appearence_model() == BSTA_MOG_F1){
--    if (!whole) {
--      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>* > (scene_ptr.as_pointer());
--      boxm_block_iterator<tree_type> it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      //boxm_save_scene_raw<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_ptr.as_pointer())) {
--    if (!whole) {
--      boxm_block_iterator<boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,bsta_num_obs<bsta_gauss_sf1> >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    if (!whole) {
--      boxm_block_iterator<type> it(scene);
--      it.begin();
--      while (!it.end()) {
--        std::stringstream strm;
--        vgl_point_3d<int> index = it.index();
--        strm << index.x() << '_' << index.y() << '_' << index.z();
--        std::string str(strm.str());
--        std::string s = filepath + str + ".raw";
--        boxm_save_block_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, it.index(), s, resolution);
--        it++;
--      }
--    }
--    else { // write the whole scene
--      boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOB_GREY> >(*scene, filepath + ".raw", resolution);
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
--    typedef boct_tree<short, boxm_edge_sample<float> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    boxm_save_scene_raw<short,boxm_edge_sample<float> >(*scene, filepath + ".raw", resolution);
--  }
--  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
--    typedef boct_tree<short, boxm_scalar_sample<float> > type;
--    auto* scene = static_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--    boxm_save_scene_raw<short,boxm_scalar_sample<float> >(*scene, filepath + ".raw", resolution);
--  }
--  else {
--    std::cout << "boxm_save_occupancy_raw_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
-deleted file mode 100644
-index 5f4d68c008..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
-+++ /dev/null
-@@ -1,140 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_save_scene_raw_process.cxx
--#include <iostream>
--#include <fstream>
--#include <sstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for writing general scenes to drishti raw files. Values in voxels are saved as they are
--//
--// \author Isabel Restrepo
--// \date Feb 17, 2011
--// \verbatim
--//  Modifications
--//  <None>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_save_scene_raw_general.h>
--#include <boxm/boxm_apm_traits.h>
--
--namespace boxm_save_scene_raw_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_save_scene_raw_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_save_scene_raw_process_globals;
--
--  // process takes 4 inputs but has no outputs
--  //input[0]: scene binary file
--  //input[1]: output file (raw) path
--  //input[2]: the resolution level wanted.. 0 is the most detailed (lowest possible level)
--  //input[3]: 0 for writing blocks individually, 1 for writing the scene into one file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_save_scene_raw_process(bprb_func_process& pro)
--{
--  using namespace boxm_save_scene_raw_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string filepath = pro.get_input<std::string>(i++);
--  auto resolution =  pro.get_input<unsigned>(i++);
--  auto whole = pro.get_input<unsigned>(i++);
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_FLOAT)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
--      return false;
--    }
--    else
--    {
--      typedef boct_tree<short, float > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if(!scene)
--        return false;
--      if (!whole) {
--        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
--        return false;
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw_general_to_byte<short,float>(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  // check the scene's app model
--  else if (scene_ptr->appearence_model() == BOXM_CHAR)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
--      return false;
--    }
--    else
--    {
--      typedef boct_tree<short, char > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if(!scene)
--        return false;
--      if (!whole) {
--        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
--        return false;
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw_general<short,char>(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  // check the scene's app model
--  else if (scene_ptr->appearence_model() == BOXM_BOOL)
--  {
--    if (scene_ptr->multi_bin())
--    {
--      std::cout << "boxm_save_scene_raw_process: Multibin scenes not implemented" << std::endl;
--      return false;
--    }
--    else
--    {
--      typedef boct_tree<short, bool > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*>(scene_ptr.as_pointer());
--      if(!scene)
--        return false;
--      if (!whole) {
--        std::cout << "boxm_save_scene_raw_process: Save by block not implemented" << std::endl;
--        return false;
--      }
--      else { // write the whole scene
--        boxm_save_scene_raw_general<short>(*scene, filepath + ".raw", resolution);
--      }
--    }
--  }
--  else {
--    std::cout << "boxm_save_scene_raw_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx b/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
-deleted file mode 100644
-index d5b044d0db..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// This is brl/bseg/boxm/algo/pro/processes/boxm_split_scene_process.cxx
--//:
--// \file
--// \brief process that splits a boxm_scene of boxm samples into an appearance and occupancy scene
--//
--// \author Isabel Restrepo
--// \date December 3, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <boxm/algo/boxm_split_sample.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace boxm_split_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--//: process takes 1 input and two outputs.
--// input[0]: The sample scene
--// output[0]: The appearance scene
--// output[1]: The alpha scene
--
--bool boxm_split_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_split_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--  output_types_[1] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_split_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_split_scene_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  //: Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > sample_tree_type;
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--  typedef boct_tree<short, apm_datatype> apm_tree_type;
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype alpha_type;
--  typedef boct_tree<short, alpha_type> alpha_tree_type;
--
--  auto *scene_in = static_cast<boxm_scene<sample_tree_type>* > (scene_base.as_pointer());
--
--  // parameters of the output scene are the same as those of the input scene
--  boxm_scene<apm_tree_type> *apm_scene = new boxm_scene<apm_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
--                                                                       scene_in->max_level(), scene_in->init_level());
--  apm_scene->set_paths(scene_in->path(), "apm_mog_grey");
--  apm_scene->set_appearance_model(BSTA_MOG_F1);
--  boxm_scene<alpha_tree_type > *alpha_scene = new boxm_scene<alpha_tree_type >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(),
--                                                                               scene_in->max_level(), scene_in->init_level());
--  alpha_scene->set_paths(scene_in->path(), "alpha");
--  alpha_scene->set_appearance_model(BOXM_FLOAT);
--  boxm_split_sample<BOXM_APM_MOG_GREY> splitter;
--
--  splitter.split_scene( *scene_in, *apm_scene, *alpha_scene);
--
--  apm_scene->write_scene("apm_scene.xml");
--  alpha_scene->write_scene("/alpha_scene.xml");
--
--  pro.set_output_val<boxm_scene_base_sptr>(0, apm_scene);
--  pro.set_output_val<boxm_scene_base_sptr>(1, alpha_scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index 2c499a1c2f..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_algo_pro_test_include test_include.cxx )
--target_link_libraries( boxm_algo_pro_test_include boxm_algo_pro)
-diff --git a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
-deleted file mode 100644
-index 8ee327ed5f..0000000000
---- a/contrib/brl/bseg/boxm/algo/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/pro/boxm_algo_processes.h>
--#include <boxm/algo/pro/boxm_algo_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
-deleted file mode 100644
-index 6140bcbb4a..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/CMakeLists.txt
-+++ /dev/null
-@@ -1,46 +0,0 @@
--# brl/bseg/boxm/algo/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_algo_rt_sources
--    boxm_change_probability_functor.h
--    boxm_edge_tangent_updater.h             boxm_edge_tangent_updater.hxx
--    boxm_edge_updater.h                     boxm_edge_updater.hxx
--    boxm_generate_edge_sample_functor.h
--    boxm_generate_edge_tangent_sample_functor.h
--    boxm_generate_opt2_sample_functor.h
--    boxm_generate_opt3_sample_functor.h
--    boxm_generate_opt_sample_functor.h
--    boxm_opt2_optimizer.h                   boxm_opt2_optimizer.hxx
--    boxm_opt3_optimizer.h                   boxm_opt3_optimizer.hxx
--    boxm_opt_appearance_estimator.h
--    boxm_opt_rt_bayesian_optimizer.h        boxm_opt_rt_bayesian_optimizer.hxx
--    boxm_pre_infinity_functor.h
--    boxm_render_expected_depth_functor.h
--    boxm_render_expected_edge_image_functor.h
--    boxm_render_expected_edge_tangent_image_functor.h
--    boxm_render_expected_image_functor.h
--    boxm_render_expected_shadow_image_functor.h
--    boxm_rpc_registration.h
--    boxm_sun_vis_prob_functor.h
--    boxm_update_image_functor.h
--    boxm_compute_num_rays_statistics.h
--    boxm_expected_edge_functor.h
--    boxm_shadow_appearance_estimator.h
--    boxm_generate_shadow_sample_functor.h
--    boxm_shadow_app_initializer.h            boxm_shadow_app_initializer.hxx
--    boxm_shadow_bayes_optimizer.h            boxm_shadow_bayes_optimizer.hxx
--    dummy.cxx
--   )
--
--aux_source_directory(Templates boxm_algo_rt_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_algo_rt LIBRARY_SOURCES ${boxm_algo_rt_sources})
--
--#processes
--add_subdirectory(pro)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_algo_rt boxm boxm_sample boxm_sample_algo boxm_basic boxm_util ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vgl_algo bsta ${VXL_LIB_PREFIX}vnl sdet brip ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo )
--
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
-deleted file mode 100644
-index ef11ac6b96..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_tangent_updater+short.float.float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
--
--BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(short,float,float);
--BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(short,float,float);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
-deleted file mode 100644
-index 8d4e1a9f37..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_edge_updater+short.float.float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/algo/rt/boxm_edge_updater.hxx>
--
--BOXM_EDGE_UPDATER_INSTANTIATE(short,float,float);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
-deleted file mode 100644
-index ca43ee5ebf..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT2_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT2_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
-deleted file mode 100644
-index fc93c9b10a..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt2_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT2_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT2_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT2_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index a9b24b175b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_MOG_GREY.BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index 318336e55b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt3_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT3_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY, BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 89f46b6393..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_MOG_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_MOG_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 0c8a2da7d1..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_opt_rt_bayesian_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 1cc6084872..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_app_initializer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
--#include <boxm/boxm_apm_traits.h>
--BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-deleted file mode 100644
-index 8a9638f4b1..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/boxm_shadow_bayes_optimizer+short.BOXM_APM_SIMPLE_GREY.BOXM_AUX_OPT_RT_GREY-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
--#include <boxm/boxm_apm_traits.h>
--BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
-deleted file mode 100644
-index 71036d42a6..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/Templates/bpgl_camera_estimator+boxm_expected_edge_functor+short.boxm_inf_line_sample+float---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <bpgl/bpgl_camera_estimator.hxx>
--#include <boxm/algo/rt/boxm_expected_edge_functor.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boxm_inf_line_sample<float> sample;
--typedef boxm_expected_edge_functor<short,sample > functor;
--BPGL_CAMERA_ESTIMATOR_INSTANTIATE(functor);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
-deleted file mode 100644
-index 5700690341..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_3d_functor.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_change_3d_functor_h
--#define boxm_change_3d_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM>
--class boxm_change_3d_functor
--{
-- public:
--  //: "default" constructor
--  boxm_change_3d_functor(vil_image_view<float> const& change_image, float prob_ratio)
--    : change_image_(change_image),
--      vis_img_(change_image.ni(),change_image.nj(), 1),
--      alpha_integral_(change_image.ni(),change_image.nj(), 1),
--      prob_ratio_(prob_ratio)
--  {
--    vis_img_.fill(1.0f);
--    alpha_integral_.fill(0.0f);
--
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM>& cell_value, boxm_scalar_sample<float>& scalar)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--
--    // update segment length sum
--    scalar.seg_len_ += seg_len;
--
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--
--    float back_prob = change_image_(i,j);
--    float fore_prob = 1.0f/(1.0f + prob_ratio_*back_prob);
--
--    // set change prob in auxiliary voxel
--    scalar.scalar_sum_ += Omega * fore_prob * seg_len;
--
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> change_image_;
--  vil_image_view<float> alpha_integral_;
--  vil_image_view<float> vis_img_;
--  float prob_ratio_;
--};
--
--template <class T_loc, class T_data>
--void boxm_change_3d(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                    vpgl_camera_double_sptr cam,
--                    vil_image_view<float> &change_image,
--                    std::string chng_name,
--                    float prob_ratio)
--{
--  typedef boxm_scalar_sample<float> sample_datatype;
--  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,chng_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--
--  std::cout<<"Chng visibility"<<std::endl;
--  // functor to compute 3-d change prob
--  typedef boxm_change_3d_functor<T_data::apm_type> change_functor;
--
--  // set up the raytrace function
--  boxm_raytrace_function<change_functor,T_loc, T_data, sample_datatype> raytracer_chng(scene,aux_scene,cam.ptr(),change_image.ni(),change_image.nj());
--
--  // construct the change probability functor
--  change_functor chng_func(change_image, prob_ratio);
--
--  // run the functor over the octree
--  raytracer_chng.run(chng_func);
--
--  std::cout<<"Change 3-d Done."<<std::endl;
--}
--
--#endif // boxm_change_3d_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
-deleted file mode 100644
-index a5d584f2c0..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_change_probability_functor.h
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#ifndef boxm_change_probability_functor_h
--#define boxm_change_probability_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <vil/vil_image_view.h>
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_change_probability_functor
--{
-- public:
--  //: "default" constructor
--  boxm_change_probability_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const & image, vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob,
--                                  vil_image_view<float> &mask_vis,
--                                  unsigned int ni,unsigned nj,
--                                  bool scene_read_only=false,bool is_aux=true)
--    : image_(image), change_prob_(change_prob),  vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
--  {
--    alpha_integral_.fill(0.0f);
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    change_prob_.fill(nil);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float prob_den  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), image_(i,j));
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    change_prob_(i,j) +=  prob_den* Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image_;
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &change_prob_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_change_prob_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                         vil_image_view<typename T_data::obs_datatype> const& image,
--                         vpgl_camera_double_sptr cam,
--                         vil_image_view<typename T_data::obs_datatype> &change_prob,
--                         vil_image_view<float> & mask,
--                         int /*bin*/ = -1,
--                         bool /*use_black_background*/ = false)
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
--  typedef boxm_change_probability_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > chng_functor;
--  boxm_raytrace_function<chng_functor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),change_prob.ni(),change_prob.nj());
--  chng_functor functor(image, change_prob,mask,change_prob.ni(),change_prob.nj(),true,false);
--  raytracer.run(functor);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h b/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
-deleted file mode 100644
-index 144d5bd7bf..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_compute_num_rays_statistics.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--#ifndef boxm_compute_num_rays_statistics_h
--#define boxm_compute_num_rays_statistics_h
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_histogram.h>
--#include <boxm/basic/boxm_num_rays_functor.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--template <class T_loc, class T_data>
--bool compute_ray_statistics(boxm_scene<boct_tree<T_loc, T_data > >& scene,
--                            vpgl_camera_double_sptr cam,
--                            bsta_histogram<float>& num_rays_hist,
--                            unsigned ni, unsigned nj)
--{
--  typedef boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_scalar_sample<sample_datatype> >::CLONE);
--
--  typedef boxm_num_rays_functor<T_data::apm_type,boxm_scalar_sample<sample_datatype> > functor_type;
--  boxm_raytrace_function<functor_type,T_loc, T_data,boxm_scalar_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),ni,nj);
--  functor_type num_rays_functor;
--  raytracer.run(num_rays_functor);
--
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  typedef boct_tree<T_loc, boxm_scalar_sample<sample_datatype> > aux_tree_type;
--  typedef boct_tree_cell<T_loc,boxm_scalar_sample<sample_datatype> > aux_cell_type;
--
--  num_rays_hist = bsta_histogram<float>(0.0f, 80.0f, 40);
--  boxm_block_iterator<tree_type> bit = scene.iterator();
--  float avg_rays=0;
--  float num_cells=0;
--  for (; !bit.end(); ++bit)
--  {
--    vgl_point_3d<int> block_index = bit.index();
--    //aux_scene.load_block(block_index);
--    boxm_block<aux_tree_type> * block = aux_scene.get_block(block_index);
--    aux_tree_type* tree=block->get_tree();
--    if (!tree) return false;
--    std::vector<aux_cell_type *> leaves = tree->leaf_cells();
--    for (typename std::vector<aux_cell_type *>::iterator cit = leaves.begin(); cit != leaves.end(); ++cit)
--    {
--      boxm_scalar_sample<sample_datatype>  data = (*cit)->data();
--      num_rays_hist.upcount(static_cast<float>(data.scalar_sum_), 1.0f);
--      avg_rays+=data.scalar_sum_;
--      num_cells++;
--    }
--  }
--
--  //aux_scene.clean_scene();
--  std::cout<<"Avg num of rays per cell "<<avg_rays/num_cells<<std::endl
--          << "[#rays]=Frequency" << '\n';
--
--  for (unsigned int i=0; i<num_rays_hist.nbins(); i++)
--  {
--      std::cout<< '[' << num_rays_hist.avg_bin_value(i) << "]=" << num_rays_hist.counts(i) << '\n';
--  }
--
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
-deleted file mode 100644
-index 510fb1158d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--#ifndef boxm_edge_tangent_updater_h_
--#define boxm_edge_tangent_updater_h_
--//:
--// \file
--// \brief class to find the optimal intersecting 3D lines for each voxel in the scene
--//
--// \author G. Tunali
--//
--// \verbatim
--//  Modifications
--//    Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
--// \endverbatim
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <vil/vil_image_view.h>
--
--template<class T_loc, class APM, class AUX>
--class boxm_edge_tangent_updater
--{
-- public:
--
--  boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
--                            std::vector<std::string>  image_ids, bool use_ransac=true, float ransac_ortho_thres = 0.01f, float ransac_volume_ratio = 128.0f, int ransac_consensus_cnt = 3);
--
--  ~boxm_edge_tangent_updater()= default;
--
--  bool add_cells();
--
-- protected:
--  std::vector<std::string> image_ids_;
--  bool use_ransac_;
--
--  float ransac_ortho_thres_;
--  float ransac_volume_ratio_;
--  int ransac_consensus_cnt_;  // number of images that need to contribute planes to a hypothesis for a cell to be assigned a 3D edge
--                              // there should be at least ransac_consensus_cnt_+1 training images for some consensus to be met at any voxel, otherwise edge world will be empty
--
--  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
--};
--
--template<class T_loc, class APM, class AUX>
--class boxm_edge_tangent_refine_updates
--{
-- public:
--
--  boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene, int consensus_cnt,
--                                   std::vector<vil_image_view<float> >  edge_images,
--                                   std::vector<vpgl_camera_double_sptr>  cameras);
--
--  ~boxm_edge_tangent_refine_updates() = default;
--
--  bool refine_cells();
--
-- protected:
--  std::vector<vil_image_view<float> > edge_images_; // edge_img(ix, iy, 0) = static_cast<float>(x); subpixel location of edge
--                                                   // edge_img(ix, iy, 1) = static_cast<float>(y);
--                                                   // edge_img(ix, iy, 2) = static_cast<float>(dir); tangent direction of the edgel
--  std::vector<vpgl_camera_double_sptr> cameras_;
--
--  int consensus_cnt_;  // how many images need to be in agreement for an edgel to survive
--  boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
-deleted file mode 100644
-index 5c3d68f321..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_tangent_updater.hxx
-+++ /dev/null
-@@ -1,291 +0,0 @@
--#ifndef boxm_edge_tangent_updater_hxx_
--#define boxm_edge_tangent_updater_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_edge_tangent_updater.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/util/boxm_plane_ransac.h>
--#include <vpgl/vpgl_camera.h>
--
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <bsta/bsta_histogram.h>
--
--template <class T_loc, class APM, class AUX>
--boxm_edge_tangent_updater<T_loc,APM,AUX>::boxm_edge_tangent_updater(boxm_scene<boct_tree<T_loc,
--                                                                    boxm_inf_line_sample<APM> > > &scene,
--                                                                    std::vector<std::string>  image_ids,
--                                                                    bool use_ransac,
--                                                                    float ransac_ortho_thres,
--                                                                    float ransac_volume_ratio,
--                                                                    int ransac_concensus_cnt)
--: image_ids_(std::move(image_ids)), use_ransac_(use_ransac), ransac_ortho_thres_(ransac_ortho_thres), ransac_volume_ratio_(ransac_volume_ratio), ransac_consensus_cnt_(ransac_concensus_cnt), scene_(scene)
--{}
--
--
--template <class T_loc, class APM, class AUX>
--bool boxm_edge_tangent_updater<T_loc,APM,AUX>::add_cells()
--{
--  // get auxiliary scenes associated with each input image
--
--  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> > > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>, boxm_edge_tangent_sample<AUX> >
--    aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_inf_line_sample<APM>,
--              boxm_edge_tangent_sample<AUX> >::LOAD, BOXM_EDGE_TANGENT_LINE);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_edge_tangent_sample<APM> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
--    int nums=0;
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, boxm_edge_tangent_sample<AUX> > *> aux_readers(aux_scenes.size());
--    std::vector<unsigned> aux_samples_num(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--      aux_samples_num[i] = 0;
--    }
--    //int a;
--    //std::cin>>a;
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
--      // initialize the cell
--      boxm_inf_line_sample<AUX> data(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(0,0),vgl_vector_3d<AUX>(1,1,1)));
--      cell->set_data(data);
--
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, boxm_edge_tangent_sample<AUX> > temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().num_obs()>0)
--        {
--            aux_samples.push_back(temp_cell.data());
--            //aux_samples_num[j]++;
--        }
--      }
--
--      if (aux_samples.size() > 1)
--      {
--        std::vector<vgl_plane_3d<AUX> > planes;
--        std::vector<AUX> weights;
--
--        for (unsigned int k=0;k<aux_samples.size(); ++k) {
--          boxm_edge_tangent_sample<APM> s = aux_samples[k];
--          for (unsigned int j=0; j<s.num_obs(); j++) {
--            boxm_plane_obs<AUX> obs = s.obs(j);
--            weights.push_back(obs.seg_len_);
--            vgl_plane_3d<AUX> plane(obs.plane_);
--            planes.push_back(plane);
--          }
--        }
--        nums+=planes.size();
--        if (planes.size() > 1) {
--          if (use_ransac_) {
--            vgl_infinite_line_3d<AUX> line;
--            float residual=1e5;
--            vgl_box_3d<double> bb = tree->cell_bounding_box(cell);
--
--            // ransac_consensus_cnt_ used to be hard-coded here to 5; made it into a parameter with a default value of 3
--            if (boxm_plane_ransac<AUX>(aux_samples, weights, line, residual,bb, ransac_consensus_cnt_, ransac_ortho_thres_, ransac_volume_ratio_)) {
--              boxm_inf_line_sample<AUX> data(line,aux_samples.size());
--              data.residual_=residual;
--
--              // now set the clipped line
--              // convert to type double
--              vgl_vector_2d<double> x0(line.x0().x(), line.x0().y());
--              vgl_point_3d<double> p0,p1;
--              vgl_vector_3d<double> dir(line.direction().x(), line.direction().y(), line.direction().z());
--              vgl_infinite_line_3d<double> dline(x0,dir);
--              if (!vgl_intersection<double>(bb, dline, p0, p1))
--                data.residual_=0;
--              else {
--                // convert back to type AUX
--                vgl_point_3d<AUX> p0_t(AUX(p0.x()), AUX(p0.y()), AUX(p0.z()));
--                vgl_point_3d<AUX> p1_t(AUX(p1.x()), AUX(p1.y()), AUX(p1.z()));
--                vgl_line_3d_2_points<AUX> line_clipped(p0_t,p1_t);
--                data.line_clipped_ = line_clipped;
--              }
--
--              cell->set_data(data);
--            }
--            else
--            {
--              boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--              cell->set_data(sample);
--            }
--          }
--          else
--          {
--            boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--            cell->set_data(sample);
--          }
--        }
--        else
--        {
--          boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--          cell->set_data(sample);
--        }
--      }
--      else
--      {
--        boxm_inf_line_sample<AUX> sample(vgl_infinite_line_3d<AUX>(vgl_vector_2d<AUX>(-10000,-10000),vgl_vector_3d<AUX>(0,0,1)));
--        cell->set_data(sample);
--      }
--    }
--    nums/=cells.size();
--
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--#if 0
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--#endif
--  return true;
--}
--
--template <class T_loc, class APM, class AUX>
--boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::boxm_edge_tangent_refine_updates(boxm_scene<boct_tree<T_loc, boxm_inf_line_sample<APM> > > &scene,
--                                                                                  int consensus_cnt,
--                                                                                  std::vector<vil_image_view<float> >  edge_images,
--                                                                                  std::vector<vpgl_camera_double_sptr>  cameras)
--: edge_images_(std::move(edge_images)), cameras_(std::move(cameras)), consensus_cnt_(consensus_cnt), scene_(scene)
--{}
--
--template <class T_loc, class APM, class AUX>
--bool boxm_edge_tangent_refine_updates<T_loc,APM,AUX>::refine_cells()
--{
--  std::cout << "using " << edge_images_.size() << " images to refine edge world!" << std::endl;
--
--  typedef boct_tree<T_loc, boxm_inf_line_sample<APM> > tree_type;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_inf_line_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >*> cells = tree->leaf_cells();
--
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      boct_tree_cell<T_loc,boxm_inf_line_sample<APM> >* cell = cells[i];
--      boxm_inf_line_sample<AUX> cell_value = cell->data();
--
--      // update residual of cell_value based on the visibility and support of this 3D line in all the images
--      if (cell_value.residual_<1.0)
--      {
--        // go through each image
--        int cnt = 0;
--        for (unsigned k = 0; k < edge_images_.size(); k++) {
--          int ni = edge_images_[k].ni();
--          int nj = edge_images_[k].nj();
--          // project this 3D line to the image
--          double u1,v1,u2,v2;
--          vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
--          vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
--          cameras_[k]->project(p1.x(),p1.y(),p1.z(),u1,v1);
--          cameras_[k]->project(p2.x(),p2.y(),p2.z(),u2,v2);
--
--          double line_angle = vnl_math::angle_0_to_2pi(std::atan2(v2-v1, -(u2-u1)));
--          double line_angle2 = vnl_math::angle_0_to_2pi(line_angle + vnl_math::pi); // line segment is symmetric
--
--          // find mid point of line seg
--          int cent_i = int(u1+(u2-u1)/2.0);
--          int cent_j = int(v1+(v2-v1)/2.0);
--
--          // check a neighborhood of 10x10 in the image to find the edgel that is nearest to this line segment
--          double angle_of_min = 0.0;
--          double dist = 10.0;
--          for (int ii = cent_i - 10; ii < cent_i + 10; ii++) {
--            if (ii < 0 || ii >= ni) continue;
--            for (int jj = cent_j - 10; jj < cent_j + 10; jj++) {
--              if (jj < 0 || jj >= nj) continue;
--              double ex = edge_images_[k](ii,jj,0);
--              double ey = edge_images_[k](ii,jj,1);
--              double dir = edge_images_[k](ii,jj,2);
--              double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, ex, ey);
--              if (dist_to_seg < dist) {
--                dist = dist_to_seg;
--                angle_of_min = dir;
--              }
--            }
--          }
--          if (dist < 10.0)
--            if (std::abs(angle_of_min - line_angle) < vnl_math::pi/16.0 || std::abs(angle_of_min - line_angle2) < vnl_math::pi/16.0)
--              cnt++;
--        }
--
--        if (cnt >= consensus_cnt_)
--          cell_value.residual_ = AUX(1.0)-AUX(cnt)/AUX(edge_images_.size());
--        else
--          cell_value.residual_ = AUX(1.0);
--        cell->set_data(cell_value);
--      }
--    }
--    scene_.write_active_block();
--    iter++;
--  }
--
--  return true;
--}
--
--
--#define BOXM_EDGE_TANGENT_UPDATER_INSTANTIATE(T1,T2,T3) \
--template class boxm_edge_tangent_updater<T1,T2,T3 >
--
--#define BOXM_EDGE_TANGENT_REFINE_UPDATES_INSTANTIATE(T1,T2,T3) \
--template class boxm_edge_tangent_refine_updates<T1,T2,T3 >
--
--#endif // boxm_edge_tangent_updater_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
-deleted file mode 100644
-index 646f92a418..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.h
-+++ /dev/null
-@@ -1,34 +0,0 @@
--#ifndef boxm_edge_updater_h_
--#define boxm_edge_updater_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_edge_sample.h>
--
--template<class T_loc, class APM, class AUX>
--class boxm_edge_updater
--{
-- public:
--  boxm_edge_updater(boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene,
--                    std::vector<std::string>  image_ids);
--
--  ~boxm_edge_updater()= default;
--
--  bool add_cells();
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_edge_sample<APM> > > &scene_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
-deleted file mode 100644
-index 029f503587..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_edge_updater.hxx
-+++ /dev/null
-@@ -1,110 +0,0 @@
--#ifndef boxm_edge_updater_hxx_
--#define boxm_edge_updater_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_edge_updater.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class APM, class AUX>
--boxm_edge_updater<T_loc,APM,AUX>::boxm_edge_updater(boxm_scene<boct_tree<T_loc,
--                                                    boxm_edge_sample<APM> > > &scene,
--                                                    std::vector<std::string>  image_ids)
--: image_ids_(std::move(image_ids)), scene_(scene)
--{}
--
--
--template <class T_loc, class APM, class AUX>
--bool boxm_edge_updater<T_loc,APM,AUX>::add_cells()
--{
--  // get auxiliary scenes associated with each input image
--  //typedef typename boxm_aux_traits<AUX>::sample_datatype AUX;
--
--  typedef boct_tree<T_loc, boxm_edge_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> > aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_edge_sample<APM>, boxm_aux_edge_sample<AUX> >::LOAD);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_aux_edge_sample<APM> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_edge_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_edge_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, boxm_aux_edge_sample<AUX> > *> aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_edge_sample<APM> >* cell = cells[i];
--      boxm_edge_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, boxm_aux_edge_sample<AUX> > temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--
--      //std::vector<typename boxm_edge_sample<APM> > obs_vector(aux_samples.size());
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        data.edge_prob_ += aux_samples[s].obs_/aux_samples[s].seg_len_;
--      }
--      data.num_obs_ += 1;
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_EDGE_UPDATER_INSTANTIATE(T1,T2,T3) \
--template class boxm_edge_updater<T1,T2,T3 >
--
--#endif // boxm_edge_updater_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
-deleted file mode 100644
-index b0d443ca27..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_expected_edge_functor.h
-+++ /dev/null
-@@ -1,53 +0,0 @@
--#ifndef boxm_expected_edge_functor_h_
--#define boxm_expected_edge_functor_h_
--//:
--// \file
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
--
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_transform.h>
--
--#include <brip/brip_vil_float_ops.h>
--
--//: Functor class to compute (1-x)
--// assumes that max range value is "1"
--// only sensible for real types
--class boxm_exp_edge_vil_not_functor
--{
-- public:
--  float operator()(float x)       const { return x<1.0f?(1.0f-x):0.0f; }
--  double operator()(double x)     const { return x<1.0?1.0-x:0.0; }
--};
--
--template <class T_loc, class T_data>
--class boxm_expected_edge_functor
--{
-- public:
--  boxm_expected_edge_functor(boxm_scene<boct_tree<T_loc, T_data > > &scene)
--    : scene_(scene) {}
--  ~boxm_expected_edge_functor() = default;
--
--  bool apply(const vpgl_camera_double_sptr& cam, vil_image_view<float> *img_eei)
--  {
--    boxm_render_edge_tangent_image_rt(scene_,cam,*img_eei);
--    // now take the inverse of this image, pixels which contain edges will have values closer to 1 and others will be zero
--    boxm_exp_edge_vil_not_functor nt;
--    vil_transform(*img_eei, nt);
--
--    // now blur this image
--    *img_eei = brip_vil_float_ops::gaussian(*img_eei, 1.0f);
--
--    return true;
--  }
--
-- private:
--  boxm_scene<boct_tree<T_loc, T_data > > scene_;
--};
--
--#undef BOXM_EXPECTED_EDGE_INSTANTIATE
--#define BOXM_EXPECTED_EDGE_INSTANTIATE(T1,T2) \
--template class boxm_expected_edge_functor<T1, T2 >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
-deleted file mode 100644
-index 756c0ca4a6..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_sample_functor.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--#ifndef boxm_generate_edge_sample_functor_h
--#define boxm_generate_edge_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T, class T_aux>
--class boxm_generate_edge_sample_functor
--{
-- public:
--  boxm_generate_edge_sample_functor(vil_image_view<float> &observation,
--                                    unsigned int /*ni*/=0,unsigned /*nj*/=0)
--    : obs_(observation)
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        T &cell_value, // FIXME: unused...
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--    aux_val.obs_ += obs_(i,j) * seg_len;
--    aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> &obs_;
--};
--
--template <class T_loc, class T_data>
--void boxm_generate_edge_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                  vpgl_camera_double_sptr cam,
--                                  vil_image_view<float> &obs,
--                                  std::string iname)
--{
--    typedef boxm_aux_edge_sample<float> aux_datatype;
--    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE);
--    typedef boxm_generate_edge_sample_functor<boxm_edge_sample<float>,aux_datatype> func;
--    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PROCESSING EDGE IMAGE\n";
--    func functor(obs,obs.ni(),obs.nj());
--    raytracer.run(functor);
--
--    //aux_scene.clean_scene();
--    std::cerr << "DONE.\n";
--}
--
--#endif // boxm_generate_edge_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
-deleted file mode 100644
-index 009e75228c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h
-+++ /dev/null
-@@ -1,78 +0,0 @@
--#ifndef boxm_generate_edge_tangent_sample_functor_h
--#define boxm_generate_edge_tangent_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vgl/vgl_homg_plane_3d.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T, class T_aux>
--class boxm_generate_edge_tangent_sample_functor
--{
-- public:
--  boxm_generate_edge_tangent_sample_functor(vil_image_view<float> &observation,
--                                            unsigned int /*ni*/=0, unsigned /*nj*/=0)
--    : obs_(observation)
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--    // make sure that the image has 4 planes ((a,b,c,d) params of a plane ax+by+cz=d )
--    if (observation.nplanes() != 4)
--      std::cerr << "boxm_generate_edge_tangent_sample_functor: the image does not have 4 planes\n";
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        T &cell_value, // FIXME - unused
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--    float a = obs_(i,j,0);
--    float b = obs_(i,j,1);
--    float c = obs_(i,j,2);
--    float d = obs_(i,j,3);
--
--    if (a||b||c||d) {
--      vgl_homg_plane_3d<float> p(a,b,c,d);
--      boxm_plane_obs<float> observation(p,seg_len);
--      aux_val.insert(observation);
--    }
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> &obs_;
--};
--
--template <class T_loc, class T_data>
--void boxm_generate_edge_tangent_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                          vpgl_camera_double_sptr cam,
--                                          vil_image_view<float> &obs,
--                                          std::string iname)
--{
--    typedef boxm_edge_tangent_sample<float> aux_datatype;
--    boxm_aux_scene<T_loc, T_data, aux_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc,T_data,aux_datatype>::CLONE, BOXM_EDGE_TANGENT_LINE);
--    typedef boxm_generate_edge_tangent_sample_functor<boxm_inf_line_sample<float>,aux_datatype> func;
--    boxm_raytrace_function<func,T_loc, T_data, aux_datatype> raytracer(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PROCESSING EDGE IMAGE\n";
--    func functor(obs,obs.ni(),obs.nj());
--    raytracer.run(functor);
--    //aux_scene.clean_scene();
--    std::cerr << "DONE.\n";
--}
--
--#endif // boxm_generate_edge_tangent_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
-deleted file mode 100644
-index 5cbaef86fc..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt2_sample_functor.h
-+++ /dev/null
-@@ -1,197 +0,0 @@
--#ifndef boxm_generate_opt2_sample_functor_h
--#define boxm_generate_opt2_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_opt2_sample_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_generate_opt2_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                           vil_image_view<float> const& beta_denom,
--                                           float model_prior,
--                                           vil_image_view<float> const& alt_prob_img)
--    : scene_read_only_(true) /*only reads info from the scene*/, is_aux_(true) /*needs to write aux*/,
--      model_prior_(model_prior), alt_prob_img_(alt_prob_img), obs_(image), beta_denom_(beta_denom),
--      vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    vis_img_.fill(1.0f);
--    pre_img_.fill(0.0f);
--    alpha_integral_.fill(0.0f);
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs = aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    // accumulate aux sample values
--    aux_val.pre_ += (pre * model_prior_ + alt_prob_img_(i,j)) * seg_len;
--    aux_val.vis_ += vis * model_prior_ * seg_len;
--
--    const float beta_num = pre + vis*PI;
--    const float beta_num_expanded = (beta_num  * model_prior_) + alt_prob_img_(i,j);
--    const float beta_denom = beta_denom_(i,j);
--    const float beta_denom_expanded = (beta_denom * model_prior_) + alt_prob_img_(i,j);
--
--    float beta = 1.0f;
--    if (beta_denom_expanded > 1e-5f) {
--      beta =  beta_num_expanded / beta_denom_expanded;
--    }
--    const float old_PQ = (float)(1.0 - std::exp(-cell_value.alpha*seg_len));
--    const float new_PQ = old_PQ * beta;
--    const float pass_prob_old = 1.0f - old_PQ;
--    float pass_prob = 1.0f - new_PQ;
--
--    // compute expected information gained from update
--    const float weight = new_PQ * std::log(new_PQ / old_PQ) + pass_prob * std::log(pass_prob / pass_prob_old);
--    // ensure log doesn't go to infinity
--    if (pass_prob < 1e-5f) {
--      pass_prob = 1e-5f;
--    }
--    aux_val.log_pass_prob_sum_ += std::log(pass_prob) * weight/seg_len;
--    aux_val.weighted_seg_len_sum_ += weight; // += seg_len * weight/seg_len;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  float model_prior_;
--  vil_image_view<float> const& alt_prob_img_;
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& beta_denom_;
--
--  //vil_image_view<float> const& pre_inf_;
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data, boxm_aux_type AUX_T>
--void boxm_generate_opt2_samples(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                vpgl_camera_double_sptr cam,
--                                vil_image_view<typename T_data::obs_datatype> &obs,
--                                std::string iname,
--                                std::vector<float> const& alt_appearance_priors,
--                                std::vector<typename T_data::apm_datatype> const& alt_appearance_models,
--                                bool black_background = false)
--{
--  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
--  //std::cout << "scene.save_platform_independent() = " << scene.save_platform_independent() << std::endl;
--  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 0"<<std::endl;
--  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--  raytracer_0.run(pass_0_functor);
--
--  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--  vil_image_view<float> inf_term(obs.ni(), obs.nj());
--
--  typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--  boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 1"<<std::endl;
--  pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--  raytracer_1.run(pass_1_functor);
--
--  // compute observation probability for "infinity" appearance model
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    // use single-mode gaussian centered at 0
--    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
--    typename T_data::obs_mathtype black(0);
--    const float black_std_dev = 8.0f/255;
--    const gauss_type appearance_dist(black, black_std_dev*black_std_dev);
--
--    //float peak=T_data::apm_processor::expected_color(background_apm);
--    //std::cout<<"Peak: "<<peak<<std::endl;
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--    for (; img_it != obs.end(); ++img_it, ++PI_it) {
--      *PI_it = appearance_dist.prob_density(*img_it);
--    }
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--  }
--  else {
--    // assume uniform prob. density on interval [0, 1]
--    //PI_inf.fill(1.0f);
--    // don't actually have to compute anything since multiplying by 1
--    inf_term = vis_inf;
--  }
--  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
--  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
--
--  // compute model prior
--  float model_prior = 1.0f;
--  for (float alt_appearance_prior : alt_appearance_priors) {
--    model_prior -= alt_appearance_prior;
--  }
--  // sanity check
--  if (model_prior <= 0.0f) {
--    std::cerr << "error: boxm_generate_opt2_samples : alt_appearance_priors sum to " << 1.0f - model_prior << " >= 1.0!\n";
--  }
--
--  // compute alternate appearance probability for each pixel in the image
--  vil_image_view<float> alt_prob_img(obs.ni(), obs.nj());
--  alt_prob_img.fill(0.0f);
--  const unsigned int n_alt = alt_appearance_priors.size();
--  if (n_alt > 0) {
--    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--    typename vil_image_view<float>::iterator alt_prob_it = alt_prob_img.begin();
--    for (; img_it != obs.end(); ++img_it, ++alt_prob_it) {
--      for (unsigned int a=0; a< n_alt; ++a) {
--        const float alt_prob_density = boxm_apm_traits<T_data::apm_type>::apm_processor::prob_density(alt_appearance_models[a],*img_it);
--        *alt_prob_it +=  alt_prob_density * alt_appearance_priors[a];
--      }
--    }
--  }
--
--  // run the raytrace function
--  std::cout<<"PASS 2"<<std::endl;
--  typedef boxm_generate_opt2_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
--  boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  pass_2 pass_2_functor(obs,beta_denom_img, model_prior, alt_prob_img);
--  raytracer_2.run(pass_2_functor);
--
--  //aux_scene.clean_scene();
--  std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_opt2_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
-deleted file mode 100644
-index 2447f5f483..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt3_sample_functor.h
-+++ /dev/null
-@@ -1,219 +0,0 @@
--#ifndef boxm_generate_opt3_sample_functor_h
--#define boxm_generate_opt3_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM>
--class pre_inf_functor
--{
--  typedef typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype aux_null_t;
-- public:
--  //: "default" constructor
--  pre_inf_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                  vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
--    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //no need to write aux
--    is_aux_=false;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value, aux_null_t & /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),obs_(i,j)); // aux_val.PI_;
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update pre
--    pre_img_(i,j) +=  PI * Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--  vil_image_view<float> alpha_integral_;
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> &pre_img_;
--};
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_opt3_sample_functor
--{
-- public:
--  //: "default" constructor
--  boxm_generate_opt3_sample_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                    vil_image_view<float> const& beta_denom)
--    : obs_(image), beta_denom_(beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux &aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), obs_(i,j));
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = (float)std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--
--    // update observation distribution
--    aux_val.update_obs_dist(obs_(i,j),vis);
--    aux_val.weighted_vis_sum_ += vis*seg_len;
--
--    const float old_PQ = 1.0f - (float)std::exp(-cell_value.alpha * seg_len);
--    float new_PQ = old_PQ;
--    const float beta_denom_val = beta_denom_(i,j);
--    const double epsilon = 1e-6;
--    if (beta_denom_val > epsilon) {
--      const float beta = (pre + vis*PI) / beta_denom_val;
--      new_PQ = old_PQ * beta;
--    }
--    double pass_prob = 1.0 - new_PQ;
--    if (pass_prob < epsilon) {
--      pass_prob = epsilon;
--    }
--    aux_val.log_pass_prob_sum_ += (float)std::log(pass_prob);
--    aux_val.seg_len_sum_ += seg_len;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& beta_denom_;
--
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data, boxm_aux_type AUX_T>
--void boxm_generate_opt3_sample(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                               vpgl_camera_double_sptr cam,
--                               vil_image_view<typename T_data::obs_datatype> &obs,
--                               std::string image_id,
--                               bool black_background = false)
--{
--  typedef boxm_opt3_sample<boxm_aux_traits<AUX_T>::APM_TYPE> aux_sample_datatype;
--  boxm_aux_scene<T_loc, T_data, aux_sample_datatype> aux_scene(&scene, image_id, boxm_aux_scene<T_loc, T_data, aux_sample_datatype>::CLONE);
--#if 0
--  typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--  boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 0"<<std::endl;
--  pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--  raytracer_0.run(pass_0_functor);
--#endif
--  vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--  vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--  typedef pre_inf_functor<T_data::apm_type> pre_inf_functor_t;
--  boxm_raytrace_function<pre_inf_functor_t, T_loc, T_data> raytracer_1(scene,cam.ptr(),obs.ni(),obs.nj());
--  std::cout<<"PASS 1"<<std::endl;
--  pre_inf_functor_t pass_1_functor(obs,pre_inf,vis_inf);
--  raytracer_1.run(pass_1_functor);
--
--  vil_image_view<float> inf_term(obs.ni(), obs.nj());
--  vil_image_view<float> beta_denom_img(obs.ni(), obs.nj());
--
--  // compute observation probability for "infinity" appearance model
--  vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    // use single-mode gaussian centered at 0
--    typedef bsta_gaussian_sphere<typename T_data::obs_mathtype, T_data::obs_dim> gauss_type;
--    typename T_data::obs_mathtype black(0);
--    const float black_std_dev = 8.0f/255;
--    const gauss_type appearance_dist(black, black_std_dev);
--#if 0
--    float peak=T_data::apm_processor::expected_color(background_apm);
--    std::cout<<"Peak: "<<peak<<std::endl;
--#endif
--    typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--    typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--    for (; img_it != obs.end(); ++img_it, ++PI_it) {
--      *PI_it = appearance_dist.prob_density(*img_it);
--    }
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--  }
--  else {
--    // assume uniform prob. density on interval [0, 1]
--    //PI_inf.fill(1.0f);
--    // don't actually have to compute anything since multiplying by 1
--    inf_term = vis_inf;
--  }
--  vil_math_image_sum<float,float,float>(pre_inf,inf_term,beta_denom_img);
--
--#ifdef DEBUG
--  vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
--  vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
--  vil_save(beta_denom_img, "E:/tests/capitol/beta_denom_img.tiff");
--  vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
--#endif
--
--  std::cout<<"PASS 2"<<std::endl;
--  typedef boxm_generate_opt3_sample_functor<T_data::apm_type, aux_sample_datatype> pass_2_functor_t;
--  boxm_raytrace_function<pass_2_functor_t, T_loc, T_data, aux_sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--  pass_2_functor_t pass_2_functor(obs, beta_denom_img);
--  raytracer_2.run(pass_2_functor);
--#if 0
--  aux_scene.clean_scene();
--#endif
--  std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_opt3_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
-deleted file mode 100644
-index c23998293f..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_opt_sample_functor.h
-+++ /dev/null
-@@ -1,164 +0,0 @@
--#ifndef boxm_generate_opt_sample_functor_h
--#define boxm_generate_opt_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_opt_sample_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_generate_opt_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                          vil_image_view<float> const& Beta_denom)
--  : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs= aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    // accumulate aux sample values
--    aux_val.pre_ += pre * seg_len;
--    aux_val.vis_ += vis * seg_len;
--
--    const float Beta_num = pre + vis*PI;
--    float Beta = 1.0f;
--    if (Beta_denom_(i,j) < 1e-6) {
--      if (Beta_num > 1e-5) {
--        Beta = 10.0f;
--      }
--    }
--    else {
--      Beta = Beta_num / Beta_denom_(i,j);
--    }
--    if (Beta < 0) {
--      if (Beta < -1e-5) {
--        std::cerr << " error: beta = " << Beta << "  setting to 0. " << '\n';
--      }
--      Beta = 0;
--    }
--    aux_val.Beta_ += Beta * seg_len;
--    //aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& Beta_denom_;
--
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data>
--void boxm_generate_opt_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                 vpgl_camera_double_sptr cam,
--                                 vil_image_view<typename T_data::obs_datatype> &obs,
--                                 std::string iname,
--                                 bool black_background = false)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 0"<<std::endl;
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--
--    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 1"<<std::endl;
--    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--    raytracer_1.run(pass_1_functor);
--
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--
--
--    if (black_background) {
--        std::cout << "using black background model" << std::endl;
--        typename T_data::obs_datatype black(0.0f);
--        float background_std_dev = 8.0f/255; // ???????????? 4/255 Vishal's
--        typename T_data::apm_datatype background_apm(black, background_std_dev*background_std_dev,1.0f);
--
--        float peak=T_data::apm_processor::expected_color(background_apm);
--        std::cout<<"Peak: "<<peak<<std::endl;
--        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--        for (; img_it != obs.end(); ++img_it, ++PI_it) {
--            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
--        }
--    }
--    else {
--        PI_inf.fill(1.0f);
--    }
--
--    vil_image_view<float> inf_term(obs.ni(), obs.nj());
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
--    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
--#ifdef DEBUG
--    vil_save(vis_inf, "E:/tests/capitol/vis_inf.tiff");
--    vil_save(pre_inf, "E:/tests/capitol/pre_inf.tiff");
--    vil_save(Beta_denom_img, "E:/tests/capitol/Beta_denom_img.tiff");
--    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
--#endif
--    std::cout<<"PASS 2"<<std::endl;
--    typedef boxm_generate_opt_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
--    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    pass_2 pass_2_functor(obs,Beta_denom_img);
--    raytracer_2.run(pass_2_functor);
--
--#if 0
--    aux_scene.clean_scene();
--#endif
--    std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_opt_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
-deleted file mode 100644
-index 551c049134..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_generate_shadow_sample_functor.h
-+++ /dev/null
-@@ -1,212 +0,0 @@
--#ifndef boxm_generate_shadow_sample_functor_h
--#define boxm_generate_shadow_sample_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_generate_shadow_sample_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_generate_shadow_sample_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                             vil_image_view<float> const& Beta_denom, float shadow_prior, vil_image_view<float> const& shadow_density)
--    : obs_(image), Beta_denom_(Beta_denom), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1), shadow_prior_(shadow_prior), shadow_density_(shadow_density)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs= aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    float alpha_l = cell_value.alpha * seg_len; //change
--    alpha_integral_(i,j) += alpha_l;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // grab this cell's pre and vis value
--    const float pre = pre_img_(i,j);
--    const float vis = vis_img_(i,j);
--    // compute weight for this cell
--    const float Omega = vis - vis_prob_end;
--
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    // accumulate aux sample values
--    aux_val.pre_ += pre * seg_len;
--    aux_val.vis_ += vis * seg_len;  //<<changed Feb 05, 2010
--    float Beta_num = pre + vis*PI;
--    Beta_num *=(1.0f - shadow_prior_);
--    Beta_num += shadow_density_(i,j);
--    float Beta = 1.0f;
--    if (Beta_denom_(i,j) < 1e-6) {
--      if (Beta_num > 1e-5) {
--        Beta = 10.0f;
--      }
--    }
--    else {
--      Beta = Beta_num / Beta_denom_(i,j);
--    }
--    if (Beta < 0) {
--      if (Beta < -1e-5) {
--        std::cerr << " error: beta = " << Beta << "  setting to 0.\n";
--      }
--      Beta = 0;
--    }
--#if 0
--    if (mean_obs == 0.0f){
--      std::cout << PI << ' ' << shadow_density_(i,j) << ' '
--               << pre << ' ' << vis << ' ' << Beta_denom_(i,j)
--               << ' ' << Beta << '\n';
--    }
--#endif
--    aux_val.Beta_ += Beta * seg_len;
--    //New discrete probability computations
--    float PQ_prior = 1.0f - std::exp(-alpha_l);
--    float PQ_post = Beta*PQ_prior;
--    if (PQ_post>=0.999f) PQ_post = 0.999f;
--    //         v------note minus sign
--    float lg = -std::log(1.0f-PQ_post);
--    aux_val.log_sum_ += lg;
--    //End of new discrete probability calculations
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--  float shadow_prior_;
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& Beta_denom_;
--
--  //vil_image_view<float> const& pre_inf_;
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--  vil_image_view<float> shadow_density_;
--};
--
--template <class T_loc, class T_data>
--void boxm_initial_shadow_sampler_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                    vpgl_camera_double_sptr cam,
--                                    vil_image_view<typename T_data::obs_datatype> &obs,
--                                    std::string iname)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"Collect Observations"<<std::endl;
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--    std::cout<<"Samples collected\n"<<std::endl;
--}
--
--template <class T_loc, class T_data>
--void boxm_generate_shadow_sample_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                    vpgl_camera_double_sptr cam,
--                                    vil_image_view<typename T_data::obs_datatype> &obs,
--                                    std::string iname,
--                                    float shadow_prior,
--                                    float shadow_mean,
--                                    float shadow_sigma,
--                                    bool black_background = false)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,iname, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type,sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0,T_loc, T_data, sample_datatype> raytracer_0(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 0"<<std::endl;
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--
--    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--    boxm_raytrace_function<pass_1,T_loc, T_data, sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cout<<"PASS 1"<<std::endl;
--    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--    raytracer_1.run(pass_1_functor);
--
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--
--
--    if (black_background) {
--        std::cout << "using black background model" << std::endl;
--        typename T_data::obs_datatype black(0.0f);
--        float background_std_dev = 8.0f/255;//???????????? 4/255 Vishal's
--        typename T_data::apm_datatype background_apm(black, background_std_dev,1.0f);
--
--        float peak=T_data::apm_processor::expected_color(background_apm);
--        std::cout<<"Peak: "<<peak<<std::endl;
--        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--        for (; img_it != obs.end(); ++img_it, ++PI_it) {
--            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
--        }
--    }
--    else {
--        PI_inf.fill(1.0f);
--    }
--
--    vil_image_view<float> inf_term(obs.ni(), obs.nj());
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--    vil_image_view<float> Beta_denom_img(obs.ni(), obs.nj());
--    vil_math_image_sum<float,float,float>(pre_inf,inf_term,Beta_denom_img);
--
--    boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
--    vil_image_view<float> shadow_density(obs.ni(), obs.nj());
--    for (unsigned j=0; j<obs.nj(); ++j)
--      for (unsigned i=0; i<obs.ni(); ++i)
--      {
--        float sh_density =
--          boxm_simple_grey_processor::prob_density(shadow_dist, obs(i,j));
--        sh_density *=2.0f;//if Gaussian centered at 0
--        shadow_density(i,j) = sh_density*shadow_prior;
--        Beta_denom_img(i,j) *= (1.0f-shadow_prior);
--        Beta_denom_img(i,j) += shadow_density(i,j);
--      }
--
--#if 0
--    vil_save(vis_inf, "E:/ShadowSite/vis_inf.tiff");
--    vil_save(pre_inf, "E:/ShadowSite/pre_inf.tiff");
--    vil_save(Beta_denom_img, "E:/ShadowSite/Beta_denom_img.tiff");
--    vil_save(pass_1_functor.alpha_integral_, "E:/tests/capitol/alpha_integr.tiff");
--#endif
--    std::cout<<"PASS 2"<<std::endl;
--    typedef boxm_generate_shadow_sample_functor_pass_2<T_data::apm_type, sample_datatype> pass_2;
--    boxm_raytrace_function<pass_2,T_loc, T_data, sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    pass_2 pass_2_functor(obs,Beta_denom_img, shadow_prior, shadow_density);
--    raytracer_2.run(pass_2_functor);
--
--    //aux_scene.clean_scene();
--    std::cout<<"DONE."<<std::endl;
--}
--
--#endif // boxm_generate_shadow_sample_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
-deleted file mode 100644
-index 0b7a1f34f7..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.h
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#ifndef boxm_opt2_bayesian_optimizer_h_
--#define boxm_opt2_bayesian_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_opt2_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_opt2_optimizer
--{
-- public:
--  boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                      std::vector<std::string>  image_ids);
--
--  ~boxm_opt2_optimizer()= default;
--
--  bool update();
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
-deleted file mode 100644
-index ae00724692..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt2_optimizer.hxx
-+++ /dev/null
-@@ -1,152 +0,0 @@
--#ifndef boxm_opt2_optimizer_hxx_
--#define boxm_opt2_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_opt2_optimizer.h"
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_opt2_optimizer<T_loc,APM,AUX>::boxm_opt2_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                        std::vector<std::string>  image_ids)
--                                                        : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_opt2_optimizer<T_loc,APM,AUX>::update()
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_opt2_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--      std::vector<float> pre_vector;
--      std::vector<float> vis_vector;
--      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector;
--
--      // UPDATE METHOD #1 : "OR" of occlusion probabilities
--      double log_pass_prob_sum = 0.0;
--      double weighted_seg_len_sum = 0.0;
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        const float obs_seg_len = aux_samples[s].seg_len_;
--        const float obs_weighted_seg_len = aux_samples[s].weighted_seg_len_sum_;
--
--        if (obs_seg_len > 1e-6) {
--          if (obs_weighted_seg_len > 1e-6) {
--            log_pass_prob_sum += aux_samples[s].log_pass_prob_sum_;
--            weighted_seg_len_sum += obs_weighted_seg_len;
--          }
--          // add observation and vis,pre to list
--          obs_vector.push_back(aux_samples[s].obs_ / obs_seg_len);
--          pre_vector.push_back(aux_samples[s].pre_ / obs_seg_len);
--          vis_vector.push_back(aux_samples[s].vis_ / obs_seg_len);
--        }
--      }
--      // update the occlusion density
--      if (weighted_seg_len_sum > 1e-6) {
--        data.alpha = (float)(-log_pass_prob_sum / weighted_seg_len_sum);
--      }
--
--      // do bounds check on new alpha value
--      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--      const float cell_len = float(cell_bb.width());
--      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--      if (data.alpha > max_alpha) {
--        data.alpha = max_alpha;
--      }
--      if (data.alpha < min_alpha) {
--        data.alpha = min_alpha;
--      }
--      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
--        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n';
--        //std::cerr << " log_alpha_sum = " << log_alpha_sum << ", n_actual_samples = " << n_actual_samples << '\n';
--      }
--      // update with new appearance
--      const float min_sigma = 0.02f;
--      boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, pre_vector, vis_vector, data.appearance_, min_sigma);
--
--      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_OPT2_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--  template class boxm_opt2_optimizer<T1,T2,T3 >
--
--#endif // boxm_opt2_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
-deleted file mode 100644
-index d19ab2d9f4..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.h
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#ifndef boxm_opt3_optimizer_h_
--#define boxm_opt3_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
--class boxm_opt3_optimizer
--{
-- public:
--  boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                      std::vector<std::string>  image_ids);
--
--  ~boxm_opt3_optimizer()= default;
--
--  bool optimize_cells();
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
-deleted file mode 100644
-index da5f7ba0fb..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt3_optimizer.hxx
-+++ /dev/null
-@@ -1,172 +0,0 @@
--#ifndef boxm_opt3_optimizer_hxx_
--#define boxm_opt3_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_opt3_optimizer.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--
--#include <vnl/vnl_random.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
--boxm_opt3_optimizer<T_loc,APM,AUX_APM>::boxm_opt3_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                            std::vector<std::string>  image_ids)
--                                                            : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_apm_type AUX_APM>
--bool boxm_opt3_optimizer<T_loc,APM,AUX_APM>::optimize_cells()
--{
--  constexpr unsigned int n_samples_per_obs = 10;
--
--  // get auxiliary scenes associated with each input image
--  typedef boxm_opt3_sample<AUX_APM> aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  typedef typename boxm_apm_traits<APM>::obs_datatype obs_t;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<float> vis_vector;
--  std::vector<obs_t> obs_vector;
--  vnl_random rand_gen;
--  std::vector<boxm_opt3_sample<AUX_APM> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        aux_samples.push_back(temp_cell.data());
--      }
--
--      vis_vector.clear();
--      obs_vector.clear();
--
--      double log_alpha_sum = 0.0;
--      unsigned int n_actual_observations = 0;
--
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        double total_seg_len = aux_samples[s].seg_len_sum_;
--
--        if (total_seg_len > 1e-6) {
--          ++n_actual_observations;
--          // compute mean vis
--          float obs_vis = (float)(aux_samples[s].weighted_vis_sum_ / total_seg_len);
--          // draw samples from obs_dist
--
--          for (unsigned int n=0; n<n_samples_per_obs; ++n) {
--            obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::sample(aux_samples[s].obs_dist_, rand_gen);
--            //obs_t obs_sample = boxm_apm_traits<AUX_APM>::apm_processor::expected_color(aux_samples[s].obs_dist_);
--            obs_vector.push_back(obs_sample);
--            vis_vector.push_back(obs_vis);
--          }
--          double alpha_s = -aux_samples[s].log_pass_prob_sum_ / total_seg_len;
--          log_alpha_sum += std::log(alpha_s);
--        }
--      }
--      float alpha_new = 0.0f;
--      if (n_actual_observations > 0) {
--        //std::cout << "cell IN " << data.alpha << ' ' << data.appearance_<< std::endl;
--        // compute new alpha value
--        alpha_new = (float)std::exp(log_alpha_sum / n_actual_observations);
--
--        // do bounds check on new alpha value
--        vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--        const float cell_len = float(cell_bb.width());
--        const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--        const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--        if (alpha_new > max_alpha) {
--          alpha_new = max_alpha;
--        }
--        if (alpha_new < min_alpha) {
--          alpha_new = min_alpha;
--        }
--        if (!((alpha_new >= min_alpha) && (alpha_new <= max_alpha)) ){
--          std::cerr << std::endl << "error: alpha_new = " << alpha_new << '\n'
--                   << "n_actual_observations = " << n_actual_observations << " log_alpha_sum = " << log_alpha_sum << '\n';
--          alpha_new = min_alpha;
--        }
--        else {
--          data.alpha = alpha_new;
--        }
--        // update with new appearance
--        //std::cout << obs_vector.size() << ' ' << std::endl;
--        if (obs_vector.size() != n_samples_per_obs * n_actual_observations) {
--          std::cerr << "error: n_samples_per_obs = " << n_samples_per_obs << " n_actual_observations = " << n_actual_observations << " obs_vector.size() " << obs_vector.size() << '\n';
--        }
--        boxm_apm_traits<APM>::apm_processor::compute_appearance(obs_vector, vis_vector, data.appearance_, 0.025f);
--        //std::cout << "cell OUT " << data.alpha << data.appearance_ << std::endl << std::endl;
--        cell->set_data(data);
--      }
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_OPT3_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--  template class boxm_opt3_optimizer<T1,T2,T3 >
--
--#endif // boxm_opt3_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
-deleted file mode 100644
-index c6f87c3817..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_appearance_estimator.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--#ifndef boxm_opt_appearance_estimator_h_
--#define boxm_opt_appearance_estimator_h_
--
--#include <vector>
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#if 0
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM>
--void boxm_opt_compute_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
--                                 std::vector<float> const& pre,
--                                 std::vector<float> const& vis,
--                                 typename boxm_apm_traits<APM>::apm_datatype &model)
--{
--  const float min_sigma=0.1f;
--  // initialize appearance model estimate using visibility probabilities as weights.
--  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,vis,model,min_sigma);
--#if 1
--  // use EM to refine estimate until convergence.
--  unsigned int nobs= obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  std::vector<float> obs_weights = vis;
--
--  const float epsilon = 1e-4f;
--  constexpr unsigned int max_its = 100;
--  const float min_weight_change = 1e-5f;
--  for (unsigned int i=0; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION
--    for (unsigned int n=0; n<nobs; ++n) {
--      // for each observation, assign probabilities to each of 3 possibilities
--      // P1: observation is generated by appearance model.
--      // P2: point is visible, but observation is generated by a point "behind" this one. (i.e. point is not on a surface)
--      // P3: point is not visible - observation is generated by a point "ahead" of this one.
--      const float P1 = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
--      const float P2 = 0.0f; //post_prob[n];
--      const float P3 = pre[n];
--      const float normalizing_factor = P1 + P2 + P3;
--      float new_obs_weight = 0;
--      if (normalizing_factor > epsilon) {
--        new_obs_weight = P1 / normalizing_factor;
--      }
--
--      // compute delta weight for convergence check
--      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
--      if (weight_delta > max_weight_change) {
--        max_weight_change = weight_delta;
--      }
--      obs_weights[n] = new_obs_weight;
--    }
--    // check for convergence
--    if (max_weight_change < min_weight_change) {
--#if 0
--    if (nobs > 1) {
--      std::cout << "EM converged in " << i << " iterations." << std::endl;
--      float total_prob = 0.0f;
--      for (unsigned int n=0; n<nobs; ++n) {
--        total_prob += obs_weights[n];
--      }
--      std::cout << "total prob for " << nobs << " observations = " << total_prob << std::endl
--               << "sigma = " << model.sigma() << ",  gauss_weight = " << model.gauss_weight() << std::endl;
--    }
--#endif
--      break;
--    }
--    // MAXIMIZATION
--    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_sigma);
--  }
--
--  // adjust model to account for small sample sizes.
--  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
--#endif
--  return;
--}
--
--#endif // boxm_opt_appearance_estimator_h_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
-deleted file mode 100644
-index 7275093568..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h
-+++ /dev/null
-@@ -1,36 +0,0 @@
--#ifndef boxm_opt_rt_bayesian_optimizer_h_
--#define boxm_opt_rt_bayesian_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_opt_rt_bayesian_optimizer
--{
-- public:
--  boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                 std::vector<std::string>  image_ids);
--
--  ~boxm_opt_rt_bayesian_optimizer()= default;
--
--  bool optimize_cells(double damping_factor);
--
-- protected:
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
-deleted file mode 100644
-index 10f61e8572..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx
-+++ /dev/null
-@@ -1,151 +0,0 @@
--#ifndef boxm_opt_rt_bayesian_optimizer_hxx_
--#define boxm_opt_rt_bayesian_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_opt_rt_bayesian_optimizer.h"
--#include "boxm_opt_appearance_estimator.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::boxm_opt_rt_bayesian_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                                              std::vector<std::string>  image_ids)
--: image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_opt_rt_bayesian_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD, APM);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        //boxm_opt_sample<typename boxm_apm_traits<APM>::obs_datatype> aux_cell = temp_cell.data();
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--
--      //boxm_sample<APM> &cell_data = cell_it->data();
--      std::vector<float> pre_vector(aux_samples.size());
--      std::vector<float> vis_vector(aux_samples.size());
--      //std::vector<float> post_prob_vector(aux_samples.size());
--      std::vector<typename boxm_apm_traits<APM>::obs_datatype> obs_vector(aux_samples.size());
--      double Beta = 1.0;
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        float seg_len = aux_samples[s].seg_len_;
--        if (seg_len > 1e-5) {
--          Beta *= (aux_samples[s].Beta_ / seg_len);
--          obs_vector[s] = aux_samples[s].obs_ / seg_len;
--          pre_vector[s] = aux_samples[s].pre_ / seg_len;
--          vis_vector[s] = aux_samples[s].vis_ / seg_len;
--          //post_prob_vector[s] = aux_samples[s].post_prob_ / seg_len;
--        }
--        else {
--          pre_vector[s] = 0.0f;
--          vis_vector[s] = 0.0f;
--          //post_prob_vector[s] = 0.0f;
--          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
--        }
--      }
--      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
--
--      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
--        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
--
--      data.alpha *= (float)damped_Beta;
--      // do bounds check on new alpha value
--      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--      const float cell_len = float(cell_bb.width());
--      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--      if (data.alpha > max_alpha) {
--        data.alpha = max_alpha;
--      }
--      if (data.alpha < min_alpha) {
--        data.alpha = min_alpha;
--      }
--      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
--        std::cerr << "\nerror: data.alpha = " << data.alpha << '\n'
--                 << "damped_Beta = " << damped_Beta << '\n';
--      }
--      // update with new appearance
--      boxm_opt_compute_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_);
--      //std::cout << "cell OUT " << data.alpha << data.appearence_ << std::endl << std::endl;
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--#ifdef DEBUG
--  std::cout << "done with all cells" << std::endl;
--#endif
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_OPT_RT_BAYESIAN_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--template class boxm_opt_rt_bayesian_optimizer<T1,T2,T3 >
--
--#endif // boxm_opt_rt_bayesian_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
-deleted file mode 100644
-index 0d50efd8a4..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_pre_infinity_functor.h
-+++ /dev/null
-@@ -1,67 +0,0 @@
--#ifndef boxm_pre_infinity_functor_h
--#define boxm_pre_infinity_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_pre_infinity_functor
--{
-- public:
--  //: "default" constructor
--  boxm_pre_infinity_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                            vil_image_view<float> &pre_inf, vil_image_view<float> &vis_inf)
--    : alpha_integral_(image.ni(),image.nj(),1), obs_(image), vis_img_(vis_inf), pre_img_(pre_inf)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute average intensity for the cell
--    const float mean_obs_ =aux_val.obs_/aux_val.seg_len_;
--    // compute appearance probability of observation
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(),mean_obs_); // aux_val.PI_;
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update pre
--    pre_img_(i,j) +=  PI * Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--  vil_image_view<float> alpha_integral_;
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> &pre_img_;
--};
--
--#endif // boxm_pre_infinity_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
-deleted file mode 100644
-index bfd4c3b08d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_depth_functor.h
-+++ /dev/null
-@@ -1,109 +0,0 @@
--#ifndef boxm_render_expected_depth_functor_h
--#define boxm_render_expected_depth_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--#include <vil/vil_transform.h>
--#include <vpgl/vpgl_camera.h>
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_depth_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_depth_functor(vil_image_view<float> &expected,
--                                     vil_image_view<float> &mask_vis,
--                                     vgl_point_3d<double> cam_center,
--                                     unsigned int ni,unsigned nj,
--                                     bool scene_read_only=false,
--                                     bool is_aux=true)
--  : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj,1), center_(cam_center)
--  {
--    alpha_integral_.fill(0.0f);
--    expected_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value, T_aux /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    const float depthexp = (float)(s1 - center_).length();
--#if 0
--    // compute appearance probability of observation
--    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
--#endif
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    expected_(i,j) += depthexp * Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float> &expected_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--  vgl_point_3d<double> center_;
--};
--
--
--//: Functor class to normalize expected image
--class normalize_expected_functor_depth_rt
--{
-- public:
--  normalize_expected_functor_depth_rt(float depth_max):depth_max_(depth_max) {}
--
--  void operator()(float mask, float &pix) const
--  {
--    pix += mask*depth_max_;
--  }
--
-- private:
--  float depth_max_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_depth_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vpgl_camera_double_sptr cam,
--                          vil_image_view<float> &expected,
--                          vil_image_view<float> &mask,
--                          int bin = -1,                      // FIXME - unused
--                          bool use_black_background = false) // FIXME - unused
--{
--  if (vpgl_perspective_camera<double> *pcam=dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--  {
--    typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data, boxm_rt_sample<sample_datatype> >::LOAD);
--
--    typedef boxm_render_expected_depth_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
--    boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
--    expfunctor exp_functor(expected,mask,pcam->camera_center(),expected.ni(),expected.nj(),true,false);
--    raytracer.run(exp_functor);
--
--    float max_depth=(float)boxm_utils::max_point_to_box_dist(scene.get_world_bbox(),pcam->camera_center());
--
--    normalize_expected_functor_depth_rt norm_fn(max_depth);
--    vil_transform2<float,float, normalize_expected_functor_depth_rt >(mask,expected,norm_fn);
--  }
--}
--
--#endif // boxm_render_expected_depth_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
-deleted file mode 100644
-index c210b8d20f..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_image_functor.h
-+++ /dev/null
-@@ -1,109 +0,0 @@
--#ifndef boxm_render_expected_edge_image_functor_h
--#define boxm_render_expected_edge_image_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <vnl/vnl_math.h>
--#include <vil/vil_transform.h>
--#include <sdet/sdet_img_edge.h>
--
--#ifdef DEBUG
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_edge_image_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_edge_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
--                                          vil_image_view<float> &mask_vis, // FIXME: unused...
--                                          unsigned int /*ni*/=0, unsigned /*nj*/=0,
--                                          bool scene_read_only=false,
--                                          bool is_aux=true)
--    : expected_(expected)
--  {
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    expected_.fill(nil);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> /*s0*/, // currently unused, see below
--                        vgl_point_3d<double> /*s1*/,
--                        boxm_edge_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    // compute segment length
--    //const float seg_len = (float)(s1-s0).length(); // FIXME: unused...
--
--    // TODO: revise with segment length
--    const float exp  = cell_value.edge_prob_;
--
--    // keep the max value in expected image
--    // if (expected_(i,j) < exp)
--    expected_(i,j) =  std::max(expected_(i,j), exp);
--
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
--};
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_expected_functor_edge
--{
-- public:
--  normalize_expected_functor_edge(float n_normal, unsigned int dof) : n_normal_(n_normal), dof_(dof)
--  {
--#ifdef DEBUG
--    std::cout << "Degrees of freedom: " << dof << std::endl;
--#endif
--  }
--
--  void operator()(float mask, float &pix) const
--  {
--    pix = sdet_img_edge::convert_edge_statistics_to_probability(pix,n_normal_,dof_);
--  }
--
--  float n_normal_;
--  unsigned int dof_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_edge_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                               vpgl_camera_double_sptr cam,
--                               vil_image_view<float> &expected,
--                               vil_image_view<float> & mask,
--                               float n_normal,
--                               unsigned int num_samples, //degrees of freedom
--                               int bin = -1) // FIXME - unused
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_aux_edge_sample<sample_datatype> >::LOAD);
--  typedef boxm_render_expected_edge_image_functor<BOXM_EDGE_FLOAT,sample_datatype > expfunctor;
--  boxm_raytrace_function<expfunctor,T_loc, T_data > raytracer(scene,cam.ptr(),expected.ni(),expected.nj());
--  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
--  raytracer.run(exp_functor);
--
--  normalize_expected_functor_edge<T_data> norm_fn(n_normal,num_samples-1);
--  vil_transform2<float,float, normalize_expected_functor_edge<T_data> >(mask,expected,norm_fn);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
-deleted file mode 100644
-index 17f8da724c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h
-+++ /dev/null
-@@ -1,126 +0,0 @@
--#ifndef boxm_render_expected_edge_tangent_image_functor_h
--#define boxm_render_expected_edge_tangent_image_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <vnl/vnl_math.h>
--#include <vil/vil_image_view.h>
--#include <sdet/sdet_img_edge.h>
--#include <vgl/vgl_distance.h>
--#ifdef DEBUG
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_edge_tangent_image_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_edge_tangent_image_functor(vil_image_view<float > &expected,
--                                                  vpgl_camera_double_sptr cam,
--                                                  //float threshold,
--                                                  unsigned int /*ni*/=0, unsigned /*nj*/=0,
--                                                  bool scene_read_only=false,
--                                                  bool is_aux=true)
--  : expected_(expected), num_obs_(expected.ni(),expected.nj()), cam_(cam), residual(1.0)
--  {
--    expected_.fill(1.0);
--    num_obs_.fill(0);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> /*s0*/, // FIXME - unused
--                        vgl_point_3d<double> /*s1*/, // FIXME - unused
--                        boxm_inf_line_sample<typename boxm_apm_traits<APM>::obs_datatype> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    //std::cout<< cell_value.residual_<<' ';
--#if 0
--    if (cell_value.residual_<residual) {
--      if (expected_(i,j) > cell_value.residual_)
--        expected_(i,j) = cell_value.residual_;
--    }
--#endif
--    if (cell_value.residual_<residual) {
--      if (expected_(i,j) > cell_value.residual_) {
--        double u1,v1,u2,v2;
--        vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
--        vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
--        cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
--        cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
--        vgl_point_2d<double> img_p1(u1,v1);
--        vgl_point_2d<double> img_p2(u2,v2);
--        double dist = length(img_p1-img_p2);
--        if (dist > 1.0)  // for img lines shorter than a pixel don't bother
--        {
--          double dist_to_seg = vgl_distance_to_linesegment<double>(u1, v1, u2, v2, i, j);
--          if (dist_to_seg <= 0.5) { // if the current pixel is less than 0.5 pixels closer to the projected line then mark it
--            expected_(i,j)=cell_value.residual_;
--          }
--        }
--      }
--    }
--#if 0
--    if (cell_value.num_obs_>2 && cell_value.residual_<residual && cell_value.num_obs_>num_obs_(i,j))
--    {
--      num_obs_(i,j)=cell_value.num_obs_;
--      double u1,v1,u2,v2;
--      vgl_point_3d<float>  p1=cell_value.line_clipped_.point1();
--      vgl_point_3d<float>  p2=cell_value.line_clipped_.point2();
--      cam_->project(p1.x(),p1.y(),p1.z(),u1,v1);
--      cam_->project(p2.x(),p2.y(),p2.z(),u2,v2);
--      if ((u1-u2)==0 && v1-v2==0)
--      {
--        expected_(i,j,0)=-1;
--        expected_(i,j,1)=-1;
--        expected_(i,j,2)=-1;
--      }
--      else
--      {
--        expected_(i,j,0)=float(u1+u2)/2;
--        expected_(i,j,1)=float(v1+v2)/2;
--        expected_(i,j,2)=float(vnl_math::angle_0_to_2pi(std::atan2(v2-v1,u2-u1)));
--      }
--    }
--#endif // 0
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<float > &expected_;
--  vil_image_view<unsigned> num_obs_;
--  vpgl_camera_double_sptr cam_;
--  float residual;
--};
--
--template <class T_loc, class T_data>
--void boxm_render_edge_tangent_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                       vpgl_camera_double_sptr cam,
--                                       vil_image_view<float> &expected)
--                                     //  float n_normal, // FIXME - unused
--                                     //  unsigned int num_samples, // FIXME - unused
--                                     //  float threshold) // degrees of freedom
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_edge_tangent_sample<sample_datatype> >::LOAD);
--  typedef boxm_render_expected_edge_tangent_image_functor<BOXM_EDGE_LINE,sample_datatype > expfunctor;
--  boxm_raytrace_function<expfunctor,T_loc, T_data> raytracer(scene, cam.ptr(),expected.ni(),expected.nj());
--  expfunctor exp_functor(expected,cam,/*threshold,*/expected.ni(),expected.nj(),true,false);
--  raytracer.run(exp_functor);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
-deleted file mode 100644
-index 51a2c930ce..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_image_functor.h
-+++ /dev/null
-@@ -1,103 +0,0 @@
--#ifndef boxm_render_expected_image_functor_h
--#define boxm_render_expected_image_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <vil/vil_transform.h>
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_render_expected_image_functor
--{
-- public:
--  //: "default" constructor
--  boxm_render_expected_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
--                                     vil_image_view<float> &mask_vis,
--                                     unsigned int ni,unsigned nj,
--                                     bool scene_read_only=false,bool is_aux=true)
--    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
--  {
--    alpha_integral_.fill(0.0f);
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    expected_.fill(nil);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value,
--                        T_aux /*aux_val*/)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    expected_(i,j) +=  exp* Omega;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_expected_functor_rt
--{
-- public:
--  normalize_expected_functor_rt(bool use_black_background) : use_black_background_(use_black_background) {}
--
--  void operator()(float mask, typename T_data::obs_datatype &pix) const
--  {
--    if (!use_black_background_) {
--      pix += mask*0.5f;
--    }
--  }
--  bool use_black_background_;
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vpgl_camera_double_sptr cam,
--                          vil_image_view<typename T_data::obs_datatype> &expected,
--                          vil_image_view<float> & mask,
--                          int /*bin*/ = -1,
--                          bool use_black_background = false)
--{
--  typedef boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_NULL>::storage_subdir(), boxm_aux_scene<T_loc, T_data,boxm_rt_sample<sample_datatype> >::LOAD);
--  typedef boxm_render_expected_image_functor<T_data::apm_type,boxm_rt_sample<sample_datatype> > expfunctor;
--  boxm_raytrace_function<expfunctor,T_loc, T_data,boxm_rt_sample<sample_datatype> > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
--  expfunctor exp_functor(expected,mask,expected.ni(),expected.nj(),true,false);
--  raytracer.run(exp_functor);
--
--  normalize_expected_functor_rt<T_data> norm_fn(use_black_background);
--  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_rt<T_data> >(mask,expected,norm_fn);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
-deleted file mode 100644
-index acbde275c3..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_render_expected_shadow_image_functor.h
-+++ /dev/null
-@@ -1,120 +0,0 @@
--#ifndef boxm_render_expected_shadow_image_functor_h
--#define boxm_render_expected_shadow_image_functor_h
--//:
--// \file
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_aux_scene.h>
--
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <vil/vil_transform.h>
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_render_expected_shadow_image_functor
--{
-- public:
--  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
--  //: "default" constructor
--  boxm_render_expected_shadow_image_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected,
--                                            vil_image_view<float> &mask_vis,
--                                            unsigned int ni,unsigned nj,
--                                            bool scene_read_only=false,bool is_aux=true)
--    : expected_(expected), vis_img_(mask_vis), alpha_integral_(ni,nj, 1)
--  {
--    alpha_integral_.fill(0.0f);
--    typename boxm_apm_traits<APM>::obs_datatype nil(0);
--    expected_.fill(nil);
--    vis_img_.fill(1.0f);
--    scene_read_only_=scene_read_only;
--    is_aux_=is_aux;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j,
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> &cell_value,
--                        T_aux& aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    const float exp  = boxm_apm_traits<APM>::apm_processor::expected_color(cell_value.appearance());
--
--    //compute sun visibility
--    float length_sum = aux_val.seg_len_;
--    float avg_sun_vis = 1.0f;
--    if (length_sum>0.0f)
--      avg_sun_vis = aux_val.vis_/length_sum;
--
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // and update expected image
--    expected_(i,j) +=  exp * Omega * avg_sun_vis;
--    // update visibility probability
--    vis_img_(i,j) = vis_prob_end;
--    return true;
--  }
--
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &expected_;
--  vil_image_view<float> &vis_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_shadow_functor
--{
-- public:
--
--  normalize_shadow_functor(bool use_black_background)
--    {use_black_background_ = use_black_background;}
--
--  void operator()(float mask, typename T_data::obs_datatype &pix) const
--  {
--    if (!use_black_background_) {
--      pix += mask*0.5f;
--    }
--  }
--  bool use_black_background_;
--};
--
--
--template <class T_loc, boxm_apm_type APM ,  boxm_aux_type AUX>
--void boxm_render_shadow_image_rt(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                 std::string const& aux_scene_id,
--                                 vpgl_camera_double_sptr cam,
--                                 vil_image_view<typename boxm_sample<APM>::obs_datatype> &expected,
--                                 vil_image_view<float> & mask,
--                                 bool use_black_background = false)
--{
--  typedef boxm_sample<APM> T_data;
--  typedef typename boxm_aux_traits<AUX>::sample_datatype T_aux;
--  boxm_aux_scene<T_loc, T_data, T_aux> aux_scene(&scene, aux_scene_id, boxm_aux_scene<T_loc, T_data, T_aux>::LOAD);
--
--  typedef boxm_render_expected_shadow_image_functor<T_loc, APM, AUX > exp_funct;
--
--  boxm_raytrace_function<exp_funct, T_loc, T_data, T_aux > raytracer(scene,aux_scene,cam.ptr(),expected.ni(),expected.nj());
--  exp_funct expf(expected,mask,expected.ni(),expected.nj(),true,true);
--  raytracer.run(expf);
--
--  normalize_shadow_functor<T_data> norm_fn(use_black_background);
--  vil_transform2<float,typename T_data::obs_datatype, normalize_shadow_functor<T_data> >(mask,expected,norm_fn);
--
--  //  aux_scene.clean_scene();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h b/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
-deleted file mode 100644
-index 78df79d9c4..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_rpc_registration.h
-+++ /dev/null
-@@ -1,447 +0,0 @@
--#ifndef boxm_rpc_registration_h_
--#define boxm_rpc_registration_h_
--//:
--// \file
--// This part contains the correction rpc camera parameters using the expected
--// edge image obtained from the world (scene) and edge map of the current image.
--// if the camera parameters are manually corrected by the user, this part should
--// be omitted by setting the "rpc_correction_flag" parameter to 0 (false) in the
--// boxm_rpc_registration_process.
--//
--// \author Ibrahim Eden
--// \date   Jan, 2009
--//
--// \verbatim
--//  Modifications
--//     Feb 1st, 2010 Gamze Tunali
--//         This piece of code is moved from bvxm_rpc_registration process to this file
--//         as a standalone function to be used in boxm/opt/boxm_rpc_registration_process
--// \endverbatim
--
--
--#include <iostream>
--#include <fstream>
--#include <limits>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--#include <vpgl/algo/vpgl_backproject.h>
--#include <vpgl/vpgl_lvcs.h>
--
--#include <brip/brip_vil_float_ops.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vil/vil_image_view.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--int convert_uncertainty_from_meters_to_pixels(float uncertainty,
--                                              vpgl_lvcs lvcs,
--                                              vpgl_camera_double_sptr camera)
--{
--  // estimate the offset search size in the image space
--  vgl_box_3d<double> box_uncertainty(-uncertainty,-uncertainty,-uncertainty,uncertainty,uncertainty,uncertainty);
--  std::vector<vgl_point_3d<double> > box_uncertainty_corners = boxm_utils::corners_of_box_3d(box_uncertainty);
--  vgl_box_2d<double> roi_uncertainty;
--
--  for (auto curr_corner : box_uncertainty_corners) {
--    vgl_point_3d<double> curr_pt;
--    if (camera->type_name()=="vpgl_local_rational_camera") {
--      curr_pt.set(curr_corner.x(),curr_corner.y(),curr_corner.z());
--    }
--    else if (camera->type_name()=="vpgl_rational_camera") {
--      double lon, lat, gz;
--      lvcs.local_to_global(curr_corner.x(), curr_corner.y(), curr_corner.z(),
--                           vpgl_lvcs::wgs84, lon, lat, gz, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--      curr_pt.set(lon, lat, gz);
--    }
--    else // dummy initialisation, to avoid compiler warning
--      curr_pt.set(-1e99, -1e99, -1.0);
--
--    double curr_u,curr_v;
--    camera->project(curr_pt.x(),curr_pt.y(),curr_pt.z(),curr_u,curr_v);
--    vgl_point_2d<double> p2d_uncertainty(curr_u,curr_v);
--    roi_uncertainty.add(p2d_uncertainty);
--  }
--
--  return vnl_math::ceil(0.5*std::max(roi_uncertainty.width(),roi_uncertainty.height()));
--}
--
--template<class T_loc, class T_data>
--bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
--                           vil_image_view<vxl_byte> edge_image,
--                           vil_image_view<vxl_byte> expected_edge_image,
--                           vpgl_camera_double_sptr camera,
--                           vpgl_camera_double_sptr camera_out,
--                           bool rpc_shift_3d_flag,
--                           float uncertainty,
--                           float n_normal, // FIXME - unused
--                           unsigned num_observations)
--{
--  double max_prob = std::numeric_limits<double>::min();
--  unsigned int best_offset_u = 0, best_offset_v = 0;
--
--  typedef boct_tree<T_loc,T_data> tree_type;
--  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--
--  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
--  int ni = edge_image.ni();
--  int nj = edge_image.nj();
--
--  // this is the two level offset search algorithm
--  int offset_lower_limit_u = -offset_search_size;
--  int offset_lower_limit_v = -offset_search_size;
--  int offset_upper_limit_u =  offset_search_size;
--  int offset_upper_limit_v =  offset_search_size;
--  std::cout << "Estimating image offsets:" << std::endl;
--  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
--    std::cout << '.';
--    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
--      // for each offset pair (u,v)
--      double prob = 0.0;
--      double norm = 0.0;
--      // find the total probability of the edge image given the expected edge image
--      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
--        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
--          if (edge_image(m,n)==255) {
--            prob += expected_edge_image(m-u,n-v);
--          }
--          norm += expected_edge_image(m-u,n-v);
--        }
--      }
--
--      if (norm>0.0)
--          prob/=norm;
--
--      // if maximum is found
--      if (prob > max_prob) {
--        max_prob = prob;
--        best_offset_u = u;
--        best_offset_v = v;
--      }
--    }
--  }
--  std::cout << std::endl;
--
--  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
--  // local variables
--  std::ifstream file_inp;
--  std::ofstream file_out;
--  file_out.clear();
--  file_out.open("offsets.txt",std::ofstream::app);
--  file_out << best_offset_u << ' ' << best_offset_v << '\n';
--  file_out.close();
--
--  double nlx=0.f,nly=0.f,nlz=0.f;
--  double motion_mult = 0.0;
--  if (rpc_shift_3d_flag)
--  {
--    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
--
--    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
--    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
--
--    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
--    vgl_point_3d<double> init_point(0.0,0.0,0.001);
--    vgl_point_3d<double> world_point;
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
--
--    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
--    motion_plane_normal = normalize(motion_plane_normal);
--    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
--
--    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
--    vgl_point_3d<double> moved_origin;
--    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
--
--    vgl_vector_3d<double> motion = moved_origin - origin_3d;
--
--    motion_mult = 1.0/((double)(num_observations+1));
--    motion = motion*motion_mult;
--
--    double lx,ly,lz;
--    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
--    lx = rpc_origin.x();
--    ly = rpc_origin.y();
--    lz = rpc_origin.z();
--
--    lx = lx*(1.0f-(double)motion_mult);
--    ly = ly*(1.0f-(double)motion_mult);
--    lz = lz*(1.0f-(double)motion_mult);
--
--    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
--    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
--
--    nlx = (double)pt_3d_updated.x();
--    nly = (double)pt_3d_updated.y();
--    nlz = (double)pt_3d_updated.z();
--
--    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
--    scene->set_rpc_origin(new_rpc_origin);
--  }
--
--  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
--  // the following block of code takes care of different input camera types
--  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
--  bool is_local_cam = true;
--  bool is_rational_cam = true;
--  vpgl_local_rational_camera<double> *cam_inp_local;
--  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
--    is_local_cam = false;
--  }
--  vpgl_rational_camera<double> *cam_inp_rational;
--  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
--    is_rational_cam = false;
--  }
--
--  if (is_local_cam) {
--    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
--    double offset_u,offset_v;
--    cam_out_local.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_local.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
--  }
--  else if (is_rational_cam) {
--    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
--    double offset_u,offset_v;
--    cam_out_rational.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_rational.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
--  }
--  else {
--    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
--    return false;
--  }
--
--  return true;
--}
--
--
--template<class T_loc, class T_data>
--bool boxm_rpc_registration(boxm_scene_base_sptr scene_base,//<boct_tree<T_loc, T_data > &scene,
--                           vil_image_view<float> edge_image,
--                           vil_image_view<float > expected_edge_image,
--                           vpgl_camera_double_sptr camera,
--                           vpgl_camera_double_sptr camera_out,
--                           bool rpc_shift_3d_flag,
--                           float uncertainty,
--                           unsigned num_observations)
--{
--  double max_cost = std::numeric_limits<double>::max();
--  unsigned int best_offset_u = 0, best_offset_v = 0;
--  double subpixel_best_offset_u = 0.0, subpixel_best_offset_v = 0.0;
--
--  typedef boct_tree<T_loc,T_data> tree_type;
--  boxm_scene<tree_type> *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--
--  int offset_search_size = convert_uncertainty_from_meters_to_pixels(uncertainty, scene->lvcs(), camera);
--  int ni = edge_image.ni();
--  int nj = edge_image.nj();
--
--  std::cout<<ni<<','<<nj<<','<<expected_edge_image.ni()<<','<<expected_edge_image.nj();
--  // this is the two level offset search algorithm
--  int offset_lower_limit_u = -offset_search_size;
--  int offset_lower_limit_v = -offset_search_size;
--  int offset_upper_limit_u =  offset_search_size;
--  int offset_upper_limit_v =  offset_search_size;
--  std::cout << "Estimating image offsets:" << std::endl;
--  for (int u=offset_lower_limit_u; u<=offset_upper_limit_u; u++) {
--    std::cout << '.';
--    for (int v=offset_lower_limit_v; v<=offset_upper_limit_v; v++) {
--      // for each offset pair (u,v)
--      double cost = 0.0;
--      double norm = 0.0;
--      // find the total probability of the edge image given the expected edge image
--      for (int m=offset_search_size+1; m<ni-offset_search_size-1; m++) {
--        for (int n=offset_search_size+1; n<nj-offset_search_size-1; n++) {
--          if (edge_image(m,n,0)>-1 && edge_image(m,n,1)>-1 && edge_image(m,n,2)>-1) {
--            if (expected_edge_image(m-u,n-v,0)>0 && expected_edge_image(m-u,n-v,1)>0 && expected_edge_image(m-u,n-v,2)>0) {
--            //std::cout<<'.';
--            float sintheta1=std::sin(edge_image(m,n,2));
--            float costheta1=std::cos(edge_image(m,n,2));
--
--            float sintheta2=std::sin(expected_edge_image(m-u,n-v,2));
--            float costheta2=std::cos(expected_edge_image(m-u,n-v,2));
--#if 0
--            float dx=expected_edge_image(m-u,n-v,0)+u-edge_image(m,n,0);
--            float dy=expected_edge_image(m-u,n-v,1)+v-edge_image(m,n,1);
--
--            float dist=std::sqrt(dx*dx+dy*dy);
--            if (dist<min_dist)
--              min_dist=dist;
--
--            float dist1=std::sqrt((dx*sintheta1*sintheta1+dy*sintheta1*costheta1)*(dx*sintheta1*sintheta1+dy*sintheta1*costheta1)
--                                +(dy*costheta1*costheta1+dx*sintheta1*costheta1)*(dy*costheta1*costheta1+dx*sintheta1*costheta1));
--            float dist2=std::sqrt((dx*sintheta2*sintheta2+dy*sintheta2*costheta2)*(dx*sintheta2*sintheta2+dy*sintheta2*costheta2)
--                                +(dy*costheta2*costheta2+dx*sintheta2*costheta2)*(dy*costheta2*costheta2+dx*sintheta2*costheta2));
--            if ((dist1+dist2)/2<min_dist)
--              min_dist=(dist1+dist2)/2;
--#endif // 0
--            float dist=(1-std::fabs(sintheta1*sintheta2+costheta2*costheta1));//+std::sqrt(dx*dx+dy*dy);
--            cost += dist;//(dist1+dist2)/2;
--          }
--          else
--          {
--            cost+=0.5;
--          }
--          norm += 1;
--        }
--      }
--    }
--
--    if (norm>0.0)
--        cost/=norm;
--
--      //std::cout<<cost<<"u "<<u<<" v"<<v<<'\n';
--      // if maximum is found
--      if (cost < max_cost) {
--        max_cost = cost;
--        best_offset_u = u;
--        best_offset_v = v;
--      }
--    }
--  }
--  std::cout << "Estimated changes in offsets (u,v)=(" << best_offset_u << ',' << best_offset_v << ')' << std::endl;
--  double subpixel_offset_limit=0.5;
--  max_cost = std::numeric_limits<double>::max();
--  for (double u=-subpixel_offset_limit; u<=subpixel_offset_limit; ) {
--    std::cout << '.';
--    for (double v=-subpixel_offset_limit; v<=subpixel_offset_limit; ) {
--      // for each offset pair (u,v)
--      double cost = 0.0;
--      // find the total probability of the edge image given the expected edge image
--      for (int m=offset_search_size; m<ni-offset_search_size; m++) {
--        for (int n=offset_search_size; n<nj-offset_search_size; n++) {
--          if (edge_image(m,n,0)!=-1 || edge_image(m,n,1)!=-1 || edge_image(m,n,2)!=-1) {
--            if (expected_edge_image(m-best_offset_u,n-best_offset_v,0)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,1)>0 && expected_edge_image(m-best_offset_u,n-best_offset_v,2)>0) {
--              double dx=expected_edge_image(m-best_offset_u,n-best_offset_v,0)+best_offset_u+u-edge_image(m,n,0);
--              double dy=expected_edge_image(m-best_offset_u,n-best_offset_v,1)+best_offset_v+v-edge_image(m,n,1);
--              double dist=std::sqrt(dx*dx+dy*dy);
--              cost += dist;
--            }
--          }
--        }
--      }
--      //std::cout<<cost<<' ';
--      if (cost < max_cost) {
--          max_cost = cost;
--          subpixel_best_offset_u = (double)u;
--          subpixel_best_offset_v = (double)v;
--      }
--
--      v=v+0.05;
--    }
--    u+=0.05;
--  }
--  std::cout << "Estimated changes in offsets (u,v)=(" << subpixel_best_offset_u << ',' << subpixel_best_offset_v << ')' << std::endl;
--
--  // local variables
--  std::ifstream file_inp;
--  std::ofstream file_out;
--  file_out.clear();
--  file_out.open("offsets.txt",std::ofstream::app);
--  file_out << best_offset_u +subpixel_best_offset_u<< ' ' << best_offset_v+subpixel_best_offset_v << '\n';
--  file_out.close();
--
--  double nlx=0.f,nly=0.f,nlz=0.f;
--  double motion_mult = 0.0;
--  if (rpc_shift_3d_flag)
--  {
--    vpgl_local_rational_camera<double> *cam_input_temp = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr());
--
--    vgl_point_3d<double> origin_3d(0.0,0.0,0.0);
--    vgl_point_2d<double> origin_2d = cam_input_temp->project(origin_3d);
--
--    vgl_plane_3d<double> curr_plane(0.0,0.0,1.0,-0.001);
--    vgl_point_3d<double> init_point(0.0,0.0,0.001);
--    vgl_point_3d<double> world_point;
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d,curr_plane,init_point,world_point);
--
--    vgl_vector_3d<double> motion_plane_normal = world_point - origin_3d;
--    motion_plane_normal = normalize(motion_plane_normal);
--    vgl_plane_3d<double> motion_plane(motion_plane_normal,origin_3d);
--
--    init_point.set(origin_3d.x(),origin_3d.y(),origin_3d.z());
--    vgl_point_3d<double> moved_origin;
--    vgl_point_2d<double> origin_2d_shift(origin_2d.x()+best_offset_u,origin_2d.y()+best_offset_v);
--    vpgl_backproject::bproj_plane(cam_input_temp,origin_2d_shift,motion_plane,init_point,moved_origin);
--
--    vgl_vector_3d<double> motion = moved_origin - origin_3d;
--
--    motion_mult = 1.0/((double)(num_observations+1));
--    motion = motion*motion_mult;
--
--    double lx,ly,lz;
--    vgl_point_3d<double> rpc_origin = scene->rpc_origin();
--    lx = rpc_origin.x();
--    ly = rpc_origin.y();
--    lz = rpc_origin.z();
--
--    lx = lx*(1.0f-(double)motion_mult);
--    ly = ly*(1.0f-(double)motion_mult);
--    lz = lz*(1.0f-(double)motion_mult);
--
--    vgl_point_3d<double> pt_3d_est_vec(lx,ly,lz);
--    vgl_point_3d<double> pt_3d_updated = pt_3d_est_vec + motion;
--
--    nlx = (double)pt_3d_updated.x();
--    nly = (double)pt_3d_updated.y();
--    nlz = (double)pt_3d_updated.z();
--
--    vgl_point_3d<double> new_rpc_origin(nlx,nly,nlz);
--    scene->set_rpc_origin(new_rpc_origin);
--  }
--
--  // correct the output for (local) rational camera using the estimated offset pair (max_u,max_v)
--  // the following block of code takes care of different input camera types
--  //  e.g., vpgl_local_rational_camera and vpgl_rational_camera
--  bool is_local_cam = true;
--  bool is_rational_cam = true;
--  vpgl_local_rational_camera<double> *cam_inp_local;
--  if (!(cam_inp_local = dynamic_cast<vpgl_local_rational_camera<double>*>(camera.ptr()))) {
--    is_local_cam = false;
--  }
--  vpgl_rational_camera<double> *cam_inp_rational;
--  if (!(cam_inp_rational = dynamic_cast<vpgl_rational_camera<double>*>(camera.ptr()))) {
--    is_rational_cam = false;
--  }
--
--  if (is_local_cam) {
--    vpgl_local_rational_camera<double> cam_out_local(*cam_inp_local);
--    double offset_u,offset_v;
--    cam_out_local.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_local.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_local_rational_camera<double>(cam_out_local);
--  }
--  else if (is_rational_cam) {
--    vpgl_rational_camera<double> cam_out_rational(*cam_inp_rational);
--    double offset_u,offset_v;
--    cam_out_rational.image_offset(offset_u,offset_v);
--    offset_u += (best_offset_u*(1.0-motion_mult));
--    offset_v += (best_offset_v*(1.0-motion_mult));
--    cam_out_rational.set_image_offset(offset_u,offset_v);
--    camera_out = new vpgl_rational_camera<double>(cam_out_rational);
--  }
--  else {
--    std::cerr << "error: process expects camera to be a vpgl_rational_camera or vpgl_local_rational_camera.\n";
--    return false;
--  }
--
--  return true;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
-deleted file mode 100644
-index 0d4d93d05d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.h
-+++ /dev/null
-@@ -1,45 +0,0 @@
--#ifndef boxm_shadow_app_initializer_h_
--#define boxm_shadow_app_initializer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_shadow_app_initializer
--{
--public:
--
--  boxm_shadow_app_initializer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                              std::vector<std::string>  image_ids,
--                              float min_app_sigma,
--                              float shadow_prior,
--                              float shadow_mean, float shadow_sigma,
--                              bool verbose=false);
--
--  ~boxm_shadow_app_initializer()= default;
--
--  bool initialize();
--
--protected:
--
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  float min_app_sigma_;
--  float shadow_prior_;
--  float shadow_mean_;
--  float shadow_sigma_;
--  bool verbose_;
--};
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
-deleted file mode 100644
-index 22c469ec72..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_app_initializer.hxx
-+++ /dev/null
-@@ -1,122 +0,0 @@
--#ifndef boxm_shadow_app_initializer_hxx_
--#define boxm_shadow_app_initializer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_shadow_app_initializer.h"
--#include "boxm_shadow_appearance_estimator.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_shadow_app_initializer<T_loc,APM,AUX>::boxm_shadow_app_initializer(
--            boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--            std::vector<std::string>  image_ids, float min_app_sigma,
--            float shadow_prior, float shadow_mean, float shadow_sigma,
--            bool verbose)
--  : image_ids_(std::move(image_ids)), scene_(scene), min_app_sigma_(min_app_sigma),
--    shadow_prior_(shadow_prior), shadow_mean_(shadow_mean),
--    shadow_sigma_(shadow_sigma),verbose_(verbose)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_shadow_app_initializer<T_loc,APM,AUX>::initialize()
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      //std::cout << "cell IN " << data.alpha << data.appearence_<< std::endl;
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--            return false;
--        }
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
--      std::vector<obs_type> obs_vector;
--      for (unsigned int s=0; s<aux_samples.size(); ++s) {
--        float seg_len = aux_samples[s].seg_len_;
--        obs_type obs = aux_samples[s].obs_;
--        if ( seg_len > 1e-5 && (obs > obs_type(0)) ){
--          obs_vector.push_back(obs / seg_len);
--        }
--      }
--      unsigned n_obs = obs_vector.size();
--      if(n_obs>1){
--      std::vector<float> pre_vector(n_obs, 0.0f);
--      std::vector<float> vis_vector(n_obs, 1.0f);
--      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector,
--                                          vis_vector, data.appearance_,
--                                          min_app_sigma_, shadow_prior_,
--                                          shadow_mean_, shadow_sigma_,
--                                          verbose_);
--      cell->set_data(data);
--      }
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    iter++;
--  }
--  // clear the aux scenes
--  for (unsigned i=0; i<aux_scenes.size(); i++)
--    aux_scenes[i].clean_scene();
--  return true;
--}
--
--
--#define BOXM_SHADOW_APP_INITIALIZER_INSTANTIATE(T1,T2,T3) \
--template class boxm_shadow_app_initializer<T1,T2,T3 >
--
--#endif // boxm_shadow_app_initializer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
-deleted file mode 100644
-index 15dd5763ba..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_appearance_estimator.h
-+++ /dev/null
-@@ -1,114 +0,0 @@
--#ifndef boxm_shadow_appearance_estimator_h_
--#define boxm_shadow_appearance_estimator_h_
--
--#include <vector>
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#if 1
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--template <boxm_apm_type APM>
--void boxm_compute_shadow_appearance(std::vector<typename boxm_apm_traits<APM>::obs_datatype> const& obs,
--                                    std::vector<float> const& pre,
--                                    std::vector<float> const& vis,
--                                    typename boxm_apm_traits<APM>::apm_datatype &model,
--                                    float min_app_sigma,
--                                    float shadow_prior,
--                                    float shadow_mean, float shadow_sigma,
--                                    bool verbose = false)
--{
--  std::vector<float> obs_weights(vis.size(), 0.0f);
--  std::vector<float> sh_density(vis.size(), 0.0f);
--  //assume that the initial appearance distribution is uniform on [0 1]
--  //thus a reasonable initialization for weights is
--  //
--  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
--  //
--  //, where Psh is shadow_prior and psh(x) is the shadow density function,
--  // sh_density. vis is the visibilty probability
--  //
--  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
--  for(unsigned n = 0; n<obs.size(); ++n)
--    {
--      //2.0 x density since centered on zero
--      sh_density[n] =
--        2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
--      float neu = vis[n]*(1-shadow_prior);
--      float weight =
--        neu/(neu + sh_density[n]*shadow_prior);
--      obs_weights[n]=weight;
--    }
--  std::vector<float> initial_weights = obs_weights;
--  // initial estimate for the illuminated appearance model
--  boxm_apm_traits<APM>::apm_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
--  double initial_mean = model.color();
--  double initial_sigma = model.sigma();
--#if 1
--  // use EM to refine estimate until convergence.
--  unsigned int nobs= obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  const float epsilon = 1e-4f;
--  constexpr unsigned int max_its = 100;
--  const float min_weight_change = 1e-5f;
--  unsigned int i=0;
--  for (; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION - determine the weights
--    for (unsigned int n=0; n<nobs; ++n) {
--
--      float PI = vis[n] * boxm_apm_traits<APM>::apm_processor::prob_density(model,obs[n]);
--      float neu = PI*(1-shadow_prior);
--      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
--      float new_obs_weight = 0;
--      if (den > epsilon) {
--        new_obs_weight = neu / den;
--      }
--      // compute delta weight for convergence check
--      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
--      if (weight_delta > max_weight_change) {
--        max_weight_change = weight_delta;
--      }
--      obs_weights[n] = new_obs_weight;
--    }
--    // check for convergence
--    if (max_weight_change < min_weight_change)
--      break;
--    // MAXIMIZATION - determine the parameters of the appearance distribution
--    boxm_apm_traits<APM>::apm_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
--  }
--  if(verbose) {
--    bool print = false;
--    for(unsigned n = 0; n<obs.size(); ++n)
--      if(obs[n]>0) print = true;
--      if(i<max_its&&print){
--        std::cout << "converged after " << i << " iterations.\n";
--        std::cout << " initial mean = " << initial_mean << " final mean = "
--                 << model.color() << '\n';
--        std::cout << " initial sigma = " << initial_sigma << " final sigma = "
--                 << model.sigma() << '\n';
--      }else{ std::cout << "failed to converge\n";}
--
--      std::cout << "Initial (Observations, Weights):\n";
--      for(unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
--      std::cout << '\n';
--      std::cout << "Final (Observations, Weights):\n";
--      for(unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
--      std::cout << '\n';
--  }
--
--  // adjust model to account for small sample sizes.
--  boxm_apm_traits<APM>::apm_processor::finalize_appearance(obs,obs_weights,model);
--#endif
--  return;
--}
--
--#endif // boxm_shadow_appearance_estimator_h_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
-deleted file mode 100644
-index beaa3b2c7d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.h
-+++ /dev/null
-@@ -1,51 +0,0 @@
--#ifndef boxm_shadow_bayes_optimizer_h_
--#define boxm_shadow_bayes_optimizer_h_
--
--#include <vector>
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vgl/vgl_point_3d.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--
--template<class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--class boxm_shadow_bayes_optimizer
--{
--public:
--
--  boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                              std::vector<std::string>  image_ids,
--                              float min_app_sigma,
--                              float shadow_prior,
--                              float shadow_mean, float shadow_sigma,
--                              bool verbose=false,
--                              vgl_point_3d<double> debug_pt =
--                              vgl_point_3d<double>(0,0,0)
--                              );
--
--  ~boxm_shadow_bayes_optimizer()= default;
--
--  bool optimize_cells(double damping_factor);
--
--protected:
--
--  std::vector<std::string> image_ids_;
--
--  boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene_;
--
--  const float max_cell_P_;
--  const float min_cell_P_;
--  float min_app_sigma_;
--  float shadow_prior_;
--  float shadow_mean_;
--  float shadow_sigma_;
--  bool verbose_;
--  vgl_point_3d<double> debug_pt_;
--};
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx b/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
-deleted file mode 100644
-index a2d24ee683..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx
-+++ /dev/null
-@@ -1,195 +0,0 @@
--#ifndef boxm_shadow_bayes_optimizer_hxx_
--#define boxm_shadow_bayes_optimizer_hxx_
--
--#include <utility>
--#include <vector>
--#include <iostream>
--#include <string>
--#include "boxm_shadow_bayes_optimizer.h"
--#include "boxm_shadow_appearance_estimator.h"
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::boxm_shadow_bayes_optimizer(boxm_scene<boct_tree<T_loc, boxm_sample<APM> > > &scene,
--                                                                        std::vector<std::string>  image_ids, float min_app_sigma,
--                                                                        float shadow_prior, float shadow_mean, float shadow_sigma,
--                                                                        bool verbose, vgl_point_3d<double> debug_pt)
--  : image_ids_(std::move(image_ids)), scene_(scene), max_cell_P_(0.995f), min_cell_P_(0.0001f),
--    min_app_sigma_(min_app_sigma), shadow_prior_(shadow_prior),
--    shadow_mean_(shadow_mean), shadow_sigma_(shadow_sigma),
--    verbose_(verbose), debug_pt_(debug_pt)
--{}
--
--
--template <class T_loc, boxm_apm_type APM, boxm_aux_type AUX>
--bool boxm_shadow_bayes_optimizer<T_loc,APM,AUX>::optimize_cells(double damping_factor)
--{
--  // get auxiliary scenes associated with each input image
--  typedef typename boxm_aux_traits<AUX>::sample_datatype aux_type;
--
--  typedef boct_tree<T_loc, boxm_sample<APM> > tree_type;
--
--  std::vector<boxm_aux_scene<T_loc,  boxm_sample<APM>, aux_type> > aux_scenes;
--  for (unsigned int i=0; i<image_ids_.size(); ++i) {
--    boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type> aux_scene(&scene_,image_ids_[i],boxm_aux_scene<T_loc, boxm_sample<APM>, aux_type>::LOAD);
--    aux_scenes.push_back(aux_scene);
--  }
--
--  std::vector<boxm_rt_sample<typename boxm_apm_traits<APM>::obs_datatype> > aux_samples;
--
--  // for each block
--  boxm_block_iterator<tree_type> iter(&scene_);
--  iter.begin();
--  while (!iter.end())
--  {
--    scene_.load_block(iter.index());
--    boxm_block<tree_type>* block = *iter;
--    boct_tree<T_loc, boxm_sample<APM> >* tree = block->get_tree();
--    boct_tree_cell<T_loc,boxm_sample<APM> >* debug_cell  = nullptr;
--    if (verbose_)
--      debug_cell = tree->locate_point_global(debug_pt_);
--    std::vector<boct_tree_cell<T_loc,boxm_sample<APM> >*> cells = tree->leaf_cells();
--
--    // get a vector of incremental readers for each aux scene.
--    std::vector<boct_tree_cell_reader<T_loc, aux_type>* > aux_readers(aux_scenes.size());
--    for (unsigned int i=0; i<aux_scenes.size(); ++i) {
--      aux_readers[i] = aux_scenes[i].get_block_incremental(iter.index());
--    }
--    // iterate over cells
--    for (unsigned i=0; i<cells.size(); ++i)
--    {
--      aux_samples.clear();
--      boct_tree_cell<T_loc,boxm_sample<APM> >* cell = cells[i];
--      boxm_sample<APM> data = cell->data();
--      for (unsigned j=0; j<aux_readers.size(); j++) {
--        boct_tree_cell<T_loc, aux_type> temp_cell;
--
--        if (!aux_readers[j]->next(temp_cell)) {
--          std::cerr << "error: incremental reader returned false.\n";
--          return false;
--        }
--        if (!temp_cell.code_.isequal(&(cell->code_))) {
--          std::cerr << "error: temp_cell idx does not match cell idx.\n";
--          return false;
--        }
--        if (temp_cell.data().seg_len_ > 0.0f) {
--          aux_samples.push_back(temp_cell.data());
--        }
--      }
--      unsigned n_samp = aux_samples.size();
--      std::vector<float> pre_vector(n_samp);
--      std::vector<float> vis_vector(n_samp);
--      // new discrete probability code
--      float log_sum = 0.0f;
--      float total_length_sum = 0.0f;
--      //===
--      typedef typename boxm_apm_traits<APM>::obs_datatype obs_type;
--      std::vector<obs_type> obs_vector(n_samp);
--//#if 0 // old beta calculation
--      double Beta = 1.0;
--//#endif
--      if (verbose_&&cell == debug_cell){
--        std::cout << "Contents of Debug Cell\n"
--                 << "s    vis[s]    pre[s]    beta[s]\n";
--      }
--      double vis_sum = 0;
--      for (unsigned int s=0; s<n_samp; ++s) {
--        float seg_len_sum = aux_samples[s].seg_len_;
--        obs_type obs = aux_samples[s].obs_;
--        if (seg_len_sum > 1e-5) {
--          obs_vector[s] = obs / seg_len_sum;
--          float pre = aux_samples[s].pre_ / seg_len_sum;
--          float vis = aux_samples[s].vis_ / seg_len_sum;
--          pre_vector[s] = pre;
--          vis_vector[s] = vis;
--
--//#if 0 // old beta calculation
--          double beta_s = (aux_samples[s].Beta_ / seg_len_sum);
--          Beta *= beta_s;
--//#else // New discrete prob code
--          log_sum += aux_samples[s].log_sum_;
--          total_length_sum += seg_len_sum;
--//#endif
--          // ====
--          if (cell == debug_cell)
--          {
--            std::cout << s << ' ' << vis << ' ' << pre << ' '
--                     << beta_s << '\n';
--          }
--        }
--        else {
--          pre_vector[s] = 0.0f;
--          vis_vector[s] = 0.0f;
--          obs_vector[s] = typename boxm_apm_traits<APM>::obs_datatype(0);
--        }
--      }
--      vis_sum /= n_samp;
--
--#if 0 // old beta calculation
--      double damped_Beta = 1.0;
--      if (n_samp>1.0){
--        damped_Beta = std::pow(Beta, 1.0/n_samp);
--      }
--#else
--      double damped_Beta = (Beta + damping_factor)/(damping_factor*Beta + 1.0);
--
--      if ((damped_Beta < 0.00000001) && (damped_Beta > -0.00000001))
--        std::cout << "ERROR: damped_Beta is:" << damped_Beta << std::endl;
--
--      data.alpha *= static_cast<float>(damped_Beta);
--
--      float alpha_post = data.alpha;
--      if (total_length_sum > 0.0f) alpha_post = log_sum/total_length_sum;
--      data.alpha = alpha_post;
--#endif
--      // do bounds check on new alpha value
--      vgl_box_3d<double> cell_bb = tree->cell_bounding_box(cell);
--      const float cell_len = float(cell_bb.width());
--      const float max_alpha = -std::log(1.0f - max_cell_P_)/cell_len;
--      const float min_alpha = -std::log(1.0f - min_cell_P_)/cell_len;
--      if (data.alpha > max_alpha) {
--        data.alpha = max_alpha;
--      }
--      if (data.alpha < min_alpha) {
--        data.alpha = min_alpha;
--      }
--      if (!((data.alpha >= min_alpha) && (data.alpha <= max_alpha)) ){
--        std::cerr << "\nerror: data.alpha = " << data.alpha << std::endl;
--      }
--      // update with new appearance
--      bool print_p = false;
--      if (verbose_&&cell == debug_cell){
--        std::cout << "Cell Level = " << cell->level()
--                 << "  AlphaPosterior  = " << data.alpha << '\n';
--        print_p = true;
--      }
--      boxm_compute_shadow_appearance<APM>(obs_vector, pre_vector, vis_vector, data.appearance_, min_app_sigma_, shadow_prior_, shadow_mean_, shadow_sigma_, print_p);
--      cell->set_data(data);
--    }
--    scene_.write_active_block();
--    for (unsigned int i=0; i<aux_readers.size(); ++i) {
--      aux_readers[i]->close();
--    }
--    ++iter;
--  }
--
--  // clear the aux scenes so that its starts with the refined scene next time
--  for (unsigned i=0; i<aux_scenes.size(); i++) {
--    aux_scenes[i].clean_scene();
--  }
--
--  return true;
--}
--
--
--#define BOXM_SHADOW_BAYES_OPTIMIZER_INSTANTIATE(T1,T2,T3) \
--template class boxm_shadow_bayes_optimizer<T1,T2,T3 >
--
--#endif // boxm_shadow_bayes_optimizer_hxx_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
-deleted file mode 100644
-index 798aac81a9..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_sun_vis_prob_functor.h
-+++ /dev/null
-@@ -1,103 +0,0 @@
--#ifndef boxm_sun_vis_prob_functor_h
--#define boxm_sun_vis_prob_functor_h
--//:
--//\file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include "boxm_pre_infinity_functor.h"
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <bpgl/algo/bpgl_camera_from_box.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_sun_vis_prob_functor
--{
-- public:
--  //: "default" constructor
--  boxm_sun_vis_prob_functor(unsigned sun_ni, unsigned sun_nj)
--  : sun_ni_(sun_ni), sun_nj_(sun_nj)
--  {
--    alpha_integral_ = vil_image_view<float>(sun_ni_, sun_nj_);
--    alpha_integral_.fill(0.0f);
--
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--
--    // accumulate segment length
--    aux_val.seg_len_ += seg_len;
--
--    // current sun visibility
--    const float sun_vis = std::exp(-alpha_integral_(i,j));
--
--    // update sun vis
--    aux_val.vis_ +=  sun_vis * seg_len;
--
--    // update alpha integral along sun ray i, j
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  unsigned sun_ni_;
--  unsigned sun_nj_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <class T_loc, class T_data, boxm_aux_type AUX_T>
--void boxm_sun_vis_prob(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                       vgl_vector_3d<double> sun_angle,
--                       std::string sun_occ_name)
--{
--  // scene bounding box
--  vgl_box_3d<double> world_bb = scene.get_world_bbox();
--  unsigned max_level = scene.max_level();
--  unsigned sun_ni = 1<<max_level;//twice as many
--  unsigned sun_nj = sun_ni;
--  vpgl_affine_camera<double> sun_cam =
--  bpgl_camera_from_box::affine_camera_from_box(world_bb, -sun_angle, sun_ni, sun_nj);
--
--  vpgl_camera_double_sptr cam = new vpgl_affine_camera<double> (sun_cam);
--
--  typedef typename boxm_aux_traits<AUX_T>::sample_datatype sample_datatype;
--  boxm_aux_scene<T_loc, T_data,  sample_datatype> aux_scene(&scene,sun_occ_name, boxm_aux_scene<T_loc, T_data,  sample_datatype>::CLONE);
--
--  std::cout<<"Sun visibility"<<std::endl;
--  // functor to accumulate sun visibility
--  typedef boxm_sun_vis_prob_functor<T_data::apm_type, sample_datatype> sun_vis;
--
--  // set up the raytrace function
--  boxm_raytrace_function<sun_vis,T_loc, T_data, sample_datatype> raytracer_vis(scene,aux_scene,cam.ptr(),sun_ni,sun_nj);
--
--  // construct the sun visibility functor need only sun ray space dimensions
--  sun_vis sun_vis_functor(sun_ni, sun_nj);
--
--  // run the functor over the octree
--  raytracer_vis.run(sun_vis_functor);
--  std::cout<<"Sun Occlusion Done."<<std::endl;
--}
--
--#endif // boxm_sun_vis_prob_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h b/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
-deleted file mode 100644
-index cc1567a545..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/boxm_update_image_functor.h
-+++ /dev/null
-@@ -1,172 +0,0 @@
--#ifndef boxm_update_image_functor_h
--#define boxm_update_image_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
--#include <vil/vil_math.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_update_image_functor_pass_2
--{
-- public:
--  //: "default" constructor
--  boxm_update_image_functor_pass_2(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& image,
--                                   vil_image_view<float> const& normalizing_img)
--  : obs_(image), norm_(normalizing_img), vis_img_(image.ni(),image.nj(),1), pre_img_(image.ni(),image.nj(),1), alpha_integral_(image.ni(),image.nj(),1)
--  {
--    alpha_integral_.fill(0.0f);
--    pre_img_.fill(0.0f);
--    vis_img_.fill(1.0f);
--    //only reads info from the scene
--    scene_read_only_=true;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1, boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    // compute segment length
--    const float seg_len = (float)(s1 - s0).length();
--    // compute appearance probability of observation
--    float mean_obs= aux_val.obs_/aux_val.seg_len_;
--    const float PI  = boxm_apm_traits<APM>::apm_processor::prob_density(cell_value.appearance(), mean_obs);
--    // update alpha integral
--    alpha_integral_(i,j) += cell_value.alpha * seg_len;
--
--    // compute new visibility probability with updated alpha_integral
--    const float vis_prob_end = std::exp(-alpha_integral_(i,j));
--    // compute weight for this cell
--    const float Omega = vis_img_(i,j) - vis_prob_end;
--    // update vis and pre
--    pre_img_(i,j) +=  PI * Omega;
--    vis_img_(i,j) = vis_prob_end;
--    aux_val.vis_+=seg_len*vis_img_(i,j);
--
--    if(norm_(i,j)>1e-10f)
--        aux_val.updatefactor_+=(((pre_img_(i,j)+vis_img_(i,j)*PI)/norm_(i,j))* seg_len);
--
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> const& obs_;
--  vil_image_view<float> const& norm_;
--  //vil_image_view<float> const& pre_inf_;
--  vil_image_view<float> vis_img_;
--  vil_image_view<float> pre_img_;
--  vil_image_view<float> alpha_integral_;
--};
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_update_image_functor_pass_3
--{
-- public:
--  //: default constructor
--  boxm_update_image_functor_pass_3()
--  {
--    //only reads info from the scene
--    scene_read_only_=false;
--    //needs to write aux
--    is_aux_=true;
--  }
--
--  inline bool step_cell(boxm_sample<APM> &cell_value, T_aux & aux_val)
--  {
--    if (aux_val.seg_len_>1e-10)
--    {
--      boxm_apm_traits<APM>::apm_processor::update(cell_value.appearance(),
--                                                  aux_val.obs_/aux_val.seg_len_,
--                                                  aux_val.vis_/aux_val.seg_len_);
--      cell_value.alpha*=(aux_val.updatefactor_/aux_val.seg_len_);
--      aux_val.seg_len_=0;
--      aux_val.obs_=0;
--      aux_val.vis_=0;
--      aux_val.updatefactor_=0.0;
--    }
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--};
--
--template <class T_loc, class T_data>
--void boxm_update_image_rt(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vpgl_camera_double_sptr cam,
--                          vil_image_view<typename T_data::obs_datatype> &obs,
--                          bool black_background = false)
--{
--    typedef boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype sample_datatype;
--    boxm_aux_scene<T_loc, T_data, sample_datatype > aux_scene(&scene,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::storage_subdir(), boxm_aux_scene<T_loc, T_data, sample_datatype>::CLONE);
--    typedef boxm_seg_length_functor<T_data::apm_type, sample_datatype>  pass_0;
--    boxm_raytrace_function<pass_0, T_loc, T_data, sample_datatype> raytracer_0(scene, aux_scene, cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PASS 0\n";
--    pass_0 pass_0_functor(obs,obs.ni(),obs.nj());
--    raytracer_0.run(pass_0_functor);
--
--    vil_image_view<float> pre_inf(obs.ni(),obs.nj(),1);
--    vil_image_view<float> vis_inf(obs.ni(),obs.nj(),1);
--
--    typedef boxm_pre_infinity_functor<T_data::apm_type,sample_datatype> pass_1;
--    boxm_raytrace_function<pass_1,T_loc, T_data,sample_datatype> raytracer_1(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    std::cerr << "PASS 1\n";
--    pass_1 pass_1_functor(obs,pre_inf,vis_inf);
--    raytracer_1.run(pass_1_functor);
--
--    vil_image_view<float> PI_inf(obs.ni(), obs.nj(),1);
--
--    typename T_data::apm_datatype background_apm;
--
--    if (black_background) {
--        std::cerr << "using black background model\n";
--        for (unsigned int i=0; i<4; ++i) {
--            T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
--            float peak=T_data::apm_processor::prob_density(background_apm,0.0f);
--            std::cout<<"Peak: "<<peak<<std::endl;
--        }
--        typename vil_image_view<typename T_data::obs_datatype>::const_iterator img_it = obs.begin();
--        typename vil_image_view<float>::iterator PI_it = PI_inf.begin();
--        for (; img_it != obs.end(); ++img_it, ++PI_it) {
--            *PI_it = T_data::apm_processor::prob_density(background_apm,*img_it);
--        }
--    }
--    else {
--        PI_inf.fill(0.5f);
--    }
--
--    vil_image_view<float> inf_term(obs.ni(), obs.nj());
--    vil_math_image_product<float,float,float>(vis_inf,PI_inf,inf_term);
--    vil_image_view<float> norm_img(obs.ni(), obs.nj());
--    vil_math_image_sum<float,float,float>(pre_inf,inf_term,norm_img);
--    std::cerr << "PASS 2\n";
--    typedef boxm_update_image_functor_pass_2<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_2;
--    boxm_raytrace_function<pass_2,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> raytracer_2(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--    pass_2 pass_2_functor(obs,norm_img);
--    raytracer_2.run(pass_2_functor);
--    std::cerr << "PASS 3\n";
--    typedef boxm_update_image_functor_pass_3<T_data::apm_type,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> pass_3;
--    boxm_iterate_cells_function<pass_3,T_loc, T_data,boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>::sample_datatype> cell_tracer_3(scene,aux_scene,cam.ptr(),obs.ni(),obs.nj());
--
--    pass_3 pass_3_functor;
--    cell_tracer_3.run(pass_3_functor);
--
--    aux_scene.clean_scene();
--    std::cerr << "DONE.\n";
--}
--
--#endif // boxm_update_image_functor_h
-diff --git a/contrib/brl/bseg/boxm/algo/rt/dummy.cxx b/contrib/brl/bseg/boxm/algo/rt/dummy.cxx
-deleted file mode 100644
-index e69de29bb2..0000000000
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-deleted file mode 100644
-index 112a19f789..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and boxm_pro depends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
-- # include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
-- # include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--  set(boxm_algo_rt_pro_sources
--      boxm_algo_rt_processes.h
--      boxm_algo_rt_register.h   boxm_algo_rt_register.cxx
--  )
--
--  #aux_source_directory(Templates boxm_algo_rt_pro_sources)
--  aux_source_directory(processes boxm_algo_rt_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_algo_rt_pro LIBRARY_SOURCES ${boxm_algo_rt_pro_sources} )
--
--  target_link_libraries(boxm_algo_rt_pro boxm_algo_rt boxm_algo_pro boxm boxm_sample boxm_sample_algo boct bprb brdb brip sdet ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
-deleted file mode 100644
-index 1ec223e9d5..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_processes.h
-+++ /dev/null
-@@ -1,29 +0,0 @@
--#ifndef boxm_algo_rt_processes_h_
--#define boxm_algo_rt_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_opt_bayesian_update_process);
--DECLARE_FUNC_CONS(boxm_update_rt_process);
--DECLARE_FUNC_CONS(boxm_render_expected_rt_process);
--DECLARE_FUNC_CONS(boxm_render_expected_depth_rt_process);
--DECLARE_FUNC_CONS(boxm_generate_opt_samples_process);
--DECLARE_FUNC_CONS(boxm_generate_edge_samples_process);
--DECLARE_FUNC_CONS(boxm_edge_update_process);
--DECLARE_FUNC_CONS(boxm_render_expected_edge_process);
--DECLARE_FUNC_CONS(boxm_rpc_registration_process);
--DECLARE_FUNC_CONS(boxm_line_backproject_process);
--DECLARE_FUNC_CONS(boxm_generate_opt2_samples_process);
--DECLARE_FUNC_CONS(boxm_opt2_update_process);
--DECLARE_FUNC_CONS(boxm_generate_opt3_samples_process);
--DECLARE_FUNC_CONS(boxm_opt3_update_process);
--DECLARE_FUNC_CONS(boxm_render_expected_edge_vrml_process);
--DECLARE_FUNC_CONS(boxm_ray_statistics_process);
--DECLARE_FUNC_CONS(boxm_change_probability_process);
--DECLARE_FUNC_CONS(boxm_estimate_camera_process);
--DECLARE_FUNC_CONS(boxm_edge_refine_updates_process);
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
-deleted file mode 100644
-index d0ebc7375e..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.cxx
-+++ /dev/null
-@@ -1,33 +0,0 @@
--#include "boxm_algo_rt_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "boxm_algo_rt_processes.h"
--
--void boxm_algo_rt_register::register_datatype()
--{
--}
--
--void boxm_algo_rt_register::register_process()
--{
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt_bayesian_update_process,"boxmOptBayesianUpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_rt_process,"boxmUpdateRTProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_rt_process, "boxmRenderExpectedRTProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_depth_rt_process, "boxmRenderExpectedDepthRTProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt_samples_process, "boxmGenerateOptSamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_edge_samples_process, "boxmGenerateEdgeSamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_update_process, "boxmEdgeUpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_edge_process, "boxmRenderExpectedEdgeProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_rpc_registration_process, "boxmRPCRegistrationProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_line_backproject_process, "boxmLineBackprojectProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt2_update_process,"boxmOpt2UpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_opt3_update_process,"boxmOpt3UpdateProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt2_samples_process,"boxmGenerateOpt2SamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_generate_opt3_samples_process,"boxmGenerateOpt3SamplesProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_ray_statistics_process,"boxmRayStatisticsProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_change_probability_process,"boxmChangeProbabilityProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_estimate_camera_process,"boxmEstimateCameraProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_edge_refine_updates_process, "boxmEdgeRefineUpdatesProcess");
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h b/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
-deleted file mode 100644
-index c060c1220f..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/boxm_algo_rt_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_algo_rt_register_h_
--#define boxm_algo_rt_register_h_
--
--class boxm_algo_rt_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_algo_rt_register_h_
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
-deleted file mode 100644
-index d7d9002e0c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
-+++ /dev/null
-@@ -1,120 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_change_probabilty_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining expected depth map for the world
--//
--// \author Vishal Jain
--// \date Aug 26, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_change_probability_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_convert.h>
--
--namespace boxm_change_probability_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_change_probability_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_change_probability_process_globals;
--
--  //process takes 4 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vil_image_view_base_sptr";
--  input_types_[2] = "vpgl_camera_double_sptr";
--  //input_types_[3] = "unsigned";
--  //input_types_[4] = "unsigned";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_change_probability_process(bprb_func_process& pro)
--{
--  using namespace boxm_change_probability_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vil_image_view_base_sptr input_img_ptr=pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--
--  unsigned ni=input_img_ptr->ni();
--  unsigned nj=input_img_ptr->nj();
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    vil_image_view<float> mask(ni,nj,1);
--    vil_image_view<float> expected(ni,nj,1);
--
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--
--    typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene,img_in, camera, expected, mask);
--    img_mask = new vil_image_view<float>(mask);
--    img = new vil_image_view<float>(expected);
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    vil_image_view<float> mask(ni,nj,1);
--    vil_image_view<float> expected(ni,nj,1);
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_img_ptr.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img_in(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img_in, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--
--    typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--    auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--    boxm_change_prob_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene,img_in, camera, expected, mask);
--    img_mask = new vil_image_view<float>(mask);
--    img = new vil_image_view<float>(expected);
--  }
--  else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
-deleted file mode 100644
-index 1593ab6590..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
-+++ /dev/null
-@@ -1,280 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_edge_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of edge images
--// \author Gamze Tunali
--// \date   Jan, 2010
--//
--// \verbatim
--//  Modifications
--//
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
--#include <boxm/algo/rt/boxm_edge_updater.h>
--
--#include <vil/vil_load.h>
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--
--namespace boxm_edge_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 6;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_edge_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_edge_update_process_globals;
--
--  // process takes 6 inputs:
--  //input[0]: The scene
--  //input[1]: Image list filename
--  //input[2]: Use ransac?
--  //input[3]: consensus cnt, param of ransac algo, value depends on number of training images
--  //          unless planes from this number of images agree at a voxel on a hypothesis, a 3D edge won't be formed,
--  //          there should be at least this number of training images during the update for any kind of consensus to be met at any voxel
--  //          (if consensus cnt < training img cnt --> edge world will be empty)
--  //input[4]: orthogonality threshold, a good value 0.01, param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
--  //input[5]: volume ratio denominator: a good value 128 , param of ransac algo, would see more 3D edges as this value gets bigger, but they would be less and less good
--  //          algo checks whether a current plane is within cell_volume/denominator radius of current hypothesis
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "bool";
--  input_types_[3] = "int";
--  input_types_[4] = "float";
--  input_types_[5] = "float";
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_edge_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_edge_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string image_list_fname = pro.get_input<std::string>(1);
--  bool use_ransac=pro.get_input<bool>(2);
--  int consensus_cnt = pro.get_input<int>(3);
--  auto ortho_thres = pro.get_input<float>(4);
--  auto vol_ratio = pro.get_input<float>(5);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  std::cout << "using image ids: ";
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    std::cout << img_id << std::endl;
--    image_ids.push_back(img_id);
--    std::cout << img_id << ' ';
--  }
--  ifs.close();
--  std::cout << std::endl;
--
--  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
--    std::cout << "appearance model EDGE_FLOAT\n";
--    typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
--    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--        return false;
--    }
--    boxm_edge_updater<short,float,float> updater(*scene, image_ids);
--    updater.add_cells();
--  }
--  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
--    std::cout << "appearance model EDGE_LINE\n";
--    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--        return false;
--    }
--
--    boxm_edge_tangent_updater<short,float,float> updater(*scene, image_ids, use_ransac, ortho_thres, vol_ratio, consensus_cnt);
--    updater.add_cells();
--  }
--  //store output
--  // (none)
--
--  return true;
--}
--
--//: set input and output types
--bool boxm_edge_refine_updates_process_cons(bprb_func_process& pro)
--{
--  // process takes 3 inputs:
--  //input[0]: The scene
--  //input[1]: Image list filename
--  //input[2]: camera list filename
--  //input[3]: consensus cnt,
--  std::vector<std::string> input_types_(4);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "int";
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(0);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_edge_refine_updates_process(bprb_func_process& pro)
--{
--  using namespace boxm_edge_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != 4)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << 4 << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string image_list_fname = pro.get_input<std::string>(1);
--  std::string cam_list_fname = pro.get_input<std::string>(2);
--  int consensus_cnt = pro.get_input<int>(3);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<vil_image_view<float> > images;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  std::cout << "using image ids: ";
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    std::cout << "loading: " << img_id << std::endl;
--
--    vil_image_view_base_sptr loaded_image = vil_load(img_id.c_str() );
--    if ( !loaded_image || loaded_image->pixel_format() != VIL_PIXEL_FORMAT_FLOAT) {
--      std::cerr << "Failed to load image file: " << img_id << " or format is not FLOAT img!\n";
--      return false;
--    }
--    vil_image_view<float> img(loaded_image);
--    images.push_back(img);
--  }
--  ifs.close();
--
--  // extract list of image_ids from file
--  std::ifstream ifsc(cam_list_fname.c_str());
--  if (!ifsc.good()) {
--    std::cerr << "error opening file " << cam_list_fname << '\n';
--    return false;
--  }
--
--  std::vector<vpgl_camera_double_sptr> cameras;
--  unsigned int n_cameras = 0;
--  ifsc >> n_cameras;
--  if (n_cameras != n_images) {
--    std::cerr << "camera file and image file do not contain equal numbers of items!\n";
--    return false;
--  }
--
--  std::cout << "using cameras: ";
--  for (unsigned int i=0; i<n_cameras; ++i) {
--    std::string img_id;
--    ifsc >> img_id;
--    std::cout << "loading camera: " << img_id << std::endl;
--
--    vpgl_camera_double_sptr ratcam = read_local_rational_camera<double>(img_id);
--    if ( !ratcam.as_pointer() ) {
--      std::cerr << "Rational camera isn't local... trying global\n";
--      ratcam = read_rational_camera<double>(img_id);
--      if ( !ratcam.as_pointer() ) {
--        std::cout << " camera: " << img_id << " is not local or global rational camera, not supporting any other type for now!\n";
--        return false;
--      }
--    }
--
--    cameras.push_back(ratcam);
--  }
--  ifsc.close();
--  std::cout << std::endl;
--
--  if (scene_base->appearence_model() == BOXM_EDGE_FLOAT) {
--    std::cout << "appearance model EDGE_FLOAT\n";
--    std::cerr << "this process is not defined for this type of scene!\n";
--    return false;
--  }
--  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
--    std::cout << "appearance model EDGE_LINE\n";
--    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--    auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--        return false;
--    }
--
--    boxm_edge_tangent_refine_updates<short,float,float> refiner(*scene, consensus_cnt, images, cameras);
--    refiner.refine_cells();
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
-deleted file mode 100644
-index d1010864dd..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
-+++ /dev/null
-@@ -1,199 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_estimate_camera_process.cxx
--//:
--// \file
--#include <iostream>
--#include <cstdio>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <brip/brip_vil_float_ops.h>
--
--#include <vnl/algo/vnl_amoeba.h>
--
--#include <vpgl/vpgl_perspective_camera.h>
--#include <bpgl/bpgl_camera_estimator.h>
--#include <bpgl/bpgl_camera_estimator_amoeba.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--#include <boxm/algo/rt/boxm_expected_edge_functor.h>
--
--//: globals
--namespace boxm_estimate_camera_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 3;
--
--  // parameter strings
--  const std::string theta_range_ =  "theta_range";
--  const std::string theta_step_ =  "theta_step";
--  const std::string phi_range_ =  "phi_range";
--  const std::string phi_step_ =  "phi_step";
--  const std::string rot_range_ =  "rot_range";
--  const std::string rot_step_ =  "rot_step";
--  const std::string max_iter_rot_angle_ =  "max_iter_rot_angle";
--  const std::string max_iter_cam_center_ =  "max_iter_cam_center";
--}
--
--//: set input and output types
--bool boxm_estimate_camera_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_estimate_camera_process_globals;
--
--  // process takes 3 inputs:
--  //input[0]: The scene
--  //input[1]: Initial camera
--  //input[2]: Edge image
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "vpgl_camera_double_sptr";
--  input_types_[i++] = "vil_image_view_base_sptr";
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  // process has 3 outputs:
--  // output[0]: The optimized camera
--  // output[1]: Expected edge image (after camera correction)
--  // output[2]: Expected edge image (before camera correction)
--
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j = 0;
--  output_types_[j++] = "vpgl_camera_double_sptr";
--  output_types_[j++] = "vil_image_view_base_sptr";
--  output_types_[j++] = "vil_image_view_base_sptr";
--  return pro.set_output_types(output_types_);
--}
--
--//:  optimizes camera parameters based on edges
--bool boxm_estimate_camera_process(bprb_func_process& pro)
--{
--  using namespace boxm_estimate_camera_process_globals;
--
--  //check number of inputs
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs
--  unsigned i = 0;
--
--  // scene
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // camera
--  vpgl_camera_double_sptr cam_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto *cam_init = dynamic_cast<vpgl_perspective_camera<double>*>(cam_inp.ptr());
--
--  // image
--  vil_image_view_base_sptr img_e_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--  vil_image_view<vxl_byte> img_e_vb(img_e_sptr);
--
--  vil_image_view<float> img_e;
--  brip_vil_float_ops::normalize_to_interval<vxl_byte,float>(img_e_vb,img_e,0.0f,1.0f);
--
--  unsigned ni = img_e.ni();
--  unsigned nj = img_e.nj();
--
--  double deg2rad = vnl_math::pi_over_180;
--
--  // parameters are in degrees
--  double theta_range = 12.0, theta_step = 0.05, phi_range = 12.0, phi_step = 0.05, rot_range = 10.0, rot_step = 1.0;
--  int max_iter_rot_angle = 5, max_iter_cam_center = 50;
--
--  pro.parameters()->get_value(theta_range_, theta_range);
--  pro.parameters()->get_value(theta_step_, theta_step);
--  pro.parameters()->get_value(phi_range_, phi_range);
--  pro.parameters()->get_value(phi_step_, phi_step);
--  pro.parameters()->get_value(rot_range_, rot_range);
--  pro.parameters()->get_value(rot_step_, rot_step);
--  pro.parameters()->get_value(max_iter_rot_angle_, max_iter_rot_angle);
--  pro.parameters()->get_value(max_iter_cam_center_, max_iter_cam_center);
--
--#if 0
--  std::cout << "printing boxm_estimate_camera_process parameters:\n"
--           << "theta_range: " << theta_range << '\n'
--           << "theta_step: " << theta_step << '\n'
--           << "phi_range: " << phi_range << '\n'
--           << "phi_step: " << phi_step << '\n'
--           << "rot_range: " << rot_range << '\n'
--           << "rot_step: " << rot_step << '\n'
--           << "max_iter_rot_angle: " << max_iter_rot_angle << '\n'
--           << "max_iter_cam_center: " << max_iter_cam_center << '\n';
--#endif
--
--  // change the parameters into radians
--  theta_range *= deg2rad; theta_step *= deg2rad; phi_range *= deg2rad; phi_step *= deg2rad; rot_range *= deg2rad; rot_step *= deg2rad;
--
--  auto *img_eei = new vil_image_view<float>(ni,nj,1);
--  img_eei->fill(0.0f);
--
--  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
--        return false;
--      }
--
--      // create the functor that finds edges
--      typedef boxm_expected_edge_functor<short, boxm_inf_line_sample<float> > func_type;
--      func_type func(*scene);
--      bpgl_camera_estimator<func_type > cam_estimator(func);
--      cam_estimator.set_estimation_params(theta_range,theta_step,phi_range,phi_step,rot_range,rot_step,max_iter_rot_angle);
--
--      func.apply(cam_inp,img_eei);
--
--      auto *img_eei_before_correction = new vil_image_view<vxl_byte>(ni,nj,1);
--      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_before_correction,0.0f,255.0f);
--
--      bpgl_camera_estimator_amoeba<func_type> cost_ftn(cam_estimator,img_e,cam_inp);
--      vnl_vector<double> x(2,1.0);
--      vnl_amoeba amoeba(cost_ftn);
--      amoeba.verbose = 1;
--      amoeba.default_verbose = true;
--      amoeba.set_relative_diameter(3.0);
--      amoeba.set_max_iterations(max_iter_cam_center);
--      amoeba.minimize(x);
--      auto *cam_est = new vpgl_perspective_camera<double>(*cam_init);
--      cost_ftn.get_result(x,cam_est);
--
--      vpgl_camera_double_sptr cam_ptr = new vpgl_perspective_camera<double>(*cam_est);
--      func.apply(cam_ptr,img_eei);
--
--      auto *img_eei_vb = new vil_image_view<vxl_byte>(ni,nj,1);
--      brip_vil_float_ops::normalize_to_interval<float,vxl_byte>(*img_eei,*img_eei_vb,0.0f,255.0f);
--
--      delete cam_est;
--      delete img_eei;
--
--      // output
--      unsigned j = 0;
--      // update the camera and store
--      pro.set_output_val<vpgl_camera_double_sptr>(j++, cam_ptr);
--      // update the edge image after update and store
--      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_vb);
--      // update the edge image before update and store
--      pro.set_output_val<vil_image_view_base_sptr>(j++, img_eei_before_correction);
--
--      return true;
--    }
--    else
--    {
--      std::cerr << "boxm_estimate_camera_process: Multibin version not yet implemented\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_estimate_camera_process: undefined APM type\n";
--    return false;
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
-deleted file mode 100644
-index bb10974eef..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
-+++ /dev/null
-@@ -1,139 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_edge_samples_process.cxx
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Sep 15, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--
--#include <sdet/sdet_img_edge.h>
--
--namespace boxm_generate_edge_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_generate_edge_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_edge_samples_process_globals;
--
--  //process takes 5 inputs
--  //input[0]: The cropped edge image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: n_normal
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "float";
--
--  //output
--  unsigned j = 0;
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[j++] = "float"; // new n_normal value
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_edge_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_edge_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << "boxm_generate_edge_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr edge_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string img_name =  pro.get_input<std::string>(i++);
--  auto n_normal = pro.get_input<float>(i++);
--
--  // get parameters
--  int edge_prob_mask_size = 21;
--  pro.parameters()->get_value("edge_prob_mask_size",edge_prob_mask_size);
--  float edge_prob_mask_sigma = 1.0f;
--  pro.parameters()->get_value("edge_prob_mask_sigma",edge_prob_mask_sigma);
--
--  // check the input validity
--  if ((edge_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--     std::cout << "boxm_generate_edge_samples_process: null input value, cannot run" << std::endl;
--     return false;
--  }
--
--  float new_n_normal=0.0;
--
--
--  if (scene->appearence_model() == BOXM_EDGE_FLOAT) {
--    vil_image_view<float> edge_prob_image;
--    sdet_img_edge::estimate_edge_prob_image(edge_image, edge_prob_image, edge_prob_mask_size, edge_prob_mask_sigma);
--    float edge_prob_image_mean;
--    vil_math_mean(edge_prob_image_mean,edge_prob_image,0);
--    vil_image_view<float> img(edge_prob_image);
--    new_n_normal = n_normal + edge_prob_image_mean;
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_generate_edge_sample_rt<short,boxm_edge_sample<float> > (*s, camera, img, img_name);
--    }
--    else
--    {
--      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
--    }
--  }
--  if (scene->appearence_model() == BOXM_EDGE_LINE) {
--    // get the edges as an image with 3 planes (a,b,c)
--    if (!scene->multi_bin())
--    {
--      typedef boxm_inf_line_sample<float> sample_type;
--      typedef boct_tree<short, sample_type> tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      // for this case, the image should be with 4 planes, representing plane definitions
--      vil_image_view<float> img(edge_image);
--      boxm_generate_edge_tangent_sample_rt<short,sample_type> (*s, camera, img, img_name);
--    }
--    else
--    {
--      std::cout<<"boxm_generate_edge_samples_process: Multibin -- Not yet implemented"<<std::endl;
--    }
--  }
--  else {
--    std::cout << "boxm_generate_edge_samples_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  pro.set_output_val<float>(0, float(new_n_normal));
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
-deleted file mode 100644
-index 06261e8d44..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
-+++ /dev/null
-@@ -1,142 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt2_samples_process.cxx
--//:
--// \file
--// \brief Process to generate samples needed for boxm_opt2_optimizer_process from a given image/camera pair
--//
--// \author Daniel Crispell
--// \date Feb 17, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_generate_opt2_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_generate_opt2_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt2_samples_process_globals;
--
--  // process takes 7 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: shadow prior
--  //input[5]: shadow sigma
--  //input[6]: use black background
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "float";
--  input_types_[5] = "float";
--  input_types_[6] = "bool";
--
--  std::vector<std::string>  output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_opt2_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt2_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_generate_opt2_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(0);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(1);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(2);
--  std::string img_name =  pro.get_input<std::string>(3); // TODO - unused!!
--  auto shadow_prior = pro.get_input<float>(4);
--  auto shadow_sigma = pro.get_input<float>(5);
--  bool use_black_background =  pro.get_input<bool>(6);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--    std::cout << "boxm_generate_opt2_samples_process: null input value, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      // create alternate appearance models
--      std::vector<float> alt_appearance_priors;
--      std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype> alt_appearance_models;
--      if (shadow_prior > 0.0f) {
--        boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype shadow_model(0.0f, shadow_sigma);
--        alt_appearance_priors.push_back(shadow_prior);
--        alt_appearance_models.push_back(shadow_model);
--      }
--      if (!scene->multi_bin()) {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
--      }
--      else {
--        std::cerr << "error: multi-bin scenes not supported\n";
--      }
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      // create alternate appearance models
--      std::vector<float> alt_appearance_priors;
--      std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype> alt_appearance_models;
--      if (shadow_prior > 0.0f) {
--        boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype shadow_model;
--        // insert a single mode with mean at 0
--        bsta_gauss_sf1 single_mode(0.0f, shadow_sigma*shadow_sigma);
--        shadow_model.insert(bsta_num_obs<bsta_gauss_sf1>(single_mode), 1.0f);
--        alt_appearance_priors.push_back(shadow_prior);
--        alt_appearance_models.push_back(shadow_model);
--      }
--      if (!scene->multi_bin()) {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt2_samples<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT2_GREY >(*s, camera, img, img_name, alt_appearance_priors, alt_appearance_models, use_black_background);
--      }
--      else {
--        std::cerr << "error: multi-bin scenes not supported\n";
--      }
--      break;
--    }
--   default:
--    std::cout << "boxm_generate_opt2_samples_process: unsupported APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
-deleted file mode 100644
-index 0eb591c79c..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
-+++ /dev/null
-@@ -1,114 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt3_samples_process.cxx
--//:
--// \file
--// \brief Process to generate samples needed for boxm_opt3_optimizer_process from a given image/camera pair
--//
--// \author Daniel Crispell
--// \date Feb 17, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_generate_opt3_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_generate_opt3_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt3_samples_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: use black background
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "bool";
--
--  std::vector<std::string>  output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_opt3_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt3_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_generate_opt3_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--    std::cout << "boxm_generate_opt3_samples_process: null input value, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      if (!scene->multi_bin())
--      {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_SIMPLE_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
--      }
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      auto *img_byte = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--      vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--      vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--      if (!scene->multi_bin())
--      {
--        typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--        auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--        boxm_generate_opt3_sample<short, boxm_sample<BOXM_APM_MOG_GREY>, BOXM_AUX_OPT3_MOG_GREY>(*s, camera,img, img_name, use_black_background);
--      }
--      break;
--    }
--   default:
--    std::cout << "boxm_generate_opt3_samples_process: unsupported APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
-deleted file mode 100644
-index fac0d9d3ae..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_generate_opt_samples_process.cxx
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Sep 15, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_generate_opt_samples_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_generate_opt_samples_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt_samples_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: image name for saving scene
--  //input[4]: use black background
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_generate_opt_samples_process(bprb_func_process& pro)
--{
--  using namespace boxm_generate_opt_samples_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_generate_opt_samples_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string img_name =  pro.get_input<std::string>(i++); // TODO - unused!!
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--     std::cout << "boxm_generate_opt_samples_process: null input value, cannot run" << std::endl;
--     return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_generate_opt_sample_rt(*s, camera,img,img_name,use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  }
--  else {
--    std::cout << "boxm_generate_opt_samples_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
-deleted file mode 100644
-index 30a4014572..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
-+++ /dev/null
-@@ -1,153 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt2_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
--// \author Daniel Crispell
--// \date   February 17, 2010
--//
--// \verbatim
--//  Modifications
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/algo/rt/boxm_opt2_optimizer.h>
--
--namespace boxm_opt2_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 2;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_opt2_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_opt2_update_process_globals;
--
--  // process takes 2 inputs:
--  //input[0]: The scene
--  //input[1]: The filename of the text file containing list of image names
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_opt2_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_opt2_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  boxm_apm_type apm_type = scene_base->appearence_model();
--
--  std::string image_list_fname = pro.get_input<std::string>(1);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    image_ids.push_back(img_id);
--  }
--  ifs.close();
--
--  switch (apm_type)
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt2_optimizer<short,BOXM_APM_SIMPLE_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
--      optimizer.update();
--
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt2_optimizer<short,BOXM_APM_MOG_GREY, BOXM_AUX_OPT2_GREY> optimizer(*scene, image_ids);
--      optimizer.update();
--
--      break;
--    }
--#if 0 // commented out
--   case BOXM_APM_SIMPLE_RGB:
--    {
--      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#endif // 0
--   default:
--    std::cerr << "error - boxm_opt2_update_process: unsupported appearance model type " << apm_type << '\n';
--    return false;
--  }
--
--  //store output
--  // (none)
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
-deleted file mode 100644
-index 47f40dd19a..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
-+++ /dev/null
-@@ -1,153 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt3_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of images. No damping parameter is required
--// \author Daniel Crispell
--// \date   February 17, 2010
--//
--// \verbatim
--//  Modifications
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/algo/rt/boxm_opt3_optimizer.h>
--
--namespace boxm_opt3_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 2;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_opt3_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_opt3_update_process_globals;
--
--  // process takes 2 inputs:
--  //input[0]: The scene
--  //input[1]: The filename of the text file containing list of image names
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_opt3_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_opt3_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  boxm_apm_type apm_type = scene_base->appearence_model();
--
--  std::string image_list_fname = pro.get_input<std::string>(1);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << '\n';
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    image_ids.push_back(img_id);
--  }
--  ifs.close();
--
--  switch (apm_type)
--  {
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt3_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
--      optimizer.optimize_cells();
--
--      break;
--    }
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt3_optimizer<short,BOXM_APM_MOG_GREY,BOXM_APM_MOG_GREY> optimizer(*scene, image_ids);
--      optimizer.optimize_cells();
--
--      break;
--    }
--#if 0 // commented out
--   case BOXM_APM_SIMPLE_RGB:
--    {
--      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#endif // 0
--   default:
--    std::cerr << "error - boxm_opt3_update_process: unsupported appearance model type " << apm_type << '\n';
--    return false;
--  }
--
--  //store output
--  // (none)
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
-deleted file mode 100644
-index 56d4d9051d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
-+++ /dev/null
-@@ -1,145 +0,0 @@
--//This is brl/bseg/boxm/algo/rt/pro/processes/boxm_opt_bayesian_update_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for updating a boxm_scene with a set of images, using a damped version of Bayes' rule
--// \author Daniel Crispell
--// \date   April 2, 2009
--//
--// \verbatim
--//  Modifications
--//   Aug 3, 2009  Gamze Tunali - Moved from lemsvxl/psm_opt to vxl
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
--
--namespace boxm_opt_bayesian_update_process_globals
--{
--  constexpr unsigned int n_inputs_ = 3;
--  constexpr unsigned int n_outputs_ = 0;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool boxm_opt_bayesian_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_opt_bayesian_update_process_globals;
--
--  // process takes 3 inputs:
--  //input[0]: The scene
--  //input[1]: The damping value
--  //input[2]: The filename of the text file containing list of image names
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "float";
--  input_types_[2] = "vcl_string";
--
--  // process has 0 outputs:
--  std::vector<std::string> output_types_(n_outputs_);
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool boxm_opt_bayesian_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_opt_bayesian_update_process_globals;
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the parameters
--  // (none)
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  boxm_apm_type apm_type = scene_base->appearence_model();
--
--  auto damping_factor = pro.get_input<float>(1);
--
--  std::string image_list_fname = pro.get_input<std::string>(2);
--
--  // extract list of image_ids from file
--  std::ifstream ifs(image_list_fname.c_str());
--  if (!ifs.good()) {
--    std::cerr << "error opening file " << image_list_fname << std::endl;
--    return false;
--  }
--  std::vector<std::string> image_ids;
--  unsigned int n_images = 0;
--  ifs >> n_images;
--  for (unsigned int i=0; i<n_images; ++i) {
--    std::string img_id;
--    ifs >> img_id;
--    image_ids.push_back(img_id);
--  }
--  ifs.close();
--
--  switch (apm_type)
--  {
--    case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *scene = dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#if 0 // commented out
--    case BOXM_APM_SIMPLE_RGB:
--    {
--      boxm_scene<BOXM_APM_SIMPLE_RGB> *scene = dynamic_cast<boxm_scene<BOXM_APM_SIMPLE_RGB>*>(scene_base.ptr());
--      if (!scene) {
--        std::cerr << "error casting scene_base to scene\n";
--        return false;
--      }
--      boxm_opt_rt_bayesian_optimizer<BOXM_APM_SIMPLE_RGB, BOXM_AUX_OPT_RT_RGB> optimizer(*scene, image_ids);
--      optimizer.optimize_cells(damping_factor);
--
--      break;
--    }
--#endif // 0
--    default:
--      std::cerr << "error - boxm_opt_bayesian_update_process: unsupported appearance model type " << apm_type << std::endl;
--      return false;
--  }
--
--  //store output
--  // (none)
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
-deleted file mode 100644
-index 5507b5b55b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
-+++ /dev/null
-@@ -1,107 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_ray_statistics_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A process for describing the attributes of a scene
--//
--// \author J.L. Mundy
--// \date January 24, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <boxm/boxm_apm_traits.h>
--#include <bsta/bsta_histogram_sptr.h>
--#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
--
--namespace boxm_ray_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_ray_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_ray_statistics_process_globals;
--
--  //process takes 2 input
--  //input[0]: scene binary file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";  //ni
--  input_types_[3] = "unsigned";  //nj
--
--  // process has 1 output:
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "bsta_histogram_sptr"; // No of rays per cell Histogram
--  //output_types_[1] = "bsta_histogram_sptr"; // Sigma Histogram
--  //output_types_[2] = "bsta_histogram_sptr"; // Level Histogram
--  //output_types_[3] = "unsigned";            // Number of leaves
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//: This process produces one output:
--//  * The distribution of "Omega" values where Omega = 1-e^( alpha x length )
--//  The following three outputs are no longer present:
--//  * The distribution of "Sigma" values where Sigma is the std_dev of
--//    the appearance model. (currently implemented only for simple grey)
--//  * The histogram of levels for leaves in the octree
--//  * The number of leaves in the tree
--//
--bool boxm_ray_statistics_process(bprb_func_process& pro)
--{
--  using namespace boxm_ray_statistics_process_globals;
--
--  if ( !pro.verify_inputs() ) {
--    std::cerr << pro.name() << ": invalid inputs\n";
--    return false;
--  }
--  // assign tree type
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
--  vpgl_camera_double_sptr cam_ptr = pro.get_input<vpgl_camera_double_sptr>(1);
--  auto ni = pro.get_input<unsigned>(2);
--  auto nj = pro.get_input<unsigned>(3);
--
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
--
--      bsta_histogram<float> num_rays_hist;
--      if (!compute_ray_statistics<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
--        return false;
--      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));    }
--    else
--    {
--      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/Gaussian mixture\n";
--      return false;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY)
--  {
--    if (!scene_ptr->multi_bin()) {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto* scene = dynamic_cast<boxm_scene<tree_type> *> (scene_ptr.as_pointer());
--
--      bsta_histogram<float> num_rays_hist;
--      if (!compute_ray_statistics<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, cam_ptr,num_rays_hist,ni,nj))
--        return false;
--      pro.set_output_val<bsta_histogram_sptr>(0, new bsta_histogram<float>(num_rays_hist));
--    }
--    else {
--      std::cerr<<"boxm_ray_statistics_process not yet implemented for multi-bin/simple_grey\n";
--      return false;
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
-deleted file mode 100644
-index 5af8acd7f8..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
-+++ /dev/null
-@@ -1,114 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_depth_rt_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining expected depth map for the world
--//
--// \author Vishal Jain
--// \date Aug 26, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_image_view.h>
--
--namespace boxm_render_expected_depth_rt_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_depth_rt_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_depth_rt_process_globals;
--
--  //process takes 4 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_depth_rt_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_depth_rt_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--      vil_image_view<float> mask(ni,nj,1);
--      vil_image_view<float> expected(ni,nj,1);
--
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask);
--      img_mask = new vil_image_view<float>(mask);
--      img = new vil_image_view<float>(expected);
--  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--      vil_image_view<float> mask(ni,nj,1);
--      vil_image_view<float> expected(ni,nj,1);
--
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask);
--      img_mask = new vil_image_view<float>(mask);
--      img = new vil_image_view<float>(expected);
--  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--      vil_image_view<float> mask(ni,nj,1);
--      vil_image_view<float> expected(ni,nj,1);
--
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_depth_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask);
--      img_mask = new vil_image_view<float>(mask);
--      img = new vil_image_view<float>(expected);
--  } else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
-deleted file mode 100644
-index 74ee8c9a88..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
-+++ /dev/null
-@@ -1,162 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_edge_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--namespace boxm_render_expected_edge_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_edge_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_process_globals;
--
--  //process takes 7 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4]: n_normal
--  //input[5]: num samples used for update
--  //input[6]: Threshold for edges
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "float";
--  input_types_[5] = "unsigned";
--  input_types_[6] = "float";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[1]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_edge_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_edge_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cerr << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--  auto n_normal = pro.get_input<float>(i++);
--  // number of updates
--  auto num_updates = pro.get_input<unsigned>(i++);
--  //float threshold = pro.get_input<float>(i++); // FIXME: unused; see line 138
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
--    vil_image_view<boxm_apm_traits<BOXM_EDGE_FLOAT>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_edge_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
--        return false;
--      }
--      boxm_render_edge_image_rt<short, boxm_edge_sample<float> >(*scene, camera, expected, mask,n_normal,num_updates);
--    }
--    else
--    {
--      std::cerr << "Ray tracing version not yet implemented\n";
--      return false;
--    }
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<vxl_byte>(ni,nj,expected.nplanes());
--    for (unsigned i=0; i<ni; i++) {
--      for (unsigned j=0; j<nj; j++) {
--        (*expected_byte)(i,j) = static_cast<unsigned char>(255.0*(expected(i,j)));
--      }
--    }
--    img = expected_byte;
--        img_mask = new vil_image_view<float>(mask);
--
--    auto *ex = new vil_image_view<float>(ni,nj,expected.nplanes());
--    for (unsigned i=0; i<ni; i++) {
--      for (unsigned j=0; j<nj; j++) {
--        (*ex)(i,j) = expected(i,j);//static_cast<unsigned char>(255.0*(expected(i,j)));
--      }
--    }
--    img = ex;
--      unsigned j = 0;
--    pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--    pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--    return true;
--  }
--
--  if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
--    vil_image_view<float > expected(ni,nj,1);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_inf_line_sample<float> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      if (!scene) {
--        std::cerr << "boxm_render_expected_edge_process: the scene is not of expected type\n";
--        return false;
--      }
--      boxm_render_edge_tangent_image_rt<short, boxm_inf_line_sample<float> >(*scene, camera, expected);//, n_normal,num_updates, threshold);
--
--      auto *edge_image=new  vil_image_view<float >(ni,nj,1);
--      *edge_image=expected;
--
--      unsigned j = 0;
--      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
--      pro.set_output_val<vil_image_view_base_sptr>(j++,edge_image);
--      return true;
--    }
--    else
--    {
--      std::cerr << "Ray tracing version not yet implemented\n";
--      return false;
--    }
--  }
--  else {
--    std::cerr << "boxm_render_expected_edge_process: undefined APM type\n";
--    return false;
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
-deleted file mode 100644
-index f92621784d..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
-+++ /dev/null
-@@ -1,143 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_render_expected_rt_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for rendering an expected image of a given scene and camera.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--#include <vil/vil_convert.h>
--
--namespace boxm_render_expected_rt_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_rt_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_rt_process_globals;
--
--  //process takes 5 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4]: black background?
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "bool";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_rt_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_rt_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
--    }
--    else
--    {
--       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
--       return false;
--    }
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  } else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_rt<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
--    }
--    else
--    {
--       std::cout<<"Ray tracing version not yet implemented"<<std::endl;
--       return false;
--    }
--  //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  } else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*scene, camera, expected, mask,-1,use_black_background);
--    }
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  } else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
-deleted file mode 100644
-index b3c1ee031e..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
-+++ /dev/null
-@@ -1,119 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_rpc_registration_process.cxx
--#include <iostream>
--#include <cstdio>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for registering the RPC camera based on the edges in the world
--// \author Gamze Tunali
--// \date   Feb 1st, 2010
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--#include <boxm/algo/rt/boxm_rpc_registration.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: globals
--namespace boxm_rpc_registration_process_globals
--{
--  constexpr unsigned n_inputs_ = 8;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: set input and output types
--bool boxm_rpc_registration_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_rpc_registration_process_globals;
--
--  // process takes 8 inputs:
--  // input[0]: The scene
--  // input[1]: The current camera
--  // input[2]: The current edge image
--  // input[3]: The expected edge image
--  // input[4]: The flag indicating whether to align the 3D voxel world along with image
--  // input[5]: Uncertainty in meters
--  // input[6]: n_normal
--  // input[7]: num_observation
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "vpgl_camera_double_sptr";
--  input_types_[i++] = "vil_image_view_base_sptr";
--  input_types_[i++] = "vil_image_view_base_sptr";
--  input_types_[i++] = "bool";
--  input_types_[i++] = "float";
--  input_types_[i++] = "float";
--  input_types_[i++] = "unsigned";
--
--  // process has 1 output:
--  // output[0]: The optimized camera
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j = 0;
--  output_types_[j++] = "vpgl_camera_double_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:  optimizes rpc camera parameters based on edges
--bool boxm_rpc_registration_process(bprb_func_process& pro)
--{
--  using namespace boxm_rpc_registration_process_globals;
--
--  //check number of inputs
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs
--  unsigned i = 0;
--
--  // scene
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // camera
--  vpgl_camera_double_sptr camera_inp = pro.get_input<vpgl_camera_double_sptr>(i++);
--
--  // image
--  vil_image_view_base_sptr edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--
--  vil_image_view_base_sptr expected_edge_image_sptr = pro.get_input<vil_image_view_base_sptr>(i++);
--
--  // boolean parameter specifying the voxel world alignment state
--  bool rpc_shift_3d_flag = pro.get_input<bool>(i++);
--
--  // uncertainty in meters
--  auto uncertainty = pro.get_input<float>(i++);
--
--  // n_normal
--  auto n_normal = pro.get_input<float>(i++);
--
--  // number of observations
--  auto num_observation = pro.get_input<unsigned>(i++);
--
--  std::string edge_type="subpixel";//pro.get_input<std::string>(i++);
--
--  vpgl_camera_double_sptr camera_out;
--
--  if (edge_type=="subpixel")
--  {
--    vil_image_view<float > expected_edge_image(expected_edge_image_sptr);
--    vil_image_view<float> edge_image(edge_image_sptr);
--    boxm_rpc_registration<short,boxm_inf_line_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty, num_observation);
--  }
--  else {
--    vil_image_view<vxl_byte> expected_edge_image(expected_edge_image_sptr);
--    vil_image_view<vxl_byte> edge_image(edge_image_sptr);
--    boxm_rpc_registration<short,boxm_edge_sample<float> >(scene,edge_image,expected_edge_image,camera_inp, camera_out, rpc_shift_3d_flag,uncertainty,n_normal, num_observation);
--  }
--
--  // output
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<vpgl_camera_double_sptr>(j++, camera_out);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
-deleted file mode 100644
-index 128496aee8..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
-+++ /dev/null
-@@ -1,136 +0,0 @@
--// This is brl/bseg/boxm/algo/rt/pro/processes/boxm_update_rt_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Apr 21, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/rt/boxm_update_image_functor.h>
--#include <boxm/boxm_apm_traits.h> // for BOXM_APM_MOG_GREY
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample.h>
--
--namespace boxm_update_rt_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_update_rt_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_update_rt_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: The bin index to be updated
--  //input[4]: Use black background?
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_update_rt_process(bprb_func_process& pro)
--{
--  using namespace boxm_update_rt_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_update_rt_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  /* unsigned bin_index = */   pro.get_input<unsigned>(i++);
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--     std::cout << "boxm_update_rt_process: null input value, cannot run" << std::endl;
--     return false;
--  }
--
--  // Mixture of Gaussians
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, camera,img, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  // Mixture of Beta's
--  } else if (scene->appearence_model() == BOXM_APM_MOB_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_image_rt<short, boxm_sample<BOXM_APM_MOB_GREY> >(*s, camera,img, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  } else if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_image_rt(*s, camera,img, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Not yet implemented"<<std::endl;
--    }
--  }
--  else {
--    std::cout << "boxm_update_rt_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index 1b63879e8e..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_algo_rt_pro_test_include test_include.cxx )
--target_link_libraries( boxm_algo_rt_pro_test_include boxm_algo_rt_pro)
-diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
-deleted file mode 100644
-index f43a3a7286..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/rt/pro/boxm_algo_rt_processes.h>
--#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
-deleted file mode 100644
-index 73a8978f93..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,16 +0,0 @@
--add_executable( boxm_algo_rt_test_all
--  test_driver.cxx
--  test_bayesian_optimizer.cxx
--  test_edges.cxx
--  test_shadow_appearance.cxx
-- )
--
--target_link_libraries( boxm_algo_rt_test_all boxm_algo_rt boxm boxm_util boxm_sample boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME boxm_algo_rt_test_bayesian_optimizer COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_bayesian_optimizer  )
--add_test( NAME boxm_algo_rt_test_edges COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_edges  )
--add_test( NAME boxm_algo_rt_test_shadow_appearance COMMAND $<TARGET_FILE:boxm_algo_rt_test_all> test_shadow_appearance  )
--add_executable( boxm_algo_rt_test_include test_include.cxx )
--target_link_libraries( boxm_algo_rt_test_include boxm_algo_rt)
--add_executable( boxm_algo_rt_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_algo_rt_test_template_include boxm_algo_rt)
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
-deleted file mode 100644
-index 5ec14a4181..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_bayesian_optimizer.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
--#include <boct/boct_tree.h>
--#include <vul/vul_file.h>
--
--static void test_bayesian_optimizer()
--{
--  typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
--  typedef boxm_rt_sample<float> aux_type;
--
--  // create the main scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_octree_levels(3,2);
--  scene.set_paths("./boxm_scene", "block");
--  scene.set_appearance_model(BOXM_APM_SIMPLE_GREY);
--  x_write(std::cout, scene, "scene");
--  vul_file::make_directory("./boxm_scene");
--  scene.write_scene();
--  //vsl_b_ofstream os("scene.bin");
--  //scene.b_write(os);
--  //os.close();
--
--  boxm_block_iterator<boct_tree<short,data_type> > iter(&scene);
--  // default model
--  boxm_simple_grey apm(0.3f, 0.4f, 0.5f);
--
--  boxm_sample<BOXM_APM_SIMPLE_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(apm);
--
--  // sample 1
--  boxm_sample<BOXM_APM_SIMPLE_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(apm);
--
--  // sample 2
--  boxm_sample<BOXM_APM_SIMPLE_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(apm);
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
--    boct_tree<short,data_type> * tree= block->get_tree();//new boct_tree<short,data_type>(3,2);
--    boct_tree_cell<short,data_type>* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,data_type>* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    block->get_tree()->print();
--    scene.write_active_block();
--    iter++;
--  }
--
--  // create the auxiliary scenes for each image
--  std::vector<std::string> image_names;
--  image_names.emplace_back("image1");
--  image_names.emplace_back("image2");
--  image_names.emplace_back("image3");
--  std::vector<boxm_scene<boct_tree<short,aux_type> >*> aux_scenes(image_names.size());
--
--  // create aux scenes
--  for (unsigned i=0; i<image_names.size(); i++) {
--    aux_scenes[i] = new boxm_scene<boct_tree<short,aux_type> >(scene.lvcs(), scene.origin(), scene.block_dim(), scene.world_dim());
--    aux_scenes[i]->set_path(scene.path(),  image_names[i]);
--    iter.begin();
--    while (!iter.end()) {
--      scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--      boxm_block<boct_tree<short,data_type> > * block=scene.get_active_block();
--      boct_tree<short,data_type>* tree=block->get_tree();
--      boct_tree<short,aux_type>* aux_tree = tree->clone_to_type<aux_type>();
--      boct_tree_cell<short,aux_type>* cell1=aux_tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--      boxm_rt_sample<float> rt;
--      rt.seg_len_=1.0;
--      cell1->set_data(rt);
--      boct_tree_cell<short,aux_type>* cell2=aux_tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--      rt.seg_len_=0.5;
--      cell2->set_data(rt);
--      aux_scenes[i]->set_block(iter.index(), new boxm_block<boct_tree<short,aux_type> >(block->bounding_box(), aux_tree));
--      aux_scenes[i]->write_active_block();
--      ++iter;
--    }
--  }
--
--  boxm_opt_rt_bayesian_optimizer<short,BOXM_APM_SIMPLE_GREY,BOXM_AUX_OPT_RT_GREY> opt(scene, image_names);
--  opt.optimize_cells(0.01);
--
--  for (unsigned i=0; i<image_names.size(); i++) {
--    delete aux_scenes[i];
--  }
--}
--
--TESTMAIN(test_bayesian_optimizer);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
-deleted file mode 100644
-index 7473709bdf..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,15 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_bayesian_optimizer );
--DECLARE( test_edges );
--DECLARE( test_shadow_appearance );
--
--void register_tests()
--{
--  REGISTER( test_bayesian_optimizer );
--  REGISTER( test_edges );
--  REGISTER( test_shadow_appearance );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
-deleted file mode 100644
-index 6f6a62f9c6..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_edges.cxx
-+++ /dev/null
-@@ -1,26 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boct/boct_tree.h>
--
--static void test_edges()
--{
--  typedef boxm_inf_line_sample<float> data_type;
--  // create the main scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,data_type> > scene(lvcs, origin, block_dim, world_dim);
--  // create the auxiliary scenes for each image
--  std::vector<std::string> image_names;
--  image_names.emplace_back("image1");
--  image_names.emplace_back("image2");
--  image_names.emplace_back("image3");
--  //boxm_edge_tangent_updater<short, float, aux_type> u(scene,imgs);
--}
--
--TESTMAIN(test_edges);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
-deleted file mode 100644
-index 6b1edbffb5..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_include.cxx
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#include <boxm/algo/rt/boxm_change_3d_functor.h>
--#include <boxm/algo/rt/boxm_change_probability_functor.h>
--#include <boxm/algo/rt/boxm_compute_num_rays_statistics.h>
--#include <boxm/algo/rt/boxm_edge_tangent_updater.h>
--#include <boxm/algo/rt/boxm_edge_updater.h>
--#include <boxm/algo/rt/boxm_expected_edge_functor.h>
--#include <boxm/algo/rt/boxm_generate_edge_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_edge_tangent_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_opt2_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_opt3_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_opt_sample_functor.h>
--#include <boxm/algo/rt/boxm_generate_shadow_sample_functor.h>
--#include <boxm/algo/rt/boxm_opt2_optimizer.h>
--#include <boxm/algo/rt/boxm_opt3_optimizer.h>
--#include <boxm/algo/rt/boxm_opt_appearance_estimator.h>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.h>
--#include <boxm/algo/rt/boxm_pre_infinity_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_depth_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_edge_tangent_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_image_functor.h>
--#include <boxm/algo/rt/boxm_render_expected_shadow_image_functor.h>
--#include <boxm/algo/rt/boxm_rpc_registration.h>
--#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
--#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
--#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.h>
--#include <boxm/algo/rt/boxm_sun_vis_prob_functor.h>
--#include <boxm/algo/rt/boxm_update_image_functor.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
-deleted file mode 100644
-index f97877bc43..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_shadow_appearance.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/algo/rt/boxm_shadow_appearance_estimator.h>
--#include <boct/boct_tree.h>
--#include <boxm/algo/rt/boxm_shadow_app_initializer.h>
--
--namespace test_shadow_appearance_globals
--{
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_type;
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype app_type;
--}
--
--
--static void test_shadow_appearance()
--{
--  using namespace test_shadow_appearance_globals;
--  //normalized observations square building (I-A)/(mu+ - A), partly in shadow
--  double obs_arr[] = {0.600555,0.7,0.061111,0.748335,0.77611,0.68611,
--                      0.148889,0.855555,0.664445,0.651665,0.101111,
--                      0.0272222,0.67278,0.70389,0.1733335,0.77111,
--                      0.701665,0.64778,0.65111,0.72611,0.82889,0.735,
--                      0.077222,0.0816665,0.051111,0.71722,0.61722,
--                      0.065,0.095,0.0866665,0.58611,0.665555};
--  std::vector<obs_type> obs;
--  std::vector<float> pre, vis;
--  for (double i : obs_arr) {
--    obs.push_back(static_cast<obs_type>(i));
--    pre.push_back(0.0f);
--    vis.push_back(1.0f);
--  }
--  float min_app_sigma = 0.05f;
--  float shadow_prior = 0.5f;
--  float shadow_mean = 0.0f;
--  float shadow_sigma = 0.05f;
--  bool verbose = true;
--  app_type model;
--  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(obs, pre, vis,
--                                                       model,
--                                                       min_app_sigma,
--                                                       shadow_prior,
--                                                       shadow_mean,
--                                                       shadow_sigma,
--                                                       verbose);
--  double er = std::fabs(0.70034355-model.color())+
--    std::fabs(model.sigma()- 1.0/11.954589);
--  TEST_NEAR("test shadow appearance EM", er, 0.0, 1e-6);
--  // normalized observations for dark road surface
--double dark_obs_arr[] ={0.0477778,0.0666665,0.0072222,0.175,0.12,
--                        0.162778,0.003333335,0.188889,0.233889,
--                        0.0605555,0.0077778,0.004444445,0.0883335,
--                        0.15,0.0716665,0.1233335,0.1983335,0.15,
--                        0.0883335,0.03944445,0.122222,0.125,0.25,
--                        0.005,0.0122222,0.1,0.1166665,0.03166665,
--                        0.015,0.01,0.1016665,0.167222};
--  std::vector<obs_type> dark_obs;
--  for (double i : dark_obs_arr)
--    dark_obs.push_back(static_cast<obs_type>(i));
--  app_type dark_model;
--  boxm_compute_shadow_appearance<BOXM_APM_SIMPLE_GREY>(dark_obs, pre, vis,
--                                                       dark_model,
--                                                       min_app_sigma,
--                                                       shadow_prior,
--                                                       shadow_mean,
--                                                       shadow_sigma,
--                                                       verbose);
--  double dark_er = std::fabs(0.14765342-dark_model.color())
--                 + std::fabs(dark_model.sigma()- 1.0/16.097824);
--  TEST_NEAR("test dark surface shadow appearance EM", dark_er, 0.0, 1e-6);
--}
--
--TESTMAIN(test_shadow_appearance);
-diff --git a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
-deleted file mode 100644
-index 03c12cb61b..0000000000
---- a/contrib/brl/bseg/boxm/algo/rt/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/algo/rt/boxm_edge_tangent_updater.hxx>
--#include <boxm/algo/rt/boxm_edge_updater.hxx>
--#include <boxm/algo/rt/boxm_opt2_optimizer.hxx>
--#include <boxm/algo/rt/boxm_opt3_optimizer.hxx>
--#include <boxm/algo/rt/boxm_opt_rt_bayesian_optimizer.hxx>
--#include <boxm/algo/rt/boxm_shadow_app_initializer.hxx>
--#include <boxm/algo/rt/boxm_shadow_bayes_optimizer.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
-deleted file mode 100644
-index 16a9fc1839..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/CMakeLists.txt
-+++ /dev/null
-@@ -1,22 +0,0 @@
--# brl/bseg/boxm/algo/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_algo_sp_sources
--    boxm_compute_volume_visibility.h
--    boxm_depth_image_triangle.h
--    boxm_render_image.h
--    boxm_render_image_triangle.h
--    boxm_update.h
--    boxm_update_triangle.h
--    dummy.cxx
--   )
--
--vxl_add_library(LIBRARY_NAME boxm_algo_sp LIBRARY_SOURCES ${boxm_algo_sp_sources})
--
--#processes
--add_subdirectory(pro)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_algo_sp boxm boxm_util boxm_sample boxm_sample_algo boxm_basic bsta imesh ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h b/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
-deleted file mode 100644
-index 1f1bbbd6c9..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_compute_volume_visibility.h
-+++ /dev/null
-@@ -1,172 +0,0 @@
--#ifndef boxm_compute_volume_visibility_h
--#define boxm_compute_volume_visibility_h
--#include <iostream>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--float boxm_compute_point_visibility(vgl_point_3d<double> point,
--                                    boxm_scene<boct_tree<T_loc, T_data > > & scene,
--                                    vpgl_camera_double_sptr & camera )
--{
--  typedef boct_tree<T_loc,T_data > tree_type;
--  // locate the cells corresponding to query volume.
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    // make a test for vertices for behind-front case
--    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--
--    std::cout<<"The point is "<<point;
--    if (cam->is_behind_camera(vgl_homg_point_3d<double>(point)))
--    return 1.0f;
--    // first block of intersection
--
--    // case 1 : when the camera lies inside the scene
--    vgl_homg_point_3d<double> cam_center_homg = cam->camera_center();
--    vgl_point_3d<double> cam_center(cam_center_homg);
--    vgl_point_3d<int> curr_block_index;
--
--    vgl_vector_3d<double> dir=(point-cam_center);
--    double lambda0=dir.length();
--    dir/=lambda0;
--
--    boxm_block<tree_type> * curr_block=scene.get_block(cam_center);
--    vgl_point_3d<double> entry_point=cam_center;
--    double lambda=0;
--
--    // case 2: camera lies outside the scene
--    if (!curr_block)
--    {
--      vgl_box_3d<double> world_bb=scene.get_world_bbox();
--      boct_face_idx face_id;
--      if (!boxm_utils::cube_entry_point(world_bb,cam_center,dir,entry_point,lambda,face_id))
--      return 1.0f;
--      if (!scene.get_block_index(entry_point,curr_block_index))
--      return 1.0f;
--    }
--    else
--    {
--      scene.get_block_index(cam_center,curr_block_index);
--    }
--
--    scene.load_block(curr_block_index);
--    curr_block=scene.get_active_block();
--    bool continue_flag=true;
--
--    tree_type * tree=curr_block->get_tree();
--
--    vgl_point_3d<double> exit_point;
--    boct_face_idx face_id=NONE;
--    double alpha_int=0;
--    boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(entry_point);
--    while (continue_flag)
--    {
--      // do processing in the block
--      if (curr_cell)
--      {
--        if (boxm_utils::cube_exit_point(tree->cell_bounding_box(curr_cell),
--        cam_center,dir,exit_point,lambda,face_id))
--        {
--          if (lambda>lambda0)
--          continue_flag=false;
--          else
--          {
--            std::vector<boct_tree_cell<T_loc,T_data > * > neighbors;
--            curr_cell->find_neighbors(face_id,neighbors,tree->root_level());
--
--            vgl_vector_3d<double> len(exit_point-entry_point);
--            T_data data=curr_cell->data();
--            alpha_int-=data.alpha*len.length();
--            curr_cell=nullptr;
--#if 0
--            std::cout<<"Lambda= "<<lambda<<" lambda0= "<<lambda0
--                    <<" exit_point="<<exit_point<<"# of neighbors"<< neighbors.size()<<std::endl;
--#endif
--            double min_dist=1e5;
--            int min_i=-1;
--            for (unsigned i=0;i<neighbors.size();++i)
--            {
--              vgl_box_3d<double> bbox=tree->cell_bounding_box(neighbors[i]);
--              double dist=0;
--              if (exit_point.x()<bbox.min_x())
--                dist+=std::fabs(exit_point.x()-bbox.min_x());
--              if (exit_point.x()>bbox.max_x())
--                dist+=std::fabs(exit_point.x()-bbox.max_x());
--              if (exit_point.y()<bbox.min_y())
--                dist+=std::fabs(exit_point.y()-bbox.min_y());
--              if (exit_point.y()>bbox.max_y())
--                dist+=std::fabs(exit_point.y()-bbox.max_y());
--              if (exit_point.z()<bbox.min_z())
--                dist+=std::fabs(exit_point.z()-bbox.min_z());
--              if (exit_point.z()>bbox.max_z())
--                dist+=std::fabs(exit_point.z()-bbox.max_z());
--
--              if (dist<min_dist)
--              {
--                min_dist=dist;
--                min_i=i;
--              }
--            }
--            if (min_i>=0)
--              curr_cell=neighbors[min_i];
--            else if (neighbors.size()>0)
--            {
--              std::cout<<"ERROR"<<std::endl;return -1.0f;
--            }
--            entry_point=exit_point;
--          }
--        }
--      }
--      // when the block is exhausted obtain a new block
--      else
--      {
--        if (face_id==X_LOW)
--          curr_block_index.set(curr_block_index.x()-1,curr_block_index.y(),curr_block_index.z());
--        if (face_id==X_HIGH)
--          curr_block_index.set(curr_block_index.x()+1,curr_block_index.y(),curr_block_index.z());
--        if (face_id==Y_LOW)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y()-1,curr_block_index.z());
--        if (face_id==Y_HIGH)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y()+1,curr_block_index.z());
--        if (face_id==Z_LOW)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()-1);
--        if (face_id==Z_HIGH)
--          curr_block_index.set(curr_block_index.x(),curr_block_index.y(),curr_block_index.z()+1);
--
--        if (scene.valid_index(curr_block_index))
--        {
--          scene.load_block(curr_block_index);
--          curr_block=scene.get_active_block();
--          tree=curr_block->get_tree();
--          curr_cell=tree->locate_point_global(entry_point);
--        }
--        else
--        {
--          continue_flag=false;
--        }
--      }
--    }
--    return (float)std::exp(alpha_int);
--  }
--  else
--  {
--  std::cout<<"Not a perspective camera"<<std::endl;
--  return -1.0f;
--  }
--}
--
--
--template <class T_loc, class T_data>
--float boxm_compute_volume_visibility(vgl_box_3d<double> bbox,
--                                     boxm_scene<boct_tree<T_loc,T_data> > & scene,
--                                     vpgl_camera_double_sptr & cam )
--{
--  // locate the cells corresponding to query volume.
--  return boxm_compute_point_visibility<T_loc,T_data>(bbox.centroid(),scene,cam);
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
-deleted file mode 100644
-index bb07d38325..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_depth_image_triangle.h
-+++ /dev/null
-@@ -1,127 +0,0 @@
--#ifndef boxm_depth_image_triangle_h_
--#define boxm_depth_image_triangle_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include "boxm_render_image.h"
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vpgl/vpgl_camera.h>
--
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#include <vil/vil_transform.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vul/vul_timer.h>
--
--
--template <class T_loc, class T_data>
--void boxm_depth_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                         vpgl_camera_double_sptr cam,
--                                         vil_image_view<float> &expected,
--                                         vil_image_view<float> &mask)
--{
--  unsigned ni=expected.ni();
--  unsigned nj=expected.nj();
--  expected.fill(0.0f);
--  vgl_plane_3d<double> projection_plane;
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
--  vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
--  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
--  vul_timer t;
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
--  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
--
--  while (block_vis_iter.next())
--  {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) // code for each block
--    {
--      t.mark();
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      t.mark();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_depth(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
--      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
--      normalize_expected_functor norm_fn;
--
--      double xverts[8];
--      double yverts[8];
--      float vertdists[8];
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        vis_end.fill(0.0f);
--        temp_depth.fill(0.0f);
--        temp_weights.fill(0.0f);
--        alpha_img_.fill(0.0f);
--
--        std::cout<<'.';
--
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          //if (sample.alpha>0.001)
--          {
--            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--            // get  alpha
--            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--            boxm_depth_fill(xverts, yverts, vertdists, vis_face_ids,temp_depth);
--          }
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights_);
--
--        // scale cell expected image by weighting function..
--        vil_math_image_product( temp_depth,pix_weights_, temp_depth);
--        // ..and use result to update final expected image
--        vil_math_image_sum(temp_depth,expected,expected);
--
--        vis.deep_copy(vis_end);
--      }
--    }
--  }
--  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
-deleted file mode 100644
-index d6cd56258c..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image.h
-+++ /dev/null
-@@ -1,166 +0,0 @@
--#ifndef boxm_render_image_h_
--#define boxm_render_image_h_
--
--#include <vector>
--#include <sstream>
--#include <iostream>
--
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#include <vil/vil_transform.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vul/vul_timer.h>
--
--class normalize_expected_functor
--{
-- public:
--  normalize_expected_functor() = default;
--
--  void operator()(float  norm, float & val) const
--  {
--    if (norm>0)
--      val/=norm;
--  }
--};
--
--class image_exp_functor
--{
-- public:
--  float operator()(float x) const { return x<0?std::exp(x):1.0f; }
--};
--
--
--template <class T_loc, class T_data>
--void boxm_render_image_splatting(boxm_scene<boct_tree<T_loc,T_data> >& scene,
--                                 vpgl_camera_double_sptr cam,
--                                 vil_image_view<typename T_data::obs_datatype>& expected,
--                                 vil_image_view<float>& /*mask*/,       // TODO: use this param
--                                 int bin=-1,
--                                 bool /*use_black_background*/ = false) // TODO: use this param
--{
--  unsigned ni=expected.ni();
--  unsigned nj=expected.nj();
--  expected.fill(0.0f);
--
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
--  vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
--
--  vul_timer t;
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
--  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
--
--  int cnt=0;
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--
--      t.mark();
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
--
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      std::cout<<"Block: "<<curr_block->bounding_box()<<std::endl
--              <<"Tree: "<<curr_block->get_tree()->number_levels()
--              << " #of leaf cells "<<curr_block->get_tree()->leaf_cells().size()<<std::endl;
--
--      t.mark();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(expected.ni(),expected.nj(),3);
--      vil_image_view<float> back_xyz(expected.ni(),expected.nj(),3);
--      vil_image_view<float> alphas(expected.ni(),expected.nj(),1);
--      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
--      normalize_expected_functor norm_fn;
--
--      double  xverts[8];
--      double  yverts[8];
--
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        front_xyz.fill(0.0f);
--        back_xyz.fill(0.0f);
--        alphas.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        temp_weights.fill(0.0f);
--        std::cout<<'.';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          //if (sample.alpha>0.001)
--          {
--            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--            boxm_utils::project_corners(corners,cam,xverts,yverts);
--            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--            boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
--            // get expected color of cell
--            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
--            // get  alpha
--            boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--            // fill expected value image
--            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
--            boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
--         }
--        }
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(expected.ni(),expected.nj(),1);
--
--        len_seg.fill(0.0f);
--        std::stringstream s,s1;
--
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,back_xyz);
--        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
--        vil_math_sqrt<float>(len_seg);
--        vil_math_image_product(len_seg,alphas, alphas);
--        vil_transform2(temp_weights,temp_expected,norm_fn);
--        ++cnt;
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,vis);
--        // scale cell expected image by weighting function..
--        vil_math_image_product( temp_expected,vis, temp_expected);
--        // ..and use result to update final expected image
--        vil_math_image_sum(temp_expected,expected,expected);
--
--        vis.deep_copy(vis_end);
--      }
--      scene.write_active_block();
--    }
--  }
--  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
-deleted file mode 100644
-index abcca0dbe5..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_render_image_triangle.h
-+++ /dev/null
-@@ -1,167 +0,0 @@
--#ifndef boxm_render_image_triangle_h_
--#define boxm_render_image_triangle_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include "boxm_render_image.h"
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vpgl/vpgl_perspective_camera.h>
--
--#include <vil/vil_image_view.h>
--#include <vil/vil_math.h>
--#include <vil/vil_transform.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vul/vul_timer.h>
--
--
--//: Functor class to normalize expected image
--template<class T_data>
--class normalize_expected_functor_splatting
--{
-- public:
--  normalize_expected_functor_splatting(bool use_black_background) : use_black_background_(use_black_background) {}
--
--  void operator()(float mask, typename T_data::obs_datatype &pix) const
--  {
--    if (!use_black_background_) {
--      pix += mask*0.5f;
--    }
--  }
--  bool use_black_background_;
--};
--
--template <class T_loc, class T_data>
--void boxm_render_image_splatting_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                          vpgl_camera_double_sptr cam,
--                                          vil_image_view<typename T_data::obs_datatype> &expected,
--                                          vil_image_view<float> &/*mask*/, // FIXME: use this param
--                                          int bin=-1,
--                                          bool use_black_background = false)
--{
--  unsigned ni=expected.ni();
--  unsigned nj=expected.nj();
--  expected.fill(0.0f);
--  vgl_plane_3d<double> projection_plane;
--  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
--    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
--    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,expected.ni(),expected.nj());
--  }
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  vil_image_view<float> vis(expected.ni(),expected.nj(),1);
--  vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(expected.ni(),expected.nj(),1); alpha_integral.fill(0.0f);
--  vil_image_view<float> alpha_img_(expected.ni(),expected.nj(),1);
--  vul_timer t;
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > >
--  block_vis_iter(cam, &scene, expected.ni(), expected.nj());
--
--  while (block_vis_iter.next())
--  {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) // code for each block
--    {
--      t.mark();
--      //if (block_indices[i].x()!=2 || block_indices[i].z()!=0)
--      //  continue;
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      std::cout<<"The time taken to read a block is "<<t.all()<<std::endl;
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      t.mark();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--      std::cout<<"The time taken to build the vis graph is "<<t.all()<<std::endl;
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> vis_end(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_expected(expected.ni(),expected.nj(),1);
--      vil_image_view<float> temp_weights(expected.ni(),expected.nj(),1);
--      vil_image_view<float> pix_weights_(expected.ni(),expected.nj(),1);
--      normalize_expected_functor norm_fn;
--
--      double  xverts[8];
--      double  yverts[8];
--      float vertdists[8];
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        temp_weights.fill(0.0f);
--        alpha_img_.fill(0.0f);
--
--        std::cout<<'.';
--
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          //if (sample.alpha>0.001)
--          {
--            // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--            std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--            if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--            {
--              boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--            }
--            else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--              boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--            }
--            boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--            //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
--            // get expected color of cell
--            typename T_data::obs_datatype cell_expected  =T_data::apm_processor::expected_color(sample.appearance(bin));
--            // get  alpha
--            boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--
--            cube_fill_value(xverts, yverts, vis_face_ids, temp_expected,  cell_expected);            // fill expected value image
--            //boxm_utils::project_cube_fill_val( vis_face_ids,temp_expected,(float)cell_expected, xverts,yverts);
--            //boxm_utils::project_cube_fill_val_aa( vis_face_ids,temp_expected,temp_weights,(float)cell_expected, xverts,yverts);
--          }
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights_);
--
--        // scale cell expected image by weighting function..
--        vil_math_image_product( temp_expected,pix_weights_, temp_expected);
--        // ..and use result to update final expected image
--        vil_math_image_sum(temp_expected,expected,expected);
--
--        vis.deep_copy(vis_end);
--      }
--    }
--  }
--  normalize_expected_functor_splatting<T_data> norm_fn(use_black_background);
--  vil_transform2<float,typename T_data::obs_datatype, normalize_expected_functor_splatting<T_data> >(vis,expected,norm_fn);
--
--  std::cout<<"\nThe time taken is"<< t.all()<<std::endl;
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
-deleted file mode 100644
-index 9642cdd4c1..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_update.h
-+++ /dev/null
-@@ -1,374 +0,0 @@
--#ifndef boxm_update_h_
--#define boxm_update_h_
--//:
--//\file
--#include <iostream>
--#include "boxm_render_image.h"
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_block.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vil/vil_math.h>
--#include <vil/vil_save.h>
--#include <vul/vul_timer.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: functor used for normalizing cell_expected image
--template <class T_loc, class T_data>
--void boxm_update_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                       vpgl_camera_double_sptr cam,
--                       vil_image_view<typename T_data::obs_mathtype> &img,
--                       vil_image_view<float> &norm_img,
--                       typename T_data::apm_datatype background_model, int bin)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--
--  vil_image_view<float> pre(ni,nj,1); pre.fill(0.0f);
--  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
--  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
--
--#if 0 // TODO: vgl_plane_3d<double> has no constructor with 3 double params....???!!!
--  //       and projection_plane is unused ..!!
--  if (vpgl_rational_camera<double> const* rcam = dynamic_cast<vpgl_rational_camera<double> const*>(cam.as_pointer())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(bbox.min_x(),bbox.min_y(),bbox.max_z());
--    vgl_plane_3d<double> bottom(bbox.min_x(),bbox.min_y(),bbox.min_z());
--    vgl_plane_3d<double> projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
--  }
--#endif // 0
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(ni,nj,1);
--      vil_image_view<float> back_xyz(ni,nj,1);
--      vil_image_view<float> alphas(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      int cnt=0;
--      while (frontier_it.next())
--      {
--        ++cnt;
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        front_xyz.fill(0.0f);
--        back_xyz.fill(0.0f);
--        alphas.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--        std::cout<<cnt<<' ';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (vpgl_camera_double_sptr pcam = dynamic_cast<vpgl_perspective_camera<double>*>(cam.as_pointer()))
--          {
--            boxm_utils::project_corners(corners,pcam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double>* rcam = dynamic_cast<vpgl_rational_camera<double>*>(cam.as_pointer())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,vgl_plane_3d<double>(),xverts,yverts,vertdists);
--            // TODO: 3rd argument should most likely be a "real" plane!!!
--          }
--
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          // get  alpha
--          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--        }
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
--        //vil_math_sum_sqr<float,float>(back_xyz,len_seg);
--        //vil_math_sqrt<float>(len_seg);
--
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--
--          typename T_data::obs_datatype cell_mean_obs;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, img, len_seg,cell_mean_obs,xverts,yverts)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--            // fill obs probability density image
--            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,cell_PI, xverts,yverts);
--          }
--        }
--        vil_math_image_product(len_seg,alphas, alphas);
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,vis);
--        // scale cell expected image by weighting function..
--        vil_math_image_product( PI_img,vis, PI_img);
--        // ..and use result to update final expected image
--        vil_math_image_sum(PI_img,pre,pre);
--
--        vis.deep_copy(vis_end);
--#if 0
--        if (cnt == 70) {
--          std::cout << "saving debug images" << std::endl;
--          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
--          vil_save(len_seg,(output_dir + "len_seg.tiff").c_str());
--          vil_save(alphas,(output_dir + "alphas.tiff").c_str());
--          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
--          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
--          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
--          vil_save(vis,(output_dir + "vis.tiff").c_str());
--          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
--          vil_save(img,(output_dir + "obs.tiff").c_str());
--        }
--#endif
--      }
--
--      scene.write_active_block();
--    }
--  }
--  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
--  for (unsigned int j=0; j<img.nj(); ++j) {
--    for (unsigned int i=0; i<img.ni(); ++i) {
--      // this will have to be modified slightly when we deal with multi-plane images -dec
--      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
--    }
--  }
--
--  vil_math_image_product(PI_background, vis, norm_img);
--  vil_math_image_sum(pre,norm_img,norm_img);
--  safe_inverse_functor inv_func(1e-8f);
--  vil_transform(norm_img, inv_func);
--}
--
--
--template <class T_loc, class T_data>
--void boxm_update_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                       vpgl_camera_double_sptr cam,
--                       vil_image_view<typename T_data::obs_mathtype> &img,
--                       vil_image_view<float> &norm_img, int bin)
--{
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  typedef boct_tree<T_loc, T_data > tree_type;
--  typedef boct_tree_cell<T_loc, T_data > cell_type;
--  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
--  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(ni,nj,1); alpha_integral.fill(0.0f);
--  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
--  vil_image_view<float> pix_weights(ni,nj,1);
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--
--  vul_timer t;  t.mark();
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(ni,nj,1);
--      vil_image_view<float> back_xyz(ni,nj,1);
--      vil_image_view<float> alphas(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      vil_image_view<float> update_factor(ni,nj,1);
--      unsigned count=0;
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        front_xyz.fill(0.0f);
--        back_xyz.fill(0.0f);
--        alphas.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--
--        std::cout<<'.';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          // get  alpha
--          boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--        }
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
--
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          //// get  alpha
--          //boxm_utils::project_cube_fill_val( vis_face_ids,alphas,sample.alpha, xverts,yverts);
--          typename T_data::obs_datatype cell_mean_obs;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, img,len_seg, cell_mean_obs,xverts,yverts)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--#if 0
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--#endif // 0
--            // fill obs probability density image
--            boxm_utils::project_cube_fill_val(vis_face_ids,PI_img,(float)cell_PI, xverts,yverts);
--          }
--          float cell_mean_vis = 0.0f;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, vis, len_seg,cell_mean_vis,xverts,yverts)) {
--            // update appearance model
--            if (cell_mean_vis > 1e-6) {
--              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
--            }
--          }
--          (*cell_it)->set_data(sample);
--        }
--#if 0
--        // compute the length of ray segment at each pixel
--        vil_image_view<float> len_seg(ni,nj,1);len_seg.fill(0.0f);
--        vil_math_image_difference<float,float>(back_xyz,front_xyz,len_seg);
--        vil_math_sum_sqr<float,float>(back_xyz,len_seg);
--        vil_math_sqrt<float>(len_seg);
--#endif // 0
--        vil_math_image_product(len_seg,alphas, alphas);
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alphas, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights);
--        // multiply PI by vis..
--        vil_math_image_product(PI_img, vis, update_factor);
--        // ..add preX to get numerator term for update..
--        vil_math_image_sum(pre_img, update_factor, update_factor);
--        //.. and normalize
--        vil_math_image_product(norm_img, update_factor, update_factor);
--
--        float max_cell_P=0.99f;
--        float min_cell_P=0.001f;
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          boxm_utils::project_corners(corners,cam,xverts,yverts);
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts);
--          float mean_update_factor = 0.0f;
--          if (boxm_utils::cube_weighted_mean(vis_face_ids, update_factor,len_seg, mean_update_factor,xverts,yverts))
--          {  // update alpha value
--            sample.alpha *= mean_update_factor;
--            // do bounds check on new alpha value
--            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
--            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
--            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
--            if (sample.alpha > max_alpha)
--            sample.alpha = max_alpha;
--
--            if (sample.alpha < min_alpha)
--            sample.alpha = min_alpha;
--
--            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
--              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
--                       << "mean_update_factor = " << mean_update_factor << '\n';
--            }
--            (*cell_it)->set_data(sample);
--          }
--        }
--        // multiply cell_PI by cell weights
--        vil_math_image_product(pix_weights, PI_img, PI_img);
--        // update pre_img
--        vil_math_image_sum(PI_img, pre_img, pre_img);
--
--        vis.deep_copy(vis_end);
--      }
--      scene.write_active_block();
--    }
--  }
--}
--
--template <class T_loc, class T_data>
--void boxm_update(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                 vil_image_view<typename T_data::obs_datatype> &img,
--                 vpgl_camera_double_sptr cam, int bin=-1,
--                 bool black_background = false)
--{
--  typename T_data::apm_datatype background_apm;
--
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    for (unsigned int i=0; i<4; ++i) {
--      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
--      T_data::apm_processor::prob_density(background_apm,0.0f);
--    }
--  }
--  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
--  boxm_update_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
--  std::cout << "update: pass1 completed" << std::endl;
--  vil_save(norm_img,"D:/vj/scripts/boxm/exp1/norm.tiff");
--  boxm_update_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
--  std::cout << "update: pass2 completed" << std::endl;
--
--  return;
--}
--
--#endif // boxm_update_h_
-diff --git a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h b/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
-deleted file mode 100644
-index 723284ff3b..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/boxm_update_triangle.h
-+++ /dev/null
-@@ -1,356 +0,0 @@
--#ifndef boxm_update_triangle_h_
--#define boxm_update_triangle_h_
--//:
--// \file
--#include <iostream>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_block.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vil/vil_math.h>
--#include <vul/vul_timer.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: functor used for normalizing cell_expected image
--template <class T_loc, class T_data>
--void boxm_update_triangle_pass1(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                vpgl_camera_double_sptr cam,
--                                vil_image_view<typename T_data::obs_mathtype> &img,
--                                vil_image_view<float> &norm_img,
--                                typename T_data::apm_datatype background_model, int bin)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc, T_data> cell_type;
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--
--  vil_image_view<float> pre(ni,nj,1);
--  vil_image_view<float> vis(ni,nj,1);
--  vil_image_view<float> alpha_integral(ni,nj,1);
--  vil_image_view<float> PI_img(ni,nj,1);
--  vil_image_view<float> pix_weights_(ni,nj,1);
--  vil_image_view<float> alpha_img_(ni,nj,1);
--
--  alpha_integral.fill(0.0f);
--  pre.fill(0.0f);
--  vis.fill(1.0f);
--
--  vgl_plane_3d<double> projection_plane;
--  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
--    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
--    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
--  }
--
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc, T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next())
--  {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) // code for each block
--    {
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      // project vertices to the image determine which faces of the cell are visible
--      boxm_cell_vis_graph_iterator<T_loc,T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> front_xyz(ni,nj,1);
--      vil_image_view<float> back_xyz(ni,nj,1);
--      vil_image_view<float> alphas(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      int cnt=0;
--
--      while (frontier_it.next())
--      {
--        ++cnt;
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        alpha_img_.fill(0.0f);
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--          {
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--          }
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          //boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdists);
--          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--
--
--          typename T_data::obs_datatype cell_mean_obs;
--          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--            // fill obs probability density image
--            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
--          }
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights_);
--        // scale cell expected image by weighting function..
--        vil_math_image_product( pix_weights_,PI_img, PI_img);
--        // ..and use result to update final expected image
--        vil_math_image_sum(PI_img,pre,pre);
--        vis.deep_copy(vis_end);
--#if 0
--        if (cnt == 10) {
--          std::cout << "saving debug images" << std::endl;
--          std::string output_dir = "D:/vj/scripts/boxm/exp1/";
--          vil_save(alpha_img_,(output_dir + "alpha_img.tiff").c_str());
--          vil_save(alpha_integral,(output_dir + "alpha_integral.tiff").c_str());
--          vil_save(pre,(output_dir + "pre_img.tiff").c_str());
--          vil_save(PI_img,(output_dir + "PI_img.tiff").c_str());
--          vil_save(vis,(output_dir + "vis.tiff").c_str());
--          vil_save(vis_end,(output_dir + "vis_end.tiff").c_str());
--          vil_save(img,(output_dir + "obs.tiff").c_str());
--        }
--#endif
--      }
--      scene.write_active_block();
--    }
--  }
--  vil_image_view<float> PI_background(norm_img.ni(),norm_img.nj(),1);
--  for (unsigned int j=0; j<img.nj(); ++j) {
--    for (unsigned int i=0; i<img.ni(); ++i) {
--      // this will have to be modified slightly when we deal with multi-plane images -dec
--      PI_background(i,j) = T_data::apm_processor::prob_density(background_model, img(i,j));
--    }
--  }
--
--  vil_math_image_product(PI_background, vis, norm_img);
--  vil_math_image_sum(pre,norm_img,norm_img);
--  safe_inverse_functor inv_func(1e-8f);
--  vil_transform(norm_img, inv_func);
--}
--
--
--template <class T_loc, class T_data>
--void boxm_update_triangle_pass2(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                vpgl_camera_double_sptr cam,
--                                vil_image_view<typename T_data::obs_mathtype> &img,
--                                vil_image_view<float> &norm_img, int bin)
--{
--  unsigned ni=img.ni();
--  unsigned nj=img.nj();
--  typedef boct_tree<T_loc, T_data > tree_type;
--  typedef boct_tree_cell<T_loc, T_data > cell_type;
--  vil_image_view<float> pre_img(ni,nj,1); pre_img.fill(0.0f);
--  vil_image_view<float> vis(ni,nj,1); vis.fill(1.0f);
--  vil_image_view<float> alpha_integral(ni,nj,1);
--  vil_image_view<float> PI_img(ni,nj,1); PI_img.fill(0.0f);
--  vil_image_view<float> pix_weights(ni,nj,1);
--  alpha_integral.fill(0.0f);
--  pre_img.fill(0.0f);
--  vis.fill(1.0f);
--
--  double xverts[8];
--  double yverts[8];
--  float vertdists[8];
--  vgl_plane_3d<double> projection_plane;
--  if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--    vgl_box_3d<double> bbox=scene.get_world_bbox();
--    vgl_plane_3d<double> top(0,0,1,-bbox.max_z());
--    vgl_plane_3d<double> bottom(0,0,1,-bbox.min_z());
--    projection_plane=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam, top, bottom,img.ni(),img.nj());
--  }
--  vul_timer t;  t.mark();
--  // code to iterate over the blocks in order of visibility
--  boxm_block_vis_graph_iterator<boct_tree<T_loc,T_data > > block_vis_iter(cam, &scene, ni,nj);
--  while (block_vis_iter.next()) {
--    std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--    for (auto & block_indice : block_indices) { // code for each block
--      scene.load_block(block_indice.x(),block_indice.y(),block_indice.z());
--      boxm_block<tree_type> * curr_block=scene.get_active_block();
--      boxm_cell_vis_graph_iterator<T_loc, T_data > frontier_it(cam,curr_block->get_tree(),ni,nj);
--
--      // for each frontier layer of each block
--      tree_type * tree=curr_block->get_tree();
--      vil_image_view<float> alpha_img_(ni,nj,1);
--      vil_image_view<float> vis_end(ni,nj,1);
--      vil_image_view<float> temp_expected(ni,nj,1);
--      vil_image_view<float> update_factor(ni,nj,1);
--
--      while (frontier_it.next())
--      {
--        std::vector<cell_type *> vis_cells=frontier_it.frontier();
--        typename std::vector<cell_type *>::iterator cell_it=vis_cells.begin();
--        vis_end.fill(0.0f);
--        temp_expected.fill(0.0f);
--        PI_img.fill(0.0f);
--        alpha_img_.fill(0.0f);
--
--        std::cout<<'.';
--        for (;cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--          {
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--          }
--
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--          boxm_alpha_seg_len(xverts, yverts, vertdists, vis_face_ids, sample.alpha, alpha_img_);
--          typename T_data::obs_datatype cell_mean_obs;
--          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,img,cell_mean_obs)) {
--            // get probability density of mean observation
--            float cell_PI = T_data::apm_processor::prob_density(sample.appearance(bin), cell_mean_obs);
--#if 0
--            if (!((cell_PI >= 0) && (cell_PI < 1e8)) ) {
--              std::cout << "\ncell_PI = " << cell_PI << '\n'
--                       << "  cell_obs = " << cell_mean_obs << '\n'
--                       << "  cell id = " << *cell_it << std::endl;
--            }
--#endif // 0
--            // fill obs probability density image
--            cube_fill_value(xverts, yverts, vis_face_ids, PI_img, cell_PI);
--          }
--          float cell_mean_vis = 0.0f;
--          if (cube_mean(xverts, yverts, vertdists, vis_face_ids,vis,cell_mean_vis)) {
--            // update appearance model
--            if (cell_mean_vis > 1e-6) {
--              T_data::apm_processor::update(sample.appearance(bin), cell_mean_obs, cell_mean_vis);
--            }
--          }
--          (*cell_it)->set_data(sample);
--        }
--        abs_functor abs_fun;
--        vil_transform(alpha_img_,alpha_img_,abs_fun);
--
--        // compute visibility
--        vil_math_image_difference(alpha_integral, alpha_img_, alpha_integral);
--
--        // compute new vis image
--        image_exp_functor exp_fun;
--        vil_transform(alpha_integral,vis_end,exp_fun);
--        // compute weights for each pixel
--        vil_math_image_difference(vis,vis_end,pix_weights);
--        // multiply PI by vis..
--        vil_math_image_product(PI_img, vis, update_factor);
--        // ..add preX to get numerator term for update..
--        vil_math_image_sum(pre_img, update_factor, update_factor);
--        //.. and normalize
--        vil_math_image_product(norm_img, update_factor, update_factor);
--
--
--        float max_cell_P=0.99f;
--        float min_cell_P=0.001f;
--        for (cell_it=vis_cells.begin();cell_it!=vis_cells.end();cell_it++)
--        {
--          // for each cell
--          T_data sample=(*cell_it)->data();
--          // get vertices of cell in the form of a bounding box (cells are always axis-aligned))
--          vgl_box_3d<double> cell_bb = tree->cell_bounding_box(*cell_it);
--          std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--          if (dynamic_cast<vpgl_perspective_camera<double> *>(cam.ptr()))
--          {
--            boxm_utils::project_corners(corners,cam,xverts,yverts,vertdists);
--          }
--          else if (vpgl_rational_camera<double> * rcam = dynamic_cast<vpgl_rational_camera<double> *>(cam.ptr())) {
--            boxm_rational_camera_utils::project_corners_rational_camera(corners,rcam,projection_plane,xverts,yverts,vertdists);
--          }
--          boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam,xverts,yverts);
--
--          float mean_update_factor = 0.0f;
--          if (cube_mean(xverts,yverts,vertdists,vis_face_ids, update_factor, mean_update_factor))
--          {
--            // update alpha value
--            sample.alpha *= mean_update_factor;
--            // do bounds check on new alpha value
--            float cell_len = float(cell_bb.max_x() - cell_bb.min_x());
--            float max_alpha = -std::log(1.0f - max_cell_P)/cell_len;
--            float min_alpha = -std::log(1.0f - min_cell_P)/cell_len;
--            if (sample.alpha > max_alpha)
--            sample.alpha = max_alpha;
--
--            if (sample.alpha < min_alpha)
--            sample.alpha = min_alpha;
--
--            if (!((sample.alpha >= min_alpha) && (sample.alpha <= max_alpha))) {
--              std::cerr << "\nerror: cell.alpha = " << sample.alpha << '\n'
--                       << "mean_update_factor = " << mean_update_factor << '\n';
--            }
--            (*cell_it)->set_data(sample);
--          }
--        }
--        // multiply cell_PI by cell weights
--        vil_math_image_product(pix_weights, PI_img, PI_img);
--        // update pre_img
--        vil_math_image_sum(PI_img, pre_img, pre_img);
--        vis.deep_copy(vis_end);
--      }
--      scene.write_active_block();
--    }
--  }
--}
--
--template <class T_loc, class T_data>
--void boxm_update_triangle(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                          vil_image_view<typename T_data::obs_datatype> &img,
--                          vpgl_camera_double_sptr cam, int bin=-1,
--                          bool black_background = false)
--{
--  typename T_data::apm_datatype background_apm;
--
--  if (black_background) {
--    std::cout << "using black background model" << std::endl;
--    for (unsigned int i=0; i<4; ++i) {
--      T_data::apm_processor::update(background_apm, 0.0f, 1.0f);
--      T_data::apm_processor::prob_density(background_apm,0.0f);
--    }
--  }
--  vil_image_view<float> norm_img(img.ni(), img.nj(), 1);
--  boxm_update_triangle_pass1<T_loc,T_data>(scene, cam,img,norm_img,background_apm,bin);
--  std::cout << "update: pass1 completed" << std::endl;
--  boxm_update_triangle_pass2<T_loc,T_data>(scene, cam,img,norm_img,bin);
--  std::cout << "update: pass2 completed" << std::endl;
--
--  return;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/dummy.cxx b/contrib/brl/bseg/boxm/algo/sp/dummy.cxx
-deleted file mode 100644
-index e69de29bb2..0000000000
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-deleted file mode 100644
-index 41fe3f9dbd..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,27 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and bvxm_prodepends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--  set(boxm_algo_sp_pro_sources
--      boxm_algo_sp_processes.h
--      boxm_algo_sp_register.h   boxm_algo_sp_register.cxx
--     )
--  aux_source_directory(Templates boxm_algo_sp_pro_sources)
--  aux_source_directory(processes boxm_algo_sp_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_algo_sp_pro LIBRARY_SOURCES ${boxm_algo_sp_pro_sources} )
--  target_link_libraries(boxm_algo_sp_pro boxm boxm_algo_sp boxm_util bprb brdb brip sdet vsol vil_pro ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil)
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
-deleted file mode 100644
-index 5339909524..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/Templates/brdb_value_t+vil_image_view_base_sptr-.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vil/vil_image_view_base.h>
--#include <vil/io/vil_io_smart_ptr.h>
--
--#include <vil/io/vil_io_image_view_base.h>
--
--typedef vil_image_view_base_sptr img_sptr;
--
--BRDB_VALUE_INSTANTIATE(img_sptr, "vil_image_view_base_sptr");
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
-deleted file mode 100644
-index 24cdc3672a..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_processes.h
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#ifndef boxm_algo_sp_processes_h_
--#define boxm_algo_sp_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_volume_visibility_process);
--DECLARE_FUNC_CONS(boxm_update_process);
--DECLARE_FUNC_CONS(boxm_render_expected_process);
--
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
-deleted file mode 100644
-index 8acaac16c3..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.cxx
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#include "boxm_algo_sp_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "boxm_algo_sp_processes.h"
--
--void boxm_algo_sp_register::register_datatype()
--{
--}
--
--void boxm_algo_sp_register::register_process()
--{
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_update_process,"boxmUpdateSPProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_render_expected_process, "boxmRenderExpectedProcess");
--    REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_volume_visibility_process, "boxmVolumeVisibilityProcess");
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h b/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
-deleted file mode 100644
-index 5b7f15d213..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/boxm_algo_sp_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_algo_sp_register_h_
--#define boxm_algo_sp_register_h_
--
--class boxm_algo_sp_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_algo_sp_register_h_
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
-deleted file mode 100644
-index 6ffd752df2..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
-+++ /dev/null
-@@ -1,117 +0,0 @@
--// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_render_expected_process.cxx
--
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_convert.h>
--
--namespace boxm_render_expected_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--bool boxm_render_expected_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_process_globals;
--
--  //process takes 5 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4]: bin number
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "unsigned";
--
--  // process has 2 outputs:
--  // output[0]: rendered image
--  // output[0]: mask
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--  output_types_[1] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_render_expected_process(bprb_func_process& pro)
--{
--  using namespace boxm_render_expected_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--
--  vil_image_view_base_sptr img;
--  vil_image_view_base_sptr img_mask;
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(ni,nj);
--    vil_image_view<float> mask(ni,nj);
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_splatting_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,-1,true);
--    }
--    else
--    {
--      auto bin = pro.get_input<unsigned>(i++);
--      std::cout<<"Multi Bin"<<std::endl;
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      boxm_render_image_splatting_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*scene, camera, expected, mask,bin,true);
--    }
--
--    //img = new vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype>(expected);
--    img_mask = new vil_image_view<float>(mask);
--
--    auto *expected_byte = new vil_image_view<unsigned char>(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,*expected_byte, 0.0f, 1.0f);
--    img = expected_byte;
--  }
--  else {
--    std::cout << "boxm_render_expected_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img_mask);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
-deleted file mode 100644
-index bf3d27ab6d..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
-+++ /dev/null
-@@ -1,107 +0,0 @@
--// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_update_process.cxx
--//:
--// \file
--// \brief Process to update the scene from an image and camera pair
--//
--// \author Gamze Tunali
--// \date Apr 21, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--namespace boxm_update_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--bool boxm_update_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_update_process_globals;
--
--  // process takes 5 inputs and no output
--  //input[0]: The observation image
--  //input[1]: The camera of the observation
--  //input[2]: The scene
--  //input[3]: The bin index to be updated
--  //input[4]: ???
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "boxm_scene_base_sptr";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_update_process(bprb_func_process& pro)
--{
--  using namespace boxm_update_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_update_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr input_image = pro.get_input<vil_image_view_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto bin_index =  pro.get_input<unsigned>(i++);
--  bool use_black_background =  pro.get_input<bool>(i++);
--
--  // check the input validity
--  if ((input_image == nullptr) || (camera == nullptr) || (scene == nullptr)) {
--    std::cout << "boxm_update_process: null input value, cannot run" << std::endl;
--    return false;
--  }
--
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    auto *img_byte
-- = dynamic_cast<vil_image_view<vxl_byte>*>(input_image.ptr());
--    vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> img(img_byte->ni(), img_byte->nj(), 1);
--    vil_convert_stretch_range_limited(*img_byte ,img, vxl_byte(0), vxl_byte(255), 0.0f, 1.0f);
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      //boxm_update<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, false);
--      boxm_update_triangle<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, img, camera, use_black_background);
--    }
--    else
--    {
--      std::cout<<"Multi Bin Update"<<std::endl;
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_update_triangle<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(*s, img, camera, bin_index,use_black_background);
--    }
--    //vil_image_view<float> image = *vil_convert_cast(float(), input_image);
--  }
--  else {
--    std::cout << "boxm_update_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
-deleted file mode 100644
-index 34ecc27c3f..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--// This is brl/bseg/boxm/algo/sp/pro/processes/boxm_volume_visibility_process.cxx
--//:
--// \file
--// \brief A class for obtaining visibility of a volume
--//
--// \author Vishal Jain
--// \date Apr 30, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <vil/vil_convert.h>
--
--namespace boxm_volume_visibility_process_globals
--{
--  constexpr unsigned n_inputs_ = 10;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_volume_visibility_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_volume_visibility_process_globals;
--
--  //process takes 10 inputs
--  //input[0]: scene binary file
--  //input[1]: camera
--  //input[2]: ni of the expected image
--  //input[3]: nj of the expected image
--  //input[4-9]: bounding box
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vpgl_camera_double_sptr";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "unsigned";
--  input_types_[4] = "float";
--  input_types_[5] = "float";
--  input_types_[6] = "float";
--  input_types_[7] = "float";
--  input_types_[8] = "float";
--  input_types_[9] = "float";
--
--  // process has 1 output:
--  // output[0]: rendered image
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "vil_image_view_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_volume_visibility_process(bprb_func_process& pro)
--{
--  using namespace boxm_volume_visibility_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(i++);
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  auto ni = pro.get_input<unsigned>(i++);
--  auto nj = pro.get_input<unsigned>(i++);
--
--  auto min_x=pro.get_input<float>(i++);
--  auto min_y=pro.get_input<float>(i++);
--  auto min_z=pro.get_input<float>(i++);
--
--  auto max_x=pro.get_input<float>(i++);
--  auto max_y=pro.get_input<float>(i++);
--  auto max_z=pro.get_input<float>(i++);
--
--  vgl_box_3d<double> query(min_x,min_y,min_z,
--                           max_x,max_y,max_z);
--
--  double xverts[8];
--  double yverts[8];
--
--  boxm_utils::project_corners(boxm_utils::corners_of_box_3d(query),camera,xverts,yverts);
--  boct_face_idx face_id=boxm_utils::visible_faces(query,camera,xverts,yverts);
--  vil_image_view_base_sptr img;
--
--  // check the scene's app model
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    float val=1.0;
--
--    if (!scene_ptr->multi_bin()){
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      val=boxm_compute_volume_visibility<short, boxm_sample<BOXM_APM_MOG_GREY> >(query,*scene, camera);
--    }
--    else
--    {
--      typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > type;
--      auto* scene = dynamic_cast<boxm_scene<type>*> (scene_ptr.as_pointer());
--      val=boxm_compute_volume_visibility<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(query,*scene, camera);
--    }
--    vil_image_view<float> img_vol(ni,nj);img_vol.fill(0.0);
--    boxm_utils::project_cube_fill_val(face_id,img_vol,val,xverts,yverts);
--    auto *vol_vis = new vil_image_view<unsigned char>(img_vol.ni(),img_vol.nj(),img_vol.nplanes());
--    vil_convert_stretch_range_limited(img_vol,*vol_vis, 0.0f, 1.0f);
--    img = vol_vis;
--
--    std::cout<<"\n Visibility is "<<val;
--  }
--  else {
--    std::cout << "boxm_volume_visibility_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  pro.set_output_val<vil_image_view_base_sptr>(j++, img);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index bc15f419d9..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_algo_sp_pro_test_include test_include.cxx )
--target_link_libraries( boxm_algo_sp_pro_test_include boxm_algo_sp_pro)
-diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
-deleted file mode 100644
-index bfdbc4ffa3..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/algo/sp/pro/boxm_algo_sp_processes.h>
--#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
-deleted file mode 100644
-index 99806c193d..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,19 +0,0 @@
--add_executable( boxm_algo_sp_test_all
--  test_driver.cxx
--  test_compute_visibility.cxx
--  test_render_image.cxx
--  test_update.cxx
--  test_update_multi_bin.cxx
-- )
--
--target_link_libraries( boxm_algo_sp_test_all boxm_algo_sp boxm_algo boxm boxm_util boxm_sample boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME boxm_algo_sp_test_compute_visibility COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_compute_visibility  )
--add_test( NAME boxm_algo_sp_test_render_image COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_render_image  )
--if( VXL_RUN_FAILING_TESTS )
--add_test( NAME boxm_algo_sp_test_update COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update  )
--endif()
--add_test( NAME boxm_algo_sp_test_update_multi_bin COMMAND $<TARGET_FILE:boxm_algo_sp_test_all> test_update_multi_bin  )
--
--add_executable( boxm_algo_sp_test_include test_include.cxx )
--target_link_libraries( boxm_algo_sp_test_include boxm_algo_sp)
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
-deleted file mode 100644
-index 69c019a479..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_compute_visibility.cxx
-+++ /dev/null
-@@ -1,90 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_test_util.h>
--
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_compute_visibility()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,3);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("./boxm_scene1", "block");
--  vul_file::make_directory("./boxm_scene1");
--  std::ofstream os("scene1.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3> s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3> s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3> s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
--    if (iter.index().z()==1)
--    {
--      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells=tree->leaf_cells();
--      s1_sample.alpha=0.6f;
--
--      for (auto & leaf_cell : leaf_cells)
--      {
--        leaf_cell->set_data(s1_sample);
--      }
--      block->init_tree(tree);
--      scene.write_active_block();
--    }
--    else
--    {
--      std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > * > leaf_cells= tree->leaf_cells();
--      s1_sample.alpha=0.01f;
--
--      for (auto & leaf_cell : leaf_cells)
--      {
--        leaf_cell->set_data(s1_sample);
--      }
--      block->init_tree(tree);
--      scene.write_active_block();
--    }
--
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--
--  double X=5,Y=5,Z;
--  for (Z=40; Z>-10; --Z)
--  {
--    boxm_compute_point_visibility<short,boxm_sample<BOXM_APM_MOG_GREY> >(vgl_point_3d<double>(X,Y,Z),scene, camera);
--  }
--  vpl_rmdir("./boxm_scene1");
--  vpl_unlink("./scene1.xml");
--}
--
--TESTMAIN(test_compute_visibility);
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
-deleted file mode 100644
-index 2ea0124c63..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_compute_visibility );
--DECLARE( test_render_image );
--DECLARE( test_update );
--DECLARE( test_update_multi_bin );
--
--void register_tests()
--{
--  REGISTER( test_compute_visibility );
--  REGISTER( test_render_image );
--  REGISTER( test_update );
--  REGISTER( test_update_multi_bin );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
-deleted file mode 100644
-index 85e7588707..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_include.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/algo/sp/boxm_compute_volume_visibility.h>
--#include <boxm/algo/sp/boxm_depth_image_triangle.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <boxm/algo/sp/boxm_update.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
-deleted file mode 100644
-index c36e76f0dd..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_render_image.cxx
-+++ /dev/null
-@@ -1,103 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/util/boxm_test_util.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree_cell.h>
--#include <vpl/vpl.h>
--#include <boxm/algo/sp/boxm_render_image.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--
--static void test_render_image()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,3);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("./boxm_scene1", "block");
--  vul_file::make_directory("./boxm_scene1");
--  std::ofstream os("scene1.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
--
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(3,2);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
--  expected.fill(0.0);
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
--  mask.fill(0.0);
--
--  boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,camera,expected,mask);
--  vpl_rmdir("boxm_scene1");
--  vpl_unlink("scene1.xml");
--}
--
--TESTMAIN(test_render_image);
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
-deleted file mode 100644
-index 9e530c4af6..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update.cxx
-+++ /dev/null
-@@ -1,259 +0,0 @@
--#include <iostream>
--#include <sstream>
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_test_util.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_homg_point_3d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_load.h>
--#include <vil/vil_save.h>
--#include <vil/vil_convert.h>
--#if 0
--#include <vpl/vpl.h>
--#endif
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_z(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/36.;
--  std::vector<vgl_point_3d<double> > centers;
--  for (unsigned i=0; i<11; i++) {
--    // double x = boxm_camera_dist*std::cos(alpha)/10;
--    double z = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
--    std::cout << centers[i] << std::endl;
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
--    rat_cameras.push_back(rat_cam);
--
--    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--    for (auto c : corners) {
--      double u,v, u2, v2;
--      vpgl_perspective_camera<double> persp_cam;
--      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
--      bb.add(vgl_point_2d<double> (u,v));
--
--      if (verbose)
--      {
--        std::cout << "Perspective [" << u << ',' << v << "]\n"
--                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
--      }
--    }
--    std::cout << bb << std::endl;
--  }
--  return rat_cameras;
--}
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_yz(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  std::cout << "centroid: " << centroid << std::endl;
--  double alpha = (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/40.;
--  std::vector<vgl_point_3d<double> > centers;
--
--  for (unsigned i=0; i<num_train_images; i++) {
--    double x = boxm_camera_dist*std::cos(alpha);
--    double y = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
--  if (verbose)
--    std::cout << centers[i] << std::endl;
--
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> persp_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vgl_point_3d<double> camera_center  = centers[i];
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
--    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--
--    //save the camera to file
--    std::stringstream cam_file;
--    vul_file::make_directory("./cams");
--    cam_file << "./cams/cam_" << i << ".txt";
--    std::ofstream cam_out(cam_file.str().c_str());
--    cam_out << persp_cam;
--
--    if (verbose) {
--      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--      for (auto c : corners) {
--        double u,v;
--        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--        bb.add(vgl_point_2d<double> (u,v));
--        std::cout << "Perspective [" << u << ',' << v << "]\n"<< std::endl;
--      }
--      std::cout << bb << std::endl;
--    }
--  }
--  return persp_cameras;
--}
--
--
--static void test_update()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--#ifdef SET_APPEARENCE_MODEL_EXISTS
--  scene.set_appearence_model(BOXM_APM_MOG_GREY);
--#endif
--  scene.set_paths("boxm_scene2", "block");
--  vul_file::make_directory("boxm_scene2");
--  std::ofstream os("scene2.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
--
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(4,3);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--#if 0
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--#endif
--  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z(world);
--
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
--
--  for (unsigned i=0; i<cameras.size(); i++) {
--    expected.fill(0.0);
--    mask.fill(0.0);
--
--    boxm_render_image_splatting_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask);
--    std::stringstream ss;
--    ss << "./boxm_scene2/img" << i << ".tif";
--#if 0
--    vil_image_view<unsigned char> expected_byte(expected.ni(),expected.nj(),expected.nplanes());
--    vil_convert_stretch_range_limited(expected,expected_byte, 0.0f, 1.0f);
--#endif
--
--    vil_save(expected, ss.str().data());
--  }
--#if 0
--  vpl_rmdir("./boxm_scene1");
--  vpl_unlink("./scene1.xml");
--#endif
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
--                                                                          block_dim, world_dim, 4U, 3U);
--  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene_new.set_paths("./boxm_scene_update", "block");
--  vul_file::make_directory("./boxm_scene_update");
--  std::ofstream os1("./boxm_scene_update/scene.xml");
--  x_write(os1, scene_new, "scene");
--  os1.close();
--
--  // update the world, with all the generated images and cameras
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss;
--    ss << "./boxm_scene2/img" << i << ".tif";
--    expected = vil_load(ss.str().data());
--    boxm_update_triangle<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i] );
--  }
--
--  // regenerate the images from world
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss; ss << "boxm_scene2/img_new" << i << ".tif";
--    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
--    boxm_render_image_splatting<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask);
--    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
--    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
--
--    vil_save(expected_byte, ss.str().data());
--  }
--}
--
--TESTMAIN(test_update);
-diff --git a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx b/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
-deleted file mode 100644
-index 27c310aea1..0000000000
---- a/contrib/brl/bseg/boxm/algo/sp/tests/test_update_multi_bin.cxx
-+++ /dev/null
-@@ -1,262 +0,0 @@
--#include <iostream>
--#include <sstream>
--#include <testlib/testlib_test.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_homg_point_3d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--#include <boxm/util/boxm_test_util.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/algo/sp/boxm_update_triangle.h>
--#include <boxm/algo/sp/boxm_render_image_triangle.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_load.h>
--#include <vil/vil_save.h>
--#include <vil/vil_convert.h>
--#ifdef CLEANUP
--#include <vpl/vpl.h>
--#endif
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_z_multi_bin(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  double alpha = (vnl_math::pi_over_180)*65; // was: (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/36.;
--  std::vector<vgl_point_3d<double> > centers;
--  for (unsigned i=0; i<11; i++) {
--    double z = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(centroid.x(), centroid.y(), centroid.z()+z);
--    std::cout << centers[i] << std::endl;
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vpgl_camera_double_sptr rat_cam = generate_camera_top(world);
--    rat_cameras.push_back(rat_cam);
--
--    std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--    for (auto c : corners) {
--      double u,v, u2, v2;
--      vpgl_perspective_camera<double> persp_cam;
--      persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--      rat_cam->project(c.x(), c.y() ,c.z(), u2, v2);
--      bb.add(vgl_point_2d<double> (u,v));
--
--      if (verbose)
--      {
--        std::cout << "Perspective [" << u << ',' << v << "]\n"
--                 << "Rational [" << u2 << ',' << v2 << "]\n\n";
--      }
--    }
--    std::cout << bb << std::endl;
--  }
--  return rat_cameras;
--}
--
--std::vector<vpgl_camera_double_sptr > generate_cameras_yz_multi_bin(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  std::cout << "centroid: " << centroid << std::endl;
--  double alpha = (vnl_math::pi/8.) * 3;
--  double delta_alpha = vnl_math::pi/40.;
--  std::vector<vgl_point_3d<double> > centers;
--
--  for (unsigned i=0; i<num_train_images; i++) {
--    double x = boxm_camera_dist*std::cos(alpha);
--    double y = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(x+centroid.x(), y+centroid.y(), 450+centroid.z());
--  if (verbose)
--    std::cout << centers[i] << std::endl;
--
--    alpha += delta_alpha;
--  }
--
--  vgl_box_2d<double> bb;
--  std::vector<vpgl_camera_double_sptr> persp_cameras;
--  for (unsigned i=0; i<centers.size(); i++)
--  {
--    vgl_point_3d<double> camera_center  = centers[i];
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
--    persp_cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--
--    //save the camera to file
--    std::stringstream cam_file;
--    vul_file::make_directory("./cams");
--    cam_file << "./cams/cam_" << i << ".txt";
--    std::ofstream cam_out(cam_file.str().c_str());
--    cam_out << persp_cam;
--
--    if (verbose) {
--      std::vector<vgl_point_3d<double> > corners = boxm_utils::corners_of_box_3d(world);
--      for (auto c : corners) {
--        double u,v;
--        persp_cam.project(c.x(), c.y() ,c.z(), u, v);
--        bb.add(vgl_point_2d<double> (u,v));
--        std::cout << "Perspective [" << u << ',' << v << ']' << std::endl << std::endl;
--      }
--      std::cout << bb << std::endl;
--    }
--  }
--  return persp_cameras;
--}
--
--
--static void test_update_multi_bin()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,1);
--  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--#ifdef SET_APPEARENCE_MODEL_EXISTS
--  scene.set_appearence_model(BOXM_APM_MOG_GREY);
--#endif
--  scene.set_paths("boxm_scene2_mb", "block");
--  vul_file::make_directory("boxm_scene2_mb");
--  std::ofstream os("scene2.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  boxm_block_iterator<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1,5);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1,5);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--  boxm_sample_multi_bin<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1,3);
--
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(4,3);
--    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.01));
--    cel11->set_data(s2_sample);
--    boct_tree_cell<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.01));
--    cell2->set_data(s1_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--#if 0
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--#endif
--  std::vector<vpgl_camera_double_sptr > cameras = generate_cameras_z_multi_bin(world);
--
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> expected(IMAGE_U,IMAGE_V);
--  vil_image_view<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> mask(IMAGE_U,IMAGE_V);
--
--  for (unsigned i=0; i<cameras.size(); i++) {
--    expected.fill(0.0);
--    mask.fill(0.0);
--
--    boxm_render_image_splatting<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,3);
--    std::stringstream ss;
--    ss << "./boxm_scene2_mb/img3" << i << ".tif";
--    vil_save(expected, ss.str().data());
--
--    expected.fill(0.0);
--    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene,cameras[i],expected,mask,5);
--    std::stringstream ss1;
--    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
--    vil_save(expected, ss1.str().data());
--  }
--#ifdef CLEANUP
--  vpl_rmdir("./boxm_scene1");
--  vpl_unlink("./scene1.xml");
--#endif
--  boxm_scene<boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > > scene_new(lvcs, origin,
--                                                                                    block_dim, world_dim, 4U, 3U);
--  scene_new.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene_new.set_paths("./boxm_scene_update", "block");
--  vul_file::make_directory("./boxm_scene_update");
--  std::ofstream os1("./boxm_scene_update/scene.xml");
--  x_write(os1, scene_new, "scene");
--  os1.close();
--
--  // update the world, with all the generated images and cameras
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss;
--    ss << "./boxm_scene2_mb/img3" << i << ".tif";
--    expected = vil_load(ss.str().data());
--    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],3 );
--    std::stringstream ss1;
--    ss1 << "./boxm_scene2_mb/img5" << i << ".tif";
--    expected = vil_load(ss1.str().data());
--    boxm_update_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new, expected, cameras[i],5 );
--  }
--
--  // regenerate the images from world
--  for (unsigned i=0; i<cameras.size(); i++) {
--    std::stringstream ss; ss << "boxm_scene2_mb/img_new" << i << ".tif";
--    vil_image_view<float> expected_new(IMAGE_U,IMAGE_V);
--    boxm_render_image_splatting_triangle<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >(scene_new,cameras[i],expected_new,mask,3);
--    vil_image_view<unsigned char> expected_byte(expected_new.ni(),expected_new.nj(),expected_new.nplanes());
--    vil_convert_stretch_range_limited(expected_new,expected_byte, 0.0f, 1.0f);
--
--    vil_save(expected_byte, ss.str().data());
--  }
--}
--
--TESTMAIN(test_update_multi_bin);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
-deleted file mode 100644
-index 5e823166ae..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,31 +0,0 @@
--add_executable( boxm_algo_test_all
--  test_driver.cxx
--  test_fill_in_mesh.cxx
--  test_save_scene_raw.cxx
--  test_upload_mesh.cxx
--  test_boxm_fill_internal_cells.cxx
--  test_boxm_scene_crop.cxx
--  test_linear_operations.cxx
--  test_remove_level0.cxx
--
-- )
--
--set(boxm_algo_test_all_sources
--    test_utils.h    test_utils.cxx
--    )
--
--vxl_add_library(LIBRARY_NAME boxm_algo_tests LIBRARY_SOURCES  ${boxm_algo_test_all_sources})
--
--target_link_libraries( boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
--target_link_libraries( boxm_algo_test_all boxm_algo_tests boxm_algo boxm boxm_sample boxm_util boxm_basic boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vpgl imesh ${VXL_LIB_PREFIX}vcl)
--
--add_test( NAME boxm_algo_test_fill_in_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_fill_in_mesh  )
--add_test( NAME boxm_algo_test_save_scene_raw COMMAND $<TARGET_FILE:boxm_algo_test_all> test_save_scene_raw  )
--add_test( NAME boxm_algo_test_upload_mesh COMMAND $<TARGET_FILE:boxm_algo_test_all> test_upload_mesh  )
--add_test( NAME boxm_algo_test_fill_internal_cells COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_fill_internal_cells  )
--add_test( NAME boxm_algo_test_scene_crop COMMAND $<TARGET_FILE:boxm_algo_test_all> test_boxm_scene_crop  )
--add_test( NAME boxm_algo_test_linear_operations COMMAND $<TARGET_FILE:boxm_algo_test_all> test_linear_operations )
--add_test( NAME boxm_algo_remove_level0 COMMAND $<TARGET_FILE:boxm_algo_test_all> test_remove_level0 )
--
--add_executable( boxm_algo_test_include test_include.cxx )
--target_link_libraries( boxm_algo_test_include boxm_algo)
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
-deleted file mode 100644
-index 509f828fb6..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_fill_internal_cells.cxx
-+++ /dev/null
-@@ -1,112 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date February 4, 2010
--
--#include <testlib/testlib_test.h>
--#include <boxm/algo/boxm_fill_internal_cells.h>
--#include <boxm/boxm_apm_traits.h>
--
--const bool debug = false;
--
--void build_tree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  // Create tree
--  tree->split();
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    leaves[1]->set_data(0.1f);
--    leaves[1]->split();
--    for (auto & leave : leaves)
--      leave->set_data(0.1f);
--  }
--
--  if (debug)
--  {
--    std::cout << "All Levels" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
--    for (auto & leave : leaves) {
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--}
--
--static void test_boxm_fill_internal_cells()
--{
--  //Create a dummy scene
--  typedef boct_tree<short,float > tree_type;
--  auto *tree = new boct_tree<short,float>(3);
--  build_tree(tree);
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--
--  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
--  std::string scene_path=".";
--  scene->set_paths(scene_path, "in_block");
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->clean_scene();
--
--  boxm_block_iterator<tree_type >  iter =scene->iterator();
--  iter.begin();
--  scene->load_block(iter.index());
--  boxm_block<tree_type> *block = scene->get_active_block();
--  block->init_tree(tree);
--  scene->write_active_block();
--
--  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
--
--  boxm_fill_internal_cells<float> filler;
--  boxm_scene<tree_type> *scene_out = filler.traverse_and_fill(scene);
--
--  //check that output scene is correct
--  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
--  iter_out.begin();
--  scene_out->load_block(iter_out.index());
--  boxm_block<tree_type> *block_out = scene_out->get_active_block();
--  boct_tree<short, float>  *tree_out= block_out->get_tree();
--  std::vector<boct_tree_cell<short,float>*> cells = tree_out->all_cells();
--  bool result = true;
--  for (auto & cell : cells)
--  {
--    if (!cell->is_leaf())
--    {
--      boct_tree_cell<short,float>* children = cell->children();
--      float avg =0;
--      for (unsigned c=0; c<8; c++)
--      {
--        avg+=children[c].data();
--      }
--      result = result && (cell->data()==(avg/8.f));
--    }
--  }
--  TEST("Valid average cells", result, true);
--
--  if (debug) {
--    std::cout << "Printing Output Tree" << std::endl;
--    for (auto & cell : cells) {
--      std::cout<< cell->get_code().x_loc_ << ','
--              << cell->get_code().y_loc_ << ','
--              << cell->get_code().z_loc_ << ','
--              << cell->get_code().level << ','
--              << cell->data() << std::endl;
--    }
--  }
--
--  scene->clean_scene();
--  scene_out->clean_scene();
--}
--
--TESTMAIN(test_boxm_fill_internal_cells);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx b/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
-deleted file mode 100644
-index 73eff00099..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_boxm_scene_crop.cxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov. 16, 2009.
--
--#include <testlib/testlib_test.h>
--#include <boxm/algo/boxm_crop_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--const bool debug = true;
--
--void fill_sample_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--  tree->init_cells(0.1f);
--  tree->split();
--  std::cout << "Level 1" << std::endl;
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5f);
--    if (debug)
--      for (auto & leave : leaves) {
--        std::cout<< leave->get_code().x_loc_ << ','
--                << leave->get_code().y_loc_ << ','
--                << leave->get_code().z_loc_ << ','
--                << leave->data() << std::endl;
--      }
--
--    leaves[1]->split();
--  }
--
--  if (debug)
--  {
--    std::cout << "Level 0" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (auto & leave : leaves) {
--      leave->set_data(0.9f);
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--
--  if (debug)
--  {
--    std::cout << "All Levels" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
--    for (auto & leave : leaves) {
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--}
--
--static void test_boxm_scene_crop()
--{
--  //Create a dummy scene
--  typedef boct_tree<short,float > tree_type;
--  auto *tree = new boct_tree<short,float>(3);
--  fill_sample_octree(tree);
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--
--  auto *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
--  std::string scene_path=".";
--  scene->set_paths(scene_path, "in_block");
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->clean_scene();
--
--  boxm_block_iterator<tree_type >  iter =scene->iterator();
--  iter.begin();
--  scene->load_block(iter.index());
--  boxm_block<tree_type> *block = scene->get_active_block();
--  block->init_tree(tree);
--  scene->write_active_block();
--
--  vgl_box_3d<double> bbox(vgl_point_3d<double>(5, 0, 0), vgl_point_3d<double>(9, 4, 4));
--
--  boxm_scene<tree_type> *scene_out = boxm_crop_scene<float>(scene, bbox);
--
--  //check that output scene is correct
--  boxm_block_iterator<tree_type >  iter_out =scene_out->iterator();
--  iter_out.begin();
--  scene_out->load_block(iter_out.index());
--  boxm_block<tree_type> *block_out = scene_out->get_active_block();
--  boct_tree<short, float>  *tree_out= block_out->get_tree();
--
--  std::vector<boct_tree_cell<short,float>*> leaves_out = tree_out->leaf_cells();
--  bool result = true;
--  for (auto & i : leaves_out)
--  {
--    result = result && (std::abs(i->data() - 0.9)< 1e-5);
--  }
--
--  TEST("Valid cropped tree", result, true);
--
--  std::vector<boct_tree_cell<short,float>*> leaves = tree_out->all_cells();
--  if (debug) {
--    std::cout << "Printing Output Tree" << std::endl;
--    for (auto & leave : leaves) {
--      std::cout<< leave->get_code().x_loc_ << ','
--              << leave->get_code().y_loc_ << ','
--              << leave->get_code().z_loc_ << ','
--              << leave->get_code().level << ','
--              << leave->data() << std::endl;
--    }
--  }
--
--  scene->clean_scene();
--  scene_out->clean_scene();
--}
--
--TESTMAIN(test_boxm_scene_crop);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
-deleted file mode 100644
-index 299ce36aab..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,23 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_fill_in_mesh );
--DECLARE( test_save_scene_raw );
--DECLARE( test_upload_mesh );
--DECLARE( test_boxm_fill_internal_cells );
--DECLARE( test_boxm_scene_crop );
--DECLARE( test_linear_operations );
--DECLARE( test_remove_level0 );
--
--void register_tests()
--{
--  REGISTER( test_fill_in_mesh );
--  REGISTER( test_save_scene_raw );
--  REGISTER( test_upload_mesh );
--  REGISTER( test_boxm_fill_internal_cells );
--  REGISTER( test_boxm_scene_crop );
--  REGISTER( test_linear_operations );
--  REGISTER( test_remove_level0 );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
-deleted file mode 100644
-index 564a5c4359..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_fill_in_mesh.cxx
-+++ /dev/null
-@@ -1,121 +0,0 @@
--#include <iostream>
--#include <limits>
--#include <testlib/testlib_test.h>
--
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_fill_in_mesh.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boct/boct_tree_cell.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_fileio.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static void test_fill_in_mesh()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("./boxm_fill_in", "block");
--  vul_file::make_directory("./boxm_fill_in");
--  std::ofstream os("scene.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  //// create a mesh
--  unsigned int num_faces=6;
--  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(8));
--  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
--  imesh_vertex<3>& vert0 = (*verts)[0]; imesh_vertex<3>& vert4 = (*verts)[4];
--  vert0[0]=2;                           vert4[0]=2;
--  vert0[1]=2;                           vert4[1]=2;
--  vert0[2]=4;                           vert4[2]=8;
--  imesh_vertex<3>& vert1 = (*verts)[1]; imesh_vertex<3>& vert5 = (*verts)[5];
--  vert1[0]=4;                           vert5[0]=4;
--  vert1[1]=2;                           vert5[1]=2;
--  vert1[2]=4;                           vert5[2]=8;
--  imesh_vertex<3>& vert2 = (*verts)[2]; imesh_vertex<3>& vert6 = (*verts)[6];
--  vert2[0]=4;                           vert6[0]=4;
--  vert2[1]=4;                           vert6[1]=4;
--  vert2[2]=4;                           vert6[2]=8;
--
--  imesh_vertex<3>& vert3 = (*verts)[3]; imesh_vertex<3>& vert7 = (*verts)[7];
--  vert3[0]=2;                           vert7[0]=2;
--  vert3[1]=4;                           vert7[1]=4;
--  vert3[2]=4;                           vert7[2]=8;
--
--  std::vector<unsigned int> face(4,0);
--  face[0]=4;face[1]=5;face[2]=6;face[3]=7;
--  (*faces)[0]=face;
--  face[0]=3;face[1]=2;face[2]=1;face[3]=0;
--  (*faces)[1]=face;
--  face[0]=0;face[1]=4;face[2]=7;face[3]=3;
--  (*faces)[2]=face;
--  face[0]=1;face[1]=2;face[2]=6;face[3]=5;
--  (*faces)[3]=face;
--  face[0]=1;face[1]=5;face[2]=4;face[3]=0;
--  (*faces)[4]=face;
--  face[0]=3;face[1]=7;face[2]=6;face[3]=2;
--  (*faces)[5]=face;
--
--
--  imesh_mesh mesh;
--#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
--  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
--  mesh.set_vertices(std::move(tempv));
--  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
--  mesh.set_faces(std::move(tempf));
--#else
--  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
--  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
--#endif
--
--  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(7,6);
--    boxm_sample<BOXM_APM_MOG_GREY> s;
--    s.alpha=std::numeric_limits<float>::max();
--    tree->init_cells(s);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--
--  boxm_sample<BOXM_APM_MOG_GREY> val;
--  val.alpha=0;
--  std::vector<imesh_mesh> meshes; meshes.push_back(mesh);
--  boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, meshes, false, val);
--
--  std::vector<std::string> fnames;
--  boxm_block_iterator<tree_type> it(&scene);
--
--  // check the first block
--  scene.load_block(it.index().x(),it.index().y(),it.index().z());
--  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
--
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vgl_point_3d<double>(3,3,6));
--  TEST("Centroid of the mesh is in the octree", cell0->data().alpha, 0.0f);
--
--
--  vpl_rmdir("boxm_fill_in");
--  vpl_unlink("scene.xml");
--}
--
--TESTMAIN(test_fill_in_mesh);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
-deleted file mode 100644
-index c59d7e8540..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_include.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <boxm/algo/boxm_compute_scene_difference.h>
--#include <boxm/algo/boxm_compute_scene_statistics.h>
--#include <boxm/algo/boxm_crop_scene.h>
--#include <boxm/algo/boxm_fill_in_mesh.h>
--#include <boxm/algo/boxm_fill_internal_cells.h>
--#include <boxm/algo/boxm_init_scene.h>
--#include <boxm/algo/boxm_linear_operations.h>
--#include <boxm/algo/boxm_merge_mog.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boxm/algo/boxm_save_scene_raw.h>
--#include <boxm/algo/boxm_save_scene_raw_general.h>
--#include <boxm/algo/boxm_scene_levels_utils.h>
--#include <boxm/algo/boxm_split_sample.h>
--#include <boxm/algo/boxm_upload_mesh.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx b/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
-deleted file mode 100644
-index 0e4fe4f91c..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_linear_operations.cxx
-+++ /dev/null
-@@ -1,82 +0,0 @@
--//:
--// \file
--// \brief Test linear combinations of blocks
--// \author Isabel Restrepo
--// \date 2-Feb-2011
--
--#include <testlib/testlib_test.h>
--#include <boxm/algo/boxm_linear_operations.h>
--#include "test_utils.h"
--
--void test_linear_operations()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
--  boxm_scene<boct_tree<short, float> > *scene2 = create_scene(2,2,2,true, "test_scene2");
--
--  float s1 = 2.0, s2=3.0;
--  for (unsigned i = 0; i< 2; i++)
--    for (unsigned j = 0; j < 2; j++)
--      for (unsigned k = 0; k< 2; k++)
--      {
--        scene1->load_block(i,j,k);
--        scene2->load_block(i,j,k);
--
--        boxm_block<boct_tree<short, float> > *block1 = scene1->get_block(i,j,k);
--        boxm_block<boct_tree<short, float> > *block2 = scene2->get_block(i,j,k);
--
--        //The result is block1 = s1*block1+ s2*block2
--        boxm_linear_combination(block1, block2, s1, s2);
--
--        //make sure to write the block back to disk
--        scene1->write_active_block();
--
--        //clean memory
--        scene1->unload_active_blocks();
--        scene2->unload_active_blocks();
--      }
--
--
--  //Test the output scene. Scene1 should contain the result i.e (2*0.8 + 3*0.8) and scene2 should be unchanged
--  boxm_cell_iterator<boct_tree<short, float> > it1 =
--  scene1->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
--
--  boxm_cell_iterator<boct_tree<short, float > > it2 =
--  scene2->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block, true);
--
--  it1.begin();
--  it2.begin();
--  bool result = true;
--
--  while ( !(it1.end() || it2.end()) ) {
--
--    boct_tree_cell<short,float > *cell1 = *it1;
--    boct_tree_cell<short,float > *cell2 = *it2;
--
--    if (std::abs(cell1->data()- 4.0f) > 1.0e-7){
--      std::cerr << "Data1 is incorrect: "<< cell1->data()  <<"Error: " << std::abs(cell1->data()- 4.0f) << '\n';
--      result = false;
--      break;
--    }
--
--    if (std::abs(cell2->data()- 0.8f) > 1.0e-7){
--      std::cerr << "Data2 is incorrect: " << cell2->data()<<'\n';
--      result = false;
--      break;
--    }
--
--    ++it1;
--    ++it2;
--  }
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_linear_operations " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  TEST("Output data is correct", result, true);
--  clean_up();
--}
--
--
--TESTMAIN(test_linear_operations);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx b/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
-deleted file mode 100644
-index 1243faf34f..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_remove_level0.cxx
-+++ /dev/null
-@@ -1,54 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov 23 2011
--
--#include <testlib/testlib_test.h>
--#include "test_utils.h"
--
--#include <boxm/algo/boxm_scene_levels_utils.h>
--
--
--void test_remove_level0()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene1 = create_scene(2,2,2,true, "test_scene1");
--
--  //clone the input scene
--  boxm_scene<boct_tree<short, float> > *scene2 = new boxm_scene<boct_tree<short, float> >(scene1->lvcs(), scene1->origin(), scene1->block_dim(),
--                                                                                          scene1->world_dim(), scene1->max_level(), scene1->init_level(),
--                                                                                          scene1->load_all_blocks(), scene1->save_internal_nodes());
--
--  std::stringstream block_pref;
--  block_pref << scene1->block_prefix() << "_max_level_"  << (scene1->max_level() - 1);
--  scene2->set_paths(scene1->path(), block_pref.str());
--  scene2->set_appearance_model(scene1->appearence_model());
--
--  std::cout << "Cloning\n";
--  scene1->clone_blocks(*scene2);
--  std::cout << "Restructuring\n";
--  boxm_remove_level_0_leaves(scene2);
--  std::cout << "Done\n";
--
--  //Show contents of the scenes scene
--  boxm_block_iterator<boct_tree<short, float> > it1 = scene1->iterator();
--  boxm_block_iterator<boct_tree<short, float> > it2 = scene2->iterator();
--  for (it1.begin(), it2.begin(); !it1.end() && !it2.end(); ++it1, ++it2)
--  {
--    scene1->load_block(it1.index());
--    scene2->load_block(it2.index());
--
--    boxm_block<boct_tree<short, float> > *block1 = scene1->get_active_block();
--    boxm_block<boct_tree<short, float> > *block2 = scene2->get_active_block();
--
--    block1->get_tree()->print();
--    block2->get_tree()->print();
--  }
--
--  scene1->unload_active_blocks();
--  scene2->unload_active_blocks();
--}
--
--
--TESTMAIN(test_remove_level0);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx b/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
-deleted file mode 100644
-index 62b425171a..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_save_scene_raw.cxx
-+++ /dev/null
-@@ -1,122 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_save_scene_raw.h>
--#include <boxm/algo/boxm_refine.h>
--#include <boct/boct_tree_cell.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_3d.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_lvcs.h>
--
--static int test_save_scene_raw()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(5,5,5);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--  scene.set_paths("boxm_scene1", "block");
--  vul_file::make_directory("boxm_scene1");
--  std::ofstream os("scene1.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  unsigned max_level=10, init_level=3;
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  // default model
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,0.1f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> default_sample;
--  default_sample.alpha=0.001f;
--  default_sample.set_appearance(simple_obs_mix_gauss_val_sf1);
--
--  // sample 1
--  bsta_gauss_sf1 s1_simple_gauss_sf1(0.5f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s1_simple_obs_gauss_val_sf1(s1_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s1_simple_mix_gauss_val_sf1;
--
--  s1_simple_mix_gauss_val_sf1.insert(s1_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s1_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s1_simple_bsta_mixture_fixed_sf1_3>  s1_simple_obs_mix_gauss_val_sf1(s1_simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> s1_sample;
--  s1_sample.alpha=0.6f;
--  s1_sample.set_appearance(s1_simple_obs_mix_gauss_val_sf1);
--
--  // sample 2
--  bsta_gauss_sf1 s2_simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> s2_simple_obs_gauss_val_sf1(s2_simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  s2_simple_mix_gauss_val_sf1;
--
--  s2_simple_mix_gauss_val_sf1.insert(s2_simple_obs_gauss_val_sf1,1);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  s2_simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<s2_simple_bsta_mixture_fixed_sf1_3>  s2_simple_obs_mix_gauss_val_sf1(s2_simple_mix_gauss_val_sf1);
--
--
--  boxm_sample<BOXM_APM_MOG_GREY> s2_sample;
--  s2_sample.alpha=0.6f;
--  s2_sample.set_appearance(s2_simple_obs_mix_gauss_val_sf1);
--
--
--  float count=0.1f;
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  > * block=scene.get_active_block();
--    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree;
--    if (iter.index().x()==0 && iter.index().y()==0 && iter.index().z()==0) {
--      tree = new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level);
--    }
--    else {
--      tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(max_level,init_level-1);
--    }
--    boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cel11=tree->locate_point(vgl_point_3d<double>(0.01,0.01,0.9));
--    s2_sample.alpha=count;
--
--    cel11->set_data(s2_sample);
--    //boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2=tree->locate_point(vgl_point_3d<double>(0.51,0.51,0.51));
--    //cell2->set_data(s2_sample);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--    count+=0.1f;
--  }
--
--
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+world_dim.x(), origin.y()+world_dim.y(), origin.z()+world_dim.z()));
--
--  float thresh=0.02f;
--  bool reset=false;
--  for (unsigned i=0; i<10; i++) {
--    boxm_refine_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, thresh, reset);
--    boxm_save_scene_raw<short,boxm_sample<BOXM_APM_MOG_GREY> >(scene, "scene.raw", 0);
--#ifdef DEBUG_LEAKS
--    std::cerr << "Leaks at test_save_scene_raw " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--  }
--
--  SUMMARY();
--}
--
--TESTMAIN(test_save_scene_raw);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx b/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
-deleted file mode 100644
-index ced456755e..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_upload_mesh.cxx
-+++ /dev/null
-@@ -1,127 +0,0 @@
--#include <iostream>
--#include <limits>
--#include <testlib/testlib_test.h>
--
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/algo/boxm_upload_mesh.h>
--#include <boxm/algo/boxm_save_block_raw.h>
--#include <boct/boct_tree_cell.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_fileio.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static void test_upload_mesh()
--{
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,1);
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY>  > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--
--#if 0
--  if (vul_file_is_directory("./boxm_upload"))
--  {
--    vul_file_iterator fiter("./boxm_upload/*");
--    while (!fiter)
--    {
--      vpl_unlink(fiter());
--      fiter++;
--    }
--    vpl_rmdir("./boxm_upload");
--  }
--#endif // 0
--
--  scene.set_paths("./boxm_upload", "block");
--  vul_file::make_directory("./boxm_upload");
--  std::ofstream os("scene.xml");
--  x_write(os, scene, "scene");
--  os.close();
--
--  // create a mesh
--  unsigned int num_faces=1;
--  std::unique_ptr<imesh_vertex_array<3> > verts(new imesh_vertex_array<3>(3));
--  std::unique_ptr<imesh_face_array > faces(new imesh_face_array(num_faces));
--  imesh_vertex<3>& vert0 = (*verts)[0];
--  vert0[0]=2;
--  vert0[1]=2;
--  vert0[2]=4;
--  imesh_vertex<3>& vert1 = (*verts)[1];
--  vert1[0]=8;
--  vert1[1]=2;
--  vert1[2]=4;
--  imesh_vertex<3>& vert2 = (*verts)[2];
--  vert2[0]=8;
--  vert2[1]=8;
--  vert2[2]=4;
--
--  for (unsigned int f=0; f<num_faces; ++f) {
--    std::vector<unsigned int>& face = (*faces)[f];
--    unsigned int cnt=3;
--    face.resize(cnt,0);
--    for (unsigned int v=0; v<cnt; ++v)
--      face[v]=v;
--  }
--  imesh_mesh mesh;
--#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
--  std::unique_ptr<imesh_vertex_array_base> tempv(std::move(verts));
--  mesh.set_vertices(std::move(tempv));
--  std::unique_ptr<imesh_face_array_base> tempf(std::move(faces));
--  mesh.set_faces(std::move(tempf));
--#else
--  mesh.set_vertices(std::unique_ptr<imesh_vertex_array_base>(verts));
--  mesh.set_faces(std::unique_ptr<imesh_face_array_base>(faces));
--#endif
--
--  typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&scene);
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(6,5);
--    boxm_sample<BOXM_APM_MOG_GREY> s;
--    s.alpha=std::numeric_limits<float>::max();
--    tree->init_cells(s);
--    block->init_tree(tree);
--    scene.write_active_block();
--    iter++;
--  }
--
--  boxm_sample<BOXM_APM_MOG_GREY> val;
--  val.alpha=0;
--  boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(scene, mesh, false, val);
--
--  std::vector<std::string> fnames;
--  boxm_block_iterator<tree_type> it(&scene);
--  it.begin();
--  // check the first block
--  scene.load_block(it.index().x(),it.index().y(),it.index().z());
--  boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=scene.get_active_block();
--  boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell0 = tree->locate_point_global(vert0.operator vgl_point_3d<double>());
--  TEST("Vertex 0 is in the octree", cell0->data().alpha, 0.0f);
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell1 = tree->locate_point_global(vert1.operator vgl_point_3d<double>());
--  TEST("Vertex 1 is in the octree", cell1->data().alpha, 0.0f);
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell2 = tree->locate_point_global(vert2.operator vgl_point_3d<double>());
--  TEST("Vertex 2 is in the octree", cell2->data().alpha, 0.0f);
--
--  boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* cell = tree->locate_point_global(vgl_point_3d<double>(1,1,1));
--  TEST_NEAR("A non-polygon point should be non-zero", cell->data().alpha, std::numeric_limits<float>::max(), 1e-6);
--
--  vpl_rmdir("./boxm_upload");
--  vpl_unlink("./scene.xml");
--}
--
--TESTMAIN(test_upload_mesh);
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx b/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
-deleted file mode 100644
-index f286501eee..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_utils.cxx
-+++ /dev/null
-@@ -1,71 +0,0 @@
--#include "test_utils.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Aug-2010
--
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--#include <utility>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i)
--{
--  tree-> split(); //now we have 8 cells
--  //tree->print();
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  leaves[i]->set_data(0.8f);
--  leaves[i]->split();
--}
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz, bool uniform, std::string scene_name)
--{
--  //crete the input scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--
--  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
--
--    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
--
--  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
--  std::string scene_path("./");
--  scene->set_paths(scene_path,  std::move(scene_name));
--
--  unsigned cell_index = 7;
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  while (!iter.end())
--  {
--    scene->load_block(iter.index());
--    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
--    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
--
--    float init_val = 0.5f;
--    if (uniform)
--      init_val = 0.8f;
--
--    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
--    //tree->print();
--    init_tree(tree, cell_index);
--    //tree->print();
--    block->init_tree(tree);
--    scene->write_active_block();
--    if (cell_index == 0) cell_index = 7;
--    cell_index--;
--    ++iter;
--  }
--  return scene;
--}
--
--void clean_up()
--{
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());
--    vul_file::delete_file_glob(file_it());
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/algo/tests/test_utils.h b/contrib/brl/bseg/boxm/algo/tests/test_utils.h
-deleted file mode 100644
-index f646d0b390..0000000000
---- a/contrib/brl/bseg/boxm/algo/tests/test_utils.h
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#ifndef boxm_algo_test_utils_h_
--#define boxm_algo_test_utils_h_
--//:
--// \file
--// \brief  A file containing utility functions for other tests
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <boxm/boxm_scene.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i);
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
--                                                   bool uniform = false, std::string scene_name = "test_scene");
--
--void clean_up();
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/CMakeLists.txt
-deleted file mode 100644
-index a5e13d6975..0000000000
---- a/contrib/brl/bseg/boxm/basic/CMakeLists.txt
-+++ /dev/null
-@@ -1,21 +0,0 @@
--# brl/bseg/boxm/basic/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_basic_sources
--    boxm_block_vis_graph_iterator.h     boxm_block_vis_graph_iterator.hxx
--    boxm_block_vis_graph_node.h
--    boxm_cell_vis_graph_iterator.h      boxm_cell_vis_graph_iterator.hxx
--    boxm_raytrace_function.h
--    boxm_seg_length_functor.h
--    boxm_num_rays_functor.h
--    boxm_util_data_types.h boxm_util_data_types.cxx
--   )
--
--aux_source_directory(Templates boxm_basic_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_basic LIBRARY_SOURCES ${boxm_basic_sources})
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--target_link_libraries(boxm_basic boxm boxm_util boxm_sample boxm_sample_algo boct ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index b4bce045ed..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/boxm_scene.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short,gauss_type> tree_type;
--
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-deleted file mode 100644
-index 4129f1a830..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,float >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-deleted file mode 100644
-index 450ee3e72c..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,int>  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 2cd39a3534..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <vgl/vgl_point_3d.h>
--
--typedef boct_tree<short,vgl_point_3d<double> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index 60ef86952b..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index d4a5a0384f..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boct_tree<short, boxm_edge_tangent_sample<float> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boct_tree<short, boxm_inf_line_sample<float> > aux_tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type);
--
--typedef boct_tree<short, float > aux_tree_type2;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(aux_tree_type2);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index 10b6aa91a5..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 72ebcd47fb..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index 0fcf5fd35c..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 3ad032ddf2..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index 9ee11b98ea..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_iterator+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
-deleted file mode 100644
-index c2743dff25..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_block_vis_graph_node+boct_tree+short.vgl_point_3d+double---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_node.h>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--typedef boct_tree<short, vgl_point_3d<double> > tree_type;
--BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index fb158b16d1..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_sample<float>);
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index b561f8e125..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_edge_tangent_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
-deleted file mode 100644
-index 343941bf71..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_inf_line_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short, boxm_inf_line_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index 69a4394c0b..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 2bf0739edf..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-deleted file mode 100644
-index 29aadb8cb1..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index ed5b966521..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx b/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
-deleted file mode 100644
-index c961518029..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/boxm_cell_vis_graph_iterator+short.vgl_point_3d+double--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--#include <boct/boct_tree.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--
--BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(short,vgl_point_3d<double>);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx b/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
-deleted file mode 100644
-index 84a7a2e75f..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/brdb_value_t+boxm_array_1d_float_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/basic/boxm_util_data_types.h>
--
--BRDB_VALUE_INSTANTIATE(boxm_array_1d_float_sptr,"boxm_array_1d_float_sptr");
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
-deleted file mode 100644
-index d887b99938..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/vbl_io_smart_ptr+boxm_array_1d_float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <boxm/basic/boxm_util_data_types.h>
--
--VBL_IO_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
-diff --git a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx b/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
-deleted file mode 100644
-index 2a77fe6767..0000000000
---- a/contrib/brl/bseg/boxm/basic/Templates/vbl_smart_ptr+boxm_array_1d_float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <vbl/vbl_smart_ptr.hxx>
--#include <boxm/basic/boxm_util_data_types.h>
--
--VBL_SMART_PTR_INSTANTIATE(boxm_array_1d_float);
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
-deleted file mode 100644
-index 70f36b1047..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.h
-+++ /dev/null
-@@ -1,53 +0,0 @@
--#ifndef boxm_block_vis_graph_iterator_h_
--#define boxm_block_vis_graph_iterator_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include <map>
--#include "boxm_block_vis_graph_node.h"
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_scene.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T>
--class boxm_block_vis_graph_iterator
--{
-- public:
--  boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam, boxm_scene<T>* scene,
--                                unsigned img_ni, unsigned img_nj, bool rev_iter=false);
--
--  ~boxm_block_vis_graph_iterator()= default;
--
--  bool next();
--
--  std::vector<boxm_block<T>*> frontier_blocks();
--
--  std::vector<vgl_point_3d<int> > frontier_indices() const {return to_process_indices_; }
--
--  void set_reverse_iter(bool reverse) { reverse_it_ = reverse; }
--
-- private:
--
--  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
--
--  //: visibility graph, indexed by the block indices
--  vis_graph_type vis_graph_;
--
--  //: blocks that can be seen by the camera unoccluded
--  std::vector<typename vis_graph_type::iterator> curr_blocks_;
--
--  std::vector<vgl_point_3d<int> > to_process_indices_;
--
--  //: the camera
--  vpgl_camera_double_sptr camera_;
--
--  boxm_scene<T>* scene_;
--
--  bool reverse_it_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
-deleted file mode 100644
-index 4baa6d8992..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_iterator.hxx
-+++ /dev/null
-@@ -1,173 +0,0 @@
--#ifndef boxm_block_vis_graph_iterator_hxx_
--#define boxm_block_vis_graph_iterator_hxx_
--
--#include "boxm_block_vis_graph_iterator.h"
--#include "boxm_block_vis_graph_node.h"
--#include <boxm/util/boxm_utils.h>
--#include <boct/boct_tree_cell.h>
--
--template <class T>
--boxm_block_vis_graph_iterator<T>::boxm_block_vis_graph_iterator(vpgl_camera_double_sptr cam,
--                                                                boxm_scene<T>* scene,
--                                                                unsigned img_ni,
--                                                                unsigned img_nj,
--                                                                bool rev_iter)
--    : camera_(cam), scene_(scene), reverse_it_(rev_iter)
--{
--  // compute the visibility graph
--  boxm_block_iterator<T> iter = scene->iterator();
--  for (; !iter.end(); iter++) {
--    boxm_block<T>* block = *iter;
--    if (boxm_utils::is_visible(block->bounding_box(), cam, img_ni, img_nj))
--      vis_graph_.insert(std::make_pair<vgl_point_3d<int>,boxm_block_vis_graph_node<T> >(iter.index(),boxm_block_vis_graph_node<T>()));
--  }
--
--  typename vis_graph_type::iterator vis_iter;
--  for (vis_iter=vis_graph_.begin(); vis_iter!=vis_graph_.end(); vis_iter++) {
--    vgl_point_3d<int> idx = vis_iter->first;
--    boxm_block<T>* block = scene->get_block(idx);
--    boct_face_idx vis_faces = boxm_utils::visible_faces(block->bounding_box(), cam);
--
--    vgl_point_3d<int> neighbor_idx = vis_iter->first;
--    bool face_in = false;
--    if (vis_faces & X_HIGH) {
--      // check for neighbor on X_HIGH face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(1,0,0);
--      face_in = true;
--    } else if (vis_faces & X_LOW) {
--      // check for neighbor on X_LOW face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(1,0,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(-1,0,0);
--      face_in = true;
--    }
--
--    if (face_in) {
--      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
--      if (nit == vis_graph_.end()) {
--        vis_iter->second.in_count++;
--        curr_blocks_.push_back(vis_iter);
--      } else {
--        vis_iter->second.in_count++;
--        nit->second.out_links.push_back(vis_iter);
--      }
--    }
--
--    face_in = false;
--    neighbor_idx = vis_iter->first;
--    if (vis_faces & Y_HIGH) {
--      // check for neighbor on Y_HIGH face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,1,0);
--      face_in = true;
--    } else if (vis_faces & Y_LOW) {
--      // check for neighbor on Y_LOW face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,1,0);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,-1,0);
--      face_in = true;
--    }
--
--    if (face_in) {
--      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
--      if (nit == vis_graph_.end()) {
--        vis_iter->second.in_count++;
--        curr_blocks_.push_back(vis_iter);
--      } else {
--        vis_iter->second.in_count++;
--        nit->second.out_links.push_back(vis_iter);
--      }
--    }
--
--    face_in=false;
--    neighbor_idx = vis_iter->first;
--    if (vis_faces & Z_HIGH) {
--      // check for neighbor on Z_HIGH face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,0,1);
--      face_in = true;
--    }else if (vis_faces & Z_LOW) {
--      // check for neighbor on Y_LOW face
--      if (reverse_it_)
--        neighbor_idx += vgl_vector_3d<int>(0,0,1);
--      else
--        neighbor_idx += vgl_vector_3d<int>(0,0,-1);
--      face_in = true;
--     }
--
--    if (face_in) {
--      typename vis_graph_type::iterator nit = vis_graph_.find(neighbor_idx);
--      if (nit == vis_graph_.end()) {
--        vis_iter->second.in_count++;
--        curr_blocks_.push_back(vis_iter);
--      }
--      else {
--        vis_iter->second.in_count++;
--        nit->second.out_links.push_back(vis_iter);
--      }
--    }
--  }
--}
--
--template <class T>
--bool boxm_block_vis_graph_iterator<T>::next()
--{
--  typename std::vector<typename vis_graph_type::iterator>::iterator block_iter = curr_blocks_.begin();
--  std::vector<typename vis_graph_type::iterator> to_process;
--
--  for (; block_iter != curr_blocks_.end(); block_iter++) {
--    //std::cout << (*block_iter)->first;
--    //std::cout << (*block_iter)->second.in_count << std::endl;
--    if (--((*block_iter)->second.in_count) == 0)
--      to_process.push_back(*block_iter);
--  }
--
--  if (to_process.size() == 0) {
--    to_process_indices_.resize(0);
--    return false;
--  }
--  to_process_indices_.resize(to_process.size());
--
--  std::vector<vgl_point_3d<int> >::iterator to_proc_it = to_process_indices_.begin();
--  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter, ++to_proc_it) {
--    *to_proc_it = (*block_iter)->first;
--  }
--
--  // add linked blocks to list for next iteration
--  curr_blocks_.clear();
--  for (block_iter = to_process.begin(); block_iter != to_process.end(); ++block_iter) {
--    std::vector<typename vis_graph_type::iterator > &links = (*block_iter)->second.out_links;
--    typename std::vector<typename vis_graph_type::iterator >::iterator neighbor_it = links.begin();
--    for (; neighbor_it != links.end(); ++neighbor_it) {
--      curr_blocks_.push_back(*neighbor_it);
--    }
--  }
--  return true;
--}
--
--template <class T>
--std::vector<boxm_block<T>*> boxm_block_vis_graph_iterator<T>::frontier_blocks()
--{
--  std::vector<boxm_block<T>*> frontier;
--
--  std::vector<vgl_point_3d<int> > blocks = to_process_indices_;
--  for (auto index : blocks) {
--    frontier.push_back(scene_->get_block(index)); //.x(), index.y(), index.z());
--  }
--
--  return frontier;
--}
--
--#define BOXM_BLOCK_VIS_GRAPH_ITERATOR_INSTANTIATE(T) \
--template class boxm_block_vis_graph_iterator<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h b/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
-deleted file mode 100644
-index 1d615b1477..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_block_vis_graph_node.h
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#ifndef boxm_block_vis_graph_node_h_
--#define boxm_block_vis_graph_node_h_
--//:
--// \file
--#include <vector>
--#include <iostream>
--#include <map>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vgl/vgl_point_3d.h>
--
--//: A comparison functor for vgl_point_3d's. Needed to create a std::set of vgl_point_3d<int>'s.
--template <class T>
--class vgl_point_3d_cmp
--{
-- public:
--  vgl_point_3d_cmp() = default;
--
--  bool operator()(vgl_point_3d<T> const& v0, vgl_point_3d<T> const& v1) const
--  {
--    if (v0.z() != v1.z())
--      return v0.z() < v1.z();
--    else if (v0.y() != v1.y())
--      return v0.y() < v1.y();
--    else
--      return v0.x() < v1.x();
--  }
--};
--
--template <class T>
--class boxm_block_vis_graph_node
--{
-- public:
--  typedef std::map<vgl_point_3d<int>, boxm_block_vis_graph_node<T>, vgl_point_3d_cmp<int> > vis_graph_type;
--
--  boxm_block_vis_graph_node() : in_count(0) {}
--  ~boxm_block_vis_graph_node()= default;
--
--  int dec_in_count() { return --in_count; }
--
--  //: the number of incoming edges to this node
--  int in_count;
--
--  //: graph links to the outgoing blocks
--  std::vector<typename vis_graph_type::iterator> out_links;
--};
--
--#define BOXM_BLOCK_VIS_GRAPH_NODE_INSTANTIATE(T) \
--template class boxm_block_vis_graph_node<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
-deleted file mode 100644
-index 6bc8372e16..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.h
-+++ /dev/null
-@@ -1,54 +0,0 @@
--#ifndef boxm_cell_vis_graph_iterator_h_
--#define boxm_cell_vis_graph_iterator_h_
--//:
--// \file
--#include <iostream>
--#include <vector>
--#include <boct/boct_tree_cell.h>
--#include <boct/boct_tree.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T_data>
--class boxm_cell_vis_graph_iterator
--{
-- public:
--  boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
--                               boct_tree<T_loc,T_data>* tree,
--                               unsigned img_ni,
--                               unsigned img_nj);
--
--  ~boxm_cell_vis_graph_iterator() = default;
--
--  bool next();
--
--  std::vector<boct_tree_cell<T_loc,T_data>*> frontier() { return frontier_; }
--
--  void set_reverse_iter(bool reverse) { reverse_iter_ = reverse; }
--
-- private:
--  //: the camera
--  vpgl_camera_double_sptr camera_;
--
--  //: blocks that can be seen by the camera unoccluded
--  std::vector<boct_tree_cell<T_loc,T_data>*> frontier_;
--  std::vector<boct_tree_cell<T_loc,T_data>*> curr_cells_;
--  bool reverse_iter_;
--
--  unsigned img_ni_;
--  unsigned img_nj_;
--
--  //: recursive function
--  void check_cell_visibility(boct_tree<T_loc,T_data>* tree,
--                             boct_tree_cell<T_loc,T_data>* tree_cell);
--
--  void form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,
--                           boct_face_idx face_idx,
--                           boct_tree<T_loc,T_data>* tree);
--
--  std::vector<boct_tree_cell<T_loc,T_data>* > list_of_vis_nodes_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx b/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
-deleted file mode 100644
-index 4108982a68..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_cell_vis_graph_iterator.hxx
-+++ /dev/null
-@@ -1,131 +0,0 @@
--#ifndef boxm_cell_vis_graph_iterator_hxx_
--#define boxm_cell_vis_graph_iterator_hxx_
--
--#include "boxm_cell_vis_graph_iterator.h"
--#include <boxm/util/boxm_utils.h>
--
--template <class T_loc,class T_data>
--boxm_cell_vis_graph_iterator<T_loc,T_data>::boxm_cell_vis_graph_iterator(vpgl_camera_double_sptr cam,
--                                                                         boct_tree<T_loc,T_data>* tree,
--                                                                         unsigned img_ni,
--                                                                         unsigned img_nj) : camera_(cam),img_ni_(img_ni), img_nj_(img_nj)
--{
--  if (!tree)
--  {
--   std::cout<<"No Tree found"<<std::endl;
--  }
--  else
--  {
--    list_of_vis_nodes_.clear();
--    // check if each node is visible or notr
--    check_cell_visibility(tree,tree->root());
--    // compute the visibility graph
--    for (unsigned i=0;i<list_of_vis_nodes_.size();i++)
--    {
--      boct_face_idx vis_faces = boxm_utils::visible_faces(tree->cell_bounding_box(list_of_vis_nodes_[i]), cam);
--      if (vis_faces & ::X_HIGH) {
--        form_graph_per_cell(list_of_vis_nodes_[i],X_HIGH,tree);
--      }
--      else if (vis_faces & ::X_LOW) {
--        form_graph_per_cell(list_of_vis_nodes_[i],X_LOW,tree);
--      }
--      if (vis_faces & ::Y_HIGH) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Y_HIGH,tree);
--      }
--      else if (vis_faces & ::Y_LOW) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Y_LOW,tree);
--      }
--      if (vis_faces & ::Z_HIGH) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Z_HIGH,tree);
--      }
--      else if (vis_faces & ::Z_LOW) {
--        form_graph_per_cell(list_of_vis_nodes_[i],Z_LOW,tree);
--      }
--    }
--    list_of_vis_nodes_.clear();
--  }
--}
--
--template <class T_loc,class T_data>
--bool boxm_cell_vis_graph_iterator<T_loc,T_data>::next()
--{
--  std::vector<boct_tree_cell<T_loc,T_data>* > to_process;
--  std::vector<boct_tree_cell<T_loc,T_data>* > to_process_refine;
--
--  typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator cell_it = curr_cells_.begin();
--  for (; cell_it != curr_cells_.end(); ++cell_it) {
--    // decrement each cell's count in list. if count == 0, add to list of nodes to process
--    if (--((*cell_it)->vis_node()->incoming_count) == 0) {
--      to_process.push_back(*cell_it);
--    }
--  }
--  if (to_process.size() == 0) {
--    return false;
--  }
--   frontier_.clear();
--
--  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
--    frontier_.push_back((*cell_it));
--  }
--  // add linked cells to list for next iteration
--  curr_cells_.clear();
--  for (cell_it = to_process.begin(); cell_it != to_process.end(); ++cell_it) {
--    std::vector<boct_tree_cell<T_loc,T_data>* > links = (*cell_it)->vis_node()->outgoing_links;
--    typename std::vector<boct_tree_cell<T_loc,T_data>* >::iterator neighbor_it = links.begin();
--    for (; neighbor_it != links.end(); ++neighbor_it) {
--      curr_cells_.push_back(*neighbor_it);
--    }
--  }
--  return true;
--}
--
--template<class T_loc,class T_data>
--void boxm_cell_vis_graph_iterator<T_loc,T_data>::check_cell_visibility(boct_tree<T_loc,T_data>* tree,
--                                                                       boct_tree_cell<T_loc,T_data>* tree_cell)
--{
--  vgl_box_3d<double> bbox=tree->cell_bounding_box(tree_cell);
--  if (boxm_utils::is_visible(bbox, camera_,img_ni_, img_nj_, true))
--  {
--    // base case for recursion
--    if (tree_cell->is_leaf())
--    {
--      boct_cell_vis_graph_node<T_loc,T_data> * node=new boct_cell_vis_graph_node<T_loc,T_data>();
--      node->visible=true;
--      tree_cell->set_vis_node(node);
--      list_of_vis_nodes_.push_back(tree_cell);
--    }
--    else
--    {
--      boct_tree_cell<T_loc,T_data>* children = tree_cell->children();
--      for (unsigned i=0; i<8; i++)
--      check_cell_visibility(tree,&children[i]);
--    }
--  }
--}
--
--template<class T_loc,class T_data>
--void boxm_cell_vis_graph_iterator<T_loc,T_data>::form_graph_per_cell(boct_tree_cell<T_loc,T_data>* cell,boct_face_idx face_idx,boct_tree<T_loc,T_data>* tree)
--{
--  boct_cell_vis_graph_node<T_loc,T_data>* vis_node=cell->vis_node();
--  std::vector<boct_tree_cell<T_loc,T_data>*> neighbors;
--  cell->find_neighbors(face_idx, neighbors,tree->root_level());
--  typename std::vector<boct_tree_cell<T_loc,T_data>*>::iterator neighbor_it = neighbors.begin();
--  bool visible_neighbors=false;
--  for (; neighbor_it != neighbors.end(); ++neighbor_it) {
--    boct_cell_vis_graph_node<T_loc,T_data>* neighbor_vis_node=(*neighbor_it)->vis_node();
--    if (neighbor_vis_node) {
--      vis_node->incoming_count++;
--      neighbor_vis_node->outgoing_links.push_back(cell);
--      visible_neighbors=true;
--    }
--  }
--  if (!visible_neighbors) {
--    vis_node->incoming_count++;
--    curr_cells_.push_back(cell);
--  }
--}
--
--#define BOXM_CELL_VIS_GRAPH_ITERATOR_INSTANTIATE(T1,T2) \
--template class boxm_cell_vis_graph_iterator<T1,T2 >
--
--#endif // boxm_cell_vis_graph_iterator_hxx_
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h b/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
-deleted file mode 100644
-index 98703eec22..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_num_rays_functor.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--#ifndef boxm_num_rays_functor_h
--#define boxm_num_rays_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_histogram.h>
--#include <boxm/boxm_apm_traits.h>
--#include "boxm_raytrace_function.h"
--
--//: this functor is to compute no of rays passing through a cell
--// Works for boxm_scalar_sample
--template <boxm_apm_type APM, class T_aux>
--class boxm_num_rays_functor
--{
-- public:
--  boxm_num_rays_functor()
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int /*i*/, unsigned int /*j*/,  // FIXME: both unused!
--                        vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> & /*cell_value*/,       // FIXME: unused...
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--
--    aux_val.scalar_sum_+=1;
--    //std::cout<<aux_val.scalar_sum_<<' ';
--    aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h b/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
-deleted file mode 100644
-index 88897fd462..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_raytrace_function.h
-+++ /dev/null
-@@ -1,618 +0,0 @@
--#ifndef boxm_raytrace_function_h_
--#define boxm_raytrace_function_h_
--//:
--// \file
--
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/boxm_aux_traits.h>
--
--#include <vpgl/vpgl_camera.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vpgl/vpgl_affine_camera.h>
--#include <vpgl/algo/vpgl_backproject.h>
--#include <vpgl/algo/vpgl_ray.h>
--
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/vgl_homg_point_2d.h>
--#include <vgl/vgl_line_3d_2_points.h>
--
--#include <vul/vul_timer.h>
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<class F, class T_loc, class T_data, class T_aux = typename boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype>
--class boxm_raytrace_function
--{
--  // null scene used as placeholder for operations that don't require an auxiliary scene
--  boxm_aux_scene<T_loc, T_data, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> null_scene_;
--
-- public:
--    typedef boct_tree<T_loc,T_data> tree_type;
--    typedef boct_tree<T_loc,T_aux> aux_tree_type;
--    typedef boct_tree_cell<T_loc,T_data> cell_type;
--
--    //: constructor for functions with no auxiliary scene needed
--    boxm_raytrace_function(boxm_scene<tree_type> &scene,
--                           vpgl_camera_double_sptr cam,
--                           unsigned int ni, unsigned int nj,
--                           bool reverse_traversal = false,
--                           unsigned int i0 = 0, unsigned int j0 = 0
--                          )
--    : scene_(scene), aux_scene_(null_scene_), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
--
--    //: constructor for functions using an auxiliary scene
--    boxm_raytrace_function(boxm_scene<tree_type> &scene,
--                           boxm_aux_scene<T_loc, T_data,  T_aux> &aux_scene,
--                           vpgl_camera_double_sptr cam,
--                           unsigned int ni, unsigned int nj,
--                           bool reverse_traversal = false,
--                           unsigned int i0 = 0, unsigned int j0 = 0)
--    : scene_(scene), aux_scene_(aux_scene), reverse_traversal_(reverse_traversal), cam_(cam), img_i0_(i0), img_j0_(j0), img_ni_(ni), img_nj_(nj), debug_lvl_(0) {}
--
--    bool run_single_ray(F& step_functor,float i, float j)
--    {
--        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
--        continue_trace.fill(true);
--        // code to iterate over the blocks in order of visibility
--        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
--        while (block_vis_iter.next())
--        {
--            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--            for (unsigned i=0; i<block_indices.size(); i++) // code for each block
--            {
--                scene_.load_block(block_indices[i]);
--                boxm_block<tree_type> * curr_block=scene_.get_active_block();
--                boxm_block<aux_tree_type> * curr_aux_block=NULL;
--                if (step_functor.is_aux_)
--                    curr_aux_block=aux_scene_.get_block(block_indices[i]);
--
--                if (debug_lvl_ > 0)
--                    std::cout << "processing block at index (" <<block_indices[i] << ')' << std::endl;
--                // make sure block projects to inside of image
--                vgl_box_3d<double> block_bb = curr_block->bounding_box();
--
--                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
--                    continue;
--
--
--                vgl_box_2d<double> img_bb;
--
--                // initialize ray_origin() function for this block
--                if (!generate_ray_init(block_bb, img_bb)) {
--                    continue;
--                }
--                tree_type * tree=curr_block->get_tree();
--
--                aux_tree_type * aux_tree=NULL;
--                if (step_functor.is_aux_)
--                {
--                    aux_tree=curr_aux_block->get_tree();
--                }
--
--                 // get direction of vector and enter point - this depends on which camera type we have
--                vgl_point_3d<double> ray_origin;
--                vgl_vector_3d<double> direction;
--                vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
--                std::vector<vgl_point_3d<double> > plane_intersections(6);
--                // add 0.5 to get center of pixel
--                generate_ray(i , j, block_bb, ray_origin, direction);
--
--                // compute intersection of each plane with ray
--                double lambda[6];
--                lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
--                lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
--                lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
--                lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
--                lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
--                lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
--
--                if (block_bb.contains(ray_origin))
--                    enter_pt=ray_origin;
--                else
--                {
--                    for (unsigned int face=0; face<6; ++face) {
--                        plane_intersections[face] = ray_origin + (direction * lambda[face]);
--                    }
--
--                    // determine which point is the entrance point based on direction
--                    const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
--                    if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
--                        (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
--                        (direction.z() < -epsilon) )
--                    {
--                        // ray intersects the zmax plane
--                        // check zmax first since it is probably the most common
--                        enter_pt = plane_intersections[5];
--                    }
--                    else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
--                        (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
--                        (direction.x() > epsilon) )
--                    {
--                        // ray intersects the xmin plane
--                        enter_pt = plane_intersections[0];
--                    }
--                    else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
--                        (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
--                        (direction.x() < -epsilon) )
--                    {
--                        // ray intersects the xmax plane
--                        enter_pt = plane_intersections[1];
--                    }
--                    else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
--                        (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
--                        (direction.y() > epsilon) )
--                    {
--                        // ray intersects the ymin plane
--                        enter_pt = plane_intersections[2];
--                    }
--                    else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
--                        (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
--                        (direction.y() < -epsilon) )
--                    {
--                        // ray intersects the ymax plane
--                        enter_pt = plane_intersections[3];
--                    }
--                    else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
--                        (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
--                        (direction.z() > epsilon) )
--                    {
--                        // ray intersects the zmin plane
--                        enter_pt = plane_intersections[4];
--                    }
--                    else {
--                        // no entry point into this block found
--                        continue;
--                    }
--                }
--                boct_tree_cell<T_loc,T_data > * curr_cell=tree->locate_point_global(enter_pt);
--                while (true)
--                {
--                    boct_loc_code<T_loc> cell_code(curr_cell->get_code());
--
--                    boct_tree_cell<T_loc,T_aux > * curr_aux_cell=NULL;
--                    if (step_functor.is_aux_)
--                        curr_aux_cell=aux_tree->get_cell(cell_code);
--                    vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
--                    // find exit point of cell
--                    vgl_point_3d<double> exit_pt;
--                    double lambda=0;
--                    boct_face_idx face_id=NONE;
--                    bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
--                    if (!found_exit) {
--                        std::cerr << "error: could not find cell exit point\n"
--                                 << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
--                                 << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
--                                 << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
--                                 << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
--                        assert(found_exit);
--                        break;
--                    }
--                    T_data cell_val=curr_cell->data();
--                    T_aux aux_val;
--                    if (step_functor.is_aux_)
--                        aux_val=curr_aux_cell->data();
--                    continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(enter_pt, exit_pt, cell_val,aux_val);
--                    curr_cell->set_data(cell_val);
--                    if (step_functor.is_aux_)
--                        curr_aux_cell->set_data(aux_val);
--                    // normalize the point to [0-1]to obtain the index.
--                    vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
--                                                      (exit_pt.y()-block_bb.min_y())/block_bb.height(),
--                                                      (exit_pt.z()-block_bb.min_z())/block_bb.depth());
--                    // obtain the code for the exit point
--                    boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level());
--                    cell_type *neighborcell=NULL;
--                    if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
--                        curr_cell=neighborcell->traverse_force(exit_loc_code);
--                    else
--                    {
--                        std::cerr << "NO NEIGHBORS FOUND!\n";
--                        break;
--                    }
--                    enter_pt=exit_pt;
--                }
--                if (!step_functor.scene_read_only_)
--                    scene_.write_active_block();
--                if (step_functor.is_aux_)
--                    aux_scene_.write_active_block();
--            }
--        }
--        scene_.unload_active_blocks();
--        aux_scene_.unload_active_blocks();
--        return true;
--    }
--
--    bool run(F& step_functor)
--    {
--        vul_timer timer;
--        float total_load_time = 0.0f;
--        float total_compute_time = 0.0f;
--        float total_save_time = 0.0f;
--        vil_image_view<bool> continue_trace(img_ni_, img_nj_);
--        continue_trace.fill(true);
--        // code to iterate over the blocks in order of visibility
--        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
--        while (block_vis_iter.next())
--        {
--            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--            for (auto & block_indice : block_indices) // code for each block
--            {
--                timer.mark();
--                scene_.load_block(block_indice);
--                boxm_block<tree_type> * curr_block=scene_.get_active_block();
--
--                if (debug_lvl_ > 0)
--                    std::cout << "processing block at index (" <<block_indice << ')' << std::endl;
--                // make sure block projects to inside of image
--                vgl_box_3d<double> block_bb = curr_block->bounding_box();
--
--                if (!boxm_utils::is_visible(block_bb,cam_,img_ni_,img_nj_))
--                    continue;
--                vgl_box_2d<double> img_bb;
--                // initialize ray_origin() function for this block
--                if (!generate_ray_init(block_bb, img_bb)) {
--                    continue;
--                }
--
--                tree_type * tree=curr_block->get_tree();
--
--                boxm_block<aux_tree_type> * curr_aux_block=nullptr;
--                aux_tree_type * aux_tree=nullptr;
--                if (step_functor.is_aux_)
--                {
--                   curr_aux_block=aux_scene_.get_block(block_indice);
--                   aux_tree=curr_aux_block->get_tree();
--                }
--                float load_time = (float)timer.all() / 1e3f;
--                total_load_time += load_time;
--                timer.mark();
--                // for each image pixel
--                for (unsigned int i = int(img_bb.min_x()+0.99); i <= img_bb.max_x(); ++i)
--                {
--                    if (debug_lvl_ > 1) {
--                        if (!(i % 10))
--                            std::cout << '.';
--                    }
--                    for (unsigned int j = int(img_bb.min_y()+0.99); j <= img_bb.max_y(); ++j)
--                    {
--                        if (!continue_trace(i - img_i0_ , j - img_j0_)) {
--                            continue;
--                        }
--                        // get direction of vector and enter point - this depends on which camera type we have
--                        vgl_point_3d<double> ray_origin;
--                        vgl_vector_3d<double>direction;
--                        vgl_point_3d<double> enter_pt(0.0,0.0,0.0);
--                        vgl_point_3d<double> exit_pt;
--                        // add 0.5 to get center of pixel
--                        generate_ray((float)i + 0.5f, (float)j + 0.5f, block_bb, ray_origin, direction);
--                        if (!entry_point(block_bb,ray_origin,direction,enter_pt))
--                            continue;
--                        // normalize the entry point to [0,1]
--                        vgl_point_3d<double> enter_pt_norm((enter_pt.x()-block_bb.min_x())/block_bb.width(),
--                                                           (enter_pt.y()-block_bb.min_y())/block_bb.height(),
--                                                           (enter_pt.z()-block_bb.min_z())/block_bb.depth());
--                        boct_loc_code<T_loc> curr_cell_code(enter_pt_norm,tree->root_level());
--                        boct_tree_cell<T_loc,T_data > * curr_cell=tree->root()->traverse_force(curr_cell_code);
--
--                        boct_tree_cell<T_loc, boxm_aux_traits<BOXM_AUX_NULL>::sample_datatype> aux_cell_null;
--
--                        while (continue_trace(i-img_i0_, j-img_j0_))
--                        {
--                            boct_tree_cell<T_loc,T_aux > *curr_aux_cell= reinterpret_cast<boct_tree_cell<T_loc,T_aux>*>(&aux_cell_null);
--                            if (step_functor.is_aux_)
--                            {
--                                boct_loc_code<T_loc> cell_code(curr_cell->get_code());
--                                curr_aux_cell=aux_tree->get_cell(cell_code);
--                            }
--                            // get the canonical bounding box
--                            vgl_box_3d<double> cell_bb = tree->cell_bounding_box(curr_cell);
--                            // find exit point of cell
--
--                            double lambda=0;
--                            boct_face_idx face_id=NONE;
--                            bool found_exit =boxm_utils::cube_exit_point(cell_bb,enter_pt,direction, exit_pt,lambda,face_id);
--                            if (!found_exit) {
--                                std::cerr << "error: could not find cell exit point\n"
--                                         << "   enter_pt = [" << enter_pt.x() << ", " << enter_pt.y() << ", " << enter_pt.z() << "]\n"
--                                         << "   direction = [" << direction.x() << ", " << direction.y() << ", " << direction.z() << "]\n"
--                                         << "   cell_bb = [" << cell_bb.min_x() <<", " << cell_bb.max_x() << "]  [" << cell_bb.min_y()
--                                         << ", " << cell_bb.max_y() << "]  [" << cell_bb.min_z() << ", " << cell_bb.max_z() <<"]\n";
--                                assert(found_exit);
--                                break;
--                            }
--                            T_data cell_val=curr_cell->data();
--                            T_aux aux_val=curr_aux_cell->data();
--
--
--                            continue_trace(i-img_i0_, j-img_j0_) = step_functor.step_cell(i,j, enter_pt, exit_pt, cell_val,aux_val);
--
--                            curr_cell->set_data(cell_val);
--                            if (step_functor.is_aux_)
--                                curr_aux_cell->set_data(aux_val);
--                             vgl_point_3d<double> exit_pt_norm((exit_pt.x()-block_bb.min_x())/block_bb.width(),
--                                                               (exit_pt.y()-block_bb.min_y())/block_bb.height(),
--                                                              (exit_pt.z()-block_bb.min_z())/block_bb.depth());
--
--                            // obtain the code for the exit point
--                            boct_loc_code<T_loc> exit_loc_code(exit_pt_norm,tree->root_level(), tree->max_val());
--                            cell_type *neighborcell=nullptr;
--                            if (curr_cell->find_neighbor(face_id,neighborcell,tree->root_level()))
--                                curr_cell=neighborcell->traverse_force(exit_loc_code);
--                            else
--                                break;
--                            enter_pt=exit_pt;
--                        }
--                    }
--                }
--                float compute_time = (float)timer.all() / 1e3f;
--                total_compute_time += compute_time;
--                timer.mark();
--
--                if (!step_functor.scene_read_only_)
--                    scene_.write_active_block();
--                if (step_functor.is_aux_)
--                    aux_scene_.write_active_block();
--
--                float save_time = (float)timer.all() /  1e3f;
--                total_save_time += save_time;
--                //std::cout << "load: " << load_time << "s  compute: " << compute_time << "s  save: " << save_time << 's' << std::endl;
--            }
--        }
--        scene_.unload_active_blocks();
--        aux_scene_.unload_active_blocks();
--
--        //std::cout << "total load: " << total_load_time << "s  total compute: " << total_compute_time << "s  total save: " << total_save_time << 's' << std::endl;
--        return true;
--    }
--
-- protected:
--
--    bool generate_ray_init(vgl_box_3d<double> const& block_bb, vgl_box_2d<double> &img_bb)
--    {
--        // determine intersection of block bounding box projection and image bounds
--        vgl_box_2d<double> img_bounds;
--        img_bounds.add(vgl_point_2d<double>(img_i0_,img_j0_));
--        img_bounds.add(vgl_point_2d<double>(img_i0_ + img_ni_ - 1, img_j0_ + img_nj_ - 1));
--
--        vgl_box_2d<double> block_projection;
--        double u,v;
--        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.min_x(),block_bb.min_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.min_x(),block_bb.max_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.min_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.min_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--        cam_->project(block_bb.max_x(),block_bb.max_y(),block_bb.max_z(),u,v);
--        block_projection.add(vgl_point_2d<double>(u,v));
--
--        img_bb=vgl_intersection(img_bounds,block_projection);
--
--        if (img_bb.is_empty())
--            return false;
--        else
--            return true;
--    }
--
--    void generate_ray(float i, float j, vgl_box_3d<double> const& /*block_bb*/, vgl_point_3d<double> &ray_origin, vgl_vector_3d<double> &norm_direction)
--    {
--      if (cam_->type_name() == "vpgl_perspective_camera") {
--        vpgl_perspective_camera<double> const* pcam =
--          static_cast<vpgl_perspective_camera<double> const*>(cam_.ptr());
--        // backproject image point to a ray
--        ray_origin = pcam->camera_center();
--        vgl_line_3d_2_points<double> cam_ray = pcam->backproject(vgl_point_2d<double>((double)i,(double)j));
--        norm_direction=cam_ray.direction();
--        normalize(norm_direction);
--        return;
--      }
--      if (cam_->type_name() == "vpgl_proj_camera") {
--        vpgl_proj_camera<double> const* prcam =
--          static_cast<vpgl_proj_camera<double> const*>(cam_.ptr());
--        ray_origin = prcam->camera_center();
--        vgl_homg_line_3d_2_points<double>  cam_ray =
--          prcam->backproject(vgl_homg_point_2d<double>((double)i,(double)j));
--        vgl_homg_point_3d<double> hp = cam_ray.point_infinite();
--        vgl_vector_3d<double> direction(hp.x(), hp.y(), hp.z());
--        norm_direction=direction;
--        normalize(norm_direction);
--        return;
--      }
--      if (cam_->type_name() == "vpgl_affine_camera") {
--        vgl_homg_point_2d<double> ph(i, j);
--        vpgl_affine_camera<double> const * afcam =
--          static_cast<vpgl_affine_camera<double> const*>(cam_.ptr());
--        vgl_homg_line_3d_2_points<double>  cam_ray =
--          afcam->backproject(ph);
--        vgl_homg_point_3d<double> hpinf = cam_ray.point_infinite();
--        vgl_homg_point_3d<double> hpfin = cam_ray.point_finite();
--        vgl_vector_3d<double> direction(hpinf.x(), hpinf.y(), hpinf.z());
--        norm_direction=direction;
--        normalize(norm_direction);
--        vgl_point_3d<double> temp(hpfin);
--        ray_origin = temp;
--        return;
--      }
--      if (cam_->type_name() == "vpgl_local_rational_camera") {
--        vpgl_local_rational_camera<double> const* lrcam =
--          static_cast<vpgl_local_rational_camera<double> const*>(cam_.ptr());
--        vpgl_ray::ray(*lrcam,(double)i, (double)j, ray_origin, norm_direction);
--        return;
--      }
--      else {
--        std::cerr << "In boxm_raytrace_function: camera type not handled\n";
--        assert(false);
--      }
--    }
--
--    bool entry_point(vgl_box_3d<double> & block_bb, vgl_point_3d<double>  &ray_origin,
--                     vgl_vector_3d<double> &direction, vgl_point_3d<double> & enter_pt)
--    {
--      double lambda[6];
--      std::vector<vgl_point_3d<double> > plane_intersections(6);
--
--      lambda[0] = (block_bb.min_x() - ray_origin.x())/direction.x();
--      lambda[1] = (block_bb.max_x() - ray_origin.x())/direction.x();
--      lambda[2] = (block_bb.min_y() - ray_origin.y())/direction.y();
--      lambda[3] = (block_bb.max_y() - ray_origin.y())/direction.y();
--      lambda[4] = (block_bb.min_z() - ray_origin.z())/direction.z();
--      lambda[5] = (block_bb.max_z() - ray_origin.z())/direction.z();
--
--      if (block_bb.contains(ray_origin))
--          enter_pt=ray_origin;
--      else
--      {
--          for (unsigned int face=0; face<6; ++face) {
--              plane_intersections[face] = ray_origin + (direction * lambda[face]);
--          }
--
--          // determine which point is the entrance point based on direction
--          const double epsilon = 1e-6; // use in place of zero to avoid badly conditioned lambdas
--          if ( (plane_intersections[5].x() >= block_bb.min_x()) && (plane_intersections[5].x() <= block_bb.max_x()) &&
--              (plane_intersections[5].y() >= block_bb.min_y()) && (plane_intersections[5].y() <= block_bb.max_y()) &&
--              (direction.z() < -epsilon) )
--          {
--              // ray intersects the zmax plane
--              // check zmax first since it is probably the most common
--              enter_pt = plane_intersections[5];
--          }
--          else if ( (plane_intersections[0].y() >= block_bb.min_y()) && (plane_intersections[0].y() <= block_bb.max_y()) &&
--              (plane_intersections[0].z() >= block_bb.min_z()) && (plane_intersections[0].z() <= block_bb.max_z()) &&
--              (direction.x() > epsilon) )
--          {
--              // ray intersects the xmin plane
--              enter_pt = plane_intersections[0];
--          }
--          else if ( (plane_intersections[1].y() >= block_bb.min_y()) && (plane_intersections[1].y() <= block_bb.max_y()) &&
--              (plane_intersections[1].z() >= block_bb.min_z()) && (plane_intersections[1].z() <= block_bb.max_z()) &&
--              (direction.x() < -epsilon) )
--          {
--              // ray intersects the xmax plane
--              enter_pt = plane_intersections[1];
--          }
--          else if ( (plane_intersections[2].x() >= block_bb.min_x()) && (plane_intersections[2].x() <= block_bb.max_x()) &&
--              (plane_intersections[2].z() >= block_bb.min_z()) && (plane_intersections[2].z() <= block_bb.max_z()) &&
--              (direction.y() > epsilon) )
--          {
--              // ray intersects the ymin plane
--              enter_pt = plane_intersections[2];
--          }
--          else if ( (plane_intersections[3].x() >= block_bb.min_x()) && (plane_intersections[3].x() <= block_bb.max_x()) &&
--              (plane_intersections[3].z() >= block_bb.min_z()) && (plane_intersections[3].z() <= block_bb.max_z()) &&
--              (direction.y() < -epsilon) )
--          {
--              // ray intersects the ymax plane
--              enter_pt = plane_intersections[3];
--          }
--          else if ( (plane_intersections[4].x() >= block_bb.min_x()) && (plane_intersections[4].x() <= block_bb.max_x()) &&
--              (plane_intersections[4].y() >= block_bb.min_y()) && (plane_intersections[4].y() <= block_bb.max_y()) &&
--              (direction.z() > epsilon) )
--          {
--              // ray intersects the zmin plane
--              enter_pt = plane_intersections[4];
--          }
--          else {
--              // no entry point into this block found
--              return false;;
--          }
--      }
--      return true;
--    }
--
--    boxm_scene<tree_type> &scene_;
--    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
--
--    bool reverse_traversal_;
--
--    const vpgl_camera_double_sptr cam_;
--    unsigned int img_i0_;
--    unsigned int img_j0_;
--    unsigned int img_ni_;
--    unsigned int img_nj_;
--
--    unsigned int debug_lvl_;
--};
--
--template<class F, class T_loc, class T_data, class T_aux>
--class boxm_iterate_cells_function
--{
-- public:
--    typedef boct_tree<T_loc,T_data> tree_type;
--    typedef boct_tree<T_loc,T_aux> aux_tree_type;
--    typedef boct_tree_cell<T_loc,T_data> cell_type;
--    typedef boct_tree_cell<T_loc,T_aux> aux_cell_type;
--    //: constructor
--    boxm_iterate_cells_function(boxm_scene<tree_type> &scene,
--                                boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene,
--                                vpgl_camera_double_sptr cam,
--                                unsigned int ni, unsigned int nj )
--    : scene_(scene), aux_scene_(aux_scene), img_ni_(ni), img_nj_(nj), cam_(cam)
--    {}
--
--
--    bool run(F& step_functor)
--    {
--        // code to iterate over the blocks in order of visibility
--        boxm_block_vis_graph_iterator<tree_type > block_vis_iter(cam_, &scene_, img_ni_,img_nj_);
--        while (block_vis_iter.next())
--        {
--            std::vector<vgl_point_3d<int> > block_indices = block_vis_iter.frontier_indices();
--            for (auto & block_indice : block_indices) // code for each block
--            {
--                scene_.load_block(block_indice);
--                boxm_block<tree_type> * curr_block=scene_.get_active_block();
--                boxm_block<aux_tree_type> * curr_aux_block=aux_scene_.get_block(block_indice);
--                tree_type * tree=curr_block->get_tree();
--                aux_tree_type * aux_tree=curr_aux_block->get_tree();
--
--                std::vector<cell_type*> leaves=tree->leaf_cells();
--                for (unsigned i=0;i<leaves.size();i++)
--                {
--                    T_data cell_val=leaves[i]->data();
--                    boct_loc_code<T_loc> cell_code(leaves[i]->get_code());
--                    aux_cell_type * aux_cell=aux_tree->get_cell(cell_code);
--                    T_aux aux_val=aux_cell->data();
--                    step_functor.step_cell(cell_val,aux_val);
--                    leaves[i]->set_data(cell_val);
--                    aux_cell->set_data(aux_val);
--                }
--                scene_.write_active_block();
--                aux_scene_.write_active_block();
--            }
--        }
--        return true;
--    }
--
-- protected:
--    boxm_scene<tree_type> &scene_;
--    boxm_aux_scene<T_loc,  T_data,  T_aux> &aux_scene_;
--    bool reverse_traversal_;
--
--    unsigned img_ni_;
--    unsigned img_nj_;
--
--    const vpgl_camera_double_sptr cam_;
--};
--
--#endif // boxm_raytrace_function_h_
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h b/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
-deleted file mode 100644
-index ea44cd7eed..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_seg_length_functor.h
-+++ /dev/null
-@@ -1,46 +0,0 @@
--#ifndef boxm_seg_length_functor_h
--#define boxm_seg_length_functor_h
--//:
--// \file
--#include <iostream>
--#include <boxm/boxm_apm_traits.h>
--#include "boxm_raytrace_function.h"
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <vil/vil_image_view.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <boxm_apm_type APM, class T_aux>
--class boxm_seg_length_functor
--{
-- public:
--  boxm_seg_length_functor(vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &observation,
--                          unsigned int /*ni*/=0, unsigned /*nj*/=0)
--    : obs_(observation)
--  {
--    scene_read_only_=true;
--    is_aux_=true;
--  }
--
--  inline bool step_cell(unsigned int i, unsigned int j, vgl_point_3d<double> s0, vgl_point_3d<double> s1,
--                        boxm_sample<APM> & /*cell_value*/,    // FIXME: unused...
--                        T_aux &aux_val)
--  {
--    const float seg_len = (float)(s1 - s0).length();
--    aux_val.obs_ += obs_(i,j) * seg_len;
--    aux_val.seg_len_ += seg_len;
--    return true;
--  }
--
-- public:
--  bool scene_read_only_;
--  bool is_aux_;
--
-- private:
--  vil_image_view<typename boxm_apm_traits<APM>::obs_datatype> &obs_;
--};
--
--#endif // boxm_seg_length_functor_h
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
-deleted file mode 100644
-index a6f2af30f1..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include "boxm_util_data_types.h"
--
--// Binary write boxm_render_probe_manager scene to stream
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_write(vsl_b_ostream &, boxm_array_1d_float const&) {}
--
--// Binary load boxm_render_probe_manager scene from stream.
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_read(vsl_b_istream &, boxm_array_1d_float &) {}
--
--// Binary load boxm_render_probe_manager scene from stream.
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_read(vsl_b_istream&, boxm_array_1d_float*) {}
--
--// Binary write scene pointer to stream
--// DUMMY IMPLEMENTATION: does nothing!
--void vsl_b_write(vsl_b_ostream&, const boxm_array_1d_float* &) {}
-diff --git a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h b/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
-deleted file mode 100644
-index 827e172bbc..0000000000
---- a/contrib/brl/bseg/boxm/basic/boxm_util_data_types.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#ifndef boxm_util_data_types_h
--#define boxm_util_data_types_h
--//:
--// \file
--#include <vbl/vbl_ref_count.h>
--#include <vbl/vbl_smart_ptr.h>
--#include <vbl/vbl_array_1d.h>
--#include <vsl/vsl_binary_io.h>
--
--class boxm_array_1d_float: public vbl_ref_count
--{
-- public:
--  boxm_array_1d_float(unsigned n):data_array(n,-1.0f){}
--  vbl_array_1d<float> data_array;
--};
--
--typedef vbl_smart_ptr<boxm_array_1d_float> boxm_array_1d_float_sptr;
--
--//: Binary write boxm_render_probe_manager scene to stream
--void vsl_b_write(vsl_b_ostream & os, boxm_array_1d_float const& a);
--
--//: Binary load boxm_render_probe_manager scene from stream.
--void vsl_b_read(vsl_b_istream & is, boxm_array_1d_float &a);
--
--void vsl_b_read(vsl_b_istream& is, boxm_array_1d_float* b);
--
--//: Binary write  scene pointer to stream
--void vsl_b_write(vsl_b_ostream& os, const boxm_array_1d_float* &b);
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
-deleted file mode 100644
-index 96c61fe483..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,15 +0,0 @@
--add_executable( boxm_basic_test_all
--  test_driver.cxx
--  test_block_vis_graph.cxx
--  test_cell_vis_graph.cxx
-- )
--
--target_link_libraries( boxm_basic_test_all boxm_basic boxm boxm_util ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME boxm_basic_test_block_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_block_vis_graph  )
--add_test( NAME boxm_basic_test_cell_vis_graph COMMAND $<TARGET_FILE:boxm_basic_test_all> test_cell_vis_graph  )
--
--add_executable( boxm_basic_test_include test_include.cxx )
--target_link_libraries( boxm_basic_test_include boxm_basic)
--add_executable( boxm_basic_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_basic_test_template_include boxm_basic)
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
-deleted file mode 100644
-index 70a87b0476..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_block_vis_graph.cxx
-+++ /dev/null
-@@ -1,48 +0,0 @@
--
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/util/boxm_test_util.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_block_vis_graph()
--{
--  // create scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(2,2,3);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  vul_file::make_directory("boxm_scene");
--  scene.set_paths("boxm_scene", "block");
--
--
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--  boxm_block_vis_graph_iterator<tree_type> block_vis_iter(camera, &scene, IMAGE_U, IMAGE_V);
--
--  int vis_count = -1;
--  std::vector<boxm_block<tree_type>*> blocks;
--  int counts[] = {4,4,4};
--  while (block_vis_iter.next()) {
--    int block_count = 0;
--    ++vis_count;
--    std::cout << "Frontier\n";
--    blocks = block_vis_iter.frontier_blocks();
--    for (unsigned i=0; i<blocks.size(); ++i) {
--      std::cout << i << "- " << blocks[i]->bounding_box() << std::endl;
--      ++block_count;
--    }
--    TEST("block count", block_count, counts[vis_count]);
--  }
--  vpl_rmdir("boxm_scene");
--  TEST("vis count", ++vis_count, 3);
--}
--
--TESTMAIN(test_block_vis_graph);
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx b/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
-deleted file mode 100644
-index d9e2da00f7..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_cell_vis_graph.cxx
-+++ /dev/null
-@@ -1,54 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/util/boxm_test_util.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_cell_vis_graph()
--{
--  // create scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  scene.set_paths("boxm_scene_cell", "block");
--  vul_file::make_directory("boxm_scene_cell");
--
--  vgl_box_3d<double> world;
--  world.add(origin);
--  world.add(vgl_point_3d<double>(origin.x()+block_dim.x()*world_dim.x(),
--                                 origin.y()+block_dim.y()*world_dim.y(),
--                                 origin.z()+block_dim.z()*world_dim.z()));
--
--  vpgl_camera_double_sptr camera = generate_camera_top(world);
--  boxm_block_iterator<boct_tree<short,vgl_point_3d<double> > > iter(&scene);
--
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,vgl_point_3d<double> > > * block=scene.get_active_block();
--    auto * tree=new boct_tree<short,vgl_point_3d<double> >(3,2);
--    block->init_tree(tree);
--    boxm_cell_vis_graph_iterator<short,vgl_point_3d<double> > cell_iterator(camera,tree,IMAGE_U, IMAGE_V);
--    double cnt=30;
--    while (cell_iterator.next()){
--      std::cout<<"Frontier\n";
--      std::vector<boct_tree_cell<short,vgl_point_3d<double> > *> vis_cells=cell_iterator.frontier();
--      for (auto & vis_cell : vis_cells)
--      {
--        vgl_box_3d<double> box=tree->cell_bounding_box(vis_cell);
--        TEST("Returns correct frontier",cnt,box.max_z());
--      }
--      cnt-=5;
--    }
--
--    scene.write_active_block();
--    iter++;
--  }
--  vpl_rmdir("boxm_scene_cell");
--}
--
--TESTMAIN(test_cell_vis_graph);
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx b/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
-deleted file mode 100644
-index 1e4f60a571..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_block_vis_graph );
--DECLARE( test_cell_vis_graph );
--
--void register_tests()
--{
--  REGISTER( test_block_vis_graph );
--  REGISTER( test_cell_vis_graph );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
-deleted file mode 100644
-index cbaeca0acc..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_include.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.h>
--#include <boxm/basic/boxm_block_vis_graph_node.h>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.h>
--#include <boxm/basic/boxm_num_rays_functor.h>
--#include <boxm/basic/boxm_raytrace_function.h>
--#include <boxm/basic/boxm_seg_length_functor.h>
--#include <boxm/basic/boxm_util_data_types.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
-deleted file mode 100644
-index 131baa9347..0000000000
---- a/contrib/brl/bseg/boxm/basic/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/basic/boxm_block_vis_graph_iterator.hxx>
--#include <boxm/basic/boxm_cell_vis_graph_iterator.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx b/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
-deleted file mode 100644
-index 1d3c646178..0000000000
---- a/contrib/brl/bseg/boxm/boxm_apm_traits.cxx
-+++ /dev/null
-@@ -1,86 +0,0 @@
--#include "boxm_apm_traits.h"
--
--const char* boxm_apm_types::app_model_strings[]  = { "apm_mog_grey",
--                                                     "apm_mog_rgb",
--                                                     "apm_simple_grey",
--                                                     "apm_simple_rgb",
--                                                     "apm_mob_grey",
--                                                     "float",
--                                                     "int",
--                                                     "short",
--                                                     "char",
--                                                     "bool",
--                                                     "vnl_double_10",
--                                                     "vnl_float_10",
--                                                     "vnl_float_3",
--                                                     "bsta_mog_f1",
--                                                     "bsta_gauss_f1",
--                                                     "bvpl_sample_float",
--                                                     "bvpl_sample_gauss_f1",
--                                                     "bvpl_pca_basis_sample_10",
--                                                     "edge_float",
--                                                     "edge_line",
--                                                     "edge_tangent_line",
--                                                     "scalar_float",
--                                                     "dbrec3d_part_instance",
--                                                     "dbrec3d_pair_composite_instance",
--                                                     "apm_na",
--                                                     "apm_unknown" };
--
--
--boxm_apm_type boxm_apm_types::str_to_enum(const char* s)
--{
--  for (int i=0; i < int(BOXM_APM_UNKNOWN); i++)
--  {
--    if (std::strcmp(s, boxm_apm_types::app_model_strings[i]) == 0)
--      return (boxm_apm_type) i;
--  }
--  return BOXM_APM_UNKNOWN;
--}
--
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.color_);
--  vsl_b_write(os, sample.one_over_sigma_);
--  //vsl_b_write(os, sample.gauss_weight_);
--}
--
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.color_);
--    vsl_b_read(is, sample.one_over_sigma_);
--    //vsl_b_read(is, sample.gauss_weight_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm)
--{
--  os << "color: " << apm.color() << ", one_over_sigma: " << apm.one_over_sigma() << std::endl;
--  return os;
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_apm_traits.h b/contrib/brl/bseg/boxm/boxm_apm_traits.h
-deleted file mode 100644
-index 17f80b5a70..0000000000
---- a/contrib/brl/bseg/boxm/boxm_apm_traits.h
-+++ /dev/null
-@@ -1,206 +0,0 @@
--#ifndef boxm_appearance_model_traits_h_
--#define boxm_appearance_model_traits_h_
--//:
--// \file
--// \brief A class for appearance model traits
--//
--// \author Daniel Crispell
--// \date April 03, 2009
--
--#include <iostream>
--#include <iosfwd>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_gauss_if3.h>
--#include <bsta/bsta_beta.h>
--#include <bsta/bsta_beta_f1.h>
--#include <vnl/vnl_vector_fixed.h>
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include "boxm_export.h"
--
--class boxm_mog_grey_processor;
--class boxm_mog_rgb_processor;
--class boxm_simple_grey_processor;
--class boxm_mob_grey_processor;
--
--enum boxm_apm_type
--{
--  BOXM_APM_MOG_GREY = 0,
--  BOXM_APM_MOG_RGB,
--  BOXM_APM_SIMPLE_GREY,
--  BOXM_APM_SIMPLE_RGB,
--  BOXM_APM_MOB_GREY,
--  BOXM_FLOAT,
--  BOXM_INT,
--  BOXM_SHORT,
--  BOXM_CHAR,
--  BOXM_BOOL,
--  VNL_DOUBLE_10,
--  VNL_FLOAT_10,
--  VNL_FLOAT_3,
--  BSTA_MOG_F1,
--  BSTA_GAUSS_F1,
--  BVPL_SAMPLE_FLOAT,
--  BVPL_SAMPLE_BSTA_GAUSS_F1,
--  BVPL_PCA_BASIS_SAMPLE_10,
--  BOXM_EDGE_FLOAT,
--  BOXM_EDGE_LINE,
--  BOXM_EDGE_TANGENT_LINE,
--  BOXM_SCALAR_FLOAT,
--  DBREC3D_PART_INSTANCE,
--  DBREC3D_PAIR_COMPOSITE_INSTANCE,
--  BOXM_APM_NA,
--  BOXM_APM_UNKNOWN
--};
--
--class boxm_apm_types
--{
-- public:
--  static boxm_EXPORT_DATA const char* app_model_strings[];
--  static boxm_apm_type str_to_enum(const char* s);
--};
--
--//: Pixel properties for templates.
--template <boxm_apm_type>
--class boxm_apm_traits;
--
--
--//: traits for a mixture of gaussian appearance model of gray-scale images
--template<>
--class boxm_apm_traits<BOXM_APM_MOG_GREY>
--{
-- public:
--  static const unsigned int n_gaussian_modes_ = 3;
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
--  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
--
-- public:
--  static const unsigned int obs_dim = 1;
--  typedef  mix_gauss_sf1_type apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_mog_grey_processor apm_processor;
--};
--
--
--//: traits for a mixture of gaussian appearance model of rgb images
--template<>
--class boxm_apm_traits<BOXM_APM_MOG_RGB>
--{
-- public:
--  static const unsigned int n_gaussian_modes_ = 3;
--
--  typedef bsta_num_obs<bsta_gauss_if3> gauss_type_if3;
--  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_if3, n_gaussian_modes_> > mix_gauss_if3_type;
--
-- public:
--  static const unsigned int obs_dim = 3;
--  typedef  mix_gauss_if3_type apm_datatype;
--  typedef vil_rgb<float> obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_mog_rgb_processor apm_processor;
--};
--
--
--//: traits for a simple one-valued appearance model of grey-scale images
--class boxm_simple_grey
--{
-- public:
--  boxm_simple_grey() : color_(0.5f), one_over_sigma_(1.0f),gauss_weight_(1.0f) {}
--  boxm_simple_grey(float colour, float std_dev, float gauss_wght=1.0f) : color_(colour), one_over_sigma_(1/std_dev), gauss_weight_(gauss_wght)  { check_vals(); }
--  boxm_simple_grey(vnl_vector_fixed<float,3> const& params) : color_(params[0]), one_over_sigma_(1.0f/params[1])  { check_vals(); }
--  static short version_no() { return 1; }
--  inline float color() const { return color_; }
--  inline float sigma() const { return 1.0f/one_over_sigma_; }
--  inline float gauss_weight() const { return gauss_weight_; }
--  inline float one_over_sigma() const { return one_over_sigma_; }
--
-- protected:
--  inline void check_vals()
--  {
--    if (!(color_ > 0.0f))
--      color_ = 0.0f;
--    if (!(color_ < 1.0f))
--      color_ = 1.0f;
--    if (!(one_over_sigma_ < 1e4))
--      one_over_sigma_ = 1e4f;
--    if (!(one_over_sigma_ > 1e-4))
--      one_over_sigma_ = 1e-4f;
--  }
--
-- public:
--  float color_;
--  float one_over_sigma_;
--  float gauss_weight_;
--};
--
--template<>
--class boxm_apm_traits<BOXM_APM_SIMPLE_GREY>
--{
-- public:
--  static const unsigned int n_gaussian_modes_ = 1;
--  static const unsigned int obs_dim = 1;
--  static const unsigned int n_params = 3;
--  typedef boxm_simple_grey apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_simple_grey_processor apm_processor;
--};
--
--template<>
--class boxm_apm_traits<BOXM_APM_MOB_GREY>
--{
-- public:
--  static const unsigned int n_beta_modes_ = 3;
--
--  typedef bsta_num_obs<bsta_beta_f1> beta_type;
--  typedef bsta_num_obs<bsta_mixture_fixed<beta_type, n_beta_modes_> > mix_beta_type;
--
-- public:
--  static const unsigned int obs_dim = 1;
--  typedef  mix_beta_type apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--  typedef boxm_mob_grey_processor apm_processor;
--};
--
--template<>
--class boxm_apm_traits<BOXM_EDGE_FLOAT>
--{
-- public:
--  static const unsigned int obs_dim = 1;
--  static const unsigned int n_params = 2;
--  typedef boxm_edge_sample<float> apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--#if 0
--  typedef boxm_edge_processor apm_processor;
--#endif
--};
--
--template<>
--class boxm_apm_traits<BOXM_EDGE_LINE>
--{
-- public:
--  static const unsigned int obs_dim = 1;
--  static const unsigned int n_params = 2;
--  typedef boxm_inf_line_sample<float> apm_datatype;
--  typedef float obs_datatype;
--  typedef float obs_mathtype;
--};
--
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const &sample);
--void vsl_b_write(vsl_b_ostream & os, boxm_simple_grey const * &sample);
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey &sample);
--void vsl_b_read(vsl_b_istream & is, boxm_simple_grey *&sample);
--std::ostream& operator << (std::ostream& os, const boxm_simple_grey& sample);
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.h b/contrib/brl/bseg/boxm/boxm_aux_scene.h
-deleted file mode 100644
-index 40a2a56914..0000000000
---- a/contrib/brl/bseg/boxm/boxm_aux_scene.h
-+++ /dev/null
-@@ -1,54 +0,0 @@
--#ifndef boxm_aux_scene_h_
--#define boxm_aux_scene_h_
--//:
--// \file
--// \brief  an auxiliary scene keeps a set of octrees for a given main scene
--//
--// \author Gamze Tunali
--// \date   July 31, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell_reader.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_block.h>
--
--#include <vgl/vgl_point_3d.h>
--
--template <class T_loc, class T, class T_AUX>
--class boxm_aux_scene
--{
-- public:
--   typedef enum {EMPTY=0, CLONE, LOAD, UNDEFINED } tree_creation_type ;
--   typedef  boct_tree<T_loc, T> tree_type;
--   typedef  boct_tree<T_loc, T_AUX> aux_tree_type;
--   boxm_aux_scene() : aux_scene_(nullptr), aux_storage_dir_("") {}
--   boxm_aux_scene(boxm_scene<tree_type>* scene, std::string suffix,
--                  tree_creation_type type, boxm_apm_type app_model=BOXM_APM_UNKNOWN);
--
--   ~boxm_aux_scene(){ /*delete aux_scene_;*/ }
--
--   void init_scene(){}
--
--
--   boxm_block<boct_tree<T_loc,T_AUX> > * get_block(vgl_point_3d<int> index){
--       aux_scene_->load_block(index);
--       return aux_scene_->get_active_block();
--   }
--
--   //: get an incremental reader for a scene block
--   boct_tree_cell_reader<T_loc, T_AUX >* get_block_incremental(vgl_point_3d<int> block_idx);
--
--   void write_active_block() { aux_scene_->write_active_block(); }
--  void unload_active_blocks() { aux_scene_->unload_active_blocks(); }
--   void clean_scene();
--
-- private:
--  boxm_scene<aux_tree_type>* aux_scene_;
--  std::string aux_storage_dir_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx b/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
-deleted file mode 100644
-index d3ceaf9c84..0000000000
---- a/contrib/brl/bseg/boxm/boxm_aux_scene.hxx
-+++ /dev/null
-@@ -1,121 +0,0 @@
--#ifndef boxm_aux_scene_hxx_
--#define boxm_aux_scene_hxx_
--
--#include "boxm_aux_scene.h"
--#include <boxm/boxm_aux_traits.h>
--
--#include <vpl/vpl.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template <class T_loc, class T, class T_AUX>
--boxm_aux_scene<T_loc,T,T_AUX>::boxm_aux_scene(boxm_scene<tree_type>* scene,
--                                              std::string storage_suffix,
--                                              tree_creation_type type,
--                                              boxm_apm_type app_model)
--: aux_scene_(nullptr)
--{
--  std::string aux_storage_dir;
--  aux_storage_dir_ = scene->path();
--  aux_scene_ = new boxm_scene<aux_tree_type >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->load_all_blocks(),scene->save_internal_nodes(), scene->save_platform_independent());
--  aux_scene_->set_path(aux_storage_dir_,  storage_suffix);
--  aux_scene_->set_appearance_model(app_model);
--  aux_scene_->set_octree_levels(scene->max_level(),scene->init_level());
--  if (type != EMPTY)
--  {
--    // loop through valid blocks and init same blocks in aux scene
--    boxm_block_iterator<tree_type > iter(scene);
--    iter.begin();
--    while (!iter.end()) {
--      if (scene->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--        if (type == LOAD) {
--          if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--#if 0
--            // auxiliary block file exist
--            aux_scene_->load_block(iter.index());
--            boxm_block<boct_tree<T_loc,T_AUX> > * block=aux_scene_->get_active_block();
--            assert(block->get_tree() != 0);
--#endif
--          }
--        }
--        else if (type==CLONE) {  //clone from the primary block
--          scene->load_block(iter.index().x(),iter.index().y(),iter.index().z());
--          boxm_block<boct_tree<T_loc,T> > * block=scene->get_active_block();
--          boct_tree<T_loc,T>* tree=block->get_tree();
--          aux_tree_type *aux_tree = tree->template clone_to_type<T_AUX>();
--          boxm_block<aux_tree_type >* aux_block = new boxm_block<aux_tree_type >(block->bounding_box(),aux_tree );
--          aux_scene_->set_block(iter.index(), aux_block);
--          aux_scene_->write_active_block();
--        }
--      }
--      ++iter;
--    }
--    aux_scene_->write_scene(storage_suffix+".xml");
--    scene->unload_active_blocks();
--    aux_scene_->unload_active_blocks();
--    }
--}
--
--
--template <class T_loc, class T, class T_AUX>
--boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::get_block_incremental(vgl_point_3d<int> block_idx)
--{
--  if (aux_scene_) {
--    std::string path=aux_scene_->gen_block_path(block_idx.x(), block_idx.y(), block_idx.z());
--    boct_tree_cell_reader<T_loc, T_AUX>* reader = new boct_tree_cell_reader<T_loc, T_AUX>(path);
--    reader->begin();
--    return reader;
--  }
--  else {
--    return nullptr;
--  }
--}
--
--template <class T_loc, class T, class T_AUX>
--void boxm_aux_scene<T_loc,T,T_AUX>::clean_scene()
--{
--  std::cout<<"Clean AUX scene "<<std::endl;
--  aux_scene_->unload_active_blocks();
--  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(aux_scene_);
--  iter.begin();
--  if (!aux_scene_->load_all_blocks())
--  {
--    while (!iter.end()) {
--      if (aux_scene_->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--        std::string filename=aux_scene_->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
--        vpl_unlink(filename.c_str());
--      }
--      iter++;
--    }
--  }
--  else
--  {
--    while (!iter.end()) {
--      if (iter->get_tree()!=nullptr)
--      {
--        iter->delete_tree();
--        iter->set_tree(nullptr);
--      }
--      iter++;
--    }
--  }
--}
--
--#if 0 // commented out
--template <class T_loc, class T, class T_AUX>
--boct_tree_cell_reader<T_loc, T_AUX>* boxm_aux_scene<T_loc,T,T_AUX>::save_scene()
--{
--  boxm_block_iterator<boct_tree<T_loc, T_AUX> > iter(&aux_scene);
--  iter.begin();
--  while (!iter.end()) {
--    // body
--  }
--}
--#endif // 0
--
--#define BOXM_AUX_SCENE_INSTANTIATE(T1,T2,T3) \
--template class boxm_aux_scene<T1,T2,T3 >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_aux_traits.h b/contrib/brl/bseg/boxm/boxm_aux_traits.h
-deleted file mode 100644
-index 4e4c5113da..0000000000
---- a/contrib/brl/bseg/boxm/boxm_aux_traits.h
-+++ /dev/null
-@@ -1,74 +0,0 @@
--#ifndef boxm_aux_traits_h_
--#define boxm_aux_traits_h_
--//:
--// \file
--
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/sample/boxm_vis_implicit_sample.h>
--#include <boxm/sample/boxm_update_sample.h>
--
--enum boxm_aux_type
--{
--  BOXM_AUX_VIS_IMPLICIT,
--  BOXM_AUX_UPDATE,
--  BOXM_AUX_OPT_GREY,
--  BOXM_AUX_OPT_RT_GREY,
--  BOXM_AUX_OPT_RGB,
--  BOXM_AUX_OPT_RT_RGB,
--  BOXM_AUX_NULL,
--  BOXM_AUX_UNKNOWN,
--  BOXM_AUX_OPT2_GREY,
--  BOXM_AUX_OPT2_RGB,
--  BOXM_AUX_OPT3_MOG_GREY,
--  BOXM_AUX_OPT3_MOG_RGB,
--  BOXM_AUX_SCALAR_SAMPLE
--};
--
--//: sample properties for templates.
--template <boxm_aux_type>
--class boxm_aux_traits;
--
--//: traits for a visibility-based implicit surface sample
--template<>
--class boxm_aux_traits<BOXM_AUX_VIS_IMPLICIT>
--{
-- public:
--  typedef boxm_vis_implicit_sample sample_datatype;
--
--  static std::string storage_subdir() { return "vis_implicit"; }
--};
--
--template<>
--class boxm_aux_traits<BOXM_AUX_UPDATE>
--{
-- public:
--  typedef boxm_update_sample sample_datatype;
--
--  static std::string storage_subdir() { return "update_work";}
--};
--
--//: traits for a null sample
--template<>
--class boxm_aux_traits<BOXM_AUX_NULL>
--{
-- public:
--  typedef float sample_datatype;
--
--  static std::string storage_subdir() { return "null"; }
--};
--template<>
--class boxm_aux_traits<BOXM_AUX_SCALAR_SAMPLE>
--{
-- public:
--  typedef float sample_datatype;
--
--  static std::string storage_subdir() { return "scalar"; }
--};
--
--
--
--#endif // boxm_aux_traits_h_
-diff --git a/contrib/brl/bseg/boxm/boxm_block.h b/contrib/brl/bseg/boxm/boxm_block.h
-deleted file mode 100644
-index 6bda381539..0000000000
---- a/contrib/brl/bseg/boxm/boxm_block.h
-+++ /dev/null
-@@ -1,58 +0,0 @@
--#ifndef boxm_block_h_
--#define boxm_block_h_
--//:
--// \file
--// \brief  a block is a smallest area that is going to be processed with an octree
--//
--// \author Gamze Tunali
--// \date Apr 01, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vgl/vgl_box_3d.h>
--#include <vsl/vsl_binary_io.h>
--
--template <class T>
--class boxm_block
--{
-- public:
--  //: Default Constructor
--  boxm_block(): octree_(nullptr) {}
--  //: Destructor
--  ~boxm_block() { if (octree_) delete octree_; }
--  //: Constructor from boundinf box
--  boxm_block(vgl_box_3d<double> bbox): bbox_(bbox), octree_(nullptr) {}
--  //: Constructor from bounding box and octree
--  boxm_block(vgl_box_3d<double> bbox, T* tree) : bbox_(bbox), octree_(tree) {octree_->set_bbox(bbox_);}
--  //: Returns the number of leaf cells in the tree
--  unsigned int size();
--  //: Initializes octree and bounding-box
--  void init_tree(T * octree);
--  //: Sets the current octree
--  void set_tree(T * octree);
--
--  // Accessors
--  vgl_box_3d<double> bounding_box() const { return bbox_; }
--  T* get_tree() { return octree_; }
--
--  //: Releases memory
--  void delete_tree() { delete octree_; octree_ = nullptr; }
--
--  // IO
--  void b_read(vsl_b_istream &s);
--  void b_write(vsl_b_ostream &s, const bool save_internal_nodes_, const bool platform_independent = true);
--  static short version_no() { return 1; }
--
--  bool operator==(boxm_block<T> const& other) const {
--    return bbox_ == other.bounding_box()
--        && octree_ == other.octree_;
--  }
--
-- private:
--  vgl_box_3d<double> bbox_;
--  T* octree_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_block.hxx b/contrib/brl/bseg/boxm/boxm_block.hxx
-deleted file mode 100644
-index a8f27f2bfe..0000000000
---- a/contrib/brl/bseg/boxm/boxm_block.hxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--#ifndef boxm_block_hxx_
--#define boxm_block_hxx_
--
--#include <iostream>
--#include "boxm_block.h"
--
--#include <vgl/io/vgl_io_box_3d.h>
--template <class T>
--void boxm_block<T>::init_tree(T * octree)
--{
--  if(octree_){
--   //release old memory unless the same tree
--   if(octree!=octree_)
--     delete octree_;
--   }
--  octree_=octree;
--  octree->set_bbox(bbox_);
--}
--
--template <class T>
--void boxm_block<T>::set_tree(T * octree)
--{
--  if(octree_) //release old memory
--    delete octree_;
--  octree_=octree;
--}
--
--template <class T>
--unsigned int boxm_block<T>::size()
--{
--  if (octree_) {
--    return octree_->size();
--  }
--  else {
--    return 0;
--  }
--}
--
--template <class T>
--void boxm_block<T>::b_read(vsl_b_istream &is)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case (1):
--      vsl_b_read(is, bbox_);
--      // if already allocated, destroy it and read from the file
--      if (octree_ != nullptr) {
--        delete octree_;
--      }
--      octree_ = new T();
--      octree_->b_read(is);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_block<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      return;
--  }
--}
--
--
--template <class T>
--void boxm_block<T>::b_write(vsl_b_ostream &os, const bool save_internal_nodes, const bool platform_independent)
--{
--  vsl_b_write(os, version_no());
--  vsl_b_write(os, bbox_);
--#if 0
--  std::cout << "Internal Nodes 3: " << save_internal_nodes << std::endl;
--#endif
--  octree_->b_write(os, save_internal_nodes, platform_independent);
--}
--
--#define BOXM_BLOCK_INSTANTIATE(T) \
--template class boxm_block<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_export.h b/contrib/brl/bseg/boxm/boxm_export.h
-deleted file mode 100644
-index 7827178bdf..0000000000
---- a/contrib/brl/bseg/boxm/boxm_export.h
-+++ /dev/null
-@@ -1,23 +0,0 @@
--#ifndef BOXM_EXPORT_H
--#define BOXM_EXPORT_H
--
--#include <vxl_config.h> // get BUILD_SHARED_LIBS
--
--#ifndef BUILD_SHARED_LIBS  // if not a shared build
--# define boxm_EXPORT_DATA
--#else  // this is a shared build
--# ifdef boxm_EXPORTS  // if building this library
--#  if defined(_WIN32) || defined(WIN32)
--#   define boxm_EXPORT_DATA __declspec(dllexport)
--#  else
--#   define boxm_EXPORT_DATA
--#  endif
--# else // we are using this library and it is built shared
--#  if defined(_WIN32) || defined(WIN32)
--#   define boxm_EXPORT_DATA __declspec(dllimport)
--#  else
--#   define boxm_EXPORT_DATA
--#  endif
--# endif
--#endif
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
-deleted file mode 100644
-index b1415333d6..0000000000
---- a/contrib/brl/bseg/boxm/boxm_io_scene_base.cxx
-+++ /dev/null
-@@ -1,25 +0,0 @@
--#include "boxm_io_scene_base.h"
--//:
--// \file
--
--
--//: Binary write boxm scene to stream
--void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base const& /*scene_base*/)
--{
--}
--
--
--//: Binary load boxm scene from stream.
--void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base& /*scene_base*/)
--{
--}
--
--//: Binary write boxm scene pointer to stream
--void vsl_b_read(vsl_b_istream& /*is*/, boxm_scene_base* /*ph*/)
--{
--}
--
--//: Binary write boxm scene pointer to stream
--void vsl_b_write(vsl_b_ostream& /*os*/, boxm_scene_base* const& /*ph*/)
--{
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_io_scene_base.h b/contrib/brl/bseg/boxm/boxm_io_scene_base.h
-deleted file mode 100644
-index 1abc4fa90c..0000000000
---- a/contrib/brl/bseg/boxm/boxm_io_scene_base.h
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#ifndef boxm_io_scene_base_h_
--#define boxm_io_scene_base_h_
--//:
--// \file
--#include <boxm/boxm_scene_base.h>
--#include <vsl/vsl_binary_io.h>
--
--//: Binary write boxm scene to stream
--void vsl_b_write(vsl_b_ostream & os, boxm_scene_base const& scene_base);
--
--//: Binary load boxm scene from stream.
--void vsl_b_read(vsl_b_istream & is, boxm_scene_base &scene_base);
--
--//: Binary load boxm scene pointer from stream.
--void vsl_b_read(vsl_b_istream& is, boxm_scene_base* p);
--
--//: Binary write boxm scene pointer to stream
--void vsl_b_write(vsl_b_ostream& os, const boxm_scene_base* &p);
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_scene.h b/contrib/brl/bseg/boxm/boxm_scene.h
-deleted file mode 100644
-index 8d1bd207d3..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene.h
-+++ /dev/null
-@@ -1,559 +0,0 @@
--#ifndef boxm_scene_h_
--#define boxm_scene_h_
--//:
--// \file
--// \brief  The main class to keep the 3D world data. It is a grid of boxm_blocks containing octrees.
--//
--// \author Gamze Tunali
--// \date Apr 03, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <string>
--#include <iostream>
--#include <iosfwd>
--#include <set>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_block.h>
--#include <boxm/sample/boxm_sample.h>
--#include <bvgl/bvgl_point_3d_cmp.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vbl/vbl_array_3d.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <boct/boct_tree.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--class boxm_scene_parser;
--template <class T> class boxm_block_iterator;
--template <class T> class boxm_cell_iterator;
--
--template <class T>
--class boxm_scene :public boxm_scene_base
--{
-- public:
--  typedef typename T::loc_type loc_type;
--  typedef typename T::datatype datatype;
--
--  //: Default constructor
--  boxm_scene() : active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
--
--  //: Constructor from lvcs, world origin, dimension of the block (in world coordinates) and number of blocks(world_dim)
--  boxm_scene(const vpgl_lvcs& lvcs,
--             const vgl_point_3d<double>& origin,
--             const vgl_vector_3d<double>& block_dim,
--             const vgl_vector_3d<unsigned>& world_dim,
--             const bool load_all_blocks=false,
--             const bool save_internal_nodes_ = false,
--             const bool save_platform_independent_ = true);
--
--  //: Constructor from lvcs, world origin, dimension of the block, number of blocks and initialization level
--  boxm_scene(const vpgl_lvcs& lvcs,
--             const vgl_point_3d<double>& origin,
--             const vgl_vector_3d<double>& block_dim,
--             const vgl_vector_3d<unsigned>& world_dim,
--             unsigned max_level, unsigned init_level,
--             const bool load_all_blocks=false,
--             const bool save_internal_nodes_ = false,
--             const bool save_platform_independent_ = true);
--
--  //: Constructor when lvcs is not available. World origin, block dimensions and number of blocks
--  boxm_scene( const vgl_point_3d<double>& origin,
--              const vgl_vector_3d<double>& block_dim,
--              const vgl_vector_3d<unsigned>& world_dim,
--              const bool load_all_blocks=false,
--              const bool save_internal_nodes_ = false,
--              const bool save_platform_independent_ = true);
--
--  //: Copy constructor
--  boxm_scene(const boxm_scene& scene);
--
--  //: Constructor from base_scene
--  boxm_scene(const boxm_scene_base& scene_base):
--  boxm_scene_base(scene_base),active_block_(vgl_point_3d<int>(-1,-1,-1)), save_internal_nodes_(false), save_platform_independent_(true) {}
--
--  //: Destructor
--  ~boxm_scene() override;
--
--  bool discover_block(vgl_point_3d<unsigned> index) { return discover_block(index.x(),index.y(),index.z()); }
--
--  bool discover_block(unsigned i, unsigned j, unsigned k);
--
--  //: Loads block into memory.
--  // Returns true if the block bin file is found on disc, otherwise returns false and creates a new tree for the block
--  bool load_block(unsigned i, unsigned j, unsigned k);
--
--  // Load block into memory without using global variables
--  bool load_block_thread_safe(unsigned i, unsigned j, unsigned k);
--
--  //: Loads block into memory.
--  bool load_block(vgl_point_3d<int> i) { return load_block(i.x(), i.y(), i.z()); }
--
--  //: Loads a block and all its neighboring(adjacent) blocks
--  bool load_block_and_neighbors(unsigned i, unsigned j, unsigned k);
--
--  //: Loads a block and all its neighboring(adjacent) blocks
--  bool load_block_and_neighbors(vgl_point_3d<int> i) { return load_block_and_neighbors(i.x(), i.y(), i.z()); }
--
--  //: Reads and loads all blocks into memorty
--  bool read_all_blocks();
--
--  //: Write the active block to disk
--  void write_active_block(bool unload_block=true);
--
--  //: Write the active block to disk
--  void write_active_block(bool unload_block=false) const;
--
--  //: Write the active blocks to disk
--  void write_active_blocks(bool unload_block=true);
--
--  //: Write the active blocks to disk
--  void write_active_blocks(bool unload_block=false) const;
--
--  //: Write the specified block to disk without changing global variables
--  void write_block_thread_safe(unsigned i, unsigned j, unsigned k);
--
--  //: Returns the active block(in memory)
--  boxm_block<T>* get_active_block();
--
--  //: Returns the index of active block
--  vgl_point_3d<int> active_block() const { return active_block_; }
--
--  //: Returns the indices of active neighbors;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >& active_blocks() { return active_blocks_; }
--
--  vpgl_lvcs lvcs() const { return lvcs_; }
--
--  vgl_point_3d<double> origin() const { return origin_; }
--
--  void set_origin(vgl_point_3d<double> o) { origin_=o; }
--
--  vgl_vector_3d<double> block_dim() const { return block_dim_; }
--
--  bool save_internal_nodes() const { return save_internal_nodes_; }
--
--  bool save_platform_independent() const { return save_platform_independent_; }
--
--  bool load_all_blocks() const { return load_all_blocks_; }
--
--  void block_num(int &x, int &y, int &z) const {
--    x=(int) blocks_.get_row1_count();
--    y=(int) blocks_.get_row2_count();
--    z=(int) blocks_.get_row3_count();
--  }
--
--  vgl_vector_3d<unsigned> world_dim() const override {
--    unsigned x=(unsigned) blocks_.get_row1_count();
--    unsigned y=(unsigned) blocks_.get_row2_count();
--    unsigned z=(unsigned) blocks_.get_row3_count();
--    return {x,y,z};
--  }
--
--  std::string path() const { return scene_path_; }
--
--  std::string block_prefix() const { return block_pref_; }
--
--  void set_path(std::string path, std::string block_prefix) { scene_path_=path; block_pref_= block_prefix; }
--
--  void b_read(vsl_b_istream & s);
--
--  void b_write(vsl_b_ostream& s) const;
--
--  //: Returns the block this point resides in
--  boxm_block<T>* get_block(vgl_point_3d<double> const& p) const;
--
--  //: Returns the index of the block containing this point
--  bool get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index);
--
--  //: Returns a block, assumes block is in memory - if not it returns null
--  boxm_block<T>* get_block(unsigned i, unsigned j, unsigned k) const { return blocks_(i,j,k); }
--
--  //: Returns a block, assumes block is in memory - if not it returns null
--  boxm_block<T>* get_block(const vgl_point_3d<int>& idx) { return blocks_(idx.x(), idx.y(), idx.z()); }
--
--  //: Returns a read-only block, assumes block is in memory - if not it returns null
--  const boxm_block<T>* get_block_read_only(unsigned i, unsigned j, unsigned k) { return blocks_(i,j,k); }
--
--  //: Return all leaf cells in a region
--  void leaves_in_region(vgl_box_3d<double>, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
--
--  //: Return the level of the smallest cell entirely containing the 3d region
--  short level_region(vgl_box_3d<double> box);
--
--  //: Return all leaf_data in a region - data is copied to new memory location
--  void leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data);
--
--  //: Returns the data of all cells at a given level, that are contained in the specified region
--  void cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level);
--
--  //: Return all leaf cells between an inner box and an outter box
--  void leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells);
--
--  //: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
--  void change_leaves_in_region(vgl_box_3d<double> box, const datatype &cell_data);
--  void change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<datatype> &all_data);
--
--  //: Locate point in scene coordinates. Assumes that the block containing the point is already loaded into memory
--  boct_tree_cell<loc_type, datatype>* locate_point_in_memory(vgl_point_3d<double> &p, unsigned level = 0);
--
--  void set_block(vgl_point_3d<int> const& idx, boxm_block<T>* block)
--  {
--    if (blocks_(idx.x(),idx.y(),idx.z())) // release memory
--      delete blocks_(idx.x(),idx.y(),idx.z());
--
--    blocks_(idx.x(),idx.y(),idx.z()) = block; active_block_=idx;
--  }
--
--  void set_block(int i, int j, int k , boxm_block<T>* block) { set_block(vgl_point_3d<int>(i,j,k), block); }
--
--  //: Write scene xml file at the scenes' path
--  void write_scene(std::string filename = "scene.xml");
--
--  //: Write scene xml file at the location indicated by path
--  void write_scene(std::string path, std::string filename);
--
--  void load_scene(std::string filename);
--
--  void load_scene(boxm_scene_parser& parser);
--
--  void force_write_blocks();
--
--  static short version_no() { return 1; }
--
--  boxm_block_iterator<T> iterator() { return boxm_block_iterator<T>(this); }
--
--  boxm_block_iterator<T> const_iterator() const { return boxm_block_iterator<T>(this); }
--
--  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned), bool read_only = false)
--  {
--    boxm_cell_iterator<T> cell_iter(this->iterator(), block_loading_func, read_only);
--    return cell_iter;
--  }
--
--  boxm_cell_iterator<T> cell_iterator(bool (boxm_scene<T>::*block_loading_func)(unsigned,unsigned, unsigned) const, bool read_only)
--  {
--    assert (read_only);
--    boxm_cell_iterator<T> cell_iter(this->const_iterator(), block_loading_func, read_only);
--    return cell_iter;
--  }
--
--  vgl_box_3d<double> get_world_bbox() const override;
--
--  //: Return the dimensions of the scene along each axis - this are equivalent to bbox width, length and depth
--  void axes_length(double &x_length,double &y_length, double &z_length) const;
--
--  //: Return true if the block index is valid
--  bool valid_index(vgl_point_3d<int> const& idx) const { return valid_index(idx.x(), idx.y(), idx.z()); }
--
--
--  //: Return true if the block index is valid
--  inline bool valid_index(int const& x, int const& y, int const& z) const {
--    return  x >= (int)0 && x < (int)blocks_.get_row1_count() &&
--            y >= (int)0 && y < (int)blocks_.get_row2_count() &&
--            z >= (int)0 && z < (int)blocks_.get_row3_count();
--   }
--
--  void set_pinit(float pinit) { pinit_=pinit; }
--
--  float pinit() const { return pinit_; }
--
--  vgl_box_3d<double> get_block_bbox(vgl_point_3d<int> const& idx) const { return get_block_bbox(idx.x(), idx.y(), idx.z()); }
--
--  vgl_box_3d<double> get_block_bbox(int x, int y, int z) const;
--
--  //: generates a name for the block binary file based on the 3D vector index
--  std::string gen_block_path(int x, int y, int z) const;
--
--  void clean_scene();
--
--  //: Returns a scene with the same structure and initialized with given value
--  void clone_blocks(boxm_scene<T> &scene_out, datatype data);
--
--  //: Returns a scene with the same structure and data
--  void clone_blocks(boxm_scene<T> &scene_out);
--
--  //: Returns a scene of a different type with the same structure  and initialized with given value
--  template <class T_out>
--  void clone_blocks_to_type(boxm_scene<T_out> &scene_out, typename boxm_scene<T_out>::datatype data )
--  {
--    std::cout << "Clone blocks to type\n";
--    boxm_block_iterator<T> iter(this);
--    boxm_block_iterator<T_out> iter_out = scene_out.iterator();
--    iter.begin();
--    iter_out.begin();
--    while (!iter.end())
--    {
--      load_block(iter.index());
--      scene_out.load_block(iter.index());
--      T_out  *tree_out =(*iter)->get_tree()->template clone_to_type<typename boxm_scene<T_out>::datatype>();
--      (*iter_out)->init_tree(tree_out);
--      tree_out->init_cells(data);
--      scene_out.write_active_block();
--      ++iter;
--      ++iter_out;
--    }
--  }
--
--  //: Returns a scene of a vector type with the same structure and vector initialized to the the same data
--  template <unsigned DIM>
--  void clone_blocks_to_vector(boxm_scene<boct_tree<short, vnl_vector_fixed<datatype, DIM> > > &scene_out)
--  {
--    typedef boct_tree<short, vnl_vector_fixed<datatype, DIM> > type_tree_out;
--    std::cout << "Clone blocks to type\n";
--    boxm_block_iterator<T> iter(this);
--    boxm_block_iterator<type_tree_out> iter_out = scene_out.iterator();
--    iter.begin();
--    iter_out.begin();
--    while (!iter.end())
--    {
--      load_block(iter.index());
--      scene_out.load_block(iter.index());
--      type_tree_out  *tree_out =(*iter)->get_tree()->template clone_to_vector<DIM>();
--      (*iter_out)->init_tree(tree_out);
--      scene_out.write_active_block();
--      ++iter;
--      ++iter_out;
--    }
--  }
--
--  //: Unload active blocks
--  void unload_active_blocks() const;
--
--  //: Print out the trees in the scene
--  void print();
--
--  //: Return the finest level in the scene
--  short finest_level();
--
--  //: Return the length of finest-level cell in the scene
--  double finest_cell_length();
--
--  //: Return the length of cells at a given level in the scene
--  double cell_length(unsigned level);
--
--  //: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
--  double finest_cell_length_in_memory() const;
--
--  //: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
--  short finest_level_in_memory() const;
--
--  //: Return the number of leaf nodes in the scene
--  unsigned long size();
--
--  vgl_point_3d<double> rpc_origin() const { return rpc_origin_; }
--
--  void set_rpc_origin(vgl_point_3d<double>& new_rpc_origin) {
--    vgl_point_3d<double> old_origin = origin();
--    vgl_point_3d<double> new_origin(
--      old_origin.x() + new_rpc_origin.x() - rpc_origin_.x(),
--      old_origin.y() + new_rpc_origin.y() - rpc_origin_.y(),
--      old_origin.z() + new_rpc_origin.z() - rpc_origin_.z());
--    set_origin(new_origin);
--    rpc_origin_ = new_rpc_origin;
--  }
--
-- protected:
--  vpgl_lvcs lvcs_;
--  vgl_point_3d<double> origin_;
--  vgl_point_3d<double> rpc_origin_;
--
--  //: World dimensions of a block .e.g 1 meter x 1 meter x 1 meter
--  vgl_vector_3d<double> block_dim_;
--
--  vbl_array_3d<boxm_block<T>*> blocks_;
--
--  //: index of the blocks (3D array) that is active; only one active block at a time
--  mutable vgl_point_3d<int> active_block_;
--
--  //: if neighbors of the active block are loaded into memory, their indices are stored in this set
--  mutable std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  active_blocks_;
--
--  float pinit_;
--
--  //: Flag that indicates whether internal nodes of the trees should be saved
--  bool save_internal_nodes_;
--
--  //: Flag that indicates whether the octree data should be saved in a platform-independent way (slower)
--  bool save_platform_independent_;
--
--  //: Flag to load all the blocks in the memory
--  bool load_all_blocks_;
--
--  // ************** private methods *******************
--
--  void create_block(unsigned i, unsigned j, unsigned k);
--
--  void create_blocks(const vgl_vector_3d<double>& block_dim, const vgl_vector_3d<unsigned>& world_dim);
--  bool parse_config(boxm_scene_parser& parser);
--
--  bool parse_xml_string(std::string xml, boxm_scene_parser& parser);
--
--  //: Load all blocks in between min-max indices. This method is private and the user needs to take care of unloading the blocks
--  bool load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
--
--  //: Unload all blocks in between min-max indices.
--  bool unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx);
--
--
--  //: A helper function to generate the indices of neighboring blocks
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  neighboring_blocks(vgl_point_3d<int> idx)
--  {
--    std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > neighbors;
--    for (int i = -1; i <= 1; i++)
--    {
--      int active_i = idx.x() + i;
--      if (active_i >= 0 && active_i < int(blocks_.get_row1_count()))
--        for (int j = -1; j <= 1; j++)
--        {
--          int active_j = idx.y() + j;
--          if (active_j >= 0 && active_j < int(blocks_.get_row2_count()) )
--            for (int k = -1; k <= 1; k++)
--            {
--              int active_k = idx.z() + k;
--              if (active_k >= 0 && active_k < int(blocks_.get_row3_count()))
--                neighbors.insert(vgl_point_3d<int>(active_i, active_j, active_k));
--            }
--        }
--    }
--    return neighbors;
--  }
--};
--
--template <class T>
--class boxm_block_iterator
--{
--  friend class boxm_cell_iterator<T>;
--
-- public:
--  boxm_block_iterator(boxm_scene<T> const* scene): i_(0), j_(0), k_(0), scene_(scene) {}
--
--  //: Copy constructor
--  boxm_block_iterator(boxm_block_iterator<T> const& other): i_(other.i_), j_(other.j_), k_(other.k_), scene_(other.scene_) {}
--
--  ~boxm_block_iterator() = default;
--
--  boxm_block_iterator<T>& begin();
--
--  bool end();
--
--  boxm_block_iterator<T>& operator=(const boxm_block_iterator<T>& that);
--
--  bool operator==(const boxm_block_iterator<T>& that);
--
--  bool operator!=(const boxm_block_iterator<T>& that);
--
--  boxm_block_iterator<T>& operator++();  // pre-inc
--
--  boxm_block_iterator<T> operator++(int); // post-inc
--
--  boxm_block_iterator<T>& operator--();
--
--  boxm_block<T>* operator*();
--
--  boxm_block<T>* operator->();
--
--  vgl_point_3d<int> index() const { return vgl_point_3d<int>(i_,j_,k_); }
--
-- private:
--  int i_;
--  int j_;
--  int k_;
--
--  boxm_scene<T> const* scene_;
--};
--
--
--//: A class to iterate through all -or only leaf- cells in a boxm_scene
--template <class T>
--class boxm_cell_iterator
--{
-- public:
--  typedef bool (boxm_scene<T>::*ptr2func)(unsigned, unsigned, unsigned);
--  typedef bool (boxm_scene<T>::*ptr2constfunc)(unsigned, unsigned, unsigned) const;
--  typedef typename T::loc_type loc_type;
--  typedef typename T::datatype datatype;
--
--  //: Copy constructor
--  boxm_cell_iterator(boxm_cell_iterator<T> const& other)
--   : block_iterator_(other.block_iterator_), cells_(other.cells_),
--     block_loading_func_(other.block_loading_func_), read_only_(other.read_only_) {}
--
--  //: Constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
--  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2func block_loading_func, bool read_only = false, bool use_internal_cells = false)
--    : block_iterator_(iter), block_loading_func_((ptr2constfunc)block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) {}
--
--  //: "Const" constructor from a block iterator and function pointer to loading mechanism i.e load_block() or load_block_and_neighbors()
--  boxm_cell_iterator(boxm_block_iterator<T> iter, ptr2constfunc block_loading_func, bool read_only, bool use_internal_cells = false)
--    : block_iterator_(iter), block_loading_func_(block_loading_func), read_only_(read_only), use_internal_cells_(use_internal_cells) { assert(read_only); }
--
--  //: Destructor
--  ~boxm_cell_iterator() = default;
--
--  //: Iterator begin
--  boxm_cell_iterator<T>& begin(bool use_internal_cells=false);
--
--  //: Iterator end
--  bool end();
--
--  /*************** Operators ****************/
--
--  boxm_cell_iterator<T>& operator=( const boxm_cell_iterator<T>& that);
--
--  bool operator==(const boxm_cell_iterator<T>& that);
--
--  bool operator!=(const boxm_cell_iterator<T>& that);
--
--  //: Prefix increment. When the end of the block is reached, it writes the block to disk and loads the next one
--  boxm_cell_iterator<T>& operator++();
--
--  //: Increment. When the end of the block is reached, it writes the block to disk and loads the next one
--  boxm_cell_iterator<T> operator+=(unsigned const &rhs);
--
--  boct_tree_cell<loc_type, datatype>* operator*();
--
--  boct_tree_cell<loc_type, datatype>* operator->();
--
--  /*************** Data accessor *************/
--  //: Return the global origin of the current cell
--  vgl_point_3d<double> global_origin();
--
--  //: Return the global centroid of the current cell - use only if cells are cubical
--  vgl_point_3d<double> global_centroid();
--
--  //: Return the global length of this cell
--  double length();
--
-- private:
--
--  boxm_block_iterator<T> block_iterator_;
--  std::vector<boct_tree_cell<loc_type ,datatype >* > cells_;
--  typename std::vector< boct_tree_cell<loc_type , datatype >* >::const_iterator cells_iterator_;
--  ptr2constfunc block_loading_func_;
--  bool read_only_;
--  bool use_internal_cells_;
--};
--
--
--//: generates an XML file from the member variables
--template <class T>
--void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name="boxm_scene");
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene);
--
--
--#endif // boxm_scene_h_
-diff --git a/contrib/brl/bseg/boxm/boxm_scene.hxx b/contrib/brl/bseg/boxm/boxm_scene.hxx
-deleted file mode 100644
-index b398bcc2ad..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene.hxx
-+++ /dev/null
-@@ -1,1764 +0,0 @@
--#ifndef boxm_scene_hxx_
--#define boxm_scene_hxx_
--//:
--// \file
--#include <cmath>
--#include <cstdio>
--#include <sstream>
--#include <iostream>
--#include <algorithm>
--#include <iterator>
--#include "boxm_scene.h"
--//
--#include "boxm_apm_traits.h"
--#include "boxm_scene_parser.h"
--
--#include <vgl/xio/vgl_xio_point_3d.h>
--#include <vgl/xio/vgl_xio_vector_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vsl/vsl_basic_xml_element.h>
--#include <vsl/vsl_binary_io.h>
--#include <vpgl/vpgl_lvcs.h>
--#include <vpgl/xio/vpgl_xio_lvcs.h>
--
--#include <vpl/vpl.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--template <class T>
--boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
--                          const vgl_point_3d<double>& origin,
--                          const vgl_vector_3d<double>& block_dim,
--                          const vgl_vector_3d<unsigned>& world_dim,
--                          const bool load_all_blocks,
--                          const bool save_internal_nodes,
--                          const bool save_platform_independent)
--: lvcs_(lvcs),
--  origin_(origin),
--  block_dim_(block_dim),
--  active_block_(vgl_point_3d<int>(-1,-1,-1)),
--  save_internal_nodes_(save_internal_nodes),
--  save_platform_independent_(save_platform_independent),
--  load_all_blocks_(load_all_blocks)
--{
--  create_blocks(block_dim, world_dim);
--}
--
--template <class T>
--boxm_scene<T>::boxm_scene( const vgl_point_3d<double>& origin,
--                           const vgl_vector_3d<double>& block_dim,
--                           const vgl_vector_3d<unsigned>& world_dim,
--                           const bool load_all_blocks,
--                           const bool save_internal_nodes,
--                           const bool save_platform_independent)
--: origin_(origin),
--  block_dim_(block_dim),
--  active_block_(vgl_point_3d<int>(-1,-1,-1)),
--  save_internal_nodes_(save_internal_nodes),
--  save_platform_independent_(save_platform_independent),
--  load_all_blocks_(load_all_blocks)
--{
--  create_blocks(block_dim, world_dim);
--}
--
--template <class T>
--boxm_scene<T>::boxm_scene(const boxm_scene& scene)
--: boxm_scene_base(scene),
--  lvcs_(scene.lvcs()),
--  origin_(scene.origin()),
--  block_dim_(scene.block_dim()),
--  active_block_(vgl_point_3d<int>(-1,-1,-1)),
--  save_internal_nodes_(scene.save_internal_nodes()),
--  save_platform_independent_(scene.save_platform_independent()),
--  load_all_blocks_(scene.load_all_blocks())
--{
--  int x,y,z;
--  scene.block_num(x,y,z);
--  create_blocks(block_dim_, vgl_vector_3d<unsigned>(x,y,z));
--}
--
--
--template <class T>
--void boxm_scene<T>::create_blocks(const vgl_vector_3d<double>& /*block_dim*/,
--                                  const vgl_vector_3d<unsigned>& world_dim)
--{
--  // compute the dimensions of 3D array
--  unsigned x_dim = world_dim.x(); // = static_cast<int>(std::floor(world_dim.x()/block_dim.x()));
--  unsigned y_dim = world_dim.y(); // = static_cast<int>(std::floor(world_dim.y()/block_dim.y()));
--  unsigned z_dim = world_dim.z(); // = static_cast<int>(std::floor(world_dim.z()/block_dim.z()));
--
--  // pointers are initialized to NULL
--  blocks_ =  vbl_array_3d<boxm_block<T>*>(x_dim, y_dim, z_dim, (boxm_block<T>*)nullptr);
--  for (unsigned i=0; i<x_dim; ++i) {
--    for (unsigned j=0; j<y_dim; ++j) {
--      for (unsigned k=0; k<z_dim; ++k) {
--        create_block(i,j,k);
--      }
--    }
--  }
--}
--
--template <class T>
--boxm_scene<T>::boxm_scene(const vpgl_lvcs& lvcs,
--                          const vgl_point_3d<double>& origin,
--                          const vgl_vector_3d<double>& block_dim,
--                          const vgl_vector_3d<unsigned>& world_dim,
--                          unsigned max_level, unsigned init_level,
--                          const bool load_all_blocks,
--                          const bool save_internal_nodes,
--                          const bool save_platform_independent)
--: lvcs_(lvcs),
--origin_(origin),
--block_dim_(block_dim),
--active_block_(vgl_point_3d<int>(-1,-1,-1)),
--save_internal_nodes_(save_internal_nodes),
--save_platform_independent_(save_platform_independent),
--load_all_blocks_(load_all_blocks)
--{
--  create_blocks(block_dim, world_dim);
--  set_octree_levels(max_level, init_level);
--}
--
--template <class T>
--void boxm_scene<T>::create_block(unsigned i, unsigned j, unsigned k)
--{
--  if (blocks_(i,j,k) == NULL) {
--    vgl_box_3d<double> bbox = get_block_bbox(i,j,k);
--    blocks_(i,j,k) = new boxm_block<T>(bbox);
--  }
--}
--
--template <class T>
--boxm_scene<T>::~boxm_scene()
--{
--  // delete the blocks
--  int x_dim, y_dim, z_dim;
--  block_num(x_dim, y_dim, z_dim);
--  for (int i=0; i<x_dim; i++) {
--    for (int j=0; j<y_dim; j++) {
--      for (int k=0; k<z_dim; k++) {
--        if (blocks_(i,j,k))
--          delete blocks_(i,j,k);
--      }
--    }
--  }
--}
--
--//: Returns a scene with the same structure and initialized with given value
--template<class T>
--void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out, datatype data)
--{
--  boxm_block_iterator<T> iter(this);
--  boxm_block_iterator<T> iter_out = scene_out.iterator();
--  iter.begin();
--  iter_out.begin();
--  while (!iter.end())
--  {
--    load_block(iter.index());
--    scene_out.load_block(iter_out.index());
--    T  *tree_out = (*iter)->get_tree()->clone_all();
--    tree_out->init_cells(data);
--    (*iter_out)->init_tree(tree_out);
--    scene_out.write_active_block();
--    ++iter;
--    ++iter_out;
--  }
--}
--
--//: Returns a scene with the same structure and data
--template<class T>
--void boxm_scene<T>::clone_blocks(boxm_scene<T> &scene_out)
--{
--  boxm_block_iterator<T> iter(this);
--  boxm_block_iterator<T> iter_out = scene_out.iterator();
--  iter.begin();
--  iter_out.begin();
--  while (!iter.end())
--  {
--    load_block(iter.index());
--    T  *tree_out = (*iter)->get_tree()->clone_all();
--    (*iter_out)->init_tree(tree_out);
--    scene_out.write_active_block();
--    ++iter;
--    ++iter_out;
--  }
--}
--
--template <class T>
--void boxm_scene<T>::write_active_block(bool unload_block)
--{
--  if (valid_index(active_block_)&& (!load_all_blocks_))
--  {
--    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
--    std::string path = gen_block_path(x,y,z);
--    vsl_b_ofstream os(path);
--#ifdef DEBUG
--    std::cout << "block path: " << path << '\n'
--             << "Load All blocks " << load_all_blocks_ << '\n'
--             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--#endif
--    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--
--    // delete the block's data
--    if (unload_block)
--    {
--      boxm_block<T>* block = blocks_(x,y,z);
--      block->delete_tree();
--      block->set_tree(nullptr);
--      active_block_.set(-1,-1,-1);
--    }
--    os.close();
--  }
--}
--
--template <class T>
--void boxm_scene<T>::write_active_block(bool unload_block) const
--{
--  assert(!unload_block); // use the "non-const" method ::write_active_block if you want to delete the block's data
--
--  if (valid_index(active_block_)&& (!load_all_blocks_))
--  {
--    int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
--    std::string path = gen_block_path(x,y,z);
--    vsl_b_ofstream os(path);
--#ifdef DEBUG
--    std::cout << "block path: " << path << '\n'
--             << "Load All blocks " << load_all_blocks_ << '\n'
--             << "Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--#endif
--    blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--    os.close();
--  }
--}
--
--
--template <class T>
--void boxm_scene<T>::write_active_blocks(bool unload_block)
--{
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
--  for (; it!=active_blocks_.end(); it++)
--  {
--    vgl_point_3d<int> bidx = *it;
--    if (valid_index(bidx)&& (!load_all_blocks_))
--    {
--      int x=bidx.x(), y=bidx.y(), z=bidx.z();
--      std::string path = gen_block_path(x,y,z);
--      vsl_b_ofstream os(path);
--  #ifdef DEBUG
--      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
--              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--  #endif
--      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--
--      // delete the block's data
--      if (unload_block)
--      {
--        boxm_block<T>* block = blocks_(x,y,z);
--        block->delete_tree();
--        block->set_tree(nullptr);
--        active_block_.set(-1,-1,-1);
--      }
--      os.close();
--    }
--  }
--}
--
--template <class T>
--void boxm_scene<T>::write_active_blocks(bool unload_block) const
--{
--  assert(!unload_block); // use the "non-const" method ::write_active_blocks if you want to delete the block's data
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
--  for (; it!=active_blocks_.end(); it++)
--  {
--    vgl_point_3d<int> bidx = *it;
--    if (valid_index(bidx)&& (!load_all_blocks_))
--    {
--      int x=bidx.x(), y=bidx.y(), z=bidx.z();
--      std::string path = gen_block_path(x,y,z);
--      vsl_b_ofstream os(path);
--  #ifdef DEBUG
--      std::cout<<"Load All blocks "<<load_all_blocks_<<'\n'
--              <<"Internal Nodes 2: " << save_internal_nodes_ << " save_platform_independent_ " << save_platform_independent_ << std::endl;
--  #endif
--      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--      os.close();
--    }
--  }
--}
--
--//: Writes and unloads the specified block. It doesn't modify global variables
--template <class T>
--void boxm_scene<T>::write_block_thread_safe(unsigned i, unsigned j, unsigned k)
--{
--  if (valid_index(i,j,k)&& (!load_all_blocks_))
--  {
--    std::string path = gen_block_path(i,j,k);
--    vsl_b_ofstream os(path);
--
--    if (blocks_(i,j,k))
--      blocks_(i,j,k)->b_write(os, save_internal_nodes_, save_platform_independent_);
--
--    // delete the block's data
--    boxm_block<T>* block = blocks_(i,j,k);
--    block->delete_tree();
--    block->set_tree(nullptr);
--
--    os.close();
--  }
--}
--
--template <class T>
--void boxm_scene<T>::force_write_blocks()
--{
--  boxm_block_iterator<T> iter(this);
--  iter.begin();
--  while (!iter.end())
--  {
--    int x=iter.index().x(), y=iter.index().y(), z=iter.index().z();
--    if (blocks_(x,y,z)->get_tree()!=nullptr)
--    {
--      std::cout<<" ? ";
--      std::string path = gen_block_path(x,y,z);
--      vsl_b_ofstream os(path);
--      blocks_(x,y,z)->b_write(os, save_internal_nodes_, save_platform_independent_);
--      os.close();
--    }
--    iter++;
--  }
--}
--
--//: Returns the block this point resides in
--template <class T>
--boxm_block<T>* boxm_scene<T>::get_block(vgl_point_3d<double> const& p) const
--{
--  vgl_box_3d<double> world(get_world_bbox());
--  if (world.contains(p)) {
--    // find the block index
--    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
--    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
--    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
--    return blocks_(i,j,k);
--  }
--  else {
--#ifdef DEBUG
--    std::cerr << "Point " << p << " is out of world " << world << '\n';
--#endif
--    return nullptr;
--  }
--}
--
--
--//: Returns the index of the block containing this point
--template <class T>
--bool boxm_scene<T>::get_block_index(vgl_point_3d<double> const& p, vgl_point_3d<int>& index)
--{
--  vgl_box_3d<double> world(get_world_bbox());
--  if (world.contains(p)) {
--    // find the block index
--    unsigned i = static_cast<unsigned>((p.x()-origin_.x())/block_dim_.x());
--    unsigned j = static_cast<unsigned>((p.y()-origin_.y())/block_dim_.y());
--    unsigned k = static_cast<unsigned>((p.z()-origin_.z())/block_dim_.z());
--    // boundary case
--    double tol = 1e-9;
--    if (std::abs(p.x()-world.max_x())<tol)
--      i-=1;
--    if (std::abs(p.y()-world.max_y())<tol)
--      j-=1;
--    if (std::abs(p.z()-world.max_z())<tol)
--      k-=1;
--
--    index=vgl_point_3d<int>(i,j,k);
--    return true;
--  }
--  else {
--#ifdef DEBUG
--    std::cerr << "Point " << p << " is out of world " << world << '\n';
--#endif
--    return false;
--  }
--}
--
--template <class T>
--boxm_block<T>* boxm_scene<T>::get_active_block()
--{
--  if (valid_index(active_block_)) {
--    boxm_block<T>* block = blocks_(active_block_.x(),active_block_.y(),active_block_.z());
--    if (block->get_tree() == nullptr)
--      load_block(active_block_.x(),active_block_.y(),active_block_.z());
--    return block;
--  }
--  else {
--    std::cerr << "index"<<active_block_<<"  is out of world\n";
--    return nullptr;
--  }
--}
--
--template <class T>
--vgl_box_3d<double> boxm_scene<T>::get_world_bbox() const
--{
--  vgl_point_3d<double> min_p(origin_.x(), origin_.y(), origin_.z());
--  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x()*blocks_.get_row1_count(),
--                             min_p.y()+block_dim_.y()*blocks_.get_row2_count(),
--                             min_p.z()+block_dim_.z()*blocks_.get_row3_count());
--
--  vgl_box_3d<double> bbox(min_p, max_p);
--  return bbox;
--}
--
--template <class T>
--void boxm_scene<T>::axes_length(double &x_length,double &y_length, double &z_length) const
--{
--  x_length = block_dim_.x()*blocks_.get_row1_count();
--  y_length = block_dim_.y()*blocks_.get_row2_count();
--  z_length = block_dim_.z()*blocks_.get_row3_count();
--}
--
--
--template <class T>
--vgl_box_3d<double> boxm_scene<T>::get_block_bbox(int x, int y, int z) const
--{
--  vgl_point_3d<double> min_p(block_dim_.x()*x+origin_.x(), block_dim_.y()*y+origin_.y(), block_dim_.z()*z+origin_.z());
--  vgl_point_3d<double> max_p(min_p.x()+block_dim_.x(), min_p.y()+block_dim_.y(), min_p.z()+block_dim_.z());
--
--  vgl_box_3d<double> bbox(min_p, max_p);
--  return bbox;
--}
--
--template <class T>
--std::string boxm_scene<T>::gen_block_path(int x, int y, int z) const
--{
--  std::stringstream strm;
--
--  strm << scene_path_ << '/' << block_pref_ << '_' <<  x << '_' << y << '_' << z << ".bin";
--
--  return strm.str();
--}
--
--template <class T>
--bool boxm_scene<T>::discover_block(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--  std::string block_path = gen_block_path(i,j,k);
--  vsl_b_ifstream os(block_path);
--
--  // if the binary block file is not found, return "false"
--  return !os == false;
--}
--
--//: returns true if the block bin file is found on disc, false otherwise.
--// If false, a new tree is create for the block
--template <class T>
--bool boxm_scene<T>::load_block(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--
--  if (!load_all_blocks_)
--  {
--    // this does not save the active block so make sure to save it first
--    if (valid_index(active_block_)) {
--      if (!(active_block_ == vgl_point_3d<int>(i,j,k)))
--      {
--        int x=active_block_.x(), y=active_block_.y(), z=active_block_.z();
--        boxm_block<T>* block = blocks_(x,y,z);
--        block->delete_tree();
--        block->set_tree(nullptr);
--      }
--    }
--  }
--
--  active_block_.set(i,j,k);
--
--  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
--  {
--    std::string block_path = gen_block_path(i,j,k);
--    vsl_b_ifstream os(block_path);
--
--    // if the binary block file is not found
--    if (!os) {
--      if (blocks_(i,j,k)->get_tree()==nullptr) {
--        T* tree= new T(max_tree_level_,init_tree_level_);
--        blocks_(i,j,k)->init_tree(tree);
--      }
--      return false;
--    }
--    blocks_(i,j,k)->b_read(os);
--    os.close();
--  }
--
--  return true;
--}
--
--
--//: Load block into memory - this doesn't use global variables so user is responsible for unloading it
--template <class T>
--bool boxm_scene<T>::load_block_thread_safe(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--
--  if (blocks_(i,j,k)->get_tree()==nullptr) // read it from file
--  {
--    std::string block_path = gen_block_path(i,j,k);
--    vsl_b_ifstream os(block_path);
--
--    // if the binary block file is not found
--    if (!os) {
--      if (blocks_(i,j,k)->get_tree()==nullptr) {
--        T* tree= new T(max_tree_level_,init_tree_level_);
--        blocks_(i,j,k)->init_tree(tree);
--      }
--      return false;
--    }
--    blocks_(i,j,k)->b_read(os);
--    os.close();
--  }
--
--  return true;
--}
--
--//: Reads and loads all blocks into memorty
--template <class T>
--bool boxm_scene<T>::read_all_blocks()
--{
--  load_all_blocks_ = true;
--  this->unload_active_blocks();
--
--  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
--    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
--      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
--        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) // read it from file
--        {
--          std::string block_path = gen_block_path(block_i,block_j,block_k);
--          vsl_b_ifstream os(block_path);
--
--          // if the binary block file is not found
--          if (!os) {
--            if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
--              T* tree= new T(max_tree_level_,init_tree_level_);
--              blocks_(block_i,block_j,block_k)->init_tree(tree);
--            }
--          }
--          else
--            blocks_(block_i,block_j,block_k)->b_read(os);
--
--          active_blocks_.insert(vgl_point_3d<int>(block_i, block_j, block_k));
--          os.close();
--        }
--      }
--    }
--  }
--
--  return true;
--}
--
--template <class T>
--bool boxm_scene<T>::load_block_and_neighbors(unsigned i, unsigned j, unsigned k)
--{
--  if (!valid_index(vgl_point_3d<int>(i,j,k)))
--    return false;
--
--  active_block_.set(i,j,k);
--  // Set unused blocks to null and load new blocks
--  // this is to avoid rereading blocks that are already in memory
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks  = neighboring_blocks(vgl_point_3d<int>(i,j,k));
--  new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
--  bvgl_point_3d_cmp<int>  cmp;
--  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
--                     new_active_blocks.begin(), new_active_blocks.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
--                     cmp);
--
--  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
--                     active_blocks_.begin(), active_blocks_.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
--                     cmp);
--
--  active_blocks_.clear();
--  active_blocks_ = new_active_blocks;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
--
--  for (; unload_it!=blocks_to_unload.end(); unload_it++)
--  {
--    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--  }
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
--
--  for (; load_it!=blocks_to_load.end(); load_it++)
--  {
--    int block_i = (*load_it).x();
--    int block_j = (*load_it).y();
--    int block_k = (*load_it).z();
--
--    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
--    {
--      std::string block_path = gen_block_path(block_i,block_j,block_k);
--      vsl_b_ifstream os(block_path);
--
--      // if the binary block file is not found
--      if (!os) {
--        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
--          T* tree= new T(max_tree_level_,init_tree_level_);
--          blocks_(block_i,block_j,block_k)->init_tree(tree);
--        }
--        return false;
--      }
--      blocks_(block_i,block_j,block_k)->b_read(os);
--      assert(blocks_(block_i,block_j,block_k)!=NULL);
--      assert(blocks_(block_i,block_j,block_k)->get_tree()!=nullptr);
--
--      os.close();
--    }
--  }
--
--  return true;
--}
--
--//: Return the finest level in the scene
--template <class T>
--short boxm_scene<T>::finest_level()
--{
--  // iterate through the blocks requesting the finest level
--  boxm_block_iterator<T > iter=this->const_iterator();
--  iter.begin();
--  short finest_level = this->max_tree_level_;
--  while (!iter.end()) {
--    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--      short this_level = get_active_block()->get_tree()->finest_level();
--      if (this_level < finest_level)
--        finest_level = this_level;
--    }
--    iter++;
--  }
--
--  return finest_level;
--}
--
--
--//: Return the finest level in the scene. Iterates through blocks assuming they are all in memory
--template <class T>
--short boxm_scene<T>::finest_level_in_memory() const
--{
--  if (!load_all_blocks_)
--    return -1;
--
-- // iterate through the blocks requesting the finest level
--  short finest_level = this->max_tree_level_;
--  for (unsigned block_i = 0; block_i < blocks_.get_row1_count(); block_i++){
--    for (unsigned block_j = 0; block_j < blocks_.get_row2_count(); block_j++){
--      for (unsigned block_k = 0; block_k < blocks_.get_row3_count(); block_k++){
--        if (blocks_(block_i,block_j,block_k)) {
--            short this_level = blocks_(block_i,block_j,block_k)->get_tree()->finest_level();
--            if (this_level < finest_level)
--              finest_level = this_level;
--          }
--      }
--    }
--  }
--
--  return finest_level;
--}
--
--//: Return the length of finest-level cell in the scene
--template <class T>
--double  boxm_scene<T>::finest_cell_length()
--{
--  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level()));
--
--  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
--    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
--             << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
--  }
--
--  return local_cell_length * block_dim_.x();
--}
--
--//: Return the length of cells at a given level in the scene
--template <class T>
--double  boxm_scene<T>::cell_length(unsigned level)
--{
--  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - level));
--
--  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7)){
--    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n"
--    << block_dim_.x() <<", " << block_dim_.y()<< ", " << block_dim_.x() << '\n';
--  }
--
--  return local_cell_length * block_dim_.x();
--}
--
--//: Return the length of finest-level cell in the scene. Iterates through blocks assuming they are all in memory
--template <class T>
--double  boxm_scene<T>::finest_cell_length_in_memory() const
--{
--  double local_cell_length = 1.0/(double)(1<<((this->max_tree_level_ -1) - finest_level_in_memory()));
--
--  if ((std::abs(block_dim_.x() - block_dim_.y()) > 1.0e-7)   || (std::abs(block_dim_.x() - block_dim_.z()) > 1.0e-7))
--    std::cerr << "Warning: In boxm_scene::finest_cell_length, cells aren't cubical, returning length along x direction\n";
--
--  return local_cell_length * block_dim_.x();
--}
--
--//: Return the number of leaf nodes in the scene
--template <class T>
--unsigned long boxm_scene<T>::size()
--{
--  // iterate through the blocks requesting the finest level
--  boxm_block_iterator<T > iter=this->const_iterator();
--  iter.begin();
--  unsigned long size = 0;
--  while (!iter.end()) {
--    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z()))
--    {
--      size += get_active_block()->get_tree()->size();
--    }
--
--    iter++;
--  }
--
--  return size;
--}
--
--template <class T>
--void boxm_scene<T>::b_read(vsl_b_istream & is)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      std::string xml="";
--      vsl_b_read(is, xml);
--      std::cout << xml << std::endl;
--      boxm_scene_parser parser;
--      parse_xml_string(xml, parser);
--      break;
--#if 0
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scene<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      return;
--#endif
--  }
--}
--
--template <class T>
--void boxm_scene<T>::b_write(vsl_b_ostream & s) const
--{
--  // create an XML stream for the parameters
--  std::stringstream strm;
--  boxm_scene<T> scene(this->lvcs(), this->origin(), this->block_dim(), this->world_dim());
--  x_write(strm, scene, "scene");
--  std::string str(strm.str());
--
--  short v = boxm_scene<T>::version_no();
--  vsl_b_write(s, v);
--  // write the XML as char stream
--  vsl_b_write(s, str);
--}
--
--template <class T>
--void boxm_scene<T>::write_scene(std::string filename)
--{
--  std::string fullpath=scene_path_+ "/" + filename;
--  std::ofstream os(fullpath.c_str());
--  x_write(os, *this, "boxm_scene");
--  this->filename_ = fullpath;
--  os.close();
--}
--
--template <class T>
--void boxm_scene<T>::write_scene(std::string path, std::string filename)
--{
--  std::string fullpath= path+ "/" + filename;
--  std::ofstream os(fullpath.c_str());
--  x_write(os, *this, "boxm_scene");
--  this->filename_ = fullpath;
--  os.close();
--}
--
--template <class T>
--void boxm_scene<T>::load_scene(std::string filename)
--{
--  boxm_scene_parser parser;
--  boxm_scene_base::load_scene(filename, parser);
--  this->filename_ = filename;
--  parse_config(parser);
--}
--
--template <class T>
--void boxm_scene<T>::load_scene(boxm_scene_parser& parser)
--{
--  parse_config(parser);
--}
--
--template <class T>
--void x_write(std::ostream &os, boxm_scene<T>& scene, std::string name)
--{
--  vsl_basic_xml_element scene_elm(name);
--  scene_elm.x_write_open(os);
--
--  vsl_basic_xml_element app_model(APP_MODEL_TAG);
--  app_model.add_attribute("type", boxm_apm_types::app_model_strings[scene.appearence_model()]);
--  app_model.x_write(os);
--
--  vsl_basic_xml_element bin(MULTI_BIN_TAG);
--  bin.add_attribute("value", scene.multi_bin()? 1 : 0);
--  bin.x_write(os);
--
--  vsl_basic_xml_element save_nodes(SAVE_INTERNAL_NODES_TAG);
--  save_nodes.add_attribute("value", scene.save_internal_nodes()? 1 : 0);
--  save_nodes.x_write(os);
--
--  vsl_basic_xml_element save_platform_independent(SAVE_PLATFORM_INDEPENDENT_TAG);
--  save_platform_independent.add_attribute("value", scene.save_platform_independent()? 1 : 0);
--  save_platform_independent.x_write(os);
--
--  vsl_basic_xml_element load_all_blocks(LOAD_ALL_BLOCKS_TAG);
--  load_all_blocks.add_attribute("value", scene.load_all_blocks()? 1 : 0);
--  load_all_blocks.x_write(os);
--
--  vpgl_lvcs lvcs=scene.lvcs();
--  x_write(os, lvcs, LVCS_TAG);
--  x_write(os, scene.origin(), LOCAL_ORIGIN_TAG);
--  x_write(os, scene.block_dim(), BLOCK_DIMENSIONS_TAG);
--
--  vsl_basic_xml_element blocks(BLOCK_NUM_TAG);
--  int x_dim, y_dim, z_dim;
--  scene.block_num(x_dim, y_dim, z_dim);
--  blocks.add_attribute("x_dimension", x_dim);
--  blocks.add_attribute("y_dimension", y_dim);
--  blocks.add_attribute("z_dimension", z_dim);
--  blocks.x_write(os);
--
--  vsl_basic_xml_element paths(SCENE_PATHS_TAG);
--  paths.add_attribute("path", scene.path());
--  paths.add_attribute("block_prefix", scene.block_prefix());
--  paths.x_write(os);
--
--  vsl_basic_xml_element tree(OCTREE_LEVELS_TAG);
--  tree.add_attribute("max", (int) scene.max_level());
--  tree.add_attribute("init", (int) scene.init_level());
--  tree.x_write(os);
--
--  scene_elm.x_write_close(os);
--}
--
--template <class T>
--bool boxm_scene<T>::parse_config(boxm_scene_parser& parser)
--{
--  vpgl_lvcs lvcs;
--  parser.lvcs(lvcs);
--  vgl_vector_3d<unsigned> dims = parser.block_nums();
--
--  lvcs_ = lvcs;
--  origin_ =  parser.origin();
--  block_dim_ = parser.block_dim();
--  create_blocks(block_dim_, dims);
--
--  parser.paths(scene_path_, block_pref_);
--  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
--  multi_bin_ = parser.multi_bin();
--  save_internal_nodes_ =parser.save_internal_nodes();
--  save_platform_independent_ = parser.save_platform_independent();
--  load_all_blocks_ = parser.load_all_blocks();
--  pinit_=parser.p_init();
--#if 0
--  std::cout << "Internal Nodes 1: " << save_internal_nodes_ << std::endl;
--#endif
--  parser.levels(max_tree_level_, init_tree_level_);
--  return true;
--}
--
--template <class T>
--bool boxm_scene<T>::parse_xml_string(std::string xml, boxm_scene_parser& parser)
--{
--  if (xml.size() == 0) {
--    std::cerr << "XML string is empty\n";
--    return false;
--  }
--  if (!parser.parseString(xml.data())) {
--    std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
--             << parser.XML_GetCurrentLineNumber() << '\n';
--
--    return false;
--  }
--
--  vpgl_lvcs lvcs;
--  parser.lvcs(lvcs);
--  vgl_vector_3d<unsigned> nums = parser.block_nums();
--
--  lvcs_ = lvcs;
--  origin_ =  parser.origin();
--  block_dim_ = parser.block_dim();
--  create_blocks(block_dim_, nums);
--
--  parser.paths(scene_path_, block_pref_);
--  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
--  multi_bin_ = parser.multi_bin();
--  pinit_=parser.p_init();
--  load_all_blocks_ = parser.load_all_blocks();
--
--  return true;
--}
--
--template <class T>
--void boxm_scene<T>::clean_scene()
--{
--  boxm_block_iterator<T > iter=this->iterator();
--  iter.begin();
--  while (!iter.end()) {
--    if (this->discover_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--      std::string filename=this->gen_block_path(iter.index().x(),iter.index().y(),iter.index().z());
--      vpl_unlink(filename.c_str());
--    }
--    iter++;
--  }
--}
--
--template <class T>
--void boxm_scene<T>::print()
--{
--  boxm_block_iterator<T > iter=this->const_iterator();
--  iter.begin();
--  while (!iter.end()) {
--    if (this->load_block(iter.index().x(),iter.index().y(),iter.index().z())) {
--      std::cout << "Printing Block : " <<  iter.index() << std::endl;
--      get_active_block()->get_tree()->print();
--    }
--    ++iter;
--  }
--}
--
--//: Load all blocks in between min-max indices.
--template <class T>
--bool boxm_scene<T>::load_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
--{
--  if (!valid_index(min_idx) || !valid_index(max_idx))
--    return false;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  new_active_blocks;
--
--  for (int i = min_idx.x(); i <= max_idx.x(); i++)
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--      for (int k = min_idx.z(); k <= max_idx.z(); k++)
--        new_active_blocks.insert(vgl_point_3d<int>(i,j,k));
--
--  // Set unused blocks to null and load new blocks
--  // this is to avoid rereading blocks that are already in memory
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_unload;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >  blocks_to_load;
--  bvgl_point_3d_cmp<int>  cmp;
--  std::set_difference(active_blocks_.begin(), active_blocks_.end(),
--                     new_active_blocks.begin(), new_active_blocks.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > >(blocks_to_unload, blocks_to_unload.begin()),
--                     cmp);
--
--  std::set_difference(new_active_blocks.begin(), new_active_blocks.end(),
--                     active_blocks_.begin(), active_blocks_.end(),
--                     std::insert_iterator<std::set<vgl_point_3d<int> , bvgl_point_3d_cmp<int> > > (blocks_to_load, blocks_to_load.begin()),
--                     cmp);
--
--  active_blocks_.clear();
--  active_blocks_ = new_active_blocks;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = blocks_to_unload.begin();
--
--  for (; unload_it!=blocks_to_unload.end(); unload_it++)
--  {
--    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--  }
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator load_it = blocks_to_load.begin();
--
--  for (; load_it!=blocks_to_load.end(); load_it++)
--  {
--    int block_i = (*load_it).x();
--    int block_j = (*load_it).y();
--    int block_k = (*load_it).z();
--
--    if (blocks_(block_i,block_j,block_k)->get_tree() == nullptr)// read it from file
--    {
--      std::string block_path = gen_block_path(block_i,block_j,block_k);
--      vsl_b_ifstream os(block_path);
--
--      // if the binary block file is not found
--      if (!os) {
--        if (blocks_(block_i,block_j,block_k)->get_tree()==nullptr) {
--          T* tree= new T(max_tree_level_,init_tree_level_);
--          blocks_(block_i,block_j,block_k)->init_tree(tree);
--        }
--        return false;
--      }
--      blocks_(block_i,block_j,block_k)->b_read(os);
--      os.close();
--    }
--  }
--
--  return true;
--}
--
--//: Unload all blocks in between min-max indices.
--template <class T>
--bool boxm_scene<T>::unload_blocks(vgl_point_3d<int> min_idx, vgl_point_3d<int> max_idx)
--{
--  if (!valid_index(min_idx) || !valid_index(max_idx))
--    return false;
--
--  for (int i = min_idx.x(); i <= max_idx.x(); i++)
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--      for (int k = min_idx.z(); k <= max_idx.z(); k++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        block->delete_tree();
--        block->set_tree(nullptr);
--      }
--  return true;
--}
--
--//: Unload active blocks.
--template <class T>
--void boxm_scene<T>::unload_active_blocks() const
--{
--  // unload active block
--  if (valid_index(active_block_))
--  {
--    boxm_block<T>* block = blocks_(active_block_.x(), active_block_.y(),active_block_.z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--    active_block_ = vgl_point_3d<int>(-1,-1,-1);
--  }
--
--  if (active_blocks_.size()==0)
--    return;
--
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator unload_it = active_blocks_.begin();
--
--  for (; unload_it!=active_blocks_.end(); unload_it++)
--  {
--    boxm_block<T>* block = blocks_((*unload_it).x(),(*unload_it).y(),(*unload_it).z());
--    block->delete_tree();
--    block->set_tree(nullptr);
--  }
--  active_blocks_.clear();
--
--  return;
--}
--
--
--//: Locate all cells within a 3d region, which coordinates are given in scene coordinates.
--//  Use with care --- blocks need to be unloaded by user to not create memory leaks
--template <class T>
--void boxm_scene<T>::leaves_in_region(vgl_box_3d<double> box, std::vector<boct_tree_cell<typename T::loc_type, typename T::datatype>* > &cells)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--  cells.clear();
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
--    return;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--#endif
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
--        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
--      }
--    }
--  }
--
--  // FIXME: I should unload the blocks
--  return;
--}
--
--//: Level of the cell containing a 3d region, which coordinates are given in scene coordinates.
--template <class T>
--short boxm_scene<T>::level_region(vgl_box_3d<double> box)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::level_region: Region does not intersect scene\n";
--    return -1;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--//#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--//#endif
--  if (!load_blocks(min_idx, max_idx))
--    return -1;
--
--  short level = -1;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        std::cout << ".....In tree with box dimension: " << get_block_bbox(i,j,k).width() << ", " << get_block_bbox(i,j,k).depth() << ", " << get_block_bbox(i,j,k).height()
--            << "looking for box with dim: " << box.width() << ", " << box.depth() << ", " <<box.height() <<std::endl;
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--
--        boct_tree_cell<loc_type, datatype>* region_cell = tree->locate_region_global(local_box_exclusive);
--        if (region_cell->level() > level)
--          level = region_cell->level();
--
--        std::cout << "level: " << level << box <<std::endl;
--
--      }
--    }
--  }
--  this->unload_active_blocks();
--  return level;
--}
--
--
--
--
--//: Return all leaf cells between an inner box and an outter box
--template <class T>
--void boxm_scene<T>::leaves_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<typename T::loc_type, typename T::datatype> > &cell_data)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--  cell_data.clear();
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
--    return;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--#endif
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_region_leaves_global(local_box_exclusive, temp_cells);
--
--        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
--        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
--          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
--                                                                (*temp_cell_it)->level(), (*temp_cell_it)->data()));
--        }
--      }
--    }
--  }
--  unload_active_blocks();
--  return;
--}
--
--//: Returns the data of all cells at a given level, that are contained in the specified region
--template <class T>
--void boxm_scene<T>::cell_data_in_region(vgl_box_3d<double> box, std::vector<boct_cell_data<loc_type, datatype> > &cell_data, unsigned level)
--{
--  vgl_box_3d<double> valid_box = vgl_intersection(get_world_bbox(),box);
--  cell_data.clear();
--
--  if (valid_box.is_empty()) {
--    std::cout << "Warning in boxm_scene<T>::leaves_in_region: Region does not intersect scene\n";
--    return;
--  }
--
--  vgl_point_3d<double> min_point = valid_box.min_point();
--  vgl_point_3d<double> max_point = valid_box.max_point();
--
--  // load blocks intersecting the region
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--#ifdef DEBUG
--  std::cout << "Loading Region beteween blocks: " << max_idx << ", " << min_idx << std::endl;
--#endif
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_region_cells_global(local_box_exclusive, temp_cells, level);
--
--        typename std::vector<boct_tree_cell<loc_type, datatype>* >::iterator temp_cell_it = temp_cells.begin();
--        for(; temp_cell_it!=temp_cells.end(); temp_cell_it++){
--          cell_data.push_back(boct_cell_data<loc_type, datatype>(tree->global_centroid(*temp_cell_it),
--                                                                 (*temp_cell_it)->level(), (*temp_cell_it)->data()));
--        }
--      }
--    }
--  }
--  unload_active_blocks();
--  return;
--}
--
--//: Return all leaf cells between an inner box and an outter box. Use with care --- blocks need to be unloaded by user
--template <class T>
--void boxm_scene<T>::leaves_in_hollow_region(vgl_box_3d<double> outer_box, vgl_box_3d<double> inner_box, std::vector<boct_tree_cell<loc_type, datatype>* >& cells)
--{
--  if (!outer_box.contains(inner_box))
--    return;
--
--  // load blocks intersecting the region
--  vgl_point_3d<double> min_point = outer_box.min_point();
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<double> max_point = outer_box.max_point();
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),outer_box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_outer_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                                     local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--
--        vgl_box_3d<double> local_inner_box_exclusive = vgl_intersection(local_outer_box_exclusive,inner_box);
--
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--        std::vector<boct_tree_cell<loc_type, datatype>* > temp_cells;
--        temp_cells.clear();
--        tree->locate_leaves_in_hollow_region_global(local_outer_box_exclusive, local_inner_box_exclusive, temp_cells);
--        cells.insert(cells.end(), temp_cells.begin(), temp_cells.end());
--      }
--    }
--  }
--
--  // FIXME: I should unload the blocks
--  return;
--}
--
--//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
--template <class T>
--void boxm_scene<T>::change_leaves_in_region(vgl_box_3d<double> box, const typename T::datatype &cell_data)
--{
--  // load blocks intersecting the region
--  vgl_point_3d<double> min_point = box.min_point();
--  vgl_point_3d<int> min_idx;
--  get_block_index(min_point, min_idx);
--
--  vgl_point_3d<double> max_point = box.max_point();
--  vgl_point_3d<int> max_idx;
--  get_block_index(max_point, max_idx);
--
--  if (!load_blocks(min_idx, max_idx))
--    return;
--
--  // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--  for (int k = min_idx.z(); k <= max_idx.z(); k++)
--  {
--    for (int j = min_idx.y(); j <= max_idx.y(); j++)
--    {
--      for (int i = min_idx.x(); i <= max_idx.x();i++)
--      {
--        boxm_block<T>* block = blocks_(i,j,k);
--        vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--        // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--        // if this is not done, the endpoint may be out of bounds
--        vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                               local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--        T *tree = block->get_tree();
--        if (!tree)
--          continue;
--
--        tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
--
--        std::string path = gen_block_path(i,j,k);
--        vsl_b_ofstream os(path);
--        block->b_write(os, save_internal_nodes_, save_platform_independent_);
--      }
--    }
--  }
--
--  unload_active_blocks();
--  return;
--}
--
--//: Locates and modifies the value of all cells within a 3d region, which coordinates are given in scene coordinates
--template <class T>
--void boxm_scene<T>::change_leaves_in_regions(std::vector<vgl_box_3d<double> > boxes, const std::vector<typename T::datatype> &all_data)
--{
--  if (boxes.size()!= all_data.size()) {
--    std::cerr << "Error in boxm_scene<T>::change_leaves_in_regions --> Input vectors don't have the same size\n";
--    return;
--  }
--
--  for (unsigned bi = 0; bi < boxes.size(); bi++)
--  {
--    const vgl_box_3d<double> &box = boxes[bi];
--    const datatype &cell_data=all_data[bi];
--    // load blocks intersecting the region
--    vgl_point_3d<double> min_point = box.min_point();
--    vgl_point_3d<int> min_idx;
--    get_block_index(min_point, min_idx);
--
--    vgl_point_3d<double> max_point = box.max_point();
--    vgl_point_3d<int> max_idx;
--    get_block_index(max_point, max_idx);
--
--    if (!load_blocks(min_idx, max_idx))
--      return;
--
--    // traverse blocks. for each block get the cells intersects the portion of the region contained in the block
--    for (int k = min_idx.z(); k <= max_idx.z(); k++)
--    {
--      for (int j = min_idx.y(); j <= max_idx.y(); j++)
--      {
--        for (int i = min_idx.x(); i <= max_idx.x();i++)
--        {
--          boxm_block<T>* block = blocks_(i,j,k);
--          vgl_box_3d<double> local_box = vgl_intersection(get_block_bbox(i,j,k),box);
--
--          // subtract a little from the max point because octree cell are give by a half-closed interval [...).
--          // if this is not done, the endpoint may be out of bounds
--          vgl_box_3d<double> local_box_exclusive(local_box.min_point().x(), local_box.min_point().y(), local_box.min_point().z(),
--                                                 local_box.max_point().x()- 1e-7, local_box.max_point().y()- 1e-7,local_box.max_point().z()- 1e-7);
--          T *tree = block->get_tree();
--          if (!tree)
--            continue;
--
--          tree->change_leaves_in_global_region_leaves_global(local_box_exclusive, cell_data);
--
--          std::string path = gen_block_path(i,j,k);
--          vsl_b_ofstream os(path);
--          block->b_write(os, save_internal_nodes_, save_platform_independent_);
--        }
--      }
--    }
--  }
--
--  unload_active_blocks();
--  return;
--}
--
--
--//: Locate point
--template <class T>
--boct_tree_cell<typename T::loc_type, typename T::datatype>* boxm_scene<T>::locate_point_in_memory(vgl_point_3d<double> &p, unsigned level)
--{
--  // get the indices for the block containing this point
--  vgl_point_3d<int> block_idx;
--  if (!get_block_index(p, block_idx))
--    return nullptr;
--
--#ifdef DEBUG
--  std::cout << "Requesting blocks : "<< block_idx<< '\n'
--           << "Active blocks :" << std::endl;
--  std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> >::iterator it = active_blocks_.begin();
--  for (; it!=active_blocks_.end(); it++) {
--    std::cout << *it << std::endl;
--    boxm_block<T > *block = get_block(*it);
--    if (!block)
--      std::cerr << " NULL block\n";
--    T *tree = block->get_tree();
--    if (!tree)
--      std::cerr << " NULL tree\n";
--  }
--#endif
--
--  // get the block, if block is not already in memory, return null
--  boxm_block<T>* block = blocks_(block_idx.x(), block_idx.y(), block_idx.z());
--  if (!block) {
--    std::cerr << "In locate_point_in_memory: NULL block\n";
--    return nullptr;
--  }
--  T *tree = block->get_tree();
--  if (!tree) {
--    std::cerr << "In locate_point_in_memory: NULL tree\n";
--    return nullptr;
--  }
--  return tree->locate_point_global(p, (short)level);
--}
--
--/************************************************ BOXM_BLOCK_ITERATOR *******************************************/
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::begin()
--{
--  i_=j_=k_=0;
--  return *this;
--}
--
--template <class T>
--bool boxm_block_iterator<T>::end()
--{
--  int x,y,z;
--  scene_->block_num(x,y,z);
--
--  // if ((i_==x-1) && (j_==y-1) && (k_==z-1))
--  bool end = (k_==z || k_ == -1);
--
--  //:If end, release memory
--  if (end)
--    scene_->unload_active_blocks();
--
--  return end;
--}
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::operator=(const boxm_block_iterator<T>& that)
--{
--  this->i_ = that.i_;
--  this->j_ = that.j_;
--  this->k_ = that.k_;
--  return *this;
--}
--
--template <class T>
--bool boxm_block_iterator<T>::operator==(const boxm_block_iterator<T>& that)
--{
--  return (this->i_ == that.i_) && (this->j_ == that.j_) && (this->k_ == that.k_) && (this->scene_ == that.scene_);
--}
--
--template <class T>
--bool boxm_block_iterator<T>::operator!=(const boxm_block_iterator<T>& that)
--{
--  return (this->i_ != that.i_) || (this->j_ != that.j_) == (this->k_ != that.k_) || (this->scene_ != that.scene_);
--}
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::operator++()
--{
--  int x,y,z;
--  scene_->block_num(x,y,z);
--
--  if (++i_==x) {
--    i_=0;
--    if (++j_==y) {
--      j_=0;
--      ++k_;
--    }
--  }
--  return *this;
--}
--
--template <class T>
--boxm_block_iterator<T> boxm_block_iterator<T>::operator++(int)
--{
--  boxm_block_iterator<T> old = *this;
--  ++*this;
--  return old;
--}
--
--template <class T>
--boxm_block_iterator<T>& boxm_block_iterator<T>::operator--()
--{
--  int x,y,z;
--
--  scene_->block_num(x,y,z);
--  if (--i_==-1) {
--    i_=0;
--    if (--j_==-1) {
--      j_=0;
--      k_--;
--    }
--  }
--  return *this;
--}
--
--template <class T>
--boxm_block<T>* boxm_block_iterator<T>::operator*()
--{
--  return scene_->get_block(i_,j_,k_);
--}
--
--template <class T>
--boxm_block<T>*  boxm_block_iterator<T>::operator->()
--{
--  return scene_->get_block(i_,j_,k_);
--}
--
--/************************************************ BOXM_CELL_ITERATOR *******************************************/
--template <class T>
--boxm_cell_iterator<T>& boxm_cell_iterator<T>::begin(bool use_internal_cells)
--{
--  use_internal_cells_= use_internal_cells;
--
--  // unload all blocks from memory
--  block_iterator_.scene_->unload_active_blocks();
--  block_iterator_.begin();
--
--  // load active block using function pointer, retrieve pointer to all cells
--  (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
--  T *tree = (*block_iterator_)->get_tree();
--  assert(tree != nullptr);
--  if(use_internal_cells_)
--    cells_=tree->all_cells();
--  else
--    cells_ = tree->leaf_cells();
--  cells_iterator_ = cells_.begin();
--
--  std::cout << "Cell iterator: # of cells: " << cells_.size() << std::endl;
--
--  return *this;
--}
--
--template <class T>
--bool boxm_cell_iterator<T>::end()
--{
--  bool end = false;
--
--  end = cells_.empty() || (block_iterator_.end() && (cells_iterator_ == cells_.end()));
--
--  if (end)
--    block_iterator_.scene_->unload_active_blocks();
--
--  return end;
--}
--
--template <class T>
--boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator=(const boxm_cell_iterator<T>& /*that*/)
--{
--  std::cerr << "assignment operator not yet implemented\n";
--  return *this;
--}
--
--template <class T>
--bool boxm_cell_iterator<T>::operator==(const boxm_cell_iterator<T>& that)
--{
--  return (this->block_iterator_ == that.block_iterator_) && (this->cells_iterator_ == that.cells_iterator_);
--}
--
--template <class T>
--bool boxm_cell_iterator<T>::operator!=(const boxm_cell_iterator<T>& that)
--{
--  return (this->block_iterator_ != that.block_iterator_) && (this->cells_iterator_ != that.cells_iterator_);
--}
--
--//: Prefix operator.
--//  When the end of the block is reached, it writes the block to disk and loads the next one, unless the read_only flag was set
--template <class T>
--boxm_cell_iterator<T>& boxm_cell_iterator<T>::operator++()
--{
--  if (++cells_iterator_ == cells_.end())
--  {
--    if (!read_only_)
--      block_iterator_.scene_->write_active_block(false);
--
--    ++block_iterator_;
--
--    if (!block_iterator_.end())
--    {
--      // load active block using function pointer, retrieve pointer to all cells
--      (block_iterator_.scene_->*block_loading_func_)(block_iterator_.index().x(),block_iterator_.index().y(),block_iterator_.index().z());
--      T *tree = (*block_iterator_)->get_tree();
--      assert(tree != nullptr);
--
--      if(use_internal_cells_)
--        cells_=tree->all_cells();
--      else
--        cells_ = tree->leaf_cells();
--
--      cells_iterator_ = cells_.begin();
--    }
--  }
--  return *this;
--}
--
--template <class T>
--boxm_cell_iterator<T> boxm_cell_iterator<T>::operator+=(unsigned const &rhs)
--{
--  // is there a more efficient way to do this whitout messing all the iterator up?
--  for (unsigned i =0; i<rhs; ++i)
--    ++(*this);
--
--  return *this;
--}
--
--
--template <class T>
--boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>* boxm_cell_iterator<T>::operator*()
--{
--  return *cells_iterator_;
--}
--
--template <class T>
--boct_tree_cell<typename boxm_cell_iterator<T>::loc_type, typename boxm_cell_iterator<T>::datatype>*  boxm_cell_iterator<T>::operator->()
--{
--  return *cells_iterator_;
--}
--
--template<class T>
--vgl_point_3d<double> boxm_cell_iterator<T>::global_origin()
--{
--  return (*block_iterator_)->get_tree()->global_origin(*cells_iterator_);
--}
--
--template<class T>
--vgl_point_3d<double> boxm_cell_iterator<T>::global_centroid()
--{
--  return (*block_iterator_)->get_tree()->global_centroid(*cells_iterator_);
--}
--
--//: Return the global length of this cell
--template<class T>
--double boxm_cell_iterator<T>::length()
--{
--  return (*block_iterator_)->get_tree()->cell_length(*cells_iterator_)*(*block_iterator_)->bounding_box().width();
--}
--
--/******************************************* I/ O *******************************************************/
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const &scene)
--{
--  scene.b_write(os);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scene<T> const * &scene)
--{
--  scene->b_write(os);
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> &scene)
--{
--  scene.b_read(is);
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scene<T> *&scene)
--{
--  scene->b_read(is);
--}
--
--#define BOXM_SCENE_INSTANTIATE(T) \
--template class boxm_scene<T >; \
--template void x_write(std::ostream&, boxm_scene<T >&, std::string); \
--template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const &scene); \
--template void vsl_b_write(vsl_b_ostream & os, boxm_scene<T > const * &scene); \
--template void vsl_b_read(vsl_b_istream & is, boxm_scene<T >  &scene); \
--template void vsl_b_read(vsl_b_istream & is, boxm_scene<T > * &scene)
--
--#define BOXM_BLOCK_ITERATOR_INSTANTIATE(T) \
--template class boxm_block_iterator<T >; \
--template class boxm_cell_iterator<T >
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.cxx b/contrib/brl/bseg/boxm/boxm_scene_base.cxx
-deleted file mode 100644
-index 11fb0faf88..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_base.cxx
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#include <iostream>
--#include <cstdio>
--#include "boxm_scene_base.h"
--#include "boxm_scene_parser.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bool boxm_scene_base::load_scene(const std::string& filename, boxm_scene_parser& parser)
--{
--
--  if (filename.size() > 0) {
--    std::FILE* xmlFile = std::fopen(filename.c_str(), "r");
--    if (!xmlFile){
--    std::cerr << filename.c_str() << " error on opening" << std::endl;
--    return false;
--    }
--    if (!parser.parseFile(xmlFile)) {
--      std::cerr << XML_ErrorString(parser.XML_GetErrorCode()) << " at line "
--               << parser.XML_GetCurrentLineNumber() << '\n';
--      std::fclose(xmlFile);
--      return false;
--    }
--    std::fclose(xmlFile);
--  }
--  else
--    std::cerr << " Filename is empty" << std::endl;
--
--  parser.paths(scene_path_, block_pref_);
--  app_model_ = boxm_apm_types::str_to_enum(parser.app_model().data());
--  multi_bin_ = parser.multi_bin();
--  parser.levels(max_tree_level_, init_tree_level_);
--  filename_ = filename;
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_base.h b/contrib/brl/bseg/boxm/boxm_scene_base.h
-deleted file mode 100644
-index 5e52195ac3..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_base.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--#ifndef boxm_scene_base_h_
--#define boxm_scene_base_h_
--//:
--// \file
--// \brief  The main class to keep the 3D world data and pieces
--//
--// \author Gamze Tunali
--// \date Apr 14, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vbl/vbl_ref_count.h>
--#include <vsl/vsl_binary_io.h>
--#include <vbl/vbl_smart_ptr.h>
--#include <vgl/vgl_box_3d.h>
--
--#include <boxm/boxm_apm_traits.h>
--
--class boxm_scene_parser;
--
--class boxm_scene_base : public vbl_ref_count
--{
-- public:
--  boxm_scene_base()
--  : app_model_(BOXM_APM_UNKNOWN), multi_bin_(false), tree_level_set_(false),
--    scene_path_(""), filename_(""), block_pref_(""), max_tree_level_(0), init_tree_level_(0) {}
--
--  ~boxm_scene_base() override = default;
--
--  bool load_scene(const std::string& filename, boxm_scene_parser& parser);
--
--  boxm_apm_type appearence_model() { return app_model_; }
--
--  void set_appearance_model(boxm_apm_type model) { app_model_ = model; }
--
--  void set_bin_option(bool multi_bin) { multi_bin_ = multi_bin; }
--
--  void set_octree_levels(unsigned max, unsigned init, bool tree_level_set=true)
--  {
--    max_tree_level_=max;
--    init_tree_level_=init;
--    tree_level_set_=tree_level_set;
--  }
--
--  void set_paths(std::string scene_path, std::string block_prefix)
--  {
--    scene_path_ = scene_path;
--    block_pref_=block_prefix;
--  }
--
--  bool multi_bin() const { return multi_bin_; }
--
--  bool parse_config(std::string xml, boxm_scene_parser& parser, bool filename);
--
--  unsigned max_level() const { return max_tree_level_; }
--  unsigned init_level() const { return init_tree_level_; }
--  std::string filename() const { return filename_; }
--
--  virtual vgl_box_3d<double> get_world_bbox() const { return {}; }
--  virtual vgl_vector_3d<unsigned> world_dim() const { return {}; }
--
-- protected:
--  boxm_apm_type app_model_;
--
--  bool multi_bin_;
--
--  //: it is set to true when max and init tree levels are given
--  bool tree_level_set_;
--
--  std::string scene_path_;
--  std::string filename_;
--  std::string block_pref_;
--
--  //: maximum octree levels allowed
--  unsigned max_tree_level_;
--
--  //: number of initial octree levels created at the tree creation step
--  unsigned init_tree_level_;
--};
--
--typedef vbl_smart_ptr<boxm_scene_base> boxm_scene_base_sptr;
--
--#endif // boxm_scene_base_h_
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx b/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
-deleted file mode 100644
-index be04cb28ed..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_parser.cxx
-+++ /dev/null
-@@ -1,277 +0,0 @@
--//:
--// \file
--// \brief Parses the configuration file for bwm tool.
--//
--#include <sstream>
--#include <cstring>
--#include <iostream>
--#include <cstdio>
--#include "boxm_scene_parser.h"
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--// --------------
--// --- PARSER ---
--// --------------
--template <typename T>
--void convert(const char* t, T& d)
--{
--  std::stringstream strm(t);
--  strm >> d;
--}
--
--boxm_scene_parser::boxm_scene_parser()
--{
--  init_params();
--}
--
--bool boxm_scene_parser::lvcs(vpgl_lvcs& lvcs) {
--  vpgl_lvcs::cs_names cs_name = vpgl_lvcs::str_to_enum(lvcs_cs_name_.data());
--  vpgl_lvcs::LenUnits len_unit;
--  vpgl_lvcs::AngUnits geo_unit;
--   if (std::strcmp(lvcs_XYZ_unit_.data(), "feet")==0) {
--     len_unit = vpgl_lvcs::FEET;
--   }
--   else if (std::strcmp(lvcs_XYZ_unit_.data(), "meters")==0) {
--     len_unit = vpgl_lvcs::METERS;
--   }
--   else {
--     std::cout << "LVCS Length Unit " << lvcs_XYZ_unit_ << " is not valid\n";
--     return false;
--   }
--
--   if (std::strcmp(lvcs_geo_angle_unit_.data(), "radians")==0) {
--     geo_unit = vpgl_lvcs::RADIANS;
--   }
--   else if (std::strcmp(lvcs_geo_angle_unit_.data(), "degrees")==0) {
--     geo_unit = vpgl_lvcs::DEG;
--   }
--   else {
--     std::cout << "LVCS Geo Angle Unit " << lvcs_geo_angle_unit_ << " is not valid\n";
--     return false;
--   }
--
--   lvcs = vpgl_lvcs(lvcs_origin_lat_,lvcs_origin_lon_,lvcs_origin_elev_, cs_name,
--                  lvcs_lat_scale_, lvcs_lon_scale_, geo_unit, len_unit,
--                  lvcs_local_origin_x_, lvcs_local_origin_y_, lvcs_theta_);
--  return true;
--}
--
--void boxm_scene_parser::init_params()
--{
--  lvcs_cs_name_="";
--  lvcs_origin_lon_=0;
--  lvcs_origin_lat_=0;
--  lvcs_origin_elev_=0;
--  lvcs_lon_scale_=0;
--  lvcs_lat_scale_=0;
--  lvcs_XYZ_unit_="";
--  lvcs_geo_angle_unit_="";
--  lvcs_local_origin_x_=0;
--  lvcs_local_origin_y_=0;
--  lvcs_theta_=0;
--
--  // world origin
--  local_orig_x_=0;
--  local_orig_y_=0;
--  local_orig_z_=0;
--
--  // block dimensions
--  block_dim_x_=0;
--  block_dim_y_=0;
--  block_dim_z_=0;
--
--  // block numbers
--  block_num_x_=0;
--  block_num_y_=0;
--  block_num_z_=0;
--
--  path_="";
--  block_pref_="";
--  save_internal_nodes_ = false;
--  save_platform_independent_ = true;
--  load_all_blocks_=false;
--  p_init_=0.01f;
--  num_buffers_init_ = 0;
--  size_buffer_init_ = 0;
--}
--
--void
--boxm_scene_parser::startElement(const char* name, const char** atts)
--{
--#if 0
--  std::cout<< "element=" << name << std::endl;
--#endif
--  if (std::strcmp(name, LVCS_TAG) == 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--        if (std::strcmp(atts[i], "cs_name") == 0)
--        convert(atts[i+1], lvcs_cs_name_);
--      else if (std::strcmp(atts[i], "origin_lon") == 0)
--        convert(atts[i+1], lvcs_origin_lon_);
--      else if (std::strcmp(atts[i], "origin_lat") == 0)
--        convert(atts[i+1], lvcs_origin_lat_);
--      else if (std::strcmp(atts[i], "origin_elev") == 0)
--        convert(atts[i+1], lvcs_origin_elev_);
--      else if (std::strcmp(atts[i], "lon_scale") == 0)
--        convert(atts[i+1], lvcs_lon_scale_);
--      else if (std::strcmp(atts[i], "lat_scale") == 0)
--        convert(atts[i+1], lvcs_lat_scale_);
--      else if (std::strcmp(atts[i], "local_XYZ_unit") == 0)
--        convert(atts[i+1], lvcs_XYZ_unit_);
--      else if (std::strcmp(atts[i], "geo_angle_unit") == 0)
--        convert(atts[i+1], lvcs_geo_angle_unit_);
--      else if (std::strcmp(atts[i], "local_origin_x") == 0)
--        convert(atts[i+1], lvcs_local_origin_x_);
--      else if (std::strcmp(atts[i], "local_origin_y") == 0)
--        convert(atts[i+1], lvcs_local_origin_y_);
--      else if (std::strcmp(atts[i], "theta_") == 0)
--        convert(atts[i+1], lvcs_theta_);
--    }
--  }
--  else if (std::strcmp(name,LOCAL_ORIGIN_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--        if (std::strcmp(atts[i], "x") == 0)
--        convert(atts[i+1], local_orig_x_);
--      else if (std::strcmp(atts[i], "y") == 0)
--        convert(atts[i+1], local_orig_y_);
--      else if (std::strcmp(atts[i], "z") == 0)
--        convert(atts[i+1], local_orig_z_);
--    }
--  }
--  else if (std::strcmp(name,BLOCK_DIMENSIONS_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--        if (std::strcmp(atts[i], "x") == 0)
--        convert(atts[i+1], block_dim_x_);
--      else if (std::strcmp(atts[i], "y") == 0)
--        convert(atts[i+1], block_dim_y_);
--      else if (std::strcmp(atts[i], "z") == 0)
--        convert(atts[i+1], block_dim_z_);
--    }
--  }
--  else if (std::strcmp(name,BLOCK_NUM_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "x_dimension") == 0)
--        convert(atts[i+1], block_num_x_);
--      else if (std::strcmp(atts[i], "y_dimension") == 0)
--        convert(atts[i+1], block_num_y_);
--      else if (std::strcmp(atts[i], "z_dimension") == 0)
--        convert(atts[i+1], block_num_z_);
--    }
--  }
--  else if (std::strcmp(name,SCENE_PATHS_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "path") == 0)
--        convert(atts[i+1], path_);
--      else if (std::strcmp(atts[i], "block_prefix") == 0)
--        convert(atts[i+1], block_pref_);
--    }
--  }
--  else if (std::strcmp(name,APP_MODEL_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "type") == 0)
--        convert(atts[i+1], app_model_);
--    }
--  }
--  else if (std::strcmp(name,MULTI_BIN_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], multi_bin_);
--    }
--  }
--  else if (std::strcmp(name,SAVE_INTERNAL_NODES_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--      std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], save_internal_nodes_);
--    }
--  }
--  else if (std::strcmp(name,SAVE_PLATFORM_INDEPENDENT_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], save_platform_independent_);
--    }
--    //std::cout << "parser: save_platform_independent_ = " << save_platform_independent_ << std::endl;
--  }
--  else if (std::strcmp(name,LOAD_ALL_BLOCKS_TAG)== 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "value") == 0)
--        convert(atts[i+1], load_all_blocks_);
--    }
--    //std::cout << "parser: load_all_blocks_ = " << load_all_blocks_ << std::endl;
--  }
--
--  else if (std::strcmp(name, "octree_level")==0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "max") == 0)
--        convert(atts[i+1], max_tree_level_);
--      else if (std::strcmp(atts[i], "init") == 0)
--        convert(atts[i+1], init_tree_level_);
--    }
--  }
--  else if (std::strcmp(name, "p_init")==0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--    if (std::strcmp(atts[i], "val") == 0)
--        convert(atts[i+1], p_init_);
--    }
--  }
--
--  else if (std::strcmp(name, "tree_init") == 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "num_buffers")==0)
--        convert(atts[i+1], num_buffers_init_);
--      if (std::strcmp(atts[i], "buff_size")==0)
--        convert(atts[i+1], size_buffer_init_);
--    }
--  }
--
--  else if (std::strcmp(name, "max_mb") == 0) {
--    for (int i=0; atts[i]; i+=2) {
--#if 0
--        std::cout << "  Attr=" << atts[i] << "->" << atts[i+1] << std::endl;
--#endif
--      if (std::strcmp(atts[i], "mb") == 0)
--        convert(atts[i+1], max_mb_);
--    }
--  }
--
--}
-diff --git a/contrib/brl/bseg/boxm/boxm_scene_parser.h b/contrib/brl/bseg/boxm/boxm_scene_parser.h
-deleted file mode 100644
-index cbda358d2d..0000000000
---- a/contrib/brl/bseg/boxm/boxm_scene_parser.h
-+++ /dev/null
-@@ -1,108 +0,0 @@
--#ifndef boxm_scene_parser_h_
--#define boxm_scene_parser_h_
--
--#include <iostream>
--#include <string>
--#include <boxm/boxm_scene.h>
--
--#ifdef WIN32
-- #define _LIB
--#endif
--#include <expatpp.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vpgl/vpgl_lvcs.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_vector_3d.h>
--
--#define LVCS_TAG "lvcs"
--#define LOCAL_ORIGIN_TAG "local_origin"
--#define BLOCK_DIMENSIONS_TAG "block_dimensions"
--#define BLOCK_NUM_TAG "blocks"
--#define SCENE_PATHS_TAG "scene_paths"
--#define APP_MODEL_TAG "appearence_model"
--#define MULTI_BIN_TAG "multi_bin"
--#define SAVE_INTERNAL_NODES_TAG "save_internal_nodes"
--#define SAVE_PLATFORM_INDEPENDENT_TAG "save_platform_independent"
--#define LOAD_ALL_BLOCKS_TAG "load_all_blocks"
--#define OCTREE_LEVELS_TAG "octree_level"
--#define P_INIT_TAG "p_init"
--#define TREE_INIT_TAG "tree_init"
--#define MAX_MB_TAG "max_mb"
--
--class boxm_scene_parser : public expatpp
--{
-- public:
--  boxm_scene_parser();
--
--  ~boxm_scene_parser(void) override = default;
--
--   bool lvcs(vpgl_lvcs& lvcs);
--   vgl_point_3d<double> origin() const { return {local_orig_x_,local_orig_y_,local_orig_z_}; }
--   vgl_vector_3d<double> block_dim() const { return {block_dim_x_,block_dim_y_,block_dim_z_}; }
--   vgl_vector_3d<unsigned> block_nums() const { return {block_num_x_,block_num_y_,block_num_z_}; }
--   void paths(std::string& scene_path, std::string& block_pref) { scene_path=path_; block_pref=block_pref_; }
--   std::string app_model() const { return app_model_; }
--   bool multi_bin() const { return multi_bin_; }
--   void levels(unsigned& max, unsigned& init) { max = max_tree_level_; init=init_tree_level_; }
--   bool save_internal_nodes() const { return save_internal_nodes_; }
--   bool save_platform_independent() const { return save_platform_independent_; }
--   bool load_all_blocks() const { return load_all_blocks_; }
--   void tree_buffer_shape(int &num_buffers, int &buff_size) { num_buffers = num_buffers_init_; buff_size = size_buffer_init_; }
--   int max_mb() const { return max_mb_; }
--
--   float p_init() const { return p_init_; }
--
-- private:
--  void startElement(const XML_Char* name, const XML_Char** atts) override;
--  void endElement(const XML_Char* /*name*/) override {}
--  void charData(const XML_Char* /*s*/, int /*len*/) override {}
--
--  void init_params();
--
--  // temporary values
--  //lvcs
--  std::string lvcs_cs_name_;
--  double lvcs_origin_lon_;
--  double lvcs_origin_lat_;
--  double lvcs_origin_elev_;
--  double lvcs_lon_scale_;
--  double lvcs_lat_scale_;
--  std::string lvcs_XYZ_unit_;
--  std::string lvcs_geo_angle_unit_;
--  double lvcs_local_origin_x_;
--  double lvcs_local_origin_y_;
--  double lvcs_theta_;
--
--  // world origin
--  double local_orig_x_;
--  double local_orig_y_;
--  double local_orig_z_;
--
--  // block dimensions
--  double block_dim_x_;
--  double block_dim_y_;
--  double block_dim_z_;
--
--  // block numbers
--  unsigned block_num_x_;
--  unsigned block_num_y_;
--  unsigned block_num_z_;
--
--  std::string path_;
--  std::string block_pref_;
--  std::string app_model_;
--  bool multi_bin_;
--  unsigned max_tree_level_;
--  unsigned init_tree_level_;
--  bool save_internal_nodes_;
--  bool save_platform_independent_;
--  bool load_all_blocks_;
--  float p_init_;
--  int num_buffers_init_, size_buffer_init_;
--  int max_mb_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-deleted file mode 100644
-index 4c0cd29038..0000000000
---- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--# boxm's Process Library
--
--# bprb depends on expat and bvxm_prodepends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--  include_directories( ${BRL_INCLUDE_DIR}/bpro )
--  include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--  include_directories( ${BRL_INCLUDE_DIR}/bseg )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--
--  set(boxm_pro_sources
--      boxm_processes.h
--      boxm_register.h   boxm_register.cxx
--     )
--
--  aux_source_directory(Templates boxm_pro_sources)
--  aux_source_directory(processes boxm_pro_sources)
--
--  vxl_add_library(LIBRARY_NAME boxm_pro LIBRARY_SOURCES ${boxm_pro_sources})
--
--  target_link_libraries(boxm_pro boxm boxm_util boxm_sample_algo boxm_sample vpgl_pro imesh bprb brdb brip vsol bsta bsta_pro ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
--
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx b/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-deleted file mode 100644
-index fb055c2df5..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/boct_tree+short.vnl_vector_fixed+float.3--.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--typedef vnl_vector_fixed<float,3> vector;
--
--
--BOCT_TREE_INSTANTIATE(short, vector );
--BOCT_TREE_CELL_INSTANTIATE(short, vector);
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-deleted file mode 100644
-index ac40b5ec2d..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/boxm_block+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vnl/vnl_vector_fixed.h>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, vnl_vector_fixed<float,3> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx b/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-deleted file mode 100644
-index 24334a0ce4..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <vnl/vnl_vector_fixed.h>
--
--typedef boct_tree<short,vnl_vector_fixed<float,3> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-deleted file mode 100644
-index 5de38b0662..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/boxm_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.h>
--BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
-diff --git a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx b/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
-deleted file mode 100644
-index d1cce77af7..0000000000
---- a/contrib/brl/bseg/boxm/pro/Templates/vbl_array_3d+boxm_block+boct_tree+short.vnl_vector_fixed+float.3---~-.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_block.h>
--#include <boct/boct_tree.h>
--#include <vnl/vnl_vector_fixed.h>
--
--typedef boct_tree<short,vnl_vector_fixed<float,3> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/pro/boxm_processes.h b/contrib/brl/bseg/boxm/pro/boxm_processes.h
-deleted file mode 100644
-index 4466447bb1..0000000000
---- a/contrib/brl/bseg/boxm/pro/boxm_processes.h
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#ifndef boxm_processes_h_
--#define boxm_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--//the init functions
--DECLARE_FUNC_CONS(boxm_load_scene_process);
--DECLARE_FUNC_CONS(boxm_create_scene_process);
--DECLARE_FUNC_CONS(boxm_construct_scene_from_image_process);
--DECLARE_FUNC_CONS(boxm_proj_local_cam_process);
--DECLARE_FUNC_CONS(boxm_camera_viewing_scene_process);
--DECLARE_FUNC_CONS(boxm_upload_mesh_process);
--DECLARE_FUNC_CONS(boxm_clean_scene_process);
--DECLARE_FUNC_CONS(boxm_force_write_blocks_process);
--#endif
-diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.cxx b/contrib/brl/bseg/boxm/pro/boxm_register.cxx
-deleted file mode 100644
-index 631b5beadc..0000000000
---- a/contrib/brl/bseg/boxm/pro/boxm_register.cxx
-+++ /dev/null
-@@ -1,27 +0,0 @@
--#include "boxm_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include <boxm/boxm_scene_base.h>
--
--#include "boxm_processes.h"
--
--void boxm_register::register_datatype()
--{
--  REGISTER_DATATYPE( boxm_scene_base_sptr );
--}
--
--void boxm_register::register_process()
--{
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_load_scene_process, "boxmLoadSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_create_scene_process, "boxmCreateSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_proj_local_cam_process,"boxmProjLocalCamProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_camera_viewing_scene_process,"boxmCameraViewingSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_construct_scene_from_image_process, "boxmConstructSceneFromImageProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_upload_mesh_process,"boxmUploadMeshProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_clean_scene_process,"boxmCleanSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_force_write_blocks_process,"boxmForceWriteBlocksProcess");
--
--}
-diff --git a/contrib/brl/bseg/boxm/pro/boxm_register.h b/contrib/brl/bseg/boxm/pro/boxm_register.h
-deleted file mode 100644
-index 784df08bde..0000000000
---- a/contrib/brl/bseg/boxm/pro/boxm_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef boxm_register_h_
--#define boxm_register_h_
--
--class boxm_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // boxm_register_h_
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
-deleted file mode 100644
-index 799958429f..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
-+++ /dev/null
-@@ -1,131 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_camera_viewing_scene_process.cxx
--#include <string>
--#include <iostream>
--#include <cmath>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for generating cameras that view a scene
--//
--// \author J.L. Mundy
--// \date January 23, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vpgl/vpgl_perspective_camera.h>
--#include <bpgl/algo/bpgl_project.h>
--#include <vnl/vnl_math.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--//:global variables
--namespace boxm_camera_viewing_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//:sets input and output types
--bool boxm_camera_viewing_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_camera_viewing_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";// the scene
--  input_types_[1] = "vcl_string";//the camera type, e.g. perspective
--  input_types_[2] = "double";//camera elevation degrees
--  input_types_[3] = "double";//camera azimuth degrees
--  input_types_[4] = "double";//radius
--
--  input_types_[5] = "unsigned";//image ni
--  input_types_[6] = "unsigned";//image nj
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "vpgl_camera_double_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:creates a scene from parameters
--bool boxm_camera_viewing_scene_process(bprb_func_process& pro)
--{
--  if ( !pro.verify_inputs()) {
--    std::cout << pro.name() << "boxm_camera_viewing_scene_process: invalid inputs" << std::endl;
--    return false;
--  }
--  using namespace boxm_camera_viewing_scene_process_globals;
--  boxm_scene_base_sptr scene_ptr = pro.get_input<boxm_scene_base_sptr>(0);
--  std::cout<<"h";
--  if (!scene_ptr) return false;
--  std::cout<<"hi";
--  vgl_box_3d<double> bb =  scene_ptr->get_world_bbox();
--
--  std::string cam_type = pro.get_input<std::string>(1);
--  if (cam_type!="vpgl_perspective_camera")
--    return false; //later other camera types
--  auto elevation = pro.get_input<double>(2);
--  auto azimuth = pro.get_input<double>(3);
--  auto radius = pro.get_input<double>(4);
--
--  auto ni = pro.get_input<unsigned>(5);
--  auto nj = pro.get_input<unsigned>(6);
--  auto dni = static_cast<double>(ni), dnj = static_cast<double>(nj);
--  //
--  //find a camera that will project the scene bounding box
--  //entirely inside the image
--  //
--  // 1) determine the stare point (center of bounding box)
--  vgl_point_3d<double> cn = bb.centroid();
--  vgl_homg_point_3d<double> stpt(cn.x(), cn.y(), cn.z());
--
--  // 2) determine camera center
--  // the viewsphere radius is set to 10x the bounding box diameter
--  //double w = bb.width(), h = bb.height(), d = bb.depth();
--  double r = radius;//std::sqrt(w*w + h*h + d*d);
--  //r *=10;
--  double deg_to_rad = vnl_math::pi_over_180;
--  double el = elevation*deg_to_rad, az = azimuth*deg_to_rad;
--  double cx = r*std::sin(el)*std::cos(az);
--  double cy = r*std::sin(el)*std::sin(az);
--  double cz = r*std::cos(el);
--  vgl_point_3d<double> cent(cx+cn.x(), cy+cn.y(), cz);
--
--  // 3) start with a unit focal length and position the camera
--  vpgl_calibration_matrix<double> K(1.0, vgl_point_2d<double>(ni/2, nj/2));
--  vgl_rotation_3d<double> R;
--  auto* cam =
--    new vpgl_perspective_camera<double>(K, cent, R);
--
--  //stare at the center of the scene
--  vgl_vector_3d<double> up(0.0, 1.0, 0.0);
--  if (std::fabs(el)<1.0e-3)
--    cam->look_at(stpt, up);
--  else
--    cam->look_at(stpt);
--
--  //4) Adjust the focal length so that the box projects into the image
--  // project the bounding box
--  vgl_box_2d<double> image_bb = bpgl_project::project_bounding_box(*cam, bb);
--  // get 2-d box diameter and image diameter
--  double bw = image_bb.width(), bh = image_bb.height();
--  double bd = std::sqrt(bw*bw + bh*bh);
--  double id = std::sqrt(dni*dni + dnj*dnj);
--  //find the adjusted focal length
--  double f = id/bd;
--  K.set_focal_length(f);
--  cam->set_calibration(K);
--
--  std::cout<<"Camera  :" <<*cam<<std::endl;
--  pro.set_output_val<vpgl_camera_double_sptr>(0, cam);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
-deleted file mode 100644
-index 82051affab..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_clean_scene_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for removing any previously created scene data from disk
--//
--// \author Daniel Crispell
--// \date Feb 18, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene_parser.h>
--
--//:global variables
--namespace boxm_clean_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned int n_inputs_ = 1;
--  constexpr unsigned int n_outputs_ = 0;
--}
--
--//:sets input and output types
--bool boxm_clean_scene_process_cons(bprb_func_process& pro)
--{
--  //set output types
--  using namespace boxm_clean_scene_process_globals;
--  //process takes 1 input
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  return true;
--}
--
--//: removes data previously associated with scene
--bool boxm_clean_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_clean_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_clean_scene_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_clean_scene_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->clean_scene();
--      break;
--    }
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->clean_scene();
--      break;
--    }
--   case BOXM_APM_MOB_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->clean_scene();
--      break;
--    }
--   default:
--    std::cout << "boxm_clean_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
-deleted file mode 100644
-index 0129877c53..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
-+++ /dev/null
-@@ -1,219 +0,0 @@
--// This is brl/bseg/boxm/pro/processes/boxm_construct_scene_from_image_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief Process to construct an ideal scene for testing
--//
--// \author J.L. Mundy
--// \date January 23, 2010
--// \verbatim
--//  Modifications
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/boxm_sample.h>
--#include <vil/vil_convert.h>
--#include <vil/vil_image_view_base.h>
--#include <vil/vil_image_view.h>
--#include <vgl/vgl_box_3d.h>
--
--namespace boxm_construct_scene_from_image_process_globals
--{
--  // The image area should be a multiple of area unit, e.g. 64.
--  // This granularity is useful for parallel implementation
--  template <class T>
--  void tree_from_image(vil_image_view<float> const& image,
--                       unsigned area_unit,
--                       unsigned& base_ni, unsigned& base_nj,
--                       boct_tree<short, T >*& tree)
--  {
--    tree = nullptr;
--    unsigned ni = image.ni(), nj = image.nj();
--    // find a square arrangement consistent with area unit
--    auto gsize = static_cast<double>(area_unit);
--    auto gwidth = static_cast<unsigned>(std::sqrt(gsize));
--    unsigned gheight = area_unit/gwidth;
--    if (gwidth*gheight!=gsize)
--      return;//maybe fixup later to handle all situations
--    unsigned mni = (ni/gwidth)*gwidth, mnj = (nj/gheight)*gheight;
--    double min_dim = mni;
--    if (mnj<min_dim)
--      min_dim = mnj;
--    double dlev = std::log(min_dim)/std::log(2.0);
--    auto n_levels = static_cast<unsigned>(dlev+1.0);
--
--    //note that tree is being constructed in local coordinates
--    float rni = 1.0f/static_cast<float>(mni), rnj =1.0f/static_cast<float>(mnj);
--    base_ni = mni; base_nj = mnj;
--    std::vector<boct_loc_code<short> > leaf_codes;
--    std::vector<float> image_int;
--    float upper_v=float(mnj-1)*rnj;
--    for (unsigned j=0; j<mnj; ++j)
--      for (unsigned i=0; i<mni; ++i)
--      {
--        float u = static_cast<float>(i)*rni;
--        float v = upper_v-static_cast<float>(j)*rnj;
--        vgl_point_3d<double> p(u, v, 0.0f);
--        boct_loc_code<short> loc(p, n_levels-1);
--        leaf_codes.push_back(loc);
--        image_int.push_back(image(i,j));
--      }
--    //construct leaves
--    std::vector<boct_tree_cell<short, T > > leaves;
--    for (auto & leaf_code : leaf_codes) {
--      boct_tree_cell<short, T > leaf(leaf_code);
--      leaves.push_back(leaf);
--    }
--
--    //construct tree from leaves
--    auto *init_tree =
--      new boct_tree<short, T >(n_levels, 0);
--    boct_tree_cell<short, T > *root =
--      init_tree->construct_tree(leaves, init_tree->number_levels());
--
--    // construct full tree with leaves and root
--    //set the global bounding box, assuming a box with depth ni
--    vgl_box_3d<double> box;
--    vgl_point_3d<double> p0(0,0,0);
--    vgl_point_3d<double> p1(mni, mnj, mni);
--    box.add(p0); box.add(p1);
--    tree = new boct_tree<short, T >(root, init_tree->number_levels());
--    tree->set_bbox(box);
--    delete init_tree;
--
--    // fill the leaves with data
--    std::vector<boct_tree_cell<short, T >* > tleaves;
--    tleaves = tree->leaf_cells();
--    std::size_t i = 0;
--    auto lit =
--      tleaves.begin();
--    for (; lit!= tleaves.end(); ++lit, ++i)
--    {
--      boct_loc_code<short> code = (*lit)->get_code();
--      bool found = false;
--      unsigned found_k = 0;
--      for (unsigned k = 0; k<leaf_codes.size()&&!found; ++k)
--        if (code == leaf_codes[k]) {
--          found = true;
--          found_k = k;
--        }
--      if (auto * cell_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >* >(*lit))
--      {
--        if (found) {
--          boxm_sample<BOXM_APM_SIMPLE_GREY> data(1.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(image_int[found_k],0.0008f));
--          cell_grey_ptr->set_data(data);
--        }
--        else {
--          boxm_sample<BOXM_APM_SIMPLE_GREY> data(0.0f,boxm_sample<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.0f,0.0008f));
--          cell_grey_ptr->set_data(data);
--        }
--      }
--      else if (auto * cell_mog_grey_ptr = reinterpret_cast<boct_tree_cell<short, boxm_sample<BOXM_APM_MOG_GREY> >* >(*lit))
--      {
--        if (found) {
--          boxm_sample<BOXM_APM_MOG_GREY> data(1.0f);
--          typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_processor aproc;
--          aproc::update(data.appearance(),image_int[found_k],1.0);
--          cell_mog_grey_ptr->set_data(data);
--        }
--        else {
--          boxm_sample<BOXM_APM_MOG_GREY> data(0.0f);
--          cell_mog_grey_ptr->set_data(data);
--        }
--      }
--      else if (auto * cell_float_ptr
--               =reinterpret_cast<boct_tree_cell<short, float >* >(*lit))
--      {
--        if (found) {
--          float data(1.0f);
--          cell_float_ptr->set_data(data);
--        }
--      }
--    }
--  }
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_construct_scene_from_image_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_construct_scene_from_image_process_globals;
--
--  //input[0]: The image view
--  //input[1]: appearance model type
--  //input[2]: scene directory
--  //input[3]: scene xml path
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vil_image_view_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--
--  //output[0]: The scene
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0]=  "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_construct_scene_from_image_process(bprb_func_process& pro)
--{
--  using namespace boxm_construct_scene_from_image_process_globals;
--
--  if ( !pro.verify_inputs()){
--    std::cerr << pro.name() << "boxm_construct_scene_from_image_process: invalid inputs\n";
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  vil_image_view_base_sptr image = pro.get_input<vil_image_view_base_sptr>(i++);
--  std::string app_type =  pro.get_input<std::string>(i++);
--  std::string scene_dir =  pro.get_input<std::string>(i++);
--  std::string xml_path =  pro.get_input<std::string>(i++);
--  if (image == nullptr) {
--    std::cerr << "boxm_construct_scene_from_image_process: null image value, cannot run\n";
--    return false;
--  }
--
--  vil_image_view<float> img = *vil_convert_cast(float(), image);
--  if (image->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
--    vil_math_scale_values(img,1.0/255.0);
--
--  unsigned base_ni =0, base_nj=0;
--  std::string block_prefix = "ideal";
--  boxm_scene_base_sptr scene_base = nullptr;
--  if (app_type == "simple_grey")
--  {
--    typedef boxm_sample<BOXM_APM_SIMPLE_GREY> data_type;
--    boct_tree<short, data_type>* tree = nullptr;
--    tree_from_image<data_type>(img, 16, base_ni, base_nj,tree);
--    if (tree == nullptr) return false;
--    boxm_block<boct_tree<short, data_type> >* blk =
--      new boxm_block<boct_tree<short, data_type> >(tree->bounding_box(), tree);
--    vgl_box_3d<double> bb = blk->bounding_box();
--    vgl_point_3d<double> origin(0,0,0);
--    vgl_vector_3d<double> block_dim(bb.width(),bb.height(),bb.depth());
--    vgl_vector_3d<unsigned> world_dim(1,1,1);
--    auto* scene
-- = new boxm_scene<boct_tree<short, data_type> >(origin, block_dim, world_dim);
--    scene->set_appearance_model(BOXM_APM_SIMPLE_GREY);
--    scene->set_block(vgl_point_3d<int>(0,0,0), blk);
--    scene->set_path(scene_dir, block_prefix);
--    scene->write_scene(xml_path);
--    scene->write_active_block();
--    scene_base = scene;
--  }
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene_base);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
-deleted file mode 100644
-index d2abb94b67..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
-+++ /dev/null
-@@ -1,218 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_create_scene_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for creating a new boxm_scene when there is not a saved one.
--//        It receives the parameters from a parameter file in XML
--//
--// \author Gamze Tunali
--// \date Apr 21, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene_parser.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--//:global variables
--namespace boxm_create_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//:sets input and output types
--bool boxm_create_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:creates a scene from parameters
--bool boxm_create_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_create_scene_process_globals;
--  std::string fname = pro.get_input<std::string>(0);
--
--  boxm_scene_parser parser;
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--  scene_ptr->load_scene(fname, parser);
--  std::cout << "Scene path: " << scene_ptr->filename()<< '\n'
--           << "Scene appearance: " <<scene_ptr->appearence_model()<< std::endl;
--
--  if (scene_ptr->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--    else {
--      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      std::cout<<"Multi Bin set"<<std::endl;
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_MOB_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--    else {
--      std::cout<<"Multi Bin for BOXM_APM_MOB_GREY is not defined yet"<<std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--#if 0
--    else {
--      typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_SIMPLE_GREY> > tree_type;
--      boxm_scene<tree_type>* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      std::cout<<"Multi Bin set"<<std::endl;
--      scene_ptr = scene;
--    }
--#endif
--  }
--  else if (scene_ptr->appearence_model() == BOXM_FLOAT) {
--      if (!scene_ptr->multi_bin())
--      {
--        typedef boct_tree<short,float> tree_type;
--        auto* scene = new boxm_scene<tree_type>();
--        scene->load_scene(fname);
--        scene_ptr = scene;
--        std::cout << "Scene path: " << scene->filename()<< std::endl;
--      }
--  }
--  else if (scene_ptr->appearence_model() == VNL_FLOAT_3) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,vnl_vector_fixed<float, 3> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      scene_ptr = scene;
--      std::cout << "Loading scene of type vnl_float_3" << '\n'
--               << "Scene path: " << scene->filename()<< std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == VNL_FLOAT_10) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,vnl_vector_fixed<float, 10> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      scene_ptr = scene;
--      std::cout << "Loading scene of type vnl_float_10" << '\n'
--               << "Scene path: " << scene->filename()<< std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_BOOL) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bool> tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(fname);
--      scene_ptr = scene;
--      std::cout << "Scene path: " << scene->filename()<< std::endl;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BSTA_MOG_F1) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BSTA_GAUSS_F1) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bsta_num_obs<bsta_gauss_sf1> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_FLOAT) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_edge_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_LINE) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BOXM_SCALAR_FLOAT) {
--    typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
--    auto* scene = new boxm_scene<tree_type>();
--    scene->load_scene(parser);
--    scene_ptr = scene;
--  }
--  else {
--    std::cerr << "boxm_create_scene_process: undefined APM type\n";
--    return false;
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
-deleted file mode 100644
-index dba8e9687e..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
-+++ /dev/null
-@@ -1,102 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_force_write_blocks_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--//:
--// \file
--// \brief A process for removing any previously created scene data from disk
--//
--// \author Daniel Crispell
--// \date Feb 18, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/boxm_scene_parser.h>
--
--//:global variables
--namespace boxm_force_write_blocks_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned int n_inputs_ = 1;
--  constexpr unsigned int n_outputs_ = 0;
--}
--
--//:sets input and output types
--bool boxm_force_write_blocks_process_cons(bprb_func_process& pro)
--{
--  //set output types
--  using namespace boxm_force_write_blocks_process_globals;
--  //process takes 1 input
--  //input[0]: The scene
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  return true;
--}
--
--//: removes data previously associated with scene
--bool boxm_force_write_blocks_process(bprb_func_process& pro)
--{
--  using namespace boxm_force_write_blocks_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << "boxm_force_write_blocks_process: The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  // check the input validity
--  if (scene == nullptr) {
--    std::cout << "boxm_force_write_blocks_process: scene is null, cannot run" << std::endl;
--    return false;
--  }
--
--  switch (scene->appearence_model())
--  {
--   case BOXM_APM_MOG_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->force_write_blocks();
--      break;
--    }
--   case BOXM_APM_SIMPLE_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->force_write_blocks();
--      break;
--    }
--   case BOXM_APM_MOB_GREY:
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      s->force_write_blocks();
--      break;
--    }
--   default:
--    std::cout << "boxm_force_write_blocks_process: undefined APM type" << std::endl;
--    return false;
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
-deleted file mode 100644
-index 59808debc7..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
-+++ /dev/null
-@@ -1,73 +0,0 @@
--// This is brl/bseg/boxm/pro/processes/boxm_load_scene_process.cxx
--//:
--// \file
--// \brief A class for obtaining roc curve from change detection results.
--//
--// \author Gamze Tunali
--// \date April 14, 2009
--
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--namespace boxm_load_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm_load_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_load_scene_process_globals;
--
--  //process takes 1 input
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  // process has 1 output:
--  // output[0]: scene sptr
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_load_scene_process(bprb_func_process& pro)
--{
--  using namespace boxm_load_scene_process_globals;
--
--  if ( pro.n_inputs() < n_inputs_ ){
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned i = 0;
--  std::string scene_file = pro.get_input<std::string>(i++);
--
--  boxm_scene_base_sptr scene= new boxm_scene_base();
--  boxm_scene_parser parser;
--  scene->load_scene(scene_file, parser);
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--    auto *s = new boxm_scene<tree_type>();
--    s->load_scene(parser);
--   // scene.unref(scene);
--    scene = s;
--  } else {
--    std::cout << "boxm_load_scene_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  unsigned j = 0;
--  // store scene smaprt pointer
--  pro.set_output_val<boxm_scene_base_sptr>(j++, scene);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
-deleted file mode 100644
-index b250a33a61..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
-+++ /dev/null
-@@ -1,103 +0,0 @@
--// This is brl/bseg/boxm/pro/processes/boxm_proj_local_cam_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for clipping and image based on a 3D bounding box.
--//        -  Input:
--//             - Image path (string)
--//             - boxm_voxel_world_sptr
--//
--//        -  Output:
--//             - modified rational camera "vpgl_camera_double_sptr"
--//             - clipped image area (NITF) "vil_image_view_base_sptr"
--//
--//        -  Params:
--//             -geographic uncertainty (error) in meters
--//
--// \author  Gamze D. Tunali
--// \date    Feb 19, 2008
--// \verbatim
--//  Modifications
--//   Brandon Mayer - Jan 28, 2009 - converted process-class to function to conform with new boxm_process architecture.
--// \endverbatim
--
--
--#include <brip/brip_roi.h>
--
--//#include <vil/file_formats/vil_nitf2_image.h> // unused?
--//#include <vil/vil_image_view_base.h> // unused?
--#include <vpgl/vpgl_local_rational_camera.h>
--
--#include <bprb/bprb_parameters.h>
--
--//: globals variables and functions
--namespace boxm_proj_local_cam_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--//: set input and output types
--// this process takes 4 inputs:
--// the camera and the (x,y,z) input coordinates
--// this process takes 2 outputs:
--// the (u,v) output coordinates
--bool boxm_proj_local_cam_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_proj_local_cam_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned  i=0;
--  input_types_[i++] = "vpgl_camera_double_sptr";   // rational camera
--  input_types_[i++] = "float";   // x
--  input_types_[i++] = "float";   // y
--  input_types_[i++] = "float";   // z
--
--  std::vector<std::string> output_types_(n_outputs_);
--  unsigned j=0;
--  output_types_[j++] = "float"; // u
--  output_types_[j++] = "float"; // v
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--bool boxm_proj_local_cam_process(bprb_func_process& pro)
--{
--  using namespace boxm_proj_local_cam_process_globals;
--  //static const parameters
--  static const std::string error = "error";
--
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << " The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  // get the inputs:
--  unsigned i = 0;
--  // camera
--  vpgl_camera_double_sptr camera = pro.get_input<vpgl_camera_double_sptr>(i++);
--  float X=0.0,Y=0.0,Z=0.0;
--  //voxel_world
--  X = pro.get_input<float>(i++);
--  Y = pro.get_input<float>(i++);
--  Z = pro.get_input<float>(i++);
--
--  auto* rat_camera =
--    dynamic_cast<vpgl_local_rational_camera<double>*> (camera.as_pointer());
--  if (!rat_camera) {
--    std::cerr << "The camera input is not a rational camera\n";
--    return false;
--  }
--
--  double u=0,v=0;
--  rat_camera->project((double)X,(double)Y,(double)Z,u,v);
--  //Store outputs
--  unsigned j = 0;
--  // update the camera and store
--  pro.set_output_val<float>(j++, float(u));
--  pro.set_output_val<float>(j++, float(v));
--
--  std::cout<<"(u,v):"<<u<<','<<v<<std::endl;
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx b/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
-deleted file mode 100644
-index 0488a2cbdb..0000000000
---- a/contrib/brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
-+++ /dev/null
-@@ -1,148 +0,0 @@
--//This is brl/bseg/boxm/pro/processes/boxm_upload_mesh_process.cxx
--#include <string>
--#include <iostream>
--#include <sstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for populating the octree with meshes.
--//         Meshes are in ply format and the grid will be filled with 0's at the faces
--//         of the meshes.
--// \author Gamze D. Tunali
--// \date   July 14, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_parameters.h>
--
--#include <boxm/boxm_apm_traits.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/algo/boxm_upload_mesh.h>
--#include <boxm/algo/boxm_fill_in_mesh.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree.h>
--#include <vul/vul_file_iterator.h>
--#include <vul/vul_file.h>
--#include <vul/vul_string.h>
--
--#include <imesh/imesh_mesh.h>
--#include <imesh/imesh_fileio.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--namespace boxm_upload_mesh_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//: set input and output types
--bool boxm_upload_mesh_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_upload_mesh_process_globals;
--
--  // process takes 4 inputs and no output
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i=0;
--  input_types_[i++]="vcl_string";           //the directory for ply files
--  input_types_[i++]="boxm_scene_base_sptr"; //scene to be uploaded
--  input_types_[i++]="bool";                 //true, if mesh vertices are in geo coordinates
--  input_types_[i++]="vcl_string";                 //true, if mesh vertices are in geo coordinates
--
--  std::vector<std::string> output_types_(n_outputs_);
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: Execute the process
--bool boxm_upload_mesh_process(bprb_func_process& pro)
--{
--  using namespace boxm_upload_mesh_process_globals;
--  // check number of inputs
--  if (pro.input_types().size() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  unsigned i=0;
--  std::string input_path = pro.get_input<std::string>(i++);
--  boxm_scene_base_sptr scene = pro.get_input<boxm_scene_base_sptr>(i++);
--  bool use_lvcs = pro.get_input<bool>(i++);
--  std::string draw_or_fill = pro.get_input<std::string>(i++);
--
--  if (!vul_file::is_directory(input_path)) {
--    std::cerr << "In boxm_upload_mesh_process -- input path " << input_path<< "is not valid!\n";
--    return false;
--  }
--
--  // get all the files in the directory
--  std::stringstream glob;
--  glob << input_path << "/*.ply*";
--
--  std::vector<imesh_mesh> meshes;
--  for (vul_file_iterator file_it = glob.str().c_str(); file_it; ++file_it)
--  {
--    std::string file(file_it());
--    std::string file_format = vul_file::extension(file);
--    vul_string_upcase(file_format);
--
--
--    std::cout << "format = " << file_format << '\n'
--             << "file = " << file << '\n';
--    // call appropriate load functions to load the M
--    imesh_mesh mesh;
--    if (file_format == ".PLY")
--      imesh_read(file, mesh);
--    else if (file_format == ".PLY2")
--      imesh_read_ply2(file, mesh);
--
--    meshes.push_back(mesh);
--  }
--  if (scene->appearence_model() == BOXM_APM_MOG_GREY) {
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--
--      boxm_sample<BOXM_APM_MOG_GREY> val(0,boxm_utils::obtain_mog_grey_unit_mode());
--      if (draw_or_fill=="draw")
--        std::cout<<"Not yet";
--        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
--      else if (draw_or_fill=="fill")
--        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, meshes, use_lvcs, val);
--    }
--    else
--      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
--  }
--  if (scene->appearence_model() == BOXM_APM_SIMPLE_GREY) {
--    if (!scene->multi_bin())
--    {
--      typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--      auto *s = static_cast<boxm_scene<tree_type>*> (scene.as_pointer());
--      boxm_simple_grey simplegrey(1.0f,0.1f,1.0f);
--      boxm_sample<BOXM_APM_SIMPLE_GREY> val(1,simplegrey);
--      if (draw_or_fill=="draw")
--        std::cout<<"Not yet";
--        //boxm_upload_mesh_into_scene<short, boxm_sample<BOXM_APM_MOG_GREY> >(*s, mesh, use_lvcs, val);
--      else if (draw_or_fill=="fill")
--        boxm_fill_in_mesh_into_scene<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >(*s, meshes, use_lvcs, val);
--    }
--    else
--      std::cout << "boxm_upload_mesh_process: multi bin is not implemented yet" << std::endl;
--  }
--  else {
--    std::cout << "boxm_upload_mesh_process: undefined APM type" << std::endl;
--    return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index f37ad237ce..0000000000
---- a/contrib/brl/bseg/boxm/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_pro_test_include test_include.cxx )
--target_link_libraries( boxm_pro_test_include boxm_pro)
-diff --git a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx b/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
-deleted file mode 100644
-index 7a3d47df60..0000000000
---- a/contrib/brl/bseg/boxm/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/pro/boxm_processes.h>
--#include <boxm/pro/boxm_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/sample/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/CMakeLists.txt
-deleted file mode 100644
-index 42618cc7ca..0000000000
---- a/contrib/brl/bseg/boxm/sample/CMakeLists.txt
-+++ /dev/null
-@@ -1,29 +0,0 @@
--# brl/bseg/boxm/sample/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_sample_sources
--    boxm_edge_sample.h                        boxm_edge_sample.hxx
--    boxm_edge_tangent_sample.h                boxm_edge_tangent_sample.hxx
--    boxm_inf_line_sample.h                    boxm_inf_line_sample.hxx
--    boxm_opt2_sample.h                        boxm_opt2_sample.hxx
--    boxm_opt3_sample.h                        boxm_opt3_sample.hxx
--    boxm_plane_obs.h                          boxm_plane_obs.hxx
--    boxm_rt_sample.h                          boxm_rt_sample.hxx
--    boxm_sample.h                             boxm_sample.hxx
--    boxm_sample_multi_bin.h                   boxm_sample_multi_bin.hxx
--    boxm_scalar_sample.h                      boxm_scalar_sample.hxx
--    boxm_vis_implicit_sample.h
--    boxm_update_sample.h
--    dummy.cxx
--   )
--
--aux_source_directory(Templates boxm_sample_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_sample LIBRARY_SOURCES ${boxm_sample_sources})
--target_link_libraries(boxm_sample boxm ${VXL_LIB_PREFIX}vgl_io bsta ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--#processors for the samples
--add_subdirectory(algo)
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index a08cc93e31..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_edge_sample<float>);
--BOCT_TREE_INSTANTIATE(short,boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index 130866a26d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
--BOCT_TREE_INSTANTIATE(short,boxm_inf_line_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 8d3ee3d65a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index ca506845c1..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index c1d7480b1c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOB_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 5eaa3da056..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--// tree with alpha and appearance combined
--BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_MOG_GREY>);
--
--// tree with appearance
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_INSTANTIATE(short, apm_datatype);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-deleted file mode 100644
-index ef07d67c7a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--BOCT_TREE_INSTANTIATE(short, boxm_sample<BOXM_APM_SIMPLE_GREY>);
--
--// tree with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_INSTANTIATE(short, apm_datatype);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index b45fc2a401..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--BOCT_TREE_INSTANTIATE(short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 7c93436b6a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree+short.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_scalar_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index 8c4d0a0f82..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_sample<float>);
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index 55b487a7aa..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_edge_tangent_sample<float>);
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_inf_line_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 39216280e0..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 3d0b6e71a5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index 9a5432b934..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mob_grey );
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 58cc1cfacf..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_CELL_INSTANTIATE(short,apm_datatype );
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-deleted file mode 100644
-index 28198f869f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample+BOXM_APM_SIMPLE_GREY--.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_SIMPLE_GREY> boxm_sample_simple_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_simple_grey );
--
--// tree with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--BOCT_TREE_CELL_INSTANTIATE(short, apm_datatype);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 1b9ee1e0de..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample_multi_bin.h"
--
--typedef boxm_sample_multi_bin<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_sample_mog_grey );
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 78c61bf35e..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell+short.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_scalar_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
-deleted file mode 100644
-index 13ae4934e9..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boxm_edge_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
--
--typedef boxm_aux_edge_sample<float> aux_sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index 3744b8ee6f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--
--typedef boxm_edge_tangent_sample<float> aux_sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,aux_sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
-deleted file mode 100644
-index 08ad36f2ea..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_inf_line_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boxm_inf_line_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 18262443a5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--typedef boxm_opt2_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 1784facefe..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--
--typedef boxm_rt_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-deleted file mode 100644
-index 83cf840aa8..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOB_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_MOB_GREY> boxm_sample_mob_grey;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mob_grey);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 68c063579f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include "boxm/boxm_apm_traits.h"
--#include "boxm/sample/boxm_sample.h"
--
--typedef boxm_sample<BOXM_APM_MOG_GREY> boxm_sample_mog_grey;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,boxm_sample_mog_grey);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 81c19507f9..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boct_tree_cell_reader+short.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--typedef boxm_scalar_sample<float> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
-deleted file mode 100644
-index 5e771c97e2..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_edge_sample+float-.boxm_aux_edge_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_edge_sample<float>,boxm_aux_edge_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index a73d09d6f5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_inf_line_sample+float-.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_inf_line_sample<float>,boxm_edge_tangent_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index c134345620..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOB_GREY-.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOB_GREY>,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index b8aa7777ee..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 918a3be765..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
-deleted file mode 100644
-index 70bf413567..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.float-.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
-deleted file mode 100644
-index 6a0f7d745c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt2_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt2_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
-deleted file mode 100644
-index 03014e67ab..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_rt_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_rt_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
-deleted file mode 100644
-index 1b75036c3b..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_scalar_sample+float--.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_scalar_sample<float>);
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_scalar_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
-deleted file mode 100644
-index a27805ad73..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.float-.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
-deleted file mode 100644
-index dc6a48e38b..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_aux_scene+short.float.boxm_edge_tangent_sample+float--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,float,boxm_edge_tangent_sample<float>);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index c814f6a8fe..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boct_tree<short,boxm_edge_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
--BOXM_BLOCK_INSTANTIATE(aux_tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index 802a8ca615..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--
--typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
-deleted file mode 100644
-index 9ef6e210dd..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_inf_line_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
-deleted file mode 100644
-index dc6e57af68..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_opt2_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--typedef boct_tree<short,boxm_opt2_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
-deleted file mode 100644
-index ef11cd85a7..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_rt_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--typedef boct_tree<short,boxm_rt_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index 647e553d5e..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index b5e4f8cce0..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--
--BOXM_BLOCK_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index 5a2482adbc..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
--
--// block with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_BLOCK_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 6e13f9977a..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
-deleted file mode 100644
-index 0348b21996..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block+boct_tree+short.boxm_scalar_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--typedef boct_tree<short,boxm_scalar_sample<float> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index 0b79668c5f..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_edge_sample<float> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boct_tree<short,boxm_aux_edge_sample<float> >  aux_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index ea335e591d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_edge_tangent_sample<float> >  aux_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(aux_tree_type);
--
--typedef boct_tree<short,boxm_inf_line_sample<float> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index 7c96bfeeee..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 052fa82c04..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index a9d55be913..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--
--// block iterator with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 25f9ca6e61..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_block_iterator+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short,boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
-deleted file mode 100644
-index d68f374c40..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_sample+float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/sample/boxm_edge_sample.hxx>
--
--BOXM_EDGE_SAMPLE_INSTANTIATE(float);
--BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
-deleted file mode 100644
-index a00d2268b5..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_edge_tangent_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_edge_tangent_sample.hxx>
--
--BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
-deleted file mode 100644
-index f957308804..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_inf_line_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_inf_line_sample.hxx>
--
--BOXM_INF_LINE_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
-deleted file mode 100644
-index 66ceeacd2d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_opt2_sample+float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/sample/boxm_opt2_sample.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_OPT2_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
-deleted file mode 100644
-index c6e45bdcca..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_plane_obs+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_plane_obs.hxx>
--
--BOXM_PLANE_OBS_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
-deleted file mode 100644
-index 1fc6db3c56..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_rt_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_rt_sample.hxx>
--
--BOXM_RT_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
-deleted file mode 100644
-index 4ee2f52816..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOB_GREY-.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_beta.h>
--
--BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOB_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index d1054422d9..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <bsta/io/bsta_io_mixture.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--
--BOXM_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
-deleted file mode 100644
-index e3c225ae4d..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample+BOXM_APM_SIMPLE_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.hxx>
--
--BOXM_SAMPLE_INSTANTIATE(BOXM_APM_SIMPLE_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index 4e2b56c696..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_sample_multi_bin+BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample_multi_bin.hxx>
--
--BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
-deleted file mode 100644
-index a9552e4b00..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scalar_sample+float-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm/sample/boxm_scalar_sample.hxx>
--#include <boxm/boxm_apm_traits.h>
--
--BOXM_SCALAR_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
-deleted file mode 100644
-index 4fd83d2d66..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_sample+float---.cxx
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_sample.h>
--
--typedef boct_tree<short,boxm_edge_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
--
--typedef boct_tree<short,boxm_aux_edge_sample<float> > aux_tree;
--BOXM_SCENE_INSTANTIATE(aux_tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-deleted file mode 100644
-index 882f421e87..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_edge_tangent_sample+float---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boct_tree<short,boxm_edge_tangent_sample<float> > aux_tree;
--BOXM_SCENE_INSTANTIATE(aux_tree);
--
--typedef boct_tree<short,boxm_inf_line_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
-deleted file mode 100644
-index dfec334150..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_opt2_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--
--typedef boct_tree<short,boxm_opt2_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
-deleted file mode 100644
-index cd3c475545..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_rt_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_rt_sample.h>
--
--typedef boct_tree<short,boxm_rt_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-deleted file mode 100644
-index db72e7c8ea..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 6d21678187..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_SCENE_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-deleted file mode 100644
-index 52e5afb01c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
--
--// scene with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--BOXM_SCENE_INSTANTIATE(apm_tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index 262d6e4f89..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> >  tree_type;
--BOXM_SCENE_INSTANTIATE(tree_type);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
-deleted file mode 100644
-index 4a2c0c7437..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.boxm_scalar_sample+float---.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--typedef boct_tree<short,boxm_scalar_sample<float> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx b/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
-deleted file mode 100644
-index b727cb7d12..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/boxm_scene+boct_tree+short.int--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.hxx>
--
--typedef boct_tree<short,int > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
-deleted file mode 100644
-index fc06a01419..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_edge_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--typedef boct_tree<short, boxm_aux_edge_sample<float> > aux_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
-deleted file mode 100644
-index 0b4f55a413..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_edge_tangent_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_edge_tangent_sample<float> > aux_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<aux_tree_type>*);
--
--typedef boct_tree<short, boxm_inf_line_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
-deleted file mode 100644
-index 1372664c8c..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt2_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_opt2_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
-deleted file mode 100644
-index 5409ed1d26..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_rt_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_rt_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
-deleted file mode 100644
-index 3508b23e74..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOB_GREY---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOB_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
-deleted file mode 100644
-index 9676fc11a4..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_MOG_GREY---~-.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
-deleted file mode 100644
-index e8c9902c7e..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample+BOXM_APM_SIMPLE_GREY---~-.cxx
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample.h>
--
--typedef boct_tree<short, boxm_sample<BOXM_APM_SIMPLE_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
--
--// scene with appearance
--typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--typedef boct_tree<short,apm_datatype >  apm_tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<apm_tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
-deleted file mode 100644
-index 4cadf24760..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_sample_multi_bin+BOXM_APM_MOG_GREY---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--
--typedef boct_tree<short, boxm_sample_multi_bin<BOXM_APM_MOG_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx b/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
-deleted file mode 100644
-index f013383f50..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_scalar_sample+float---~-.cxx
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_scalar_sample.h>
--#include <boct/boct_tree.h>
--
--typedef boct_tree<short, boxm_scalar_sample<float> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx b/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
-deleted file mode 100644
-index 116b748109..0000000000
---- a/contrib/brl/bseg/boxm/sample/Templates/vil_image_view+boxm_inf_line_sample+float--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <vil/vil_image_view.hxx>
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--typedef boxm_inf_line_sample<float> sample;
--VIL_IMAGE_VIEW_INSTANTIATE(sample);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
-deleted file mode 100644
-index c758e9f2a4..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
-+++ /dev/null
-@@ -1,18 +0,0 @@
--# brl/bseg/boxm/util/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_sample_algo_sources
--    boxm_mob_grey_processor.h        boxm_mob_grey_processor.cxx
--    boxm_mog_grey_processor.h        boxm_mog_grey_processor.cxx
--    boxm_simple_grey_processor.h     boxm_simple_grey_processor.cxx
--    boxm_sigma_normalizer.h          boxm_sigma_normalizer.cxx
--   )
--
--aux_source_directory(Templates boxm_sample_algo_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_sample_algo LIBRARY_SOURCES ${boxm_sample_algo_sources})
--
--target_link_libraries(boxm_sample_algo boxm_sample boxm boxm_util bsta bsta_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vbl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 994d8628d9..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--BOCT_TREE_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 10fc203f38..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boct/boct_tree_cell.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--BOCT_TREE_CELL_INSTANTIATE(short,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index b5be45d2b1..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boct_tree_cell_reader+short.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree_cell_reader.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boxm_opt3_sample<BOXM_APM_MOG_GREY> sample;
--BOCT_TREE_CELL_READER_INSTANTIATE(short,sample);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 0772000b0d..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_MOG_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_MOG_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-deleted file mode 100644
-index 00af986d6d..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_aux_scene+short.boxm_sample+BOXM_APM_SIMPLE_GREY-.boxm_opt3_sample+BOXM_APM_MOG_GREY--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/boxm_aux_scene.hxx>
--
--BOXM_AUX_SCENE_INSTANTIATE(short,boxm_sample<BOXM_APM_SIMPLE_GREY>,boxm_opt3_sample<BOXM_APM_MOG_GREY>);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index b4aef87f19..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
--BOXM_BLOCK_INSTANTIATE(tree);
--
--#include <boxm/boxm_scene.hxx>
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
-deleted file mode 100644
-index c67fd5c479..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_opt3_sample+BOXM_APM_MOG_GREY-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/sample/boxm_opt3_sample.hxx>
--
--BOXM_OPT3_SAMPLE_INSTANTIATE(BOXM_APM_MOG_GREY);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-deleted file mode 100644
-index e0c8931986..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/boxm_scene+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <boxm/boxm_scene.hxx>
--#include <boct/boct_tree.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boct_tree<short,boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree;
--BOXM_SCENE_INSTANTIATE(tree);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx b/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
-deleted file mode 100644
-index 0bf4864b81..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/Templates/vbl_array_3d+boxm_block+boct_tree+short.boxm_opt3_sample+BOXM_APM_MOG_GREY---~-.cxx
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#include <iostream>
--#include <string>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vbl/vbl_array_3d.hxx>
--#include <vgl/io/vgl_io_point_3d.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_apm_traits.h>
--
--typedef boct_tree<short, boxm_opt3_sample<BOXM_APM_MOG_GREY> > tree_type;
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type>*);
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
-deleted file mode 100644
-index e93ea9b17a..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.cxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#include "boxm_mob_grey_processor.h"
--//:
--// \file
--#include <bsta/algo/bsta_beta_updater.h>
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_beta.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_beta_f1.h>
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: Expected value
--boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype
--boxm_mob_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype const& appear)
--{
--  float total_weight= 0;
--  obs_datatype c = 0;
--  obs_datatype expected = 0;
--
--  //should be components used
--  for (unsigned i = 0; i< appear.num_components(); ++i)
--  {
--    total_weight += appear.weight(i);
--    c += appear.distribution(i).mean() * appear.weight(i);
--  }
--  if (total_weight > 0.0f) {
--    expected = c/total_weight;
--  }
--
--  return expected;
--}
--//: Return probability density of observing pixel values
--float boxm_mob_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
--{
--  if (appear.num_components() ==0) {
--    return 1.00f;
--  }
--  else {
--    return appear.prob_density(obs);
--  }
--}
--
--//: Update with a new sample image
--bool boxm_mob_grey_processor::update( apm_datatype &appear,
--                                      obs_datatype const& obs,
--                                      float const& weight)
--{
--  // the model
--  float init_variance = 0.008f;
--  float g_thresh = 0.025f; // number of std devs from mean sample must be
--
--  //float t_l_u = float(std::sqrt(1-4*init_variance)*0.5);
--  //float lower = 0.5f-t_l_u;
--  //float upper = 0.5f+t_l_u;
--
--  obs_datatype val = obs;
--  //if (obs < lower)
--  //  val = lower+0.000001f;
--  //else if (obs > upper)
--  //  val = upper-0.000001f;
--
--  float alpha, beta;
--  bsta_beta<float>::bsta_beta_from_moments(val, init_variance,alpha,beta);
--  bsta_beta_f1 this_beta(alpha,beta);
--
--  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOB_GREY>::n_beta_modes_;
--
--  typedef bsta_num_obs<bsta_beta_f1> beta_type;
--  typedef bsta_mixture_fixed<beta_type, nmodes> mix_beta;
--
--  // the updater
--  bsta_mix_beta_updater<mix_beta> updater(this_beta, g_thresh, init_variance, nmodes );
--
--  if (weight > 0) {
--    updater(appear, obs);
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
-deleted file mode 100644
-index 8c6c4b46d8..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--// This is brl/bseg/boxm/sample/algo/boxm_mob_grey_processor.h
--#ifndef boxm_mob_grey_processor_h_
--#define boxm_mob_grey_processor_h_
--//:
--// \file
--// \brief A class for a grey-scale-mixture-of-beta processor
--//
--// \author Gamze Tunali
--// \date   Nov 24, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <boxm/boxm_apm_traits.h>
--
--
--class  boxm_mob_grey_processor
--{
-- protected:
--  // convenience typedefs
--  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::apm_datatype apm_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_datatype obs_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOB_GREY>::obs_mathtype obs_mathtype;
--
-- public:
--  static obs_datatype expected_color(apm_datatype const& appear);
--  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
--  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
--};
--
--#endif // boxm_mob_grey_processor_h_
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
-deleted file mode 100644
-index 7c7e011b07..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.cxx
-+++ /dev/null
-@@ -1,286 +0,0 @@
--#include "boxm_mog_grey_processor.h"
--//:
--// \file
--#include <bsta/algo/bsta_adaptive_updater.h>
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gaussian_indep.h>
--#include <bsta/algo/bsta_fit_gaussian.h>
--
--#include <vnl/vnl_random.h>
--
--#include "boxm_sigma_normalizer.h"
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: Expected value
--boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
--boxm_mog_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear)
--{
--  float total_weight= 0;
--  obs_datatype c = 0;
--  obs_datatype expected = 0;
--
--  //should be components used
--  for (unsigned i = 0; i< appear.num_components(); ++i)
--  {
--    total_weight += appear.weight(i);
--    c += appear.distribution(i).mean() * appear.weight(i);
--  }
--  if (total_weight > 0.0f) {
--    expected = c/total_weight;
--  }
--
--  return expected;
--}
--
--//: Return a random sample from the appearance distribution
--boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype
--boxm_mog_grey_processor::sample(boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype const& appear, vnl_random &rand_gen)
--{
--  return appear.sample(rand_gen);
--}
--
--
--//: Return probability density of observing pixel values
--float boxm_mog_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
--{
--  if (appear.num_components() ==0) {
--    return 1.00f;
--  }
--  else {
--    return appear.prob_density(obs);
--  }
--}
--
--//: Update with a new sample image
--bool boxm_mog_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& weight)
--{
--  // the model
--  float init_variance = 0.008f;
--  float min_stddev = 0.030f; //TO UNDERSTAND: changed from 0.02 for dinoRing dataset -dec
--  float g_thresh = 2.5; // number of std devs from mean sample must be
--  bsta_gauss_sf1 this_gauss(0.0f, init_variance);
--
--  const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
--
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--  typedef bsta_mixture_fixed<gauss_type, nmodes> mix_gauss;
--
--  // the updater
--  bsta_mg_grimson_weighted_updater<mix_gauss> updater(this_gauss, nmodes ,g_thresh,min_stddev);
--
--  if (weight > 0) {
--    updater(appear, obs, weight);
--  }
--
--  return true;
--}
--
--void boxm_mog_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
--{
--  std::vector<float> pre(obs.size(),0.0f);
--  compute_appearance(obs,pre,obs_weights,model,min_sigma);
--  return;
--}
--
--void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
--{
--  std::vector<float> pre(obs.size(),0.0f);
--  compute_appearance(obs,pre,obs_weights,model,min_sigma);
--  return;
--}
--
--void boxm_mog_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs,
--                                                  std::vector<float> const&  /*obs_weights*/, // FIXME - unused
--                                                  boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model,
--                                                  float min_sigma)
--{
--  static const unsigned int nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
--  const auto nobs = (unsigned int)obs.size();
--  const float min_var = min_sigma*min_sigma;
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--  const float big_var = big_sigma * big_sigma;
--
--  static boxm_sigma_normalizer sigma_norm(0.1f);
--  for (unsigned int m=0; m<nmodes; ++m) {
--    //float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
--    float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
--
--    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
--    float mode_var = model.distribution(m).var();
--    mode_var *= (unbias_factor*unbias_factor);
--
--    // make sure variance does not get too big
--    if (!(mode_var < big_var)) {
--      mode_var = big_var;
--    }
--    // or too small
--    if (!(mode_var > min_var)) {
--      mode_var = min_var;
--    }
--    model.distribution(m).set_var(mode_var);
--  }
--  return;
--}
--
--void boxm_mog_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma)
--{
--  static const unsigned int max_nmodes = boxm_apm_traits<BOXM_APM_MOG_GREY>::n_gaussian_modes_;
--  const float min_var = min_sigma*min_sigma;
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--  const float big_var = big_sigma * big_sigma;
--
--  auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  if (nobs == 1) {
--    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
--    bsta_gauss_sf1 mode(obs[0], big_sigma*big_sigma);
--    model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), 1.0f);
--    return;
--  }
--
--  unsigned int nmodes = model.num_components();
--
--  if (nmodes == 0) {
--    // if initial model is "blank", create an arbitrary starting point for the optimization with max number of modes
--    model = bsta_num_obs<bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, max_nmodes> >();
--    nmodes = max_nmodes;
--    // no need for model to have more modes than observations
--    if (nobs < nmodes) {
--      nmodes = nobs;
--    }
--    // initialize parameters
--    for (unsigned int m=0; m<nmodes; ++m) {
--      float mean = (float(m) + 0.5f) / float(nmodes);
--      float sigma = 0.3f;
--      float mode_weight = 1.0f / float(nmodes);
--      bsta_gauss_sf1 mode(mean, sigma*sigma);
--      model.insert(bsta_num_obs<bsta_gauss_sf1>(mode), mode_weight);
--    }
--  }
--
--  std::vector<std::vector<float> > mode_probs(nobs);
--  for (unsigned int n=0; n<nobs; ++n) {
--    for (unsigned int m=0; m<nmodes; ++m) {
--      mode_probs[n].push_back(0.0f);
--    }
--  }
--  std::vector<float> mode_weight_sum(nmodes,0.0f);
--
--  // run EM algorithm to maximize expected probability of observations
--  constexpr unsigned int max_its = 50;
--  const float max_converged_weight_change = 1e-3f;
--
--  for (unsigned int i=0; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION
--    for (unsigned int n=0; n<nobs; ++n) {
--      // for each observation, assign probabilities to each mode of appearance model (and to a "previous cell")
--      float total_prob = 0.0f;
--      std::vector<float> new_mode_probs(nmodes);
--      for (unsigned int m=0; m<nmodes; ++m) {
--        // compute probability that nth data point was produced by mth mode
--        const float new_mode_prob = vis[n] * model.distribution(m).prob_density(obs[n]) * model.weight(m);
--        new_mode_probs[m] = new_mode_prob;
--        total_prob += new_mode_prob;
--      }
--      // compute the probability the observation came from an occluding cell
--      const float prev_prob = pre[n];
--      total_prob += prev_prob;
--      if (total_prob > 1e-6) {
--        for (unsigned int m=0; m<nmodes; ++m) {
--          new_mode_probs[m] /= total_prob;
--          const float weight_change = std::fabs(new_mode_probs[m] - mode_probs[n][m]);
--          if (weight_change > max_weight_change) {
--            max_weight_change = weight_change;
--          }
--          mode_probs[n][m] = new_mode_probs[m];
--        }
--      }
--    }
--    // check for convergence
--    if (max_weight_change < max_converged_weight_change) {
--      break;
--    }
--    // MAXIMIZATION
--    // computed the weighted means and variances for each mode based on the probabilities
--    float total_weight_sum = 0.0f;
--
--    // update the mode parameters
--    for (unsigned int m=0; m<nmodes; ++m) {
--      mode_weight_sum[m] = 0.0f;
--      std::vector<float> obs_weights(nobs);
--      for (unsigned int n=0; n<nobs; ++n) {
--        obs_weights[n] = mode_probs[n][m];
--        mode_weight_sum[m] += obs_weights[n];
--      }
--      total_weight_sum += mode_weight_sum[m];
--      float mode_mean(0.5f);
--      float mode_var(1.0f);
--      bsta_gauss_sf1 single_gauss(mode_mean,mode_var);
--      bsta_fit_gaussian(obs, obs_weights, single_gauss);
--      mode_mean = single_gauss.mean();
--      mode_var = single_gauss.var();
--
--      // unbias variance based on number of observations
--      //float unbias_factor = sigma_norm_factor(mode_weight_sum[m]);
--      // mode_var *= (unbias_factor*unbias_factor);
--
--      // make sure variance does not get too big
--      if (!(mode_var < big_var)) {
--        mode_var = big_var;
--      }
--      // or too small
--      if (!(mode_var > min_var)) {
--        mode_var = min_var;
--      }
--
--      // update mode parameters
--      model.distribution(m).set_mean(mode_mean);
--      model.distribution(m).set_var(mode_var);
--    }
--    // update mode probabilities
--    if (total_weight_sum > 1e-6) {
--      for (unsigned int m=0; m<nmodes; ++m) {
--        const float mode_weight = mode_weight_sum[m] / total_weight_sum;
--        // update mode weight
--        model.set_weight(m, mode_weight);
--      }
--    }
--  }
--
--  // unbias variance based on number of observations
--  static const boxm_sigma_normalizer sigma_norm(0.20f);
--  for (unsigned int m=0; m<nmodes; ++m) {
--    float unbias_factor = sigma_norm.normalization_factor(mode_weight_sum[m]);
--    //float unbias_factor = sigma_norm.normalization_factor(model.weight(m) * nobs);
--    //float unbias_factor = sigma_norm.normalization_factor_int(nobs);
--
--    float mode_var = model.distribution(m).var();
--    mode_var *= (unbias_factor*unbias_factor);
--
--    // make sure variance does not get too big
--    if (!(mode_var < big_var)) {
--      mode_var = big_var;
--    }
--    // or too small
--    if (!(mode_var > min_var)) {
--      mode_var = min_var;
--    }
--    model.distribution(m).set_var(mode_var);
--  }
--
--  // sort the modes based on weight
--  model.sort();
--
--  return;
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
-deleted file mode 100644
-index b4d64bc6ad..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
-+++ /dev/null
-@@ -1,50 +0,0 @@
--// This is brl/bseg/boxm/sample/algo/boxm_mog_grey_processor.h
--#ifndef boxm_mog_grey_processor_h_
--#define boxm_mog_grey_processor_h_
--//:
--// \file
--// \brief A class for a grey-scale-mixture-of-gaussian processor
--//
--// \author Gamze Tunali
--// \date   Apr 03, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bsta/algo/bsta_adaptive_updater.h>
--#include <bsta/bsta_distribution.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gaussian_indep.h>
--
--#include <vnl/vnl_random.h>
--
--#include <boxm/boxm_apm_traits.h>
--
--
--class  boxm_mog_grey_processor
--{
-- protected:
--  // convienance typedefs
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype apm_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype obs_datatype;
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_mathtype obs_mathtype;
--
-- public:
--  static obs_datatype expected_color(apm_datatype const& appear);
--
--  static obs_datatype sample(apm_datatype const& appear, vnl_random &rand_gen);
--
--  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
--
--  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
--
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& obs_weights, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--};
--
--#endif // boxm_mog_grey_processor_h_
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
-deleted file mode 100644
-index b88fd5c03d..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.cxx
-+++ /dev/null
-@@ -1,104 +0,0 @@
--#include <iostream>
--#include "boxm_sigma_normalizer.h"
--//:
--// \file
--// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_gamma.h>
--#include <vnl/vnl_least_squares_function.h>
--#include <vnl/algo/vnl_levenberg_marquardt.h>
--
--boxm_sigma_normalizer::boxm_sigma_normalizer(float under_estimation_probability) : unbias_const_(N_PRECOMPUTED_+1, 0.0f)
--{
--  class gammainc_error_fn : public vnl_least_squares_function
--  {
--   public:
--    gammainc_error_fn(unsigned int ndof, float under_estimation_prob) : vnl_least_squares_function(1,1,no_gradient), ndof_(ndof), p_(under_estimation_prob) {}
--
--    void f(vnl_vector<double> const& x, vnl_vector<double>& fx) override
--    {
--      // don't allow x to become negative
--      if (x[0] < 0.0f) {
--        fx[0] = x[0] - p_; // so error function is c0 continuous at x=0
--        return;
--      }
--      double cdf_prob = vnl_cum_prob_chi2(ndof_, x[0]);
--      fx[0] = cdf_prob - p_;
--      return;
--    }
--   private:
--    unsigned int ndof_;
--    float p_;
--  };
--
--  // sanity check on probability
--  if (under_estimation_probability < 1e-4) {
--    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too low" << std::endl;
--    return;
--  }
--  if (under_estimation_probability > (1 - 1e-4)) {
--    std::cout << "error : boxm_sigma_normalizer : under_estimation_probability " << under_estimation_probability << " too high" << std::endl;
--    return;
--  }
--
--  // populate array of normalization factors for easy lookup
--  vnl_vector_fixed<double,1> x(1.0);
--
--  for (unsigned int n=2; n<= N_PRECOMPUTED_; ++n) {
--    gammainc_error_fn f(n-1, under_estimation_probability);
--    vnl_levenberg_marquardt minimizer(f);
--    minimizer.set_f_tolerance(1e-8);
--    minimizer.set_x_tolerance(1e-8);
--
--    minimizer.minimize(x);
--    //minimizer.diagnose_outcome();
--    double end_error = minimizer.get_end_error();
--    if (end_error > 1e-3) {
--      std::cerr << "error: boxm_sigma_normalizer: levenberg_marquardt final error = " << end_error << '\n';
--    }
--    auto unbias_constant = (float)std::sqrt((float)(n-1) / x[0]);
--
--    unbias_const_[n] = unbias_constant;
--  }
--  // sigma is undefined for samples sizes of 0 and 1, but we can linearly interpolate to get values anyway
--  unbias_const_[1] = unbias_const_[2] - (unbias_const_[3] - unbias_const_[2]);
--  unbias_const_[0] = unbias_const_[1] - (unbias_const_[2] - unbias_const_[1]);
--}
--
--
--float boxm_sigma_normalizer::normalization_factor(float number_of_observations) const
--{
--  if (number_of_observations <= 1.0f) {
--    return normalization_factor_int((unsigned int)1);
--  }
--
--  // linearly interpolate between integer values
--  float nobs_floor = std::floor(number_of_observations);
--  float nobs_ceil = std::ceil(number_of_observations);
--  float floor_weight = nobs_ceil - number_of_observations;
--  float norm_factor = (normalization_factor_int((unsigned int)nobs_floor) * floor_weight) + (normalization_factor_int((unsigned int)nobs_ceil) * (1.0f - floor_weight));
--
--  return norm_factor;
--}
--
--
--float boxm_sigma_normalizer::normalization_factor_int(unsigned int number_of_observations) const
--{
--  if (number_of_observations < 2) {
--    return unbias_const_[1];
--  }
--
--  if (number_of_observations <= N_PRECOMPUTED_) {
--    return unbias_const_[number_of_observations];
--  }
--  // else nobs >= N_PRECOMPUTED_
--  // approximate for big n with function a = m /nobs + b
--  static const float m = (unbias_const_[N_PRECOMPUTED_] - unbias_const_[N_PRECOMPUTED_ - 5])/(1.0f/N_PRECOMPUTED_ - 1.0f/(N_PRECOMPUTED_ - 5));
--  static const float b = unbias_const_[N_PRECOMPUTED_]  - m*(1.0f/N_PRECOMPUTED_);
--  return m/number_of_observations + b;
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h b/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
-deleted file mode 100644
-index aafb71a2c2..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// this is brl/bseg/boxm/sample/algo/boxm_sigma_normalizer.h
--#ifndef boxm_sigma_normalizer_h_
--#define boxm_sigma_normalizer_h_
--//:
--// \file
--// \brief A class for adjusting sample standard deviation values such that the probability of underestimation of the true std. dev. is fixed.
--//
--// \author Daniel Crispell
--// \date   Feb. 18, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class boxm_sigma_normalizer
--{
-- public:
--  //: create a sigma_normalizer object.
--  boxm_sigma_normalizer(float under_estimation_probability);
--
--  //: compute the normalization factor for a sample distribution computing with N observations
--  // \a sigma_norm = sample_sigma * normalization_factor(N);
--  float normalization_factor(float number_of_observations) const;
--
--  //: compute the normalization factor for a sample distribution computed with N observations
--  // \a sigma_norm = sample_sigma * normalization_factor(N);
--  float normalization_factor_int(unsigned int number_of_observations) const;
--
-- private:
--  // do not allow default constructor - under-estimation param is necessary
--  boxm_sigma_normalizer()= default;
--
--  static const unsigned int N_PRECOMPUTED_ = 40;
--  std::vector<float> unbias_const_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
-deleted file mode 100644
-index b1d9e4639b..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.cxx
-+++ /dev/null
-@@ -1,437 +0,0 @@
--#include "boxm_simple_grey_processor.h"
--//:
--// \file
--
--#include <vnl/vnl_erf.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/algo/bsta_fit_gaussian.h>
--
--#include "boxm_sigma_normalizer.h"
--
--//const float boxm_simple_grey_processor::one_over_sigma_ = 25.0f;
--const static bool USE_UNIFORM_COMPONENT = false;
--
--//: Return probability density of observing pixel values
--float boxm_simple_grey_processor::prob_density(apm_datatype const& appear, obs_datatype const& obs)
--{
--  const auto norm =  float(appear.one_over_sigma() * vnl_math::one_over_sqrt2pi);
--  const float diff = obs - appear.color();
--  const float p = norm * std::exp(-(diff*diff)*appear.one_over_sigma()*appear.one_over_sigma()*0.5f);
--  // normalize by area of distribution between 0 and 1
--  //return p / total_prob(appear);
--  return p * appear.gauss_weight() + (1.0f - appear.gauss_weight());
--}
--
--//: Return probabilities that pixels are in range [min,max]
--float boxm_simple_grey_processor::prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max)
--{
--  // make sure obs_min and obs_max are within bounds
--  const float obs_min_n = obs_min >= 0 ? obs_min : 0.0f;
--  const float obs_max_n = obs_max <= 1.0? obs_max : 1.0f;
--
--  const float diff_low = obs_min_n - appear.color();
--  const float diff_high = obs_max_n - appear.color();
--  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
--
--  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
--  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
--  const float P = (0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1));
--  //return P / total_prob(appear);
--  return P * appear.gauss_weight() + (1.0f - appear.gauss_weight())*(obs_max - obs_min);
--}
--
--//: Return probabilities that pixels are in range [0,1] - used for normalizing
--float boxm_simple_grey_processor::total_prob(apm_datatype const& appear)
--{
--  const float diff_low =  -appear.color();
--  const float diff_high = 1.0f - appear.color();
--  const auto norm = float(appear.one_over_sigma()*vnl_math::sqrt1_2);
--  const auto double_cdf_low_minus_1 = (float)vnl_erf(diff_low*norm);
--  const auto double_cdf_high_minus_1 = (float)vnl_erf(diff_high*norm);
--  return 0.5f * (double_cdf_high_minus_1 - double_cdf_low_minus_1);
--}
--
--
--//: Update with a new sample image
--bool boxm_simple_grey_processor::update( apm_datatype &appear, obs_datatype const& obs, float const& /*weight*/)
--{
--  appear = boxm_simple_grey(vnl_vector_fixed<float,3>(obs, appear.sigma(), appear.gauss_weight()));
--  return true;
--}
--
--
--//: Expected value
--boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype boxm_simple_grey_processor::expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear)
--{
--  return appear.color() * appear.gauss_weight() + 0.5f * (1.0f - appear.gauss_weight());
--}
--
--//: color of the most probable mode in the mixtures in the slab
--boxm_simple_grey_processor::obs_datatype boxm_simple_grey_processor::most_probable_color(apm_datatype const& appear)
--{
--  return appear.color();
--}
--
--void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
--{
--  bsta_gauss_sf1 model_bsta(model.color(),model.sigma()*model.sigma());
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--  auto nobs = (unsigned int)obs.size();
--  // check for some simple cases first
--  if (nobs == 0) {
--    // zero observations. nothing to do here.
--    model = boxm_simple_grey(0.5f, big_sigma);
--    return;
--  }
--  if (nobs == 1) {
--    // one observation: Just return the value as the mean, and a big sigma.
--    model = boxm_simple_grey(obs[0], big_sigma);
--    return;
--  }
--  //std::cout << "nobs = " << obs.size() << std::endl;
--  //for (unsigned int i=0; i<obs.size(); ++i) {
--  //  std::cout << "obs=" << obs[i] << " vis=" << vis[i] << "pre=" << pre[i] << std::endl;
--  //}
--  const float min_var_EM = 1.5e-5f; // to prevent degenerate solution (corresponds roughly to sigma = 1/255)
--  bsta_fit_gaussian(obs,vis,pre,model_bsta,min_var_EM);
--  // compute expected number of observations
--  float expected_nobs = 0.0f;
--  for (float vi : vis) {
--    expected_nobs += vi;
--  }
--  // normalize sigma
--  static const boxm_sigma_normalizer sigma_norm(0.20f);
--  const float norm_factor = sigma_norm.normalization_factor(expected_nobs);
--  //const float norm_factor = 1.0f;
--  float sigma = std::sqrt(model_bsta.var()) * norm_factor;
--
--  // bounds check on std. deviation value
--  if (sigma < min_sigma) {
--    sigma = min_sigma;
--  }
--  if (sigma > big_sigma) {
--    sigma = big_sigma;
--  }
--  if (!(sigma < big_sigma) && !(sigma > min_sigma)) {
--    std::cerr << "error: sigma = " << sigma << " model_bsta.var() = " << model_bsta.var() << std::endl;
--    sigma = big_sigma;
--  }
--  // convert back to a boxm_simple_grey model
--  model = boxm_simple_grey(model_bsta.mean(),sigma);
--  return;
--}
--
--void boxm_simple_grey_processor::compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
--{
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--
--  const auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // zero observations. nothing to do here.
--    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(0.5f, 1.0f, 0.0f);
--    return;
--  }
--  if (nobs == 1) {
--    // one observation: Just return the value as the mean, and a big sigma.
--    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma, weights[0]);
--    return;
--  }
--  else {
--    // compute estimate of gaussian parameters
--    // Initialize the estimates
--    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
--    float sigma_est = 0.0f;
--
--    compute_gaussian_params(obs, weights, mean_est, sigma_est);
--    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype gauss_model(mean_est, sigma_est, 1.0f);
--
--    sigma_est *= sigma_norm_factor(nobs);
--
--    // make sure standard deviation is not too small
--    if (sigma_est < min_sigma) {
--      sigma_est = min_sigma;
--    }
--    // or too big
--    if (sigma_est > big_sigma) {
--      sigma_est = big_sigma;
--    }
--
--    // compute estimate of gaussian weight by summing probabilities
--    float gauss_weight = 0.0f;
--    if (USE_UNIFORM_COMPONENT) {
--      float weight_sum = 0.0f;
--      for (unsigned int n=0; n<nobs; ++n) {
--        const float p_gauss = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(gauss_model,obs[n]);
--        const float p_uniform = 1.0f;
--        gauss_weight += weights[n] * p_gauss / (p_gauss + p_uniform);
--        weight_sum += weights[n];
--      }
--      if (weight_sum > 0.0f) {
--        gauss_weight /= weight_sum;
--      }
--    }
--    else {
--      gauss_weight = 1.0f;
--    }
--
--    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
--  }
--}
--
--
--void boxm_simple_grey_processor::update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma)
--{
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--
--  const auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // zero observations. nothing to do here.
--    return;
--  }
--  if (nobs == 1) {
--    // one observation: Just return the value as the mean, and a big sigma.
--    model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(obs[0], big_sigma);
--    return;
--  }
--  else {
--    // compute estimate of gaussian weight by summing probabilities
--    std::vector<float> obs_gauss_weights = weights;
--    float gauss_weight = 0.0f;
--    float expected_nobs = 0.0f;
--    if (USE_UNIFORM_COMPONENT) {
--      float weight_sum = 0.0f;
--
--      for (unsigned int n=0; n<nobs; ++n) {
--        const float p_total = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_processor::prob_density(model,obs[n]);
--        const float p_uniform = 1.0f - model.gauss_weight();
--        const float p_gauss = p_total - p_uniform;
--        if (p_total > 0.0f) {
--          obs_gauss_weights[n] = weights[n] * p_gauss / p_total;
--        }
--        else {
--          obs_gauss_weights[n] = 0.0f;
--        }
--        gauss_weight += obs_gauss_weights[n];
--        weight_sum += weights[n];
--      }
--      if (weight_sum > 0.0f) {
--        gauss_weight /= weight_sum;
--      }
--      expected_nobs = weight_sum;
--    }
--    else {
--      auto wit = weights.begin();
--      for (; wit != weights.end(); ++wit) {
--        expected_nobs += *wit;
--      }
--      gauss_weight = 1.0f;
--    }
--    // Initialize the estimates
--    boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype mean_est(0);
--    float sigma_est = 0.0f;
--
--    compute_gaussian_params(obs, obs_gauss_weights, mean_est, sigma_est);
--
--    //sigma_est *= sigma_norm_factor(nobs);
--
--    // make sure standard deviation is not too small
--    if (sigma_est < min_sigma) {
--      sigma_est = min_sigma;
--    }
--    // or too big
--    if (sigma_est > big_sigma) {
--      sigma_est = big_sigma;
--    }
--
--    model = boxm_simple_grey(mean_est, sigma_est, gauss_weight);
--  }
--  return;
--}
--
--void boxm_simple_grey_processor::finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
--                                                     std::vector<float> const& weights,
--                                                     boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model)
--{
--  const auto big_sigma = (float)vnl_math::sqrt1_2; // maximum possible std. dev for set of samples drawn from [0 1]
--
--  float expected_nobs = 0.0f;
--    const auto nobs = (unsigned int)obs.size();
--
--  auto wit = weights.begin();
--  for (; wit != weights.end(); ++wit) {
--    expected_nobs += *wit;
--  }
--
--  //float unbiased_sigma = model.sigma() * sigma_norm_factor(expected_nobs);
--  float unbiased_sigma = model.sigma() * sigma_norm_factor(nobs);
--  if (unbiased_sigma > big_sigma) {
--    unbiased_sigma = big_sigma;
--  }
--
--
--  model = boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype(model.color(), unbiased_sigma, model.gauss_weight());
--}
--
--
--void boxm_simple_grey_processor::compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma)
--{
--  const auto nobs = (unsigned int)obs.size();
--  double w_sum = 0.0;
--  double w2_sum = 0.0;
--  double obs_sum = 0.0;
--
--  for (unsigned int i=0; i<nobs; ++i) {
--    w_sum += weights[i];
--    w2_sum += weights[i]*weights[i];
--    obs_sum += obs[i] * weights[i];
--  }
--  double mean_obs = 0.5f;
--  if (w_sum > 0) {
--    mean_obs = obs_sum / w_sum;
--  }
--
--  double var_sum = 0.0;
--  for (unsigned int i=0; i<nobs; ++i) {
--    const double diff = obs[i] - mean_obs;
--    var_sum += diff*diff*weights[i];
--  }
--  double var = 1.0f;
--  if (w_sum > 0) {
--    var = var_sum / (w_sum - (w2_sum/w_sum));
--  }
--
--  mean = (float)mean_obs;
--  sigma = (float)std::sqrt(var);
--}
--
--float boxm_simple_grey_processor::sigma_norm_factor(float nobs)
--{
--  if (nobs <= 1.0f) {
--    return sigma_norm_factor((unsigned int)1);
--  }
--
--  // linearly interpolate between integer values
--  float nobs_floor = std::floor(nobs);
--  float nobs_ceil = std::ceil(nobs);
--  float floor_weight = nobs_ceil - nobs;
--  float norm_factor = (sigma_norm_factor((unsigned int)nobs_floor) * floor_weight) + (sigma_norm_factor((unsigned int)nobs_ceil) * (1.0f - floor_weight));
--
--  return norm_factor;
--}
--
--float boxm_simple_grey_processor::sigma_norm_factor(unsigned int nobs)
--{
--  static const float unbias_const[] = {0, 1e3f, 7.9057f, 3.0787f, 2.2646f, 1.9389f, 1.7617f, 1.6496f, 1.5716f, 1.5140f, 1.4693f, 1.4336f, 1.4043f, 1.3797f, 1.3587f, 1.3406f, 1.3248f, 1.3107f, 1.2983f, 1.2871f, 1.2770f, 1.2678f, 1.2594f, 1.2517f, 1.2446f, 1.2380f, 1.2319f, 1.2262f, 1.2209f, 1.2159f, 1.2112f, 1.2068f, 1.2026f, 1.1987f, 1.1949f, 1.1914f };
--
--  if (nobs < 2) {
--    return unbias_const[1];
--  }
--
--  if (nobs < 36) {
--    return unbias_const[nobs];
--  }
--  // else nobs >= 36
--  // approximate for big n with function a = m /nobs + b
--  static const float m = (unbias_const[35] - unbias_const[30])/(1.0f/35.0f - 1.0f/30.0f);
--  static const float b = unbias_const[35]  - m*(1.0f/35.0f);
--  return m/nobs + b;
--}
--
--void boxm_simple_grey_processor::
--boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
--                               std::vector<float> const& pre,
--                               std::vector<float> const& vis,
--                               boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
--                               float min_app_sigma,
--                               float shadow_prior,
--                               float shadow_mean,
--                               float shadow_sigma,
--                               bool verbose )
--{
--  std::vector<float> obs_weights(vis.size(), 0.0f);
--  std::vector<float> sh_density(vis.size(), 0.0f);
--  //assume that the initial appearance distribution is uniform on [0 1]
--  //thus a reasonable initialization for weights is
--  //
--  //  vis(1-Psh)/( (1-Psh) + Psh psh(obs) )
--  //
--  //, where Psh is shadow_prior and psh(x) is the shadow density function,
--  // sh_density. vis is the visibilty probability
--  //
--  boxm_simple_grey shadow_dist(shadow_mean, shadow_sigma);
--  for (unsigned n = 0; n<obs.size(); ++n)
--  {
--    //2.0 x density since centered on zero
--    sh_density[n] =
--      2.0f*boxm_simple_grey_processor::prob_density(shadow_dist, obs[n]);
--    float neu = vis[n]*(1-shadow_prior);
--    float weight =
--      neu/(neu + sh_density[n]*shadow_prior);
--    obs_weights[n]=weight;
--  }
--  std::vector<float> initial_weights = obs_weights;
--  // initial estimate for the illuminated appearance model
--  boxm_simple_grey_processor::compute_appearance(obs,obs_weights,model,min_app_sigma);
--  double initial_mean = model.color();
--  double initial_sigma = model.sigma();
--
--  // use EM to refine estimate until convergence.
--  auto nobs = (unsigned int)obs.size();
--  if (nobs == 0) {
--    // nothing to do.
--    return;
--  }
--  const float epsilon = 1e-4f;
--  constexpr unsigned int max_its = 100;
--  const float min_weight_change = 1e-5f;
--  unsigned int i=0;
--  for (; i<max_its; ++i) {
--    float max_weight_change = 0.0f;
--    // EXPECTATION - determine the weights
--    for (unsigned int n=0; n<nobs; ++n) {
--      float PI = vis[n] * boxm_simple_grey_processor::prob_density(model,obs[n]);
--      float neu = PI*(1-shadow_prior);
--      float den = (PI + pre[n])*(1-shadow_prior) + shadow_prior*sh_density[n];
--      float new_obs_weight = 0;
--      if (den > epsilon) {
--        new_obs_weight = neu / den;
--      }
--      // compute delta weight for convergence check
--      float weight_delta = std::fabs(obs_weights[n] - new_obs_weight);
--      if (weight_delta > max_weight_change) {
--        max_weight_change = weight_delta;
--      }
--      obs_weights[n] = new_obs_weight;
--    }
--    // check for convergence
--    if (max_weight_change < min_weight_change)
--      break;
--    // MAXIMIZATION - determine the parameters of the appearance distribution
--    boxm_simple_grey_processor::update_appearance(obs,obs_weights,model,min_app_sigma);
--  }
--  if (verbose) {
--    bool print = false;
--    for (unsigned n = 0; n<obs.size(); ++n) {
--      if (obs[n]>0) print = true;
--      if (i<max_its&&print) {
--        std::cout << "converged after " << i << " iterations.\n"
--                 << " initial mean = " << initial_mean << " final mean = "
--                 << model.color() << '\n'
--                 << " initial sigma = " << initial_sigma << " final sigma = "
--                 << model.sigma() << '\n';
--      }
--      else { std::cout << "failed to converge\n"; }
--
--      std::cout << "Initial (Observations, Weights):\n";
--      for (unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << initial_weights[n] << ") ";
--      std::cout << "\nFinal (Observations, Weights):\n";
--      for (unsigned n=0; n<obs.size(); ++n)
--        std::cout << '('<< obs[n] << ' ' << obs_weights[n] << ") ";
--      std::cout << '\n';
--    }
--  }
--
--  // adjust model to account for small sample sizes.
--  boxm_simple_grey_processor::finalize_appearance(obs,obs_weights,model);
--}
-diff --git a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h b/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
-deleted file mode 100644
-index 076213bd46..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
-+++ /dev/null
-@@ -1,86 +0,0 @@
--// This is brl/bseg/boxm/sample/algo/boxm_simple_grey_processor.h
--#ifndef boxm_simple_grey_processor_h_
--#define boxm_simple_grey_processor_h_
--//:
--// \file
--// \brief A class for processing simple, single valued grey-scale appearance models.
--//  The represented distribution can be thought of as a delta function centered on the value.
--//
--// \author Daniel Crispell
--// \date Sept 29, 2008
--// \verbatim
--//  Modifications
--//  <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <iosfwd>
--#include <boxm/boxm_apm_traits.h>
--#if 0 // operator<< in commented-out section
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--class  boxm_simple_grey_processor
--{
-- protected:
--  // convienance typedefs
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype apm_datatype;
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype obs_datatype;
--  typedef boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype obs_mathtype;
--
--  // all methods are static - no constructor needed
-- private:
--  boxm_simple_grey_processor() = default;
--
--#if 0  // one_over_sigma is now a member of apm_datatype
--  static const float one_over_sigma_;
--#endif
--
-- public:
--
--  static float prob_density(apm_datatype const& appear, obs_datatype const& obs);
--
--  static float prob_range(apm_datatype const& appear, obs_datatype const& obs_min, obs_datatype const& obs_max);
--
--  static float total_prob(apm_datatype const& appear);
--
--  static bool update( apm_datatype &appear, obs_datatype const& obs, float const& weight);
--
--  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype expected_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
--
--  static boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_mathtype most_probable_color(boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype const& appear);
--
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--  static void compute_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& pre, std::vector<float> const& vis, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma=0.01f);
--
--  static void update_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model, float min_sigma = 0.01f);
--
--  static void finalize_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs, std::vector<float> const& weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model);
--
--  //: includes a shadow density component to the single gaussian scalar appearance model, defined by a fixed shadow mean and sigma.
--  // The shadow prior defines the probability that an observation is in shadow.
--  // The function updates the "model" mean and sigma.
--  static void boxm_compute_shadow_appearance(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> const& obs,
--                                             std::vector<float> const& pre,
--                                             std::vector<float> const& vis,
--                                             boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::apm_datatype &model,
--                                             float min_app_sigma,
--                                             float shadow_prior,
--                                             float shadow_mean,
--                                             float shadow_sigma,
--                                             bool verbose = false);
-- private:
--  static void compute_gaussian_params(std::vector<boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype> obs, std::vector<float> weights, boxm_apm_traits<BOXM_APM_SIMPLE_GREY>::obs_datatype &mean, float &sigma);
--
--  static float sigma_norm_factor(unsigned int nobs);
--
--  static float sigma_norm_factor(float nobs);
--};
--
--#if 0
--std::ostream& operator<<(std::ostream &os, boxm_simple_grey const& apm);
--#endif
--
--#endif // boxm_simple_grey_processor_h_
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
-deleted file mode 100644
-index 4390b597bc..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,11 +0,0 @@
--add_executable( boxm_sample_algo_test_all
--  test_driver.cxx
--  test_sigma_normalizer.cxx
-- )
--
--target_link_libraries( boxm_sample_algo_test_all boxm_sample_algo boxm_sample boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vbl bsta bsta_algo)
--
--add_test( NAME boxm_sample_test_sigma_normalizer COMMAND $<TARGET_FILE:boxm_sample_algo_test_all> test_sigma_normalizer  )
--
--add_executable( boxm_sample_algo_test_include test_include.cxx )
--target_link_libraries( boxm_sample_algo_test_include boxm_sample_algo)
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
-deleted file mode 100644
-index 1258c5dc63..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_sigma_normalizer );
--
--void register_tests()
--{
--  REGISTER( test_sigma_normalizer );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
-deleted file mode 100644
-index 3c7fc60db6..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/test_include.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boxm/sample/algo/boxm_mob_grey_processor.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--#include <boxm/sample/algo/boxm_simple_grey_processor.h>
--#include <boxm/sample/algo/boxm_sigma_normalizer.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx b/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
-deleted file mode 100644
-index 7231ca0b24..0000000000
---- a/contrib/brl/bseg/boxm/sample/algo/tests/test_sigma_normalizer.cxx
-+++ /dev/null
-@@ -1,59 +0,0 @@
--
--#include <testlib/testlib_test.h>
--#include <vnl/vnl_random.h>
--#include <boxm/sample/algo/boxm_sigma_normalizer.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/algo/bsta_fit_gaussian.h>
--
--
--static void test_sigma_normalizer()
--{
--  START("boxm_sigma_normalizer test");
--
--  // generate random sets of samples from a normal distribution and compare sigma estimate to true value
--  {
--    vnl_random rand_gen;
--    unsigned int n_trials = 5000;
--
--    unsigned int n_observations = 6;
--    float true_sigma = 0.5f;
--    float true_mean = 2.5f;
--    float under_estimation_prob = 0.4f;
--    unsigned int under_estimates = 0;
--
--    boxm_sigma_normalizer normalizer(under_estimation_prob);
--
--    for (unsigned int t=0; t<n_trials; ++t) {
--      std::vector<float> samples;
--      std::vector<float> weights;
--      for (unsigned int n=0; n<n_observations; ++n) {
--        float sample = true_mean + true_sigma*(float)rand_gen.normal();
--        samples.push_back(sample);
--        weights.push_back(1.0f);
--      }
--      // compute the sample mean and variance
--      bsta_gauss_sf1 gauss_model;
--      bsta_fit_gaussian(samples, weights, gauss_model);
--      float normalized_sigma = std::sqrt(gauss_model.var()) * normalizer.normalization_factor_int(n_observations);
--      if (normalized_sigma < true_sigma) {
--        ++under_estimates;
--      }
--    }
--    float under_estimate_ratio = (float)under_estimates / n_trials;
--
--    TEST_NEAR("correct ratio of sigma under-estimates", under_estimate_ratio, under_estimation_prob, 0.05);
--  }
--
--  // make sure normalization factor approaches 1 for large sample sizes
--  {
--    boxm_sigma_normalizer sigma_norm(0.10f);
--    float norm_factor_f = sigma_norm.normalization_factor(10000.0f);
--    float norm_factor_i = sigma_norm.normalization_factor_int(10000);
--
--    TEST_NEAR("normalization factor (float) approaches 1 for large N",norm_factor_f, 1.0, 0.1);
--    TEST_NEAR("normalization factor (int) approaches 1 for large N",norm_factor_i, 1.0, 0.1);
--  }
--  return;
--}
--
--TESTMAIN(test_sigma_normalizer);
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
-deleted file mode 100644
-index ae46c03fd6..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.h
-+++ /dev/null
-@@ -1,97 +0,0 @@
--#ifndef boxm_edge_sample_h_
--#define boxm_edge_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_aux_traits.h>
--
--template<class OBS_T>
--class boxm_edge_sample
--{
-- public:
--  boxm_edge_sample(): edge_prob_(0), num_obs_(0.0f) {}
--  ~boxm_edge_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val() const { return edge_prob_; }
--  OBS_T edge_prob_;
--  float num_obs_;
--};
--
--template<class OBS_T>
--class boxm_aux_edge_sample
--{
-- public:
--  boxm_aux_edge_sample(): obs_(0), seg_len_(0.0f) { }
--  ~boxm_aux_edge_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  OBS_T obs_;
--  float seg_len_;
--};
--
--#if 0 // two classes commented out
--
--//: traits for a grey optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
--{
-- public:
--  typedef boxm_edge_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_grey_work"; }
--};
--
--//: traits for an rgb optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
--{
-- public:
--  typedef boxm_edge_sample<vil_rgb<float> > sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
--};
--
--#endif // 0
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample);
--
--
--#endif // boxm_edge_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
-deleted file mode 100644
-index d2e60dc175..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_sample.hxx
-+++ /dev/null
-@@ -1,137 +0,0 @@
--#ifndef boxm_edge_sample_hxx_
--#define boxm_edge_sample_hxx_
--
--#include "boxm_edge_sample.h"
--
--
--// Edge Sample Methods
--template <class OBS_T>
--void boxm_edge_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(edge_prob=" << edge_prob_ << " num_obs=" << num_obs_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.edge_prob_);
--  vsl_b_write(os, sample.num_obs_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.edge_prob_);
--      vsl_b_read(is, sample.num_obs_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_edge_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--// Auxiliary Edge Sample Methods
--template <class OBS_T>
--void boxm_aux_edge_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(obs=" << obs_ << " seg_len=" << seg_len_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.obs_);
--  vsl_b_write(os, sample.seg_len_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_aux_edge_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.obs_);
--      vsl_b_read(is, sample.seg_len_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_aux_edge_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_aux_edge_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_aux_edge_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_EDGE_SAMPLE_INSTANTIATE(T) \
--template class boxm_edge_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_edge_sample<T >&)
--
--#define BOXM_AUX_EDGE_SAMPLE_INSTANTIATE(T) \
--template class boxm_aux_edge_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_aux_edge_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_aux_edge_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_aux_edge_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
-deleted file mode 100644
-index a92ae0e38e..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.h
-+++ /dev/null
-@@ -1,69 +0,0 @@
--#ifndef boxm_edge_tangent_sample_h_
--#define boxm_edge_tangent_sample_h_
--//:
--// \file
--
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include "boxm_plane_obs.h"
--#include <boxm/boxm_aux_traits.h>
--
--
--template <class T>
--class boxm_edge_tangent_sample
--{
-- public:
--  boxm_edge_tangent_sample() = default;
--  ~boxm_edge_tangent_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  //: adds observations
--  void insert(boxm_plane_obs<T> const& obs) { obs_.push_back(obs); }
--
--  //: insert a lis of observations
--  void insert(std::vector<boxm_plane_obs<T> > const& obs) {obs_.insert(obs_.end(),obs.begin(),obs.end()); }
--
--  //: returns the number of observations
--  unsigned num_obs() const { return obs_.size(); }
--
--  boxm_plane_obs<T> obs(unsigned int i) const {
--    if (i < obs_.size()) return obs_[i];
--    std::cerr << "boxm_edge_tangent_sample: " << i << " is out of index - size is " << obs_.size() << std::endl;
--    return boxm_plane_obs<T>();
--  }
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val(unsigned int i) {
--    if (i < obs_.size()) return obs_[i].seg_len_;
--    std::cerr << "boxm_edge_tangent_sample: " << i << "is out of index - size is " << obs_.size() << std::endl;
--    return -1.0f;
--  }
--
--  std::vector<boxm_plane_obs<T> > obs_list() { return obs_; }
--
-- private:
--  std::vector<boxm_plane_obs<T> > obs_;
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample);
--
--template <class T>
--std::ostream&operator << (std::ostream& os, boxm_edge_tangent_sample<T>& sample);
--
--
--#endif // boxm_edge_tangent_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
-deleted file mode 100644
-index bb96baa1e0..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_edge_tangent_sample.hxx
-+++ /dev/null
-@@ -1,79 +0,0 @@
--#ifndef boxm_edge_tangent_sample_hxx_
--#define boxm_edge_tangent_sample_hxx_
--
--#include "boxm_edge_tangent_sample.h"
--#include "boxm_plane_obs.h"
--
--template <class OBS_T>
--void boxm_edge_tangent_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << " num_obs=" << this->num_obs() << std::endl;
--  for (unsigned i=0; i<obs_.size(); i++)
--    os << "    " << i << "- (obs=" << this->obs(i) << ")\n" ;
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const & sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.num_obs());
--  for (unsigned i=0; i<sample.num_obs(); i++)
--    vsl_b_write(os, sample.obs(i));
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_edge_tangent_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--     { unsigned num;
--      vsl_b_read(is, num);
--      boxm_plane_obs<T> o;
--      for (unsigned i=0; i<num; i++) {
--        vsl_b_read(is, o);
--        sample.insert(o);
--      }}
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_edge_tangent_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, boxm_edge_tangent_sample<T> &sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_EDGE_TANGENT_SAMPLE_INSTANTIATE(T) \
--template class boxm_edge_tangent_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_edge_tangent_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_edge_tangent_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, boxm_edge_tangent_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
-deleted file mode 100644
-index 953c9f286f..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.h
-+++ /dev/null
-@@ -1,55 +0,0 @@
--#ifndef boxm_inf_line_sample_h_
--#define boxm_inf_line_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vgl/vgl_line_3d_2_points.h>
--
--#include <boxm/boxm_aux_traits.h>
--#include <bsta/bsta_kent.h>
--
--template<class T>
--class boxm_inf_line_sample
--{
-- public:
--  //: initially the residual is very big, it means the solution to this inf line is not found yet
--  boxm_inf_line_sample() :
--       residual_(1e6), line_(vgl_infinite_line_3d<T>(vgl_vector_2d<T>(0,0),
--       vgl_vector_3d<T>(10,10,10))), num_obs_(0){}
--
--  boxm_inf_line_sample(vgl_infinite_line_3d<T> line,unsigned num_obs=0) : residual_(1e6),line_(line),num_obs_(num_obs) {}
--  ~boxm_inf_line_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) { os << "(line=" << line_ << ')';  }
--  bool operator==(const boxm_inf_line_sample &rhs) const;
--  typedef boxm_inf_line_sample<T> value_type;
--  // public members
--  T residual_;
--  vgl_infinite_line_3d<T> line_;
--  vgl_line_3d_2_points<T> line_clipped_;
--  unsigned num_obs_;
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample);
--
--
--#endif // boxm_inf_line_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
-deleted file mode 100644
-index 1206b4a5f3..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_inf_line_sample.hxx
-+++ /dev/null
-@@ -1,79 +0,0 @@
--#ifndef boxm_inf_line_sample_hxx_
--#define boxm_inf_line_sample_hxx_
--
--#include "boxm_inf_line_sample.h"
--#include <vgl/io/vgl_io_infinite_line_3d.h> // for vsl_b_write(os, sample.line_);
--#include <vgl/io/vgl_io_line_3d_2_points.h> // for vsl_b_write(os, sample.line_clipped_);
--
--template <class T>
--bool boxm_inf_line_sample<T>::operator==(const boxm_inf_line_sample<T> &rhs) const
--{
--  if ((this==&rhs) || (line_==rhs.line_ && line_clipped_==rhs.line_clipped_ && num_obs_==rhs.num_obs_))
--    return true;
--  else
--    return false;
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.num_obs_);
--  vsl_b_write(os, sample.residual_);
--  vsl_b_write(os, sample.line_);
--  vsl_b_write(os, sample.line_clipped_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_inf_line_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.num_obs_);
--      vsl_b_read(is, sample.residual_);
--      vsl_b_read(is, sample.line_);
--      vsl_b_read(is, sample.line_clipped_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_inf_line_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_inf_line_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, boxm_inf_line_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_INF_LINE_SAMPLE_INSTANTIATE(T) \
--template class boxm_inf_line_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_inf_line_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_inf_line_sample<T > *&);\
--template std::ostream& operator << (std::ostream&, boxm_inf_line_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
-deleted file mode 100644
-index 56ac1825d9..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.h
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#ifndef boxm_opt2_sample_h_
--#define boxm_opt2_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_aux_traits.h>
--
--
--template <class OBS_T>
--class boxm_opt2_sample
--{
-- public:
--  boxm_opt2_sample()
--  : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), log_pass_prob_sum_(0.0f), weighted_seg_len_sum_(0.0f)
--  {}
--
--  ~boxm_opt2_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  OBS_T obs_;
--  float pre_;
--  float vis_;
--  float PI_;
--  float seg_len_;
--
--  float log_pass_prob_sum_;
--  float weighted_seg_len_sum_;
--};
--
--//:traits for a grey optimization sample
--template <>
--class boxm_aux_traits<BOXM_AUX_OPT2_GREY>
--{
-- public:
--  typedef boxm_opt2_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "opt2_grey_work"; }
--};
--
--//:traits for an rgb optimization sample
--template <>
--class boxm_aux_traits<BOXM_AUX_OPT2_RGB>
--{
-- public:
--  typedef boxm_opt2_sample<vil_rgb<float> > sample_datatype;
--
--  static std::string storage_subdir() { return "opt2_rgb_work"; }
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator<< (std::ostream& os, const boxm_opt2_sample<T>& sample);
--
--#endif // boxm_opt2_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
-deleted file mode 100644
-index 44300e3bf7..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt2_sample.hxx
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#ifndef boxm_opt2_sample_hxx_
--#define boxm_opt2_sample_hxx_
--
--#include "boxm_opt2_sample.h"
--
--
--template <class OBS_T>
--void boxm_opt2_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_
--     << " seg_len=" << seg_len_ << " log_pass_prob_sum=" << log_pass_prob_sum_
--     << " weighted_seg_len_sum=" << weighted_seg_len_sum_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.obs_);
--  vsl_b_write(os, sample.pre_);
--  vsl_b_write(os, sample.vis_);
--  vsl_b_write(os, sample.PI_);
--  vsl_b_write(os, sample.seg_len_);
--  vsl_b_write(os, sample.log_pass_prob_sum_);
--  vsl_b_write(os, sample.weighted_seg_len_sum_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt2_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.obs_);
--    vsl_b_read(is, sample.pre_);
--    vsl_b_read(is, sample.vis_);
--    vsl_b_read(is, sample.PI_);
--    vsl_b_read(is, sample.seg_len_);
--    vsl_b_read(is, sample.log_pass_prob_sum_);
--    vsl_b_read(is, sample.weighted_seg_len_sum_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt2_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template<class T>
--void vsl_b_read(vsl_b_istream & is, boxm_opt2_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_opt2_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_OPT2_SAMPLE_INSTANTIATE(T) \
--template class boxm_opt2_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt2_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt2_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_opt2_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
-deleted file mode 100644
-index 3b8d162774..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--#ifndef boxm_opt3_sample_h_
--#define boxm_opt3_sample_h_
--//:
--// \file
--
--#include <vector>
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_traits.h>
--
--//: class for holding auxiliary information for opt3 process.
--// Note that APM is not necessarily appearance model type of world,
--// but observation types of the two models should be the same.
--template<boxm_apm_type APM>
--class boxm_opt3_sample
--{
-- public:
--  typedef typename boxm_apm_traits<APM>::obs_datatype obs_datatype;
--  typedef typename boxm_apm_traits<APM>::apm_datatype apm_datatype;
--
--  boxm_opt3_sample()
--    : weighted_vis_sum_(0.0f), seg_len_sum_(0.0f), log_pass_prob_sum_(0.0f) { }
--  ~boxm_opt3_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  void update_obs_dist(obs_datatype obs, float obs_prob);
--
--  apm_datatype obs_dist_; // distribution of samples from this observation
--  float weighted_vis_sum_; // sum of visibility probabilities * corresponding seg_lens
--  float seg_len_sum_; // sum of sample segment lengths
--  float log_pass_prob_sum_; // sum of log of updated (1 - PQ)
--};
--
--//: traits for a grey optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT3_MOG_GREY>
--{
-- public:
--   typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::obs_datatype sample_datatype;
--   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_GREY;
--
--  static std::string storage_subdir() { return "opt3_mog_grey"; }
--};
--
--//: traits for an rgb optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT3_MOG_RGB>
--{
-- public:
--   typedef boxm_apm_traits<BOXM_APM_MOG_RGB>::obs_datatype sample_datatype;
--   static const boxm_apm_type APM_TYPE = BOXM_APM_MOG_RGB;
--
--  static std::string storage_subdir() { return "opt3_mog_rgb"; }
--};
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample);
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample);
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample);
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample);
--
--template <boxm_apm_type APM>
--std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample);
--
--#endif // boxm_opt3_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
-deleted file mode 100644
-index 85f2e954dc..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_opt3_sample.hxx
-+++ /dev/null
-@@ -1,92 +0,0 @@
--#ifndef boxm_opt3_sample_hxx_
--#define boxm_opt3_sample_hxx_
--
--#include "boxm_opt3_sample.h"
--
--#include <vsl/vsl_vector_io.h>
--#include <vsl/vsl_binary_io.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_mixture_fixed.h> // for binary io functions
--#include <bsta/io/bsta_io_gaussian_indep.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/algo/boxm_mog_grey_processor.h>
--//#include <boxm/boxm_mog_rgb_processor.h>
--
--template <boxm_apm_type APM>
--void boxm_opt3_sample<APM>::print(std::ostream& os) const
--{
--  os << "(log_pass_prob_sum=" << log_pass_prob_sum_ << " seg_len_sum_=" << seg_len_sum_
--     << "weighted_vis_sum_=" << weighted_vis_sum_ << " obs_dist=" << obs_dist_ << ')';
--}
--
--template <boxm_apm_type APM>
--void boxm_opt3_sample<APM>::update_obs_dist(typename boxm_opt3_sample<APM>::obs_datatype obs, float obs_prob)
--{
--  boxm_apm_traits<APM>::apm_processor::update(obs_dist_, obs, obs_prob);
--}
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.log_pass_prob_sum_);
--  vsl_b_write(os, sample.seg_len_sum_);
--  vsl_b_write(os, sample.weighted_vis_sum_);
--  vsl_b_write(os, sample.obs_dist_);
--}
--
--template <boxm_apm_type APM>
--void vsl_b_write(vsl_b_ostream & os, boxm_opt3_sample<APM> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.log_pass_prob_sum_);
--    vsl_b_read(is, sample.seg_len_sum_);
--    vsl_b_read(is, sample.weighted_vis_sum_);
--    vsl_b_read(is, sample.obs_dist_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_opt3_sample<APM>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template <boxm_apm_type APM>
--void vsl_b_read(vsl_b_istream & is, boxm_opt3_sample<APM> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <boxm_apm_type APM>
--std::ostream& operator << (std::ostream& os, const boxm_opt3_sample<APM>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_OPT3_SAMPLE_INSTANTIATE(T) \
--template class boxm_opt3_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_opt3_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_opt3_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_opt3_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
-deleted file mode 100644
-index 417c0ccc98..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.h
-+++ /dev/null
-@@ -1,45 +0,0 @@
--#ifndef boxm_plane_obs_h_
--#define boxm_plane_obs_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <vgl/vgl_homg_plane_3d.h>
--#include <boxm/boxm_aux_traits.h>
--
--template<class T>
--class boxm_plane_obs
--{
-- public:
--  boxm_plane_obs() : seg_len_(0.0f), plane_(vgl_homg_plane_3d<T>()) {}
--  boxm_plane_obs(vgl_homg_plane_3d<T> plane, float seg_len) : seg_len_(seg_len), plane_(plane) {}
--  ~boxm_plane_obs() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const { os << "(plane=" << plane_ << " seg_len=" << seg_len_ << ')'; }
--
--  // public members
--  float seg_len_;
--  vgl_homg_plane_3d<T> plane_;
--};
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_plane_obs<T>& sample);
--
--
--#endif // boxm_plane_obs_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx b/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
-deleted file mode 100644
-index 5d2d8b4535..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_plane_obs.hxx
-+++ /dev/null
-@@ -1,69 +0,0 @@
--#ifndef boxm_plane_obs_hxx_
--#define boxm_plane_obs_hxx_
--
--#include "boxm_plane_obs.h"
--
--#include "boxm_edge_tangent_sample.h"
--#include "boxm_inf_line_sample.h"
--
--#include <vgl/io/vgl_io_homg_plane_3d.h> // for vsl_b_write(os, sample.plane_);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.seg_len_);
--  vsl_b_write(os, sample.plane_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_plane_obs<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.seg_len_);
--      vsl_b_read(is, sample.plane_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_edge_tangent_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_plane_obs<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator<< (std::ostream& os, boxm_plane_obs<T> const& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_PLANE_OBS_INSTANTIATE(T) \
--template class boxm_plane_obs<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_plane_obs<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_plane_obs<T > *&);\
--template std::ostream& operator << (std::ostream&, boxm_plane_obs<T > const&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
-deleted file mode 100644
-index e51d415ce8..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.h
-+++ /dev/null
-@@ -1,70 +0,0 @@
--#ifndef boxm_rt_sample_h_
--#define boxm_rt_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vil/vil_rgb.h>
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_aux_traits.h>
--
--template<class OBS_T>
--class boxm_rt_sample
--{
-- public:
--  boxm_rt_sample()
--    : obs_(0), pre_(0.0f), vis_(0.0f), PI_(0.0f), seg_len_(0.0f), Beta_(0.0f),
--    updatefactor_(0.0f), log_sum_(0.0f) {}
--  ~boxm_rt_sample() = default;
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  OBS_T obs_;
--  float pre_;
--  float vis_;
--  float PI_;
--  float seg_len_;
--  float Beta_;
--  float updatefactor_;
--  float log_sum_;
--};
--
--
--//: traits for a grey optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_GREY>
--{
-- public:
--  typedef boxm_rt_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_grey_work"; }
--};
--
--//: traits for an rgb optimization sample
--template<>
--class boxm_aux_traits<BOXM_AUX_OPT_RT_RGB>
--{
-- public:
--  typedef boxm_rt_sample<vil_rgb<float> > sample_datatype;
--
--  static std::string storage_subdir() { return "opt_rt_rgb_work"; }
--};
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_rt_sample<T>& sample);
--
--#endif // boxm_rt_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
-deleted file mode 100644
-index 4202653363..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_rt_sample.hxx
-+++ /dev/null
-@@ -1,81 +0,0 @@
--#ifndef boxm_rt_sample_hxx_
--#define boxm_rt_sample_hxx_
--
--#include "boxm_rt_sample.h"
--
--
--template <class OBS_T>
--void boxm_rt_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(obs=" << obs_ << " pre=" << pre_ << " vis=" << vis_ << " PI=" << PI_ << " seg_len=" << seg_len_ << " Beta=" << Beta_ << ')';
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.obs_);
--  vsl_b_write(os, sample.pre_);
--  vsl_b_write(os, sample.vis_);
--  vsl_b_write(os, sample.PI_);
--  vsl_b_write(os, sample.seg_len_);
--  vsl_b_write(os, sample.updatefactor_);
--  vsl_b_write(os, sample.Beta_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_rt_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.obs_);
--    vsl_b_read(is, sample.pre_);
--    vsl_b_read(is, sample.vis_);
--    vsl_b_read(is, sample.PI_);
--    vsl_b_read(is, sample.seg_len_);
--    vsl_b_read(is, sample.updatefactor_);
--    vsl_b_read(is, sample.Beta_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_rt_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_rt_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream &operator << (std::ostream& os, const boxm_rt_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_RT_SAMPLE_INSTANTIATE(T) \
--template class boxm_rt_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_rt_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_rt_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_rt_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.h b/contrib/brl/bseg/boxm/sample/boxm_sample.h
-deleted file mode 100644
-index 4d2312ae98..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample.h
-+++ /dev/null
-@@ -1,68 +0,0 @@
--#ifndef boxm_sample_h_
--#define boxm_sample_h_
--//:
--// \file
--#include <iostream>
--#include <utility>
--#include <boxm/boxm_apm_traits.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <bsta/io/bsta_io_attributes.h>
--
--template <boxm_apm_type APM_MODEL>
--class boxm_sample
--{
-- public:
--  static const boxm_apm_type apm_type = APM_MODEL;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
--  static const unsigned int obs_dim = boxm_apm_traits<APM_MODEL>::obs_dim;
--
--  //: default constructor: alpha is set to 0.0015.
--  boxm_sample() : alpha(0.0015f), appearance_() {}
--
--  boxm_sample(float alpha_val): alpha(alpha_val), appearance_() {}
--  //: constructor
--  boxm_sample(float alpha_val, apm_datatype apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
--
--  virtual ~boxm_sample() = default;
--
--  static short version_no() { return 1; }
--
--  //: bin is to imitate the bin number of multiple_bin case
--  apm_datatype & appearance(int /*bin*/=-1) { return appearance_; }
--
--  void set_appearance(apm_datatype  app,int /*bin*/=-1) { appearance_=app; }
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val() const { return alpha; }
--
--  //: the occlusion density at the sample point
--  float alpha;
--
--  //: the appearance model at the sample point
--  typename boxm_apm_traits<APM_MODEL>::apm_datatype appearance_;
--
--  void  print(std::ostream& os) const;
--};
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample);
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample);
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
-deleted file mode 100644
-index e644739f43..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample.hxx
-+++ /dev/null
-@@ -1,71 +0,0 @@
--#ifndef boxm_sample_hxx_
--#define boxm_sample_hxx_
--
--#include "boxm_sample.h"
--#include <bsta/bsta_mixture_fixed.h>
--
--template <boxm_apm_type APM_MODEL>
--void boxm_sample<APM_MODEL>::print(std::ostream& os) const
--{
--  os << "(alpha=" << alpha << " appearence=" << appearance_ << ')';
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.alpha);
--  vsl_b_write(os, sample.appearance_);
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample<APM_MODEL> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.alpha);
--      vsl_b_read(is, sample.appearance_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample<APM_MODEL> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample<APM_MODEL>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_SAMPLE_INSTANTIATE(T) \
--template class boxm_sample<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
-deleted file mode 100644
-index 838637e49f..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.h
-+++ /dev/null
-@@ -1,63 +0,0 @@
--#ifndef boxm_sample_multi_bin_h_
--#define boxm_sample_multi_bin_h_
--//:
--// \file
--#include <iostream>
--#include <utility>
--#include <boxm/boxm_apm_traits.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <bsta/bsta_attributes.h>
--
--template <boxm_apm_type APM_MODEL>
--class boxm_sample_multi_bin
--{
-- public:
--  static const boxm_apm_type apm_type = APM_MODEL;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_datatype apm_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_datatype obs_datatype;
--  typedef typename boxm_apm_traits<APM_MODEL>::obs_mathtype obs_mathtype;
--  typedef typename boxm_apm_traits<APM_MODEL>::apm_processor apm_processor;
--
--  //: default constructor
--  boxm_sample_multi_bin() : alpha(0.001f) {}
--  //: constructor
--  boxm_sample_multi_bin(float alpha_val,std::map<int,apm_datatype> apm_val): alpha(alpha_val), appearance_(std::move(apm_val)) {}
--
--  static short version_no() { return 1; }
--
--  //: returns a basic value that represents this sample (mostly for raw file creation purposes)
--  float basic_val() const { return alpha; }
--
--  //: the occlusion density at the sample point
--  float alpha;
--  apm_datatype & appearance(int bin=0);
--
--  void set_appearance(apm_datatype  app,int bin=0);
--
--  std::map<int,apm_datatype> appearance_;
--
--  void  print(std::ostream& os) const;
-- private:
--  //: the appearance model at the sample point
--};
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample);
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample);
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample);
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx b/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
-deleted file mode 100644
-index 714b493eec..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_sample_multi_bin.hxx
-+++ /dev/null
-@@ -1,98 +0,0 @@
--#ifndef boxm_sample_multi_bin_hxx_
--#define boxm_sample_multi_bin_hxx_
--
--#include "boxm_sample_multi_bin.h"
--#include <bsta/bsta_mixture_fixed.h>
--#include <vsl/vsl_map_io.hxx>
--#include <bsta/io/bsta_io_mixture_fixed.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <bsta/io/bsta_io_mixture.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_indep.h>
--
--template <boxm_apm_type APM_MODEL>
--typename boxm_sample_multi_bin<APM_MODEL>::apm_datatype & boxm_sample_multi_bin<APM_MODEL>::appearance(int bin)
--{
--  if (appearance_.find(bin)==appearance_.end())
--  {
--    appearance_[bin]=apm_datatype();
--    return appearance_[bin];
--  }
--  else
--    return appearance_[bin];
--}
--
--template <boxm_apm_type APM_MODEL>
--void boxm_sample_multi_bin<APM_MODEL>::set_appearance(apm_datatype  app,int bin)
--{
--  appearance_[bin]=app;
--}
--
--template <boxm_apm_type APM_MODEL>
--void boxm_sample_multi_bin<APM_MODEL>::print(std::ostream& os) const
--{
--  os << "(alpha=" << alpha << " appearence=" ;
--  for (typename std::map<int,apm_datatype>::const_iterator iter=appearance_.begin();
--       iter!=appearance_.end(); ++iter)
--    os << "bin#= " << iter->first << ' ' << iter->second;
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.alpha);
--  vsl_b_write(os, sample.appearance_);
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_write(vsl_b_ostream & os, boxm_sample_multi_bin<APM_MODEL> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.alpha);
--      vsl_b_read(is, sample.appearance_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample_multi_bin<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <boxm_apm_type APM_MODEL>
--void vsl_b_read(vsl_b_istream & is, boxm_sample_multi_bin<APM_MODEL> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <boxm_apm_type APM_MODEL>
--std::ostream& operator << (std::ostream& os, const boxm_sample_multi_bin<APM_MODEL>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_SAMPLE_MULTI_BIN_INSTANTIATE(T) \
--template class boxm_sample_multi_bin<T >; \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, boxm_sample_multi_bin<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > &); \
--template void vsl_b_read(vsl_b_istream &, boxm_sample_multi_bin<T > *&); \
--template std::ostream& operator << (std::ostream&, const boxm_sample_multi_bin<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
-deleted file mode 100644
-index ba4cd770ad..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.h
-+++ /dev/null
-@@ -1,55 +0,0 @@
--#ifndef boxm_scalar_sample_h_
--#define boxm_scalar_sample_h_
--//:
--// \file
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--#include <boxm/boxm_apm_traits.h>
--
--
--template <class T>
--class boxm_scalar_sample
--{
-- public:
--  boxm_scalar_sample() : scalar_sum_(0), seg_len_(0.0f) { }
--
--  ~boxm_scalar_sample() = default;
--  T basic_val() { if (seg_len_>0) return scalar_sum_/seg_len_; else return (T)0; }
--  static short version_no() { return 1; }
--  void print(std::ostream& os) const;
--
--  T scalar_sum_;
--  float seg_len_;
--};
--
--//: traits for a scalar sample
--template <>
--class boxm_apm_traits<BOXM_SCALAR_FLOAT>
--{
-- public:
--  typedef boxm_scalar_sample<float> sample_datatype;
--
--  static std::string storage_subdir() { return "scalar_subdir"; }
--};
--
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample);
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const* &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample);
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T>* &sample);
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample);
--
--#endif // boxm_scalar_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx b/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
-deleted file mode 100644
-index 6eb0d37aef..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_scalar_sample.hxx
-+++ /dev/null
-@@ -1,70 +0,0 @@
--#ifndef boxm_scalar_sample_hxx_
--#define boxm_scalar_sample_hxx_
--
--#include "boxm_scalar_sample.h"
--
--template <class OBS_T>
--void boxm_scalar_sample<OBS_T>::print(std::ostream& os) const
--{
--  os << "(scalar=" << scalar_sum_ << " seg_len=" << seg_len_ << ")\n";
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.scalar_sum_);
--  vsl_b_write(os, sample.seg_len_);
--}
--
--template <class T>
--void vsl_b_write(vsl_b_ostream & os, boxm_scalar_sample<T> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--   case 1:
--    vsl_b_read(is, sample.scalar_sum_);
--    vsl_b_read(is, sample.seg_len_);
--    break;
--   default:
--    std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_scalar_sample<T>&)\n"
--             << "           Unknown version number "<< version << '\n';
--    is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--    break;
--  }
--}
--
--template <class T>
--void vsl_b_read(vsl_b_istream & is, boxm_scalar_sample<T> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--template <class T>
--std::ostream& operator << (std::ostream& os, const boxm_scalar_sample<T>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BOXM_SCALAR_SAMPLE_INSTANTIATE(T) \
--  template class boxm_scalar_sample<T >; \
--  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const &); \
--  template void vsl_b_write(vsl_b_ostream &, boxm_scalar_sample<T > const *&); \
--  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > &); \
--  template void vsl_b_read(vsl_b_istream &, boxm_scalar_sample<T > *&); \
--  template std::ostream& operator << (std::ostream&, const boxm_scalar_sample<T >&)
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h b/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
-deleted file mode 100644
-index 666c4a3ac5..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_update_sample.h
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#ifndef boxm_update_sample_h_
--#define boxm_update_sample_h_
--//:
--// \file
--
--class boxm_update_sample
--{
-- public:
--  //: default constructor
--  boxm_update_sample() : update_multiplier(0.0f), do_update(false) {}
--
--  //: the (unnormalized) update multiplier
--  float update_multiplier;
--  bool do_update;
--};
--
--#endif // boxm_update_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h b/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
-deleted file mode 100644
-index 3ff4ed3ad5..0000000000
---- a/contrib/brl/bseg/boxm/sample/boxm_vis_implicit_sample.h
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#ifndef boxm_vis_implicit_sample_h_
--#define boxm_vis_implicit_sample_h_
--//:
--// \file
--
--class boxm_vis_implicit_sample
--{
-- public:
--  //: default constructor
--  boxm_vis_implicit_sample() : max_vis(0.0f), n_obs(0) {}
--
--  float max_vis;
--  unsigned int n_obs;
--};
--
--#endif // boxm_vis_implicit_sample_h_
-diff --git a/contrib/brl/bseg/boxm/sample/dummy.cxx b/contrib/brl/bseg/boxm/sample/dummy.cxx
-deleted file mode 100644
-index e69de29bb2..0000000000
-diff --git a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
-deleted file mode 100644
-index ed11dfb489..0000000000
---- a/contrib/brl/bseg/boxm/sample/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,4 +0,0 @@
--add_executable( boxm_sample_test_include test_include.cxx )
--target_link_libraries( boxm_sample_test_include boxm_sample)
--add_executable( boxm_sample_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_sample_test_template_include boxm_sample)
-diff --git a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
-deleted file mode 100644
-index 17e8b789dd..0000000000
---- a/contrib/brl/bseg/boxm/sample/tests/test_include.cxx
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#include <boxm/sample/boxm_edge_sample.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <boxm/sample/boxm_inf_line_sample.h>
--#include <boxm/sample/boxm_opt2_sample.h>
--#include <boxm/sample/boxm_opt3_sample.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/sample/boxm_rt_sample.h>
--#include <boxm/sample/boxm_sample.h>
--#include <boxm/sample/boxm_sample_multi_bin.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--#include <boxm/sample/boxm_update_sample.h>
--#include <boxm/sample/boxm_vis_implicit_sample.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
-deleted file mode 100644
-index d1f741b32f..0000000000
---- a/contrib/brl/bseg/boxm/sample/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/sample/boxm_edge_sample.hxx>
--#include <boxm/sample/boxm_edge_tangent_sample.hxx>
--#include <boxm/sample/boxm_inf_line_sample.hxx>
--#include <boxm/sample/boxm_opt2_sample.hxx>
--#include <boxm/sample/boxm_opt3_sample.hxx>
--#include <boxm/sample/boxm_plane_obs.hxx>
--#include <boxm/sample/boxm_rt_sample.hxx>
--#include <boxm/sample/boxm_sample.hxx>
--#include <boxm/sample/boxm_sample_multi_bin.hxx>
--#include <boxm/sample/boxm_scalar_sample.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/tests/CMakeLists.txt
-deleted file mode 100644
-index eb0d974b9f..0000000000
---- a/contrib/brl/bseg/boxm/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,32 +0,0 @@
--add_executable( boxm_test_all
--  test_driver.cxx
--  test_binary_io.cxx
--  test_block_iter.cxx
--# FAILS on DASHBOARD FIX_ME
--#  test_region_finder.cxx
--  test_cell_iterator.cxx
--  test_load_neighboring_blocks.cxx
-- )
--
--set(boxm_test_all_sources
--    test_utils.h    test_utils.cxx
--    )
--
--vxl_add_library(LIBRARY_NAME boxm_tests LIBRARY_SOURCES  ${boxm_test_all_sources})
--target_link_libraries(boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--
--target_link_libraries( boxm_test_all boxm_tests boxm boct ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vul)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
--
--add_test( NAME boxm_test_binary_io COMMAND $<TARGET_FILE:boxm_test_all>    test_binary_io  )
--add_test( NAME boxm_test_block_iter COMMAND $<TARGET_FILE:boxm_test_all>    test_block_iter  )
--#add_test( NAME boxm_test_region_finder COMMAND $<TARGET_FILE:boxm_test_all>    test_region_finder )
--if( VXL_RUN_FAILING_TESTS ) ## SEGFAULT when testing with ctest -j16 (perhaps files are shared between tests)
--add_test( NAME boxm_test_cell_iterator COMMAND $<TARGET_FILE:boxm_test_all>    test_cell_iterator )
--endif()
--add_test( NAME boxm_test_load_neighboring_blocks COMMAND $<TARGET_FILE:boxm_test_all>    test_load_neighboring_blocks )
--
--add_executable( boxm_test_include test_include.cxx )
--target_link_libraries( boxm_test_include boxm)
--add_executable( boxm_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_test_template_include boxm)
-diff --git a/contrib/brl/bseg/boxm/tests/camera0.txt b/contrib/brl/bseg/boxm/tests/camera0.txt
-deleted file mode 100644
-index cf11c57707..0000000000
---- a/contrib/brl/bseg/boxm/tests/camera0.txt
-+++ /dev/null
-@@ -1,104 +0,0 @@
--satId = "????";
--bandId = "RGB";
--SpecId = "RPC00B";
--BEGIN_GROUP = IMAGE
--
--
--  lineOffset = 0.0
--  sampOffset = 0.0
--  latOffset = 0.0
--  longOffset = 0.0
--  heightOffset = 0.0
--  lineScale = 1.0
--  sampScale = 1.0
--  latScale = 1.0
--  longScale = 1.0
--  heightScale = 1.0
--  lineNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  lineDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--END_GROUP = IMAGE
--END;
--lvcs
--47.550493 35.395931 664.186757
-diff --git a/contrib/brl/bseg/boxm/tests/frame_00000.txt b/contrib/brl/bseg/boxm/tests/frame_00000.txt
-deleted file mode 100644
-index a66e2014bd..0000000000
---- a/contrib/brl/bseg/boxm/tests/frame_00000.txt
-+++ /dev/null
-@@ -1,7 +0,0 @@
--1 0 0
--0 1 0
--0 0 1
--1 0 0
--0 1 0
--0 0 1
--0 0 0
-diff --git a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx b/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
-deleted file mode 100644
-index 7dc2da196e..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_binary_io.cxx
-+++ /dev/null
-@@ -1,75 +0,0 @@
--
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree.h>
--#include <vpl/vpl.h>
--#include <vul/vul_file.h>
--
--static void test_binary_io()
--{
--#ifdef DEBUG
--  short nlevels=5;
--  typedef vgl_point_3d<double> point_type;
--  boct_tree<short,point_type > * block = new boct_tree<short,point_type >(nlevels);
--  TEST("No of Max levels of tree",nlevels, block->num_levels());
--
--  block->split(); //block->print();
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<double> world_dim(30,30,30);
--  boxm_scene<boct_tree<short,point_type > > scene(lvcs, origin, block_dim, world_dim);
--  scene.set_paths("./boxm_scene", "block");
--  x_write(std::cout, scene, "scene");
--
--  vsl_b_ofstream os("scene.bin");
--  scene.b_write(os);
--  os.close();
--  vul_file::make_directory("./boxm_scene");
--
--  boxm_scene<boct_tree<short,vgl_point_3d<double> > > scene_out;
--  vsl_b_ifstream is("scene.bin", std::ios::binary);
--  scene_out.b_read(is);
--  vpl_rmdir("./boxm_scene");
--  vpl_unlink("./scene.bin");
--
--  // writing the binary file for a scene with grey MOG
--  vgl_point_3d<double>  mog_origin(0,0,0);
--  vgl_vector_3d<double> mog_block_dim(1,1,1);
--  vgl_vector_3d<double> mog_world_dim(3,3,1);
--
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > mog_scene( mog_origin, mog_block_dim, mog_world_dim);
--  mog_scene.set_paths("./boxm_scene", "block");
--  vul_file::make_directory("./boxm_scene");
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > iter(&mog_scene);
--
--  while (!iter.end())
--  {
--    mog_scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=mog_scene.get_active_block();
--    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=new boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> >(10,6);
--    block->init_tree(tree);
--    mog_scene.write_active_block();
--    iter++;
--  }
--  mog_scene.write_scene();
--  // writing the binary file for a scene with grey MOG
--  boxm_scene<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_mog_scene;
--  read_mog_scene.load_scene("./boxm_scene/scene.xml");
--
--  boxm_block_iterator<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > read_iter(&read_mog_scene);
--  while (!read_iter.end())
--  {
--    read_mog_scene.load_block(read_iter.index().x(),read_iter.index().y(),read_iter.index().z());
--    boxm_block<boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > > * block=read_mog_scene.get_active_block();
--    boct_tree<short,boxm_sample<BOXM_APM_MOG_GREY> > * tree=block->get_tree();
--    read_iter++;
--  }
--  vpl_rmdir("./boxm_scene");
--  vpl_unlink("./scene.bin");
--#endif // DEBUG
--}
--
--TESTMAIN(test_binary_io);
-diff --git a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx b/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
-deleted file mode 100644
-index 376ee2d9b4..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_block_iter.cxx
-+++ /dev/null
-@@ -1,47 +0,0 @@
--#include <testlib/testlib_test.h>
--
--#include <boxm/boxm_scene.h>
--#include <boct/boct_tree.h>
--
--#include "test_utils.h"
--
--typedef boct_tree<short,vgl_point_3d<double> > tree_type;
--
--static void test_block_iter()
--{
--  clean_up();
--  short nlevels=5;
--  auto * block = new tree_type(nlevels);
--  TEST("No of Max levels of tree",nlevels, block->number_levels());
--
--  block->split();
--  block->print();
--  delete block;
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(3,3,3);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  scene.set_paths("./boxm_scene", "block");
--
--  boxm_block_iterator<tree_type> iter = scene.iterator();
--  int num_blocks=0;
--  for (; !iter.end(); ++iter) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type> *block = scene.get_active_block();
--    block->set_tree(new tree_type(5,3));
--    std::cout << block->bounding_box() << std::endl;
--    ++num_blocks;
--    scene.write_active_block();
--  }
--  int x,y,z;
--  scene.block_num(x,y,z);
--  TEST("Number of blocks iterator visits", num_blocks, x*y*z);
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks in test_block_iter: " << boct_tree_cell<short,vgl_point_3d<double> >::nleaks() << '\n';
--#endif
--  clean_up();
--}
--
--TESTMAIN(test_block_iter);
-diff --git a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx b/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
-deleted file mode 100644
-index f65529a973..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_cell_iterator.cxx
-+++ /dev/null
-@@ -1,51 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <testlib/testlib_test.h>
--#include "test_utils.h"
--
--void test_cell_iterator()
--{
--
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene();
--
--  //get the iterator
--  boxm_cell_iterator<boct_tree<short, float > > iterator = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors);
--  iterator.begin();
--
--  boct_tree_cell<short,float> *cell = *iterator;
--  unsigned num_cells = 0;
--  bool result = true;
--
--  while (!iterator.end()) {
--
--    if( (std::abs(cell->data() - 0.8) > 1e-7) && (std::abs(cell->data() - 0.5) > 1e-7) ){
--      result = false;
--      std::cerr << " Wrong data: " << cell->data() << std::endl;
--    }
--    ++iterator;
--    num_cells ++;
--        if(!iterator.end()){
--    cell = *iterator;
--        }
--  }
--
--  if(num_cells!=120){
--    result = false;
--    std::cerr << "Wrong number of cells: " << num_cells << std::endl;
--  }
--
--  TEST("Valid Test", result, true);
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_cell_iterator " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--  clean_up();
--
--}
--
--
--TESTMAIN(test_cell_iterator);
-diff --git a/contrib/brl/bseg/boxm/tests/test_driver.cxx b/contrib/brl/bseg/boxm/tests/test_driver.cxx
-deleted file mode 100644
-index 3e55d5a0ea..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_binary_io );
--DECLARE( test_block_iter );
--//FAILS ON DASHBOARD FIX_ME
--//DECLARE( test_region_finder );
--DECLARE( test_cell_iterator );
--DECLARE( test_load_neighboring_blocks );
--
--void register_tests()
--{
--  REGISTER( test_binary_io );
--  REGISTER( test_block_iter );
--//FAILS ON DASHBOARD FIX_ME
--// REGISTER( test_region_finder );
--  REGISTER( test_cell_iterator );
--  REGISTER( test_load_neighboring_blocks );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/tests/test_include.cxx b/contrib/brl/bseg/boxm/tests/test_include.cxx
-deleted file mode 100644
-index ae4ae05a88..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_include.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/boxm_aux_scene.h>
--#include <boxm/boxm_aux_traits.h>
--#include <boxm/boxm_block.h>
--#include <boxm/boxm_io_scene_base.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene_parser.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx b/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
-deleted file mode 100644
-index 1f8fe346ca..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_load_neighboring_blocks.cxx
-+++ /dev/null
-@@ -1,89 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 17-Aug-2010
--
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--void test_load_neighboring_blocks()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
--  std::cout << "Scene Created" << std::endl;
--
--  //iterate through blocks, loading blocks and eighbors
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  bool result = true;
--  while (!iter.end()) {
--    if (scene->load_block_and_neighbors(iter.index().x(),iter.index().y(),iter.index().z())) {
--      //std::cout << "Center blocks : "  << iter.index()<< std::endl;
--      std::set<vgl_point_3d<int>, bvgl_point_3d_cmp<int> > active_blocks = scene->active_blocks();
--
--      //iterate through the active blocks and check that their trees are in memory
--      auto it = active_blocks.begin();
--
--      for (; it!=active_blocks.end(); it++){
--        boxm_block<boct_tree<short, float> > *block = scene->get_block(*it);
--        if(!block)
--          result = false;
--        boct_tree<short, float> *tree = block->get_tree();
--        if(!tree)
--          result =false;
--      }
--
--
--      unsigned sum =0;
--      if (iter.index().x()>0 && iter.index().x()<3) sum++;
--      if (iter.index().y()>0 && iter.index().y()<3) sum++;
--      if (iter.index().z()>0 && iter.index().z()<3) sum++;
--      if(sum == 0)
--        if(active_blocks.size()!=8){
--          result = false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--      if(sum == 1)
--        if(active_blocks.size()!=12){
--          result = false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--      if(sum == 2)
--        if(active_blocks.size()!=18){
--          result = false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--      if(sum == 3)
--        if(active_blocks.size()!=27){
--          result=false;
--          std::cout << sum << ' ' << active_blocks.size() << std::endl;
--        }
--#if 0
--      std::cout << "Active blocks : " << std::endl;
--      std::set<vgl_point_3d<int> >::iterator it = active_blocks.begin();
--      for (; it!=active_blocks.end(); it++)
--        std::cout << *it << std::endl;
--#endif
--    }
--    iter++;
--
--  }
--
--  scene->unload_active_blocks();
--  if(scene->active_blocks().size()!=0){
--    result = false;
--    std::cout << "Failed to unload active blocks" << std::endl;
--  }
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks test_load_neighboring_blocks: " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  TEST("Valid Test", result, true);
--  clean_up();
--}
--
--
--TESTMAIN(test_load_neighboring_blocks);
-diff --git a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx b/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
-deleted file mode 100644
-index 47d5fd903b..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_region_finder.cxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--//:
--// \file
--// \brief  A test to verify that findind cells within a region is correct
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--void test_region_finder()
--{
--  clean_up();
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene();
--
--  bool result = true;
--
--  if(!scene) result=false;
--
--  //find a region
--
--  {
--    vgl_point_3d<double> max_point(14.0, 14.0, 14.0);
--    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
--    vgl_box_3d<double> roi(min_point, max_point);
--
--    std::vector<boct_tree_cell<short, float>* > cells;
--    scene->leaves_in_region(roi,cells);
--
--
--    if(cells.size()!=64){
--      result=false;
--      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
--    }
--
--    for(unsigned i =0; i<cells.size(); i++)
--      if(std::abs(cells[i]->data()- 0.8f)>1.0e-7)
--      {
--        result = false;
--        std::cerr << cells[i]->data()<<std::endl;
--      }
--
--    cells.clear();
--    scene->unload_active_blocks();
--
--  }
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Region1: " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  //find another region
--  {
--    vgl_point_3d<double> max_point(19.0, 19.0, 19.0);
--    vgl_point_3d<double> min_point(6.0, 6.0, 6.0);
--    vgl_box_3d<double> roi(min_point, max_point);
--
--    std::vector<boct_tree_cell<short, float>* > cells;
--    scene->leaves_in_region(roi,cells);
--
--    if(cells.size()!=83){
--      result=false;
--      std::cerr << "Number of cells in the region: " << cells.size() <<std::endl;
--    }
--
--    cells.clear();
--    scene->unload_active_blocks();
--  }
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Region2: " << boct_tree_cell<short, float >::nleaks() << std::endl;
--#endif
--
--  if(!scene) result=false;
--
--  TEST("Correct region found", result, true);
--  clean_up();
--}
--
--
--TESTMAIN(test_region_finder);
-diff --git a/contrib/brl/bseg/boxm/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/tests/test_template_include.cxx
-deleted file mode 100644
-index edd7156927..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <boxm/boxm_aux_scene.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/tests/test_utils.cxx b/contrib/brl/bseg/boxm/tests/test_utils.cxx
-deleted file mode 100644
-index 58b40215a5..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_utils.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#include "test_utils.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Aug-2010
--
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i)
--{
--  tree-> split(); //now we have 8 cells
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  leaves[i]->set_data(0.8f);
--  leaves[i]->split();
--}
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz)
--{
--  //crete the input scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--
--  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
--
--    vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
--
--  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim);
--  std::string scene_path("./");
--  scene->set_paths(scene_path, "test_scene");
-- #ifdef DEBUG
--  std::cerr << "Leaks Created - scene constructor: " << boct_tree_cell<short,float>::nleaks() << '\n';
--#endif
--  unsigned cell_index = 7;
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  while (!iter.end())
--  {
--    //std::cout << "Loading block " << iter.index() << std::endl;
--    scene->load_block(iter.index());
--    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
--    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
--    auto *tree = new boct_tree<short,float>(0.5f, 3, 1);
--    //tree->print();
--    init_tree(tree, cell_index);
--    //tree->print();
--    block->init_tree(tree);
--    scene->write_active_block();
--    if (cell_index == 0) cell_index = 7;
--    cell_index--;
--    ++iter;
--  }
--  //scene->unload_active_blocks();
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << '\n';
--#endif
--
--  return scene;
--}
--
--void clean_up()
--{
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());
--    //vul_file::delete_file_glob(file_it());// already deleted ?? FIX_ME
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/tests/test_utils.h b/contrib/brl/bseg/boxm/tests/test_utils.h
-deleted file mode 100644
-index 43f864a0da..0000000000
---- a/contrib/brl/bseg/boxm/tests/test_utils.h
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#ifndef boxm_test_utils_h_
--#define boxm_test_utils_h_
--//:
--// \file
--// \brief  A file containing utility functions for other tests
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <boxm/boxm_scene.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i);
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2);
--
--void clean_up();
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/CMakeLists.txt b/contrib/brl/bseg/boxm/util/CMakeLists.txt
-deleted file mode 100644
-index 10f3b5fd49..0000000000
---- a/contrib/brl/bseg/boxm/util/CMakeLists.txt
-+++ /dev/null
-@@ -1,23 +0,0 @@
--# brl/bseg/boxm/util/CMakeLists.txt
--include_directories( ${MUL_INCLUDE_DIR} )
--set(boxm_util_sources
--    boxm_cell_data_traits.h                 boxm_cell_data_traits.cxx
--    boxm_plane_ransac.h
--    boxm_quad_scan_iterator.h               boxm_quad_scan_iterator.cxx
--    boxm_rational_camera_utils.h            boxm_rational_camera_utils.cxx
--    boxm_raytrace_operations.h              boxm_raytrace_operations.cxx
--    boxm_triangle_interpolation_iterator.h  boxm_triangle_interpolation_iterator.hxx
--    boxm_triangle_scan_iterator.h           boxm_triangle_scan_iterator.cxx
--    boxm_utils.h                            boxm_utils.cxx
--    boxm_vrml_util.h
--    boxm_test_util.h                        boxm_test_util.cxx
--   )
--
--aux_source_directory(Templates boxm_util_sources)
--
--vxl_add_library(LIBRARY_NAME boxm_util LIBRARY_SOURCES ${boxm_util_sources})
--target_link_libraries(boxm_util boxm boxm_sample bvrml boct bsta ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx b/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
-deleted file mode 100644
-index 3a276cc3b2..0000000000
---- a/contrib/brl/bseg/boxm/util/Templates/boxm_triangle_interpolation_iterator+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
--
--BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
-deleted file mode 100644
-index b4bf234941..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.cxx
-+++ /dev/null
-@@ -1,25 +0,0 @@
--#include "boxm_cell_data_traits.h"
--//:
--// \file
--
--
--//: Template specialization of zero_val for floating point case
--template <>
--float boxm_zero_val<short, float>()
--{
--  return 0.0f;
--}
--
--
--//: Template specialization of zero_val for unimodal gaussian
--template <>
--bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >()
--{
--  return {};
--}
--
--template <>
--mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>()
--{
--  return {};
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h b/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
-deleted file mode 100644
-index c96599e730..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_cell_data_traits.h
-+++ /dev/null
-@@ -1,89 +0,0 @@
--// This is brl/bseg/boxm/util/boxm_cell_data_traits.h
--#ifndef boxm_cell_data_traits_h_
--#define boxm_cell_data_traits_h_
--//:
--// \file
--// \brief  Set of accessors of cell's data, taking care of different datatypes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date   December 9, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boct/boct_tree_cell.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <boxm/sample/boxm_scalar_sample.h>
--
--//: Float to float
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, float >* cell,  double /*step_len*/)
--{
--  //return 1.0 - std::exp(-cell->data()*step_len);
--  return cell->data();
--}
--
--//: Float to float
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, short >* cell,  double /*step_len*/)
--{
--  return (float)cell->data();
--}
--
--//: bool to float
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, bool >* cell,  double /*step_len*/)
--{
--  return (float)cell->data();
--}
--
--//: Mixture of gaussians to float; return the mean
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, bsta_num_obs<bsta_gauss_sf1> >* cell, double /*step_len*/)
--{
--  return cell->data().mean();
--}
--
--//: Mixture of gaussians to float; return the mean
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype >* cell, double /*step_len*/)
--{
--  return cell->data().expected_value();
--}
--
--//: boxm_sample to float. Return the probability values
--template <class T_loc, class T_data>
--float boxm_cell_to_float(boct_tree_cell<T_loc, T_data >* cell, double step_len)
--{
--  return 1.f - float(std::exp(-cell->data().basic_val()*step_len));
--}
--
--
--template <class T_loc, class T_data>
--T_data boxm_zero_val()
--{
--  return T_data(0);
--}
--
--static const unsigned int n_gaussian_modes_ = 3;
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
--typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
--template <>
--mix_gauss_sf1_type boxm_zero_val<short, mix_gauss_sf1_type>();
--
--template <>
--bsta_num_obs<bsta_gauss_sf1> boxm_zero_val<short, bsta_num_obs<bsta_gauss_sf1> >();
--
--template <>
--float boxm_zero_val<short, float >();
--
--//: boxm_scalar_sample to float. Return the normalized scalar value
--template <class T_loc>
--float boxm_cell_to_float(boct_tree_cell<T_loc, boxm_scalar_sample<float>  >* cell, double /*step_len*/)
--{
--  return cell->data().basic_val();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h b/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
-deleted file mode 100644
-index 07d10348a6..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_plane_ransac.h
-+++ /dev/null
-@@ -1,126 +0,0 @@
--#ifndef boxm_plane_ransac_h_
--#define boxm_plane_ransac_h_
--//:
--// \file
--// \brief class to find the optimal intersecting 3D line of a set of 3D planes.
--//
--// \author G. Tunali
--//
--// \verbatim
--//  Modifications
--//   Ozge C. Ozcanli  July 7, 2010 : made some internal hard-coded defaults into parameters
--// \endverbatim
--
--#include <iostream>
--#include <cstdlib>
--#include <list>
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vgl/vgl_intersection.h>
--#include <vgl/algo/vgl_intersection.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_distance.h>
--#include <vgl/vgl_vector_3d.h>
--#include <vgl/vgl_closest_point.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#define ITER_MAX 100
--
--template <class T>
--bool boxm_plane_ransac(std::vector<boxm_edge_tangent_sample<T> > aux_samples,
--                       std::vector<T> /*weights*/,
--                       vgl_infinite_line_3d<T>& line,
--                       T &min_res, vgl_box_3d<double> cell_global_box,
--                       unsigned int threshold, float ortho_thres = 0.01f, float volume_ratio = 128.0f)
--{
--  unsigned int num_imgs = aux_samples.size();
--
--  vgl_point_3d<T> local_origin((T)cell_global_box.centroid_x(),(T)cell_global_box.centroid_y(),(T)cell_global_box.centroid_z());
--  std::list<vgl_plane_3d<T> > fit_planes;
--  min_res=T(1e10);
--  line=vgl_infinite_line_3d<T>(vgl_vector_2d<T>(-10000,-10000),vgl_vector_3d<T>(0,0,1));
--  std::vector<T> ws;
--  bool set=false;
--  // this threshold is to check participation from number of images
--  if (num_imgs<=threshold)
--    return set;
--
--  for (unsigned iter=0; iter<ITER_MAX; iter++)
--  {
--    fit_planes.clear();
--    ws.clear();
--    // select two imgs randomly
--    int index1 = std::rand() % num_imgs;
--    int index2 = index1;
--    while (index2==index1)
--      index2=std::rand() % num_imgs;
--
--    int index1_1 =std::rand() % aux_samples[index1].num_obs();
--    int index2_1 =std::rand() % aux_samples[index2].num_obs();
--
--    vgl_plane_3d<T> plane1 = aux_samples[index1].obs(index1_1).plane_;
--    vgl_plane_3d<T> plane2 = aux_samples[index2].obs(index2_1).plane_;
--
--    vgl_infinite_line_3d<T> inters_line;
--    // form a hypothesis
--    if (vgl_intersection(plane1, plane2, inters_line))
--    {
--      vgl_vector_3d<T> line_dir = inters_line.direction();
--      vgl_point_3d<T> p=vgl_closest_point<T>(inters_line,local_origin);
--      int cnt_imgs=0;
--      // only if the hypothesis is close to the cell in consideration
--      // can be made more tighter.
--      if (vgl_distance<T>(p,local_origin)<0.67*cell_global_box.width())
--      {
--        for (unsigned i=0; i<aux_samples.size(); ++i) {
--          bool flag=false;
--          for (unsigned j=0;j<aux_samples[i].num_obs();j++)
--          {
--            vgl_plane_3d<T> plane = aux_samples[i].obs(j).plane_;
--            vgl_vector_3d<T> normal = plane.normal();
--            // see if the line direction and plane normal is perpendicular
--            T res = dot_product(normal,line_dir);
--            if (std::fabs(res) < T(ortho_thres))  {  // ortho_thres, used to be hard-coded to 0.05, then made a param with default 0.01 (stricter)
--              // check to see if the line is close to the plane
--              if (plane.contains(p,T(cell_global_box.width())/T(volume_ratio)))  // volume_ratio, used to be hard-coded to 8, then made a param with default 128 (stricter)
--              {
--                fit_planes.push_back(plane);
--                //ws.push_back(weights[i]);
--                ws.push_back(aux_samples[i].obs(j).seg_len_);
--                flag=true;
--              }
--            }
--          }
--          if (flag)
--            cnt_imgs++;
--        }
--      }
--
--      // intersect the selected planes
--      if (cnt_imgs > (int)threshold ) {
--        T res=0;
--        vgl_infinite_line_3d<T> l;
--        bool good = vgl_intersection(fit_planes, ws, l, res);
--        vgl_point_3d<double> p0,p1;
--        vgl_vector_2d<double> x0(l.x0().x(), l.x0().y());
--        vgl_vector_3d<double> dir(l.direction().x(), l.direction().y(), l.direction().z());
--
--        if (good&&vgl_intersection<double>(cell_global_box, vgl_infinite_line_3d<double>(x0,dir), p0, p1)) {
--          if (res<min_res) {
--            min_res=res;
--            line=l;
--            set=true;
--          }
--        }
--      }
--    }
--  }
--
--  return set;
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
-deleted file mode 100644
-index c1e220a294..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.cxx
-+++ /dev/null
-@@ -1,188 +0,0 @@
--#include <vector>
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_quad_scan_iterator.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: constructor
--boxm_quad_scan_iterator::boxm_quad_scan_iterator(double *verts_x, double *verts_y,
--                                                 unsigned int v0, unsigned int v1,
--                                                 unsigned int v2, unsigned int v3):poly_()
--{
--  poly_.new_sheet();
--
--  poly_.push_back(verts_x[v0] * supersample_ratio_ - 0.5,
--                  verts_y[v0] * supersample_ratio_ - 0.5);
--  poly_.push_back(verts_x[v1] * supersample_ratio_ - 0.5,
--                  verts_y[v1] * supersample_ratio_ - 0.5);
--  poly_.push_back(verts_x[v2] * supersample_ratio_ - 0.5,
--                  verts_y[v2] * supersample_ratio_ - 0.5);
--  poly_.push_back(verts_x[v3] * supersample_ratio_ - 0.5,
--                  verts_y[v3] * supersample_ratio_ - 0.5);
--
--  super_it_= new vgl_polygon_scan_iterator<double>(poly_,false);
--
--  poly_bb_.update(verts_x[v0], verts_y[v0]);
--  poly_bb_.update(verts_x[v1], verts_y[v1]);
--  poly_bb_.update(verts_x[v2], verts_y[v2]);
--  poly_bb_.update(verts_x[v3], verts_y[v3]);
--
--  int poly_xmin = (int)std::floor(poly_bb_.xmin());
--  int poly_xmax = (int)std::floor(poly_bb_.xmax()) + 1;
--  poly_diameter_x_ = (poly_xmax - poly_xmin) + 1;
--  aa_vals_ = new float[poly_diameter_x_];
--  aa_vals_offset_ = -poly_xmin;
--  next_return_ = false;
--}
--
--
--//: Resets the scan iterator to before the first scan line
--//  After calling this function, next() needs to be called before
--//  startx() and endx() form a valid scan line.
--void boxm_quad_scan_iterator::reset()
--{
--  super_it_->reset();
--  next_return_ = super_it_->next();
--  while (next_return_ && super_it_->scany() < 0) {
--    next_return_ = super_it_->next();
--  }
--}
--
--//: Tries to move to the next scan line.
--//  Returns false if there are no more scan lines.
--bool boxm_quad_scan_iterator::next()
--{
--  if (!next_return_) {
--    return false;
--  }
--  int super_scany = super_it_->scany();
--  scany_ = super_scany / supersample_ratio_; // super_scany should always be >= 0
--
--  // initialize startx_ and endx_
--  startx_ = int(poly_bb_.xmax()) + 1;
--  endx_ =  int(poly_bb_.xmin()) - 1;
--
--  // compute antialiasing values for each pixel in scanline
--  //std::fill(aa_vals_.begin(), aa_vals_.end(), 0.0f);
--  for (unsigned int i=0; i<poly_diameter_x_; i++)
--    aa_vals_[i] = 0.0f;
--
--  int super_scany_end = (scany_ + 1)*supersample_ratio_;
--  static const float increment = 1.0f / (supersample_ratio_*supersample_ratio_);
--  static const float full_increment = 1.0f / (supersample_ratio_);
--
--  while ( (super_scany < super_scany_end) && next_return_ ) {
--    int super_startx = super_it_->startx();
--    int super_endx = super_it_->endx() + 1;
--
--    super_startx = std::max(0, super_startx);
--    super_endx = std::max(0, super_endx);
--    // make sure super_startx < super_endx
--    if (super_endx > super_startx) {
--      int scanline_startx = super_startx / supersample_ratio_;
--      int scanline_endx = ((super_endx - 1)/ supersample_ratio_) + 1;
--      // update startx and endx
--      if (scanline_startx < startx_) {
--        startx_ = scanline_startx;
--      }
--      if (scanline_endx > endx_) {
--        endx_ = scanline_endx;
--      }
--      // case 1: run covers 1 superpixel only
--      if (scanline_startx + 1 == scanline_endx) {
--        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(super_endx - super_startx);
--      }
--      // case 2: startx is less than endx by more than 1
--      else {
--        // partial coverage at the beginning of scanline
--        aa_vals_[aa_vals_offset_ + scanline_startx] += increment*(supersample_ratio_ - (super_startx % supersample_ratio_));
--
--        // full coverage in middle of scanline
--        for (int x = scanline_startx + 1; x < scanline_endx-1; ++x) {
--          aa_vals_[aa_vals_offset_ + x] += full_increment;
--        }
--        // partial coverage at end of scanline
--        aa_vals_[aa_vals_offset_ + scanline_endx - 1] += increment*((super_endx - 1)% supersample_ratio_ + 1);
--      }
--    }
--    next_return_ = super_it_->next();
--    super_scany = super_it_->scany();
--  }
--  return true;
--}
--
--//: y-coordinate of the current scan line.
--int boxm_quad_scan_iterator::scany() const
--{
--  return scany_;
--}
--
--//: Returns starting x-value of the current scan line.
--//  startx() should be smaller than endx(), unless the scan line is empty
--int boxm_quad_scan_iterator::startx() const
--{
--  return startx_;
--}
--
--//: Returns ending x-value of the current scan line.
--//  endx() should be larger than startx(), unless the scan line is empty
--int  boxm_quad_scan_iterator::endx() const
--{
--  return endx_;
--}
--
--//: returns the amount of pixel at location x in the current scanline covered by the triangle
--float boxm_quad_scan_iterator::pix_coverage(int x)
--{
--  return aa_vals_[aa_vals_offset_ + x];
--}
--
--bool
--boxm_quad_scan_iterator:: x_start_end_val(const double * vals,double & start_val,double & end_val)
--{
--  int * chainnum=nullptr;
--  int * vertnum=nullptr;
--  int numcrossedges=0;
--  super_it_->get_crossedge_vertices(chainnum,vertnum,numcrossedges);
--  if (numcrossedges==2)
--  {
--    for (int i=0;i<numcrossedges;++i)
--    {
--      vgl_point_2d<double> p1=poly_[chainnum[i]][vertnum[i]];
--      double val1=vals[vertnum[i]];
--      double val2=0;
--      vgl_point_2d<double> p2;
--      if (vertnum[i]==3)
--      {
--        val2=vals[0];
--        p2=poly_[chainnum[i]][0];
--      }
--      else
--      {
--        val2=vals[vertnum[i]+1];
--        p2=poly_[chainnum[i]][vertnum[i]+1];
--      }
--      if (i==0)
--        start_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
--      else
--        end_val=val1+(val2-val1)*(super_it_->scany()-p1.y())/(p2.y()-p1.y());
--    }
--    delete [] vertnum;
--    delete [] chainnum;
--    return true;
--  }
--  else
--    return false;
--}
--
--
--boxm_quad_scan_iterator::~boxm_quad_scan_iterator()
--{
--  delete super_it_;
--  delete[] aa_vals_;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
-deleted file mode 100644
-index 86c7bd0565..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_quad_scan_iterator.h
-+++ /dev/null
-@@ -1,66 +0,0 @@
--#ifndef boxm_quad_scan_iterator_h_
--#define boxm_quad_scan_iterator_h_
--//:
--// \file
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vgl/vgl_region_scan_iterator.h>
--#include <vgl/vgl_polygon_scan_iterator.h>
--
--#include <vbl/vbl_bounding_box.h>
--
--class boxm_quad_scan_iterator : public vgl_region_scan_iterator
--{
-- public:
--  //: constructor
--  boxm_quad_scan_iterator(double *verts_x, double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2, unsigned int v3 = 3);
--  ~boxm_quad_scan_iterator() override;
--
--  //: Resets the scan iterator to before the first scan line
--  //  After calling this function, next() needs to be called before
--  //  startx() and endx() form a valid scan line.
--  void reset() override;
--
--  //: Tries to move to the next scan line.
--  //  Returns false if there are no more scan lines.
--  bool next() override;
--
--  //: y-coordinate of the current scan line.
--  int  scany() const override;
--
--  //: Returns starting x-value of the current scan line.
--  //  startx() should be smaller than endx(), unless the scan line is empty
--  int  startx() const override;
--
--  //: Returns ending x-value of the current scan line.
--  //  endx() should be larger than startx(), unless the scan line is empty
--  int  endx() const override;
--
--  //: returns the amount of pixel at location x in the current scanline covered by the triangle
--  float pix_coverage(int x);
--
--  bool x_start_end_val(const double * vals,double & start_val,double & end_val);
--
--
-- protected:
--  static const unsigned int supersample_ratio_ = 1;
--  vgl_polygon_scan_iterator<double> * super_it_;
--  vgl_polygon<double>  poly_;
--
--  int startx_;
--  int endx_;
--  int scany_;
--  bool next_return_;
--
--  unsigned int poly_diameter_x_;
--  float* aa_vals_;
--  int aa_vals_offset_;
--
--  vbl_bounding_box<double,2> poly_bb_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
-deleted file mode 100644
-index 4ffdd47b22..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.cxx
-+++ /dev/null
-@@ -1,36 +0,0 @@
--#include "boxm_rational_camera_utils.h"
--#include <vgl/vgl_point_2d.h>
--
--vgl_plane_3d<double>
--boxm_rational_camera_utils::boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
--                                                           vgl_plane_3d<double> top,
--                                                           vgl_plane_3d<double> bottom,
--                                                           unsigned ni, unsigned nj)
--{
--   vgl_point_3d<double> top_guess(0,0,-top.d()/top.c());
--   vgl_point_3d<double> bottom_guess(0,0,-bottom.d()/bottom.c());
--   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),top,top_guess,top_guess);
--   vpgl_backproject::bproj_plane(*rcam,vgl_point_2d<double>(ni/2,nj/2),bottom,bottom_guess,bottom_guess);
--
--   vgl_plane_3d<double> parallelplane(bottom_guess-top_guess,top_guess);
--
--   return parallelplane;
--}
--
--void
--boxm_rational_camera_utils::project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
--                                                            vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
--                                                            double* xverts, double* yverts,
--                                                            float* vertdist)
--{
--  double a=plane.a();
--  double b=plane.b();
--  double c=plane.c();
--  double d=plane.d();
--  double denom=std::sqrt(a*a+b*b+c*c);
--  for (unsigned i=0; i<corners.size(); ++i)
--  {
--    rcam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
--    vertdist[i]=float((corners[i].x()*a+corners[i].y()*b+corners[i].z()*c+d)/denom);
--  }
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h b/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
-deleted file mode 100644
-index 61c9252276..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_rational_camera_utils.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#ifndef boxm_rational_camera_utils_h
--#define boxm_rational_camera_utils_h
--
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vpgl/vpgl_rational_camera.h>
--#include <vpgl/algo/vpgl_backproject.h>
--
--class boxm_rational_camera_utils
--{
-- public:
--  static vgl_plane_3d<double>  boxm_find_parallel_image_plane(vpgl_rational_camera<double> * rcam,
--                                                              vgl_plane_3d<double> top,
--                                                              vgl_plane_3d<double> bottom,
--                                                              unsigned ni, unsigned nj);
--  static void project_corners_rational_camera(std::vector<vgl_point_3d<double> > const& corners,
--                                              vpgl_rational_camera<double> * rcam,vgl_plane_3d<double> plane,
--                                              double* xverts, double* yverts,
--                                              float* vertdist);
--};
--
--class abs_functor
--{
-- public:
--  abs_functor()= default;
--
--  float operator()(float x) const { return std::fabs(x); }
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
-deleted file mode 100644
-index 1b1a95623b..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.cxx
-+++ /dev/null
-@@ -1,232 +0,0 @@
--#include "boxm_raytrace_operations.h"
--
--bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance)
--{
--  // multiply each vertex distance by alpha
--  float vert_alpha_distances[8];
--  float *vert_dist_ptr = vert_distances;
--  float *vert_alpha_dist_ptr = vert_alpha_distances;
--  for (unsigned int i=0; i<8; ++i) {
--    *vert_alpha_dist_ptr++ = *vert_dist_ptr++ * alpha;
--  }
--
--  // for each face, create two triangle iterators and fill in pixel data
--  // X_LOW
--  // tri 0
--  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_alpha_distances, 0, 4, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--
--  // X_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 1, 2, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 2, 6, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--
--  // Y_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 5, 4);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // Y_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 2, 6);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 3, 6, 7);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // Z_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 1, 2);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 0, 2, 3);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  // Z_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 5, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_alpha_distances, 4, 7, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, alpha_distance, true);
--  else
--    tri_interpolate_values(tri_it, alpha_distance, false);
--
--  return true;
--}
--
--
--bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
--                     float* vert_distances, boct_face_idx visible_faces,
--                     vil_image_view<float> &depth_image)
--{
--  // for each face, create two triangle iterators and fill in pixel data
--  // X_LOW
--  // tri 0
--  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_distances, 0, 4, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 3);
--  if (visible_faces & X_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--
--  // X_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 1, 2, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 2, 6, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--
--  // Y_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 5, 4);
--  if (visible_faces & Y_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // Y_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 2, 6);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 3, 6, 7);
--  if (visible_faces & Y_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // Z_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 1, 2);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 0, 2, 3);
--  if (visible_faces & Z_LOW)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  // Z_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 5, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_distances, 4, 7, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolate_values(tri_it, depth_image, true);
--
--  return true;
--}
--
--
--bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val)
--{
--  // for each face, create two triangle iterators and fill in pixel data
--  boxm_triangle_scan_iterator tri_it(xverts_2d, yverts_2d, 0,4,3);
--  if (visible_faces & X_LOW) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 4, 3);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 3);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & X_HIGH) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 1, 2, 5);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 2, 6, 5);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Y_LOW) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 5);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 5, 4);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Y_HIGH) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 2, 6);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 3, 6, 7);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Z_LOW) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 1, 2);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 0, 2, 3);
--    tri_fill_value(tri_it, img, val);
--  }
--  if (visible_faces & Z_HIGH) {
--    // tri 0
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 5, 6);
--    tri_fill_value(tri_it, img, val);
--    // tri 1
--    tri_it = boxm_triangle_scan_iterator(xverts_2d, yverts_2d, 4, 7, 6);
--    tri_fill_value(tri_it, img, val);
--  }
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h b/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
-deleted file mode 100644
-index ee6147127b..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_raytrace_operations.h
-+++ /dev/null
-@@ -1,452 +0,0 @@
--#ifndef boxm_raytrace_operations_h_
--#define boxm_raytrace_operations_h_
--//:
--// \file
--
--#include <iostream>
--#include "boxm_triangle_interpolation_iterator.h"
--#include "boxm_triangle_scan_iterator.h"
--#include <boxm/boxm_apm_traits.h>
--
--#include <vnl/algo/vnl_determinant.h>
--#include <vgl/vgl_triangle_scan_iterator.h>
--#include <boct/boct_tree.h>
--#include <vil/vil_image_view.h>
--
--#if 0
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#endif
--
--bool cube_fill_value(double* xverts_2d, double* yverts_2d, boct_face_idx visible_faces, vil_image_view<float> &img, float const& val);
--
--bool boxm_alpha_seg_len(double *xverts_2d, double* yverts_2d, float* vert_distances, boct_face_idx visible_faces, float alpha, vil_image_view<float> &alpha_distance);
--bool boxm_depth_fill(double *xverts_2d, double* yverts_2d,
--                     float* vert_distances, boct_face_idx visible_faces,
--                     vil_image_view<float> &depth_image);
--template<class T, class tri_int_it_t>
--bool tri_interpolated_weighted_sum(tri_int_it_t &tri_it, vil_image_view<T> const& values, T &val_sum, float &weight_sum, bool subtract)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= values.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
--
--    if (subtract) {
--      for (unsigned int x = startx; x < endx; ++x) {
--        float point_dist = tri_it.value_at(x);
--        val_sum -= values(x,yu) * point_dist;
--        weight_sum -= point_dist;
--      }
--    }
--    else {
--      for (unsigned int x = startx; x < endx; ++x) {
--        float point_dist = tri_it.value_at(x);
--        val_sum += values(x,yu) * point_dist;
--        weight_sum += point_dist;
--      }
--    }
--  }
--  return true;
--}
--
--//: returns the sum of the weights
--template<class T1, class T2, class tri_it_t>
--bool tri_interpolated_weighted_sum(tri_it_t &tri_it, vil_image_view<T1> const& weights, vil_image_view<T2> const& values, T2 &val_sum, T1 &weight_sum, bool subtract=false)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= values.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)values.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)values.ni(),tri_it.endx());
--
--    if (subtract) {
--      for (unsigned int x = startx; x < endx; ++x) {
--        T1 weight = tri_it.value_at(x)*weights(x,yu);
--        val_sum -= weight * values(x,yu);
--        weight_sum -= weight;
--      }
--    }
--    else {
--      for (unsigned int x = startx; x < endx; ++x) {
--        T1 weight = tri_it.value_at(x)*weights(x,yu);
--        val_sum += weight * values(x,yu);
--        weight_sum += weight;
--      }
--    }
--  }
--  return true;
--}
--
--
--template<class T, class tri_it_t>
--void tri_interpolate_values(tri_it_t &tri_it, vil_image_view<T> &img, bool subtract = false)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    if (subtract) {
--      for (unsigned int x = startx; x < endx; ++x) {
--        img(x,yu) -= tri_it.value_at(x);
--      }
--    }
--    else {
--      for (unsigned int x = startx; x < endx; ++x) {
--        img(x,yu) += tri_it.value_at(x);
--      }
--    }
--  }
--  return;
--}
--
--
--#if 0
--template<class T, class tri_it_T>
--void tri_interpolate_values(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &img, vil_image_view<float> &pix_coverage, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
--{
--  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  // (no need to compute barycentric coordinates at each step)
--  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
--  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
--  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
--  double Acol2[] = {1.0, 1.0, 1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2);
--  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
--  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
--  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
--
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu > img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      T interp_val = (T)(s0*x + s1*y + s2);
--      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
--        min_img(x,yu) = interp_val;
--      }
--      if (max_img(x,yu) < interp_val) {
--        max_img(x,yu) = interp_val;
--      }
--    }
--  }
--  return;
--}
--#endif
--
--template<class T, class tri_it_T>
--void tri_interpolate_min_max(tri_it_T &tri_it, double* xvals, double* yvals, T* vals, vil_image_view<T> &min_img, vil_image_view<T> &max_img, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
--{
--  // first compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  // (no need to compute barycentric coordinates at each step)
--  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
--  double Acol0[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5};
--  double Acol1[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5};
--  double Acol2[] = {1.0, 1.0, 1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2);
--  double s0 = vnl_determinant(Z, Acol1, Acol2) / detA;
--  double s1 = vnl_determinant(Acol0, Z, Acol2) / detA;
--  double s2 = vnl_determinant(Acol0, Acol1, Z) / detA;
--
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= max_img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)max_img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)max_img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      T interp_val = (T)(s0*x + s1*y + s2);
--      if ( (min_img(x,yu) == 0) || (min_img(x,yu) > interp_val) ) {
--        min_img(x,yu) = interp_val;
--      }
--      if (max_img(x,yu) < interp_val) {
--        max_img(x,yu) = interp_val;
--      }
--    }
--  }
--  return;
--}
--
--template<class T1, class T2>
--void tri_weighted_sum(vgl_triangle_scan_iterator<double> &tri_it, vil_image_view<T1> &img, vil_image_view<T2> &weights, T1 &val_sum, T2 &weight_sum)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      val_sum += img(x,yu)*weights(x,yu);
--      weight_sum += weights(x,yu);
--    }
--  }
--  return;
--}
--
--template<class T, class tri_it_T>
--void tri_fill_value(tri_it_T &tri_it, vil_image_view<T> &img, T val)
--{
--  tri_it.reset();
--  while (tri_it.next()) {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      img(x,yu) = val;
--    }
--  }
--  return;
--}
--
--#if 0 // this function commented out
--template <class T>
--void tri_fill_value_aa(boxm_triangle_scan_iterator_aa &tri_it, vil_image_view<T> &img, vil_image_view<float> &aa_weights, T val)
--{
--  tri_it.reset();
--  while (tri_it.next())
--  {
--    int y = tri_it.scany();
--    if (y < 0) {
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (tri_it.startx() >= (int)img.ni()) || (tri_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,tri_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),tri_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      float pix_cov = tri_it.pix_coverage(x);
--      if ((pix_cov < 0.0f) || (pix_cov > 1.0f)) {
--        std::cerr << " error: pix_cov = " << pix_cov << std::endl;
--      }
--      aa_weights(x,yu) += tri_it.pix_coverage(x);
--      img(x,yu) += val * pix_cov;
--    }
--  }
--  return;
--}
--#endif // 0
--
--template<class T>
--bool cube_mean(double* xverts_2d, double* yverts_2d, float* vert_dists, boct_face_idx visible_faces, vil_image_view<T> const& values, T &mean)
--{
--  // for each face, create two triangle iterators to interpolate distances
--  T value_sum(0);
--  float weight_sum(0);
--  // X_LOW
--  // tri 0
--  boxm_triangle_interpolation_iterator<float> tri_it(xverts_2d, yverts_2d, vert_dists, 0, 3, 4);
--  if (visible_faces & X_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 3, 4, 7);
--  if (visible_faces & X_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // X_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 1, 2, 5);
--  if (visible_faces & X_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 5, 6);
--  if (visible_faces & X_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Y_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 1, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 0, 5);
--  if (visible_faces & Y_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Y_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 7, 3, 2);
--  if (visible_faces & Y_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 2, 6, 7);
--  if (visible_faces & Y_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Z_LOW
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 1);
--  if (visible_faces & Z_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 0, 2, 3);
--  if (visible_faces & Z_LOW)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  // Z_HIGH
--  // tri 0
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 5, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--  // tri 1
--  tri_it = boxm_triangle_interpolation_iterator<float>(xverts_2d, yverts_2d, vert_dists, 4, 7, 6);
--  if (visible_faces & Z_HIGH)
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, true);
--  else
--    tri_interpolated_weighted_sum(tri_it, values, value_sum, weight_sum, false);
--
--  if (std::fabs(weight_sum) > 1e-6)  {
--    mean = value_sum / weight_sum;
--  }
--  else {
--    mean = T(0);
--    return false;
--  }
--  return true;
--}
--
--inline void init_triangle_scan_iterator(vgl_triangle_scan_iterator<double> &tri_it, const double* xverts, const double* yverts, unsigned int v0=0, unsigned int v1=1, unsigned int v2=2)
--{
--  // subtract 0.5 to follow convention that the center of pixel i,j is located at coordinates i+0.5, j+0.5
--  tri_it.a.x = xverts[v0] - 0.5; tri_it.a.y = yverts[v0] - 0.5;
--  tri_it.b.x = xverts[v1] - 0.5; tri_it.b.y = yverts[v1] - 0.5;
--  tri_it.c.x = xverts[v2] - 0.5; tri_it.c.y = yverts[v2] - 0.5;
--}
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx b/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
-deleted file mode 100644
-index 1586ba9fcd..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_test_util.cxx
-+++ /dev/null
-@@ -1,141 +0,0 @@
--#include "boxm_test_util.h"
--#include <vgl/vgl_line_3d_2_points.h>
--#include <vnl/io/vnl_io_matrix_fixed.h>
--#include <vgl/algo/vgl_rotation_3d.h>
--
--void generate_persp_camera(double focal_length,
--                           vgl_point_2d<double>& pp,  //principal point
--                           double x_scale, double y_scale,
--                           vgl_point_3d<double>& camera_center,
--                           vpgl_perspective_camera<double>& cam)
--{
--  vpgl_calibration_matrix<double> K(focal_length,pp, x_scale, y_scale);
--  cam.set_calibration(K);
--  cam.set_camera_center(camera_center);
--}
--
--vpgl_rational_camera<double>
--perspective_to_rational(vpgl_perspective_camera<double>& cam_pers)
--{
--  vnl_matrix_fixed<double,3,4> cam_pers_matrix = cam_pers.get_matrix();
--  std::vector<double> neu_u,den_u,neu_v,den_v;
--  double x_scale = 1.0, x_off = 0.0,
--         y_scale = 1.0, y_off = 0.0,
--         z_scale = 1.0, z_off = 0.0,
--         u_scale = 1.0, u_off = 0.0,
--         v_scale = 1.0, v_off = 0.0;
--
--  for (int i=0; i<20; i++) {
--    neu_u.push_back(0.0);
--    neu_v.push_back(0.0);
--    den_u.push_back(0.0);
--    den_v.push_back(0.0);
--  }
--
--  int vector_map[] = {9,15,18,19};
--
--  for (int i=0; i<4; i++) {
--    neu_u[vector_map[i]] = cam_pers_matrix(0,i);
--    neu_v[vector_map[i]] = cam_pers_matrix(1,i);
--    den_u[vector_map[i]] = cam_pers_matrix(2,i);
--    den_v[vector_map[i]] = cam_pers_matrix(2,i);
--  }
--
--  vpgl_rational_camera<double> cam_rat(neu_u,den_u,neu_v,den_v,
--                                       x_scale,x_off,y_scale,y_off,z_scale,z_off,
--                                       u_scale,u_off,v_scale,v_off);
--  return cam_rat;
--}
--
--vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
--
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--
--  vpgl_perspective_camera<double> persp_cam;
--  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--        double r[] = { 1, 0, 0,
--              0, -1, 0,
--              0, 0, -1 };
--
--  vnl_matrix_fixed<double,3,3> R(r);
--  persp_cam.set_rotation(vgl_rotation_3d<double>(R));
--
--  //persp_cam.look_at(vgl_homg_point_3d<double>(centroid));
--  vpgl_rational_camera<double>* rat_cam = new vpgl_rational_camera<double>(perspective_to_rational(persp_cam));
--  return rat_cam;
--}
--
--vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U*0.5, IMAGE_V*0.5);
--
--  vgl_point_3d<double> centroid = world.centroid();
--  vgl_point_3d<double> camera_center(centroid.x(), centroid.y(), centroid.z()+boxm_camera_dist);
--
--  std::vector<vpgl_camera_double_sptr> rat_cameras;
--
--  auto * persp_cam= new vpgl_perspective_camera<double>();
--  generate_persp_camera(boxm_focal_length,principal_point, boxm_x_scale, boxm_y_scale, camera_center, *persp_cam);
--  persp_cam->look_at(vgl_homg_point_3d<double>(centroid));
--  return persp_cam;
--}
--
--std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
--
--  std::vector<vgl_point_3d<double> > centers;
--  unsigned i=0;
--  for (double t=0; t<=1.0; t+=0.1) {
--    vgl_point_3d<double> centroid = diag.point_t(1-t);
--    centers.push_back(centroid);
--    std::cout << centers[i++] << std::endl;
--  }
--
--  std::vector<vpgl_camera_double_sptr> cameras;
--  for (auto camera_center : centers)
--  {
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
--    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--  }
--  return cameras;
--}
--
--std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world)
--{
--  vgl_point_2d<double> principal_point(IMAGE_U/2., IMAGE_V/2.);
--
--  vgl_line_3d_2_points<double> diag(world.min_point(), world.max_point());
--
--  std::vector<vgl_point_3d<double> > centers;
--  vgl_point_3d<double> centroid(0,0,0);
--  double x,y;
--  double alpha = 0;
--  double delta_alpha = vnl_math::pi/9.;
--  for (unsigned i=0; i<11; i++) {
--    x = boxm_camera_dist*std::cos(alpha);
--    y = boxm_camera_dist*std::sin(alpha);
--    centers.emplace_back(centroid.x()+x, centroid.y()+y, centroid.z());
--    std::cout << centers[i] << std::endl;
--    alpha += delta_alpha;
--  }
--
--  std::vector<vpgl_camera_double_sptr> cameras;
--  for (auto camera_center : centers)
--  {
--    vpgl_perspective_camera<double> persp_cam;
--    generate_persp_camera(boxm_focal_length, principal_point, boxm_x_scale, boxm_y_scale, camera_center, persp_cam);
--    persp_cam.look_at(vgl_homg_point_3d<double>(0,0,0)); //camera_center.x()+10, camera_center.y()+10, camera_center.z()));
--    cameras.push_back(new vpgl_perspective_camera<double>(persp_cam));
--  }
--  return cameras;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_test_util.h b/contrib/brl/bseg/boxm/util/boxm_test_util.h
-deleted file mode 100644
-index b960b6d3c7..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_test_util.h
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#ifndef boxm_test_util_h
--#define boxm_test_util_h
--//:
--// \file
--#include <boct/boct_tree.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vpgl/vpgl_rational_camera.h>
--
--typedef boct_tree<short,vgl_point_3d<double> > tree_type;
--
--constexpr int IMAGE_U = 800;
--constexpr int IMAGE_V = 500;
--constexpr int boxm_x_scale = 500;
--constexpr int boxm_y_scale = 500;
--constexpr double boxm_focal_length = 1.0;
--constexpr double boxm_camera_dist = 300;
--constexpr unsigned num_train_images = 20;
--constexpr bool verbose = true;
--
--void generate_persp_camera(double focal_length,
--                           vgl_point_2d<double>& pp,  //principal point
--                           double x_scale, double y_scale,
--                           vgl_point_3d<double>& camera_center,
--                           vpgl_perspective_camera<double>& cam);
--
--vpgl_rational_camera<double>
--perspective_to_rational(vpgl_perspective_camera<double>& cam_pers);
--
--vpgl_camera_double_sptr generate_camera_top(vgl_box_3d<double>& world);
--
--vpgl_camera_double_sptr generate_camera_top_persp(vgl_box_3d<double>& world);
--
--//: create a trajectory of perspective cameras at the diagonal of world (inside)
--std::vector<vpgl_camera_double_sptr> generate_cameras_diagonal(vgl_box_3d<double>& world);
--
--std::vector<vpgl_camera_double_sptr> generate_cameras_circular(vgl_box_3d<double>& world);
--#endif // boxm_test_util_h
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
-deleted file mode 100644
-index e3561eb3b5..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.h
-+++ /dev/null
-@@ -1,53 +0,0 @@
--#ifndef boxm_triangle_interpolation_iterator_h_
--#define boxm_triangle_interpolation_iterator_h_
--//:
--// \file
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vgl/vgl_region_scan_iterator.h>
--#include <vgl/vgl_triangle_scan_iterator.h>
--
--template<class T>
--class boxm_triangle_interpolation_iterator : public vgl_region_scan_iterator
--{
-- public:
--  //: constructor
--  boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *values, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
--
--  //: Resets the scan iterator to before the first scan line
--  //  After calling this function, next() needs to be called before
--  //  startx() and endx() form a valid scan line.
--  void reset() override;
--
--  //: Tries to move to the next scan line.
--  //  Returns false if there are no more scan lines.
--  bool next() override;
--
--  //: y-coordinate of the current scan line.
--  int  scany() const override;
--
--  //: Returns starting x-value of the current scan line.
--  //  startx() should be smaller than endx(), unless the scan line is empty
--  int  startx() const override;
--
--  //: Returns ending x-value of the current scan line.
--  //  endx() should be larger than startx(), unless the scan line is empty
--  int  endx() const override;
--
--  //: returns the interpolated value at location x in the current scanline
--  T value_at(int x);
--
-- protected:
--
--  vgl_triangle_scan_iterator<double> tri_it_;
--
--  double s0_;
--  double s1_;
--  double s2_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx b/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
-deleted file mode 100644
-index 8ea38cb6c3..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_interpolation_iterator.hxx
-+++ /dev/null
-@@ -1,100 +0,0 @@
--#ifndef boxm_triangle_interpolation_iterator_hxx_
--#define boxm_triangle_interpolation_iterator_hxx_
--//:
--// \file
--
--#include <vector>
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_triangle_interpolation_iterator.h"
--
--#include <vnl/algo/vnl_determinant.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: constructor
--template<class T>
--boxm_triangle_interpolation_iterator<T>::boxm_triangle_interpolation_iterator(double *verts_x, double *verts_y, T *vals, unsigned int v0, unsigned int v1, unsigned int v2)
--: tri_it_()
--{
--  tri_it_.a.x = verts_x[v0]  - 0.5;
--  tri_it_.a.y = verts_y[v0]  - 0.5;
--  tri_it_.b.x = verts_x[v1]  - 0.5;
--  tri_it_.b.y = verts_y[v1]  - 0.5;
--  tri_it_.c.x = verts_x[v2]  - 0.5;
--  tri_it_.c.y = verts_y[v2]  - 0.5;
--
--
--  // compute s0, s1, s2 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  double Acol0[] = {tri_it_.a.x + 0.5, tri_it_.b.x + 0.5, tri_it_.c.x + 0.5};
--  double Acol1[] = {tri_it_.a.y + 0.5, tri_it_.b.y + 0.5, tri_it_.c.y + 0.5};
--  double Acol2[] = {1.0, 1.0, 1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2);
--  s0_ = vnl_determinant(Z, Acol1, Acol2) / detA;
--  s1_ = vnl_determinant(Acol0, Z, Acol2) / detA;
--  s2_ = vnl_determinant(Acol0, Acol1, Z) / detA;
--
--  //std::cout << "s0 = " << s0_ <<"  s1 = " << s1_ << " s2 = " << s2_ << std::endl;
--}
--
--
--//: Resets the scan iterator to before the first scan line
--//  After calling this function, next() needs to be called before
--//  startx() and endx() form a valid scan line.
--template<class T>
--void boxm_triangle_interpolation_iterator<T>::reset()
--{
--  tri_it_.reset();
--}
--
--//: Tries to move to the next scan line.
--//  Returns false if there are no more scan lines.
--template<class T>
--bool boxm_triangle_interpolation_iterator<T>::next()
--{
--  return tri_it_.next();
--}
--
--//: y-coordinate of the current scan line.
--template<class T>
--int boxm_triangle_interpolation_iterator<T>::scany() const
--{
--  return tri_it_.scany();
--}
--
--//: Returns starting x-value of the current scan line.
--//  startx() should be smaller than endx(), unless the scan line is empty
--template<class T>
--int boxm_triangle_interpolation_iterator<T>::startx() const
--{
--  return tri_it_.startx();
--}
--
--//: Returns ending x-value of the current scan line.
--//  endx() should be larger than startx(), unless the scan line is empty
--template<class T>
--int  boxm_triangle_interpolation_iterator<T>::endx() const
--{
--  return tri_it_.endx() + 1;
--}
--
--
--//: returns the interpolated value at location x in the current scanline
--template<class T>
--T boxm_triangle_interpolation_iterator<T>::value_at(int x)
--{
--  return (T)((s0_*(x+0.5) + s1_*(tri_it_.scany()+0.5) + s2_));
--}
--
--
--#define BOXM_TRIANGLE_INTERPOLATION_ITERATOR_INSTANTIATE(T) \
--  template class boxm_triangle_interpolation_iterator<T >
--
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
-deleted file mode 100644
-index c268ecca30..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.cxx
-+++ /dev/null
-@@ -1,59 +0,0 @@
--#include <vector>
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_triangle_scan_iterator.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: constructor
--boxm_triangle_scan_iterator::boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0, unsigned int v1, unsigned int v2)
--: tri_it_()
--{
--  tri_it_.a.x = verts_x[v0] - 0.5;
--  tri_it_.a.y = verts_y[v0] - 0.5;
--  tri_it_.b.x = verts_x[v1] - 0.5;
--  tri_it_.b.y = verts_y[v1] - 0.5;
--  tri_it_.c.x = verts_x[v2] - 0.5;
--  tri_it_.c.y = verts_y[v2] - 0.5;
--}
--
--
--//: Resets the scan iterator to before the first scan line
--//  After calling this function, next() needs to be called before
--//  startx() and endx() form a valid scan line.
--void boxm_triangle_scan_iterator::reset()
--{
--  tri_it_.reset();
--}
--
--//: Tries to move to the next scan line.
--//  Returns false if there are no more scan lines.
--bool boxm_triangle_scan_iterator::next()
--{
--  return tri_it_.next();
--}
--
--//: y-coordinate of the current scan line.
--int boxm_triangle_scan_iterator::scany() const
--{
--  return tri_it_.scany();
--}
--
--//: Returns starting x-value of the current scan line.
--//  startx() should be smaller than endx(), unless the scan line is empty
--int boxm_triangle_scan_iterator::startx() const
--{
--  return tri_it_.startx();
--}
--
--//: Returns ending x-value of the current scan line.
--//  endx() should be larger than startx(), unless the scan line is empty
--int  boxm_triangle_scan_iterator::endx() const
--{
--  return tri_it_.endx() + 1;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h b/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
-deleted file mode 100644
-index 47b52ebc26..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_triangle_scan_iterator.h
-+++ /dev/null
-@@ -1,46 +0,0 @@
--#ifndef boxm_triangle_scan_iterator_h_
--#define boxm_triangle_scan_iterator_h_
--//:
--// \file
--
--#include <iostream>
--#include <vector>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <vgl/vgl_region_scan_iterator.h>
--#include <vgl/vgl_triangle_scan_iterator.h>
--
--class boxm_triangle_scan_iterator : public vgl_region_scan_iterator
--{
-- public:
--  //: constructor
--  boxm_triangle_scan_iterator(const double *verts_x, const double *verts_y, unsigned int v0 = 0, unsigned int v1 = 1, unsigned int v2 = 2);
--
--  //: Resets the scan iterator to before the first scan line
--  //  After calling this function, next() needs to be called before
--  //  startx() and endx() form a valid scan line.
--  void reset() override;
--
--  //: Tries to move to the next scan line.
--  //  Returns false if there are no more scan lines.
--  bool next() override;
--
--  //: y-coordinate of the current scan line.
--  int  scany() const override;
--
--  //: Returns starting x-value of the current scan line.
--  //  startx() should be smaller than endx(), unless the scan line is empty
--  int  startx() const override;
--
--  //: Returns ending x-value of the current scan line.
--  //  endx() should be larger than startx(), unless the scan line is empty
--  int  endx() const override;
--
-- protected:
--
--  vgl_triangle_scan_iterator<double> tri_it_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.cxx b/contrib/brl/bseg/boxm/util/boxm_utils.cxx
-deleted file mode 100644
-index 2464b5c4a8..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_utils.cxx
-+++ /dev/null
-@@ -1,1469 +0,0 @@
--#include <cmath>
--#include <iostream>
--#include <algorithm>
--#include "boxm_utils.h"
--//:
--// \file
--#include "boxm_quad_scan_iterator.h"
--#include <boct/boct_tree_cell.h>
--#include <vgl/vgl_box_2d.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_vector_2d.h>
--#include <vgl/vgl_polygon.h>
--#include <vgl/vgl_intersection.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vnl/algo/vnl_determinant.h>
--#include <vnl/algo/vnl_matrix_inverse.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bool boxm_utils::is_visible(vgl_box_3d<double> const& bbox,
--                            vpgl_camera_double_sptr const& camera,
--                            unsigned int img_ni, unsigned int img_nj,
--                            bool do_front_test)
--{
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    // make a test for vertices for behind-front case
--    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--    if (do_front_test) {
--      if (cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.min_y(),bbox.max_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.min_x(),bbox.max_y(),bbox.max_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.min_y(),bbox.max_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.min_z()))&&
--          cam->is_behind_camera(vgl_homg_point_3d<double>(bbox.max_x(),bbox.max_y(),bbox.max_z())))
--        return false;
--    }
--  }
--
--  // make sure corners project into image bounds
--  vgl_box_2d<double> cube_proj_bb;
--  vgl_box_2d<double> img_bb;
--  img_bb.add(vgl_point_2d<double>(0.0, 0.0));
--  img_bb.add(vgl_point_2d<double>(img_ni, img_nj));
--  // project corners of block into image
--  double u,v;
--  camera->project(bbox.min_x(),bbox.min_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.min_x(),bbox.min_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.min_x(),bbox.max_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.min_x(),bbox.max_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.min_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.min_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.max_y(),bbox.min_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  camera->project(bbox.max_x(),bbox.max_y(),bbox.max_z(),u,v);
--  cube_proj_bb.add(vgl_point_2d<double>(u,v));
--  // check for intersection
--  vgl_box_2d<double> intersection =  vgl_intersection(cube_proj_bb, img_bb);
--  return ! intersection.is_empty();
--}
--
--//:
--// \verbatim
--//                                 MaxPosition
--//
--//                       7-----------6
--//                      /           /|
--//                     /           / |
--//                    4-----------5  |
--//                    |           |  |
--//                    |           |  |
--//                    |    3      |  2
--//     Z              |           | /
--//     |   Y          |           |/
--//     |  /           0-----------1
--//     | /         MinPosition
--//     O-----X
--//
--// \endverbatim
--std::vector<vgl_point_3d<double> >
--boxm_utils::corners_of_box_3d(vgl_box_3d<double> const& box)
--{
--  std::vector<vgl_point_3d<double> > corners;
--
--  corners.push_back(box.min_point());
--  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.min_z());
--  corners.emplace_back(box.min_x()+box.width(), box.min_y()+box.height(), box.min_z());
--  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.min_z());
--  corners.emplace_back(box.min_x(), box.min_y(), box.max_z());
--  corners.emplace_back(box.min_x()+box.width(), box.min_y(), box.max_z());
--  corners.push_back(box.max_point());
--  corners.emplace_back(box.min_x(), box.min_y()+box.height(), box.max_z());
--  return corners;
--}
--
--void
--boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
--                            const vpgl_camera_double_sptr& camera,
--                            double* xverts, double* yverts)
--{
--  for (unsigned i=0; i<corners.size(); ++i)
--    camera->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
--}
--
--void
--boxm_utils::project_corners(std::vector<vgl_point_3d<double> > const& corners,
--                            const vpgl_camera_double_sptr& camera,
--                            double* xverts, double* yverts,
--                            float* vertdist)
--{
--    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
--        for (unsigned i=0; i<corners.size(); ++i)
--        {
--            cam->project(corners[i].x(), corners[i].y(), corners[i].z(), xverts[i], yverts[i]);
--            vertdist[i]=(float)(cam_center-corners[i]).length();
--        }
--    }
--}
--
--void
--boxm_utils::project_point3d(vgl_point_3d<double> const& point,
--                            const vpgl_camera_double_sptr& camera,
--                            double & xvert, double &yvert,
--                            double & vertdist)
--{
--    if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--        auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--        vgl_point_3d<double> cam_center = vgl_point_3d<double>(cam->camera_center());
--        cam->project(point.x(), point.y(), point.z(), xvert,yvert);
--        vertdist=(float)(cam_center-point).length();
--    }
--}
--
--//: corners of the input face: visible?
--bool boxm_utils::is_face_visible(const double * xverts, const double *yverts,
--                                 unsigned id1,unsigned id2,unsigned id3,unsigned  /*id4*/) // id4 unused?!? - FIXME
--{
--  double normal=(xverts[id2]-xverts[id1])*(yverts[id3]-yverts[id2])-(yverts[id2]-yverts[id1])*(xverts[id3]-xverts[id2]);
--  return normal < 0;
--}
--
--//: corners of the input face: visible?
--bool boxm_utils::is_face_visible(std::vector<vgl_point_3d<double> > &face,
--                                 vpgl_camera_double_sptr const& camera)
--{
--  assert(face.size() >= 3);
--  std::vector<vgl_point_2d<double> > vs;
--
--  for (auto & i : face) {
--    double u,v;
--    camera->project(i.x(), i.y(), i.z(), u, v);
--    vs.emplace_back(u,v);
--  }
--
--  vgl_vector_2d<double> v0 = vs[1] - vs[0];
--  vgl_vector_2d<double> v1 = vs[2] - vs[1];
--  auto normal = cross_product<double>(v0,v1);
--  //if (normal>-1e-4 && normal<0.0)
--  //    std::cout<<"+";
--  return normal < -1e-5;
--}
--
--std::vector<vgl_point_2d<double> >
--boxm_utils::project_face(std::vector<vgl_point_3d<double> > &face,
--                         vpgl_camera_double_sptr const& camera)
--{
--  std::vector<vgl_point_2d<double> > vs;
--
--  for (auto & i : face) {
--    double u,v;
--    camera->project(i.x(), i.y(), i.z(), u, v);
--    vs.emplace_back(u,v);
--  }
--
--  return vs;
--}
--
--boct_face_idx
--boxm_utils::visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera)
--{
--  boct_face_idx face_idx = NONE;
--  //if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--  //  vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--  //  vgl_point_3d<double> const& cam_center = cam->camera_center();
--
--  //  if (cam_center.x() > bbox.max_x()) {
--  //    face_idx |= X_HIGH;
--  //  }
--  //  else if (cam_center.x() < bbox.min_x()) {
--  //    face_idx |= X_LOW;
--  //  }
--  //  if (cam_center.y() > bbox.max_y()) {
--  //    face_idx |= Y_HIGH;
--  //  }
--  //  else if (cam_center.y() < bbox.min_y()) {
--  //    face_idx |= Y_LOW;
--  //  }
--  //  if (cam_center.z() > bbox.max_x()) {
--  //    face_idx |= Z_HIGH;
--  //  }
--  //  else if (cam_center.z() < bbox.min_z()) {
--  //    face_idx |= Z_LOW;
--  //  }
--  //}
--  //// for other cameras, use projection and normals
--  //else
--  {
--    // fix the face normals so that the vertices are in counter-clockwise order
--    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
--    faces_of_box_3d(bbox, faces);
--
--    if (is_face_visible(faces.find(Z_LOW)->second, camera)) {
--      face_idx |= Z_LOW;
--#ifdef DEBUG
--      std::cout << "Z_LOW " ;
--#endif
--    }
--    if (is_face_visible(faces.find(Z_HIGH)->second, camera)) {
--      face_idx |= Z_HIGH;
--#ifdef DEBUG
--      std::cout << "Z_HIGH " ;
--#endif
--    }
--    if (is_face_visible(faces.find(X_LOW)->second, camera)) {
--      face_idx |= X_LOW;
--#ifdef DEBUG
--      std::cout << "X_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(faces.find(X_HIGH)->second, camera)) {
--      face_idx |= X_HIGH;
--#ifdef DEBUG
--      std::cout << "X_HIGH " ;
--#endif
--    }
--
--    if (is_face_visible(faces.find(Y_LOW)->second, camera)) {
--      face_idx |= Y_LOW;
--#ifdef DEBUG
--      std::cout << "Y_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(faces.find(Y_HIGH)->second, camera)) {
--      face_idx |= Y_HIGH;
--#ifdef DEBUG
--      std::cout << "Y_HIGH " ;
--#endif
--    }
--  }
--#ifdef DEBUG
--  std::cout << std::endl;
--#endif
--
--  return face_idx;
--}
--
--boct_face_idx
--boxm_utils::visible_faces(vgl_box_3d<double> const& /*bbox*/, // FIXME: currently unused -- see commented out code
--                          const vpgl_camera_double_sptr& /*camera*/, // idem
--                          double *xverts, double *yverts)
--{
--  boct_face_idx face_idx = NONE;
--#if 0
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    vpgl_perspective_camera<double>* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--    vgl_point_3d<double> const& cam_center = cam->camera_center();
--
--    if (cam_center.x() > bbox.max_x()) {
--      face_idx |= X_HIGH;
--    }
--    else if (cam_center.x() < bbox.min_x()) {
--      face_idx |= X_LOW;
--    }
--    if (cam_center.y() > bbox.max_y()) {
--      face_idx |= Y_HIGH;
--    }
--    else if (cam_center.y() < bbox.min_y()) {
--      face_idx |= Y_LOW;
--    }
--    if (cam_center.z() > bbox.max_x()) {
--      face_idx |= Z_HIGH;
--    }
--    else if (cam_center.z() < bbox.min_z()) {
--      face_idx |= Z_LOW;
--    }
--  }
--  // for other cameras, use projection and normals
--  else
--#endif // 0
--  {
--    // fix the face normals so that the vertices are the counter clockwise order
--#if 0
--    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
--    faces_of_box_3d(bbox, faces);
--    project_corners(bbox,camera,xverts,yverts);
--#endif // 0
--    if (is_face_visible(xverts,yverts,1,0,3,2)) {
--      face_idx |= Z_LOW;
--#ifdef DEBUG
--      std::cout << "Z_LOW " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,4,5,6,7)) {
--      face_idx |= Z_HIGH;
--#ifdef DEBUG
--      std::cout << "Z_HIGH " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,7,3,0,4)) {
--      face_idx |= X_LOW;
--#ifdef DEBUG
--      std::cout << "X_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,1,2,6,5)) {
--      face_idx |= X_HIGH;
--#ifdef DEBUG
--      std::cout << "X_HIGH " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,0,1,5,4)) {
--      face_idx |= Y_LOW;
--#ifdef DEBUG
--      std::cout << "Y_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,2,3,7,6)) {
--      face_idx |= Y_HIGH;
--#ifdef DEBUG
--      std::cout << "Y_HIGH " ;
--#endif
--    }
--  }
--#ifdef DEBUG
--  std::cout << std::endl;
--#endif
--
--  return face_idx;
--}
--
--boct_face_idx
--boxm_utils::visible_faces_cell(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera,
--                               double *xverts, double *yverts)
--{
--  boct_face_idx face_idx = NONE;
--  if (camera->type_name().compare("vpgl_perspective_camera")==0) {
--    auto* cam = static_cast<vpgl_perspective_camera<double>*>(camera.ptr());
--    vgl_point_3d<double> const& cam_center = cam->camera_center();
--
--    if (cam_center.x() > bbox.max_x()) {
--      face_idx |= X_HIGH;
--    }
--    else if (cam_center.x() < bbox.min_x()) {
--      face_idx |= X_LOW;
--    }
--    if (cam_center.y() > bbox.max_y()) {
--      face_idx |= Y_HIGH;
--    }
--    else if (cam_center.y() < bbox.min_y()) {
--      face_idx |= Y_LOW;
--    }
--    if (cam_center.z() > bbox.max_x()) {
--      face_idx |= Z_HIGH;
--    }
--    else if (cam_center.z() < bbox.min_z()) {
--      face_idx |= Z_LOW;
--    }
--  }
--  // for other cameras, use projection and normals
--  else
--  {
--    // fix the face normals so that the vertices are the counter clockwise order
--#if 0
--    std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > faces;
--    faces_of_box_3d(bbox, faces);
--    double * xverts; double *yverts;
--    project_corners(bbox,camera,xverts,yverts);
--#endif // 0
--    if (is_face_visible(xverts,yverts,1,0,3,2)) {
--      face_idx |= Z_LOW;
--#ifdef DEBUG
--      std::cout << "Z_LOW " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,4,5,6,7)) {
--      face_idx |= Z_HIGH;
--#ifdef DEBUG
--      std::cout << "Z_HIGH " ;
--#endif
--    }
--    if (is_face_visible(xverts,yverts,7,3,0,4)) {
--      face_idx |= X_LOW;
--#ifdef DEBUG
--      std::cout << "X_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,1,2,6,5)) {
--      face_idx |= X_HIGH;
--#ifdef DEBUG
--      std::cout << "X_HIGH " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,0,1,5,4)) {
--      face_idx |= Y_LOW;
--#ifdef DEBUG
--      std::cout << "Y_LOW " ;
--#endif
--    }
--
--    if (is_face_visible(xverts,yverts,2,3,7,6)) {
--      face_idx |= Y_HIGH;
--#ifdef DEBUG
--      std::cout << "Y_HIGH " ;
--#endif
--    }
--  }
--#ifdef DEBUG
--  std::cout << std::endl;
--#endif
--
--  return face_idx;
--}
--
--//: returns the faces of a box, the vertices are ordered in the normal direction
--void boxm_utils::faces_of_box_3d(vgl_box_3d<double> const& bbox,
--                                 std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >& faces)
--{
--  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(bbox);
--
--  // face bottom [1,0,3,2]
--  std::vector<vgl_point_3d<double> > face_corners;
--  face_corners.push_back(corners[1]);
--  face_corners.push_back(corners[0]);
--  face_corners.push_back(corners[3]);
--  face_corners.push_back(corners[2]);
--  faces[Z_LOW] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[4]);
--  face_corners.push_back(corners[5]);
--  face_corners.push_back(corners[6]);
--  face_corners.push_back(corners[7]);
--  faces[Z_HIGH] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[7]);
--  face_corners.push_back(corners[3]);
--  face_corners.push_back(corners[0]);
--  face_corners.push_back(corners[4]);
--  faces[X_LOW] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[1]);
--  face_corners.push_back(corners[2]);
--  face_corners.push_back(corners[6]);
--  face_corners.push_back(corners[5]);
--  faces[X_HIGH] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[0]);
--  face_corners.push_back(corners[1]);
--  face_corners.push_back(corners[5]);
--  face_corners.push_back(corners[4]);
--  faces[Y_LOW] = face_corners;
--
--  face_corners.resize(0);
--  face_corners.push_back(corners[2]);
--  face_corners.push_back(corners[3]);
--  face_corners.push_back(corners[7]);
--  face_corners.push_back(corners[6]);
--  faces[Y_HIGH] = face_corners;
--}
--
--//: returns the union of the projected faces of a polygon
--void boxm_utils::project_cube(vgl_box_3d<double> &bbox,
--                              const vpgl_camera_double_sptr& camera,
--                              std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
--                              boct_face_idx & vis_face_ids)
--{
--  faces_of_box_3d(bbox, faces);
--  vis_face_ids=boxm_utils::visible_faces(bbox,camera);
--}
--
--
--void boxm_utils::quad_interpolate(boxm_quad_scan_iterator &poly_it,
--                                  double* xvals, double* yvals, double* vals,
--                                  vil_image_view<float> &img,unsigned img_plane_num,
--                                  unsigned int v0, unsigned int v1,
--                                  unsigned int v2,unsigned int v3 )
--{
--  // first compute s0, s1, s2, s3 such that  val = s0*x + s1*y + s2 for any point within the triangle
--  // (no need to compute barycentric coordinates of a quadrilateral at each step)
--  // subtract 0.5 from xvals and yvals, so that interpolated value at pixel x,y evaluates to coordinates x+0.5, y+0.5 (center of pixel)
--
--  double Acol0[] = {(xvals[v0]-0.5)*(yvals[v0]-0.5),
--            (xvals[v1]-0.5)*(yvals[v1]-0.5),
--            (xvals[v2]-0.5)*(yvals[v2]-0.5),
--            (xvals[v3]-0.5)*(yvals[v3]-0.5)};
--  double Acol1[] = {xvals[v0]-0.5, xvals[v1]-0.5, xvals[v2]-0.5,xvals[v3]-0.5};
--  double Acol2[] = {yvals[v0]-0.5, yvals[v1]-0.5, yvals[v2]-0.5,yvals[v3]-0.5};
--  double Acol3[] = {1.0, 1.0, 1.0,1.0};
--
--  double Z[] = {vals[v0], vals[v1], vals[v2],vals[v3]};
--
--  double detA = vnl_determinant(Acol0, Acol1, Acol2,Acol3);
--  double s0 = vnl_determinant(Z, Acol1, Acol2,Acol3) / detA;
--  double s1 = vnl_determinant(Acol0, Z, Acol2,Acol3) / detA;
--  double s2 = vnl_determinant(Acol0, Acol1, Z,Acol3) / detA;
--  double s3 = vnl_determinant(Acol0, Acol1, Acol2,Z) / detA;
--
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      auto interp_val = (float)(s0*x*y + s1*x + s2*y+s3);
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
--    }
--  }
--  return;
--#if 0 // commented out
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    unsigned int yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    double start_val=0;
--    double end_val=0;
--
--    if (poly_it.x_start_end_val(vals,start_val,end_val))
--    {
--      float rx=endx-startx;
--      for (unsigned int x = startx; x < endx; ++x) {
--        float interp_val = start_val+(x-startx)/rx*(end_val-start_val);
--        img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*interp_val);
--        //img(x,yu,img_plane_num) =interp_val;
--      }
--    }
--  }
--  return;
--#endif // 0
--}
--
--void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
--                           vil_image_view<float> &img, float val,
--                           unsigned img_plane_num)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      img(x,yu,img_plane_num) = val;
--#if 0 // was:
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      if (poly_it.pix_coverage(x)>1)
--        std::cout<<"ERROR ALERT "<<poly_it.pix_coverage(x)<<std::endl;
--      assert(poly_it.pix_coverage(x)>1);
--#endif // 0
--    }
--  }
--  return;
--}
--
--
--void boxm_utils::quad_fill(boxm_quad_scan_iterator &poly_it,
--                           vil_image_view<float> &img,
--                           vil_image_view<float> &weights_img,
--                           float val,
--                           unsigned img_plane_num)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      //img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      img(x,yu,img_plane_num) += (poly_it.pix_coverage(x)*val);
--      weights_img(x,yu)+=poly_it.pix_coverage(x);
--    }
--  }
--  return;
--}
--
--
--void boxm_utils::quad_mean(boxm_quad_scan_iterator &poly_it,
--                           vil_image_view<float> &img, float &val,  float & count)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      val+=poly_it.pix_coverage(x)*img(x,yu) ;
--      count+=poly_it.pix_coverage(x);
--    }
--  }
--  return;
--}
--
--void boxm_utils::quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
--                                    vil_image_view<float> &img,
--                                    vil_image_view<float> &weighted_img,
--                                    float &numerator,  float & denominator)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      numerator+=poly_it.pix_coverage(x)*img(x,yu)*weighted_img(x,yu);
--      denominator+=poly_it.pix_coverage(x)*weighted_img(x,yu);
--      //numerator+=img(x,yu)*weighted_img(x,yu);
--      //denominator+=weighted_img(x,yu);
--    }
--  }
--  return;
--}
--
--void boxm_utils::quad_sum(boxm_quad_scan_iterator &poly_it,
--                          vil_image_view<float> &img, float &val)
--{
--  poly_it.reset();
--  while (poly_it.next()) {
--    int y = poly_it.scany();
--    if (y < 0){
--      // not inside of image bounds yet. go to next scanline.
--      continue;
--    }
--    auto yu = (unsigned int)y;
--    if (yu >= img.nj() ) {
--      // we have left the image bounds. no need to continue.
--      break;
--    }
--    if ( (poly_it.startx() >= (int)img.ni()) || (poly_it.endx() <= 0) ) {
--      // no part of this scanline is within the image bounds. go to next scanline.
--      continue;
--    }
--    unsigned int startx = (unsigned int)std::max((int)0,poly_it.startx());
--    unsigned int endx = (unsigned int)std::min((int)img.ni(),poly_it.endx());
--
--    for (unsigned int x = startx; x < endx; ++x) {
--      val+=(poly_it.pix_coverage(x)*img(x,yu)) ;
--    }
--  }
--  return;
--}
--
--bool boxm_utils::project_cube_xyz( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                                   boct_face_idx & vis_face_ids,
--                                   vil_image_view<float> &front_xyz,
--                                   vil_image_view<float> &back_xyz,
--                                   const vpgl_camera_double_sptr& cam)
--{
--  auto face_it=faces.begin();
--  for (; face_it!=faces.end(); ++face_it)
--  {
--    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
--    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
--
--    double xs[]={face_projected[0].x(),face_projected[1].x(),face_projected[2].x(),face_projected[3].x()};
--    double ys[]={face_projected[0].y(),face_projected[1].y(),face_projected[2].y(),face_projected[3].y()};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    double Xs[]={face_corners[0].x(),face_corners[1].x(),face_corners[2].x(),face_corners[3].x()};
--    double Ys[]={face_corners[0].y(),face_corners[1].y(),face_corners[2].y(),face_corners[3].y()};
--    double Zs[]={face_corners[0].z(),face_corners[1].z(),face_corners[2].z(),face_corners[3].z()};
--
--    if (vis_face_ids & face_it->first){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--
--  return true;
--}
--
--
--bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
--                                  boct_face_idx & vis_face_ids,
--                                  vil_image_view<float> &front_xyz,
--                                  vil_image_view<float> &back_xyz,
--                                  double *xverts,double * yverts)
--{
--  // open extra scope, to allow redeclaration of xs[], ys[]
--  {
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--#if 0
--    std::vector<vgl_point_2d<double> > face_polygon(4);
--    for (unsigned i=0;i<4;++i)
--      face_polygon.push_back(vgl_point_2d<double>(xs[i],ys[i]));
--#endif // 0
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[1].x(),corners[0].x(),corners[3].x(),corners[2].x()};
--    double Ys[]={corners[1].y(),corners[0].y(),corners[3].y(),corners[2].y()};
--    double Zs[]={corners[1].z(),corners[0].z(),corners[3].z(),corners[2].z()};
--    if (vis_face_ids & Z_LOW){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
--    }
--  }
--  {
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[4].x(),corners[5].x(),corners[6].x(),corners[7].x()};
--    double Ys[]={corners[4].y(),corners[5].y(),corners[6].y(),corners[7].y()};
--    double Zs[]={corners[4].z(),corners[5].z(),corners[6].z(),corners[7].z()};
--    if (vis_face_ids & Z_HIGH){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_fill(poly_it,front_xyz,float(Zs[0]),2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_fill(poly_it,back_xyz,float(Zs[0]),2);
--    }
--  }
--  {
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    double Xs[]={corners[7].x(),corners[3].x(),corners[0].x(),corners[4].x()};
--    double Ys[]={corners[7].y(),corners[3].y(),corners[0].y(),corners[4].y()};
--    double Zs[]={corners[7].z(),corners[3].z(),corners[0].z(),corners[4].z()};
--    if (vis_face_ids & X_LOW){
--      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--  {
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    double Xs[]={corners[1].x(),corners[2].x(),corners[6].x(),corners[5].x()};
--    double Ys[]={corners[1].y(),corners[2].y(),corners[6].y(),corners[5].y()};
--    double Zs[]={corners[1].z(),corners[2].z(),corners[6].z(),corners[5].z()};
--    if (vis_face_ids & X_HIGH){
--      quad_fill(poly_it,front_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,front_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_fill(poly_it,back_xyz,float(Xs[0]),0);
--      quad_interpolate(poly_it,xs,ys,Ys,back_xyz,1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--  {
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--        vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[0].x(),corners[1].x(),corners[5].x(),corners[4].x()};
--    double Ys[]={corners[0].y(),corners[1].y(),corners[5].y(),corners[4].y()};
--    double Zs[]={corners[0].z(),corners[1].z(),corners[5].z(),corners[4].z()};
--    if (vis_face_ids & Y_LOW){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--
--      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--  {
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--
--    double Xs[]={corners[2].x(),corners[3].x(),corners[7].x(),corners[6].x()};
--    double Ys[]={corners[2].y(),corners[3].y(),corners[7].y(),corners[6].y()};
--    double Zs[]={corners[2].z(),corners[3].z(),corners[7].z(),corners[6].z()};
--    if (vis_face_ids & Y_HIGH){
--      quad_interpolate(poly_it,xs,ys,Xs,front_xyz,0);
--      quad_fill(poly_it,front_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,front_xyz,2);
--    }
--    else
--    {
--      quad_interpolate(poly_it,xs,ys,Xs,back_xyz,0);
--      quad_fill(poly_it,back_xyz,float(Ys[0]),1);
--      quad_interpolate(poly_it,xs,ys,Zs,back_xyz,2);
--    }
--  }
--
--  return true;
--}
--
--
--bool boxm_utils::project_cube_xyz(std::vector< vgl_point_3d<double> > & /*corners*/,
--                                  boct_face_idx & vis_face_ids,
--                                  vil_image_view<float> &front_xyz,
--                                  vil_image_view<float> &back_xyz,
--                                  double *xverts,double * yverts,float * vertdist)
--{
--  // Use extra {} so that destructors will do their work
--  {
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    double ds[]={vertdist[1],vertdist[0],vertdist[3],vertdist[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Z_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    double ds[]={vertdist[4],vertdist[5],vertdist[6],vertdist[7]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Z_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    double ds[]={vertdist[7],vertdist[3],vertdist[0],vertdist[4]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    if (vis_face_ids & X_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    double ds[]={vertdist[1],vertdist[2],vertdist[6],vertdist[5]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    if (vis_face_ids & X_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    double ds[]={vertdist[0],vertdist[1],vertdist[5],vertdist[4]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Y_LOW){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                     { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--  {
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    double ds[]={vertdist[2],vertdist[3],vertdist[7],vertdist[6]};
--
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    vgl_polygon<double> p(xs,ys,4);
--    if (vis_face_ids & Y_HIGH){ quad_interpolate(poly_it,xs,ys,ds,front_xyz,0); }
--    else                      { quad_interpolate(poly_it,xs,ys,ds,back_xyz,0); }
--  }
--
--  return true;
--}
--
--
--#if 0
--bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                                        boct_face_idx & vis_face_ids,
--                                        vil_image_view<float> &fill_img,
--                                        float val, vpgl_camera_double_sptr cam)
--{
--  for (std::map<boct_face_idx, std::vector<vgl_point_3d<double> > >::iterator face_it=faces.begin();
--       face_it!=faces.end(); ++face_it)
--  {
--    std::vector<vgl_point_3d<double> > face_corners=face_it->second;
--    std::vector<vgl_point_2d<double> > face_projected=project_face(face_corners,cam);
--    vgl_polygon<double> face_polygon(face_projected);
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    if (vis_face_ids & face_it->first){
--      quad_fill(poly_it,fill_img,val,0);
--    }
--  }
--}
--#else
--bool boxm_utils::project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > &,
--                                        boct_face_idx &, vil_image_view<float> &, float, const vpgl_camera_double_sptr&)
--{ return false; }
--#endif // 0
--
--bool boxm_utils::project_cube_fill_val(boct_face_idx & vis_face_ids,
--                                       vil_image_view<float> &fill_img,
--                                       float val, double *xverts,double * yverts)
--{
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,val,0);
--  }
--  return true;
--}
--
--
--bool boxm_utils::project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
--                                          vil_image_view<float> &fill_img,
--                                          vil_image_view<float> &weight_img,
--                                          float val, double *xverts,double * yverts)
--{
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_fill(poly_it,fill_img,weight_img,val,0);
--  }
--  return true;
--}
--
--bool boxm_utils::cube_sum(boct_face_idx & vis_face_ids,
--                          vil_image_view<float> &img,
--                          float & val, double *xverts,double * yverts)
--{
--  val=0;
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_sum(poly_it,img,val);
--  }
--
--  return true;
--}
--
--
--bool boxm_utils::cube_uniform_mean(boct_face_idx & vis_face_ids,
--                                   vil_image_view<float> &img,
--                                   float & val, double *xverts,double * yverts)
--{
--  val=0;
--  float count=0;
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_mean(poly_it,img,val,count);
--  }
--
--  if (count > 0) {
--    val/=(float)count;
--    return true;
--  }
--  else {
--    val = 0;
--    return true;
--  }
--}
--
--
--bool boxm_utils::cube_weighted_mean(boct_face_idx & vis_face_ids,
--                                    vil_image_view<float> &img,
--                                    vil_image_view<float> &weight_img,
--                                    float & val, double *xverts,double * yverts)
--{
--  val=0;
--  float count=0;
--  if (vis_face_ids & Z_LOW){
--    double xs[]={xverts[1],xverts[0],xverts[3],xverts[2]};
--    double ys[]={yverts[1],yverts[0],yverts[3],yverts[2]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & Z_HIGH){
--    double xs[]={xverts[4],xverts[5],xverts[6],xverts[7]};
--    double ys[]={yverts[4],yverts[5],yverts[6],yverts[7]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & X_LOW){
--    double xs[]={xverts[7],xverts[3],xverts[0],xverts[4]};
--    double ys[]={yverts[7],yverts[3],yverts[0],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & X_HIGH){
--    double xs[]={xverts[1],xverts[2],xverts[6],xverts[5]};
--    double ys[]={yverts[1],yverts[2],yverts[6],yverts[5]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & Y_LOW){
--    double xs[]={xverts[0],xverts[1],xverts[5],xverts[4]};
--    double ys[]={yverts[0],yverts[1],yverts[5],yverts[4]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--  if (vis_face_ids & Y_HIGH){
--    double xs[]={xverts[2],xverts[3],xverts[7],xverts[6]};
--    double ys[]={yverts[2],yverts[3],yverts[7],yverts[6]};
--    boxm_quad_scan_iterator poly_it(xs,ys);
--    quad_weighted_mean(poly_it,img,weight_img,val,count);
--  }
--
--  if (count > 0) {
--    val/=(float)count;
--    return true;
--  }
--  else {
--    val = 0;
--    return true;
--  }
--}
--
--
--bool
--boxm_utils::cube_entry_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
--                             vgl_vector_3d<double> direction,
--                             vgl_point_3d<double> & entry_point,
--                             double & lambda,boct_face_idx & face_id)
--{
--  // check each face
--  if (direction.x() > 0 && pt.x()<=cube.min_x()) {
--    // intersect with low x plane
--    lambda = (cube.min_x() - pt.x()) / direction.x();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=X_LOW;
--        return true;
--    }
--  }
--  else if (direction.x() < 0 && pt.x()>=cube.max_x()){
--    // intersect with high x plane
--    lambda = (cube.max_x() - pt.x()) / direction.x();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=X_HIGH;
--        return true;
--    }
--  }
--  if (direction.y() > 0&& pt.y()<=cube.min_y()) {
--    // intersect with low y plane
--    lambda = (cube.min_y() - pt.y()) / direction.y();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=Y_LOW;
--        return true;
--    }
--  }
--  else if (direction.y() < 0 && pt.y()>=cube.max_y()){
--    // intersect with high y plane
--    lambda = (cube.max_y() - pt.y()) / direction.y();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.z() >= cube.min_z()) && (entry_point.z() <= cube.max_z()) ) {
--        face_id=Y_HIGH;
--        return true;
--    }
--  }
--  if (direction.z() > 0&& pt.z()<=cube.min_z()) {
--    // intersect with low z plane
--    lambda = (cube.min_z() - pt.z()) / direction.z();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
--        face_id=Z_LOW;
--        return true;
--    }
--  }
--  else if (direction.z() < 0 && pt.z()>=cube.max_z()){
--    // intersect with high z plane
--    lambda = (cube.max_z() - pt.z()) / direction.z();
--    entry_point = pt + direction * lambda;
--    if ( (entry_point.x() >= cube.min_x()) && (entry_point.x() <= cube.max_x()) &&
--      (entry_point.y() >= cube.min_y()) && (entry_point.y() <= cube.max_y()) ) {
--        face_id=Z_HIGH;
--        return true;
--    }
--  }
--  return false;
--}
--
--
--bool boxm_utils::cube_exit_point(vgl_box_3d<double> cube,vgl_point_3d<double> pt,
--                                 vgl_vector_3d<double> direction,
--                                 vgl_point_3d<double> & exit_pt,
--                                 double & lambda,boct_face_idx & face_id)
--{
--  // check each face
--  if (direction.x() < 0 ) {
--    // intersect with low x plane
--    lambda = (cube.min_x() - pt.x()) / direction.x();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=X_LOW;
--      return true;
--    }
--  }
--  else if (direction.x() > 0 ) {
--    // intersect with high x plane
--    lambda = (cube.max_x() - pt.x()) / direction.x();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=X_HIGH;
--      return true;
--    }
--  }
--  if (direction.y() < 0 ) {
--    // intersect with low y plane
--    lambda = (cube.min_y() - pt.y()) / direction.y();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=Y_LOW;
--      return true;
--    }
--  }
--  else if (direction.y() > 0 ) {
--    // intersect with high y plane
--    lambda = (cube.max_y() - pt.y()) / direction.y();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.z() >= cube.min_z()) && (exit_pt.z() <= cube.max_z()) ) {
--      face_id=Y_HIGH;
--      return true;
--    }
--  }
--  if (direction.z() < 0 ) {
--    // intersect with low z plane
--    lambda = (cube.min_z() - pt.z()) / direction.z();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
--      face_id=Z_LOW;
--      return true;
--    }
--  }
--  else if (direction.z() > 0 ) {
--    // intersect with high z plane
--    lambda = (cube.max_z() - pt.z()) / direction.z();
--    exit_pt = pt + direction * lambda;
--    if ( (exit_pt.x() >= cube.min_x()) && (exit_pt.x() <= cube.max_x()) &&
--         (exit_pt.y() >= cube.min_y()) && (exit_pt.y() <= cube.max_y()) ) {
--      face_id=Z_HIGH;
--      return true;
--    }
--  }
--  return false;
--}
--
--
--boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
--boxm_utils::obtain_mog_grey_unit_mode()
--{
--  bsta_gauss_sf1 simple_gauss_sf1(1.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--  return simple_obs_mix_gauss_val_sf1;
--}
--
--boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
--boxm_utils::obtain_mog_grey_zero_mode()
--{
--  bsta_gauss_sf1 simple_gauss_sf1(0.0f,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--  return simple_obs_mix_gauss_val_sf1;
--}
--
--boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype
--boxm_utils::obtain_mog_grey_single_mode(float  mean)
--{
--  bsta_gauss_sf1 simple_gauss_sf1(mean,0.1f);
--  bsta_num_obs<bsta_gauss_sf1> simple_obs_gauss_val_sf1(simple_gauss_sf1,1);
--  bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>, 3>  simple_mix_gauss_val_sf1;
--
--  simple_mix_gauss_val_sf1.insert(simple_obs_gauss_val_sf1,1.0f);
--
--  typedef bsta_mixture_fixed<bsta_num_obs<bsta_gauss_sf1>,3>  simple_bsta_mixture_fixed_sf1_3;
--  bsta_num_obs<simple_bsta_mixture_fixed_sf1_3>  simple_obs_mix_gauss_val_sf1(simple_mix_gauss_val_sf1);
--
--  return simple_obs_mix_gauss_val_sf1;
--}
--
--double boxm_utils::max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt)
--{
--  double dist_max=0;
--
--  std::vector<vgl_point_3d<double> > corners=corners_of_box_3d(box);
--  for (const auto & corner : corners)
--  {
--    if (dist_max<(corner-pt).length())
--      dist_max=(corner-pt).length();
--  }
--  return dist_max;
--}
-diff --git a/contrib/brl/bseg/boxm/util/boxm_utils.h b/contrib/brl/bseg/boxm/util/boxm_utils.h
-deleted file mode 100644
-index 86f74b3945..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_utils.h
-+++ /dev/null
-@@ -1,168 +0,0 @@
--#ifndef boxm_utils_h_
--#define boxm_utils_h_
--//:
--// \file
--// \brief  The utility methods for the boxm project
--//
--// \author Gamze Tunali
--// \date Apr 07, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include "boxm_quad_scan_iterator.h"
--#include <vgl/vgl_box_3d.h>
--#include <vgl/vgl_point_3d.h>
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <boct/boct_tree_cell.h>
--#include <boxm/boxm_apm_traits.h>
--#include <vil/vil_image_view.h>
--
--class safe_inverse_functor
--{
-- public:
--  safe_inverse_functor(float tol = 0.0f) : tol_(tol) {}
--
--  float operator()(float x) const { return (x > tol_)? 1.0f/x : 0.0f; }
--
--  float tol_;
--};
--
--class boxm_utils
--{
-- public:
--
--  //: returns true if a given box is visible from the camera and the image plane
--  static bool is_visible(vgl_box_3d<double> const& bbox,
--                         vpgl_camera_double_sptr const& camera,
--                         unsigned int img_ni, unsigned int img_nj,
--                         bool do_front_test = true);
--
--  // returns the 8 corner points of a box
--  static std::vector<vgl_point_3d<double> > corners_of_box_3d(vgl_box_3d<double> const& box);
--
--  //: returns the indices of the faces visible from the camera
--  static bool is_face_visible(std::vector<vgl_point_3d<double> > &face,
--                              vpgl_camera_double_sptr const& camera);
--
--  //:
--  static bool is_face_visible(const double * xverts, const double *yerts,
--                              unsigned id1,unsigned id2,unsigned id3,unsigned id4);
--
--  //: returns the visible faces of a box given a camera.
--  // It puts a bit 1 for each face visible based on the boct_cell_face values.
--  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox,
--                                     const vpgl_camera_double_sptr& camera,
--                                     double *xverts, double *yerts);
--  static boct_face_idx visible_faces_cell(vgl_box_3d<double> const& bbox,
--                                          const vpgl_camera_double_sptr& camera,
--                                          double *xverts, double *yverts);
--
--  static boct_face_idx visible_faces(vgl_box_3d<double> const& bbox, const vpgl_camera_double_sptr& camera);
--
--  static void faces_of_box_3d(vgl_box_3d<double> const& bbox,
--                              std::map<boct_face_idx, std::vector<vgl_point_3d<double> > > & faces);
--
--  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,const vpgl_camera_double_sptr& camera,
--                              double * xverts, double *yerts);
--  static void project_point3d(vgl_point_3d<double> const& point,
--                              const vpgl_camera_double_sptr& camera,
--                              double & xvert, double &yert, double & vertdist);
--
--  static void project_corners(std::vector<vgl_point_3d<double> > const& corners,
--                              const vpgl_camera_double_sptr& camera,
--                              double* xverts, double* yverts,
--                              float* vertdist);
--  static void project_cube(vgl_box_3d<double> &bbox,
--                           const vpgl_camera_double_sptr& camera,
--                           std::map<boct_face_idx, std::vector< vgl_point_3d<double> > > & faces,
--                           boct_face_idx & vis_face_ids);
--
--  static std::vector<vgl_point_2d<double> >  project_face(std::vector<vgl_point_3d<double> > &face,
--                                                         vpgl_camera_double_sptr const& camera);
--
--  static void quad_interpolate(boxm_quad_scan_iterator &poly_it,
--                               double* xvals, double* yvals, double* vals,
--                               vil_image_view<float> &img,unsigned img_plane_num=0,
--                               unsigned int v0=0, unsigned int v1=1,
--                               unsigned int v2=2,unsigned int v3=3);
--
--  static void quad_fill(boxm_quad_scan_iterator &poly_it,
--                        vil_image_view<float> &img, float val,
--                        unsigned img_plane_num=0);
--  static void quad_fill(boxm_quad_scan_iterator &poly_it,
--                        vil_image_view<float> &img,
--                        vil_image_view<float> &weights_img,
--                        float val,
--                        unsigned img_plane_num=0);
--
--  static bool project_cube_xyz(std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                               boct_face_idx & vis_face_ids,
--                               vil_image_view<float> &front_xyz,
--                               vil_image_view<float> &back_xyz,
--                               const vpgl_camera_double_sptr& camera);
--
-- static bool project_cube_xyz(std::vector< vgl_point_3d<double> >  & corners,
--                              boct_face_idx & vis_face_ids,
--                              vil_image_view<float> &front_xyz,
--                              vil_image_view<float> &back_xyz,
--                              double *xverts,double * yerts);
-- //: only for perspective camera
-- static bool project_cube_xyz(std::vector< vgl_point_3d<double> > & corners,
--                              boct_face_idx & vis_face_ids,
--                              vil_image_view<float> &front_xyz,
--                              vil_image_view<float> &back_xyz,
--                              double *xverts,double * yverts,float * vertdist);
--
--  static bool project_cube_fill_val( std::map<boct_face_idx,std::vector< vgl_point_3d<double> > > & faces,
--                                     boct_face_idx & vis_face_ids,
--                                     vil_image_view<float> &fill_img,
--                                     float val, const vpgl_camera_double_sptr& cam);
--
--  static bool project_cube_fill_val(boct_face_idx & vis_face_ids,
--                                    vil_image_view<float> &fill_img,
--                                    float val, double *xverts,double * yverts);
--  static bool project_cube_fill_val_aa(boct_face_idx & vis_face_ids,
--                                       vil_image_view<float> &fill_img,
--                                       vil_image_view<float> &weights_img,
--                                       float val, double *xverts,double * yverts);
--
--  static bool cube_uniform_mean(boct_face_idx & vis_face_ids,
--                                vil_image_view<float> &img,
--                                float & val, double *xverts,double * yverts);
--  static bool cube_weighted_mean(boct_face_idx & vis_face_ids,
--                                 vil_image_view<float> &img,
--                                 vil_image_view<float> &weight_img,
--                                 float & val, double *xverts,double * yverts);
--
--  static bool cube_sum(boct_face_idx & vis_face_ids,
--                       vil_image_view<float> &img,
--                       float & val, double *xverts,double * yverts);
--
--  static void quad_mean(boxm_quad_scan_iterator &poly_it,
--                        vil_image_view<float> &img, float &val,  float & count);
--  static void quad_sum(boxm_quad_scan_iterator &poly_it,
--                       vil_image_view<float> &img, float &val);
--  static void quad_weighted_mean(boxm_quad_scan_iterator &poly_it,
--                                 vil_image_view<float> &img,
--                                 vil_image_view<float> &weighted_img,
--                                 float &numerator,  float & denominator);
--  static bool cube_entry_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
--                               vgl_vector_3d<double> dir,
--                               vgl_point_3d<double> & entry_point,
--                               double & lambda, boct_face_idx & face_id);
--  static bool cube_exit_point(vgl_box_3d<double> box,vgl_point_3d<double> pt,
--                              vgl_vector_3d<double> dir, vgl_point_3d<double> & exit_point,
--                              double & lambda,boct_face_idx & face_id);
--
--  static double max_point_to_box_dist(vgl_box_3d<double> box,vgl_point_3d<double> pt);
--
--  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_unit_mode();
--
--  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_zero_mode();
--
--  static boxm_apm_traits<BOXM_APM_MOG_GREY>::apm_datatype obtain_mog_grey_single_mode(float  mean);
--};
--
--#endif
-diff --git a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h b/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
-deleted file mode 100644
-index 3e7bcdc580..0000000000
---- a/contrib/brl/bseg/boxm/util/boxm_vrml_util.h
-+++ /dev/null
-@@ -1,214 +0,0 @@
--// This is brl/bseg/boxm/util/boxm_vrml_util.h
--#ifndef boxm_vrml_util_h
--#define boxm_vrml_util_h
--//:
--// \file
--// \brief  Set of utilities to save a boxm_scene as vrml files
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Dec 9, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <fstream>
--#include <boxm/boxm_scene.h>
--#include "boxm_cell_data_traits.h"
--#include <bvrml/bvrml_write.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class boxm_vrml_util
--{
-- public:
--
--  // Writes the values in the scene above the threshold as vrml dots
--  template <class T_data>
--  static void write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene,
--                               const float threshold= 0.0f);
--#if 0 // not yet working?
--  static void write_vrml_scene(std::ofstream& str, bvxm_voxel_scene<bsta_num_obs<bsta_gauss_sf1> > *scene,
--                               const float threshold);
--  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<float> *scene, float threshold);
--  static void write_vrml_scene_as_spheres(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
--  static void write_vrml_scene_as_pointers(std::ofstream& str, bvxm_voxel_scene<vnl_float_4> *scene, float threshold, int s=1);
--#endif // 0
--};
--
--
--template <class T_data>
--void boxm_vrml_util::write_vrml_scene(std::ofstream& str, boxm_scene<boct_tree<short,T_data> > *scene, float /*threshold*/)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short, T_data> cell_type;
--  std::ofstream temp_stream("temp.txt");
--
--  bvrml_write::write_vrml_header(str);
--
--  str << "Shape {\n"
--      << "  appearance NULL\n"
--      << "    geometry PointSet {\n"
--      << "      color Color{\n"
--      << "        color[\n";
--  // write the colors
--  // iterate through the scene
--  boxm_block_iterator<tree_type > iter= scene->iterator();
--  iter.begin();
--
--  for (; !iter.end(); iter++) {
--    scene->load_block(iter.index());
--    tree_type  *tree = (*iter)->get_tree();
--
--    // iterate through the tree
--    std::vector<cell_type*> cells = tree->leaf_cells();
--
--    for (unsigned i = 0; i < cells.size(); i++)
--    {
--      str <<"        0.5 0.2 0.8\n";
--      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
--      temp_stream <<"        " << (int)coord.x() << ' ' <<(int)coord.y() << ' ' << (int)coord.z() <<  '\n';
--    }
--  }
--  temp_stream.close();
--
--  str << "        ]\n     }\n"
--      << "      coord Coordinate{\n"
--      << "        point[\n";
--
--  // write the coordinates.
--  std::ifstream fin;  // file in
--  std::filebuf *fb;   // file buffer
--  fb = fin.rdbuf();
--  fb->open ("temp.txt",std::ios::in);
--  if (fb->is_open() )
--  {
--    while (fb->sgetc()!=EOF)
--    {
--      std::string temp_str;
--      std::istream isbf(fb);
--      std::getline(isbf, temp_str);
--      str << temp_str << '\n';
--    }
--  }
--  else
--    std::cerr << "file is not open.\n";
--
--  fin.close();
--  str << "        ]\n     }\n   }\n}\n";
--}
--
--#if 0 // not yet working?
--void bvxm_vrml_voxel_grid::write_vrml_grid(std::ofstream& str, bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid, float threshold)
--{
--  bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> >::iterator grid_it = grid->begin();
--
--  str << "Shape {\n"
--      << "  appearance NULL\n"
--      << "    geometry PointSet {\n"
--      << "      color Color{\n"
--      << "        color[\n";
--  // write the colors
--  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
--    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
--      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
--        if ((((*grid_it)(i,j)).mean() > threshold))
--          str <<"        " << ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << ' '<< ((*grid_it)(i,j)).mean() << '\n';
--      }
--    }
--  }
--  str << "        ]\n     }\n"
--      << "      coord Coordinate{\n"
--      << "        point[\n";
--
--  // write the coordinates
--  grid_it = grid->begin();
--  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
--    std::cout << '.';
--    for (unsigned i=0; i<(*grid_it).nx(); ++i) {
--      for (unsigned j=0; j < (*grid_it).ny(); ++j) {
--        if (((*grid_it)(i,j)).mean() > threshold)
--          str<<"        " << i << ' ' <<j << ' ' << k <<  '\n';
--      }
--    }
--  }
--  str << "        ]\n     }\n   }\n}\n";
--}
--
--
--void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<float> *grid, float threshold)
--{
--  bvxm_voxel_grid<float>::iterator grid_it = grid->begin();
--  vgl_vector_3d<unsigned> dim=grid->grid_size();
--  unsigned s=3;
--  // write the colors
--  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
--    if (k%1==0)
--    {
--      for (unsigned i=0; i<(*grid_it).nx(); i+=s) {
--        for (unsigned j=0; j < (*grid_it).ny(); j+=s) {
--          if (((*grid_it)(i,j) > threshold)) {
--#ifdef DEBUG
--            vgl_sphere_3d<float> sphere((float)i,(float)j,(float)k,0.5f);
--            write_vrml_sphere(str, sphere, (*grid_it)(i,j),(*grid_it)(i,j),(*grid_it)(i,j),1-(*grid_it)(i,j));
--#endif // DEBUG
--            vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.4f);
--            bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
--          }
--        }
--      }
--    }
--  }
--}
--
--void bvxm_vrml_voxel_grid::write_vrml_grid_as_spheres(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
--{
--  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
--  // write the colors
--  for (unsigned k=0; grid_it != grid->end(); ++grid_it, ++k) {
--    for (unsigned i=0; i<(*grid_it).nx(); ) {
--      for (unsigned j=0; j < (*grid_it).ny(); ) {
--        if ((*grid_it)(i,j)[3]/255.0f > threshold) {
--          vgl_sphere_3d<float> sphere((float)i/s,(float)j/s,(float)k/s,0.5f);
--          bvrml_write::write_vrml_sphere(str, sphere, 1,0,0,0);
--        }
--      }
--    }
--  }
--}
--
--
--void bvxm_vrml_voxel_grid::write_vrml_grid_as_pointers(std::ofstream& str, bvxm_voxel_grid<vnl_float_4> *grid, float threshold, int s)
--{
--  bvxm_voxel_grid<vnl_float_4>::iterator grid_it = grid->begin();
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--  vgl_vector_3d<double> dirx(1,0,0);
--  vgl_vector_3d<double> diry(0,1,0);
--  vgl_vector_3d<double> dirz(0,0,1);
--  bvrml_write::write_vrml_line(str,origin,dirx,1,1,0,0);
--  bvrml_write::write_vrml_line(str,origin,diry,1,0,1,0);
--  bvrml_write::write_vrml_line(str,origin,dirz,1,0,0,1);
--
--  vgl_vector_3d<unsigned> dim=grid->grid_size();
--  // write the colors
--  for (unsigned k=dim.z()-1; grid_it != grid->end(); ++grid_it, --k) {
--    if (k%s==0)
--    {
--      for (unsigned i=0; i<(*grid_it).nx(); i=i+s) {
--        for (unsigned j=0; j < (*grid_it).ny(); j=j+s) {
--          if (((*grid_it)(i,j)[3] > threshold)) {
--            vgl_vector_3d<double> dir((*grid_it)(i,j)[0],(*grid_it)(i,j)[1],(*grid_it)(i,j)[2]);
--            vgl_point_3d<double> pt((double)i/s,(double)j/s,(double)k/s);
--            bvrml_write::write_vrml_line(str, pt,dir,4*((*grid_it)(i,j)[3]-0.5f),1,0,0);
--            bvrml_write::write_vrml_disk(str, pt,dir,2*((*grid_it)(i,j)[3]-0.5f),0,0.5f,0.0f);
--          }
--        }
--      }
--    }
--  }
--}
--#endif // 0
--
--#endif // boxm_vrml_util_h
-diff --git a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt b/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
-deleted file mode 100644
-index 91cc0db455..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,18 +0,0 @@
--add_executable( boxm_util_test_all
--  test_driver.cxx
--  test_boxm_plane_ransac.cxx
--  test_boxm_rational_camera_utils.cxx
--  test_quad_interpolate.cxx
-- )
--
--target_link_libraries( boxm_util_test_all boxm_util boxm boxm_sample ${VXL_LIB_PREFIX}testlib boct bsta ${VXL_LIB_PREFIX}vcl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vil bvrml)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/camera0.txt ${CMAKE_CURRENT_BINARY_DIR}/camera0.txt COPYONLY )
--
--add_test( NAME boxm_util_test_plane_ransac COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_plane_ransac  )
--add_test( NAME boxm_util_test_rational_camera_utils COMMAND $<TARGET_FILE:boxm_util_test_all> test_boxm_rational_camera_utils  ${CMAKE_CURRENT_SOURCE_DIR})
--add_test( NAME boxm_util_test_quad_interpolate COMMAND $<TARGET_FILE:boxm_util_test_all> test_quad_interpolate  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
--
--add_executable( boxm_util_test_include test_include.cxx )
--target_link_libraries( boxm_util_test_include boxm_util)
--add_executable( boxm_util_test_template_include test_template_include.cxx )
--target_link_libraries( boxm_util_test_template_include boxm_util)
-diff --git a/contrib/brl/bseg/boxm/util/tests/camera0.txt b/contrib/brl/bseg/boxm/util/tests/camera0.txt
-deleted file mode 100644
-index cf11c57707..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/camera0.txt
-+++ /dev/null
-@@ -1,104 +0,0 @@
--satId = "????";
--bandId = "RGB";
--SpecId = "RPC00B";
--BEGIN_GROUP = IMAGE
--
--
--  lineOffset = 0.0
--  sampOffset = 0.0
--  latOffset = 0.0
--  longOffset = 0.0
--  heightOffset = 0.0
--  lineScale = 1.0
--  sampScale = 1.0
--  latScale = 1.0
--  longScale = 1.0
--  heightScale = 1.0
--  lineNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  lineDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampNumCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--  sampDenCoef = (
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1,
--    1);
--END_GROUP = IMAGE
--END;
--lvcs
--47.550493 35.395931 664.186757
-diff --git a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt b/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
-deleted file mode 100644
-index a66e2014bd..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/frame_00000.txt
-+++ /dev/null
-@@ -1,7 +0,0 @@
--1 0 0
--0 1 0
--0 0 1
--1 0 0
--0 1 0
--0 0 1
--0 0 0
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
-deleted file mode 100644
-index 6664f28f37..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_boxm_plane_ransac.cxx
-+++ /dev/null
-@@ -1,79 +0,0 @@
--//:
--// \file
--// \author Gamze Tunali
--// \brief  this code tests the function boxm_plane_ransac.
--//  Creates 10 planes that the same line goes through and 10 random planes
--//  which do not contain the plane. It makes sure it returns only the
--//  first 10 planes as the fittest ones.
--//
--// \date   March 25, 2010
--
--#include <iostream>
--#include <vector>
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_plane_ransac.h>
--#include <boxm/sample/boxm_plane_obs.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vgl/vgl_infinite_line_3d.h>
--#include <vnl/vnl_random.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static const unsigned int test_num=10;
--static const unsigned int test_set=10;
--
--static void test_boxm_plane_ransac()
--{
--  // create 10 planes that the line go through and 10 random planes
--  vgl_point_3d<float> p1(20,20,10);
--  vgl_point_3d<float> p2(30,20,10);
--  vgl_infinite_line_3d<float> line(p1,p2);
--
--  std::vector<boxm_edge_tangent_sample<float> > planes;
--  vnl_random rand;
--  // get two points from the line, and create a random 3rd point to define a plane
--
--  for (unsigned i=0; i<test_num; ++i) {
--    auto x=float(rand.drand32()*100);
--    auto y=float(rand.drand32()*100);
--    auto z=float(rand.drand32()*100);
--    vgl_point_3d<float> p3(x,y,z);
--    vgl_plane_3d<float> plane(p1,p2,p3);
--    boxm_plane_obs<float> obs(plane,1);
--    boxm_edge_tangent_sample<float> sample;
--    sample.insert(obs);
--    planes.push_back(sample);
--  }
--
--  // add the random planes
--  for (unsigned i=0; i<test_set; ++i) {
--    auto a=float(rand.drand32()*100);
--    auto b=float(rand.drand32()*100);
--    auto c=float(rand.drand32()*100);
--    auto d=float(rand.drand32()*100);
--    vgl_plane_3d<float> plane(a,b,c,d);
--    boxm_plane_obs<float> obs(plane,1);
--    boxm_edge_tangent_sample<float> sample;
--    sample.insert(obs);
--    planes.push_back(sample);
--  }
--
--  std::cout << " planes size: " << planes.size() << std::endl;
--
--  std::vector<float> weights(test_set,1);
--  int threshold=2;
--  float residual;
--  vgl_infinite_line_3d<float> l;
--  vgl_box_3d<double> cell_global_box(18,15,5,32,25,15);
--  float ortho_thres = 0.01f;
--  float volume_ratio = 128;
--  boxm_plane_ransac<float>(planes, weights, l, residual, cell_global_box, threshold, ortho_thres, volume_ratio);
--
--  TEST_NEAR("test_boxm_plane_ransac: found the right plane set",
--            (l.point()-line.point()).sqr_length() + (l.direction()-line.direction()).sqr_length(),
--            0.0f, 0.01f);
--}
--
--TESTMAIN(test_boxm_plane_ransac);
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx b/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
-deleted file mode 100644
-index bbee3d575d..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_boxm_rational_camera_utils.cxx
-+++ /dev/null
-@@ -1,24 +0,0 @@
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <vgl/vgl_plane_3d.h>
--#include <vpgl/vpgl_local_rational_camera.h>
--
--
--static void test_boxm_rational_camera_utils()
--{
--  std::string filename="camera0.txt";
--
--  vpgl_local_rational_camera<double>* rcam=read_local_rational_camera<double>( "./" + filename);
--  vgl_plane_3d<double> top(0,0,1,-200);
--  vgl_plane_3d<double> bottom(0,0,1,0);
--
--  unsigned ni=800,
--           nj=800;
--  double u, v;
--
--  rcam->project(495,431,200,u,v);
--  vgl_plane_3d<double>  plane_parallel=boxm_rational_camera_utils::boxm_find_parallel_image_plane(rcam,top,bottom,ni,nj);
--  // TODO: do something with plane_parallel !
--}
--
--TESTMAIN(test_boxm_rational_camera_utils);
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx b/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
-deleted file mode 100644
-index 3bc9c909f2..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,15 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_boxm_plane_ransac );
--DECLARE( test_boxm_rational_camera_utils );
--DECLARE( test_quad_interpolate );
--
--void register_tests()
--{
--  REGISTER( test_boxm_plane_ransac );
--  REGISTER( test_boxm_rational_camera_utils );
--  REGISTER( test_quad_interpolate );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_include.cxx
-deleted file mode 100644
-index fec661974c..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_include.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boxm/util/boxm_cell_data_traits.h>
--#include <boxm/util/boxm_plane_ransac.h>
--#include <boxm/util/boxm_quad_scan_iterator.h>
--#include <boxm/util/boxm_rational_camera_utils.h>
--#include <boxm/util/boxm_raytrace_operations.h>
--#include <boxm/util/boxm_triangle_interpolation_iterator.h>
--#include <boxm/util/boxm_triangle_scan_iterator.h>
--#include <boxm/util/boxm_utils.h>
--#include <boxm/util/boxm_vrml_util.h>
--#include <boxm/util/boxm_test_util.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx b/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
-deleted file mode 100644
-index 2c8c986813..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_quad_interpolate.cxx
-+++ /dev/null
-@@ -1,117 +0,0 @@
--#include <iostream>
--#include <fstream>
--#include <testlib/testlib_test.h>
--#include <boxm/util/boxm_utils.h>
--#include <vgl/vgl_point_2d.h>
--#include <vgl/vgl_polygon.h>
--#include <boxm/util/boxm_quad_scan_iterator.h>
--#include <vgl/vgl_box_3d.h>
--#include <boct/boct_tree.h>
--#include <boct/boct_tree_cell.h>
--#include <vil/vil_save.h>
--#include <vil/vil_plane.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vpgl/vpgl_camera_double_sptr.h>
--#include <vpgl/vpgl_perspective_camera.h>
--#include <vgl/vgl_point_3d.h>
--#include <vgl/algo/vgl_rotation_3d.h>
--
--
--static void test_quad_interpolate(int argc, char* argv[])
--{
--  std::vector<vgl_point_2d<double> > points;
--  points.emplace_back(10,10);
--  points.emplace_back(10,12);
--  points.emplace_back(12,12);
--  points.emplace_back(12,10);
--
--  double xvals[]={10,10,12,12};
--  double yvals[]={10,12,12,10};
--  double vals[]={10,10,12,12};
--  //vgl_polygon<double> poly(points);
--  boxm_quad_scan_iterator poly_it(xvals,yvals);
--  vil_image_view<float> img_min(40,40);
--  vil_image_view<float> img_max(40,40);
--  vil_image_view<float> g_img_max(40,40);
--
--  img_max.fill(0.0f);
--  g_img_max.fill(0.0f);
--  // creating ground truth
--  g_img_max(10,10)=10.5f; g_img_max(10,11)=10.5f;
--  g_img_max(11,10)=11.5f; g_img_max(11,11)=11.5f;
--
--  boxm_utils::quad_interpolate(poly_it, xvals, yvals, vals,img_max,0);
--  for (unsigned i=10;i<=12;i++)
--  {
--    for (unsigned j=10;j<=12;j++)
--    {
--      std::cout << img_max(j,i) << ' ';
--    }
--    std::cout << '\n';
--  }
--  bool flag=true;
--  for (unsigned i=0; i<g_img_max.ni() && flag; ++i)
--  for (unsigned j=0; j<g_img_max.nj() && flag; ++j)
--    if (g_img_max(i,j)!=img_max(i,j))
--      flag=false;
--
--  TEST("Interpolated image", true, flag);
--
--  std::vector<vgl_point_2d<double> > points1;
--  points.emplace_back(10.25,10.25);
--  points.emplace_back(10.25,12.25);
--  points.emplace_back(12.25,12.25);
--  points.emplace_back(12.25,10.25);
--
--  double xvals1[]={10.3,10.3,11.4,11.4};
--  double yvals1[]={10.3,11.4,11.4,10.3};
--  //double vals1[]={10,10,12,12};
--  ////vgl_polygon<double> poly(points);
--  boxm_quad_scan_iterator poly_it_1(xvals1,yvals1);
--  //vil_image_view<float> img_min(40,40);
--  //vil_image_view<float> img_max(40,40);
--
--  g_img_max.fill(0.0f);
--  // creating ground truth
--  g_img_max(10,10)=10;g_img_max(10,11)=10;
--  g_img_max(11,10)=10;g_img_max(11,11)=10;
--
--  float val=0;
--  float count=0;
--  boxm_utils::quad_mean(poly_it_1,g_img_max,val,count);
--
--  // code to test the projection of a cube .
--  vgl_box_3d<double> cell_bb(-0.8,19.2,-18.75,0.7625, 20.7625,-17.1875);
--  std::string camera_input_path = (argc < 2) ? "." : argv[1];
--  std::ifstream ifs((camera_input_path + "/frame_00000.txt").c_str());
--  if (!ifs.is_open()) {
--    std::cerr << "Failed to open file " << camera_input_path << "/frame_00000.txt\n";
--    TEST("Opening camera file", true, false);
--    return;
--  }
--  auto* cam = new vpgl_perspective_camera<double>();
--  ifs >> *cam;
--  double xverts[8];
--  double yverts[8];
--  float vertdist[8];
--  unsigned int ni=1280;
--  unsigned int nj=720;
--
--  vpgl_camera_double_sptr cam_d(cam);
--  vil_image_view<float> front_xyz(ni,nj,1);front_xyz.fill(0.0f);
--  vil_image_view<float> back_xyz(ni,nj,1) ;back_xyz.fill(0.0f);
--
--  std::vector<vgl_point_3d<double> > corners=boxm_utils::corners_of_box_3d(cell_bb);
--  boxm_utils::project_corners(corners,cam_d,xverts,yverts,vertdist);
--  boct_face_idx  vis_face_ids=boxm_utils::visible_faces(cell_bb,cam_d,xverts,yverts);
--  boxm_utils::project_cube_xyz(corners,vis_face_ids,front_xyz,back_xyz,xverts,yverts,vertdist);
--
--  std::string image_output_path = (argc < 3) ? "." : argv[2];
--  std::cout << "Saving two TIFF files to directory " << image_output_path << '\n';
--  vil_save(vil_plane(front_xyz,0),(image_output_path + "/front.tiff").c_str());
--  vil_save(vil_plane(back_xyz,0), (image_output_path + "/back.tiff").c_str());
--}
--
--TESTMAIN_ARGS(test_quad_interpolate);
-diff --git a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx b/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
-deleted file mode 100644
-index a3fbe3c4ae..0000000000
---- a/contrib/brl/bseg/boxm/util/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm/util/boxm_triangle_interpolation_iterator.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-deleted file mode 100644
-index 643a441654..0000000000
---- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
-+++ /dev/null
-@@ -1,59 +0,0 @@
--# contrib/brl/bseg/boxm_batch/CMakeLists.txt
--
--include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
--include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
--
--if( PYTHON_FOUND )
--  FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--  if( EXPAT_FOUND )
--    include_directories( ${PYTHON_INCLUDE_DIRS} )
--    include_directories( ${BRL_INCLUDE_DIR} )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
--
--    include_directories( ${GEL_INCLUDE_DIR}/mrc )
--    include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
--    include_directories( ${MUL_INCLUDE_DIR} )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm/algo )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
--    include_directories( ${BRL_INCLUDE_DIR}/bbas/bsta )
--
--     set(boxm_batch_sources
--         reg_boxm.h   reg_boxm.cxx
--        )
--    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
--      vxl_add_library(LIBRARY_NAME boxm_batch LIBRARY_SOURCES SHARED ${boxm_batch_sources})
--
--      #library has to have different name depending on debug or release version.
--      if(WIN32)
--        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch DEBUG_POSTFIX _d SUFFIX .pyd)
--      endif()
--      if(APPLE)
--        set_target_properties(boxm_batch PROPERTIES OUTPUT_NAME boxm_batch SUFFIX .so)
--      endif()
--      set_target_properties(boxm_batch PROPERTIES PREFIX "")
--
--      target_link_libraries(boxm_batch bpro_batch boxm_pro boxm_sample_algo boxm_algo_rt_pro boxm_algo_sp_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro sdet_pro bsta_pro icam_pro bapl_pro )
--
--      if(PYTHON_DEBUG_LIBRARIES)
--        target_link_libraries( boxm_batch debug ${PYTHON_DEBUG_LIBRARY})
--      endif()
--
--      if(PYTHON_LIBRARIES)
--        target_link_libraries( boxm_batch optimized ${PYTHON_LIBRARY})
--      endif()
--
--      if( BUILD_TESTING )
--        add_subdirectory(tests)
--      endif()
--
--    endif()
--  endif()
--endif()
--
--include( ${VXL_CMAKE_DIR}/NewCMake/FindDirectShow.cmake )
--if(DIRECTSHOW_FOUND)
--  add_definitions(-DHAS_DIRECTSHOW)
--endif()
-diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx b/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
-deleted file mode 100644
-index baa2f55b02..0000000000
---- a/contrib/brl/bseg/boxm_batch/reg_boxm.cxx
-+++ /dev/null
-@@ -1,135 +0,0 @@
--#include "reg_boxm.h"
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <brdb/brdb_selection.h>
--
--// processes
--#include <vil_pro/vil_register.h>
--#include <vpgl_pro/vpgl_register.h>
--#include <sdet_pro/sdet_register.h>
--//#include <icam_pro/icam_register.h>
--#include <boxm/pro/boxm_register.h>
--#include <boxm/algo/pro/boxm_algo_register.h>
--#include <boxm/algo/rt/pro/boxm_algo_rt_register.h>
--#include <boxm/algo/sp/pro/boxm_algo_sp_register.h>
--
--#include <bsta/pro/bsta_register.h>
--#include <bapl/pro/bapl_register.h>
--
--#include <bbas_pro/bbas_register.h>
--
--#include <boxm/basic/boxm_util_data_types.h>
--PyObject *
--register_processes(PyObject *self, PyObject *args)
--{
--  vil_register::register_process();
--  vpgl_register::register_process();
--  boxm_register::register_process();
--  boxm_algo_register::register_process();
--
--  boxm_algo_rt_register::register_process();
--  boxm_algo_sp_register::register_process();
--  sdet_register::register_process();
--  //icam_register::register_process();
--  bapl_register::register_process();
--  bbas_register::register_process();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--PyObject *
--register_datatypes(PyObject *self, PyObject *args)
--{
--  register_basic_datatypes();
--  vil_register::register_datatype();
--  vpgl_register::register_datatype();
--  boxm_register::register_datatype();
--  boxm_algo_register::register_process();
--
--  boxm_algo_rt_register::register_datatype();
--  boxm_algo_sp_register::register_datatype();
--
--  bsta_register::register_datatype();
--  //icam_register::register_datatype();
--  bapl_register::register_datatype();
--  bbas_register::register_datatype();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--
--PyObject *get_boxm_array_1d_float(PyObject * /*self*/, PyObject *args)
--{
--  unsigned id;
--  boxm_array_1d_float_sptr value;
--  if (!PyArg_ParseTuple(args, "i:get_boxm_array_1d_float", &id))
--    return NULL;
--
--  std::string relation_name = "boxm_array_1d_float_sptr_data";
--
--  // query to get the data
--  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
--  brdb_selection_sptr selec = DATABASE->select(relation_name, std::move(Q));
--  PyObject *array_1d=0;
--  if (selec->size()!=1) {
--    std::cout << "in get_boxm_array_1d_float() - no relation with type" << relation_name << " id: " << id << std::endl;
--
--    return array_1d;
--  }
--
--  brdb_value_sptr brdb_value;
--  if (!selec->get_value(std::string("value"), brdb_value)) {
--    std::cout << "in get_boxm_array_1d_float() didn't get value\n";
--    return array_1d;
--  }
--
--  if (!brdb_value) {
--    std::cout << "in get_boxm_array_1d_float() - null value\n";
--    return array_1d;
--  }
--
--  brdb_value_t<boxm_array_1d_float_sptr>* result_out = static_cast<brdb_value_t<boxm_array_1d_float_sptr>* >(brdb_value.ptr());
--  value = result_out->value();
--
--  array_1d = PyList_New(value->data_array.size());
--  PyObject *x;
--  for(unsigned i=0;i<value->data_array.size();i++)
--  {
--    x=PyFloat_FromDouble((double)value->data_array[i]);
--    PyList_SetItem(array_1d, i,x);//Py_DECREF(x);
--  }
--  Py_INCREF(array_1d);
--  return array_1d;
--}
--PyMODINIT_FUNC
--initboxm_batch(void)
--{
--  PyMethodDef reg_pro;
--  reg_pro.ml_name = "register_processes";
--  reg_pro.ml_meth = register_processes;
--  reg_pro.ml_doc = "register_processes() create instances of each defined process";
--  reg_pro.ml_flags = METH_VARARGS;
--
--
--  PyMethodDef reg_data;
--  reg_data.ml_name = "register_datatypes";
--  reg_data.ml_meth = register_datatypes;
--  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
--  reg_data.ml_flags = METH_VARARGS;
--
--  PyMethodDef get_boxm_array_1d_float_func;
--  get_boxm_array_1d_float_func.ml_name = "get_boxm_array_1d_float";
--  get_boxm_array_1d_float_func.ml_meth = get_boxm_array_1d_float;
--  get_boxm_array_1d_float_func.ml_doc = "get_boxm_array_1d_float() Get 1-d array in python";
--  get_boxm_array_1d_float_func.ml_flags = METH_VARARGS;
--
--  boxm_batch_methods[0]=reg_pro;
--  boxm_batch_methods[1]=reg_data;
--  boxm_batch_methods[2]=get_boxm_array_1d_float_func;
--
--  for (int i=0; i<METHOD_NUM; ++i) {
--    boxm_batch_methods[i+3]=batch_methods[i];
--  }
--
--  Py_InitModule("boxm_batch", boxm_batch_methods);
--}
-diff --git a/contrib/brl/bseg/boxm_batch/reg_boxm.h b/contrib/brl/bseg/boxm_batch/reg_boxm.h
-deleted file mode 100644
-index fa2ddfee33..0000000000
---- a/contrib/brl/bseg/boxm_batch/reg_boxm.h
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#ifndef reg_boxm_h_
--#define reg_boxm_h_
--
--#include <bpro/bpro_batch/bpro_batch.h>
--
--static PyObject *register_processes(PyObject *self, PyObject *args);
--static PyObject *register_datatypes(PyObject *self, PyObject *args);
--static PyObject *get_boxm_array_1d_float(PyObject * self, PyObject *args);
--
--static PyMethodDef boxm_batch_methods[METHOD_NUM+3];
--
--#endif
-diff --git a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
-deleted file mode 100644
-index 8b72db0d89..0000000000
---- a/contrib/brl/bseg/boxm_batch/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_batch_test_include test_include.cxx )
--target_link_libraries( boxm_batch_test_include boxm_batch)
-diff --git a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx b/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
-deleted file mode 100644
-index f962b339e8..0000000000
---- a/contrib/brl/bseg/boxm_batch/tests/test_include.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <boxm_batch/reg_boxm.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
-deleted file mode 100644
-index 7186a42583..0000000000
---- a/contrib/brl/bseg/boxm_bridge/CMakeLists.txt
-+++ /dev/null
-@@ -1,25 +0,0 @@
--if (HAS_GEOTIFF)
--include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
--if(OPENCL_FOUND)
--
--  add_definitions(-DHAS_OPENCL=1)
--  include_directories( ${OPENCL_INCLUDE_PATH} )
--  include_directories( ${GEL_INCLUDE_DIR}/mrc )
--  include_directories( ${MUL_INCLUDE_DIR} )
--
--  add_executable( boxm2_to_boxm_exe boxm2_to_boxm.cxx  boxm2_to_boxm.h)
--  target_link_libraries( boxm2_to_boxm_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--  # executable to convert a bit scene to a boxm2_scene
--  add_executable( boxm_to_boxm2_exe boxm_to_boxm2.cxx  boxm_to_boxm2.h)
--  target_link_libraries( boxm_to_boxm2_exe boxm2 boxm boxm_sample boxm2_io boct ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vcl)
--
--  #tests
--  if( BUILD_TESTING )
--    add_subdirectory(tests)
--  endif()
--
--endif()
--else()
--  message(STATUS "Skipping contrib/brl/bseg/boxm_bridge: requires geotiff")
--endif()
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
-deleted file mode 100644
-index a9a7c43ba6..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm2_normails_to_boxm.cxx
-+++ /dev/null
-@@ -1,233 +0,0 @@
--//:
--// \file
--#include <iostream>
--#include <queue>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree2.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--#define BOXM2_SCENE_HAS_DIMENSIONS
--
--//: computes the log2 of a number and returns it.
--// power_of_2 is set to true if \p x is an exact power of two.
--// returns -1 when \p x is zero.
--int mylog2(unsigned x, bool& power_of_2)
--{
--  unsigned orig_x = x;
--  int l = -1; // mylog2(0) will return -1
--  while (x != 0u) {
--    x >>= 1u;
--    ++l;
--  }
--  if (orig_x > std::pow(2.0,l)) {
--    power_of_2 = false;
--    ++l;
--  }
--  else
--    power_of_2 = true;
--  return l;
--}
--
--
--template <class T_loc, class T_data>
--void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
--{
--  // find the leaf node in the tree to insert subtree
--  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
--  if (!node)
--    std::cerr << "The node could NOT be FOUND\n";
--  if (node->children()) {
--    std::cerr << "The node is not a leaf node! Cannot insert here\n";
--    return;   // it should have been a leaf node
--  }
--
--  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
--  node->insert_subtree(sub_root);
--}
--
--// converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_tree(boct_bit_tree2 const& bit_tree, boct_tree<T_loc,T_data>*& tree,
--                  boxm2_data<BOXM2_NORMAL>* normal_data)
--{
--  // check if root has any child, if not return the empty tree
--  tree = new boct_tree<T_loc,T_data>(4, 1);
--
--  // if root has no child return a root node filled with data
--  if (!bit_tree.bit_at(0)) {
--    int data_idx = bit_tree.get_data_index(0,false);
--    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
--    tree->root()->set_data(vnl_vector_fixed<float, 3> (data[0], data[1], data[2]));
--    return;
--  }
--
--  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--  boct_tree_cell<T_loc,T_data>* root = tree->root();
--  Q.push(root);
--
--  // go through the bits and create cells
--  int data_idx=bit_tree.get_data_index(0,false);
--  for (unsigned i=0; i<73; i++) {
--    int parent_idx = (i-1)/8;
--    if (i==0 || bit_tree.bit_at(parent_idx)) {
--      if (!Q.empty()) {
--        boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
--        vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
--        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--        ptr->set_data(normal);
--        Q.pop();
--        if (bit_tree.bit_at(i)) {
--          ptr->split();
--          boct_tree_cell<T_loc,T_data>* children = ptr->children();
--          for (unsigned j=0; j<8; j++) {
--            Q.push(&children[j]);
--          }
--        }
--        data_idx++;
--      }
--    }
--  }
--
--  // some of the leaf nodes are still in the queue, fill them with data
--  while (!Q.empty()) {
--    if (data_idx > bit_tree.get_data_index(0,false)+585)
--      std::cerr << "ERROR! exceeded!\n";
--    boxm2_data_traits<BOXM2_NORMAL>::datatype data = normal_data->data()[data_idx];
--    vnl_vector_fixed<float, 3> normal(data[0], data[1], data[2]);
--    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--    ptr->set_data(normal);
--    Q.pop();
--    data_idx++;
--  }
--}
--
--int main(int argc, char** argv)
--{
--  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
--  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
--  vul_arg<std::string> boxm_dir("-out", "output directory", "");
--  vul_arg_parse(argc, argv);
--
--  boxm2_scene scene2(boxm2_file());
--
--  //initialize a block and data cache
--  boxm2_lru_cache::create(&scene2);
--  boxm2_cache_sptr cache = boxm2_cache::instance();
--
--  bgeo_lvcs lvcs = scene2.lvcs();
--  //vgl_point_3d<double> origin = scene2.local_origin();
--  vgl_box_3d<double> world = scene2.bounding_box();
--  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2.blocks();
--  std::map<boxm2_block_id, boxm2_block_metadata>::iterator iter = blocks.begin();
--
--  typedef boct_tree<short, vnl_vector_fixed<float, 3> > tree_type;
--  vgl_vector_3d<unsigned int> block_nums = scene2.scene_dimensions();
--  vgl_point_3d<int> min_block_index;
--  vgl_point_3d<double> origin;
--  scene2.min_block_index(min_block_index, origin);
--  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
--
--
--  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
--  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
--  scene.set_paths(scene_path,"block");
--  scene.set_appearance_model(VNL_FLOAT_3);
--
--  int x_dim;
--  while (iter != blocks.end()) {
--    boxm2_block_metadata metadata = iter ->second;
--    boxm2_block_id id = iter->first;
--    boxm2_block *     block     = cache->get_block(iter->first);
--    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
--
--    boxm2_data_base * data_base  = cache->get_data_base(iter->first,boxm2_data_traits<BOXM2_NORMAL>::prefix());
--    boxm2_data<BOXM2_NORMAL> *data =new boxm2_data<BOXM2_NORMAL>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
--
--    // compute the block bounding box etc
--    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
--    vgl_vector_3d<double> subdim=block->sub_block_dim();
--
--    // block dimensions should be equal
--    bool equal = (dim.x()==dim.y());
--    equal = equal && (dim.x()==dim.z());
--    assert(equal);
--
--    // the block dimensions should be the power of 2 for octree creation
--    bool pow_of_2;
--    x_dim = mylog2((double)dim.x(),pow_of_2);
--    assert(pow_of_2);
--
--    double p[3];
--    p[0] = metadata.local_origin_.x();
--    p[1] = metadata.local_origin_.y();
--    p[2] = metadata.local_origin_.z();
--    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
--    tree_type* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
--    block_tree->set_bbox(block_bb);
--    block_tree->init_cells(0);
--
--    int block_i = id.i() - min_block_index.x();
--    int block_j = id.j() - min_block_index.y();
--    int block_k = id.k() - min_block_index.z();
--
--    scene.load_block(block_i, block_j, block_k);
--    // go over the subtrees
--    for (unsigned z=0; z<dim.z(); z++) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        for (unsigned x=0; x<dim.x(); x++) {
--          boxm2_block::uchar16 tree = block->trees()[x][y][z];
--          boct_bit_tree2 bit_tree((unsigned char*)tree.data_block());
--          if (bit_tree.num_cells() >= 1) {
--            tree_type* octree;
--            convert_tree(bit_tree,octree,data);
--            int n1=bit_tree.num_cells();
--            int n2=octree->all_cells().size();
--            if (n1 != n2) {
--              std::cerr << x << ',' << y << ',' << z << '\n'
--              << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
--            }
--
--            // all three dimensions should be same now, so we can use the one value
--            double cell_dim=1./dim.x();
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            insert(block_tree,octree, cell_bb);
--
--            // since the subtree is added to the main tree, we can delete the root node now
--            delete octree;
--          }
--        }
--      }
--    }
--    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
--    block_new->init_tree(block_tree);
--    scene.write_active_block();
--    iter++;
--  }
--  scene.set_octree_levels(x_dim+4, x_dim+1);
--  scene.write_scene("boxm_scene.xml");
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
-deleted file mode 100644
-index a9d5135776..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.cxx
-+++ /dev/null
-@@ -1,292 +0,0 @@
--#include <iostream>
--#include <queue>
--#include "boxm2_to_boxm.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <cassert>
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--
--#define BOXM2_SCENE_HAS_DIMENSIONS
--
--//: computes the log2 of a number and returns it.
--// power_of_2 is set to true if \p x is an exact power of two.
--// returns -1 when \p x is zero.
--int mylog2(unsigned x, bool& power_of_2)
--{
--  unsigned orig_x = x;
--  int l = -1; // mylog2(0) will return -1
--  while (x != 0u) {
--    x >>= 1u;
--    ++l;
--  }
--  if (orig_x > std::pow(2.0,l)) {
--    power_of_2 = false;
--    ++l;
--  }
--  else
--    power_of_2 = true;
--  return l;
--}
--
--
--template <class T_loc, class T_data>
--void insert(boct_tree<T_loc,T_data>*& tree, boct_tree<T_loc,T_data>*& subtree, vgl_box_3d<double> cell_bb)
--{
--  // find the leaf node in the tree to insert subtree
--  boct_tree_cell<T_loc,T_data>* node = tree->locate_point(cell_bb.centroid());
--  if (!node)
--    std::cerr << "The node could NOT be FOUND\n";
--  if (node->children()) {
--    std::cerr << "The node is not a leaf node! Cannot insert here\n";
--    return;   // it should have been a leaf node
--  }
--
--  boct_tree_cell<T_loc,T_data>*  sub_root = subtree->root();
--  node->insert_subtree(sub_root);
--}
--
--//: combine the data values to create a sample
--boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
--                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
--                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs)
--{
--  float m0=data[0]/255.0f;
--  float v0=data[1]/255.0f;
--  float w0=data[2]/255.0f;
--  float m1=data[3]/255.0f;
--  float v1=data[4]/255.0f;
--  float w1=data[5]/255.0f;
--  float m2=data[6]/255.0f;
--  float v2=data[7]/255.0f;
--  float w2=0;
--  if (w0>0 && w1>0)
--    w2=1.0-w0-w1;
--
--  unsigned short n0=num_obs[0];
--  unsigned short n1=num_obs[1];
--  unsigned short n2=num_obs[2];
--  unsigned short nmix=num_obs[3];
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::mix_gauss_sf1_type mix_gauss_sf1_type;
--
--
--  bsta_gauss_sf1 dist0((float)m0, (float)v0);
--  bsta_num_obs<bsta_gauss_sf1> num_obs_dist0(dist0, n0);
--  bsta_gauss_sf1 dist1((float)m1, (float)v1);
--  bsta_num_obs<bsta_gauss_sf1> num_obs_dist1(dist1, n1);
--  bsta_gauss_sf1 dist2((float)m2, (float)v2);
--  bsta_num_obs<bsta_gauss_sf1> num_obs_dist2(dist2, n2);
--
--  bsta_mixture_fixed<gauss_type_sf1, 3>  mf;
--  mf.insert(num_obs_dist0,w0);
--  mf.insert(num_obs_dist1,w1);
--  mf.insert(num_obs_dist2,w2);
--
--  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs(mf,nmix/100.0f);
--
--  boxm_sample<BOXM_APM_MOG_GREY> sample(alpha, obs);
--  return sample;
--}
--
--// converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
--                  boxm2_data<BOXM2_ALPHA>* alpha_data,
--                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
--                  boxm2_data<BOXM2_NUM_OBS>* num_obs)
--{
--  // check if root has any child, if not return the empty tree
--  tree = new boct_tree<T_loc,T_data>(4, 1);
--
--  // if root has no child return a root node filled with data
--  if (!bit_tree.bit_at(0)) {
--    int data_idx = bit_tree.get_data_index(0,false);
--    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
--    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
--    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
--    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
--    tree->root()->set_data(sample);
--    return;
--  }
--
--  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--  boct_tree_cell<T_loc,T_data>* root = tree->root();
--  Q.push(root);
--
--  // go through the bits and create cells
--  int data_idx=bit_tree.get_data_index(0,false);
--  for (unsigned i=0; i<73; i++) {
--    int parent_idx = (i-1)/8;
--    if (i==0 || bit_tree.bit_at(parent_idx)) {
--      if (!Q.empty()) {
--        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
--        boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
--        boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
--        boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
--
--        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--        ptr->set_data(sample);
--        Q.pop();
--        if (bit_tree.bit_at(i)) {
--          ptr->split();
--          boct_tree_cell<T_loc,T_data>* children = ptr->children();
--          for (unsigned j=0; j<8; j++) {
--            Q.push(&children[j]);
--          }
--        }
--        data_idx++;
--      }
--    }
--  }
--
--  // some of the leaf nodes are still in the queue, fill them with data
--  while (!Q.empty()) {
--    if (data_idx > bit_tree.get_data_index(0,false)+585)
--      std::cerr << "ERROR! exceeded!\n";
--    boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data = mog3_data->data()[data_idx];
--    boxm2_data_traits<BOXM2_NUM_OBS>::datatype nums = num_obs->data()[data_idx];
--    boxm2_data<BOXM2_ALPHA>::datatype alpha = alpha_data->data()[data_idx];
--    boxm_sample<BOXM_APM_MOG_GREY> sample = create_sample(alpha,data,nums);
--    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--    ptr->set_data(sample);
--    Q.pop();
--   data_idx++;
--  }
--}
--
--int main(int argc, char** argv)
--{
--  std::cout<<"Converting boxm2 scene to boxm scene"<<std::endl;
--  vul_arg<std::string> boxm2_file("-scene", "scene filename", "");
--  vul_arg<std::string> boxm_dir("-out", "output directory", "");
--  vul_arg_parse(argc, argv);
--
--  boxm2_scene_sptr scene2 = new boxm2_scene(boxm2_file());
--
--  //initialize a block and data cache
--  boxm2_lru_cache::create(scene2);
--  boxm2_cache_sptr cache = boxm2_cache::instance();
--
--  vpgl_lvcs lvcs = scene2->lvcs();
--  //vgl_point_3d<double> origin = scene2->local_origin();
--  vgl_box_3d<double> world = scene2->bounding_box();
--  std::map<boxm2_block_id, boxm2_block_metadata> blocks = scene2->blocks();
--  auto iter = blocks.begin();
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  vgl_vector_3d<unsigned int> block_nums = scene2->scene_dimensions();
--  vgl_point_3d<int> min_block_index;
--  vgl_point_3d<double> origin;
--  scene2->min_block_index(min_block_index, origin);
--  vgl_vector_3d<double> ww(world.width()/block_nums.x(),world.height()/block_nums.y(),world.depth()/block_nums.z());
--
--
--  boxm_scene<tree_type> scene(lvcs, origin, ww, block_nums,false,true,true);
--  std::string scene_path=boxm_dir(); //"C:/data/boxm2/downtown/boxm_scene";
--  scene.set_paths(scene_path,"block");
--  scene.set_appearance_model(BOXM_APM_MOG_GREY);
--
--  int x_dim;
--  while (iter != blocks.end()) {
--    boxm2_block_metadata metadata = iter ->second;
--    boxm2_block_id id = iter->first;
--    boxm2_block *     block     = cache->get_block(scene2, iter->first);
--    std::cout<<" DATA buffers "<< block->num_buffers()<<std::endl;
--    boxm2_data_base * data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_NUM_OBS>::prefix());
--    boxm2_data<BOXM2_NUM_OBS> *num_obs=new boxm2_data<BOXM2_NUM_OBS>(data_base->data_buffer(),data_base->buffer_length(),data_base->block_id());
--
--    boxm2_data_base * mog3_data_base = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_MOG3_GREY>::prefix());
--    boxm2_data<BOXM2_MOG3_GREY> *mog3_data=new boxm2_data<BOXM2_MOG3_GREY>(mog3_data_base->data_buffer(),mog3_data_base->buffer_length(),mog3_data_base->block_id());
--    boxm2_data_base * alpha_data_base  = cache->get_data_base(scene2, iter->first,boxm2_data_traits<BOXM2_ALPHA>::prefix());
--    boxm2_data<BOXM2_ALPHA> *alpha_data =new boxm2_data<BOXM2_ALPHA>(alpha_data_base->data_buffer(),alpha_data_base->buffer_length(),alpha_data_base->block_id());
--
--    // compute the block bounding box etc
--    vgl_vector_3d<unsigned int> dim = block->sub_block_num();
--    vgl_vector_3d<double> subdim=block->sub_block_dim();
--
--    // block dimensions should be equal
--    bool equal = (dim.x()==dim.y());
--    equal = equal && (dim.x()==dim.z());
--    assert(equal);
--
--    // the block dimensions should be the power of 2 for octree creation
--    bool pow_of_2;
--    x_dim = mylog2((double)dim.x(),pow_of_2);
--    assert(pow_of_2);
--
--    double p[3];
--    p[0] = metadata.local_origin_.x();
--    p[1] = metadata.local_origin_.y();
--    p[2] = metadata.local_origin_.z();
--    vgl_box_3d<double> block_bb(p, subdim.x()*dim.x(), subdim.y()*dim.y(), subdim.z()*dim.z(), vgl_box_3d<double>::min_pos);
--    auto* block_tree=new tree_type(x_dim+4, x_dim+1); // FIX take max of 3 dims instead
--    block_tree->set_bbox(block_bb);
--    block_tree->init_cells(0);
--
--    int block_i = id.i() - min_block_index.x();
--    int block_j = id.j() - min_block_index.y();
--    int block_k = id.k() - min_block_index.z();
--
--    scene.load_block(block_i, block_j, block_k);
--    // go over the subtrees
--    for (unsigned z=0; z<dim.z(); z++) {
--      for (unsigned y=0; y<dim.y(); y++) {
--        for (unsigned x=0; x<dim.x(); x++) {
--          boxm2_block::uchar16 tree = block->trees()[x][y][z];
--          boct_bit_tree bit_tree((unsigned char*)tree.data_block());
--          if (bit_tree.num_cells() >= 1) {
--            tree_type* octree;
--            convert_tree(bit_tree,octree,alpha_data,mog3_data,num_obs);
--            int n1=bit_tree.num_cells();
--            int n2=octree->all_cells().size();
--            if (n1 != n2) {
--              std::cerr << x << ',' << y << ',' << z << '\n'
--                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << '\n';
--            }
--
--            // all three dimensions should be same now, so we can use the one value
--            double cell_dim=1./dim.x();
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            insert(block_tree,octree, cell_bb);
--
--            // since the subtree is added to the main tree, we can delete the root node now
--            delete octree;
--          }
--        }
--      }
--    }
--    boxm_block<tree_type>* block_new = scene.get_block(block_i, block_j, block_k);
--    block_new->init_tree(block_tree);
--    scene.write_active_block();
--    iter++;
--  }
--  scene.set_octree_levels(x_dim+4, x_dim+1);
--  scene.write_scene("boxm_scene.xml");
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h b/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
-deleted file mode 100644
-index a4dec11806..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm2_to_boxm.h
-+++ /dev/null
-@@ -1,24 +0,0 @@
--#ifndef boxm2_to_boxm_h_
--#define boxm2_to_boxm_h_
--//:
--// \file
--
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--#include <boxm2/boxm2_data.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--//: combine the data values to create a sample
--boxm_sample<BOXM_APM_MOG_GREY> create_sample(float alpha,
--                                             boxm2_data_traits<BOXM2_MOG3_GREY>::datatype data,
--                                             boxm2_data_traits<BOXM2_NUM_OBS>::datatype num_obs);
--
--//: converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_tree(boct_bit_tree const& bit_tree, boct_tree<T_loc,T_data>*& tree,
--                  boxm2_data<BOXM2_ALPHA>* alpha_data,
--                  boxm2_data<BOXM2_MOG3_GREY>* mog3_data,
--                  boxm2_data<BOXM2_NUM_OBS>* num_obs);
--
--#endif // boxm2_to_boxm_h_
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
-deleted file mode 100644
-index 54dc134841..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm_normals_to_boxm2.cxx
-+++ /dev/null
-@@ -1,326 +0,0 @@
--#include <queue>
--#include <iostream>
--#include "boxm_to_boxm2.h"
--//:
--// \file
--//
--//  boxm_normals_to_boxm2.cxx
--//
--// \author
--//  Created by David Borton on 11/28/11.
--//  Copyright (c) 2011 Brown University. All rights reserved.
--//
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree2.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--
--//: extracts the tree cell's data into an array format for boxm2 representation
--template <class T_loc, class T_data>
--void convert_data(boct_tree<T_loc,T_data>* tree,
--                  boct_tree_cell<T_loc,T_data>* tree_cell,
--                  boct_tree_cell<T_loc, bool>* valid_cell,
--                  boct_tree_cell<T_loc, float>* alpha_cell,
--                  boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr,
--                  boxm2_data_traits<BOXM2_POINT>::datatype* points_arr,
--                  boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr,
--                  int& data_idx)
--{
--  // go through the tree, in depth first order to collect data
--  std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--  std::queue<boct_tree_cell<T_loc,float>*> alpha_Q;
--  std::queue<boct_tree_cell<T_loc,bool>*> valid_Q;
--
--  Q.push(tree_cell);
--  alpha_Q.push(alpha_cell);
--  valid_Q.push(valid_cell);
--
--  while (!Q.empty()) {
--    boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--    boct_tree_cell<T_loc, bool>* valid_ptr = valid_Q.front();
--    boct_tree_cell<T_loc, float> alpha_ptr = alpha_Q.front();
--    vgl_point_3d<double> point = tree->global_centroid(tree_cell);
--
--    if (ptr && valid_ptr && alpha_ptr)
--    {
--      if (valid_ptr->data()) {
--        T_data normal = tree_cell->data();
--
--        normals_arr[data_idx][0] = normal[0];
--        normals_arr[data_idx][1] = normal[2];
--        normals_arr[data_idx][2] = normal[3];
--        normals_arr[data_idx][3] = 0.0f;
--
--        points_arr[data_idx][0] = point.x();
--        points_arr[data_idx][1] = point.y();
--        points_arr[data_idx][2] = point.z();
--        points_arr[data_idx][3] = 0.0f;
--
--        alpha_arr[data_idx]=alpha_cell->data();
--      }
--      else {
--        normals_arr[data_idx][0] = 0.0f;
--        normals_arr[data_idx][1] = 0.0f;
--        normals_arr[data_idx][2] = 0.0f;
--        normals_arr[data_idx][3] = 0.0f;
--
--        points_arr[data_idx][0] = point.x();
--        points_arr[data_idx][1] = point.y();
--        points_arr[data_idx][2] = point.z();
--        points_arr[data_idx][3] = 0.0f;
--
--        alpha_arr[data_idx]=alpha_cell->data();
--      }
--
--      data_idx++;
--
--      if (!ptr->is_leaf()) {
--        boct_tree_cell<T_loc,T_data>* children = ptr->children();
--        boct_tree_cell<T_loc, bool>* valid_children = valid_ptr->children();
--        boct_tree_cell<T_loc, float>* alpha_chidren = alpha_ptr->children();
--        for (unsigned j=0; j<8; j++) {
--          Q.push(&children[j]);
--          alpha_Q.push(&alpha_chidren[j]);
--          valid_Q.push(&valid_children[j]);
--        }
--      }
--    }
--    Q.pop();
--    alpha_Q.pop();
--    valid_Q.pop();
--  }
--}
--
--//: recursively sets the bits based on the octree structure
--template <class T_loc, class T_data>
--void set_bits(boct_bit_tree2*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
--{
--  if (cell.code_.level == 0)
--    return;
--
--  if (!cell.is_leaf()) {
--    int bit_idx=idx*8+1+child_idx;
--    bit_tree->set_bit_at(bit_idx,true);
--    for (unsigned i=0; i<8; i++)
--      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
--  }
--}
--
--//: converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree2*& bit_tree)
--{
--  bit_tree = new boct_bit_tree2();
--  // first set all the bits to 0
--  for (unsigned i=0; i<73; i++)
--    bit_tree->set_bit_at(i,false);
--
--  // empty tree
--  if (!tree_cell)
--    return;
--
--  // only root node
--  if (tree_cell->is_leaf())
--    return;
--
--  int idx=0;
--  bit_tree->set_bit_at(idx,true); // root
--  for (unsigned i=0; i<8; i++) {  // level root-1
--    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
--  }
--}
--
--template <class T_loc, class T_data>
--void convert_scene( boxm_scene<boct_octree<T_loc, T_data> > &scene,
--                    boxm_scene<boct_octree<T_loc, bool> > &valid_scene,
--                    boxm_scene<boct_octree<T_loc, float> > &alpha_scene,
--                    boxm2_scene &new_scene)
--{
--  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
--  unsigned int dim=sub_block_dim();
--  typedef boct_octree<T_loc, T_data> tree_type;
--  boxm_block_iterator<tree_type > iter(&scene);
--  boxm_block_iterator<tree_type > validd_iter(&valid_scene);
--  boxm_block_iterator<tree_type > alpha_iter(&alpha_scene);
--
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type >* block = scene.get_block(idx);
--    vgl_box_3d<double> block_bb = block->bounding_box();
--    std::cout<<block_bb<<std::endl;
--    tree_type * tree = block->get_tree();
--
--    valid_scene.load_block(idx);
--    boxm_block<boct_tree<short, bool> >* valid_block = valid_scene.get_block(idx);
--    boct_tree<short, bool> * valid_tree = valid_block->get_tree();
--
--    alpha_scene.load_block(idx);
--    boxm_block<boct_tree<short, float> >* alpha_block = alpha_scene.get_block(idx);
--    boct_tree<short, float> * alpha_tree = alpha_block->get_tree();
--
--    // create metadata for the block
--    boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
--    vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
--    vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
--    vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
--                                         sub_block_dim.y()*scene.block_dim().y(),
--                                         sub_block_dim.z()*scene.block_dim().z());
--    boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
--                                  real_block_dim,sub_block_num,1,4,650.0,0.001);
--    boxm2_block new_block(metadata);
--    new_blocks[block_id]=metadata;
--
--    // find the total number of cells to figure out data array sizes, as the first step
--    int data_size=0;
--    for (unsigned z=0; z<dim; z++) {
--      for (unsigned y=0; y<dim; y++) {
--        for (unsigned x=0; x<dim; x++) {
--          double cell_dim=1./dim;
--          double p[3];
--          p[0] = x*cell_dim;
--          p[1] = y*cell_dim;
--          p[2] = z*cell_dim;
--          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--          boct_tree_cell<T_loc,T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--          if (!node)
--            std::cout << "The node COULD not be FOUND" << std::endl;
--          else {
--            std::vector<boct_tree_cell<T_loc,T_data> > *> children;
--            node->all_children(children);
--            int n2= children.size()+1;
--            data_size += n2;
--          }
--        }
--      }
--    }
--
--    // allocate data array
--    boxm2_data_traits<BOXM2_NORMAL>::datatype* normals_arr=new  boxm2_data_traits<BOXM2_NORMAL>::datatype[data_size];
--    boxm2_data_traits<BOXM2_POINT>::datatype* points_arr=new  boxm2_data_traits<BOXM2_POINT>::datatype[data_size];
--    boxm2_data_traits<BOXM2_ALPHA>::datatype* alpha_arr = new boxm2_data_traits<BOXM2_ALPHA>::datatype[data_size];
--
--    // divide the blocks
--    int data_idx=0;
--    boxm2_array_3d<boxm2_block::uchar16>& trees = new_block.trees();
--    for (unsigned z=0; z<dim; z++) {
--      for (unsigned y=0; y<dim; y++) {
--        for (unsigned x=0; x<dim; x++) {
--          double cell_dim=1./dim;
--          double p[3];
--          p[0] = x*cell_dim;
--          p[1] = y*cell_dim;
--          p[2] = z*cell_dim;
--          vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--          boct_tree_cell<T_loc, T_data >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--          boct_tree_cell<T_loc, bool>* valid_node = valid_tree->locate_point_at_level(cell_bb.centroid(), 3);
--          boct_tree_cell<T_loc, float> *alpha_node = alpha_tree->locate_point_at_level(cell_bb.centroid(), 3);
--
--          if (!(node && valid_node && alpha_node) )
--            std::cout << "One of the nodes COULD not be FOUND" << std::endl;
--          else {
--            std::vector<boct_tree_cell<T_loc, T_data > *> children;
--            node->all_children(children);
--            int n2= children.size()+1;
--
--            boct_bit_tree2* bit_tree;
--            convert_to_bittree(node, bit_tree);
--            int n1=bit_tree->num_cells();
--            int start=data_idx;
--            convert_data(tree, node, valid_node, alpha_node, normals_arr, points_arr, alpha_arr,  data_idx);
--            // set the data index at the tree
--            bit_tree->set_data_ptr(start, false);
--            // set the tree at the block
--            boxm2_block::uchar16& t=trees[x][y][z];
--            t.set(bit_tree->get_bits());
--            if (n1 != n2) {
--              std::cout << x << ',' << y << ',' << z << '\n'
--                       << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
--            }
--          }
--        }
--      }
--    }
--    char* b1 = reinterpret_cast<char *>(normals_arr);
--    boxm2_data<BOXM2_NORMAL> *normals_data=new boxm2_data<BOXM2_NORMAL>(b1,data_size*sizeof(boxm2_data_traits<BOXM2_NORMAL>::datatype),block_id);
--    char* b2 = reinterpret_cast<char *>(pointa_arr);
--    boxm2_data<BOXM2_POINT> *points_data=new boxm2_data<BOXM2_POINT>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_POINT>::datatype),block_id);
--    char* b3 = reinterpret_cast<char *>(alpha_arr);
--    boxm2_data<BOXM2_ALPHA> *alpha_data = new boxm2_data<BOXM2_ALPHA>(b3, data_size*sizeof(boxm2_data_traits<BOXM2_ALPHA>::datatype),block_id);
--
--    boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
--    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, normals_data);
--    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, points_data);
--    boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
--
--    delete [] normals_arr;
--    delete [] points_arr;
--    delete [] alpha_arr;
--    iter++;
--  }
--  new_scene.set_blocks(new_blocks);
--  new_scene.save_scene();
--}
--
--int main(int argc, char** argv)
--{
--  std::cout << "Converting boxm scene with normals to boxm2 normals and points" << std::endl;
--  vul_arg<std::string> scene_path("-normals_scene", "scene filename", "");
--  vul_arg<std::string> scene_path("-valid_scene", "scene filename", "");
--  vul_arg<std::string> scene_path("-alpha_scene", "scene filename", "");
--  vul_arg<std::string> out_dir("-out", "output directory", "");
--  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
--  vul_arg_parse(argc, argv);
--
--  boxm_scene_parser parser;
--  boxm_scene_base_sptr n_scene_ptr=new boxm_scene_base();
--  n_scene_ptr->load_scene(normals_scene(), parser);
--
--  if (n_scene_ptr->appearence_model() == VNL_FLOAT_3)
--  {
--    typedef boct_tree<short, VNL_FLOAT_3 > tree_type;
--    boxm_scene<tree_type > scene;
--    scene.load_scene(normals_scene());
--
--    boxm_scene<boct_tree<short, bool> > valid_scene;
--    valid_scene.load_scene(valid_scene());
--
--    boxm_scene<boct_tree<short, float> > alpha_scene;
--    alpha_scene.load_scene(alpha_scene());
--
--    // create a boxm2 scene
--    boxm2_scene new_scene;
--    new_scene.set_data_path(out_dir());
--    new_scene.set_local_origin(scene.origin());
--    new_scene.set_lvcs(scene.lvcs());
--    new_scene.set_xml_path(out_dir()+"/scene.xml");
--
--    //initialize a block
--    boxm2_lru_cache::create(&new_scene);
--
--    convert_scene(scene, valid_scene, alpha_scene, new_scene);
--  }
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
-deleted file mode 100644
-index 5a3d2d6e83..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.cxx
-+++ /dev/null
-@@ -1,262 +0,0 @@
--#include <iostream>
--#include <queue>
--#include "boxm_to_boxm2.h"
--//:
--// \file
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//executable args
--#include <vul/vul_arg.h>
--
--#include <vgl/vgl_point_3d.h>
--#include <vgl/vgl_box_3d.h>
--
--//boct files
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--
--//boxm2 files
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_block.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm2/io/boxm2_sio_mgr.h>
--#include <boxm2/io/boxm2_lru_cache.h>
--
--// boxm files
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_apm_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--
--//: extracts the parameters of a boxm_sample for boxm2 representation
--void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
--                        float &alpha,
--                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
--                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs)
--{
--  alpha=sample.alpha;
--
--  typedef boxm_apm_traits<BOXM_APM_MOG_GREY>::gauss_type_sf1 gauss_type_sf1;
--
--  bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, 3> > obs = sample.appearance();
--  unsigned int nmix = obs.num_observations*100.0;
--  num_obs[3] = nmix;
--
--  for (unsigned i=0; i<obs.num_components(); i++) {
--    gauss_type_sf1  mf=obs.distribution(i);
--    auto w = (unsigned char)std::floor(obs.weight(i)*255.0);
--    unsigned int  n = (unsigned char)mf.num_observations;
--    auto m = (unsigned char)std::floor(mf.mean()*255.0);
--    auto v = (unsigned char)std::floor(mf.var()*255.0);
--    num_obs[i]=n;
--    data[i*3]=m;
--    data[i*3+1]=v;
--    if (i<2)
--      data[i*3+2]=w;
--  }
--}
--
--//: extracts the tree cell's data into an array format for boxm2 representation
--template <class T_loc, class T_data>
--void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
--                  float* alpha,
--                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
--                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
--                  int& data_idx)
--{
--    // go through the tree, in depth first order to collect data
--    std::queue<boct_tree_cell<T_loc,T_data>*> Q;
--    Q.push(tree_cell);
--    while (!Q.empty()) {
--        boct_tree_cell<T_loc,T_data>* ptr = Q.front();
--        {
--            deconstruct_sample(ptr->data(),alpha[data_idx],data[data_idx],num_obs[data_idx]);
--            data_idx++;
--            if (!ptr->is_leaf()) {
--                boct_tree_cell<T_loc,T_data>* children = ptr->children();
--                for (unsigned j=0; j<8; j++) {
--                    Q.push(&children[j]);
--                }
--            }
--        }
--        Q.pop();
--    }
--}
--
--//: recursively sets the bits based on the octree structure
--template <class T_loc, class T_data>
--void set_bits(boct_bit_tree*& bit_tree, int idx, unsigned int child_idx, boct_tree_cell<T_loc,T_data> & cell)
--{
--  if (cell.code_.level == 0)
--    return;
--
--  if (!cell.is_leaf()) {
--    int bit_idx=idx*8+1+child_idx;
--    bit_tree->set_bit_at(bit_idx,true);
--    for (unsigned i=0; i<8; i++)
--      set_bits(bit_tree, bit_idx, i, cell.children()[i]);
--  }
--}
--
--//: converts the bit tree to boct_octree representation
--template <class T_loc, class T_data>
--void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree)
--{
--  bit_tree = new boct_bit_tree();
--  // first set all the bits to 0
--  for (unsigned i=0; i<73; i++)
--    bit_tree->set_bit_at(i,false);
--
--  // empty tree
--  if (!tree_cell)
--    return;
--
--  // only root node
--  if (tree_cell->is_leaf()) {
--    return;
--  }
--
--  int idx=0;
--  bit_tree->set_bit_at(idx,true); // root
--  for (unsigned i=0; i<8; i++) {  // level root-1
--    set_bits(bit_tree, idx, i, tree_cell->children()[i]);
--  }
--}
--
--int main(int argc, char** argv)
--{
--  std::cout << "Converting boxm scene to boxm2 Scene" << std::endl;
--  vul_arg<std::string> scene_path("-scene", "scene filename", "");
--  vul_arg<std::string> out_dir("-out", "output directory", "");
--  vul_arg<unsigned int> sub_block_dim("-dim", "sub block dimensions", 64);
--  vul_arg_parse(argc, argv);
--
--  typedef boct_tree<short, boxm_sample<BOXM_APM_MOG_GREY> > tree_type;
--  boxm_scene<tree_type > scene;
--  scene.load_scene(scene_path());
--
--  // create a boxm2 scene
--  boxm2_scene new_scene;
--  new_scene.set_data_path(out_dir());
--  new_scene.set_local_origin(scene.origin());
--  new_scene.set_lvcs(scene.lvcs());
--  new_scene.set_xml_path(out_dir()+"/scene.xml");
--
--  //initialize a block
--  boxm2_lru_cache::create(&new_scene);
--
--  std::map<boxm2_block_id, boxm2_block_metadata> new_blocks;
--  unsigned int dim=sub_block_dim();
--  if (scene.appearence_model() == BOXM_APM_MOG_GREY) {
--    boxm_block_iterator<tree_type > iter(&scene);
--    while (!iter.end()) {
--      vgl_point_3d<int> idx = iter.index();
--      scene.load_block(idx);
--      boxm_block<tree_type >* block = scene.get_block(idx);
--      vgl_box_3d<double> block_bb = block->bounding_box();
--      std::cout<<block_bb<<std::endl;
--      tree_type * tree = block->get_tree();
--
--      // create metadata for the block
--      boxm2_block_id block_id(idx.x(),idx.y(),idx.z());
--      vgl_vector_3d<double> sub_block_dim(1.0/dim,1.0/dim,1.0/dim);
--      vgl_vector_3d<unsigned> sub_block_num(dim,dim,dim);
--      vgl_vector_3d<double> real_block_dim(sub_block_dim.x()*scene.block_dim().x(),
--                                           sub_block_dim.y()*scene.block_dim().y(),
--                                           sub_block_dim.z()*scene.block_dim().z());
--      boxm2_block_metadata metadata(block_id, block->bounding_box().min_point(),
--                                    real_block_dim,sub_block_num,1,4,650.0,0.001);
--      boxm2_block new_block(metadata);
--      new_blocks[block_id]=metadata;
--
--      // find the total number of cells to figure out data array sizes, as the first step
--      int data_size=0;
--      for (unsigned z=0; z<dim; z++) {
--        for (unsigned y=0; y<dim; y++) {
--          for (unsigned x=0; x<dim; x++) {
--            double cell_dim=1./dim;
--            double p[3];
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--            if (!node)
--              std::cout << "The node COULD not be FOUND" << std::endl;
--            else {
--              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
--              node->all_children(children);
--              int n2= children.size()+1;
--              data_size += n2;
--            }
--          }
--        }
--      }
--
--      // allocate data array
--      auto* data_arr=new  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype[data_size];
--      auto* num_obs_arr=new  boxm2_data_traits<BOXM2_NUM_OBS>::datatype[data_size];
--      auto* alpha_arr = new float[data_size];
--
--      // divide the blocks
--      int data_idx=0;
--      boxm2_array_3d<boxm2_block::uchar16> trees = new_block.trees_copy();
--      for (unsigned z=0; z<dim; z++) {
--        for (unsigned y=0; y<dim; y++) {
--          for (unsigned x=0; x<dim; x++) {
--            double cell_dim=1./dim;
--            double p[3];
--            p[0] = x*cell_dim;
--            p[1] = y*cell_dim;
--            p[2] = z*cell_dim;
--            vgl_box_3d<double> cell_bb(p, cell_dim, cell_dim, cell_dim, vgl_box_3d<double>::min_pos);
--            boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> >* node = tree->locate_point_at_level(cell_bb.centroid(),3);
--            if (!node)
--              std::cout << "The node COULD not be FOUND" << std::endl;
--            else {
--              std::vector<boct_tree_cell<short,boxm_sample<BOXM_APM_MOG_GREY> > *> children;
--              node->all_children(children);
--              int n2= children.size()+1;
--
--              boct_bit_tree* bit_tree;
--              convert_to_bittree(node, bit_tree);
--              int n1=bit_tree->num_cells();
--              int start=data_idx;
--              convert_data(node, alpha_arr, data_arr, num_obs_arr, data_idx);
--              // set the data index at the tree
--              bit_tree->set_data_ptr(start, false);
--              // set the tree at the block
--              boxm2_block::uchar16& t=trees[x][y][z];
--              t.set(bit_tree->get_bits());
--              if (n1 != n2) {
--                std::cout << x << ',' << y << ',' << z << '\n'
--                         << "ERROR! The converted tree is not right, should have " << n1 << " nodes instead of " << n2 << std::endl;
--              }
--            }
--          }
--        }
--      }
--      new_block.set_trees(trees);
--      char* b1 = reinterpret_cast<char *>(alpha_arr);
--      boxm2_data<BOXM2_ALPHA> *alpha_data=new boxm2_data<BOXM2_ALPHA>(b1,data_size*sizeof(float),block_id);
--      char* b2 = reinterpret_cast<char *>(data_arr);
--      boxm2_data<BOXM2_MOG3_GREY> *mog_data=new boxm2_data<BOXM2_MOG3_GREY>(b2,data_size*sizeof(boxm2_data_traits<BOXM2_MOG3_GREY>::datatype),block_id);
--      char* b3 = reinterpret_cast<char *>(num_obs_arr);
--      boxm2_data<BOXM2_NUM_OBS> *num_data=new boxm2_data<BOXM2_NUM_OBS>(b3,data_size*sizeof(boxm2_data_traits<BOXM2_NUM_OBS>::datatype),block_id);
--
--      boxm2_sio_mgr::save_block(new_scene.data_path(), &new_block);
--      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, alpha_data);
--      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, mog_data);
--      boxm2_sio_mgr::save_block_data(new_scene.data_path(), block_id, num_data);
--
--      delete [] alpha_arr;
--      delete [] data_arr;
--      delete [] num_obs_arr;
--      iter++;
--    }
--    new_scene.set_blocks(new_blocks);
--    new_scene.save_scene();
--  }
--}
-diff --git a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h b/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
-deleted file mode 100644
-index 6f15345854..0000000000
---- a/contrib/brl/bseg/boxm_bridge/boxm_to_boxm2.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--#ifndef boxm_to_boxm2_h_
--#define boxm_to_boxm2_h_
--//:
--// \file
--
--#include <boct/boct_tree.h>
--#include <boct/boct_bit_tree.h>
--#include <boxm2/boxm2_data.h>
--#include <boxm2/boxm2_data_traits.h>
--#include <boxm/sample/boxm_sample.h>
--
--//: extracts the parameters of a boxm_sample for boxm2 representation
--void deconstruct_sample(boxm_sample<BOXM_APM_MOG_GREY> sample,
--                        float &alpha,
--                        boxm2_data_traits<BOXM2_MOG3_GREY>::datatype& data,
--                        boxm2_data_traits<BOXM2_NUM_OBS>::datatype& num_obs);
--
--//: extracts the tree cell's data into an array format for boxm2 representation
--template <class T_loc, class T_data>
--void convert_data(boct_tree_cell<T_loc,T_data>* tree_cell,
--                  float* alpha,
--                  boxm2_data_traits<BOXM2_MOG3_GREY>::datatype* data,
--                  boxm2_data_traits<BOXM2_NUM_OBS>::datatype* num_obs,
--                  int& data_idx);
--
--//: converts the boct_octree to bit tree representation
--template <class T_loc, class T_data>
--void convert_to_bittree(boct_tree_cell<T_loc,T_data>* tree_cell, boct_bit_tree*& bit_tree);
--
--#endif // boxm_to_boxm2_h_
-diff --git a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt b/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
-deleted file mode 100644
-index 62cccc7c6f..0000000000
---- a/contrib/brl/bseg/boxm_bridge/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( boxm_bridge_test_include test_include.cxx )
--target_link_libraries( boxm_bridge_test_include boxm)
-diff --git a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx b/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
-deleted file mode 100644
-index ee10496c92..0000000000
---- a/contrib/brl/bseg/boxm_bridge/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <boxm_bridge/boxm2_to_boxm.h>
--#include <boxm_bridge/boxm_to_boxm2.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/CMakeLists.txt b/contrib/brl/bseg/bvpl/CMakeLists.txt
-index 424ed5bf50..2593480038 100644
---- a/contrib/brl/bseg/bvpl/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/CMakeLists.txt
-@@ -24,7 +24,6 @@ target_link_libraries(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta ${VXL_
- 
- add_subdirectory(pro)
- add_subdirectory(util)
--add_subdirectory(bvpl_octree)
- add_subdirectory(kernels)
- add_subdirectory(functors)
- 
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-deleted file mode 100644
-index 1f390f966c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
-+++ /dev/null
-@@ -1,71 +0,0 @@
--# This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
--# Brown Voxel Processing library for octrees
--
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--
--#option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
--#mark_as_advanced( VXL_FORCE_V3P_RPLY )
--
--if(EXPAT_FOUND)
--
--find_package( Threads )
--
--#vxl_configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/bvpl_octree_config.h.in
--#                ${CMAKE_CURRENT_BINARY_DIR}/bvpl_octree_config.h include/vxl/contrib/brl/bseg/bvpl/bvpl_octree)
--
--include_directories( ${EXPAT_INCLUDE_DIR} )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/boct )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/boxm )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl )
--include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
--
--set(bvpl_octree_sources
--    bvpl_octree_kernel_operator.h
--    bvpl_octree_vector_operator.h
--    bvpl_scene_kernel_operator.h
--    bvpl_scene_vector_operator.h
--    bvpl_block_kernel_operator.h
--    bvpl_block_vector_operator.h
--    bvpl_octree_vrml_util.h
--    bvpl_cell_data_traits.h
--    bvpl_octree_neighbors.h
--    bvpl_scene_neighborhood_operator.h    bvpl_scene_neighborhood_operator.cxx
--    bvpl_scene_statistics.h               bvpl_scene_statistics.cxx
--    bvpl_discover_pca_kernels.h           bvpl_discover_pca_kernels.cxx
--    bvpl_pca_error_scenes.h               bvpl_pca_error_scenes.cxx
--    bvpl_global_pca.h                     bvpl_global_pca.hxx
--    bvpl_taylor_scenes_map.h              bvpl_taylor_scenes_map.cxx
--    bvpl_taylor_basis.h                   bvpl_taylor_basis.cxx
--    bvpl_global_taylor.h                  bvpl_global_taylor.hxx          bvpl_global_taylor.cxx
--    bvpl_global_corners.h                 bvpl_global_corners.cxx
--    bvpl_corner_detector.h
--    bvpl_corner_functors.h
--    bvpl_gauss3D_steerable_filters.h      bvpl_gauss3D_steerable_filters.cxx
--   )
--
--aux_source_directory(Templates bvpl_octree_sources)
--
--vxl_add_library(LIBRARY_NAME bvpl_octree LIBRARY_SOURCES ${bvpl_octree_sources})
--target_link_libraries(bvpl_octree bvpl_kernels bvpl_functors bvpl_octree_sample bvrml boxm boct ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
--
--#Binary io
--add_subdirectory(io)
--
--#Directory with python/c++ processes
--add_subdirectory(pro)
--
--# Octree samples needed by bvpl
--add_subdirectory(sample)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--if( CMAKE_USE_PTHREADS_INIT )
--  add_definitions(-DBVPL_OCTREE_HAS_PTHREADS=1)
--  set_target_properties(bvpl_octree PROPERTIES COMPILE_FLAGS -pthread)
--  target_link_libraries(bvpl_octree pthread)
--endif()
--
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
-deleted file mode 100644
-index 067773b3d9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--
--BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<gauss_type>);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
-deleted file mode 100644
-index a5900cfb6b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_octree_sample+float--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--
--BOCT_TREE_INSTANTIATE(short, bvpl_octree_sample<float>);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_octree_sample<float>);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
-deleted file mode 100644
-index 7c2f63355a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_pca_basis_sample+10--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--
--BOCT_TREE_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_pca_basis_sample<10>);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
-deleted file mode 100644
-index 81366222a6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boct_tree+short.bvpl_taylor_basis2_sample-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--BOCT_TREE_INSTANTIATE(short, bvpl_taylor_basis2_sample);
--BOCT_TREE_CELL_INSTANTIATE(short, bvpl_taylor_basis2_sample);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
-deleted file mode 100644
-index 7cad8969f8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1----.cxx
-+++ /dev/null
-@@ -1,20 +0,0 @@
--#include <iostream>
--#include <string>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef boct_tree<short, bvpl_octree_sample< gauss_type> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
-deleted file mode 100644
-index 8a135d4e05..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_octree_sample+float---.cxx
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#include <iostream>
--#include <string>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vbl/vbl_array_3d.hxx>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--typedef boct_tree<short, bvpl_octree_sample<float> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
-deleted file mode 100644
-index fcc60090f2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_pca_basis_sample+10---.cxx
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <vbl/vbl_array_3d.hxx>
--
--typedef boct_tree<short, bvpl_pca_basis_sample<10> > tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
-deleted file mode 100644
-index d4d340f12d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/boxm_block+boct_tree+short.bvpl_taylor_basis2_sample--.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#include <boct/boct_tree.h>
--#include <boxm/boxm_block.hxx>
--#include <boxm/boxm_scene.hxx>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--#include <vbl/vbl_array_3d.hxx>
--
--typedef boct_tree<short, bvpl_taylor_basis2_sample> tree_type;
--
--BOXM_BLOCK_INSTANTIATE(tree_type);
--BOXM_BLOCK_ITERATOR_INSTANTIATE(tree_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(boxm_block<tree_type> *);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
-deleted file mode 100644
-index cafd0cfaf7..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_pca+125-.cxx
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
--BVPL_GLOBAL_PCA(125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
-deleted file mode 100644
-index 9e815605e3..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+double.10-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl_octree/bvpl_global_taylor.hxx>
--
--BVPL_GLOBAL_TAYLOR_INSTANTIATE(double, 10);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
-deleted file mode 100644
-index b8312f8e7e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/bvpl_global_taylor+float.3-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl_octree/bvpl_global_taylor.hxx>
--
--BVPL_GLOBAL_TAYLOR_INSTANTIATE(float, 3);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
-deleted file mode 100644
-index e32ee1303b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_discover_pca_kernels-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
-deleted file mode 100644
-index 1bf245a9f9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_corners-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_global_corners);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
-deleted file mode 100644
-index ff5175103e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_pca+125--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--typedef bvpl_global_pca<125> bvpl_global_pca_125;
--VBL_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
-deleted file mode 100644
-index 254b91e81f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_global_taylor+double.10--.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--typedef bvpl_global_taylor<double,10> gt;
--VBL_SMART_PTR_INSTANTIATE(gt);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
-deleted file mode 100644
-index a13ebae610..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_pca_error_scenes-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
-deleted file mode 100644
-index 07c500d5bb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vbl_smart_ptr+bvpl_taylor_scenes_map-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <vbl/vbl_smart_ptr.hxx>
--
--VBL_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
-deleted file mode 100644
-index e15416cdba..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/Templates/vnl_matrix_fixed+double.125.125-.cxx
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#include <vnl/vnl_matrix_fixed.hxx>
--VNL_MATRIX_FIXED_INSTANTIATE(double,125,125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
-deleted file mode 100644
-index ec59fe4893..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
-+++ /dev/null
-@@ -1,134 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_kernel_operator.h
--#ifndef bvpl_block_kernel_operator_h
--#define bvpl_block_kernel_operator_h
--
--//:
--// \file
--// \brief A class operates a kernel on a boxm_block
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  1-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boxm/boxm_scene.h>
--#include "bvpl_octree_kernel_operator.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//: A class which operates a kernel on a boxm_block.
--// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
--// This class is useful to run multithreading processes
--class bvpl_block_kernel_operator
--{
-- public:
--  //: "Convolves" kernel with an input octree, storing the output in an output octree.
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data, class F>
--  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--               F functor,
--               bvpl_kernel_sptr kernel,
--               unsigned i, unsigned j, unsigned k,
--               boxm_scene<boct_tree<short, T_data > > &scene_out,
--               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
--};
--
--//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data, class F>
--void bvpl_block_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_sptr kernel,
--                                         unsigned block_i, unsigned block_j, unsigned block_k,
--                                         boxm_scene<boct_tree<short, T_data > > &scene_out,
--                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  //scene_in.clone_blocks(scene_out, T_data());
--
--  // Load input and output blocks
--  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
--  scene_out.load_block(block_i,block_j,block_k);
--  valid_scene.load_block(block_i,block_j,block_k);
--
--
--  tree_type *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
--  tree_type *tree_out = tree_in->clone();
--  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<cell_type* > cells_out = tree_out->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  typename std::vector<cell_type* >::iterator it_out = cells_out.begin();
--  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end())&& (valid_it!=valid_cells.end()); it_in++, it_out++, valid_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short,T_data> *out_center_cell = *it_out;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    bool valid = true;
--
--#ifdef DEBUG
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
--
--      if (this_cell) {
--        bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val, d);
--      }
--      else {
--        valid = false;
--        break;
--      }
--
--      ++kernel_iter;
--    }
--
--    out_center_cell->set_data(functor.result());
--    valid_center_cell->set_data(valid);
--  }
--
--  //write the output block
--  std::cout << "Writing scenes\n";
--  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
--  scene_out.write_active_block();
--  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene.write_active_block();
--}
--
--#endif // bvpl_block_kernel_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
-deleted file mode 100644
-index 7c772dbd2f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
-+++ /dev/null
-@@ -1,146 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_block_vector_operator.h
--#ifndef bvpl_block_vector_operator_h
--#define bvpl_block_vector_operator_h
--
--//:
--// \file
--// \brief A class operates a kernel on a boxm_block
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  1-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boxm/boxm_scene.h>
--#include "bvpl_octree_kernel_operator.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//:A class operates a kernel on a boxm_block.
--// This class differes from bvpl_octree_kernel_operator in that it loads neighbor block to process blocks appropriately.
--// This class is useful to run multathreding processes
--class bvpl_block_vector_operator
--{
-- public:
--  //: "Convolves" kernel with an input octree, storing the output in an output octree.
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data_in, class T_data_out,class F, unsigned dim >
--  void operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
--               F functor,
--               bvpl_kernel_vector_sptr kernel_vector,
--               unsigned block_i, unsigned block_j, unsigned block_k,
--               boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
--               boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length);
--};
--
--//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data_in, class T_data_out,class F, unsigned dim >
--void bvpl_block_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in > > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_vector_sptr kernel_vector,
--                                         unsigned block_i, unsigned block_j, unsigned block_k,
--                                         boxm_scene<boct_tree<short, vnl_vector_fixed<T_data_out, dim> > > &scene_out,
--                                         boxm_scene<boct_tree<short, bool> > &valid_scene, double cell_length)
--{
--  if (kernel_vector->size()!=dim) {
--    std::cout << "Error in bvpl_block_vector_operator::operate ---> size missmatch\n";
--    return;
--  }
--
--  typedef boct_tree<short, T_data_in> tree_type_in;
--  typedef boct_tree_cell<short,T_data_in> cell_type_in;
--
--  typedef boct_tree<short, vnl_vector_fixed<T_data_out, dim> > tree_type_out;
--  typedef boct_tree_cell<short, vnl_vector_fixed<T_data_out, dim> > cell_type_out;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  // Load input and output blocks
--  scene_in.load_block_and_neighbors(block_i,block_j,block_k);
--  scene_out.load_block(block_i,block_j,block_k);
--  valid_scene.load_block(block_i,block_j,block_k);
--
--
--  tree_type_in *tree_in = scene_in.get_block(block_i, block_j, block_k)->get_tree();
--  tree_type_out *tree_out = tree_in->template clone_to_type<vnl_vector_fixed<T_data_out, dim> >();
--  boct_tree<short, bool> *valid_tree = tree_in->template clone_to_type<bool>();
--
--  std::vector<cell_type_in* > cells_in = tree_in->leaf_cells();
--  std::vector<cell_type_out* > cells_out = tree_out->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type_in* >::iterator it_in = cells_in.begin();
--  typename std::vector<cell_type_out* >::iterator it_out = cells_out.begin();
--  typename std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--
--  for (; (it_in!=cells_in.end())&&(it_out!= cells_out.end() && (valid_it!=valid_cells.end())); ++it_in, ++it_out, ++valid_it)
--  {
--    cell_type_in *center_cell = *it_in;
--    cell_type_out *out_center_cell = *it_out;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    bool valid = true;
--
--#ifdef DEBUG
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    vnl_vector_fixed<T_data_out, dim> responses;
--
--    for (unsigned k=0; k< kernel_vector->kernels_.size(); ++k)
--    {
--      bvpl_kernel_sptr kernel = kernel_vector->kernels_[k];
--      bvpl_kernel_iterator kernel_iter = kernel->iterator();
--      kernel_iter.begin(); // reset the kernel iterator
--      while (!kernel_iter.isDone())
--      {
--        vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
--
--        if (this_cell) {
--          bvpl_kernel_dispatch d = *kernel_iter;
--          T_data_in val =(T_data_in)this_cell->data();
--          functor.apply(val, d);
--        }
--        else {
--          valid = false;
--          break;
--        }
--
--        ++kernel_iter;
--      }
--      responses[k] = (T_data_out)(functor.result());
--    }
--
--    out_center_cell->set_data(responses);
--    valid_center_cell->set_data(valid);
--  }
--
--  //write the output block
--  scene_out.get_block(block_i, block_j, block_k)->init_tree(tree_out);
--  scene_out.write_active_block();
--  valid_scene.get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene.write_active_block();
--}
--
--#endif // bvpl_block_vector_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
-deleted file mode 100644
-index 7f28fa9bef..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
-+++ /dev/null
-@@ -1,34 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_cell_data_traits.h
--#ifndef bvpl_cell_data_traits_h
--#define bvpl_cell_data_traits_h
--//:
--// \file
--// \brief  Set of accessors of cell's data, taking care of different datatypes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Dec 16, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <boct/boct_tree_cell.h>
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_gauss_sf1.h>
--
--//: Float to float
--template <class T_loc>
--float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<float> >* cell)
--{
--  return cell->data().response_;
--}
--
--//: Mixture of gaussians to float; return the mean
--template <class T_loc>
--float bvpl_cell_to_float(boct_tree_cell<T_loc, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > >* cell)
--{
--  return cell->data().response_.mean();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
-deleted file mode 100644
-index e3988f369f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
-+++ /dev/null
-@@ -1,299 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_detector.h
--#ifndef bvpl_corner_detector_h
--#define bvpl_corner_detector_h
--//:
--// \file
--// \brief A class to detect 3d Harris corners, based on the 2nd moment matrix
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  20-Jul-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vnl/vnl_double_3x3.h>
--#include <vnl/algo/vnl_determinant.h>
--
--class bvpl_corner_detector
--{
-- public:
--  //: Detects Harris features  kernel with an input octree
--  //  However, features below the Harris threshold are set as invalid in the valid_scene (in place)
--  //  The type of measure used, depends on the functor.
--  template<class T_data, class F>
--  void detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                             F harris_functor,
--                             vgl_point_3d<int> min_neigborhood_idx,
--                             vgl_point_3d<int> max_neigborhood_idx,
--                             unsigned block_i, unsigned block_j, unsigned block_k,
--                             boxm_scene<boct_tree<short, bool> > *valid_scene,
--                             boxm_scene<boct_tree<short, float> > *corner_scene,
--                             double cell_length);
--
--  //: Computes the corner measure and stores it in "corner_scene"
--  //  Input scene and auxiliary valid scene are not modified
--  template<class T_data, class F>
--  void compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                  F harris_functor,
--                  vgl_point_3d<int> min_neigborhood_idx,
--                  vgl_point_3d<int> max_neigborhood_idx,
--                  unsigned block_i, unsigned block_j, unsigned block_k,
--                  boxm_scene<boct_tree<short, bool> > *valid_scene,
--                  boxm_scene<boct_tree<short, float> > *corner_scene,
--                  double cell_length);
--
--  //: Compute the determinant of the hessian
--  template<class T_data>
--  void compute_det_H(boxm_scene<boct_tree<short, T_data > > *scene_in,
--                     unsigned block_i, unsigned block_j, unsigned block_k,
--                     boxm_scene<boct_tree<short, bool> > *valid_scene,
--                     boxm_scene<boct_tree<short, float> > *corner_scene);
--};
--
--
--template<class T_data, class F>
--void bvpl_corner_detector::detect_and_threshold( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                                                 F harris_functor,
--                                                 vgl_point_3d<int> min_neigborhood_idx,
--                                                 vgl_point_3d<int> max_neigborhood_idx,
--                                                 unsigned block_i, unsigned block_j, unsigned block_k,
--                                                 boxm_scene<boct_tree<short, bool> > *valid_scene,
--                                                 boxm_scene<boct_tree<short, float> > *corner_scene,
--                                                 double cell_length)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  // Load input and output blocks
--  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--  corner_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
--  corner_tree->init_cells(0.0f);
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
--
--  unsigned long n_fail = 0;
--
--  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
--
--    if (!valid_center_cell->data()) {
--      continue;
--    }
--#if 0
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
--      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
--        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
--        {
--          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
--
--          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
--                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
--                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
--
--          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
--
--          if (this_cell) {
--            harris_functor.apply(this_cell->data());
--          }
--          else
--            break;
--        }
--
--    double C = 0;
--    if (!harris_functor.result(C)) {
--      valid_center_cell->set_data(false);
--      ++n_fail;
--    }
--    corner_center_cell->set_data(float(C));
--  }
--
--  std::cout << "Number of Harris fails: " << n_fail << std::endl;
--  //write the output block
--  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene->write_active_block();
--  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
--  corner_scene->write_active_block();
--}
--
--template<class T_data, class F>
--void bvpl_corner_detector::compute_C( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                                      F harris_functor,
--                                      vgl_point_3d<int> min_neigborhood_idx,
--                                      vgl_point_3d<int> max_neigborhood_idx,
--                                      unsigned block_i, unsigned block_j, unsigned block_k,
--                                      boxm_scene<boct_tree<short, bool> > *valid_scene,
--                                      boxm_scene<boct_tree<short, float> > *corner_scene,
--                                      double cell_length)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--
--  // Load input and output blocks
--  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--  corner_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
--  corner_tree->init_cells(0.0f);
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
--
--  unsigned long n_fail = 0;
--
--  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
--
--    if (!valid_center_cell->data()) {
--      continue;
--    }
--#if 0
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure\n";
--      continue;
--    }
--#endif
--
--    vgl_point_3d<double> center_cell_centroid = tree_in->global_centroid(center_cell);
--
--    for (int k = min_neigborhood_idx.z(); k <= max_neigborhood_idx.z(); k++)
--      for (int j = min_neigborhood_idx.y(); j <= max_neigborhood_idx.y(); j++)
--        for (int i = min_neigborhood_idx.x(); i <= max_neigborhood_idx.x(); i++)
--        {
--          vgl_point_3d<int> neighbor_cell_idx(i, j, k);
--
--          vgl_point_3d<double> neighbor_cell_centroid(center_cell_centroid.x() + ((double)neighbor_cell_idx.x())*cell_length,
--                                                      center_cell_centroid.y() + ((double)neighbor_cell_idx.y())*cell_length,
--                                                      center_cell_centroid.z() + ((double)neighbor_cell_idx.z())*cell_length);
--
--          boct_tree_cell<short,T_data> *this_cell = scene_in->locate_point_in_memory(neighbor_cell_centroid);
--
--          if (this_cell) {
--            harris_functor.apply(this_cell->data());
--          }
--          else
--            break;
--        }
--
--    double C = 0;
--    harris_functor.result(C);
--    corner_center_cell->set_data(float(C));
--  }
--
--  std::cout << "Number of Harris fails: " << n_fail << std::endl;
--  //write the output block
--  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
--  corner_scene->write_active_block();
--}
--
--
--template<class T_data>
--void bvpl_corner_detector::compute_det_H( boxm_scene<boct_tree<short, T_data > > *scene_in,
--                                          unsigned block_i, unsigned block_j, unsigned block_k,
--                                          boxm_scene<boct_tree<short, bool> > *valid_scene,
--                                          boxm_scene<boct_tree<short, float> > *corner_scene)
--{
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  // Load input and output blocks
--  scene_in->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--  corner_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree_in = scene_in->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, bool> *valid_tree = valid_scene->get_block(block_i, block_j, block_k)->get_tree();
--  boct_tree<short, float> *corner_tree = tree_in->template clone_to_type<float>();
--  corner_tree->init_cells(0.0f);
--
--  std::vector<cell_type* > cells_in = tree_in->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, float> * > corner_cells = corner_tree->leaf_cells();
--
--  //iterators
--  typename std::vector<cell_type* >::iterator it_in = cells_in.begin();
--  std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--  std::vector<boct_tree_cell<short, float> * >::iterator corner_it = corner_cells.begin();
--
--  for (; (it_in!=cells_in.end())&& (valid_it!=valid_cells.end()) && (corner_it!=corner_cells.end()); it_in++, valid_it++, corner_it++)
--  {
--    boct_tree_cell<short,T_data> *center_cell = *it_in;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--    boct_tree_cell<short, float> *corner_center_cell = *corner_it;
--
--    if (!valid_center_cell->data()) {
--      continue;
--    }
--
--    vnl_vector_fixed<double,10> mean_coeff = center_cell->data();
--
--    vnl_double_3x3 H;
--    H.put(0,0,mean_coeff[4]);
--    H.put(0,1,mean_coeff[7]);
--    H.put(0,2,mean_coeff[8]);
--    H.put(1,0,mean_coeff[7]);
--    H.put(1,1,mean_coeff[5]);
--    H.put(1,2,mean_coeff[9]);
--    H.put(2,0,mean_coeff[8]);
--    H.put(2,1,mean_coeff[9]);
--    H.put(2,2,mean_coeff[6]);
--
--    corner_center_cell->set_data(float(vnl_determinant(H)));
--  }
--
--  //write the output block
--  corner_scene->get_block(block_i, block_j, block_k)->init_tree(corner_tree);
--  corner_scene->write_active_block();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
-deleted file mode 100644
-index 85231de3e0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
-+++ /dev/null
-@@ -1,68 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_corner_functors.h
--#ifndef bvpl_corner_functors_h
--#define bvpl_corner_functors_h
--//:
--// \file
--// \brief Set of functors based on Harris measures
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  20-Jul-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vnl/vnl_double_3x3.h>
--#include <vnl/algo/vnl_determinant.h>
--
--//  Functor to threshold on Harris corner measure proposed in:
--//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107-123, 2005
--class bvpl_harris_laptev_functor
--{
-- public:
--  bvpl_harris_laptev_functor(double k)
--  {
--    H_ = vnl_double_3x3(0.0);
--    count_ = 0;
--    k_ = k;
--  }
--
--  //: Apply a given operation to value \p val, depending on the dispatch character
--  void apply(vnl_vector_fixed<double,10> taylor_coeff)
--  {
--    vnl_double_3x3 temp_H;
--    for (unsigned mi = 0; mi <3; mi++)
--      for (unsigned mj = 0; mj <3; mj++)
--        temp_H.put(mi,mj, taylor_coeff[mi+1] * taylor_coeff[mj+1]);
--
--    H_ = H_ + temp_H;
--    count_++;
--  }
--
--  //: Returns true if the harris threshold is passed, returns by reference the value of the harris ration
--  bool result( double &C)
--  {
--    H_ /= (double)count_;
--
--    double trace_H = H_[0][0] + H_[1][1] + H_[2][2];
--    bool pass = false;
--
--    C = vnl_determinant(H_) - k_*(trace_H * trace_H * trace_H);
--
--    if (C >= 1e-7)
--      pass = true;
--
--    count_ = 0;
--    H_.fill(0.0);
--
--    return pass;
--  }
--
-- protected:
--
--  vnl_double_3x3 H_;
--  unsigned count_;
--  double k_;
--};
--
--#endif // bvpl_corner_functors_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
-deleted file mode 100644
-index a2aa13a8c6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.cxx
-+++ /dev/null
-@@ -1,1028 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 8-Nov-2010
--
--#include "bvpl_discover_pca_kernels.h"
--#include <vnl/algo/vnl_symmetric_eigensystem.h>
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--#include <boxm/boxm_scene_parser.h>
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bvpl_discover_pca_kernels::bvpl_discover_pca_kernels(const std::string &path)
--{
--  std::cout << "Loading pca info from xml-file" << std::endl;
--
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--
--  if (!xml_ifs)
--    return;
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("pca_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cout << "bvpl_discover_pca_kernels - could not parse xml root\n";
--  }
--
--  //Parse neighborhood bounding box - units are number of voxels
--  bxml_element nbbox_query("neighborhood");
--  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
--  auto* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
--  int min_x=0, min_y=0, min_z=0, max_x=0, max_y=0, max_z =0;
--  nbbox_elm->get_attribute("min_x", min_x);
--  nbbox_elm->get_attribute("min_y", min_y);
--  nbbox_elm->get_attribute("min_z", min_z);
--  nbbox_elm->get_attribute("max_x", max_x);
--  nbbox_elm->get_attribute("max_y", max_y);
--  nbbox_elm->get_attribute("max_z", max_z);
--
--  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
--  std::cout << "Neighborhood: " << nbbox_ << std::endl;
--
--  //Parse Number of samples
--  bxml_element nsamples_query("samples");
--  bxml_data_sptr nsamples_data = bxml_find_by_name(root, nsamples_query);
--  auto* nsamples_elm = dynamic_cast<bxml_element*>(nsamples_data.ptr());
--  nsamples_elm->get_attribute("nsamples", nsamples_);
--  std::cout << "Number of samples: " << nsamples_ << std::endl;
--
--  //Parse dimension
--  bxml_element dim_query("dimension");
--  bxml_data_sptr dim_data = bxml_find_by_name(root, dim_query);
--  auto* dim_elm = dynamic_cast<bxml_element*>(dim_data.ptr());
--  dim_elm->get_attribute("feature_dim", feature_dim_);
--  std::cout << "Feature dimension: " << feature_dim_ << std::endl;
--
--  //Parse paths and set matrices
--  bxml_element paths_query("paths");
--  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
--  auto* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
--
--  int valid = 0;
--  std::string ifs_path;
--
--  path_elm->get_attribute("pc_path", ifs_path);
--  if (ifs_path != pc_path())
--    valid = -1;
--  else{
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> pc_;
--    if (pc_.size()!=feature_dim_*feature_dim_)
--      valid = -2;
--  }
--
--  path_elm->get_attribute("weights_path", ifs_path);
--  if (ifs_path != weights_path())
--    valid = -3;
--  else{
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> weights_;
--    if (weights_.size()!=feature_dim_)
--      valid = -4;
--  }
--
--  path_elm->get_attribute("sample_mean_path", ifs_path);
--  if (ifs_path != sample_mean_path())
--    valid = -5;
--  else
--  {
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> sample_mean_feature_ ;
--    if (sample_mean_feature_.size()!=feature_dim_)
--      valid = -6;
--  }
--
--  path_elm->get_attribute("data_path", ifs_path);
--  if (ifs_path != data_path())
--    valid = -7;
--
--  path_elm->get_attribute("positions_path", ifs_path);
--  if (ifs_path != pos_path())
--    valid = -8;
--
--  path_elm->get_attribute("scene_path", scene_path_);
--
--  //load scene
--  boxm_scene_parser parser;
--  data_scene_base_=new boxm_scene_base();
--  data_scene_base_->load_scene(scene_path_, parser);
--
--  //cast scene
--  auto *scene= new boxm_scene<boct_tree<short, float > >();
--  if (data_scene_base_->appearence_model() == BOXM_FLOAT){
--    scene->load_scene(parser);
--    data_scene_base_ = scene;
--  }
--
--  path_elm->get_attribute("data_mean_path", ifs_path);
--  if (ifs_path != data_mean_path()){
--    compute_mean_feature(scene);
--    valid = -9;
--    std::cout << "bvpl_discover_pca_kernels - errors parsing data_mean_feature.xml\n";
--  }
--  else
--  {
--    std::ifstream ifs(ifs_path.c_str());
--    ifs >> data_mean_feature_ ;
--    if (data_mean_feature_.size()!=feature_dim_)
--      valid = -10;
--  }
--
--  //Parse dimension
--  bxml_element cell_length_query("finest_cell_length");
--  bxml_data_sptr cell_length_data = bxml_find_by_name(root, cell_length_query);
--  auto* cell_length_elm = dynamic_cast<bxml_element*>(cell_length_data.ptr());
--  bool has_length = cell_length_elm->get_attribute("length", finest_cell_length_);
--  if (!has_length || finest_cell_length_ < 0.0){
--     std::cout << "Error: Finest cell length read from file: " << finest_cell_length_ << " has length " << has_length << std::endl;
--     finest_cell_length_ = scene->finest_cell_length();
--     valid = -11;
--  }
--  std::cout << "Finest cell length: " << finest_cell_length_ << std::endl;
--
--  if (valid<0){
--    std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
--    xml_write();
--  }
--}
--
--
--//: Set Up the PCA matrix for the given scene
--void bvpl_discover_pca_kernels::set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene)
--{
--  //zero-mean feature matrix
--  vnl_matrix<double> M = this->compute_deviation_matrix(scene);
--
--  vnl_svd<double> A(M);
--
--  //columns of U contain principal components.
--  pc_.set_size(feature_dim_, feature_dim_);
--  A.U().extract(pc_);
--  weights_.set_size(feature_dim_);
--  weights_ = A.W().diagonal().extract(feature_dim_);
--
--  weights_ = element_product(weights_, weights_);
--
--#ifdef DEBUG
--  std::cerr << "Scatter Matix svd" << M*M.transpose() << '\n'
--           << "PC Matix SVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
--           << "Evals SVD:\nSize: " << weights_.size() << '\n' << weights_ << '\n';
--  bvpl_write_pca(path_out_ + "/pca_matrices", M, weights_, pc_);
--#endif
--}
--
--
--//: Set Up the PCA matrix for the given scene
--//  This method performs eigen value decomposition on the scatter matrix
--//  Use this method when number of samples >> number of dimensions
--void bvpl_discover_pca_kernels::set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene)
--{
--  //zero-mean feature matrix
--  vnl_matrix<double> S = this->compute_scatter_matrix(scene);
--
--  // Compute eigenvectors(principal components) and values of S
--  pc_.set_size(feature_dim_,feature_dim_);
--  weights_.set_size(feature_dim_);
--
--  vnl_symmetric_eigensystem_compute(S, pc_, weights_);
--
--  pc_.fliplr();
--  weights_.flip();
--
--#ifdef DEBUG
--  std::cerr << "Scatter Matix" << S << '\n'
--           << "PC Matix EVD:\n Size: " << pc_.size() << '\n' <<pc_ << '\n'
--           << "EVals EVD:\n Size: " << weights_.size() << '\n' <<weights_ << '\n';
--  bvpl_write_pca(path_out_ + "/pca_evd", S, weights_, pc_);
--#endif
--}
--
--
--//: Ramndom samples according to octree structure.
--//  Sampling is achieved by generating uniform random cell samples.
--//  Since there are more cells where the resolution is finer, then these regions get sampled more often
--vnl_matrix<double> bvpl_discover_pca_kernels::compute_scatter_matrix( boxm_scene<boct_tree<short, float> > *scene)
--{
--  //init variables
--  double scene_ncells = scene->size();
--  scene->unload_active_blocks();
--  sample_mean_feature_.fill(0.0f);
--  vnl_matrix<double> S(feature_dim_, feature_dim_, 0.0f);
--  vnl_random rng;
--  std::ofstream pos_ofs(pos_path().c_str());
--  std::ofstream data_ofs(data_path().c_str());
--  data_ofs.precision(15);
--
--  // 1. Traverse through the blocks/trees
--  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
--  unsigned long long nfeature = 1;
--  for (it.begin(); !it.end(); ++it)
--  {
--    scene->load_block_and_neighbors(it.index());
--    boct_tree<short, float>   *tree = (*it)->get_tree();
--    assert(tree != nullptr);
--
--    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
--    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
--    int tree_ncells = leaf_cells.size();
--    auto tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
--#ifdef DEBUG
--    std::cout <<"Tree nsamples is: " << tree_nsamples << '\n'
--             <<" nsamples is: " << nsamples_ <<std::endl;
--#endif
--    for (unsigned i=0; i<tree_nsamples; ++i)
--    {
--      unsigned long sample = rng.lrand32(tree_ncells-1);
--
--      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
--      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--      //convert neighborhood box to scene coordinates
--      vgl_point_3d<int> nmin = nbbox_.min_point();
--      vgl_point_3d<int> nmax = nbbox_.max_point();
--
--      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
--                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
--      roi.set_centroid(center_cell_centroid);
--
--      //if neighborhood is not inclusive we would have missing features
--      if (!((scene->get_world_bbox()).contains(roi))){
--        --i;
--        continue;
--      }
--
--      //3. Assemble neighborhood as a feature-vector
--      vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--      unsigned curr_dim = 0;
--      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--          {
--            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
--                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
--                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
--
--            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--            assert(neighbor_cell !=nullptr);
--            this_feature[curr_dim] = (double)neighbor_cell->data();
--            ++curr_dim;
--          }
--
--      assert(curr_dim == feature_dim_);
--
--      pos_ofs << center_cell_centroid <<'\n' ;
--      data_ofs << this_feature << '\n';
--
--      //increment weights
--      double rho = 1.0/(double)nfeature;
--      double rho_comp = 1.0 - rho;
--
--      // the difference vector between the sample and the mean
--      vnl_vector<double> diff = this_feature - sample_mean_feature_;
--
--      //update the covariance
--      S += rho_comp*outer_product(diff,diff);
--
--      //update the mean
--      sample_mean_feature_ += (rho*diff);
--
--      ++nfeature;
--#ifdef DEBUG
--      std::cerr << "Feature EVD: " <<this_feature << '\n'
--               << "Mean Feature EVD: " <<mean_feature << '\n';
--#endif
--    }
--  } //end of block-loop
--
--  pos_ofs.close();
--  data_ofs.close();
--  std::ofstream mean_ofs(sample_mean_path().c_str());
--  mean_ofs.precision(15);
--  mean_ofs << sample_mean_feature_;
--  mean_ofs.close();
--
--  nsamples_ = nfeature-1;
--
--  return S;
--}
--
--
--//: Samples according to octree structure.
--//  Sampling is achieved by generating uniform random cell samples.
--//  Since there are more cells where the resolution is finer, then these regions get sampled more often
--vnl_matrix<double> bvpl_discover_pca_kernels::compute_deviation_matrix( boxm_scene<boct_tree<short, float> > *scene)
--{
--  //init variables
--  unsigned long scene_ncells = scene->size();
--  sample_mean_feature_.fill(0.0f);
--  vnl_matrix<double> M(feature_dim_, (unsigned int)nsamples_);
--  vnl_random rng(9667566ul);
--  std::ofstream pos_ofs(pos_path().c_str());
--
--  // 1. Traverse through the blocks/trees
--  boxm_block_iterator<boct_tree<short,float> > it = scene->iterator();
--  unsigned long feature_col = 0;
--  for (it.begin(); !it.end(); ++it)
--  {
--    scene->load_block_and_neighbors(it.index());
--    boct_tree<short, float>   *tree = (*it)->get_tree();
--    assert(tree != nullptr);
--
--    //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
--    std::vector<boct_tree_cell<short, float> *> leaf_cells = tree->leaf_cells();
--    int tree_ncells = leaf_cells.size();
--    auto tree_nsamples = (unsigned long)(tree_ncells*nsamples_/scene_ncells); // possible overflow ...
--
--    for (unsigned int i=0; i<tree_nsamples; ++i)
--    {
--      unsigned long sample = rng.lrand32(tree_ncells-1);
--
--      boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
--      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--      //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--      //convert neighborhood box to scene coordinates
--      vgl_point_3d<int> nmin = nbbox_.min_point();
--      vgl_point_3d<int> nmax = nbbox_.max_point();
--
--      vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
--                             finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
--      roi.set_centroid(center_cell_centroid);
--
--      //if neighborhood is not inclusive we would have missing features
--      if (!((scene->get_world_bbox()).contains(roi))){
--        --i;
--        continue;
--      }
--
--      //3. Assemble neighborhood as a feature-vector
--      vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--      unsigned curr_dim = 0;
--      for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--        for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--          for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--          {
--            vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
--                                                   center_cell_centroid.y() + (double)y*finest_cell_length_,
--                                                   center_cell_centroid.z() + (double)z*finest_cell_length_);
--
--            boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--            assert(neighbor_cell !=nullptr);
--            this_feature[curr_dim] = (double)neighbor_cell->data();
--            ++curr_dim;
--          }
--
--      assert(curr_dim == feature_dim_);
--
--      pos_ofs << center_cell_centroid <<'\n' ;
--
--      M.set_column(feature_col,this_feature);
--      sample_mean_feature_+=this_feature;
--      ++feature_col;
--#ifdef DEBUG
--      std::cerr << "Feature SVD: " <<this_feature << '\n'
--               << "Mean Feature SVD: " <<mean_feature/(double)feature_col << '\n';
--#endif
--    }
--  } //end of block-loop
--
--  //the actual number of samples is different from desired number of smaples because only integer samples are drawn from each tree
--  vnl_matrix<double> F(feature_dim_, feature_col);
--
--  M.extract(F);
--
--  //4. Normalize feature vector
--  sample_mean_feature_/=feature_col;
--#ifdef DEBUG
--  std::cerr << "Mean Feature SVD: " <<mean_feature << '\n';
--#endif
--  std::ofstream mean_ofs(sample_mean_path().c_str());
--  mean_ofs.precision(15);
--  mean_ofs << sample_mean_feature_;
--  mean_ofs.close();
--
--  for (unsigned int j=0; j<feature_col; ++j)
--    F.set_column(j,F.get_column(j) - sample_mean_feature_);
--
--  return F;
--}
--
--
--//: Project training samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::compute_training_error(vnl_vector<double> &proj_error)
--{
--  std::ifstream data_ifs(data_path().c_str());
--  std::cerr << data_path() << '\n';
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond elemend, to error when projecting on frist 2 components and so on
--  proj_error.set_size(feature_dim_);
--  proj_error.fill(0.0);
--
--  //For all samples
--  for (unsigned long i = 0; i < nsamples_; ++i)
--  {
--    if (data_ifs.eof())
--      continue;
--
--    //retrieve the data from file
--    vnl_vector<double> norm_feature(feature_dim_, 0.0);
--    data_ifs >> norm_feature;
--#ifdef DEBUG
--    std::cerr << "Feature: " <<norm_feature << '\n';
--#endif
--    norm_feature-=sample_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (norm_feature);
--
--    //project as a function of number of components
--    for (unsigned c = 0; c < feature_dim_; ++c)
--    {
--      //reconstruct
--      vnl_vector<double> norm_feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
--      vnl_vector<double> rec_feature = pc_*a;
--      //compute error
--      proj_error[c]+= (norm_feature - norm_feature_approx).squared_magnitude();
--    }
--  }
--}
--
--
--//: Project training samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::compute_normalized_training_error(vnl_vector<double> &proj_error)
--{
--  theoretical_training_error(proj_error);
--  proj_error /= (double)nsamples_;
--}
--
--//: Project training samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::theoretical_training_error(vnl_vector<double> &proj_error)
--{
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond elemend, to error when projecting on frist 2 components and so on
--  proj_error.set_size(feature_dim_);
--  proj_error.fill(0.0);
--
--  for (unsigned i=0; i<weights_.size(); ++i)
--  {
--    double error = weights_.extract(weights_.size() - (i+1), i+1).sum(); // * 0.5
--    proj_error[i] = error;
--  }
--}
--
--
--//: Project test samples onto pca space and return error as a function of number of components used
--void bvpl_discover_pca_kernels::compute_testing_error(vnl_vector<double> &proj_error)
--{
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond element, to error when projecting on frist 2 components and so on
--  proj_error.set_size(feature_dim_);
--  proj_error.fill(0.0);
--
--  //cast scene
--  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > > *> (data_scene_base_.as_pointer());
--
--  compute_mean_feature(scene);
--
--  //iterate through leaves and arrage as vectors.
--  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
--  cell_it.begin();
--
--  while (!(cell_it.end()))
--  {
--    //boct_tree_cell<short, float> *center_cell = *cell_it;
--    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--    //convert neighborhood box to scene coordinates
--    vgl_point_3d<int> nmin = nbbox_.min_point();
--    vgl_point_3d<int> nmax = nbbox_.max_point();
--
--    vgl_box_3d<double> roi(finest_cell_length_*(double)nmin.x(),finest_cell_length_*(double)nmin.y(),finest_cell_length_*(double)nmin.z(),
--                           finest_cell_length_*(double)nmax.x(),finest_cell_length_*(double)nmax.y(),finest_cell_length_*(double)nmax.z());
--    roi.set_centroid(center_cell_centroid);
--
--    //if neighborhood is not inclusive we would have missing features
--    if (!((scene->get_world_bbox()).contains(roi))){
--      ++cell_it;
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*finest_cell_length_,
--                                                 center_cell_centroid.y() + (double)y*finest_cell_length_,
--                                                 center_cell_centroid.z() + (double)z*finest_cell_length_);
--
--          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--          assert(neighbor_cell !=nullptr);
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    assert(curr_dim == feature_dim_);
--
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--#ifdef DEBUG
--    std::cout <<"This feature is " << this_feature <<std::endl;
--#endif
--
--    //project as a function of number of components
--    for (unsigned c = 0; c < feature_dim_; ++c)
--    {
--      //reconstruct
--      vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, c+1) * a.extract(c+1);
--      vnl_vector<double> rec_feature = pc_*a;
--#ifdef DEBUG
--      std::cout <<"Feature approx at c = " << c << " is " <<  feature_approx <<std::endl;
--#endif
--      //compute error
--      proj_error[c]+= (this_feature - feature_approx).squared_magnitude();
--    }
--
--    ++cell_it;
--  }
--#if 0
--  vnl_vector<double> training_error;
--  this->theoretical_training_error(training_error);
--  proj_error-=training_error;
--#endif
--}
--
--
--//: Reconstructions error on testing samples. By block. Error is given as average error per sample
--void bvpl_discover_pca_kernels::compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
--                                                      int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  //cast the scenes
--  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
--  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  if (!(data_scene &&error_scene)){
--    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
--    return;
--  }
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))){
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--  data_scene->unload_active_blocks();
--  error_scene->unload_active_blocks();
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  error_tree->init_cells(-1.0f);
--
--  //get the leaves
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> min_point = nbbox_.min_point();
--  vgl_point_3d<int> max_point = nbbox_.max_point();
--
--  for (unsigned i=0; i<data_leaves.size(); ++i)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
--      continue;
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
--                                                 centroid.y() + (double)y*finest_cell_length_,
--                                                 centroid.z() + (double)z*finest_cell_length_);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell){
--            std::cerr << "Error in compute_testing_error\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    if (curr_dim != feature_dim_){
--      std::cerr << "Error in compute_testing_error\n";
--      return;
--    }
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--    //project as a function of number of components
--    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
--
--    //compute error
--    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
--  error_scene->write_active_block();
--  data_scene->unload_active_blocks();
--  error_scene->unload_active_blocks();
--}
--
--
--#if BVPL_OCTREE_HAS_PTHREADS
--void bvpl_discover_pca_kernels::compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene,
--                                                                  unsigned ncomponents,
--                                                                  int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  //cast the scenes
--  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
--
--  if (!(data_scene &&error_scene)){
--    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
--    return;
--  }
--
--  if (!(data_scene->load_all_blocks() && error_scene->load_all_blocks())){
--    std::cerr << "Must load all blocks into memory before using threads\n";
--    return;
--  }
--  //get the cells for this block
--  if (!error_scene->valid_index(block_i, block_j, block_k)){
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  //error_scene->load_block_thread_safe(block_i, block_j, block_k);
--
--  //get the trees
--  boxm_block<float_tree_type> *data_block = data_scene->get_block(block_i, block_j, block_k);
--  if (!data_block)
--    return;
--
--  float_tree_type* data_tree = data_block->get_tree();
--  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  // error_tree->init_cells(-1.0f);
--
--  //get the leaves
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  //std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> min_point = nbbox_.min_point();
--  vgl_point_3d<int> max_point = nbbox_.max_point();
--
--  for (auto data_cell : data_leaves)
--  {
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*finest_cell_length_, centroid.y() + (double)min_point.y()*finest_cell_length_, centroid.z() + (double)min_point.z()*finest_cell_length_);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*finest_cell_length_, centroid.y() + (double)max_point.y()*finest_cell_length_, centroid.z() + (double)max_point.z()*finest_cell_length_);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
--      continue;
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*finest_cell_length_,
--                                                 centroid.y() + (double)y*finest_cell_length_,
--                                                 centroid.z() + (double)z*finest_cell_length_);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell){
--            std::cerr << "Error in compute_testing_error\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    if (curr_dim != feature_dim_){
--      std::cerr << "Error in compute_testing_error\n";
--      return;
--    }
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--    //project as a function of number of components
--    vnl_vector<double> feature_approx  = pc_.extract(feature_dim_, ncomponents) * a.extract(ncomponents);
--
--    //compute error
--    //error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
--  error_scene->write_block_thread_safe(block_i, block_j, block_k);
--}
--#endif // BVPL_OCTREE_HAS_PTHREADS
--
--
--//: Compute mean feature of all "leaf-features" in a scene
--void bvpl_discover_pca_kernels::compute_mean_feature(boxm_scene<boct_tree<short, float> > *scene)
--{
--  //a vector to keep projection error - first element refers to error when using only first pc,
--  //the sencond element, to error when projecting on frist 2 components and so on
--  data_mean_feature_.set_size(feature_dim_);
--  data_mean_feature_.fill(0.0);
--  unsigned long nfeatures = 0;
--
--  //iterate through leaves and arrage as vectors.
--  double cell_length = scene->finest_cell_length();
--
--  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
--  cell_it.begin();
--
--  while (!(cell_it.end()))
--  {
--    //boct_tree_cell<short, float> *center_cell = *cell_it;
--    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--    //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--    //convert neighborhood box to scene coordinates
--    vgl_point_3d<int> nmin = nbbox_.min_point();
--    vgl_point_3d<int> nmax = nbbox_.max_point();
--
--    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
--                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
--    roi.set_centroid(center_cell_centroid);
--
--    //if neighborhood is not inclusive we would have missing features
--    if (!((scene->get_world_bbox()).contains(roi))){
--      ++cell_it;
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
--                                                 center_cell_centroid.y() + (double)y*cell_length,
--                                                 center_cell_centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_centroid);
--
--          assert(neighbor_cell !=nullptr);
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          ++curr_dim;
--        }
--
--    assert(curr_dim == feature_dim_);
--
--    data_mean_feature_+=this_feature;
--    ++nfeatures;
--    ++cell_it;
--  }
--  data_mean_feature_ = data_mean_feature_/(double)nfeatures;
--
--  std::ofstream mean_ofs(data_mean_path().c_str());
--  mean_ofs.precision(15);
--  mean_ofs << data_mean_feature_;
--  mean_ofs.close();
--}
--
--
--#if 0 //too_slow
--      //: Compute deviations i.e. zero-mean feature matrix
--vnl_matrix<float>& bvpl_discover_pca_kernels::compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene)
--{
--  unsigned long max_nsamples = scene->size();
--
--  //iterate through leaves, keep random samples in memory and arrage as vectors.
--  boxm_cell_iterator<boct_tree<short, float > > cell_it = scene->cell_iterator(&boxm_scene<boct_tree<short, float> >::load_block_and_neighbors, true);
--  cell_it.begin();
--
--  vnl_random rng(9667566ul);
--  unsigned long pos_pre = 0;  //previous position on random samples array
--
--  for (unsigned i=1; i<nsamples_; ++i)
--  {
--    unsigned long sample = rng.lrand32(max_nsamples);
--    vgl_box_3d<double> roi = nbbox_;
--    for (unsigned u = 0; u + pos_pre < sample; ++u)
--      ++cell_it;
--    pos_pre = sample;
--    roi.set_centroid(cell_it.global_centroid());
--    if (!((scene->get_world_bbox()).contains(roi))){
--      --i;
--      continue;
--    }
--
--    positions_.push_back(sample);
--  }
--
--  //sort random numbers for easy access
--  positions_.sort();
--  if (nsamples_ != positions_.size())
--  {
--    std::cerr << "Error computing PCA features: Wrong number of random samples generated\n";
--    return false;
--  }
--
--  cell_it.begin();
--
--  //init cells array to first random element
--  std::list<unsigned long>::const_iterator rand_it = positions_.begin();
--  cell_it+=(*rand_it - pos_pre);
--  pos_pre = *rand_it;
--
--  //init quantities for mean
--  unsigned feature_dim = nbbox_.width()*nbbox_.height()* nbbox_.depth();
--  vnl_vector<float> mean(feature_dim);
--  M.set_size(feature_dim, nsamples_);
--  unsigned i=0;
--
--  double cell_length = scene->finest_cell_length();
--  while (!(cell_it.end()))
--  {
--    boct_tree_cell<short, float> *center_cell = *cell_it;
--    vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--    if (!center_cell){
--      std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
--      return false;
--    }
--
--    //assemble neighborhood as a feature-vector
--    vnl_vector<float> this_feature(feature_dim);
--
--    unsigned curr_dims = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_origin(center_cell_centroid.x() + (double)x*cell_length,
--                                               center_cell_centroid.y() + (double)y*cell_length,
--                                               center_cell_centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = scene->locate_point_in_memory(neighbor_origin);
--
--          if (!neighbor_cell){
--            std::cerr << "Error is bvpl_discover_pca_kernels: Unexpected NULL cell\n";
--            return false;
--          }
--
--          this_feature[x + nbbox_.width()*y + nbbox_.width()*nbbox_.height()*z] = neighbor_cell->data();
--          ++curr_dims;
--        }
--
--    M.set_column(i,this_feature);
--    mean+=this_feature;
--
--    //increment iterators
--    cell_it+=(*rand_it - pos_pre);
--    pos_pre = *rand_it;
--    ++rand_it;
--    ++i;
--  }
--
--  mean/=nsamples_;
--
--  for (unsigned int j=0; j<nsamples_; ++j)
--    M.set_column(j,M.get_column(j) - mean);
--
--  return true;
--}
--#endif
--
--void bvpl_discover_pca_kernels::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("pca_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  bxml_element* paths = new bxml_element("paths");
--  paths->append_text("\n");
--  paths->set_attribute("pc_path", pc_path() );
--  paths->set_attribute("data_path", data_path() );
--  paths->set_attribute("weights_path", weights_path() );
--  paths->set_attribute("positions_path", pos_path()) ;
--  paths->set_attribute("sample_mean_path", sample_mean_path());
--  paths->set_attribute("data_mean_path", data_mean_path());
--  paths->set_attribute("scene_path", scene_path_);
--  root->append_data(paths);
--  root->append_text("\n");
--
--  bxml_element* neighborhood = new bxml_element("neighborhood");
--  neighborhood->append_text("\n");
--  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
--  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
--  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
--  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
--  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
--  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
--  root->append_data(neighborhood);
--  root->append_text("\n");
--
--  bxml_element* nsamples = new bxml_element("samples");
--  nsamples->append_text("\n");
--  nsamples->set_attribute("nsamples", nsamples_);
--  root->append_data(nsamples);
--  root->append_text("\n");
--
--  bxml_element* dim = new bxml_element("dimension");
--  dim->append_text("\n");
--  dim->set_attribute("feature_dim", feature_dim_);
--  root->append_data(dim);
--  root->append_text("\n");
--
--  bxml_element* cell_length = new bxml_element("finest_cell_length");
--  cell_length->append_text("\n");
--  cell_length->set_attribute("length", finest_cell_length_);
--  root->append_data(cell_length);
--  root->append_text("\n");
--
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--
--  //: Write pca main matrices -other matrices aren't class variables and should have been written during computation time
--
--  write_pca_matrices();
--}
--
--
--//: Write a PCA file
--bool bvpl_discover_pca_kernels::write_pca_matrices()
--{
--  std::ofstream pc_ofs(pc_path().c_str());
--  pc_ofs.precision(15);
--  std::ofstream weights_ofs(weights_path().c_str());
--  weights_ofs.precision(15);
--
--  pc_ofs << pc_;
--  pc_ofs.close();
--  weights_ofs << weights_;
--  weights_ofs.close();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
-deleted file mode 100644
-index 875504affa..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
-+++ /dev/null
-@@ -1,309 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_discover_pca_kernels.h
--#ifndef bvpl_discover_pca_kernels_h
--#define bvpl_discover_pca_kernels_h
--//:
--// \file
--// \brief A class to discover those features that represent the data the best in a least square sense using PCA
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  8-Nov-2010.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <list>
--#include <iostream>
--#include <utility>
--#include <vgl/vgl_box_3d.h>
--
--#include <boxm/boxm_scene.h>
--#include <bxml/bxml_document.h>
--
--#include <vnl/vnl_matrix.h>
--#include <vnl/vnl_vector.h>
--#include <vnl/algo/vnl_svd.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--
--#if BVPL_OCTREE_HAS_PTHREADS
--#include <pthread.h>
--#endif
--
--class bvpl_discover_pca_kernels;
--
--typedef vbl_smart_ptr<bvpl_discover_pca_kernels> bvpl_discover_pca_kernels_sptr;
--
--class bvpl_discover_pca_kernels: public vbl_ref_count
--{
-- public:
--  //: Constructor from neighborhood bounding boxm, number of samples to be drawn, scene and flag to indicate whether to use evd or svd
--  bvpl_discover_pca_kernels(vgl_box_3d<int> nbbox, unsigned long long nsamples, boxm_scene<boct_tree<short,float> > *scene, std::string  path_out=".", bool use_evd = true):
--  nbbox_(nbbox), nsamples_(nsamples), path_out_(std::move(path_out))
--  {
--    scene_path_ = scene->filename();
--    std::cout << "Scene path: " << scene->filename()<< std::endl;;
--    data_scene_base_=scene;
--
--    finest_cell_length_ = scene->finest_cell_length();
--
--    feature_dim_ = (nbbox_.width()+1)*(nbbox_.height()+1)* (nbbox_.depth()+1);
--    compute_mean_feature(scene);
--
--    sample_mean_feature_.set_size(feature_dim_);
--
--    if (use_evd)
--      set_up_pca_evd(scene);
--    else
--      set_up_pca_svd(scene);
--
--    scene->unload_active_blocks();
--  }
--
--  //: Construct from xml file
--  bvpl_discover_pca_kernels(const std::string &path);
--
--  //: Constructor from zero-mean matrix
--  bvpl_discover_pca_kernels(const vnl_matrix<double>& M)
--  {
--    vnl_svd<double> A(M, -1e-8);
--
--    //columns of U contain principal components.
--    pc_.set_size(A.rank(), M.rows());
--    A.U().extract(pc_);
--  }
--
--  //: Access the principal components
--  const vnl_matrix<double>& principal_comps() { return pc_; }
--
--  //: Access the coefficients
--  const vnl_vector<double>& weights() { return weights_; }
--
--  //: Access the mean of samples
--  const vnl_vector<double>& mean()  { return sample_mean_feature_; }
--
--  //: Project training samples onto pca space and return error as a function of number of components used
--  void compute_training_error(vnl_vector<double> &proj_error);
--
--  //: Project training samples onto pca space and return error as a function of number of components used
--  void compute_normalized_training_error(vnl_vector<double> &proj_error);
--
--  //: Reconstrcution error on training samples. Same as above but it is not computed from samples.
--  void theoretical_training_error(vnl_vector<double> &proj_error);
--
--  //: Reconstructions error on testing samples. All training samples are excuded!
--  void compute_testing_error(vnl_vector<double> &proj_error);
--
--  //: Reconstructions error on testing samples. By block. Error is given as average error per sample
--  void compute_testing_error(const boxm_scene_base_sptr& error_scene_base, unsigned ncomponents,
--                             int block_i, int block_j, int block_k);
--
--#if BVPL_OCTREE_HAS_PTHREADS
--
--  void compute_testing_error_thread_safe(boxm_scene<boct_tree<short,float> > * error_scene, unsigned ncomponents,
--                                         int block_i, int block_j, int block_k);
--
--//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
--//  bool compute_testing_error_thread_safe(boxm_scene_base_sptr error_scene_base, unsigned ncomponents);
--//
--//  //: Reconstructions error on testing samples. By block. Error is the sse of feature vector approximation
--//  friend void *compute_testing_error_thread( void *ptr);
--
--#endif
--
--  //: Computes pca projection at each voxel on the block and it save the specified number of dimensions (dim)
--  template <unsigned DIM>
--  void project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
--               int block_i, int block_j, int block_k);
--
--  //: Compute the mean feature of all "leaf" samples in the data scene associated with this class
--  void compute_mean_feature(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Return the number of samples used
--  unsigned long long nsamples() const { return nsamples_; }
--
--  //: Return dimension of the features
--  unsigned feature_dim() const { return feature_dim_; }
--
--  //: Return scene path
--  std::string scene_path() const { return scene_path_; }
--
--  //: Return number of blocks in the data scene
--  vgl_vector_3d<unsigned> data_scene_dim() const { return data_scene_base_->world_dim(); }
--
--  bool load_all_scene_blocks()
--  {
--    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
--    return scene->read_all_blocks();
--  }
--
--  void unload_all_scene_blocks()
--  {
--    boxm_scene<boct_tree<short,float> > *scene = dynamic_cast<boxm_scene<boct_tree<short,float> >* > (data_scene_base_.as_pointer());
--    scene->unload_active_blocks();
--  }
--
--  //: Compute deviations i.e. zero-mean feature matrix
--  vnl_matrix<double> compute_deviation_matrix(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Compute the scatter matrix.
--  vnl_matrix<double> compute_scatter_matrix(boxm_scene<boct_tree<short,float> > *scene);
--
--  void xml_write();
--
-- protected:
--
--  //: Set Up the PCA matrix for the given scene.
--  //  This method computes the deviation matrix and performs SVD to find the principal components
--  //  If the number of samples is very large use set_up_pca_evd
--  void set_up_pca_svd(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Set Up the PCA matrix for the given scene
--  //  This method performs eigen value decomposition on the covariance matrix
--  //  Use this method when number of samples >> number of dimensions
--  void set_up_pca_evd(boxm_scene<boct_tree<short,float> > *scene);
--
--  //: Write a PCA file
--  bool write_pca_matrices();
--
--  //: The size around the central feature to include in PCA vectors
--  vgl_box_3d<int> nbbox_;
--  //: Number of total samples(leaves) to be drawn
--  unsigned long long nsamples_;
--  //: Number of dimension of feature vector
--  unsigned feature_dim_;
--  //: Principal components - eigen vectors of the scatter matrix
--  vnl_matrix<double> pc_;
--  //: Weights - eigen values of the scatter matrix
--  vnl_vector<double> weights_;
--  //: The mean of sample data
--  vnl_vector<double> sample_mean_feature_;
--  //: The mean of all features in the scene data
--  vnl_vector<double> data_mean_feature_;
--  //: Pointer to data scene
--  boxm_scene_base_sptr data_scene_base_;
--  //: Finest cell length of data scene
--  double finest_cell_length_;
--
--  //: Paths for i/o of matrices and vectors
--  std::string path_out_;
--  std::string scene_path_;
--  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
--  std::string data_path() const { return path_out_ + "/data.txt"; }
--  std::string weights_path() const { return path_out_ + "/weights.txt"; }
--  std::string pos_path() const { return path_out_ + "/positions.txt"; }
--  std::string sample_mean_path() const { return  path_out_ + "/sample_mean.txt"; }
--  std::string data_mean_path() const { return  path_out_ + "/data_mean.txt"; }
--  std::string xml_path() const { return path_out_ + "/pca_info.xml"; }
--
--  //: Tolerance, retain eigenvalues above max(eigenVals)*tol
--  double tol_;
--};
--
--
--//: Computes pca projection at each voxel on the block and it saves the specified number of coefficientes
--template <unsigned DIM>
--void bvpl_discover_pca_kernels::project(boxm_scene<boct_tree<short, bvpl_pca_basis_sample<DIM> > > *proj_scene,
--                                        int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree<short,bvpl_pca_basis_sample<DIM> > pca_tree_type;
--  typedef boct_tree_cell<short,bvpl_pca_basis_sample<DIM> > pca_cell_type;
--
--  //cast the scenes
--  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base_.as_pointer());
--
--  if (!(data_scene &&proj_scene)) {
--    std::cerr << "Error in bvpl_discover_pca_kernels::compute_testing_error: Faild to cast scene\n";
--    return;
--  }
--
--  double cell_length = data_scene->finest_cell_length();
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  proj_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  pca_tree_type* proj_tree = data_tree->template clone_to_type<bvpl_pca_basis_sample<DIM> >();
--
--  //get the leaves
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<pca_cell_type*> proj_leaves = proj_tree->leaf_cells();
--
--  //CAUTION: the neighborhood box was supposed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> min_point = nbbox_.min_point();
--  vgl_point_3d<int> max_point = nbbox_.max_point();
--
--  for (unsigned i =0; i<data_leaves.size(); i++)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
--      proj_leaves[i]->set_data(bvpl_pca_basis_sample<DIM>());
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector<double> this_feature(feature_dim_, 0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
--                                                 centroid.y() + (double)y*cell_length,
--                                                 centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell) {
--            std::cerr << "Error in compute_testing_error\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    if (curr_dim != feature_dim_) {
--      std::cerr << "Error in compute_testing_error\n";
--      return;
--    }
--    this_feature-=data_mean_feature_;
--
--    //solve for the coefficients
--    vnl_vector<double> a(feature_dim_, 0.0);
--    a = pc_.transpose() * (this_feature);
--
--    //compute error
--    bvpl_pca_basis_sample<DIM> sample(a.extract(DIM), 0);
--    proj_leaves[i]->set_data(sample);
--  }
--
--  // write and release memory
--  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
--  proj_scene->write_active_block();
--  data_scene->unload_active_blocks();
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
-deleted file mode 100644
-index 978a9443de..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.cxx
-+++ /dev/null
-@@ -1,512 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 12-Aug-2011
--
--#include "bvpl_gauss3D_steerable_filters.h"
--#include <vgl/vgl_vector_3d.h>
--
--//: Constructor
--//  Initializes the order separable filter tabs should be applied for eac bases
--bvpl_gauss3D_steerable_filters::bvpl_gauss3D_steerable_filters()
--{
--  axis_.clear();
--  axis_.emplace_back(1,0,0);
--  axis_.emplace_back(0,1,0);
--  axis_.emplace_back(0,0,1);
--
--  //Initialize from lists - waiting for VXL to support TR1!
--  basis_.clear();
--  basis_names_.clear();
--
--  //zerth order - that is gaussian functio
--  std::string G0a[3] = {"f01", "f02", "f02"};
--  basis_.emplace_back(&G0a[0], &G0a[3]);
--  basis_names_.emplace_back("G0a");
--
--  //first order derivatives
--  std::string G1a[3] = {"f11", "f12", "f12"};
--  std::string G1b[3] = {"f12", "f11", "f12"};
--  std::string G1c[3] = {"f12", "f12", "f11"};
--  basis_.emplace_back(&G1a[0], &G1a[3]);
--  basis_.emplace_back(&G1b[0], &G1b[3]);
--  basis_.emplace_back(&G1c[0], &G1c[3]);
--  basis_names_.emplace_back("G1a");
--  basis_names_.emplace_back("G1b");
--  basis_names_.emplace_back("G1c");
--
--  //second order derivatives
--  std::string G2a[3] = {"f21", "f22", "f22"};
--  std::string G2b[3] = {"f23", "f24", "f22"};
--  std::string G2c[3] = {"f22", "f21", "f22"};
--  std::string G2d[3] = {"f23", "f22", "f24"};
--  std::string G2e[3] = {"f22", "f23", "f24"};
--  std::string G2f[3] = {"f22", "f22", "f21"};
--  basis_.emplace_back(&G2a[0], &G2a[3]);
--  basis_.emplace_back(&G2b[0], &G2b[3]);
--  basis_.emplace_back(&G2c[0], &G2c[3]);
--  basis_.emplace_back(&G2d[0], &G2d[3]);
--  basis_.emplace_back(&G2e[0], &G2e[3]);
--  basis_.emplace_back(&G2f[0], &G2f[3]);
--  basis_names_.emplace_back("G2a");
--  basis_names_.emplace_back("G2b");
--  basis_names_.emplace_back("G2c");
--  basis_names_.emplace_back("G2d");
--  basis_names_.emplace_back("G2e");
--  basis_names_.emplace_back("G2f");
--}
--
--//: Computes  the responses to separable filter taps.
--//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
--//  Each basis is made up of 3 1-d filter taps (x, y, z)
--//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
--//  the taps have size 5, this could be changed later on
--bool bvpl_gauss3D_steerable_filters::basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                              boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
--{
--  this->assemble_basis_size_5();
--
--  bvpl_algebraic_functor  functor;
--
--  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
--  unsigned max_ntaps = 3;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  // Load input and output blocks
--  scene->clone_blocks_to_type(*valid_scene, true);
--
--  //create and init a temporary scene to hold the intermediate 1-d output.
--  boxm_scene<tree_type> *temp_scene =
--  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  temp_scene->set_paths(".", "temp_gsf_scene");
--  temp_scene->set_appearance_model(VNL_FLOAT_10);
--  temp_scene->write_scene("temp_gsf_scene.xml");
--  scene->clone_blocks(*temp_scene);
--
--  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
--  {
--    //Assemple tabs into a map
--    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
--
--    for (unsigned dim=0; dim< DIM_; dim++){
--      std::string tap_name = basis_[dim][tap_i];
--      one_d_taps.push_back(separable_taps_[tap_name]);
--    }
--
--    //Traverse applying the appropriate 1-d taps
--    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
--    cell_it.begin();
--
--    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
--    temp_cell_it.begin();
--
--    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
--    valid_cell_it.begin();
--
--    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
--    {
--      cell_type *temp_center_cell = *temp_cell_it;
--      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
--
--      if (!valid_center_cell->data())
--      {
--        ++cell_it; ++temp_cell_it; ++valid_cell_it;
--        continue;
--      }
--
--      bool valid = true;
--
--      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--
--      vnl_vector_fixed<float, DIM_> responses(0.0);
--
--      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
--      {
--        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
--
--        for (int i =-2; i<=2; i++)
--        {
--          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
--
--          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
--
--          if (this_cell) {
--            bvpl_kernel_dispatch d(this_tap[i+2]);
--            float val =(float)(this_cell->data()[response_dim]);
--            functor.apply(val, d);
--          }
--          else {
--            valid = false;
--            break;
--          }
--        }
--
--        if (!valid)
--          break;
--
--        responses[response_dim] = (float)(functor.result());
--      }
--
--      temp_center_cell->set_data(responses);
--      valid_center_cell->set_data(valid);
--      ++cell_it; ++temp_cell_it; ++valid_cell_it;
--    }
--
--    //copy temp cells into cells
--    cell_it.begin();
--    temp_cell_it.begin();
--
--    while ( !(cell_it.end() || temp_cell_it.end()) )
--    {
--      (*cell_it)->set_data((*temp_cell_it)->data());
--      ++cell_it; ++temp_cell_it;
--    }
-- }
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  temp_scene->unload_active_blocks();
--  delete temp_scene;
--  return true;
--}
--
--
--//: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
--bool bvpl_gauss3D_steerable_filters::multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                               boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level)
--{
--  this->assemble_basis_size_5();
--
--  bvpl_algebraic_functor  functor;
--
--  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
--  unsigned max_ntaps = 3;
--
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  // Load input and output blocks
--  scene->clone_blocks_to_type(*valid_scene, true);
--
--  //create and init a temporary scene to hold the intermediate 1-d output.
--  boxm_scene<tree_type> *temp_scene =
--  new boxm_scene<tree_type>(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  temp_scene->set_paths(".", "temp_gsf_scene");
--  temp_scene->set_appearance_model(VNL_FLOAT_10);
--  temp_scene->write_scene("temp_gsf_scene.xml");
--  scene->clone_blocks(*temp_scene);
--
--  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
--  {
--    //Assemple tabs into a map
--    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
--
--    for (unsigned dim=0; dim< DIM_; dim++){
--      std::string tap_name = basis_[dim][tap_i];
--      one_d_taps.push_back(separable_taps_[tap_name]);
--    }
--
--    //Traverse applying the appropriate 1-d taps
--    boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block_and_neighbors);
--    cell_it.begin(true);
--
--    boxm_cell_iterator<tree_type> temp_cell_it = temp_scene->cell_iterator(&boxm_scene<tree_type>::load_block);
--    temp_cell_it.begin(true);
--
--    boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block);
--    valid_cell_it.begin(true);
--
--    while ( !(cell_it.end() || temp_cell_it.end() || valid_cell_it.end()) )
--    {
--      cell_type *temp_center_cell = *temp_cell_it;
--      boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
--
--      if (!valid_center_cell->data())
--      {
--        ++cell_it; ++temp_cell_it; ++valid_cell_it;
--        continue;
--      }
--
--      bool valid = true;
--
--      vgl_point_3d<double> center_cell_centroid = cell_it.global_centroid();
--      double cell_length = cell_it.length();
--
--      vnl_vector_fixed<float, DIM_> responses(0.0);
--
--      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
--      {
--        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
--
--        for (int i =-2; i<=2; i++)
--        {
--          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
--
--          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid, resolution_level);
--
--          if (this_cell) {
--            bvpl_kernel_dispatch d(this_tap[i+2]);
--            float val =(float)(this_cell->data()[response_dim]);
--            functor.apply(val, d);
--          }
--          else {
--            valid = false;
--            break;
--          }
--        }
--
--        if (!valid)
--          break;
--
--        responses[response_dim] = (float)(functor.result());
--      }
--
--      temp_center_cell->set_data(responses);
--      valid_center_cell->set_data(valid);
--      ++cell_it; ++temp_cell_it; ++valid_cell_it;
--    }
--
--    //copy temp cells into cells
--    cell_it.begin();
--    temp_cell_it.begin();
--
--    while ( !(cell_it.end() || temp_cell_it.end()) )
--    {
--      (*cell_it)->set_data((*temp_cell_it)->data());
--      ++cell_it; ++temp_cell_it;
--    }
--  }
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  temp_scene->unload_active_blocks();
--  delete temp_scene;
--  return true;
--}
--
--#if 0
--//: Computes  the responses to separable filter taps.
--//  There are 10 basis, corresponding to gaussians  zeroth, first and second derivatives
--//  Each basis is made up of 3 1-d filter taps (x, y, z)
--//  "scene" should be initialized with a dim-dimensional vector of the real input scene.
--//  the taps have size 5, this could be changed later on
--bool bvpl_gauss3D_steerable_filters::basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                    int block_i, int block_j, int block_k,
--                                                    boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length)
--{
--  this->assemble_basis_size_5();
--
--  bvpl_algebraic_functor  functor;
--
--  // each basis function, should have 3 1-d taps (one in x, one in y, one in z)
--  unsigned max_ntaps = 3;
--
--  std::cout << "bvpl_block_kernel_operator: Operating on cells of length: " << cell_length << std::endl;
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  // Load input and output blocks
--  scene->load_block_and_neighbors(block_i,block_j,block_k);
--  valid_scene->load_block(block_i,block_j,block_k);
--
--  tree_type *tree = scene->get_block(block_i, block_j, block_k)->get_tree();
--  tree_type *temp_tree = tree->clone(); //a temporary tree to store partial results
--  boct_tree<short, bool> *valid_tree = tree->clone_to_type<bool>();
--  valid_tree->init_cells(true);
--
--  std::vector<cell_type* > cells = tree->leaf_cells();
--  std::vector<cell_type* > temp_cells = temp_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> * > valid_cells = valid_tree->leaf_cells();
--
--  std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;
--
--  for (unsigned tap_i=0; tap_i<max_ntaps; tap_i++)
--  {
--    //Assemple tabs into a map
--    std::vector<vnl_vector_fixed<float,5> > one_d_taps;
--
--    for (unsigned dim=0; dim< DIM_; dim++){
--      std::string tap_name = basis_[dim][tap_i];
--      one_d_taps.push_back(separable_taps_[tap_name]);
--    }
--
--    //Traverse applying the appropriate 1-d taps
--    std::vector<cell_type* >::iterator cells_it = cells.begin();
--    std::vector<cell_type* >::iterator temp_it = temp_cells.begin();
--    std::vector<boct_tree_cell<short, bool> * >::iterator valid_it = valid_cells.begin();
--    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end())&&(valid_it!=valid_cells.end()); cells_it++, valid_it++, temp_it++)
--    {
--      cell_type *center_cell = *cells_it;
--      cell_type *temp_center_cell = *temp_it;
--      boct_tree_cell<short, bool> *valid_center_cell = *valid_it;
--
--      if (!valid_center_cell->data())
--        continue;
--
--      bool valid = true;
--
--      vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--      vnl_vector_fixed<float, DIM_> responses(0.0);
--
--      for (unsigned response_dim=0; response_dim<=DIM_; response_dim++)
--      {
--        vnl_vector_fixed<float,5> this_tap = one_d_taps[response_dim];
--
--        for (int i =-2; i<=2; i++)
--        {
--          vgl_vector_3d<int> kernel_idx = i*axis_[tap_i];
--
--          vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                    center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                    center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--          cell_type *this_cell = scene->locate_point_in_memory(kernel_cell_centroid);
--
--          if (this_cell) {
--            bvpl_kernel_dispatch d(this_tap[i+2]);
--            float val =(float)(this_cell->data()[response_dim]);
--            functor.apply(val, d);
--          }
--          else {
--            valid = false;
--            break;
--          }
--        }
--
--        if (!valid)
--          break;
--
--        responses[response_dim] = (float)(functor.result());
--      }
--
--      temp_center_cell->set_data(responses);
--      valid_center_cell->set_data(valid);
--    }
--
--    //copy temp cells into cells
--    cells_it = cells.begin();
--    temp_it = temp_cells.begin();
--    for (; (cells_it!=cells.end())&&(temp_it!=temp_cells.end()); cells_it++, temp_it++)
--      (*cells_it)->set_data((*temp_it)->data());
--
--    std::cout << scene->locate_point_in_memory(test_point)->data()<< std::endl;;
--  }
--
--  //write the output block
--  scene->get_block(block_i, block_j, block_k)->init_tree(tree);
--  scene->write_active_block();
--  valid_scene->get_block(block_i, block_j, block_k)->init_tree(valid_tree);
--  valid_scene->write_active_block();
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  delete temp_tree;
--  return true;
--}
--#endif
--
--
--bool bvpl_gauss3D_steerable_filters::rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                                                      boxm_scene<boct_tree<short, bool> > *valid_scene)
--{
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM_> > tree_type;
--  typedef boct_tree_cell<short, vnl_vector_fixed<float,DIM_> > cell_type;
--
--  //Traverse all cells
--  boxm_cell_iterator<tree_type> cell_it = scene->cell_iterator(&boxm_scene<tree_type>::load_block);
--  cell_it.begin();
--  boxm_cell_iterator<boct_tree<short, bool> > valid_cell_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool> >::load_block, true);
--  valid_cell_it.begin();
--
--  while ( !(cell_it.end() || valid_cell_it.end()) )
--  {
--    cell_type *center_cell = *cell_it;
--    boct_tree_cell<short, bool> *valid_center_cell = *valid_cell_it;
--
--    if (!valid_center_cell->data()){
--      ++cell_it; ++valid_cell_it;
--      continue;
--    }
--
--    vnl_vector_fixed<float, DIM_> responses=center_cell->data();
--
--    vgl_vector_3d<float> grad(responses[1], responses[2],responses[3]);
--    normalize(grad); //after normalizing the gradient the direction cosines are the cartesian coordinates of grad
--
--    //rotate the responses according to the gradient
--    vnl_vector_fixed<float, DIM_> rotation_weigths(1.0f);
--    rotation_weigths[0] = 1;
--    rotation_weigths[1] = grad.x(); rotation_weigths[2] = grad.y();     rotation_weigths[3] = grad.z();
--    rotation_weigths[4] = grad.x()* grad.x(); rotation_weigths[5] = 2.0f* grad.x()*grad.y();
--    rotation_weigths[6] = grad.y()* grad.y(); rotation_weigths[7] = 2.0f* grad.x()*grad.z();
--    rotation_weigths[8] = 2.0f * grad.y()* grad.z(); rotation_weigths[9] = grad.z()*grad.z();
--
--    responses = element_product(responses, rotation_weigths);
--
--    center_cell->set_data(responses);
--    ++cell_it; ++valid_cell_it;
--  }
--
--  //clear memory
--  scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  return true;
--}
--
--
--void bvpl_gauss3D_steerable_filters::assemble_basis_size_5()
--{
--  separable_taps_.clear();
--
--  //Zeroth Derivative G0
--  //Separable basis taps: f01, f02
--  float f01_data[5] = {0.000402093f, 0.162216f, 1.19862f, 0.162216f, 0.000402093f};
--  vnl_vector_fixed<float, 5> f01(f01_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f01", f01));
--
--  float f02_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
--  vnl_vector_fixed<float,5> f02(f02_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f02", f02));
--
--  //First Derivative Basis: G1 = alpha*G1a + beta*G1b
--  //Separable basis functions: f11, f12
--  float f11_data[5] = {0.00227458f, 0.458816f, 0.0f, -0.458816f, -0.00227458f};
--  vnl_vector_fixed<float,5> f11(f11_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f11", f11));
--  float f12_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
--  vnl_vector_fixed<float,5> f12(f12_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f12", f12));
--
--  //Second derivative basis G2 = alpha^2*G2a + 2*alpha*beta*G2b + beta^2*G2c + 2*alpha*gamma*G2d + 2*beta*gamma*G2e + gamma^2*G2f
--  //Separable basis taps = f21, f22, f23, f24
--  float f21_data[5] = {0.00696448f, 0.561934f, -1.38405f, 0.561934f, 0.00696448f};
--  vnl_vector_fixed<float,5> f21(f21_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f21", f21));
--
--  float f22_data[5] = {0.000335463f, 0.135335f, 1.0f, 0.135335f, 0.000335463f};
--  vnl_vector_fixed<float,5> f22(f22_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f22", f22));
--
--  float f23_data[5] = {-0.00643349f, -1.29773f, 0.0f, 1.29773f, 0.00643349f};
--  vnl_vector_fixed<float,5> f23(f23_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f23", f23));
--
--  float f24_data[5] = {-0.000670925f, -0.135335f, 0.0f, 0.135335f, 0.000670925f};
--  vnl_vector_fixed<float,5> f24(f24_data);
--  separable_taps_.insert(std::pair<std::string, vnl_vector_fixed<float, 5> >("f24", f24));
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
-deleted file mode 100644
-index bda8905d49..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h
-+++ /dev/null
-@@ -1,61 +0,0 @@
--// This is bvpl_gauss3D_steerable_filters.h
--#ifndef bvpl_gauss3D_steerable_filters_h
--#define bvpl_gauss3D_steerable_filters_h
--
--//:
--// \file
--// \brief 3-d Streerable filters implemented theough separable basis
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  12-Aug-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <vnl/vnl_vector_fixed.h>
--#include <boxm/boxm_scene.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--
--
--class bvpl_gauss3D_steerable_filters{
--
--public:
--  bvpl_gauss3D_steerable_filters();
--
--  //: The dimension of the filter response e.i. number of steerable filters
--  enum { DIM_ = 10 };
--
--  //: Compute basis response at all leaf cells
--  bool basis_response_at_leaves(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                boxm_scene<boct_tree<short, bool> > *valid_scene, double cell_length);
--
--  //: Compute basis response at all levels - assumes the intermediate cells of the tree have ben filled with meaningful info, otherwise the result could be garbage
--  bool multiscale_basis_response(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                 boxm_scene<boct_tree<short, bool> > *valid_scene, unsigned resolution_level);
--
--  //: Assemble basis for: -2 -1 0 1 2
--  void assemble_basis_size_5();
--
--  std::vector<std::vector<std::string> > basis() {return basis_;}
--  std::vector<std::string> basis_names() {return basis_names_;}
--  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps(){return separable_taps_;}
--
--  bool rotation_invariant_interpolation(boxm_scene<boct_tree<short, vnl_vector_fixed<float, bvpl_gauss3D_steerable_filters::DIM_> > > *scene,
--                                        boxm_scene<boct_tree<short, bool> > *valid_scene);
--
--protected:
--
--  //: lists of 1-d filter tap names needed for each basis
--  std::vector<std::vector<std::string> > basis_;
--
--  //: list of basis identifying strings
--  std::vector<std::string> basis_names_;
--
--  //: map containing the 1-d filter taps (actual values) and their identifying string
--  std::map<std::string, vnl_vector_fixed<float,5> > separable_taps_;
--
--  std::vector<vgl_vector_3d<int> > axis_;
--};
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
-deleted file mode 100644
-index 391c7f157e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.cxx
-+++ /dev/null
-@@ -1,475 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include <iostream>
--#include <fstream>
--#include "bvpl_global_corners.h"
--
--#include <bsta/bsta_histogram.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--#include <bvpl_octree/bvpl_corner_detector.h>
--#include <bvpl_octree/bvpl_corner_functors.h>
--
--#include <vul/vul_file.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--
--//: Constructor  from xml file
--bvpl_global_corners::bvpl_global_corners(const std::string &path)
--{
--  std::cout << "Loading corners info from xml-file" << std::endl;
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--  if (!xml_ifs.is_open()){
--    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
--    throw;
--  }
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("global_corners_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
--    throw;
--  }
--
--  //Parse scenes
--  bxml_element scenes_query("scene");
--  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
--
--  unsigned nscenes=scenes_data.size();
--  std::cout << "Number of scenes: " << nscenes << std::endl;
--
--  aux_dirs_.clear();
--  aux_dirs_.resize(nscenes);
--
--  finest_cell_length_.clear();
--  finest_cell_length_.resize(nscenes);
--
--  for (unsigned si = 0; si < nscenes; si++)
--  {
--    auto* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
--    int id = -1;
--    scenes_elm->get_attribute("id", id);
--    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
--    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
--
--    if (!(vul_file::exists(aux_dirs_[id]) && vul_file::is_directory(aux_dirs_[id]))){
--      vul_file::make_directory(aux_dirs_[id]);
--    }
--  }
--
--  //Parse kernels
--  bxml_element params_query("parameters");
--  bxml_data_sptr params_data = bxml_find_by_name(root, params_query);
--  if (params_data)
--  {
--    auto* params_elm = dynamic_cast<bxml_element*>(params_data.ptr());
--
--    params_elm->get_attribute("harris_k", harris_k_);
--    std::cout << "Harris_k is " << harris_k_ << '\n';
--  }
--  else {
--    std::cerr << " In Gobal Corners: no parameters element\n";
--  }
--}
--
--
--//: Compute Harris' measure extension to 3-d as proposed by:
--//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
--void bvpl_global_corners::compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--
--  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, float> >* corner_scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  corner_scene->set_appearance_model(BOXM_FLOAT);
--  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
--  corner_scene->write_scene("harris_scene.xml");
--
--  if (!( proj_scene && valid_scene && corner_scene ))
--  {
--    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_corner_detector corner_detector;
--  bvpl_harris_laptev_functor harris_functor(harris_k_);
--
--  vgl_point_3d<int> max_neighborhood_idx = global_taylor->kernel_vector_->max();
--  vgl_point_3d<int> min_neighborhood_idx = global_taylor->kernel_vector_->min();
--
--  std::cout << "Neighborhood for Harris threshold: " << min_neighborhood_idx << " , " << max_neighborhood_idx << std::endl;
--
--  corner_detector.compute_C(proj_scene, harris_functor, min_neighborhood_idx, max_neighborhood_idx, block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
--
--  //clean memory
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--
--//: Compute corner measure extension to 3-d as proposed by:
--// P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
--void bvpl_global_corners::compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--
--  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, float> >* corner_scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  corner_scene->set_appearance_model(BOXM_FLOAT);
--  corner_scene->set_paths(aux_dirs_[scene_id], "corner_scene");
--  corner_scene->write_scene("harris_scene.xml");
--
--  if (!( proj_scene && valid_scene && corner_scene ))
--  {
--    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_corner_detector corner_detector;
--
--  corner_detector.compute_det_H(proj_scene, block_i, block_j, block_k, valid_scene, corner_scene);
--
--  //clean memory
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--
--//: Threshold a percentage of corners, based of the Harris' measure extension to 3-d proposed by:
--//  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
--void bvpl_global_corners::threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float harris_thresh, const std::string& output_path)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =global_taylor->load_projection_scene(scene_id);
--
--  auto* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--
--  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
--
--  if (!(vul_file::exists(output_path) && vul_file::is_directory(output_path)))
--    vul_file::make_directory(output_path);
--
--  boxm_scene<boct_tree<short, bool> >* valid_corner_scene =
--  new boxm_scene<boct_tree<short, bool> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  valid_corner_scene->set_appearance_model(BOXM_BOOL);
--
--  std::stringstream valid_ss;
--  valid_ss << "valid_scene_" << scene_id ;
--
--  valid_corner_scene->set_paths(output_path, valid_ss.str());
--  valid_corner_scene->write_scene(valid_ss.str() + ".xml");
--  valid_scene->clone_blocks(*valid_corner_scene);
--
--  std::stringstream proj_ss;
--  proj_ss << "proj_taylor_scene_" << scene_id ;
--
--  boxm_scene<taylor_tree_type >* copy_proj_scene =
--  new boxm_scene<taylor_tree_type >(proj_scene->lvcs(), proj_scene->origin(), proj_scene->block_dim(), proj_scene->world_dim(), proj_scene->max_level(), proj_scene->init_level());
--  copy_proj_scene->set_appearance_model(VNL_DOUBLE_10);
--  copy_proj_scene->set_paths(proj_scene->path(), proj_scene->block_prefix());
--  copy_proj_scene->write_scene(output_path, proj_ss.str() + ".xml");
--
--  delete copy_proj_scene;
--
--  if (!( valid_scene && corner_scene && valid_corner_scene))
--  {
--    std::cerr << "Error in bvpl_global_corners::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
--  valid_it.begin();
--
--  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
--  corners_it.begin();
--
--  boxm_cell_iterator<boct_tree<short, bool > > valid_corners_it = valid_corner_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block);
--  valid_corners_it.begin();
--
--  while ( !(valid_it.end() || corners_it.end() || valid_corners_it.end()) )
--  {
--    boct_tree_cell<short,bool> *valid_cell = *valid_it;
--    boct_tree_cell<short,float> *corner_cell = *corners_it;
--    boct_tree_cell<short,bool> *valid_corner_cell = *valid_corners_it;
--
--    boct_loc_code<short> valid_code = valid_cell->get_code();
--    boct_loc_code<short> corner_code = corner_cell->get_code();
--    boct_loc_code<short> valid_corner_code = valid_corner_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((valid_cell->level() != corner_cell->level()) || (valid_cell->level() != valid_corner_cell->level()) || !(valid_code.isequal(&corner_code)) || !(valid_code.isequal(&valid_corner_code))){
--      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
--      return;
--    }
--
--    /*****CAUTION: Only looking at cells at level 0*/
--    if (valid_cell->level()!=0) {
--      ++valid_it;
--      ++corners_it;
--      valid_corner_cell->set_data(false);
--      ++valid_corners_it;
--      continue;
--    }
--
--    if (corner_cell->data() < harris_thresh)
--      valid_corner_cell->set_data(false);
--    else
--      valid_corner_cell->set_data(true);
--
--    ++valid_it;
--    ++corners_it;
--    ++valid_corners_it;
--  }
--
--  //clean memory
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--  valid_corner_scene->unload_active_blocks();
--
--  delete valid_corner_scene;
--}
--
--//: Take a histogram of corners and get different values for percentage of thresholds
--void bvpl_global_corners::explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--
--  boxm_scene_base_sptr valid_scene_base = global_taylor->load_valid_scene(scene_id);
--  boxm_scene_base_sptr corner_scene_base = this->load_corner_scene(scene_id);
--
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--
--  auto* corner_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (corner_scene_base.as_pointer());
--
--  if (!( valid_scene && corner_scene))
--  {
--    std::cerr << "Error in bvpl_global_corners::explore_corner_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--
--  //compute scene statistics at valid cells only
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, bool > > valid_it = valid_scene->cell_iterator(&boxm_scene<boct_tree<short, bool > >::load_block, true);
--  valid_it.begin();
--
--  boxm_cell_iterator<boct_tree<short, float > > corners_it = corner_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block, true);
--  corners_it.begin();
--
--  float cell_count = 0;
--  auto max = (float)(*corners_it)->data();
--  float min = max;
--  float this_val = max;
--  while ( !(valid_it.end() || corners_it.end()) )
--  {
--    boct_tree_cell<short,bool> *valid_cell = *valid_it;
--    boct_tree_cell<short,float> *corner_cell = *corners_it;
--
--    boct_loc_code<short> valid_code = valid_cell->get_code();
--    boct_loc_code<short> corner_code = corner_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
--      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
--      return;
--    }
--
--    /*****CAUTION: Only looking at cells at level 0*/
--    if (valid_cell->level()!=0) {
--      ++valid_it;
--      ++corners_it;
--      continue;
--    }
--
--    cell_count++;
--    this_val = (float)(*corners_it)->data();
--    if ( this_val > max)  max = this_val;
--    if ( this_val < min)  min = this_val;
--
--    ++valid_it;
--    ++corners_it;
--  }
--
--  auto nbins = (unsigned int)std::floor(std::sqrt(cell_count));
--  bsta_histogram<float>  corner_hist(min, max, nbins);
--  valid_it.begin();
--  corners_it.begin();
--  while ( !(valid_it.end() || corners_it.end()) )
--  {
--    boct_tree_cell<short,bool> *valid_cell = *valid_it;
--    boct_tree_cell<short,float> *corner_cell = *corners_it;
--
--    boct_loc_code<short> valid_code = valid_cell->get_code();
--    boct_loc_code<short> corner_code = corner_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((valid_cell->level() != corner_cell->level()) || !(valid_code.isequal(&corner_code))){
--      std::cerr << " Error in threshold_laptev_corners: Cells don't have the same structure\n";
--      return;
--    }
--
--    /*****CAUTION: Only looking at cells at level 0*/
--    if (valid_cell->level()!=0) {
--      ++valid_it;
--      ++corners_it;
--      continue;
--    }
--
--    corner_hist.upcount((float)(*corners_it)->data(), 1.0f);
--
--    ++valid_it;
--    ++corners_it;
--  }
--
--  std::string file = aux_dirs_[scene_id] + "/corner_threshold_values.txt";
--  float threshold[] = {0.01f, 0.02f, 0.05f, 0.1f, 0.2f, 0.5f, 0.8f};
--  std::ofstream ofs(file.c_str());
--  ofs.precision(7);
--  for (float i : threshold) {
--    ofs << i << ' ' << corner_hist.value_with_area_above(i) << '\n';
--  }
--
--  //clean memory
--  ofs.close();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--//: Load scene info
--boxm_scene_base_sptr bvpl_global_corners::load_corner_scene(int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr scene_base = new boxm_scene_base();
--  boxm_scene_parser scene_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/harris_scene.xml";
--  scene_base->load_scene(aux_scene_ss.str(), scene_parser);
--
--  //cast scene
--  auto *scene= new boxm_scene<boct_tree<short, float > >();
--  if (scene_base->appearence_model() == BOXM_FLOAT){
--    scene->load_scene(scene_parser);
--    scene_base = scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_corners::load_corner_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
--boxm_scene_base_sptr bvpl_global_corners::load_valid_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)aux_dirs_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_corners::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  auto *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL){
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_corners::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--//: Write this class to xml file
--void bvpl_global_corners::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("global_corners_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  //write the scene elements
--  for (unsigned i =0; i<aux_dirs_.size(); i++)
--  {
--    bxml_element* scenes_elm = new bxml_element("scene");
--    scenes_elm->append_text("\n");
--    scenes_elm->set_attribute("id", i);
--    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
--    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
--    root->append_data(scenes_elm);
--    root->append_text("\n");
--  }
--
--  //write parameters for corner detection
--  bxml_element* param_elm = new bxml_element("parameters");
--  param_elm->append_text("\n");
--  param_elm->set_attribute("harris_k", harris_k_);
--  root->append_data(param_elm);
--  root->append_text("\n");
--
--  //write to disk
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
-deleted file mode 100644
-index 0e7924fe1b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
-+++ /dev/null
-@@ -1,71 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_corners.h
--#ifndef bvpl_global_corners_h
--#define bvpl_global_corners_h
--//:
--// \file
--// \brief A class to compute corner features across different boxm_scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  21-Jul-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--#include <bvpl_octree/bvpl_global_taylor.h>
--
--class bvpl_global_corners : public vbl_ref_count
--{
--
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  public:
--
--  //: Constructor  from xml file
--  bvpl_global_corners(const std::string &path);
--
--  //: Compute Harris' measure extension to 3-d as proposed by:
--  //  I. Laptev. On space-time interest points. Int. J. Computer Vision, 64(2):107--123, 2005
--  void compute_laptev_corners(const bvpl_global_taylor_sptr& global_taylor, int scene_id, int block_i, int block_j, int block_k);
--
--  //: Compute corner measure extension to 3-d as proposed by:
--  // P. Beaudet, Rotationally invariant image operators, in Proc. 4th Int. Joint Conf. Patt. Recog. 1978.
--  void compute_beaudet_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, int block_i, int block_j, int block_k);
--
--  //: Threshold corners below a threshold
--  void threshold_laptev_corners(const bvpl_global_taylor_sptr& global_taylor,int scene_id, float thresh, const std::string& output_path);
--
--  //: Take a histogram of corners and get different values for percentage of thresholds
--  void explore_corner_statistics(const bvpl_global_taylor_sptr& global_taylor,int scene_id);
--
--  //: Write to global_corners_info.xml
--  void xml_write();
--
--  // Accessors
--  std::string path_out() {return path_out_;}
--  std::vector<std::string> aux_dirs() { return aux_dirs_; }
--  std::string aux_dirs( unsigned i ) { return aux_dirs_[i]; }
--  std::vector<double> cell_lengths() { return finest_cell_length_; }
--
--  boxm_scene_base_sptr load_corner_scene (int scene_id);
--  boxm_scene_base_sptr load_valid_scene (int scene_id);
--
--  std::string xml_path() { return path_out_ + "/global_corners_info.xml"; }
--
-- protected:
--
--  //: A vector to hold paths to keep taylor coefficient scenes and valid scenes
--  std::vector<std::string> aux_dirs_;
--  //: A vector to hold the finest cell length of the corresponding scene scene
--  std::vector<double> finest_cell_length_;
--  //: Path to xml info file
--  std::string path_out_;
--  //: The value of the parameter k for harris corners
--  float harris_k_;
--};
--
--typedef vbl_smart_ptr<bvpl_global_corners > bvpl_global_corners_sptr;
--
--
--#endif // bvpl_global_corners_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
-deleted file mode 100644
-index 7b33da89da..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include "bvpl_global_pca.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Mar-2011
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
-deleted file mode 100644
-index 39ff106c20..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
-+++ /dev/null
-@@ -1,153 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.h
--#ifndef bvpl_global_pca_h
--#define bvpl_global_pca_h
--//:
--// \file
--// \brief A class to compute and learn pca features across different boxm_scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  14-Mar-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <utility>
--#include <vnl/vnl_matrix_fixed.h>
--#include <vnl/vnl_vector_fixed.h>
--
--#include <boxm/boxm_scene.h>
--
--
--template <unsigned feature_dim>
--class bvpl_global_pca: public vbl_ref_count
--{
-- public:
--  //: Constructor
--  bvpl_global_pca(std::vector<std::string> scenes, std::vector<std::string> aux_dirs, std::vector<double> finest_cell_length,
--                  vgl_box_3d<int> nbbox,  double training_fraction = 0.1, std::string path_out = "./"):
--  scenes_(std::move(scenes)), aux_dirs_(std::move(aux_dirs)), finest_cell_length_(std::move(finest_cell_length)), nbbox_(nbbox), training_fraction_(training_fraction),path_out_(std::move(path_out))
--  {
--    training_scenes_ = std::vector<bool>(scenes_.size(), true);
--    nleaves_ =  std::vector<unsigned long>(scenes_.size(), 0);
--    nsamples_ = 0;
--    training_mean_.fill(0.0);
--    pc_.fill(0.0);
--    weights_.fill(0.0);
--    scatter_.fill(0.0);
--    this->xml_write();
--  }
--
--  //:Create from xml file
--  bvpl_global_pca(const std::string &path);
--
--  //: Init auxiliary scenes and smallest cell length values
--  void init(unsigned scene_id);
--
--  //: Computes the scatter matrix and mean vector of a portion of random samples from a block
--  bool sample_statistics( int scene_id, int block_i, int block_j, int block_k,
--                          vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                          vnl_vector_fixed<double, feature_dim> &mean,
--                          unsigned long &nfeature);
--
--  //: Update mean and scatter, given the mean and scatter of two sets.
--  //  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
--   static void combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim>  &mean1,
--                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter1,
--                                            double const n1,
--                                            const vnl_vector_fixed<double,feature_dim>  &mean2,
--                                            const vnl_matrix_fixed<double,feature_dim,feature_dim>  &scatter2,
--                                            double const n2,
--                                            vnl_vector_fixed<double,feature_dim> & mean_out,
--                                            vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
--                                            double &n_out );
--
--  //: Set total scatter matrix, mean, sample, principal components and weights for this class
--  void set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                      const vnl_vector_fixed<double, feature_dim> &mean,
--                      const double total_nsamples);
--
--  //: Access the principal components
--  const vnl_matrix_fixed<double, feature_dim, feature_dim>& principal_comps() { return pc_; }
--
--  //: Access the coefficients
--  const vnl_vector_fixed<double, feature_dim>& weights() { return weights_; }
--
--  //: Access the mean of samples
--  const vnl_vector_fixed<double, feature_dim>& mean()  { return training_mean_; }
--
--  bool register_scene(std::string scene_path, std::string aux_path)
--  {
--    if (scenes_.size()!=aux_dirs_.size())
--      return false;
--    scenes_.push_back(scene_path);
--    aux_dirs_.push_back(aux_path);
--    return true;
--  }
--
--  void xml_write();
--
--  //: Computes 10-dimensional pca projection at each voxel on the block and saves it
--  void project(int scene_id, int block_i, int block_j, int block_k);
--
--  void projection_error(int scene_id, int block_i, int block_j, int block_k);
--
--
--  std::string path_out() const { return path_out_; }
--
--  inline std::vector<std::string> scenes() const { return scenes_; }
--  inline std::vector<std::string> aux_dirs() const { return aux_dirs_; }
--  inline std::vector<double> cell_lengths() const { return finest_cell_length_; }
--  inline std::vector<bool> training_scenes() const { return training_scenes_; }
--  inline vgl_box_3d<int> nbbox() const { return nbbox_; }
--  inline unsigned nscenes() const { return scenes_.size(); }
-- protected:
--
--  //: A vector to hold scene paths
--  std::vector<std::string> scenes_;
--  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
--  std::vector<std::string> aux_dirs_;
--  //: A vector to hold the finest cell length of the corresponding scene scene
--  std::vector<double> finest_cell_length_;
--  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
--  std::vector<bool> training_scenes_;
--  //: A vector to keep the size of each scene
--  std::vector<unsigned long> nleaves_;
--
--  //: The size around the central feature to include in PCA vectors
--  vgl_box_3d<int> nbbox_;
--  //: Number of total samples(leaves) to be drawn
--  unsigned long long nsamples_;
--
--  //: Principal components - eigen vectors of the scatter matrix
--  vnl_matrix_fixed<double, feature_dim, feature_dim> pc_;
--  //: Weights - eigen values of the scatter matrix
--  vnl_vector_fixed<double, feature_dim> weights_;
--  //: The mean of sample data
--  vnl_vector_fixed<double, feature_dim> training_mean_;
--  //: Scatter matrix used to compute pca
--  vnl_matrix_fixed<double, feature_dim, feature_dim> scatter_;
--  //: Fraction of cells used for learning
--  double training_fraction_;
--
--  //: Paths for i/o of matrices and vectors
--  std::string path_out_;
--  std::string pc_path() const { return path_out_ + "/pc.txt" ; }
--  std::string weights_path() const { return path_out_ + "/weights.txt"; }
--  std::string mean_path() const { return  path_out_ + "/mean.txt"; }
--  std::string scatter_path() const { return  path_out_ + "/scatter.txt"; }
--  std::string xml_path() const { return path_out_ + "/pca_global_info.xml"; }
--
--  void write_pca_matrices();
--
-- public:
--  boxm_scene_base_sptr load_scene (int scene_id);
--  boxm_scene_base_sptr load_train_scene (int scene_id);
--  boxm_scene_base_sptr load_valid_scene (int scene_id);
--  boxm_scene_base_sptr load_projection_scene (int scene_id);
--  boxm_scene_base_sptr load_error_scene (int scene_id);
--};
--
--typedef vbl_smart_ptr<bvpl_global_pca<125> > bvpl_global_pca_125_sptr;
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
-deleted file mode 100644
-index 6877b12a34..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_pca.hxx
-+++ /dev/null
-@@ -1,1018 +0,0 @@
--#ifndef bvpl_global_pca_hxx_
--#define bvpl_global_pca_hxx_
--//:
--// \file
--// \author Isabel Restrepo
--// \date 14-Mar-2011
--
--#include "bvpl_global_pca.h"
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--
--
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--
--#include <boxm/boxm_scene_parser.h>
--
--#include <vnl/vnl_random.h>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_matrix_fixed.h>
--#include <vnl/algo/vnl_symmetric_eigensystem.h>
--
--#include <vul/vul_file.h>
--
--#include <cassert>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//#define DEBUG_PROJ
--
--//: Create from xml_file
--template <unsigned feature_dim>
--bvpl_global_pca<feature_dim>::bvpl_global_pca(const std::string &path)
--{
--  std::cout << "Loading pca info from xml-file" << std::endl;
--  int valid = 0;
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--  if (!xml_ifs.is_open()) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not open xml info file: " << xml_path() << '\n';
--    throw;
--  }
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("pca_global_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
--    throw;
--  }
--
--  //Parse neighborhood bounding box - units are number of voxels
--  bxml_element nbbox_query("neighborhood");
--  bxml_data_sptr nbbox_data = bxml_find_by_name(root, nbbox_query);
--  bxml_element* nbbox_elm = dynamic_cast<bxml_element*>(nbbox_data.ptr());
--  int min_x, min_y, min_z, max_x, max_y, max_z =0;
--  nbbox_elm->get_attribute("min_x", min_x);
--  nbbox_elm->get_attribute("min_y", min_y);
--  nbbox_elm->get_attribute("min_z", min_z);
--  nbbox_elm->get_attribute("max_x", max_x);
--  nbbox_elm->get_attribute("max_y", max_y);
--  nbbox_elm->get_attribute("max_z", max_z);
--
--  nbbox_ = vgl_box_3d<int>(vgl_point_3d<int>(min_x, min_y, min_y), vgl_point_3d<int>(max_x, max_y, max_z));
--  std::cout << "Neighborhood: " << nbbox_ << std::endl;
--
--  //Parse Number of samples
--  bxml_element properties_query("properties");
--  bxml_data_sptr properties_data = bxml_find_by_name(root, properties_query);
--  bxml_element* properties_elm = dynamic_cast<bxml_element*>(properties_data.ptr());
--  properties_elm->get_attribute("nsamples", nsamples_);
--  unsigned temp_dim;
--  properties_elm->get_attribute("feature_dim", temp_dim);
--  if (temp_dim!=feature_dim) {
--    valid = -10;
--  }
--  properties_elm->get_attribute("training_fraction", training_fraction_);
--
--  unsigned nscenes = 0;
--  properties_elm->get_attribute("nscenes", nscenes);
--
--  std::cout << "Number of samples: " << nsamples_ << '\n'
--           << "Feature dimension: " << temp_dim << '\n'
--           << "Number of scenes: " << nscenes <<std::endl;
--
--  //Parse scenes
--  bxml_element scenes_query("scene");
--  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
--
--  if (nscenes !=scenes_data.size()) {
--    std::cerr<<"Wrong number of scenes\n";
--    throw;
--  }
--
--  scenes_.clear();
--  scenes_.resize(nscenes);
--
--  aux_dirs_.clear();
--  aux_dirs_.resize(nscenes);
--
--  finest_cell_length_.clear();
--  finest_cell_length_.resize(nscenes);
--
--  nleaves_.clear();
--  nleaves_.resize(nscenes);
--
--  for (unsigned si = 0; si < nscenes; si++)
--  {
--    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
--    int id = -1;
--    scenes_elm->get_attribute("id", id);
--    scenes_elm->get_attribute("path", scenes_[id]);
--    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
--    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
--    scenes_elm->get_attribute("nleaves", nleaves_[id]);
--
--    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
--  }
--
--  //Parse training scenes
--  bxml_element train_query("training_scenes");
--  bxml_element* train_elm = dynamic_cast<bxml_element*>(bxml_find_by_name(root, train_query).ptr());
--  unsigned n_train_scenes = 0;
--  train_elm->get_attribute("nscenes", n_train_scenes);
--  training_scenes_.clear();
--  training_scenes_.resize(nscenes, false);
--
--  //read out the scenes
--  for (bxml_element::const_data_iterator s_it = train_elm->data_begin(); s_it != train_elm->data_end(); s_it++) {
--    if ((*s_it)->type() == bxml_data::TEXT) {
--      bxml_text* t = dynamic_cast<bxml_text*>((*s_it).ptr());
--      std::stringstream text_d(t->data()); std::string buf;
--      std::vector<std::string> tokens;
--      while (text_d >> buf) {
--        tokens.push_back(buf);
--      }
--      if (tokens.size() != n_train_scenes)
--        continue;
--      for (unsigned i = 0; i < n_train_scenes; i++) {
--        std::stringstream ss2(tokens[i]); int s_type_id;
--        ss2 >> s_type_id;
--        std::cout << "Scene: " << s_type_id << " is used for training\n";
--        training_scenes_[s_type_id]=true;
--      }
--      break;
--    }
--  }
--
--  //Parse paths and set matrices
--  bxml_element paths_query("paths");
--  bxml_data_sptr paths_data = bxml_find_by_name(root, paths_query);
--  if (paths_data)
--  {
--    bxml_element* path_elm = dynamic_cast<bxml_element*>(paths_data.ptr());
--
--    std::string ifs_path;
--
--    path_elm->get_attribute("pc_path", ifs_path);
--    if (ifs_path != pc_path())
--      valid = -1;
--    else{
--      std::ifstream ifs(ifs_path.c_str());
--      ifs >> pc_;
--      ifs.close();
--      if (pc_.size()!=feature_dim*feature_dim)
--        valid = -2;
--    }
--
--    path_elm->get_attribute("weights_path", ifs_path);
--    if (ifs_path != weights_path())
--      valid = -3;
--    else{
--      std::ifstream ifs(ifs_path.c_str());
--      ifs >> weights_;
--      ifs.close();
--      if (weights_.size()!=feature_dim)
--        valid = -4;
--    }
--
--    path_elm->get_attribute("mean_path", ifs_path);
--    if (ifs_path != mean_path())
--      valid = -5;
--    else
--    {
--      if ( vul_file::exists(ifs_path))
--      {
--        std::ifstream ifs(ifs_path.c_str());
--        ifs >> training_mean_;
--        ifs.close();
--      }
--      else{
--        std::cerr << " Warning: Mean file is empty\n";
--        training_mean_.fill(0.0);
--      }
--
--      path_elm->get_attribute("scatter_path", ifs_path);
--      if (ifs_path != scatter_path())
--        valid = -6;
--      else if (vul_file::exists(ifs_path)) {
--        std::ifstream(ifs_path);
--        ifs_path >> scatter_;
--        ifs_path.close();
--      }
--      else{
--        std::cerr << " Warning: Scatter file is empty\n";
--        scatter_.fill(0.0);
--      }
--
--      if (valid<0) {
--        std::cout << "bvpl_discover_pca_kernels - errors parsing pca_info.xml. Error code: " << valid << std::endl;
--        xml_write();
--      }
--    }
--  }
--
--  xml_ifs.close();
--}
--
--//: Init auxiliary scenes and smallest cell length values
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::init(unsigned scene_id)
--{
--  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  if (!data_scene) {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
--    return;
--  }
--  double finest_cell_length = data_scene->finest_cell_length();
--  finest_cell_length_[scene_id] = finest_cell_length;
--  nleaves_[scene_id] = data_scene->size();
--
--  if (!(vul_file::exists(aux_dirs_[scene_id]) && vul_file::is_directory(aux_dirs_[scene_id]))) {
--    vul_file::make_directory(aux_dirs_[scene_id]);
--  }
--
--  {
--    std::stringstream aux_scene_ss;
--    aux_scene_ss << "train_scene_" << scene_id ;
--    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--    if (!vul_file::exists(aux_scene_path)) {
--      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--      boxm_scene<boct_tree<short, bool> > *aux_scene =
--      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--      aux_scene->set_appearance_model(BOXM_BOOL);
--      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--    }
--  }
--  {
--    std::stringstream aux_scene_ss;
--    aux_scene_ss << "valid_scene_" << scene_id ;
--    std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--    if (!vul_file::exists(aux_scene_path)) {
--      std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--      boxm_scene<boct_tree<short, bool> > *aux_scene =
--      new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--      aux_scene->set_appearance_model(BOXM_BOOL);
--      aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--      aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--    }
--  }
--
--  {
--    std::stringstream proj_scene_ss;
--    proj_scene_ss << "proj_pca_scene_" << scene_id ;
--    std::string proj_scene_path = aux_dirs_[scene_id] + "/" + proj_scene_ss.str() + ".xml";
--    if (!vul_file::exists(proj_scene_path)) {
--      std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
--      typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--      boxm_scene<pca_tree_type > *proj_scene =
--      new boxm_scene<pca_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--      proj_scene->set_appearance_model(VNL_DOUBLE_10);
--      proj_scene->set_paths(aux_dirs_[scene_id], proj_scene_ss.str());
--      proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
--    }
--  }
--
--  xml_write();
--}
--
--//: Compute the scatter matrix of the specified block. A random number of cells are drawn for the calculation
--//  The mask block indicates, whether a cell was used for learning the scatter matrix and mean
--//  Ramndom samples according to octree structure.
--//  Sampling is achieved by generating uniform random cell samples.
--//  Since there are more cells where the resolution is finer, then these regions get sampled more often
--template <unsigned feature_dim>
--bool bvpl_global_pca<feature_dim>::sample_statistics( int scene_id, int block_i, int block_j, int block_k,
--                                                      vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                                                      vnl_vector_fixed<double, feature_dim> &mean,
--                                                      unsigned long &nfeature)
--{
--  if (!training_scenes_[scene_id]) {
--    std::cout << "Skiping scene: " << scene_id <<", labeled for testing\n";
--    return false;
--  }
--
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,bool> bool_tree_type;
--  typedef boct_tree_cell<short,bool> bool_cell_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr mask_scene_base =load_train_scene(scene_id);
--
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* mask_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*>(mask_scene_base.as_pointer());
--
--  if (!(data_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast data scenes\n";
--    return false;
--  }
--  if (!(mask_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast mask scenes\n";
--    return false;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  mask_scene->unload_active_blocks();
--
--  mean.fill(0.0);
--  S.fill(0.0);
--
--  vnl_random rng;
--  //vnl_random rng(9667566ul);
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && mask_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return false;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  mask_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  bool_tree_type* mask_tree = data_tree->template clone_to_type<bool>();
--  mask_tree->init_cells(false);
--
--  nfeature = 1;
--
--  //2. Sample cells from this tree. The number of samples from this tree depends on the portion of scene cells that live in this tree
--  std::vector<float_cell_type *> leaf_cells = data_tree->leaf_cells();
--  std::vector<bool_cell_type*> mask_leaves = mask_tree->leaf_cells();
--
--  int tree_ncells = leaf_cells.size();
--  unsigned long tree_nsamples = (unsigned long)(tree_ncells*training_fraction_);
--  double cell_length = finest_cell_length_[scene_id];
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> nmin = nbbox_.min_point();
--  vgl_point_3d<int> nmax = nbbox_.max_point();
--
--  std::cout <<" In block (" << block_i <<", " << block_j << ", " << block_k << "), number of nsamples is: " << tree_nsamples << ", cell length is: " << cell_length << std::endl;
--
--  for (unsigned long i=0; i<tree_nsamples; i++)
--  {
--    unsigned long sample = rng.lrand32(tree_ncells-1);
--
--    boct_tree_cell<short, float> *center_cell = leaf_cells[sample];
--    vgl_point_3d<double> center_cell_centroid = data_tree->global_centroid(center_cell);
--
--    vgl_box_3d<double> roi(cell_length*(double)nmin.x(),cell_length*(double)nmin.y(),cell_length*(double)nmin.z(),
--                           cell_length*(double)nmax.x(),cell_length*(double)nmax.y(),cell_length*(double)nmax.z());
--    roi.set_centroid(center_cell_centroid);
--
--    //if neighborhood is not inclusive we would have missing features
--    if (!((data_scene->get_world_bbox()).contains(roi))) {
--      i--;
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector_fixed<double, feature_dim> this_feature(0.0);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
--        {
--          vgl_point_3d<double> neighbor_centroid(center_cell_centroid.x() + (double)x*cell_length,
--                                                 center_cell_centroid.y() + (double)y*cell_length,
--                                                 center_cell_centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          assert(neighbor_cell !=nullptr);
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    assert(curr_dim == feature_dim);
--
--    mask_leaves[sample]->set_data(true);
--
--    //increment weights
--    double rho = 1.0/(double)nfeature;
--    double rho_comp = 1.0 - rho;
--
--    // the difference vector between the sample and the mean
--    vnl_vector_fixed<double, feature_dim> diff = this_feature - mean;
--
--    //update the covariance
--    S += rho_comp*outer_product(diff,diff);
--
--    //update the mean
--    mean += (rho*diff);
--
--    ++nfeature;
--#if 0
--    std::cerr << "Feature EVD: " <<this_feature << '\n'
--             << "Mean Feature EVD: " <<mean_feature << '\n';
--#endif
--  }
--
--  --nfeature;
--  // write and release memory
--  mask_scene->get_block(block_i, block_j, block_k)->init_tree(mask_tree);
--  mask_scene->write_active_block();
--
--  data_scene->unload_active_blocks();
--  mask_scene->unload_active_blocks();
--
--  return true;
--}
--
--
--//: Update mean and scatter, given the mean and scatter of two sets.
--//  Calculation is done according to Chan et al. Updating Formulae and a Pairwise Algorithm for Computing Sample Variances
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::combine_pairwise_statistics( const vnl_vector_fixed<double,feature_dim> &mean1,
--                                                                const vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter1,
--                                                                double const n1,
--                                                                const vnl_vector_fixed<double,feature_dim>  &mean2,
--                                                                const  vnl_matrix_fixed<double,feature_dim,feature_dim> &scatter2,
--                                                                double const n2,
--                                                                vnl_vector_fixed<double,feature_dim> & mean_out,
--                                                                vnl_matrix_fixed<double,feature_dim,feature_dim> & scatter_out,
--                                                                double &n_out )
--{
--  n_out = n1+n2;
--  mean_out = (n1*mean1 + n2*mean2)* (1.0/n_out);
--  vnl_vector_fixed<double, feature_dim> d = mean2 - mean1;
--  scatter_out = scatter1 + scatter2 + (n1*n2/n_out)*outer_product(d,d);
--}
--
--//: Set total scatter matrix, mean, sample, principal components and weights for this class
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::set_up_pca_evd(const vnl_matrix_fixed<double, feature_dim, feature_dim> &S,
--                                                  const vnl_vector_fixed<double, feature_dim> &mean,
--                                                  const double total_nsamples)
--{
--  scatter_ = S;
--  training_mean_ = mean;
--  nsamples_ = (long unsigned int)total_nsamples;
--
--  // Compute eigenvectors(principal components) and values of S
--
--  vnl_matrix<double> pc_temp;
--  vnl_vector<double> w_temp;
--
--  vnl_symmetric_eigensystem_compute(scatter_.as_ref(), pc_temp, w_temp);
--  pc_ = pc_temp.fliplr();
--  weights_=w_temp.flip();
--
--  //save the newly set vaeiables
--  this->xml_write();
--}
--
--//: Computes 10-dimensional pca projection at each voxel on the block and saves it
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::project(int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
--  boxm_scene_base_sptr aux_scene_base = load_valid_scene(scene_id);
--
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
--  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* aux_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (aux_scene_base.as_pointer());
--  if (!(data_scene && proj_scene && aux_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  aux_scene->unload_active_blocks();
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && aux_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  proj_scene->load_block(block_i, block_j, block_k);
--  aux_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  pca_tree_type* proj_tree = data_tree->template clone_to_type<vnl_vector_fixed<double,10> >();
--  boct_tree<short, bool>* aux_tree = data_tree->template clone_to_type<bool>();
--  aux_tree->init_cells(true);
--
--  //get leaf cells
--  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
--  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
--  std::vector<boct_tree_cell<short, bool> *> aux_leaves = aux_tree->leaf_cells();
--
--  double cell_length = finest_cell_length_[scene_id];
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> nmin = nbbox_.min_point();
--  vgl_point_3d<int> nmax = nbbox_.max_point();
--#ifdef DEBUG_PROJ
--  double error = 0.0;
--  unsigned long n_valid_cells= 0;
--#endif
--
--  for (unsigned long i =0; i<data_leaves.size(); i++)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd test if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
--      proj_leaves[i]->set_data(vnl_vector_fixed<double,10>(0.0));
--      aux_leaves[i]->set_data(false);
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); z++)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); y++)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); x++)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
--                                                 centroid.y() + (double)y*cell_length,
--                                                 centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell) {
--            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    if (curr_dim != feature_dim) {
--      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--      return;
--    }
--    this_feature-=training_mean_;
--
--    //solve for the coefficients
--    vnl_vector_fixed<double, feature_dim> a(0.0);
--    a = pc_.transpose() * (this_feature);
--    vnl_vector_fixed<double,10> sample(a.extract(10));
--    proj_leaves[i]->set_data(sample);
--
--#ifdef DEBUG_PROJ
--    //project as a function of number of components
--    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * sample;
--
--    //compute error
--    error+=(float)((this_feature - feature_approx).squared_magnitude());
--    n_valid_cells++;
--#endif
--  }
--
--  // write and release memory
--  proj_scene->get_block(block_i, block_j, block_k)->init_tree(proj_tree);
--  proj_scene->write_active_block();
--  proj_scene->unload_active_blocks();
--  aux_scene->get_block(block_i, block_j, block_k)->init_tree(aux_tree);
--  aux_scene->write_active_block();
--  aux_scene->unload_active_blocks();
--  data_scene->unload_active_blocks();
--
--#ifdef DEBUG_PROJ
--  std::cout << "Total error in this block: " << error/(double)n_valid_cells << std::endl;
--#endif
--}
--
--//: Computes the projection error (as square magniture) given 10-dimensional pca projection at each voxel on the block
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::projection_error(int scene_id, int block_i, int block_j, int block_k)
--{
--  if (training_scenes_[scene_id]) {
--    std::cout << "Skipping training scene: " <<scene_id << std::endl;
--    return;
--  }
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > pca_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
--  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--
--  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>*>(data_scene_base.as_pointer());
--  boxm_scene<pca_tree_type>* proj_scene = dynamic_cast<boxm_scene<pca_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<float_tree_type >* error_scene = dynamic_cast<boxm_scene<float_tree_type >*>(error_scene_base.as_pointer());
--
--  if (!(data_scene && error_scene && proj_scene))
--  {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::sample_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  error_scene->unload_active_blocks();
--
--  //get the cells for this block
--  if (!(data_scene->valid_index(block_i, block_j, block_k) && proj_scene->valid_index(block_i, block_j, block_k) && error_scene->valid_index(block_i, block_j, block_k))) {
--    std::cerr << "In compute_testing_error: Invalid block\n";
--    return;
--  }
--
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  proj_scene->load_block(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the trees
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  pca_tree_type* proj_tree = proj_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--  error_tree->init_cells(-1.0f);
--
--  //get leaf cells
--  std::vector<float_cell_type *> data_leaves = data_tree->leaf_cells();
--  std::vector<pca_cell_type *> proj_leaves = proj_tree->leaf_cells();
--  std::vector<float_cell_type *> error_leaves = error_tree->leaf_cells();
--
--  double cell_length = finest_cell_length_[scene_id];
--
--  //CAUTION: the neighborhood box was suppossed to be defined as number of regular neighbors
--  //convert neighborhood box to scene coordinates
--  vgl_point_3d<int> nmin = nbbox_.min_point();
--  vgl_point_3d<int> nmax = nbbox_.max_point();
--
--  for (unsigned i =0; i<data_leaves.size(); i++)
--  {
--    float_cell_type* data_cell = data_leaves[i];
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates aad test if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)nmin.x()*cell_length, centroid.y() + (double)nmin.y()*cell_length, centroid.z() + (double)nmin.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)nmax.x()*cell_length, centroid.y() + (double)nmax.y()*cell_length, centroid.z() + (double)nmax.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global))) {
--      error_leaves[i]->set_data(-1.0f);
--      continue;
--    }
--
--    //3. Assemble neighborhood as a feature-vector
--    vnl_vector_fixed<double, feature_dim> this_feature(0.0f);
--
--    unsigned curr_dim = 0;
--    for (int z = nbbox_.min_z(); z<=nbbox_.max_z(); ++z)
--      for (int y = nbbox_.min_y(); y<=nbbox_.max_y(); ++y)
--        for (int x = nbbox_.min_x(); x<=nbbox_.max_x(); ++x)
--        {
--          vgl_point_3d<double> neighbor_centroid(centroid.x() + (double)x*cell_length,
--                                                 centroid.y() + (double)y*cell_length,
--                                                 centroid.z() + (double)z*cell_length);
--
--          boct_tree_cell<short,float> *neighbor_cell = data_scene->locate_point_in_memory(neighbor_centroid);
--
--          if (!neighbor_cell) {
--            std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--            return;
--          }
--
--          this_feature[curr_dim] = (double)neighbor_cell->data();
--          curr_dim++;
--        }
--
--    if (curr_dim != feature_dim) {
--      std::cerr << "Error in bvpl_global_pca<feature_dim>::project\n";
--      return;
--    }
--    this_feature-=training_mean_;
--
--    //get the coefficients
--    vnl_vector_fixed<double, 10> a = proj_leaves[i]->data();
--
--    //project
--    vnl_vector_fixed<double, feature_dim> feature_approx  = pc_.extract(feature_dim, 10) * a;
--
--    //compute error
--    error_leaves[i]->set_data((float)((this_feature - feature_approx).squared_magnitude()));
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->init_tree(error_tree);
--  error_scene->write_active_block();
--  error_scene->unload_active_blocks();
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--}
--
--
--//: Load scene info
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr scene_base = new boxm_scene_base();
--  boxm_scene_parser scene_parser;
--  scene_base->load_scene(scenes_[scene_id], scene_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
--  if (scene_base->appearence_model() == BOXM_FLOAT) {
--    scene->load_scene(scene_parser);
--    scene_base = scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_valid_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is should be used for training
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_train_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--
--//: Load auxiliary scene info
--template <unsigned feature_dim>
--
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_projection_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_projection_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
--  boxm_scene_parser proj_parser;
--  std::stringstream proj_scene_ss;
--  proj_scene_ss << aux_dirs_[scene_id] << "/proj_pca_scene_" << scene_id << ".xml";
--  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
--
--  //cast scene
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > pca_tree_type;
--  boxm_scene<pca_tree_type > *proj_scene= new boxm_scene<pca_tree_type >();
--  if (proj_scene_base->appearence_model() == VNL_DOUBLE_10) {
--    proj_scene->load_scene(proj_parser);
--    proj_scene_base = proj_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_proj_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return proj_scene_base;
--}
--
--
--//: Load auxiliary scene info
--template <unsigned feature_dim>
--boxm_scene_base_sptr bvpl_global_pca<feature_dim>::load_error_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid scene id\n";
--    return nullptr;
--  }
--
--  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  if (!data_scene) {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
--    return nullptr;
--  }
--
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << "error_pca_scene_" << scene_id ;
--  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--  if (!vul_file::exists(aux_scene_path)) {
--    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--    boxm_scene<boct_tree<short, float> > *aux_scene =
--    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--    aux_scene->set_appearance_model(BOXM_FLOAT);
--    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--  }
--
--  //load scene
--  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
--  boxm_scene_parser error_parser;
--  std::stringstream error_scene_ss;
--  error_scene_ss << aux_dirs_[scene_id] << "/error_pca_scene_" << scene_id << ".xml";
--  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
--  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
--    error_scene->load_scene(error_parser);
--    error_scene_base = error_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_error_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return error_scene_base;
--}
--
--
--//: Write this class to xml file
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("pca_global_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  bxml_element* paths = new bxml_element("paths");
--  paths->append_text("\n");
--  paths->set_attribute("pc_path", pc_path() );
--  paths->set_attribute("weights_path", weights_path() );
--  paths->set_attribute("mean_path", mean_path());
--  paths->set_attribute("scatter_path", scatter_path());
--  root->append_data(paths);
--  root->append_text("\n");
--
--  bxml_element* neighborhood = new bxml_element("neighborhood");
--  neighborhood->append_text("\n");
--  neighborhood->set_attribute("min_x", nbbox_.min_point().x());
--  neighborhood->set_attribute("min_y", nbbox_.min_point().y());
--  neighborhood->set_attribute("min_z", nbbox_.min_point().z());
--  neighborhood->set_attribute("max_x", nbbox_.max_point().x());
--  neighborhood->set_attribute("max_y", nbbox_.max_point().y());
--  neighborhood->set_attribute("max_z", nbbox_.max_point().z());
--  root->append_data(neighborhood);
--  root->append_text("\n");
--
--  bxml_element* properties = new bxml_element("properties");
--  properties->append_text("\n");
--  properties->set_attribute("nsamples", nsamples_);
--  properties->set_attribute("feature_dim", feature_dim);
--  //properties->set_attribute("finest_cell_length", finest_cell_length_);
--  properties->set_attribute("nscenes", scenes_.size());
--  properties->set_attribute("training_fraction", training_fraction_);
--
--  root->append_data(properties);
--  root->append_text("\n");
--
--  //write the scenes
--  for (unsigned i =0; i<scenes_.size(); i++)
--  {
--    bxml_element* scenes_elm = new bxml_element("scene");
--    scenes_elm->append_text("\n");
--    scenes_elm->set_attribute("id", i);
--    scenes_elm->set_attribute("path", scenes_[i]);
--    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
--    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
--    scenes_elm->set_attribute("nleaves", nleaves_[i]);
--    root->append_data(scenes_elm);
--    root->append_text("\n");
--  }
--
--  //write training scenes
--  bxml_element* train_elm = new bxml_element("training_scenes");
--  train_elm->append_text("\n");
--
--  std::stringstream ss;
--  unsigned ts = 0;
--
--  for (unsigned i = 0; i< training_scenes_.size(); i++) {
--    if (training_scenes_[i]) {
--      ss << i << ' ';
--      ts++;
--    }
--  }
--
--  train_elm->set_attribute("nscenes", ts);
--  train_elm->append_text(ss.str());
--  train_elm->append_text("\n");
--  root->append_data(train_elm);
--  root->append_text("\n");
--
--  //write to disk
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--
--  // Write pca main matrices -other matrices aren't class variables and should have been written during computation time
--  write_pca_matrices();
--}
--
--//: Write a PCA file
--template <unsigned feature_dim>
--void bvpl_global_pca<feature_dim>::write_pca_matrices()
--{
--  std::ofstream pc_ofs(pc_path().c_str());
--  pc_ofs.precision(15);
--  std::ofstream weights_ofs(weights_path().c_str());
--  weights_ofs.precision(15);
--  std::ofstream mean_ofs(mean_path().c_str());
--  mean_ofs.precision(15);
--  std::ofstream scatter_ofs(scatter_path().c_str());
--  scatter_ofs.precision(15);
--
--  pc_ofs << pc_;
--  pc_ofs.close();
--  weights_ofs << weights_;
--  weights_ofs.close();
--  mean_ofs << training_mean_;
--  mean_ofs.close();
--  scatter_ofs << scatter_;
--  scatter_ofs.close();
--}
--
--
--#define BVPL_GLOBAL_PCA(feature_dim) \
--template class bvpl_global_pca<feature_dim>;
--
--
--#endif // bvpl_global_pca_hxx_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
-deleted file mode 100644
-index 40ca062045..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.cxx
-+++ /dev/null
-@@ -1,12 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 11-Apr-2011
--
--#include "bvpl_global_taylor.h"
--
--template <>
--boxm_apm_type bvpl_taylor_apm<double, 10>(){return VNL_DOUBLE_10;}
--
--template <>
--boxm_apm_type bvpl_taylor_apm<float, 3>(){return VNL_FLOAT_3;}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
-deleted file mode 100644
-index 38c05600fb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.h
--#ifndef bvpl_global_taylor_h
--#define bvpl_global_taylor_h
--//:
--// \file
--// \brief A class to compute taylor features across different boxm_scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  11-Apr-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <vbl/vbl_ref_count.h>
--
--//Forward declaration
--class bvpl_global_corners;
--
--template <class T_data, unsigned DIM>
--boxm_apm_type bvpl_taylor_apm();
--
--namespace bvpl_global_tylor_defaults
--{
--  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--;
--}
--
--template<class T_data, unsigned DIM>
--class bvpl_global_taylor : public vbl_ref_count
--{
-- public:
--
--  //: Constructor  from xml file
--  bvpl_global_taylor(const std::string &path, const std::string kernel_names[]);
--
--  //: Init auxiliary scenes and smallest cell length values
--  void init();
--
--  //: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
--  void compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k);
--
--  //: Compute reconstruction error
--  bool compute_approximation_error(int scene_id, int block_i, int block_j, int block_k);
--
--  //: Extract a particular coefficient scene
--  void extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *coeff_scene);
--
--  //: Threshold non-salient features according to Harris' measure
--  void threshold_corners(int scene_id, int block_i, int block_j, int block_k, double k);
--
--  //: Write to taylor_global_info.xml
--  void xml_write();
--
--  // Accessors
--  std::string path_out() const { return path_out_; }
--  std::vector<std::string> scenes() const { return scenes_; }
--  std::vector<std::string> aux_dirs() const { return aux_dirs_; }
--  std::string aux_dirs( unsigned i ) const { return aux_dirs_[i]; }
--  std::vector<double> cell_lengths() const { return finest_cell_length_; }
--  //std::vector<bool> training_scenes() const { return training_scenes_; }
--
--  boxm_scene_base_sptr load_scene (int scene_id);
--  boxm_scene_base_sptr load_error_scene (int scene_id);
--  boxm_scene_base_sptr load_valid_scene (int scene_id);
--  boxm_scene_base_sptr load_projection_scene (int scene_id);
--
--  std::string xml_path() { return path_out_ + "/taylor_global_info.xml"; }
--
--  friend class bvpl_global_corners;
--
-- protected:
--
--  //: A vector to hold scene paths
--  std::vector<std::string> scenes_;
--  //: A vector to hold paths to keep any kind of auxiliary scene or info(must be in the same order as scenes_)
--  std::vector<std::string> aux_dirs_;
--  //: A vector to hold the finest cell length of the corresponding scene scene
--  std::vector<double> finest_cell_length_;
--  //: A vector that indicates whether a scene should be used as train (True) or test(False). Order is equivalent to scenes_
--  //std::vector<bool> training_scenes_;
--
--  //: A vector to 2-degree taylor approximation kernels
--  //  The order is I0, Ix, Iy, Iz, Ixx, Iyy, Izz, Ixy, Ixz, Iyz (therefore this class works for dimensions 1-10)
--  bvpl_kernel_vector_sptr kernel_vector_;
--
--  //: Path to kernel files
--  std::string kernels_path_;
--  //: Path to xml info file
--  std::string path_out_;
--};
--
--#include <vbl/vbl_smart_ptr.h>
--// This does not really seem like a good idea to me ... - PVr.
--typedef vbl_smart_ptr<bvpl_global_taylor<double,10> > bvpl_global_taylor_sptr;
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
-deleted file mode 100644
-index d8bdd3f0e4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_global_taylor.hxx
-+++ /dev/null
-@@ -1,645 +0,0 @@
--#ifndef bvpl_global_taylor_hxx_
--#define bvpl_global_taylor_hxx_
--//:
--// \file
--#include "bvpl_global_taylor.h"
--// \author Isabel Restrepo
--// \date 11-Apr-2011
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--#include <bxml/bxml_write.h>
--#include <bxml/bxml_read.h>
--#include <bxml/bxml_find.h>
--
--#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <bvpl_octree/bvpl_corner_detector.h>
--#include <bvpl_octree/bvpl_corner_functors.h>
--
--#include <vul/vul_file.h>
--
--#include <vnl/algo/vnl_matrix_inverse.h>
--#include <vnl/vnl_double_3.h>
--#include <vnl/vnl_double_3x3.h>
--
--//: Constructor  from xml file
--template<class T_data, unsigned DIM>
--bvpl_global_taylor<T_data, DIM>::bvpl_global_taylor(const std::string &path, const std::string kernel_names[])
--{
--  std::cout << "Loading taylor info from xml-file" << std::endl;
--  path_out_ = path;
--  std::ifstream xml_ifs(xml_path().c_str());
--  if (!xml_ifs.is_open()) {
--    std::cerr << "Error: could not open xml info file: " << xml_path() << '\n';
--    throw;
--  }
--  bxml_document doc = bxml_read(xml_ifs);
--  bxml_element query("taylor_global_info");
--  bxml_data_sptr root = bxml_find_by_name(doc.root_element(), query);
--  if (!root) {
--    std::cerr << "Error: bvpl_discover_pca_kernels - could not parse xml root\n";
--    throw;
--  }
--
--  //Parse scenes
--  bxml_element scenes_query("scene");
--  std::vector<bxml_data_sptr> scenes_data = bxml_find_all_with_name(root, scenes_query);
--
--  unsigned nscenes=scenes_data.size();
--  std::cout << "Number of scenes: " << nscenes <<std::endl;
--
--  scenes_.clear();
--  scenes_.resize(nscenes);
--
--  aux_dirs_.clear();
--  aux_dirs_.resize(nscenes);
--
--  finest_cell_length_.clear();
--  finest_cell_length_.resize(nscenes);
--
--  for (unsigned si = 0; si < nscenes; si++)
--  {
--    bxml_element* scenes_elm = dynamic_cast<bxml_element*>(scenes_data[si].ptr());
--    int id = -1;
--    scenes_elm->get_attribute("id", id);
--    scenes_elm->get_attribute("path", scenes_[id]);
--    scenes_elm->get_attribute("aux_dir", aux_dirs_[id]);
--    scenes_elm->get_attribute("cell_length" , finest_cell_length_[id]);
--
--    std::cout << "Scene " << id << " is " << scenes_[id] << '\n';
--  }
--
--  //Parse kernels
--  bxml_element kernels_query("kernels");
--  bxml_data_sptr kernels_data = bxml_find_by_name(root, kernels_query);
--  if (kernels_data)
--  {
--    bxml_element* kernels_elm = dynamic_cast<bxml_element*>(kernels_data.ptr());
--
--    kernels_elm->get_attribute("path", kernels_path_);
--
--    std::cout << "Kernels path is " << kernels_path_ << '\n';
--    kernel_vector_ = new bvpl_kernel_vector;
--
--    if (vul_file::exists(kernels_path_) && vul_file::is_directory(kernels_path_)) {
--      //read the kernels
--
--      kernel_vector_->kernels_.clear();
--
--      kernel_vector_->kernels_.resize(DIM, nullptr);
--      //std::string kernel_names[]={"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz"};
--      for (unsigned ki = 0; ki<DIM; ki++) {
--        std::string filename = kernels_path_ + "/" + kernel_names[ki] + ".txt";
--        std::cout << "Reading kernel file : " << filename << std::endl;
--        bvpl_taylor_basis_factory factory(filename);
--        bvpl_kernel_sptr kernel = new bvpl_kernel(factory.create());
--        kernel_vector_->kernels_[ki] = kernel;
--      }
--    }
--  }
--  else {
--    std::cerr << " In Gobal Taylor, path to kernels does not exist\n";
--  }
--}
--
--//: Compute the DIM taylor kernels for this scene at current block. The output is saved to the projection scene as a DIM-d vector
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::compute_taylor_coefficients(int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree_cell<short,float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
--
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*>(data_scene_base.as_pointer());
--  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  if (!(data_scene && proj_scene && valid_scene))
--  {
--    std::cerr << "Error in bvpl_global_taylor::sample_statistics: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_block_vector_operator block_oper;
--  bvpl_algebraic_functor functor;
--  block_oper.operate(*data_scene, functor, kernel_vector_, block_i, block_j, block_k, *proj_scene, *valid_scene, finest_cell_length_[scene_id]);
--
--  //clean memory
--  data_scene->unload_active_blocks();
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--}
--
--template<class T_data, unsigned DIM>
--bool bvpl_global_taylor<T_data, DIM>::compute_approximation_error(int scene_id, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr proj_scene_base = load_projection_scene(scene_id);
--  boxm_scene_base_sptr error_scene_base = load_error_scene(scene_id);
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--
--  //cast the scenes
--  boxm_scene<float_tree_type>* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
--  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (proj_scene_base.as_pointer());
--  boxm_scene<float_tree_type> * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  if (!data_scene || !basis_scene || !error_scene) {
--    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
--    return false;
--  }
--
--  //load blocks of interest
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  basis_scene->load_block(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  error_tree->init_cells(-1.0f);
--  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
--
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
--
--  vgl_point_3d<int> min_point = kernel_vector_->min();
--  vgl_point_3d<int> max_point = kernel_vector_->max();
--  double cell_length = this->finest_cell_length_[scene_id];
--  std::cout << "In computing taylor error, limits are: " <<min_point << " and " <<max_point <<std::endl;
--
--  for (unsigned i =0; i<data_leaves.size(); i++)
--  {
--    //current cell is the center
--    float_cell_type* data_cell = data_leaves[i];
--    taylor_cell_type* basis_cell = basis_leaves[i];
--
--    boct_loc_code<short> data_code = data_cell->get_code();
--    boct_loc_code<short> basis_code = basis_cell->get_code();
--
--    //check cells are at the same location
--    if (! data_code.isequal(basis_code)) {
--      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
--               << "Data Code: " << data_code << '\n'
--               << "Basis Code: " << basis_code << '\n';
--
--      return false;
--    }
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length,
--                                          centroid.y() + (double)min_point.y()*cell_length,
--                                          centroid.z() + (double)min_point.z()*cell_length);
--    if (! data_scene->locate_point_in_memory(min_point_global))
--      continue;
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length,
--                                          centroid.y() + (double)max_point.y()*cell_length,
--                                          centroid.z() + (double)max_point.z()*cell_length);
--    if (! data_scene->locate_point_in_memory(max_point_global))
--      continue;
--
--    //assemble basis
--//    double I0 = basis_cell->data().I0;
--//    vnl_double_3 G= basis_cell->data().G;
--//    vnl_double_3x3 H = basis_cell->data().H;
--    vnl_vector_fixed<double,10> taylor_coeff = basis_cell->data();
--
--    //form basis
--    double I0 = taylor_coeff[0];
--    vnl_double_3 G(taylor_coeff[1], taylor_coeff[2], taylor_coeff[3]);
--    vnl_double_3x3 H;
--    H.put(0,0,taylor_coeff[4]);
--    H.put(0,1,taylor_coeff[7]);
--    H.put(0,2,taylor_coeff[8]);
--    H.put(1,0,taylor_coeff[7]);
--    H.put(1,1,taylor_coeff[5]);
--    H.put(1,2,taylor_coeff[9]);
--    H.put(2,0,taylor_coeff[8]);
--    H.put(2,1,taylor_coeff[9]);
--    H.put(2,2,taylor_coeff[6]);
--
--    double error = 0.0;
--    for (int x = min_point.x(); x<= max_point.x(); x++) {
--      for (int y = min_point.y(); y<=max_point.y(); y++) {
--        for (int z = min_point.z(); z<=max_point.z(); z++) {
--          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
--          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
--          if (this_cell) {
--            vnl_double_3 X((double)x,(double)y, (double)z);
--            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
--            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
--            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
--            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
--          }
--        }
--      }
--    }
--
--    error_leaves[i]->set_data((float)error);
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
--  error_scene->write_active_block();
--  data_scene->unload_active_blocks();
--  basis_scene->unload_active_blocks();
--
--  return true;
--}
--
--
--//: Threshold non-salient features according to Harris' measure
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::threshold_corners(int scene_id, int block_i, int block_j, int block_k, double harris_k)
--{
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > taylor_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > taylor_cell_type;
--
--  boxm_scene_base_sptr data_scene_base =load_scene(scene_id);
--  boxm_scene_base_sptr proj_scene_base =load_projection_scene(scene_id);
--  boxm_scene_base_sptr valid_scene_base = load_valid_scene(scene_id);
--
--  boxm_scene<taylor_tree_type>* proj_scene = dynamic_cast<boxm_scene<taylor_tree_type>*>(proj_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, bool> >* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  boxm_scene<boct_tree<short, float> >* corner_scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  corner_scene->set_appearance_model(BOXM_FLOAT);
--  corner_scene->set_paths(valid_scene->path(), "harris_scene");
--  corner_scene->write_scene("/harris_scene.xml");
--
--  if (!( proj_scene && valid_scene && corner_scene ))
--  {
--    std::cerr << "Error in bvpl_global_taylor::threshold_corners: Could not cast input scenes\n";
--    return;
--  }
--
--  //init variables
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--
--  //operate on scene
--  bvpl_corner_detector corner_detector;
--  bvpl_harris_laptev_functor harris_functor(harris_k);
--
--  vgl_point_3d<int> max_neigborhood_idx = kernel_vector_->max();
--  vgl_point_3d<int> min_neigborhood_idx = kernel_vector_->min();
--
--  std::cout << "Neighborhood for harris threshhold: " << min_neigborhood_idx << " , " << max_neigborhood_idx << std::endl;
--
--  corner_detector.detect_and_threshold(proj_scene, harris_functor, min_neigborhood_idx, max_neigborhood_idx,
--                                       block_i, block_j, block_k, valid_scene, corner_scene, finest_cell_length_[scene_id]);
--
--  //clean memory
--  proj_scene->unload_active_blocks();
--  valid_scene->unload_active_blocks();
--  corner_scene->unload_active_blocks();
--}
--
--//: Init auxiliary scenes and smallest cell length values
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::init()
--{
--  for (unsigned i = 0; i < aux_dirs_.size(); i++)
--  {
--    boxm_scene_base_sptr data_scene_base = load_scene(i);
--    boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--    if (!data_scene) {
--      std::cerr << "Error in bvpl_global_taylor::init(): Could not cast data scene\n";
--      return;
--    }
--    double finest_cell_length = data_scene->finest_cell_length();
--    finest_cell_length_[i] = finest_cell_length;
--
--    if (!(vul_file::exists(aux_dirs_[i]) && vul_file::is_directory(aux_dirs_[i]))) {
--      vul_file::make_directory(aux_dirs_[i]);
--    }
--
--    {
--      std::stringstream aux_scene_ss;
--      aux_scene_ss << "valid_scene_" << i ;
--      std::string aux_scene_path = aux_dirs_[i] + "/" + aux_scene_ss.str() + ".xml";
--      if (!vul_file::exists(aux_scene_path)) {
--        std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--        boxm_scene<boct_tree<short, bool> > *aux_scene =
--        new boxm_scene<boct_tree<short, bool> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--        aux_scene->set_appearance_model(BOXM_BOOL);
--        aux_scene->set_paths(aux_dirs_[i], aux_scene_ss.str());
--        aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--      }
--    }
--
--    {
--      std::stringstream proj_scene_ss;
--      proj_scene_ss << "proj_taylor_scene_" << i ;
--      std::string proj_scene_path = aux_dirs_[i] + "/" + proj_scene_ss.str() + ".xml";
--      if (!vul_file::exists(proj_scene_path)) {
--        std::cout<< "Scene: " << proj_scene_path << " does not exist, initializing" << std::endl;
--        typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
--        boxm_scene<taylor_tree_type > *proj_scene =
--        new boxm_scene<taylor_tree_type >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--        proj_scene->set_appearance_model(bvpl_taylor_apm<T_data,DIM>());
--        proj_scene->set_paths(aux_dirs_[i], proj_scene_ss.str());
--        proj_scene->write_scene("/" + proj_scene_ss.str() +  ".xml");
--      }
--    }
--  }
--
--  xml_write();
--}
--
--
--//: Load scene info
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr scene_base = new boxm_scene_base();
--  boxm_scene_parser scene_parser;
--  scene_base->load_scene(scenes_[scene_id], scene_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float > > *scene= new boxm_scene<boct_tree<short, float > >();
--  if (scene_base->appearence_model() == BOXM_FLOAT) {
--    scene->load_scene(scene_parser);
--    scene_base = scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_pca::load_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return scene_base;
--}
--
--//: Load auxiliary scene indicating if a cell is valid. e.g border cells are not valid
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_valid_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/valid_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return aux_scene_base;
--}
--
--
--//: Load auxiliary scene info
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_error_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>=(int)scenes_.size())
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid scene id\n";
--    return nullptr;
--  }
--
--  boxm_scene_base_sptr data_scene_base = load_scene(scene_id);
--  boxm_scene<boct_tree<short, float> >* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  if (!data_scene) {
--    std::cerr << "Error in bvpl_global_pca<feature_dim>::init(): Could not cast data scene\n";
--    return nullptr;
--  }
--
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << "error_taylor_scene_" << scene_id ;
--  std::string aux_scene_path = aux_dirs_[scene_id] + "/" + aux_scene_ss.str() + ".xml";
--  if (!vul_file::exists(aux_scene_path)) {
--    std::cout<< "Scene: " << aux_scene_path << " does not exist, initializing" << std::endl;
--    boxm_scene<boct_tree<short, float> > *aux_scene =
--    new boxm_scene<boct_tree<short, float> >(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--    aux_scene->set_appearance_model(BOXM_FLOAT);
--    aux_scene->set_paths(aux_dirs_[scene_id], aux_scene_ss.str());
--    aux_scene->write_scene("/" + aux_scene_ss.str() +  ".xml");
--  }
--
--  //load scene
--  boxm_scene_base_sptr error_scene_base = new boxm_scene_base();
--  boxm_scene_parser error_parser;
--  std::stringstream error_scene_ss;
--  error_scene_ss << aux_dirs_[scene_id] << "/error_taylor_scene_" << scene_id << ".xml";
--  error_scene_base->load_scene(error_scene_ss.str(), error_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, float> > *error_scene= new boxm_scene<boct_tree<short, float> >();
--  if (error_scene_base->appearence_model() == BOXM_FLOAT) {
--    error_scene->load_scene(error_parser);
--    error_scene_base = error_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_error_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return error_scene_base;
--}
--
--
--#if 0
--//: Load auxiliary scene indicating if a cell is should be used for training
--boxm_scene_base_sptr bvpl_global_taylor::load_train_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_scene: Invalid scene id\n";
--    return NULL;
--  }
--  //load scene
--  boxm_scene_base_sptr aux_scene_base = new boxm_scene_base();
--  boxm_scene_parser aux_parser;
--  std::stringstream aux_scene_ss;
--  aux_scene_ss << aux_dirs_[scene_id] << "/train_scene_" << scene_id << ".xml";
--  aux_scene_base->load_scene(aux_scene_ss.str(), aux_parser);
--
--  //cast scene
--  boxm_scene<boct_tree<short, bool > > *aux_scene= new boxm_scene<boct_tree<short, bool > >();
--  if (aux_scene_base->appearence_model() == BOXM_BOOL) {
--    aux_scene->load_scene(aux_parser);
--    aux_scene_base = aux_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_aux_scene: Invalid appearance model\n";
--    return NULL;
--  }
--
--  return aux_scene_base;
--}
--#endif
--
--
--//: Load auxiliary scene info
--template<class T_data, unsigned DIM>
--boxm_scene_base_sptr bvpl_global_taylor<T_data, DIM>::load_projection_scene (int scene_id)
--{
--  if (scene_id<0 || scene_id>((int)scenes_.size() -1))
--  {
--    std::cerr << "Error in bvpl_global_taylor::load_projection_scene: Invalid scene id\n";
--    return nullptr;
--  }
--  //load scene
--  boxm_scene_base_sptr proj_scene_base = new boxm_scene_base();
--  boxm_scene_parser proj_parser;
--  std::stringstream proj_scene_ss;
--  proj_scene_ss << aux_dirs_[scene_id] << "/proj_taylor_scene_" << scene_id << ".xml";
--  proj_scene_base->load_scene(proj_scene_ss.str(), proj_parser);
--
--  //cast scene
--  typedef boct_tree<short,vnl_vector_fixed<T_data,DIM> > taylor_tree_type;
--  boxm_scene<taylor_tree_type > *proj_scene= new boxm_scene<taylor_tree_type >();
--  if (proj_scene_base->appearence_model() == bvpl_taylor_apm<T_data,DIM>()) {
--    proj_scene->load_scene(proj_parser);
--    proj_scene_base = proj_scene;
--  }
--  else {
--    std::cerr << "Error in bvpl_global_taylor::load_proj_scene: Invalid appearance model\n";
--    return nullptr;
--  }
--
--  return proj_scene_base;
--}
--
--//: Write this class to xml file
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::xml_write()
--{
--  bxml_document doc;
--  bxml_element *root = new bxml_element("taylor_global_info");
--  doc.set_root_element(root);
--  root->append_text("\n");
--
--  //write the scenes
--  for (unsigned i =0; i<scenes_.size(); i++)
--  {
--    bxml_element* scenes_elm = new bxml_element("scene");
--    scenes_elm->append_text("\n");
--    scenes_elm->set_attribute("id", i);
--    scenes_elm->set_attribute("path", scenes_[i]);
--    scenes_elm->set_attribute("aux_dir", aux_dirs_[i]);
--    scenes_elm->set_attribute("cell_length", finest_cell_length_[i]);
--    root->append_data(scenes_elm);
--    root->append_text("\n");
--  }
--
--  //write path to kernels
--  bxml_element* kernel_elm = new bxml_element("kernels");
--  kernel_elm->append_text("\n");
--  kernel_elm->set_attribute("path", kernels_path_);
--  root->append_data(kernel_elm);
--  root->append_text("\n");
--
--  //write to disk
--  std::ofstream os(xml_path().c_str());
--  bxml_write(os, doc);
--  os.close();
--}
--
--
--//: Extract a particular coefficient scene
--template<class T_data, unsigned DIM>
--void bvpl_global_taylor<T_data, DIM>::extract_coefficient_scene(int scene_id, int coefficient_id, boxm_scene<boct_tree<short, float > > *float_scene)
--{
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree_cell<short, float> float_cell_type;
--
--  typedef boct_tree<short,vnl_vector_fixed<double,10> > projection_tree_type;
--  typedef boct_tree_cell<short,vnl_vector_fixed<double,10> > projection_cell_type;
--  std::vector<vnl_vector_fixed<double,10> > projections;
--
--  boxm_scene_base_sptr projection_scene_base = load_projection_scene(scene_id);
--
--  boxm_scene<projection_tree_type>* projection_scene = dynamic_cast<boxm_scene<projection_tree_type>* >(projection_scene_base.as_pointer());
--
--  if (!(projection_scene && float_scene))
--  {
--    std::cerr << "Error in bof_util::random_label_for_training: Could not cast scenes\n";
--    return;
--  }
--
--  //init variables
--  projection_scene->unload_active_blocks();
--  float_scene->unload_active_blocks();
--
--  //get the cells for these blocks
--  boxm_block_iterator<projection_tree_type> it = projection_scene->iterator();
--  for (it.begin(); !it.end(); ++it)
--  {
--    if (!(projection_scene->valid_index(it.index()) && float_scene->valid_index(it.index()))) {
--      std::cerr << "In bof_util::random_label_for_training: invalid block\n";
--      return;
--    }
--
--    projection_scene->load_block(it.index());
--    float_scene->load_block(it.index());
--
--    //get the trees
--    projection_tree_type* projection_tree = projection_scene->get_block(it.index())->get_tree();
--    float_tree_type* float_tree = projection_tree->clone_to_type<float>();
--
--    //get leaf cells
--    std::vector<projection_cell_type *> projection_leaves = projection_tree->leaf_cells();
--    std::vector<float_cell_type *> float_leaves = float_tree->leaf_cells();
--
--    unsigned int tree_ncells = projection_leaves.size();
--
--    for (unsigned int i =0; i<tree_ncells; ++i)
--    {
--      float_leaves[i]->set_data(float(projection_leaves[i]->data()[coefficient_id]));
--    }
--    float_scene->get_block(it.index())->init_tree(float_tree);
--    float_scene->write_active_block();
--  }
--
--  //release memory
--  projection_scene->unload_active_blocks();
--  float_scene->unload_active_blocks();
--}
--
--
--#define BVPL_GLOBAL_TAYLOR_INSTANTIATE(T1,T2) \
--template class bvpl_global_taylor<T1,T2 >
--
--#endif // bvpl_global_taylor_hxx_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
-deleted file mode 100644
-index 6d3206a9c5..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
-+++ /dev/null
-@@ -1,142 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_kernel_operator.h
--#ifndef bvpl_octree_kernel_operator_h
--#define bvpl_octree_kernel_operator_h
--//:
--// \file
--// \brief A class that operates a bvpl_kernel on an octree or boxm scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 13, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<class T_data>
--class bvpl_octree_kernel_operator
--{
-- public:
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  //Constructor from a bvpl functor
--  bvpl_octree_kernel_operator(tree_type* tree_in): tree_in_(tree_in){}
--
--  // "Convolves" kernel with class tree, storing the output in an output octree.
--  template<class F>
--  void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
--  {
--    // get all (leaf) cells at given scale
--    std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
--    std::vector<cell_type* > out_cells = out_tree->leaf_cells_at_level(level);
--
--    bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--    // iterate, through all cells
--    for (unsigned i = 0; i <  cells.size();i++)
--    {
--      // iterate through vector and compute result
--      cell_type* center_cell = cells[i];
--
--      if (center_cell->level()!=level)
--        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
--
--      if (!center_cell->is_leaf())
--        std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a leaf\n";
--
--      vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
--
--      // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
--
--      kernel_iter.begin(); // reset the kernel iterator
--      while (!kernel_iter.isDone())
--      {
--        vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--        vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
--                                           this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
--                                           this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
--
--        cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
--
--        if (this_cell) {
--          bvpl_kernel_dispatch d = *kernel_iter;
--          T_data val = this_cell->data();
--          functor.apply(val, d);
--        }
--        else
--          break;
--        ++kernel_iter;
--      }
--
--      out_cells[i]->set_data(functor.result());
--    }
--  }
--
--  // "Convolves" kernel with class tree, storing the output in an output octree.
--  template<class F>
--  void operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length);
--
-- private:
--  tree_type * tree_in_;
--};
--
--template <class T_data> template <class F>
--void bvpl_octree_kernel_operator<T_data>::operate(F functor, bvpl_kernel_sptr kernel, short level, double cell_length)
--{
--  // get all (leaf) cells at given scale/tree level
--  std::vector<cell_type* > cells = tree_in_->leaf_cells_at_level(level);
--
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  // iterate, through all cells
--  for (unsigned i = 0; i <  cells.size();i++)
--  {
--    // iterate through vector and compute result
--    cell_type* center_cell = cells[i];
--
--    if (center_cell->level()!=level)
--      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is not at the right level\n";
--
--    if (!center_cell->is_leaf())
--      std::cerr << "Error in bvpl_octree_kernel_operator: Cell is a not a leaf\n";
--
--    vgl_point_3d<double> this_cell_origin = tree_in_->local_origin(center_cell);
--
--    // TODO: check bounds. Is it more efficient to check bounds for every kernel or to let is run and store a dummy value in it?
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> this_cell_idx(this_cell_origin.x() + (double)kernel_idx.x()*cell_length,
--                                         this_cell_origin.y() + (double)kernel_idx.y()*cell_length,
--                                         this_cell_origin.z() + (double)kernel_idx.z()*cell_length);
--
--      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
--
--      if (this_cell) {
--        bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val, d);
--      }
--      else
--        break;
--      ++kernel_iter;
--    }
--
--    center_cell->set_data(functor.result());
--  }
--
--}
--
--#endif // bvpl_octree_kernel_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
-deleted file mode 100644
-index be5efb6238..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
-+++ /dev/null
-@@ -1,78 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_neighbors.h
--#ifndef bvpl_octree_neighbors_h
--#define bvpl_octree_neighbors_h
--//:
--// \file
--// \brief  A class that operates a bvpl_kernel on an octree or boxm scene to find all the neighbor cells that correspond to that kernel, and returns a list of pointers to those neighbors
--// \author Gamze Tunali Gamze_Tunali@brown.edu
--// \date   March 18, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boct/boct_tree.h>
--#include <boxm/boxm_scene.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--template<class T_data>
--class bvpl_octree_neighbors
--{
-- public:
--  typedef boct_tree<short, T_data> tree_type;
--  typedef boct_tree_cell<short,T_data> cell_type;
--
--  //Constructor from a bvpl functor
--  bvpl_octree_neighbors(tree_type* tree_in): tree_in_(tree_in){}
--
--  // "Convolves" kernel with class tree, storing the output in an output octree.
--  void neighbors(bvpl_kernel_sptr kernel, cell_type* cell,
--                 std::vector<cell_type *>& neighb_cells)
--  {
--    bvpl_kernel_iterator kernel_iter = kernel->iterator();
--    short level = cell->level();
--    double cell_length = tree_in_->cell_length(cell);
--    // iterate through vector and find the neighbors
--    vgl_point_3d<double> cell_origin = tree_in_->local_origin(cell);
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--      vgl_point_3d<double> this_cell_idx(cell_origin.x() + (double)kernel_idx.x()*cell_length,
--                                         cell_origin.y() + (double)kernel_idx.y()*cell_length,
--                                         cell_origin.z() + (double)kernel_idx.z()*cell_length);
--
--      cell_type* this_cell = tree_in_->locate_point_at_level(this_cell_idx, level, true);
--      if (this_cell) {
--        // check if this cell is an internal node, if so get the children
--        if (!this_cell->is_leaf()) {
--          std::vector<cell_type *> children;
--          this_cell->leaf_children(children);
--          neighb_cells.insert(neighb_cells.end(), children.begin(), children.end());
--        }
--        else {
--          // make sure that the same cell is not added more than once
--          bool found=false;
--          for (unsigned i=0; i<neighb_cells.size(); i++) {
--            if (neighb_cells[i] == this_cell)
--              found=true;
--          }
--          if (!found)
--            neighb_cells.push_back(this_cell);
--        }
--      }
--      ++kernel_iter;
--    }
--  }
--
-- private:
--  tree_type * tree_in_;
--};
--
--#endif // bvpl_octree_neighbors_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
-deleted file mode 100644
-index c5067b597e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
-+++ /dev/null
-@@ -1,84 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator.h
--#ifndef bvpl_octree_vector_operator_h
--#define bvpl_octree_vector_operator_h
--//:
--// \file
--// \brief An abstract class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 17, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include "bvpl_octree_kernel_operator.h"
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/functors/bvpl_local_max_functor.h>
--#include <boct/boct_tree.h>
--
--
--//: A class with a template operation (as in template method pattern) to apply a vector of bvpl_kernel on an octree
--//  The class also contains abstract methods to be specialized in the subclasses
--template <class T_data>
--class bvpl_octree_vector_operator
--{
-- public:
--
--  //: Applies a vector of kernels and functor to a grid. Returns a grid that combines the responses of the kernels as specified in the subclass
--  template <class F>
--  bool operate(boct_tree<short ,T_data>* tree_in,
--               F functor,
--               bvpl_kernel_vector_sptr kernel_vector,
--               boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
--               short level, double cell_length)
--  {
--    bvpl_local_max_functor<T_data> func_max;
--    boct_tree<short ,T_data>* temp_tree = tree_in->clone();
--    bvpl_octree_kernel_operator<T_data> oper(tree_in);
--    for (unsigned int id = 0; id < kernel_vector->kernels_.size(); ++id)
--    {
--      temp_tree->init_cells(func_max.min_response());
--      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
--      oper.operate(functor, kernel, temp_tree,level, cell_length);
--      combine_kernel_responses(tree_out, temp_tree, id);
--    }
--
--    return true;
--  }
--
-- protected:
--  //: Abstract function to be implemented on children on how to combine current kernel response with output response
--
--  virtual void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
--                                        int id_curr)=0;
--
--  //: Compares response grids and stores in out, the maximum responses. This function gets called in subclasses when implementing combine_kernel_responses
--
--  void keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out, boct_tree<short ,T_data>* new_tree,
--                              int new_id);
--};
--
--
--//: Compares response grids and stores in grid1, the wining responses.
--template<class T_data>
--void bvpl_octree_vector_operator<T_data>::keep_max_response_tree(boct_tree<short ,bvpl_octree_sample<T_data> >* tree_out,
--                                                                 boct_tree<short ,T_data>* new_tree,
--                                                                 int new_id)
--{
--  bvpl_local_max_functor<T_data> func_max;
--
--  std::vector<boct_tree_cell<short,T_data>*> new_leaves = new_tree->leaf_cells();
--  std::vector<boct_tree_cell<short,bvpl_octree_sample<T_data> >*> leaves_out = tree_out->leaf_cells();
--
--  for (unsigned i=0; i< new_leaves.size(); i++)
--  {
--    T_data val1 = new_leaves[i]->data();
--    T_data val2 = leaves_out[i]->data().response_;
--    if (func_max.greater_than(val1, val2))
--      leaves_out[i]->set_data(bvpl_octree_sample<T_data>(new_leaves[i]->data(), new_id));
--  }
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
-deleted file mode 100644
-index e01a23ca65..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
-+++ /dev/null
-@@ -1,30 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h
--#ifndef bvpl_octree_vector_operator_impl_h
--#define bvpl_octree_vector_operator_impl_h
--//:
--// \file
--// \brief Subclasses that implement the abstract interface of bvpl_octree_vector_operator. They can be used to queue operations
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 30, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include "bvpl_octree_vector_operator.h"
--
--
--//: Class to apply a vector of kernels and functor to a grid, returning a grid containing at each voxel the max response
--template <class T_data>
--class bvpl_max_vector_operator: public bvpl_octree_vector_operator<T_data>
--{
-- public:
--  void combine_kernel_responses(boct_tree<short ,bvpl_octree_sample <T_data> >* tree_out, boct_tree<short ,T_data>* tree_curr,
--                                        int id_curr) override
--  {
--    this->keep_max_response_tree(tree_out, tree_curr, id_curr);
--  }
--};
--
--#endif // bvpl_octree_vector_operator_impl_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
-deleted file mode 100644
-index ec024dfe41..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
-+++ /dev/null
-@@ -1,84 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_octree_vrml_util.h
--#ifndef bvpl_octree_vrml_util_h
--#define bvpl_octree_vrml_util_h
--//:
--// \file
--// \brief VRML utilities for scenes with bvpl_octree samples
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  December 10,  2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
--
--#include <boxm/boxm_scene.h>
--#include <bvrml/bvrml_write.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class bvpl_octree_vrml_util
--{
-- public:
--   //: Writes direction of kernel and magnitude of the response as disks of different sizes
--  template<class T_data>
--  static void write_scene_as_disks(std::ofstream &vrml_os,
--                                   boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > >  *scene,
--                                   bvpl_kernel_vector_sptr kernel_vector);
--};
--
--template<class T_data>
--void bvpl_octree_vrml_util::write_scene_as_disks(std::ofstream &vrml_os,
--                                                 boxm_scene<boct_tree<short, bvpl_octree_sample<T_data> > > *scene,
--                                                 bvpl_kernel_vector_sptr kernel_vector)
--{
--  typedef boct_tree<short, bvpl_octree_sample<T_data> > tree_type;
--  typedef boct_tree_cell<short, bvpl_octree_sample<T_data> > cell_type;
--
--  bvrml_write::write_vrml_header(vrml_os);
--
--  // iterate through the scene
--  boxm_block_iterator<tree_type > iter= scene->iterator();
--  iter.begin();
--
--  for (; !iter.end(); iter++)
--  {
--    scene->load_block(iter.index());
--    tree_type  *tree = (*iter)->get_tree();
--
--    // iterate through the tree
--    std::vector<cell_type*> cells = tree->leaf_cells();
--    unsigned lines = 0;
--    float max_response =bvpl_cell_to_float(cells[0]);
--    for (unsigned i = 0; i < cells.size(); i+=10)
--    {
--      int id = cells[i]->data().id_;
--      if (id < 0)
--        continue;
--      bvpl_kernel_sptr kernel = kernel_vector->kernels_[id];
--      float response = bvpl_cell_to_float(cells[i]);
--      if (response > max_response) {
--        max_response = response;
--      }
--      std::cout << "response " << response << std::endl;
--      vgl_vector_3d<double> dir((kernel->axis())[0],(kernel->axis())[1],(kernel->axis())[2]);
--      vgl_point_3d<double> coord = tree->global_origin(cells[i]);
--      if (response > 3.5f) {
--        bvrml_write::write_vrml_line(vrml_os, coord, dir, .1f*response, 1, 0, 0);
--        lines++;
--      }
--#ifdef DEBUG
--      bvrml_write::write_vrml_disk(vrml_os, coord, dir, 2*response-.5f, 0, .5f, 0);
--#endif
--    }
--    std::cout << "max response " << max_response << std::endl
--             << "number of lines: " << lines << std::endl;
--  }
--}
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
-deleted file mode 100644
-index 1d72f41d58..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 18-Feb-2011
--
--#include <iostream>
--#include <sstream>
--#include "bvpl_pca_error_scenes.h"
--
--#include <boxm/boxm_scene.h>
--
--#include <vul/vul_file.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--bvpl_pca_error_scenes::bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& pca_path, unsigned dim)
--{
--  typedef boct_tree<short,float> tree_type;
--  for (unsigned i =0; i<dim+1; i++)
--    scenes_.push_back(new boxm_scene_base());
--
--  auto* data_scene= dynamic_cast<boxm_scene<tree_type>* > (data_scene_base.as_pointer());
--  if (!data_scene)
--    std::cerr << "In bvpl_pca_error_scenes: Null Scene\n";
--
--  for (unsigned i = 0; i<dim+1; i++)
--  {
--    //path to error scenes
--    std::stringstream error_path_ss;
--    error_path_ss << pca_path << "/error_" << i;
--    std::string error_path = error_path_ss.str();
--    if (!vul_file::is_directory(error_path))
--      vul_file::make_directory(error_path);
--
--    boxm_scene<tree_type> *error_scene =
--    new boxm_scene<tree_type>(data_scene->lvcs(), data_scene->origin(), data_scene->block_dim(), data_scene->world_dim(), data_scene->max_level(), data_scene->init_level());
--    error_scene->set_appearance_model(BOXM_FLOAT);
--
--    std::string scene_name = "error_scene";
--    error_scene->set_paths(error_path, scene_name);
--
--    if (!vul_file::exists(error_path + "/" + scene_name +  ".xml"))
--      error_scene->write_scene("/" +scene_name +  ".xml");
--
--    //data_scene->clone_blocks(*error_scene, -1.0);
--
--    scenes_[i] = error_scene;
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
-deleted file mode 100644
-index a50c851c2f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_pca_error_scenes.h
-+++ /dev/null
-@@ -1,39 +0,0 @@
--// This is bvpl_pca_error_scenes.h
--#ifndef bvpl_pca_error_scenes_h
--#define bvpl_pca_error_scenes_h
--
--//:
--// \file
--// \brief A class to hold the smartpointers to pca error scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <boxm/boxm_scene_base.h>
--#include <vsl/vsl_binary_io.h>
--
--// Forward declarations
--class bvpl_pca_error_scenes;
--
--typedef vbl_smart_ptr<bvpl_pca_error_scenes> bvpl_pca_error_scenes_sptr;
--
--//: A class to hold the smartpointers to response scenes and their corresponding names
--class bvpl_pca_error_scenes : public vbl_ref_count
--{
--public:
--
--  bvpl_pca_error_scenes(const boxm_scene_base_sptr& data_scene_base, const std::string& taylor_path, unsigned dim);
--
--  //: Return the error scene associated with a number of components used for reconstruction
--  boxm_scene_base_sptr get_scene(unsigned ncomponent) {return scenes_[ncomponent];}
--
--private:
--  std::vector<boxm_scene_base_sptr> scenes_;
--
--};
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
-deleted file mode 100644
-index 2217b22966..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
-+++ /dev/null
-@@ -1,213 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_kernel_operator.h
--#ifndef bvpl_scene_kernel_operator_h
--#define bvpl_scene_kernel_operator_h
--//:
--// \file
--// \brief A class that operates a bvpl_kernel on a boxm_scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 18, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <boxm/boxm_scene.h>
--#include "bvpl_octree_kernel_operator.h"
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class bvpl_scene_kernel_operator
--{
-- public:
--  //: "Convolves" kernel with an input octree, storing the output in an output octree.
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data, class F>
--  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--               F functor,
--               bvpl_kernel_sptr kernel,
--               boxm_scene<boct_tree<short, T_data > > &scene_out);
--
--  //: Performs in-situ non-maxima suppression over the area occupied by the kernel
--  template<class T_data, class F>
--  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                    F functor,
--                                    bvpl_kernel_sptr kernel);
--
--#if 0 //Depracated
--  // "Convolves" kernel with an input octree, storing the output in an output octree.
--  template<class T_data, class F>
--  void operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--               F functor,
--               bvpl_kernel_sptr kernel,
--               boxm_scene<boct_tree<short, T_data > > &scene_out,
--               short level)
--  {
--    typedef boct_tree<short, T_data > tree_type;
--    boxm_block_iterator<tree_type> iter_in = scene_in.iterator();
--    boxm_block_iterator<tree_type> iter_out = scene_out.iterator();
--    iter_in.begin();
--    iter_out.begin();
--    for (; !iter_in.end(); iter_in++, iter_out++) {
--      //Isa: change to load block and neighbors
--      scene_in.load_block(iter_in.index());
--      scene_out.load_block(iter_out.index());
--      tree_type *tree_in= (*iter_in)->get_tree();
--      tree_type *tree_out = tree_in->clone();
--
--      // output tree has the same shape but is initialized to have response zero
--      T_data zero_val = T_data();
--      std::cout << "Response tree is initialized to: " << zero_val << std::endl;
--      tree_out->init_cells(zero_val);
--
--      bvpl_octree_kernel_operator<T_data> oper(tree_in);
--      double cell_length = 1.0/(double)(1<<(tree_in->root_level() -level));
--      oper.operate(functor, kernel, tree_out, level, cell_length);
--      (*iter_out)->init_tree(tree_out);
--      scene_out.write_active_block();
--    }
--  }
--#endif
--};
--
--//: Operates a kernel on a scene by : (1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data, class F>
--void bvpl_scene_kernel_operator::operate(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_sptr kernel,
--                                         boxm_scene<boct_tree<short, T_data > > &scene_out)
--{
--  double cell_length = kernel->voxel_length();
--  short finest_level = scene_in.finest_level();
--  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
--
--  scene_in.clone_blocks(scene_out, T_data());
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
--  iterator.begin();
--
--  boxm_cell_iterator<boct_tree<short, T_data > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block);
--  out_iter.begin();
--
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  while ( !(iterator.end() || out_iter.end()) )
--  {
--    boct_tree_cell<short,T_data> *center_cell = *iterator;
--    boct_tree_cell<short,T_data> *out_center_cell = *out_iter;
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))){
--      std::cerr << " Input and output cells don't have the same structure\n";
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    //we are only interested in finest resolution
--    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()){
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    vgl_point_3d<double> center_cell_origin = iterator.global_origin();
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> kernel_cell_origin(center_cell_origin.x() + (double)kernel_idx.x()*cell_length + 1.0e-7,
--                                              center_cell_origin.y() + (double)kernel_idx.y()*cell_length + 1.0e-7,
--                                              center_cell_origin.z() + (double)kernel_idx.z()*cell_length + 1.0e-7);
--
--      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_origin);
--
--      if (this_cell) {
--        bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val, d);
--      }
--      else {
--        break;
--      }
--
--      ++kernel_iter;
--    }
--
--    out_center_cell->set_data(functor.result());
--    ++iterator;
--    ++out_iter;
--  }
--}
--
--//: Applies non-maxima suppression on the region occupied by the kernel. The output is stored in situ.
--//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data, class F>
--void bvpl_scene_kernel_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                                              F functor,
--                                                              bvpl_kernel_sptr kernel)
--{
--  short finest_level = scene_in.finest_level();
--  double cell_length = kernel->voxel_length();
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data > >::load_block_and_neighbors);
--  iterator.begin();
--
--  bvpl_kernel_iterator kernel_iter = kernel->iterator();
--
--  while ( !(iterator.end()) )
--  {
--    boct_tree_cell<short,T_data> *center_cell = *iterator;
--
--    //we are only interested in finest resolution
--    if (!center_cell->level() == finest_level || !center_cell->is_leaf()){
--      ++iterator;
--      continue;
--    }
--    T_data this_data = center_cell->data();
--
--    //vgl_point_3d<double> center_cell_origin = iterator.global_origin();
--    vgl_point_3d<double> center_cell_center = this_data.location();
--    if (!functor.init(this_data)){
--      ++iterator;
--      continue;
--    }
--
--    kernel_iter.begin(); // reset the kernel iterator
--    while (!kernel_iter.isDone())
--    {
--      vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--      vgl_point_3d<double> kernel_cell_center(center_cell_center.x() + (double)kernel_idx.x()*cell_length,
--                                              center_cell_center.y() + (double)kernel_idx.y()*cell_length,
--                                              center_cell_center.z() + (double)kernel_idx.z()*cell_length);
--
--      boct_tree_cell<short,T_data> *this_cell = scene_in.locate_point_in_memory(kernel_cell_center);
--
--      if (this_cell) {
--        //bvpl_kernel_dispatch d = *kernel_iter;
--        T_data val = this_cell->data();
--        functor.apply(val);
--      }
--      else {
--        break;
--      }
--
--      ++kernel_iter;
--    }
--
--    center_cell->set_data(functor.result());
--    ++iterator;
--  }
--}
--
--#endif // bvpl_scene_kernel_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
-deleted file mode 100644
-index c6fabe14e2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include "bvpl_scene_neighborhood_operator.h"
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
-deleted file mode 100644
-index 5f8e43f92f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h
--#ifndef bvpl_scene_neighborhood_operator_h
--#define bvpl_scene_neighborhood_operator_h
--//:
--// \file
--// \brief A class to perform neighborhood operations on a boxm_scene.
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  13-Aug-2010.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <boxm/boxm_scene.h>
--
--#include <vgl/vgl_box_3d.h>
--
--//: A class to perform neighborhood operations on a bvxm_scene.
--// This class operates on all leaf cells within a region
--class bvpl_scene_neighborhood_operator
--{
-- public:
--  bvpl_scene_neighborhood_operator()= default;
--
--  //: Applies the region-based functor on every leaf cell of the scene. The output is stored on a separate scene
--  template <class T_data_in, class T_data_out, class F>
--  void operate(boxm_scene<boct_tree<short, T_data_in > > *scene_in,
--               F functor,
--               vgl_box_3d<double> roi,
--               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
--
--  //: Applies the region-based functor on every leaf cell of the scene. The region is obtained from scen2.
--  //  The output is stored on a separate scene
--  template <class T_data_in1, class T_data_in2, class T_data_out, class F>
--  void operate(boxm_scene<boct_tree<short, T_data_in1 > > *scene_in1,
--               boxm_scene<boct_tree<short, T_data_in2 > > *scene_in2,
--               F functor,
--               vgl_box_3d<double> roi,
--               boxm_scene<boct_tree<short, T_data_out > > *scene_out);
--
--  //: Applies a non-maxima suppression functor on every leaf cell of the scene. The output is stored in situ
--  template <class T_data, class F>
--  void local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                    F functor,
--                                    vgl_box_3d<double> &roi);
--};
--
--
--//: Applies the region-based functor on every leaf cell of the scene. The output is stored in situ. The ROI must be in scene-coordinates
--//(1)Traverse input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template <class T_data, class F>
--void bvpl_scene_neighborhood_operator::local_non_maxima_suppression(boxm_scene<boct_tree<short, T_data > > &scene_in,
--                                                                    F functor,vgl_box_3d<double> &roi)
--{
--  short finest_level = scene_in.finest_level();
--
--  //(1) Traverse the scene
--  boxm_cell_iterator<boct_tree<short, T_data > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data> >::load_block_and_neighbors);
--
--  iterator.begin();
--
--  while (!iterator.end())
--  {
--    boct_tree_cell<short,T_data> *cell = *iterator;
--    if ((!(cell->level() == finest_level)) || !cell->is_leaf()){
--      ++iterator;
--      continue;
--    }
--    // the region is located with subvoxel accuracy so datastructure should contain subvoxel localization
--    roi.set_centroid((cell->data()).location());
--
--    T_data this_data= cell->data();
--    functor.init(this_data, roi);
--
--    // get all cells that intersect a region
--    std::vector<boct_tree_cell<short, T_data>* > cells_in_roi;
--
--    //Return all cells that intersec the region
--    scene_in.leaves_in_region(roi,cells_in_roi);
--
--    for (unsigned i = 0; i<cells_in_roi.size(); i++)
--    {
--      boct_tree_cell<short, T_data> *this_cell = cells_in_roi[i];
--      if (!this_cell)
--        continue;
--      T_data val = this_cell->data();
--      functor.apply(val);
--    }
--
--    cell->set_data(functor.result());
--    ++iterator;
--  }
--}
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
-deleted file mode 100644
-index 5f43040cc0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.cxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 22-Sep-2010
--
--#include "bvpl_scene_statistics.h"
--
--
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
--
--  scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
--  std::vector<float_cell_type*> leaves = tree->leaf_cells();
--
--  int tree_ncells = leaves.size();
--  //unsigned long tree_nsamples = (tree_ncells/scene_ncells)*(float)nsamples_;
--
--  double avg_val = 0.0;
--  vnl_random rng(9667566ul);
--  for (unsigned i=0; i<tree_nsamples; i++)
--  {
--    unsigned long sample = rng.lrand32(tree_ncells-1);
--
--    boct_tree_cell<short, float> *center_cell = leaves[sample];
--    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--    //if neighborhood is not inclusive we would have missing features
--    if ((double)center_cell->data()< -0.5) {
--      i--;
--      continue;
--    }
--    else {
--      avg_val+=(double)center_cell->data();
--    }
--  }
--
--  return avg_val/tree_nsamples;
--}
--
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  auto * scene = dynamic_cast<boxm_scene<float_tree_type>* > (scene_base.as_pointer());
--  if (!scene) {
--    std::cerr << "Error in bvpl_average_value: Error scene is of incorrect type\n";
--    return false;
--  }
--  scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* tree = scene->get_block(block_i, block_j, block_k)->get_tree();
--  std::vector<float_cell_type*> leaves = tree->leaf_cells();
--
--  double actual_samples = 0.0;
--  double avg_val = 0.0;
--  for (auto center_cell : leaves)
--  {
--    // vgl_point_3d<double> center_cell_centroid = tree->global_centroid(center_cell);
--
--    //if neighborhood is not inclusive we would have missing features
--    if ((double)center_cell->data()< -0.5) {
--      continue;
--    }
--    else {
--      avg_val+=(double)center_cell->data();
--      actual_samples = actual_samples +1.0;
--    }
--  }
--
--  std::cout << "Adding errors of : " << actual_samples << " samples" << std::endl;
--
--  return avg_val/actual_samples;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
-deleted file mode 100644
-index f14813bc74..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
-+++ /dev/null
-@@ -1,102 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_statistics.h
--#ifndef bvpl_scene_statistics_h
--#define bvpl_scene_statistics_h
--//:
--// \file
--// \brief A set of functions to provide statistics about response scenes
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  22-Sep-2010.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bsta/bsta_histogram.h>
--#include <boxm/boxm_scene.h>
--
--template <unsigned DIM>
--bool bvpl_compute_scene_statistics(boxm_scene< boct_tree<short, vnl_vector_fixed<float,DIM> > > *scene, bsta_histogram<float> &response_hist )
--{
--  typedef boct_tree<short, vnl_vector_fixed<float,DIM> > tree_type;
--
--  //(1) Traverse the leaves of the scene
--  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
--
--  iterator.begin();
--  float cell_count = 0;
--  float max = (*iterator)->data().magnitude();
--  float min = max;
--  float mag = max;
--  while (!iterator.end()) {
--    cell_count++;
--    mag = (*iterator)->data().magnitude();
--    if ( mag > max)  max = mag;
--    if ( mag < min)  min = mag;
--    ++iterator;
--  }
--
--  unsigned int nbins = (unsigned int)std::floor(std::sqrt(cell_count));
--  response_hist = bsta_histogram<float>(min, max, nbins);
--
--  iterator.begin();
--
--  while (!iterator.end()) {
--    response_hist.upcount(static_cast<float>((*iterator)->data().magnitude()), 1.0f);
--    ++iterator;
--  }
--
--  scene->unload_active_blocks();
--
--  return true;
--}
--
--
--template <class T_loc, class T_data>
--bool bvpl_compute_scene_statistics(boxm_scene<boct_tree<T_loc, T_data > >* scene, bsta_histogram<float>& response_hist, unsigned int nbins = 0 )
--                                   //, bsta_histogram<float>& level_hist, unsigned& n_leaves)
--{
--  typedef boct_tree<T_loc, T_data> tree_type;
--  typedef boct_tree_cell<T_loc,T_data> cell_type;
--
--  //(1) Traverse the leaves of the scene
--  boxm_cell_iterator<tree_type > iterator = scene->cell_iterator(&boxm_scene<tree_type>::load_block, true);
--
--  iterator.begin();
--  float cell_count = 0;
--  T_data max = (*iterator)->data();
--  T_data min = max;
--  T_data this_val = max;
--  while (!iterator.end()) {
--    cell_count++;
--    this_val = (*iterator)->data();
--    if ( this_val > max)  max = this_val;
--    if ( this_val < min)  min = this_val;
--    ++iterator;
--  }
--
--  if (nbins == 0)
--    nbins = (unsigned int)std::floor(std::sqrt(cell_count));
--  response_hist = bsta_histogram<float>(min, max, nbins);
--  scene->unload_active_blocks();
--  iterator.begin();
--  while (!iterator.end()) {
--    response_hist.upcount(static_cast<T_data>((*iterator)->data()), 1.0f);
--    ++iterator;
--  }
--
--  scene->unload_active_blocks();
--
--  return true;
--}
--
--//: Function that compute average value of a fraction of samples in the specified block.
--//  Datatype is assumed to be float, but if could be templated to expand to other types
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k, unsigned long tree_nsamples);
--
--//: Function that compute average value of all positive samples in the specified block.
--//  Datatype is assumed to be float, but if could be templated to expand to other types
--double bvpl_average_value(const boxm_scene_base_sptr& scene_base, int block_i, int block_j, int block_k);
--
--
--#endif // bvpl_scene_statistics_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
-deleted file mode 100644
-index 49e7066a5c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
-+++ /dev/null
-@@ -1,178 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_scene_vector_operator.h
--#ifndef bvpl_scene_vector_operator_h
--#define bvpl_scene_vector_operator_h
--//:
--// \file
--// \brief  A class that applies a vector of bvpl_kernels on a boxm_scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  November 30, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/functors/bvpl_local_max_functor.h>
--
--#include <boxm/boxm_scene.h>
--
--#include <vnl/vnl_vector_fixed.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--class bvpl_scene_vector_operator
--{
-- public:
--
--  //: "Convolves" a vector of kernel with an input octree, storing the output in an output octree.
--  //  The shape of the output is determined by a templated function
--  //  This function only iterate through leaf_cells at level 0;
--  template<class T_data_in, class T_data_out, class F >
--  void operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
--               F functor,
--               bvpl_kernel_vector_sptr kernel_vector,
--               boxm_scene<boct_tree<short, T_data_out > > &scene_out);
--
-- protected:
--
--  //:Function incharged of combining results
--  template<class T_data>
--  void combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out);
--
--  //:Function incharged of combining results
--  template<class T_data>
--  void combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out);
--};
--
--
--//: Operates a vector of kernels on a scene by : (1)Traversing input scene and for every leaf cell, (2) request a region around it, and (3) apply the functor
--template<class T_data_in, class T_data_out,class F >
--void bvpl_scene_vector_operator::operate(boxm_scene<boct_tree<short, T_data_in> > &scene_in,
--                                         F functor,
--                                         bvpl_kernel_vector_sptr kernel_vector,
--                                         boxm_scene<boct_tree<short, T_data_out > > &scene_out)
--{
--  short finest_level = scene_in.finest_level();
--  // CAUTION: kernel is run at finest resolution, but this may not always be desired
--  double cell_length = scene_in.finest_cell_length();
--
--  std::cout << "bvpl_scene_kernel_operator: Operating on cells at level: " << finest_level << " and length: " << cell_length << std::endl;
--
--  T_data_out zero;
--  scene_in.template clone_blocks_to_type<boct_tree<short, T_data_out > >(scene_out, zero);
--  std::cout << "The initial zero-value for all cells is : " << zero << std::endl;
--
--  //(1) Traverse the scene - is there an easy way to modify the cell iterator so to only use leaf cells at level 0;
--  boxm_cell_iterator<boct_tree<short, T_data_in > > iterator = scene_in.cell_iterator(&boxm_scene<boct_tree<short, T_data_in > >::load_block_and_neighbors);
--  iterator.begin();
--
--  boxm_cell_iterator<boct_tree<short, T_data_out > > out_iter = scene_out.cell_iterator(&boxm_scene<boct_tree<short, T_data_out > >::load_block);
--  out_iter.begin();
--
--  while ( !(iterator.end() || out_iter.end()) )
--  {
--    boct_tree_cell<short,T_data_in> *center_cell = *iterator;
--    boct_tree_cell<short,T_data_out> *out_center_cell = *out_iter;
--    boct_loc_code<short> out_code = out_center_cell->get_code();
--    boct_loc_code<short> in_code = center_cell->get_code();
--
--    //if level and location code of cells isn't the same then continue
--    if ((center_cell->level() != out_center_cell->level()) || !(in_code.isequal(&out_code))) {
--      std::cerr << " Input and output cells don't have the same structure " << std::endl;
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    //we are only interested in finest resolution
--    if ((!(center_cell->level() == finest_level)) || !center_cell->is_leaf()) {
--      ++iterator;
--      ++out_iter;
--      continue;
--    }
--
--    vgl_point_3d<double> center_cell_centroid = iterator.global_centroid();
--
--    //(2) Run vector of kernels
--
--    std::vector<T_data_in> responses;
--    for (auto kernel : kernel_vector->kernels_)
--    {
--      bvpl_kernel_iterator kernel_iter = kernel->iterator();
--      kernel_iter.begin(); // reset the kernel iterator
--      while (!kernel_iter.isDone())
--      {
--        vgl_point_3d<int> kernel_idx = kernel_iter.index();
--
--        vgl_point_3d<double> kernel_cell_centroid(center_cell_centroid.x() + (double)kernel_idx.x()*cell_length,
--                                                  center_cell_centroid.y() + (double)kernel_idx.y()*cell_length,
--                                                  center_cell_centroid.z() + (double)kernel_idx.z()*cell_length);
--
--        boct_tree_cell<short,T_data_in> *this_cell = scene_in.locate_point_in_memory(kernel_cell_centroid);
--
--        if (this_cell) {
--          bvpl_kernel_dispatch d = *kernel_iter;
--          T_data_in val = this_cell->data();
--          functor.apply(val, d);
--        }
--
--        ++kernel_iter;
--      }
--
--      responses.push_back(functor.result());
--    }
--
--    T_data_out data_out;
--    combine_kernel_responses(responses, data_out);
--    out_center_cell->set_data(data_out);
--    ++iterator;
--    ++out_iter;
--  }
--  return;
--}
--
--template <class T_data>
--void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, vnl_vector_fixed<T_data, 3> &response_out)
--{
--  if (responses.size() != 3) {
--    std::cerr << "Wrong number of responses" << std::endl;
--    return;
--  }
--
--  for (unsigned i = 0 ; i < 3; i++)
--  {
--    response_out[i] = responses[i];
--  }
--  return;
--}
--
--template <class T_data>
--void bvpl_scene_vector_operator::combine_kernel_responses(const std::vector<T_data>& responses, bvpl_octree_sample<T_data> &response_out)
--{
--  if (responses.size() != 3) {
--    std::cerr << "Wrong number of responses" << std::endl;
--    return;
--  }
--
--  bvpl_local_max_functor<T_data> func_max;
--
--  T_data max= responses[0];
--  int max_id =0;
--  for (unsigned i = 1 ; i < responses.size(); i++)
--  {
--    if (func_max.greater_than(max, responses[i])){
--      max = responses[i];
--      max_id = i;
--    }
--  }
--  response_out.response_=max;
--  response_out.id_ = max_id;
--  return;
--}
--
--#endif // bvpl_scene_vector_operator_h
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
-deleted file mode 100644
-index e8cac33615..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.cxx
-+++ /dev/null
-@@ -1,258 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 31-Jan-2011
--
--#include "bvpl_taylor_basis.h"
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--#include <boxm/boxm_scene.h>
--
--bool bvpl_taylor_basis::compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
--                                                    const boxm_scene_base_sptr& basis_scene_base,
--                                                    const boxm_scene_base_sptr& error_scene_base,
--                                                    const bvpl_taylor_basis_loader& loader,
--                                                    int block_i, int block_j, int block_k, double cell_length)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
--  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
--  //cast the scenes
--  auto* data_scene = dynamic_cast<boxm_scene<float_tree_type>* > (data_scene_base.as_pointer());
--  auto* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (basis_scene_base.as_pointer());
--  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  if (!(data_scene && basis_scene &&error_scene)){
--    std::cerr << "Error in compute_approximation_error: Faild to cast scene\n";
--    return false;
--  }
--
--  //load blocks of interest
--  data_scene->load_block_and_neighbors(block_i, block_j, block_k);
--  basis_scene->load_block(block_i, block_j, block_k);
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* data_tree = data_scene->get_block(block_i, block_j, block_k)->get_tree();
--  float_tree_type* error_tree = data_tree->clone();
--
--  //error is always positive, therefore cells with negative errors can be identified as uninitialized.
--  error_tree->init_cells(-1.0f);
--  taylor_tree_type* basis_tree = basis_scene->get_block(block_i, block_j, block_k)->get_tree();
--
--  std::vector<float_cell_type*> data_leaves = data_tree->leaf_cells();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--  std::vector<taylor_cell_type*> basis_leaves = basis_tree->leaf_cells();
--
--  vgl_point_3d<int> min_point =  loader.min_point();
--  vgl_point_3d<int> max_point =  loader.max_point();
--
--
--  for (unsigned i =0; i<data_leaves.size(); i++) {
--    //current cell is the center
--    float_cell_type* data_cell = data_leaves[i];
--    taylor_cell_type* basis_cell = basis_leaves[i];
--
--    boct_loc_code<short> data_code = data_cell->get_code();
--    boct_loc_code<short> basis_code = basis_cell->get_code();
--
--    //check cells are at the same location
--    if (! data_code.isequal(basis_code)){
--      std::cerr << "Error in compute_approximation_error: Cells don't have the same location in the tree\n"
--               << "Data Code: " << data_code << '\n'
--               << "Basis Code: " << basis_code << '\n';
--
--      return false;
--    }
--
--    //create a region around the center cell
--    vgl_point_3d<double> centroid = data_tree->global_centroid(data_cell);
--
--    //change the coordinates of enpoints to be in global coordinates abd text if they are contained in the scene
--    vgl_point_3d<double> min_point_global(centroid.x() + (double)min_point.x()*cell_length, centroid.y() + (double)min_point.y()*cell_length, centroid.z() + (double)min_point.z()*cell_length);
--    vgl_point_3d<double> max_point_global(centroid.x() + (double)max_point.x()*cell_length, centroid.y() + (double)max_point.y()*cell_length, centroid.z() + (double)max_point.z()*cell_length);
--    if (!(data_scene->locate_point_in_memory(min_point_global) && data_scene->locate_point_in_memory(max_point_global)))
--      continue;
--
--    //retrieve basis
--    double I0 = basis_cell->data().I0;
--    vnl_double_3 G= basis_cell->data().G;
--    vnl_double_3x3 H = basis_cell->data().H;
--    double error = 0.0;
--    for (int x = min_point.x(); x<= max_point.x(); x++) {
--      for (int y = min_point.y(); y<=max_point.y(); y++) {
--        for (int z = min_point.z(); z<=max_point.z(); z++) {
--          vgl_point_3d<double> point2visit(centroid.x()+(double)x*cell_length, centroid.y()+ (double)y*cell_length, centroid.z() + (double)z*cell_length);
--          boct_tree_cell<short,float> *this_cell = data_scene->locate_point_in_memory(point2visit);
--          if (this_cell) {
--            vnl_double_3 X((double)x,(double)y, (double)z);
--            double approx = I0 + dot_product(X,G) + 0.5* (dot_product(X,(H*X)));
--            error = error + (this_cell->data() - approx)*(this_cell->data() - approx);
--            //std::cout << "Taylor Error :\n" << "This centroid: " << this_centroid << ", box_centroid: " <<box_centroid <<std::endl;
--            //std::cout << "Taylor Error :\n" << "X: " << X << "\nI0: " << I0 <<"\nG: " << G << "\nH: " << H <<"\nApprox: " <<approx << "\nError: " << error << std::endl;
--          }
--        }
--      }
--    }
--
--    error_leaves[i]->set_data((float)error);
--  }
--
--  // write and release memory
--  error_scene->get_block(block_i, block_j, block_k)->set_tree(error_tree);
--  error_scene->write_active_block();
--  data_scene->unload_active_blocks();
--  basis_scene->unload_active_blocks();
--
--  return true;
--}
--
--
--double bvpl_taylor_basis::sum_errors(const boxm_scene_base_sptr& error_scene_base,
--                                     int block_i, int block_j, int block_k, unsigned long tree_nsamples)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  auto * error_scene = dynamic_cast<boxm_scene<float_tree_type>* > (error_scene_base.as_pointer());
--
--  error_scene->load_block(block_i, block_j, block_k);
--
--  //get the leaves
--  float_tree_type* error_tree = error_scene->get_block(block_i, block_j, block_k)->get_tree();
--  std::vector<float_cell_type*> error_leaves = error_tree->leaf_cells();
--
--  int tree_ncells = error_leaves.size();
--  //unsigned long tree_nsamples = (unsigned long)((float)tree_ncells/scene_ncells*nsamples_);
--
--  double error = 0.0;
--  vnl_random rng(9667566ul);
--  for (unsigned i=0; i<tree_nsamples; i++)
--  {
--    unsigned long sample = rng.lrand32(tree_ncells-1);
--
--    boct_tree_cell<short, float> *center_cell = error_leaves[sample];
--    // vgl_point_3d<double> center_cell_centroid = error_tree->global_centroid(center_cell);
--
--    //if neighborhood is not inclusive we would have missing features
--    if ((double)center_cell->data()< -0.5){
--      i--;
--      continue;
--    }
--    else {
--      error+=(double)center_cell->data();
--    }
--  }
--
--  return error/tree_nsamples;
--}
--
--//: Reads the values of basis responses and assembles them into matrices and vectors
--bool bvpl_taylor_basis::assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k)
--{
--  typedef boct_tree<short,float> float_tree_type;
--  typedef boct_tree<short, bvpl_taylor_basis2_sample > taylor_tree_type;
--  typedef boct_tree_cell<short,float> float_cell_type;
--  typedef boct_tree_cell<short, bvpl_taylor_basis2_sample > taylor_cell_type;
--
--  std::cerr << "Caution: Using hardcoded size for taylor reconstruction\n";
--
--  //load output scene
--  boxm_scene<taylor_tree_type>* basis_scene = dynamic_cast<boxm_scene<taylor_tree_type>* > (taylor_scenes->get_scene("basis").as_pointer());
--  if (!basis_scene)
--  {
--    std::cerr << "Error in reconstruct: Faild to cast output scene\n";
--    return false;
--  }
--
--  //retieve basis scenes
--  //zeroth derivative scene
--  boxm_scene<float_tree_type>* I0_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("I0").as_pointer());
--  boxm_scene<float_tree_type>* Ix_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ix").as_pointer());
--  boxm_scene<float_tree_type>* Iy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iy").as_pointer());
--  boxm_scene<float_tree_type>* Iz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iz").as_pointer());
--  boxm_scene<float_tree_type>* Ixx_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixx").as_pointer());
--  boxm_scene<float_tree_type>* Ixy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixy").as_pointer());
--  boxm_scene<float_tree_type>* Ixz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Ixz").as_pointer());
--  boxm_scene<float_tree_type>* Iyy_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyy").as_pointer());
--  boxm_scene<float_tree_type>* Iyz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Iyz").as_pointer());
--  boxm_scene<float_tree_type>* Izz_scene = dynamic_cast<boxm_scene<float_tree_type>* > (taylor_scenes->get_scene("Izz").as_pointer());
--
--
--  if (!(I0_scene && Ix_scene && Iy_scene && Iz_scene && Ixx_scene && Iyy_scene && Izz_scene && Ixy_scene && Ixz_scene && Iyz_scene))
--  {
--    std::cerr << "Error in assemble_basis: Faild to load taylor scenes\n";
--    return false;
--  }
--
--  //load the blocks
--  basis_scene->load_block(block_i, block_j,block_k);
--  I0_scene->load_block(block_i, block_j,block_k);
--  Ix_scene->load_block(block_i, block_j,block_k);
--  Iy_scene->load_block(block_i, block_j,block_k);
--  Iz_scene->load_block(block_i, block_j,block_k);
--  Ixx_scene->load_block(block_i, block_j,block_k);
--  Ixy_scene->load_block(block_i, block_j,block_k);
--  Ixz_scene->load_block(block_i, block_j,block_k);
--  Iyy_scene->load_block(block_i, block_j,block_k);
--  Iyz_scene->load_block(block_i, block_j,block_k);
--  Izz_scene->load_block(block_i, block_j,block_k);
--
--
--  float_tree_type *treeI0 = I0_scene->get_block(block_i, block_j, block_k)->get_tree();
--  taylor_tree_type *basis_tree = treeI0->clone_to_type<bvpl_taylor_basis2_sample>();
--  basis_tree->init_cells(bvpl_taylor_basis2_sample());
--  std::vector<taylor_cell_type*> leaves_basis = basis_tree->leaf_cells();
--  std::vector<float_cell_type* > leaves_I0 = treeI0->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ix = Ix_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iy = Iy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iz = Iz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ixx =Ixx_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ixy =Ixy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Ixz =Ixz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iyy =Iyy_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Iyz =Iyz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--  std::vector<float_cell_type* > leaves_Izz =Izz_scene->get_block(block_i, block_j, block_k)->get_tree()->leaf_cells();
--
--
--  //iterate gathering and assembling the data
--  for (unsigned i=0; i<leaves_basis.size(); i++)
--  {
--    auto I0 = (double)leaves_I0[i]->data();
--    vnl_double_3 G((double)leaves_Ix[i]->data(),(double)leaves_Iy[i]->data(),(double)leaves_Iz[i]->data());
--
--    vnl_double_3x3 H;
--    H.put(0,0,(double)leaves_Ixx[i]->data());
--    H.put(0,1,(double)leaves_Ixy[i]->data());
--    H.put(0,2,(double)leaves_Ixz[i]->data());
--    H.put(1,0,(double)leaves_Ixy[i]->data());
--    H.put(1,1,(double)leaves_Iyy[i]->data());
--    H.put(1,2,(double)leaves_Iyz[i]->data());
--    H.put(2,0,(double)leaves_Ixz[i]->data());
--    H.put(2,1,(double)leaves_Iyz[i]->data());
--    H.put(2,2,(double)leaves_Izz[i]->data());
--
--    bvpl_taylor_basis2_sample sample(I0, G, H);
--
--    leaves_basis[i]->set_data(sample);
--  }
--
--  //write basis block
--  basis_scene->get_block(block_i, block_j, block_k)->set_tree(basis_tree);
--  basis_scene->write_active_block();
--
--  //free up memory
--  basis_scene->unload_active_blocks();
--  I0_scene->unload_active_blocks();
--  Ix_scene->unload_active_blocks();
--  Iy_scene->unload_active_blocks();
--  Iz_scene->unload_active_blocks();
--  Ixx_scene->unload_active_blocks();
--  Ixy_scene->unload_active_blocks();
--  Ixz_scene->unload_active_blocks();
--  Iyy_scene->unload_active_blocks();
--  Iyz_scene->unload_active_blocks();
--  Izz_scene->unload_active_blocks();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
-deleted file mode 100644
-index 6d35064025..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
-+++ /dev/null
-@@ -1,50 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/bvpl_taylor_basis.h
--#ifndef bvpl_taylor_basis_h
--#define bvpl_taylor_basis_h
--
--//:
--// \file
--// \brief A class with utilities to apply taylor kernels to a scene
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  31-Jan-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include "bvpl_taylor_scenes_map.h"
--#include <boxm/boxm_scene_base.h>
--
--
--class bvpl_taylor_basis
--{
--
--public:
--  //  bvpl_taylor_basis(boxm_scene_base_sptr scene_base, bvpl_taylor_basis_loader loader, std::string path_out):
--  //  kernel_loader_(loader), scene_base_(scene_base), path_out_(path_out){}
--  //
--  static bool assemble_basis(const bvpl_taylor_scenes_map_sptr& taylor_scenes,int block_i, int block_j, int block_k);
--
--  //: Computes the square errors between the scene and the taylor approximation at every voxel
--  // This function operates on a block specified by an index
--  static bool compute_approximation_error(const boxm_scene_base_sptr& data_scene_base,
--                                          const boxm_scene_base_sptr& basis_scene_base,
--                                          const boxm_scene_base_sptr& error_scene_base,
--                                          const bvpl_taylor_basis_loader& loader,
--                                          int block_i, int block_j, int block_k, double cell_length);
--
--  //: Sums the square errors for a percenatge of random samples
--  static double sum_errors(const boxm_scene_base_sptr& error_scene_base,
--                           int block_i, int block_j, int block_k, unsigned long tree_nsamples);
--
--protected:
--
--  //
--  //  bvpl_taylor_basis_loader kernel_loader_;
--  //  boxm_scene_base_sptr scene_base_;
--  //  std::string path_out_;
--};
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
-deleted file mode 100644
-index 92128f59d6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_taylor_scenes_map.h"
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--
--#include <vul/vul_file.h>
--
--bvpl_taylor_scenes_map::bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader)
--{
--  loader_ = loader;
--  typedef boct_tree<short,float> tree_type;
--
--  std::vector<std::string> kernel_names;
--  loader.files(kernel_names);
--
--  //Load scenes one-by-one an insert them in the map
--  for (auto & kernel_name : kernel_names)
--  {
--    std::string scene_in_file = loader.path() + '/' + kernel_name + "/float_response_scene.xml";
--    boxm_scene_parser parser;
--    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--    scene_ptr->load_scene(scene_in_file, parser);
--
--    if (scene_ptr->appearence_model() != BOXM_FLOAT) {
--      std::cerr << " bvpl_taylor_scenes, scenes must be of type float\n";
--    }
--
--    auto* scene = new boxm_scene<tree_type>();
--    scene->load_scene(parser);
--    scene_ptr = scene;
--
--    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( kernel_name, scene_ptr));
--  }
--
--  // Create a scene to later save the taylor reconstruction (parameters of the  scene are the same as those of the input scene)
--  auto* scene_in = static_cast<boxm_scene<tree_type>* > (scenes_[kernel_names[0]].as_pointer());
--  {
--    boxm_scene<tree_type> *scene_out =
--    new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(loader.path(), "error");
--    scene_out->set_appearance_model(BOXM_FLOAT);
--    if (!vul_file::exists(loader.path() + "/error_scene.xml"))
--      scene_out->write_scene("error_scene.xml");
--    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "error", scene_out));
--  }
--
--  {
--    boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> > *scene_out =
--    new boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(loader.path(), "basis");
--    scene_out->set_appearance_model(BOXM_FLOAT);
--    if (!vul_file::exists(loader.path() + "/basis_scene.xml"))
--      scene_out->write_scene("basis_scene.xml");
--    this->scenes_.insert(std::pair<std::string, boxm_scene_base_sptr>( "basis", scene_out));
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
-deleted file mode 100644
-index 51f783da43..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/bvpl_taylor_scenes_map.h
-+++ /dev/null
-@@ -1,41 +0,0 @@
--// This is bvpl_taylor_scenes_map.h
--#ifndef bvpl_taylor_scenes_map_h
--#define bvpl_taylor_scenes_map_h
--
--//:
--// \file
--// \brief A class to hold the smartpointers to response scenes and their corresponding names
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <boxm/boxm_scene_base.h>
--#include <vsl/vsl_binary_io.h>
--
--// Forward declarations
--class bvpl_taylor_scenes_map;
--
--typedef vbl_smart_ptr<bvpl_taylor_scenes_map> bvpl_taylor_scenes_map_sptr;
--
--//: A class to hold the smartpointers to response scenes and their corresponding names
--class bvpl_taylor_scenes_map : public vbl_ref_count
--{
--public:
--
--  bvpl_taylor_scenes_map(bvpl_taylor_basis_loader loader);
--
--  boxm_scene_base_sptr get_scene(std::string basis) {return scenes_[basis];}
--
--  const bvpl_taylor_basis_loader& loader() {return loader_ ;}
--
--private:
--  std::map<std::string, boxm_scene_base_sptr> scenes_;
--  bvpl_taylor_basis_loader loader_;
--
--};
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
-deleted file mode 100644
-index e1264a0f5c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/CMakeLists.txt
-+++ /dev/null
-@@ -1,20 +0,0 @@
--# contrib/brl/bseg/bvpl/io/CMakeLists.txt
--
--set(bvpl_octree_io_sources
--    bvpl_io_taylor_scenes_map.h       bvpl_io_taylor_scenes_map.cxx
--    bvpl_io_pca_error_scenes.h        bvpl_io_pca_error_scenes.cxx
--    bvpl_io_discover_pca_kernels.h    bvpl_io_discover_pca_kernels.cxx
--    bvpl_io_global_pca.h              bvpl_io_global_pca.cxx
--    bvpl_io_global_taylor.h
--    bvpl_io_global_corners.h          bvpl_io_global_corners.cxx
--
--)
--
--aux_source_directory(Templates bvpl_octree_io_sources)
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_io LIBRARY_SOURCES ${bvpl_octree_io_sources})
--target_link_libraries(bvpl_octree_io bvpl_octree ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vsl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
-deleted file mode 100644
-index 45954e1337..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_discover_pca_kernels-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_discover_pca_kernels);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
-deleted file mode 100644
-index ed29b40a54..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_corners-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <bvpl_octree/io/bvpl_io_global_corners.h>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_corners);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
-deleted file mode 100644
-index fc4656672f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_pca+125--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <bvpl_octree/io/bvpl_io_global_pca.h>
--
--typedef bvpl_global_pca<125> bvpl_global_pca_125;
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_pca_125);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
-deleted file mode 100644
-index ff9d7dc465..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_global_taylor+double.10--.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--#include <bvpl_octree/io/bvpl_io_global_taylor.h>
--
--typedef bvpl_global_taylor<double, 10> bvpl_global_taylor_double_10;
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_global_taylor_double_10);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
-deleted file mode 100644
-index 427e3937d4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_pca_error_scenes-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_pca_error_scenes);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-deleted file mode 100644
-index 25a60ca12c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
-deleted file mode 100644
-index 05fe44152d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_discover_pca_kernels.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_discover_pca_kernels const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_discover_pca_kernels & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_discover_pca_kernels & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_discover_pca_kernels*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_discover_pca_kernels* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
-deleted file mode 100644
-index b52e2355b2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// This is bvpl_io_discover_pca_kernels.h
--#ifndef bvpl_io_discover_pca_kernels_h
--#define bvpl_io_discover_pca_kernels_h
--
--//:
--// \file
--// \brief Binary IO for bvpl_discover_pca_kernels. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_discover_pca_kernels const &);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_discover_pca_kernels &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_discover_pca_kernels &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_discover_pca_kernels* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_discover_pca_kernels* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_discover_pca_kernels* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
-deleted file mode 100644
-index ef10f3ad61..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include "bvpl_io_global_corners.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_corners const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_corners & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_corners & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_corners*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_corners* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
-deleted file mode 100644
-index ac64d773d4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_corners.h
--#ifndef bvpl_io_global_cornerss_h
--#define bvpl_io_global_cornerss_h
--//:
--// \file
--// \brief Binary IO for bvpl_global_corners_125. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--typedef bvpl_global_corners bvpl_global_corners;
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_global_corners const &);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_global_corners &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_global_corners &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_global_corners* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_global_corners* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_corners* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
-deleted file mode 100644
-index cac12cb25b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_global_pca.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_global_pca_125 const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_global_pca_125 & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_global_pca_125 & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_global_pca_125*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_global_pca_125* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
-deleted file mode 100644
-index 2858d03895..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_pca.h
--#ifndef bvpl_io_global_pca_h
--#define bvpl_io_global_pca_h
--//:
--// \file
--// \brief Binary IO for bvpl_global_pca_125. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--typedef bvpl_global_pca<125> bvpl_global_pca_125;
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_global_pca_125 const &);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_global_pca_125 &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_global_pca_125 &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_global_pca_125* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_global_pca_125* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_global_pca_125* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
-deleted file mode 100644
-index 8c57308415..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_global_taylor.h
-+++ /dev/null
-@@ -1,75 +0,0 @@
--// This is bvpl_io_global_taylor.h
--#ifndef bvpl_io_global_taylor_h
--#define bvpl_io_global_taylor_h
--
--//:
--// \file
--// \brief Binary IO for bvpl_global_taylor. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--
--//: Binary save parameters to stream.
--template <class T, unsigned N>
--void vsl_b_write(vsl_b_ostream & os, bvpl_global_taylor<T,N> const &)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--//: Binary load parameters from stream.
--template <class T, unsigned N>
--void vsl_b_read(vsl_b_istream & is, bvpl_global_taylor<T,N> &p)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--template <class T, unsigned N>
--void vsl_print_summary(std::ostream &os, const bvpl_global_taylor<T,N> &p)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--template <class T, unsigned N>
--void vsl_b_read(vsl_b_istream& is, bvpl_global_taylor<T,N>* p)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--template <class T, unsigned N>
--void vsl_b_write(vsl_b_ostream& os, const bvpl_global_taylor<T,N>* &mp)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--template <class T, unsigned N>
--void vsl_print_summary(std::ostream& os, const bvpl_global_taylor<T,N>* &p)
--{
--  if (p==0)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
-deleted file mode 100644
-index ff1de28596..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_pca_error_scenes.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_pca_error_scenes const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_pca_error_scenes & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_pca_error_scenes & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_pca_error_scenes*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_pca_error_scenes* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
-deleted file mode 100644
-index b0e98d6299..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// This is bvpl_io_pca_error_scenes.h
--#ifndef bvpl_io_pca_error_scenes_h
--#define bvpl_io_pca_error_scenes_h
--
--//:
--// \file
--// \brief Binary IO for bvpl_pca_error_scenes. Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_pca_error_scenes);
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_error_scenes &m);
--
--
--void vsl_print_summary(std::ostream &os, const bvpl_pca_error_scenes &m);
--
--
--void vsl_b_read(vsl_b_istream& is, bvpl_pca_error_scenes* m);
--
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_pca_error_scenes* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_pca_error_scenes* &m);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
-deleted file mode 100644
-index ba4155da13..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include "bvpl_io_taylor_scenes_map.h"
--
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & /*os*/, bvpl_taylor_scenes_map const & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & /*is*/, bvpl_taylor_scenes_map & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream & /*os*/, const bvpl_taylor_scenes_map & )
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_read(vsl_b_istream&  /*is*/,bvpl_taylor_scenes_map*  /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_b_write(vsl_b_ostream&  /*os*/, const bvpl_taylor_scenes_map* & /*p*/)
--{
--  std::cerr << "Error: Trying to save but binary io not implemented\n";
--  return;
--}
--
--void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &p)
--{
--  if (p==nullptr)
--    os << "NULL PTR";
--  else {
--    os << "T: ";
--    vsl_print_summary(os, *p);
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h b/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
-deleted file mode 100644
-index 3900318cd2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
-+++ /dev/null
-@@ -1,38 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h
--#ifndef bvpl_io_taylor_scenes_map_h
--#define bvpl_io_taylor_scenes_map_h
--//:
--// \file
--// \brief Binary IO for bvpl_taylor_scenes_map.
--//        Not implemented, only declared so it can be stored in the database
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  15-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--//: Binary save parameters to stream.
--void vsl_b_write(vsl_b_ostream & os, bvpl_kernel const &bvpl_taylor_scenes_map);
--
--//: Binary load parameters from stream.
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_scenes_map &m);
--
--void vsl_print_summary(std::ostream &os, const bvpl_taylor_scenes_map &m);
--
--void vsl_b_read(vsl_b_istream& is, bvpl_taylor_scenes_map* m);
--
--void vsl_b_write(vsl_b_ostream& os, const bvpl_taylor_scenes_map* &m);
--
--void vsl_print_summary(std::ostream& os, const bvpl_taylor_scenes_map* &m);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
-deleted file mode 100644
-index 8c8f573ab9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( bvpl_octree_io_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_io_test_include bvpl_octree_io)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
-deleted file mode 100644
-index 4ddefe5f48..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/io/tests/test_include.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_global_corners.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_global_pca.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_global_taylor.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_pca_error_scenes.h>
--#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-deleted file mode 100644
-index bbc90f7cea..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
-+++ /dev/null
-@@ -1,31 +0,0 @@
--# This is contrib/brl/bseg/bvpl/pro/CMakeLists.txt
--# bvxm's Process Library
--
--# bprb depends on expat and bvxm_pro depends on bprb primarily
--FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--if(EXPAT_FOUND)
--include_directories( ${BRL_INCLUDE_DIR}/bpro )
--include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
--
--set(bvpl_octree_pro_sources
--    bvpl_octree_processes.h
--    bvpl_octree_register.h    bvpl_octree_register.cxx
--   )
--
--aux_source_directory(Templates bvpl_octree_pro_sources)
--aux_source_directory(processes bvpl_octree_pro_sources)
--aux_source_directory(processes/pca bvpl_octree_pro_sources)
--aux_source_directory(processes/taylor bvpl_octree_pro_sources)
--aux_source_directory(processes/corners bvpl_octree_pro_sources)
--aux_source_directory(processes/steerable_filters bvpl_octree_pro_sources)
--
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_pro LIBRARY_SOURCES ${bvpl_octree_pro_sources})
--target_link_libraries(bvpl_octree_pro bvpl_octree_io bvpl_octree bvpl_kernels_io boxm boct boxm_algo_pro boxm_sample boxm_util bprb brdb ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
--
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-deleted file mode 100644
-index 5de38b0662..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+boxm_scene_base_sptr-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <brdb/brdb_value.hxx>
--#include <boxm/boxm_scene_base.h>
--#include <vbl/io/vbl_io_smart_ptr.h>
--BRDB_VALUE_INSTANTIATE(boxm_scene_base_sptr, "boxm_scene_base_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
-deleted file mode 100644
-index 9cf83eebc4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_discover_pca_kernels_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_discover_pca_kernels_sptr, "bvpl_discover_pca_kernels_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
-deleted file mode 100644
-index b2e7fa3fed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_corners_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_global_corners_sptr, "bvpl_global_corners_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
-deleted file mode 100644
-index f911ce4589..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_global_pca_125_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_global_pca_125_sptr, "bvpl_global_pca_125_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
-deleted file mode 100644
-index 1a079ac413..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_pca_error_scenes_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_pca_error_scenes_sptr, "bvpl_pca_error_scenes_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-deleted file mode 100644
-index ee1188aea5..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
-deleted file mode 100644
-index 600668ef3f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/Templates/brdb_value_t+vbl_smart_ptr+bvpl_global_taylor+double.10---.cxx
-+++ /dev/null
-@@ -1,8 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--BRDB_VALUE_INSTANTIATE(bvpl_global_taylor_sptr, "bvpl_global_taylor_sptr");
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
-deleted file mode 100644
-index 89d5581af3..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_processes.h
-+++ /dev/null
-@@ -1,61 +0,0 @@
--#ifndef bvpl_octree_processes_h_
--#define bvpl_octree_processes_h_
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_macros.h>
--
--DECLARE_FUNC_CONS(bvpl_scene_vector_operator_process);
--DECLARE_FUNC_CONS(bvpl_scene_kernel_operator_process);
--DECLARE_FUNC_CONS(bvpl_block_kernel_operator_process);
--DECLARE_FUNC_CONS(bvpl_save_vrml_process);
--DECLARE_FUNC_CONS(bvpl_create_scene_process);
--DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
--DECLARE_FUNC_CONS(bvpl_nonmax_supp_process);
--DECLARE_FUNC_CONS(bvpl_compute_gauss_gradients);
--DECLARE_FUNC_CONS(bvpl_scene_histogram_process);
--DECLARE_FUNC_CONS(bvpl_block_avg_value_process);
--DECLARE_FUNC_CONS(bvpl_grad_scene_to_bin_process);
--
--
--//PCA related
--DECLARE_FUNC_CONS(bvpl_discover_pca_features_process);
--DECLARE_FUNC_CONS(bvpl_compute_pca_test_error_process);
--DECLARE_FUNC_CONS(bvpl_compute_pca_error_scene_process);
--DECLARE_FUNC_CONS(bvpl_compute_pca_error_block_process);
--DECLARE_FUNC_CONS(bvpl_load_pca_error_scenes_process);
--DECLARE_FUNC_CONS(bvpl_add_pca_errors_process);
--DECLARE_FUNC_CONS(bvpl_load_pca_info_process);
--DECLARE_FUNC_CONS(bvpl_pca_project_process);
--DECLARE_FUNC_CONS(bvpl_normalize_pca_training_error_process);
--DECLARE_FUNC_CONS(bvpl_pca_global_statistics_process);
--DECLARE_FUNC_CONS(bvpl_combine_pairwise_statistics_process);
--DECLARE_FUNC_CONS(bvpl_global_pca_process);
--DECLARE_FUNC_CONS(bvpl_init_global_pca_process);
--DECLARE_FUNC_CONS(bvpl_load_global_pca_125_process);
--DECLARE_FUNC_CONS(bvpl_pca_global_proj_error_process);
--DECLARE_FUNC_CONS(bvpl_pca_global_add_error_process);
--
--//Taylor related
--DECLARE_FUNC_CONS(bvpl_load_taylor_scenes_process);
--DECLARE_FUNC_CONS(bvpl_compute_taylor_error_process);
--DECLARE_FUNC_CONS(bvpl_add_taylor_errors_process);
--DECLARE_FUNC_CONS(bvpl_init_global_taylor_process);
--DECLARE_FUNC_CONS(bvpl_compute_taylor_coefficients_process);
--DECLARE_FUNC_CONS(bvpl_explore_coefficient_scene_process);
--DECLARE_FUNC_CONS(bvpl_load_global_taylor_process);
--DECLARE_FUNC_CONS(bvpl_taylor_global_proj_error_process);
--DECLARE_FUNC_CONS(bvpl_taylor_global_add_error_process);
--
--//Corner related
--DECLARE_FUNC_CONS(bvpl_compute_harris_measure_process);
--DECLARE_FUNC_CONS(bvpl_load_global_corners_process);
--DECLARE_FUNC_CONS(bvpl_corner_statistics_process);
--DECLARE_FUNC_CONS(bvpl_threshold_corners_process);
--DECLARE_FUNC_CONS(bvpl_compute_beaudet_measure_process);
--
--//Steerable filters
--DECLARE_FUNC_CONS(bvpl_init_sf_response_scene_process);
--DECLARE_FUNC_CONS(bvpl_compute_sf_raw_response_process);
--
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
-deleted file mode 100644
-index 189cb04ae3..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.cxx
-+++ /dev/null
-@@ -1,81 +0,0 @@
--#include "bvpl_octree_register.h"
--
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_func_process.h>
--
--#include "bvpl_octree_processes.h"
--#include <bvpl_octree/bvpl_taylor_scenes_map.h>
--#include <bvpl_octree/bvpl_pca_error_scenes.h>
--#include <bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl_octree/bvpl_global_pca.h>
--#include <bvpl_octree/bvpl_global_taylor.h>
--#include <bvpl_octree/bvpl_global_corners.h>
--
--void bvpl_octree_register::register_datatype()
--{
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  REGISTER_DATATYPE(bvpl_taylor_scenes_map_sptr);
--  REGISTER_DATATYPE(bvpl_pca_error_scenes_sptr);
--  REGISTER_DATATYPE(bvpl_discover_pca_kernels_sptr);
--  REGISTER_DATATYPE(bvpl_global_pca_125_sptr);
--  REGISTER_DATATYPE(bvpl_global_taylor_sptr);
--  REGISTER_DATATYPE(bvpl_global_corners_sptr);
--
--}
--
--void bvpl_octree_register::register_process()
--{
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_vector_operator_process, "bvplSceneVectorOperatorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_kernel_operator_process, "bvplSceneKernelOperatorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_kernel_operator_process, "bvplBlockKernelOperatorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_save_vrml_process, "bvplSaveVrmlProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_scene_process, "bvplCreateSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_nonmax_supp_process, "bvplNonmaxSuppProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_gauss_gradients, "bvplComputeGaussGradients");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_test_error_process, "bvplComputeTestErrorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_scene_histogram_process, "bvplSceneHistorgramProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_grad_scene_to_bin_process, "bvplGradSceneToBinProcess");
--
--  //PCA related
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_discover_pca_features_process, "bvplDiscoverPCAFeaturesProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_scene_process, "bvplComputePCAErrorSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_pca_error_block_process, "bvplComputePCAErrorBlockProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_error_scenes_process, "bvplLoadPCAErrorSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_block_avg_value_process, "bvplBlockAvgValueProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_pca_errors_process, "bvplAddPCAErrorsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_pca_info_process, "bvplLoadPCAInfoProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_project_process, "bvplPCAProjectProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_normalize_pca_training_error_process, "bvplNormalizePCATrainingErrorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_pca_global_statistics_process, "bvplPCAGlobalStatisticsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_combine_pairwise_statistics_process, "bvplCombinePairwiseStatisticsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_global_pca_process, "bvplGlobalPCAProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_pca_process, "bvplInitGlobalPCAProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_pca_125_process, "bvplLoadGlobalPCA125Process");
--  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_proj_error_process);
--  REG_PROCESS_FUNC_CONS2(bvpl_pca_global_add_error_process);
--
--  //Taylor related
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_scenes_process, "bvplLoadTaylorScenesProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_error_process, "bvplComputeTaylorErrorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_add_taylor_errors_process, "bvplAddTaylorErrorsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_global_taylor_process, "bvplInitGlobalTaylorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_taylor_coefficients_process, "bvplComputeTaylorCoefficients");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_explore_coefficient_scene_process, "bvplExploreCoefficientSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_taylor_process, "bvplLoadGlobalTaylorProcess");
--  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_proj_error_process);
--  REG_PROCESS_FUNC_CONS2(bvpl_taylor_global_add_error_process);
--
--  //Corner related
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_threshold_corners_process, "bvplThresholdCornersProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_harris_measure_process, "bvplComputeHarrisMeasureProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_global_corners_process, "bvplLoadGlobalCornersProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_corner_statistics_process, "bvplCornerStatisticsProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_beaudet_measure_process, "bvplComputeBeaudetMeasureProcess");
--
--  //Steerable filters
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_init_sf_response_scene_process, "bvplInitSFResponseSceneProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_compute_sf_raw_response_process, "bvplComputeSFRawResponseProcess");
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h b/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
-deleted file mode 100644
-index a72acdd9a2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/bvpl_octree_register.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef bvpl_octree_register_h_
--#define bvpl_octree_register_h_
--
--class bvpl_octree_register
--{
-- public:
--  static void register_datatype();
--  static void register_process();
--};
--
--#endif // bvpl_octree_register_h_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
-deleted file mode 100644
-index 5a37180f2d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_avg_value_process.cxx
-+++ /dev/null
-@@ -1,81 +0,0 @@
--//:
--// \file
--// \brief A process to add taylor error at a percentage of voxels in a block
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_block_avg_value_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_block_avg_value_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_block_avg_value_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_block_avg_value_process(bprb_func_process& pro)
--{
--  using namespace bvpl_block_avg_value_process_globals;
--
--  //get inputs
--  unsigned i =0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto fraction_nsamples = pro.get_input<double>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!scene_base){
--    std::cerr << "Error in bvpl_block_avg_value_process: Null error scene\n";
--    return false;
--  }
--  auto* scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (scene_base.as_pointer());
--  if (!scene){
--    std::cerr << "Error in bvpl_block_avg_value_process: Error scene is of incorrect type\n";
--    return false;
--  }
--  //sum errors within block
--  auto scene_ncells = (double)scene->size();
--  scene->load_block(block_i,block_j,block_k);
--  auto tree_ncells = (double)scene->get_block(block_i,block_j,block_k)->get_tree()->size();
--  double nsamples = scene_ncells * fraction_nsamples;
--
--  //number of samples - 10% of total number of leaf-cells
--  auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
--  std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
--           << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
--  double avg_value = bvpl_average_value(scene,block_i, block_j, block_k, tree_nsamples);
--
--  //store output
--  pro.set_output_val<double>(0, avg_value);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
-deleted file mode 100644
-index 0602d6d2ed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_block_kernel_operator_process.cxx
-+++ /dev/null
-@@ -1,208 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 1-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
--#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
--#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--
--#include <boxm/boxm_scene.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--
--#include <vul/vul_file.h>
--
--namespace bvpl_block_kernel_operator_process_globals
--{
--  constexpr unsigned n_inputs_ = 8;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: process takes 6 inputs and has 1 output.
--// * input[0]: The boxm_scene
--// * input[1]: The kernels; bvpl_kernel_vector_sptr
--// * input[2,3,4]: block index (i,j,k);
--// * input[5]: String identifying functor type
--// * input[6]: Output path to a dir where to store response blocks
--
--
--bool bvpl_block_kernel_operator_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_block_kernel_operator_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i=0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "bvpl_kernel_sptr";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "vcl_string";
--  input_types_[i++] = "vcl_string";
--  input_types_[i++] = "double";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_block_kernel_operator_process(bprb_func_process& pro)
--{
--  using namespace bvpl_block_kernel_operator_process_globals;
--
--  if (pro.n_inputs() < n_inputs_)
--  {
--    std::cerr << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << '\n';
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  std::string functor_name = pro.get_input<std::string>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--  auto cell_length = pro.get_input<double>(i++);
--  //short level = 0;
--
--  //print inputs
--  std::cout << "In bvpl_block_kernel_operator:\n"
--           << "Index(i,j,k) : (" << block_i << ',' << block_j << ',' << block_k << ")\n"
--           << "Functor Name: " << functor_name << '\n'
--           << "Output path: " << output_path  << '\n'
--           << "Cell length" << cell_length << std::endl;
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cerr <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if (!kernel) {
--    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
--    return false;
--  }
--
--
--  switch (scene_base->appearence_model())
--  {
--    case BSTA_GAUSS_F1:
--    {
--      typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--      typedef boct_tree<short, gauss_type > tree_type;
--      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--
--      //parameters of the output scene are the same as those of the input scene
--      boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      scene_out->set_paths(output_path, "gauss_response_scene");
--      scene_out->set_appearance_model(BSTA_GAUSS_F1);
--      if (!vul_file::exists(output_path + "/gauss_response_scene.xml"))
--        scene_out->write_scene("/gauss_response_scene.xml");
--
--      //parameters of the output scene are the same as those of the input scene
--      boxm_scene<boct_tree<short,bool> > *valid_scene =
--      new boxm_scene<boct_tree<short,bool > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      valid_scene->set_paths(output_path, "valid_scene");
--      valid_scene->set_appearance_model(BOXM_BOOL);
--      if (!vul_file::exists(output_path + "/valid_scene.xml"))
--        valid_scene->write_scene("/valid_scene.xml");
--
--      if (functor_name == "gauss_convolution") {
--        bvpl_gauss_convolution_functor functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--
--        return true;
--      }
--      else if (functor_name == "positive_gauss_convolution") {
--        bvpl_positive_gauss_conv_functor functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--
--        return true;
--      }
--      else
--        return false;
--
--      break;
--    }
--    case BOXM_FLOAT:
--    {
--      typedef boct_tree<short, float > tree_type;
--      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--      //parameters of the output scene are the same as those of the input scene
--      boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      scene_out->set_paths(output_path, "response_scene");
--      scene_out->set_appearance_model(BOXM_FLOAT);
--      if (!vul_file::exists(output_path + "/float_response_scene.xml"))
--        scene_out->write_scene("/float_response_scene.xml");
--
--      boxm_scene<boct_tree<short,bool> > *valid_scene =
--      new boxm_scene<boct_tree<short,bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--      valid_scene->set_paths(output_path, "valid_scene");
--      valid_scene->set_appearance_model(BOXM_BOOL);
--      if (!vul_file::exists(output_path + "/valid_scene.xml"))
--        valid_scene->write_scene("/valid_scene.xml");
--
--      if (functor_name == "edge_algebraic_mean")
--      {
--        bvpl_edge_algebraic_mean_functor<float> functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--        return true;
--      }
--      else if (functor_name == "algebraic")
--      {
--        bvpl_algebraic_functor functor;
--        bvpl_block_kernel_operator block_oper;
--        //operate on scene
--        block_oper.operate(*scene_in, functor, kernel, block_i, block_j, block_k, *scene_out, *valid_scene, cell_length);
--
--        //clean memory
--        scene_in->unload_active_blocks();
--        scene_out->unload_active_blocks();
--        return true;
--      }
--      else
--        return false;
--
--      break;
--    }
--    default:
--      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
--      return false;
--  }
--  return false;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
-deleted file mode 100644
-index 126deb3ac8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_compute_gauss_gradients.cxx
-+++ /dev/null
-@@ -1,86 +0,0 @@
--//:
--// \file
--// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
--// \author Isabel Restrepo
--// \date 13-Oct-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--#include <boxm/boxm_scene.h>
--
--//: global variables
--namespace bvpl_compute_gauss_gradients_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_compute_gauss_gradients_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_gauss_gradients_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";  //input scene
--  input_types_[1] = "vcl_string";            //output path
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";  //output scene
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_compute_gauss_gradients(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_gauss_gradients_globals;
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  //Create the factory and get the vector of kernels
--  bvpl_gauss3d_x_kernel_factory factory(1.0f,1.0f,1.0f);
--  bvpl_create_directions_xyz dir;
--  bvpl_kernel_vector_sptr kernels = factory.create_kernel_vector(dir);
--
--  //get scene
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
--
--  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
--  {
--    boxm_scene<grad_tree_type> *scene_out =
--    new boxm_scene<grad_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "float_gradient_scene");
--    scene_out->set_appearance_model(VNL_FLOAT_3);
--    scene_out->write_scene("float_gradient_scene.xml");
--
--    bvpl_algebraic_functor functor;
--    bvpl_scene_vector_operator vector_oper;
--    vector_oper.operate(*scene_in, functor, kernels, *scene_out);
--    //store output
--    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--    scene_ptr = scene_out;
--    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--    bsta_histogram<float> magnitude_hist;
--    bvpl_compute_scene_statistics(scene_out, magnitude_hist);
--    std::cout << "Histogram:\n" << magnitude_hist << std::endl;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
-deleted file mode 100644
-index e175191e55..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
-+++ /dev/null
-@@ -1,88 +0,0 @@
--//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_create_scene_process.cxx
--#include <iostream>
--#include <string>
--#include <boxm/boxm_scene_base.h>
--//:
--// \file
--// \brief A process loading xml parameters of a boxm_scene of types specific to bvpl_octree
--//
--// \author Isabel Restrepo
--// \date Nov 15, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <boxm/boxm_scene.h>
--#include <boxm/boxm_scene_parser.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--//:global variables
--namespace bvpl_create_scene_process_globals
--{
--  //this process takes no inputs
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//:sets input and output types
--bool bvpl_create_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_create_scene_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--//:creates a scene from parameters
--bool bvpl_create_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_create_scene_process_globals;
--  std::string fname = pro.get_input<std::string>(0);
--
--  boxm_scene_parser parser;
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--  scene_ptr->load_scene(fname, parser);
--  if (scene_ptr->appearence_model() == BVPL_SAMPLE_FLOAT) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bvpl_octree_sample<float> > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else if (scene_ptr->appearence_model() == BVPL_SAMPLE_BSTA_GAUSS_F1) {
--    if (!scene_ptr->multi_bin())
--    {
--      typedef boct_tree<short,bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > tree_type;
--      auto* scene = new boxm_scene<tree_type>();
--      scene->load_scene(parser);
--      scene_ptr = scene;
--    }
--  }
--  else {
--    std::cerr << "bvpl_create_scene_process: undefined datatype\n";
--    return false;
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
-deleted file mode 100644
-index 39195ec048..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_grad_scene_to_bin_process.cxx
-+++ /dev/null
-@@ -1,136 +0,0 @@
--//:
--// \file
--// \brief A process to save a gradient scene to a flat binary file
--// \author Isabel Restrepo
--// \date 3-Aug-2011
--
--#include <iostream>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <vnl/vnl_vector_fixed.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--//:global variables
--namespace bvpl_grad_scene_to_bin_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_grad_scene_to_bin_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_grad_scene_to_bin_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "boxm_scene_base_sptr";  //alpha scene
--  input_types_[i++] = "boxm_scene_base_sptr";  //gradient scene
--  input_types_[i++] = "vcl_string";            //output binary file
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_grad_scene_to_bin_process(bprb_func_process& pro)
--{
--  using namespace bvpl_grad_scene_to_bin_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr alpha_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr grad_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string output_file = pro.get_input<std::string>(i++);
--
--  //get scene
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,3 > > grad_tree_type;
--
--  std::ofstream os(output_file.c_str(), std::ios::out);
--
--  if (auto *alpha_scene = dynamic_cast<boxm_scene< float_tree_type >* >(alpha_scene_base.as_pointer()))
--  {
--    if (auto *grad_scene = dynamic_cast<boxm_scene< grad_tree_type >* >(grad_scene_base.as_pointer()))
--    {
--      double cell_length = alpha_scene->finest_cell_length();
--      short finest_level = alpha_scene->finest_level();
--
--      bool read_only = true;
--
--      boxm_cell_iterator<float_tree_type > alpha_iter = alpha_scene->cell_iterator(&boxm_scene<float_tree_type >::load_block_and_neighbors, read_only);
--      alpha_iter.begin();
--
--      boxm_cell_iterator<grad_tree_type > grad_iter = grad_scene->cell_iterator(&boxm_scene<grad_tree_type >::load_block, read_only);
--      grad_iter.begin();
--
--      long unsigned n_grads = 0;
--
--      while ( !(alpha_iter.end() || grad_iter.end()) )
--      {
--        boct_tree_cell<short, float> *alpha_cell = *alpha_iter;
--        boct_tree_cell<short, vnl_vector_fixed< float,3 > > *grad_cell = *grad_iter;
--
--        boct_loc_code<short> grad_code = grad_cell->get_code();
--        boct_loc_code<short> alpha_code = alpha_cell->get_code();
--
--        //if level and location code of cells isn't the same then continue
--        if ((alpha_cell->level() != grad_cell->level()) || !(alpha_code.isequal(&grad_code))) {
--          std::cerr << " Input and output cells don't have the same structure\n";
--          ++alpha_iter;
--          ++grad_iter;
--          continue;
--        }
--
--        //we are only interested in finest resolution
--        if ((!(alpha_cell->level() == finest_level)) || !alpha_cell->is_leaf()) {
--          ++alpha_iter;
--          ++grad_iter;
--          continue;
--        }
--
--        vgl_point_3d<double> centroid = alpha_iter.global_centroid();
--        vnl_vector_fixed< float,3 > grad = grad_cell->data();
--        float p_x = 1.0f - (float)std::exp(- (alpha_cell->data() * cell_length ));
--#if 0
--        vsl_b_write(os, (float)centroid.x());
--        vsl_b_write(os, (float)centroid.y());
--        vsl_b_write(os, (float)centroid.z());
--        vsl_b_write(os, grad[0]);
--        vsl_b_write(os, grad[1]);
--        vsl_b_write(os, grad[2]);
--        vsl_b_write(os, p_x);
--#endif
--
--        os << (float)centroid.x() << ' '
--           << (float)centroid.y() << ' '
--           << (float)centroid.z() << ' '
--           << grad[0] << ' '
--           << grad[1] << ' '
--           << grad[2] << ' '
--           << p_x << '\n';
--
--        ++alpha_iter;
--        ++grad_iter;
--        n_grads++;
--      }
--
--      grad_scene->unload_active_blocks();
--      alpha_scene->unload_active_blocks();
--      os.close();
--      std::cout << "Wrote " << n_grads << " gradients\n";
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
-deleted file mode 100644
-index b53398692b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
-+++ /dev/null
-@@ -1,178 +0,0 @@
--//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_nonmax_supp_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for spreading the plane information of the cell to the neighbors
--// \author Gamze Tunali
--// \date   Mar 19, 2010
--//
--// \verbatim
--//  Modifications
--//
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_inf_line_sample.h>
--
--#include <bvpl/bvpl_neighb_operator.h>
--#include <bvpl/kernels/bvpl_kernel_iterator.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
--
--namespace bvpl_nonmax_supp_process_globals
--{
--  constexpr unsigned int n_inputs_ = 4;
--  constexpr unsigned int n_outputs_ = 1;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool bvpl_nonmax_supp_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_nonmax_supp_process_globals;
--
--  // process takes 4 inputs:
--  //input[0]: The scene
--  //input[1]: the scene path for the output scene
--  //input[2]: block prefix for the output scene
--  //input[3]: the filename for the new scene xml file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--
--  // process has 1 output:
--  // output[0]: the new scene with updated cell information
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool bvpl_nonmax_supp_process(bprb_func_process& pro)
--{
--  using namespace bvpl_nonmax_supp_process_globals;
--
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string scene_path = pro.get_input<std::string>(1);
--  std::string block_prefix = pro.get_input<std::string>(2);
--  std::string scene_filename = pro.get_input<std::string>(3);
--  boxm_scene_base_sptr output_scene_sptr;
--
--  // only applies to the edge_line type of scenes
--  if (scene_base->appearence_model() == BOXM_EDGE_LINE) {
--    typedef boct_tree<short,boxm_inf_line_sample<float> > tree_type;
--    typedef boct_tree_cell<short,boxm_inf_line_sample<float> > cell_type;
--    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--       return false;
--    }
--
--    auto *output_scene=new boxm_scene<tree_type>(*scene);
--    output_scene->set_paths(scene_path, block_prefix);
--    output_scene_sptr = output_scene;
--
--    // create a kernel for 3x3 neighborhood
--    bvpl_kernel_iterator k_iter;
--    vgl_point_3d<int> min_pt(-1,-1,-1);
--    vgl_point_3d<int> max_pt(1,1,1);
--    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
--      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
--        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
--          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
--        }
--      }
--    }
--    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
--
--    boxm_block_iterator<tree_type> iter(scene);
--    boxm_block_iterator<tree_type> output_iter(output_scene);
--    iter.begin();
--    output_iter.begin();
--
--    while (!iter.end())
--    {
--      scene->load_block(iter.index());
--      output_scene->load_block(iter.index());
--      boxm_block<tree_type>* block = *iter;
--      boxm_block<tree_type>* output_block = *output_iter;
--
--      tree_type* tree = block->get_tree();
--      std::vector<cell_type *> cells = tree->leaf_cells();
--
--      tree_type* output_tree=tree->clone();
--      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
--
--      bvpl_octree_neighbors<boxm_inf_line_sample<float> > oper(tree);
--      for (unsigned i=0; i<cells.size(); i++) {
--        cell_type *cell=cells[i];
--        cell_type *output_cell=output_cells[i];
--        std::vector<cell_type *> neighb_cells;
--        oper.neighbors(kernel, cells[i], neighb_cells);
--
--        float residual = cell->data().residual_;
--
--        bool min=true;
--        for (unsigned n=0; n<neighb_cells.size()&& min; n++) {
--          cell_type *neighbor = neighb_cells[n];
--          boct_loc_code<short> cell_code=cell->code_;
--          boct_loc_code<short> n_code = neighbor->code_;
--          bool itself = n_code.isequal(&cell_code);
--          // do not include itself in the list
--          if (!itself) {
--            float r = neighbor->data().residual_;
--            if ( r < residual)
--              min=false;
--          }
--
--          if (min) {
--            boxm_inf_line_sample<float> data = cell->data();
--            output_cell->set_data(data);
--          }
--        }
--      }
--      output_block->delete_tree();
--      output_block->set_tree(output_tree);
--      output_scene->write_active_block();
--      iter++;
--    }
--    output_scene->write_scene(scene_filename);
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
-deleted file mode 100644
-index 2c503cdbf2..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
-+++ /dev/null
-@@ -1,209 +0,0 @@
--//This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_plane_propagate_process.cxx
--#include <string>
--#include <iostream>
--#include <fstream>
--#include <set>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for spreading the plane information of the cell to the neighbors
--// \author Gamze Tunali
--// \date   Mar 19, 2010
--//
--// \verbatim
--//  Modifications
--//
--// \endverbatim
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--#include <brdb/brdb_value.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene_base.h>
--#include <boxm/boxm_scene.h>
--
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--
--#include <bvpl/bvpl_neighb_operator.h>
--#include <bvpl/kernels/bvpl_kernel_iterator.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
--
--struct ltstr
--{
--  bool operator()(const boxm_plane_obs<float> & p1, const boxm_plane_obs<float> & p2) const
--  {
--      if(p1.plane_.a()<p2.plane_.a())
--          return true;
--      else if(p1.plane_.a()>p2.plane_.a())
--          return false;
--      else
--      {
--          if(p1.plane_.b()<p2.plane_.b())
--              return true;
--          else if(p1.plane_.b()>p2.plane_.b())
--              return false;
--          else
--          {
--              if(p1.plane_.c()<p2.plane_.c())
--                  return true;
--              else if(p1.plane_.c()>p2.plane_.c())
--                  return false;
--              else
--              {
--                  if(p1.plane_.d()<p2.plane_.d())
--                      return true;
--                  else
--                      return false;
--              }
--          }
--      }
--  }
--};
--
--namespace bvpl_plane_propagate_process_globals
--{
--  constexpr unsigned int n_inputs_ = 4;
--  constexpr unsigned int n_outputs_ = 1;
--  //Define parameters here
--}
--
--
--//: set input and output types
--bool bvpl_plane_propagate_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_plane_propagate_process_globals;
--
--  // process takes 4 inputs:
--  //input[0]: The scene
--  //input[1]: the scene path for the output scene
--  //input[2]: block prefix for the output scene
--  //input[3]: the filename for the new scene xml file
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--
--  // process has 1 output:
--  // output[0]: the new scene with updated cell information
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  if (!pro.set_input_types(input_types_))
--    return false;
--
--  if (!pro.set_output_types(output_types_))
--    return false;
--
--  return true;
--}
--
--//: Execute the process
--bool bvpl_plane_propagate_process(bprb_func_process& pro)
--{
--  using namespace bvpl_plane_propagate_process_globals;
--
--
--  // check number of inputs
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << "The number of inputs should be " << n_inputs_ << std::endl;
--    return false;
--  }
--
--  // get the inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string scene_path = pro.get_input<std::string>(1);
--  std::string block_prefix = pro.get_input<std::string>(2);
--  std::string scene_filename = pro.get_input<std::string>(3);
--  boxm_scene_base_sptr output_scene_sptr;
--  // only applies to the edge_line type of scenes
--  if (scene_base->appearence_model() == BOXM_EDGE_TANGENT_LINE) {
--    typedef boct_tree<short,boxm_edge_tangent_sample<float> > tree_type;
--    typedef boct_tree_cell<short,boxm_edge_tangent_sample<float> > cell_type;
--    auto *scene=dynamic_cast<boxm_scene<tree_type>*>(scene_base.ptr());
--    if (!scene) {
--       std::cerr << "error casting scene_base to scene\n";
--       return false;
--    }
--
--    auto *output_scene=new boxm_scene<tree_type>(*scene);
--    output_scene->set_paths(scene_path, block_prefix);
--    output_scene_sptr = output_scene;
--    // create a kernel for 3x3 neighborhood
--    bvpl_kernel_iterator k_iter;
--    vgl_point_3d<int> min_pt(-1,-1,-1);
--    vgl_point_3d<int> max_pt(1,1,1);
--    for (int i=min_pt.x(); i<=max_pt.x(); i++) {
--      for (int j=min_pt.y(); j<=max_pt.y(); j++) {
--        for (int k=min_pt.z(); k<=max_pt.z(); k++) {
--          k_iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
--        }
--      }
--    }
--    bvpl_kernel_sptr kernel= new bvpl_kernel(k_iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0), 0.0f, vgl_vector_3d<int>(3,3,3),min_pt,max_pt);
--
--    boxm_block_iterator<tree_type> iter(scene);
--    boxm_block_iterator<tree_type> output_iter(output_scene);
--    iter.begin();
--    output_iter.begin();
--
--    while (!iter.end())
--    {
--      scene->load_block(iter.index());
--      output_scene->load_block(iter.index());
--      boxm_block<tree_type>* block = *iter;
--      boxm_block<tree_type>* output_block = *output_iter;
--
--      tree_type* tree = block->get_tree();
--      std::vector<cell_type *> cells = tree->leaf_cells();
--
--      tree_type* output_tree=tree->clone();
--      std::vector<cell_type *> output_cells = output_tree->leaf_cells();
--
--      bvpl_octree_neighbors<boxm_edge_tangent_sample<float> > oper(tree);
--      for (unsigned i=0; i<cells.size(); i++) {
--        cell_type *cell=cells[i];
--        cell_type *output_cell=output_cells[i];
--        std::vector<cell_type *> neighb_cells;
--        oper.neighbors(kernel, cells[i], neighb_cells);
--        std::set<boxm_plane_obs<float>,ltstr> planes;
--
--        for (auto neighbor : neighb_cells) {
--          boct_loc_code<short> cell_code=cell->code_;
--          boct_loc_code<short> n_code = neighbor->code_;
--          bool itself = n_code.isequal(&cell_code);
--         if (!itself) {
--             std::vector<boxm_plane_obs<float> > observations = neighbor->data().obs_list();
--             boxm_edge_tangent_sample<float> data=output_cell->data();
--             data.insert(observations);
--             output_cell->set_data(data);
--            }
--        }
--      }
--      //  std::set<boxm_plane_obs<float>,ltstr >::iterator iter1=planes.begin();
--      //  boxm_edge_tangent_sample<float> data;
--      //  for(;iter1!=planes.end();iter1++)
--      //  {
--      //      data.insert(*iter1);
--      //  }
--      //  output_cell->set_data(data);
--      //}
--      output_block->delete_tree();
--      output_block->set_tree(output_tree);
--      output_scene->write_active_block();
--      iter++;
--    }
--    output_scene->write_scene(scene_filename);
--  }
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, output_scene_sptr);
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
-deleted file mode 100644
-index 5adb8cc4ec..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
-+++ /dev/null
-@@ -1,89 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_save_vrml_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief process saves a boxm_scene of kernel responses to a vrml file
--//
--// \author Isabel Restrepo
--// \date December 10, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel.h>
--
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--namespace bvpl_save_vrml_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--//: process takes 3 inputs and has no outputs.
--// input[0]: The scene
--// input[1]: The vector of kernels
--// input[2]: Path to output vrml file
--// No outputs
--
--bool bvpl_save_vrml_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_save_vrml_process_globals;
--
--  //process takes 3 inputs but has no outputs
--  std::vector<std::string> output_types_(n_outputs_);
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "bvpl_kernel_vector_sptr";
--  input_types_[2] = "vcl_string";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_save_vrml_process(bprb_func_process& pro)
--{
--  using namespace bvpl_save_vrml_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  bvpl_kernel_vector_sptr kernel_vector = pro.get_input<bvpl_kernel_vector_sptr>(1);
--  std::string vrml_path = pro.get_input<std::string>(2);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  //:Note initial implementation is for fixed types, but this can be changed if more cases are needed
--
--  std::ofstream ofs(vrml_path.c_str());
--
--  if (auto *scene_in =
--      dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >* > (scene_base.as_pointer()))
--  {
--    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
--  }
--  else if (auto *scene_in =
--           dynamic_cast<boxm_scene<boct_tree<short, bvpl_octree_sample<bsta_num_obs<bsta_gauss_sf1> > > >* >(scene_base.as_pointer()))
--  {
--    bvpl_octree_vrml_util::write_scene_as_disks(ofs, scene_in, kernel_vector);
--  }
--  else {
--    std::cerr << "In bvpl_save_vrml_process: Unsupported scene type\n";
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
-deleted file mode 100644
-index f3d93180ba..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_histogram_process.cxx
-+++ /dev/null
-@@ -1,66 +0,0 @@
--//:
--// \file
--// \brief Process to explore the histogram of a scene
--// \author Isabel Restrepo
--// \date 18-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--//:global variables
--namespace bvpl_scene_histogram_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_scene_histogram_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_histogram_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_scene_histogram_process(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_histogram_process_globals;
--
--  //get inputs
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--
--  if (!scene_base){
--    std::cerr << "Null scene\n";
--    return false;
--  }
--
--  switch (scene_base->appearence_model())
--  {
--    case BOXM_FLOAT:
--    {
--      typedef boct_tree<short, float > tree_type;
--      auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--      bsta_histogram<float> hist;
--      bvpl_compute_scene_statistics(scene_in, hist);
--      hist.pretty_print();
--      break;
--    }
--    default:
--      std::cout << "bvpl_block_kernel_operator_process: undefined APM type" << std::endl;
--      return false;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
-deleted file mode 100644
-index 9d7c20ba2c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
-+++ /dev/null
-@@ -1,179 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_kernel_operator_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for running a kernel to a boxm_scene
--// \author Isabel Restrepo
--// \date January 29, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/functors/bvpl_edge_algebraic_mean_functor.h>
--#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
--#include <bvpl/functors/bvpl_positive_gauss_conv_functor.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--
--namespace bvpl_scene_kernel_operator_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 5 inputs and has 1 output.
--// * input[0]: The boxm_scene
--// * input[1]: The kernel
--// * input[2]: The grid type:
--//           - float
--//           - opinion
--//           - ...
--// * input[3]: String identifying functor type
--// * input[4]: Output path to a dir where to store, id octree and response octree
--//
--// * output[0]: Output scene with response and kernel id
--
--bool bvpl_scene_kernel_operator_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_kernel_operator_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "bvpl_kernel_sptr";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_scene_kernel_operator_process(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_kernel_operator_process_globals;
--
--  if (pro.n_inputs() < n_inputs_)
--  {
--    std::cerr << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << '\n';
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_kernel_sptr kernel = pro.get_input<bvpl_kernel_sptr>(i++);
--  std::string datatype = pro.get_input<std::string>(i++);
--  std::string functor_name = pro.get_input<std::string>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--  //short level = 0;
--
--  //print inputs
--  std::cout << "In bvpl_scene_kernel_operator:\n"
--           << "Datatype:     " << datatype << std::endl
--           << "Functor Name: " << functor_name << std::endl;
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cerr <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if ( !kernel ) {
--    std::cerr << pro.name() << " :-- Kernel is not valid!\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--
--  if (datatype == "bsta_gauss_f1")
--  {
--    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--    typedef boct_tree<short, gauss_type > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--    double finest_cell_length = scene_in->finest_cell_length();
--    kernel->set_voxel_length(finest_cell_length);
--
--    //parameters of the output scene are the same as those of the input scene
--    boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "gauss_response_scene");
--    scene_out->set_appearance_model(BSTA_GAUSS_F1);
--    scene_out->write_scene("/gauss_response_scene.xml");
--
--    if (functor_name == "gauss_convolution") {
--      bvpl_gauss_convolution_functor functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--      return true;
--    }
--    else if (functor_name == "positive_gauss_convolution") {
--      bvpl_positive_gauss_conv_functor functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--
--      //clean memory
--      scene_in->unload_active_blocks();
--      scene_out->unload_active_blocks();
--
--      return true;
--    }
--      return false;
--  }
--  else if (datatype == "float")
--  {
--    typedef boct_tree<short, float > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--    double finest_cell_length = scene_in->finest_cell_length();
--    kernel->set_voxel_length(finest_cell_length);
--    //parameters of the output scene are the same as those of the input scene
--    boxm_scene<tree_type> *scene_out =
--      new boxm_scene<tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "response_scene");
--    scene_out->set_appearance_model(BOXM_FLOAT);
--    scene_out->write_scene("/float_response_scene.xml");
--
--    if (functor_name == "edge_algebraic_mean") {
--      bvpl_edge_algebraic_mean_functor<float> functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--      return true;
--    }
--    else if (functor_name == "algebraic") {
--      bvpl_algebraic_functor functor;
--      bvpl_scene_kernel_operator scene_oper;
--      //operate on scene
--      scene_oper.operate(*scene_in, functor, kernel, *scene_out);
--      scene_ptr = scene_out;
--      pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--      return true;
--    }
--    else
--      return false;
--  }
--  else
--    return false;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
-deleted file mode 100644
-index 74762468c1..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
-+++ /dev/null
-@@ -1,151 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/pro/processes/bvpl_scene_vector_operator_process.cxx
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief A class for successively running a kernel(of a vector), applying non-max suppression and combining with previous result
--// \author Isabel Restrepo
--// \date December 2, 2009
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/kernels/bvpl_kernel_factory.h>
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/functors/bvpl_gauss_convolution_functor.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_attributes.h>
--
--namespace bvpl_scene_vector_operator_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 6 inputs and has 1 output.
--// * input[0]: The boxm_scene
--// * input[1]: The kernels; bvpl_kernel_vector_sptr
--// * input[2]: The grid type:
--//           - float
--//           - opinion
--//           - ...
--// * input[3]: String identifying octree_vector_operator (e.g. max)
--// * input[4]: String identifying functor type
--// * input[5]: Output path to a dir where to store, id octree and response octree
--//
--// * output[0]: Output scene with response and kernel id
--
--
--bool bvpl_scene_vector_operator_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_vector_operator_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "bvpl_kernel_vector_sptr";
--  input_types_[2] = "vcl_string";
--  input_types_[3] = "vcl_string";
--  input_types_[4] = "vcl_string";
--  input_types_[5] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool bvpl_scene_vector_operator_process(bprb_func_process& pro)
--{
--  using namespace bvpl_scene_vector_operator_process_globals;
--
--  if (pro.n_inputs() < n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_kernel_vector_sptr kernel_vec = pro.get_input<bvpl_kernel_vector_sptr>(i++);
--  std::string datatype = pro.get_input<std::string>(i++);
--  std::string operator_name = pro.get_input<std::string>(i++);
--  std::string functor_name = pro.get_input<std::string>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Grid is not valid!\n";
--    return false;
--  }
--
--  if ( !kernel_vec ) {
--    std::cout << pro.name() << " :-- Kernel is not valid!\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--
--  if (datatype == "float")
--  {
--    typedef boct_tree<short, float > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--    //parameters of the output scene are the same as thos of the input scene
--    boxm_scene<boct_tree<short, bvpl_octree_sample<float> > > *scene_out =
--    new boxm_scene<boct_tree<short, bvpl_octree_sample<float> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
--    scene_out->set_paths(output_path, "response_scene");
--    scene_out->set_appearance_model(BVPL_SAMPLE_FLOAT);
--    scene_out->write_scene("/response_scene.xml");
--    if (operator_name == "max_vector_operator")
--    {
--      bvpl_max_vector_operator<float> max_oper;
--
--      if (functor_name == "edge_geometric_mean") {
--        bvpl_edge_geometric_mean_functor<float> functor;
--        bvpl_scene_vector_operator scene_oper;
--        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
--        scene_ptr = scene_out;
--        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--        return true;
--      }
--    }
--  }
--  if (datatype == "bsta_gauss_f1")
--  {
--    typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--    typedef boct_tree<short, gauss_type > tree_type;
--    auto *scene_in = static_cast<boxm_scene<tree_type>* > (scene_base.as_pointer());
--
--    //parameters of the output scene are the same as thos of the input scene
--    boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > > *scene_out =
--    new boxm_scene<boct_tree<short, bvpl_octree_sample<gauss_type> > >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim());
--    scene_out->set_paths(output_path, "response_scene");
--    scene_out->set_appearance_model(BVPL_SAMPLE_BSTA_GAUSS_F1);
--    scene_out->write_scene("/response_scene.xml");
--    if (operator_name == "max_vector_operator")
--    {
--      bvpl_max_vector_operator<gauss_type> max_oper;
--
--      if (functor_name == "gauss_convolution") {
--        bvpl_gauss_convolution_functor functor;
--        bvpl_scene_vector_operator scene_oper;
--        scene_oper.operate(*scene_in, functor, kernel_vec, *scene_out);
--        scene_ptr = scene_out;
--        pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--        return true;
--      }
--    }
--    return false;
--  }
--  else
--    return false;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
-deleted file mode 100644
-index 93af3679c8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_beaudet_measure_process.cxx
-+++ /dev/null
-@@ -1,64 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (beaudet)
--// \author Isabel Restrepo
--// \date 27-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_compute_beaudet_measure_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_beaudet_measure_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_beaudet_measure_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_beaudet_measure_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_beaudet_measure_process_globals;
--
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->compute_beaudet_corners(global_taylor, scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
-deleted file mode 100644
-index 94d872196d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_compute_harris_measure_process.cxx
-+++ /dev/null
-@@ -1,65 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (Harris)
--// \author Isabel Restrepo
--// \date 20-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_compute_harris_measure_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_harris_measure_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_harris_measure_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_harris_measure_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_harris_measure_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->compute_laptev_corners(global_taylor, scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
-deleted file mode 100644
-index 16f6bd1cd0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_corner_statistics_process.cxx
-+++ /dev/null
-@@ -1,57 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (Harris)
--// \author Isabel Restrepo
--// \date 20-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_corner_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_corner_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_corner_statistics_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_corner_statistics_process(bprb_func_process& pro)
--{
--  using namespace bvpl_corner_statistics_process_globals;
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->explore_corner_statistics(global_taylor, scene_id);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
-deleted file mode 100644
-index 9c003728ca..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_load_global_corners_process.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl_octree/bvpl_global_corners.h>
--
--//: global variables
--namespace bvpl_load_global_corners_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_load_global_corners_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_corners_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_global_corners_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_load_global_corners_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_corners_process_globals;
--
--  // get inputs
--  std::string corners_file = pro.get_input<std::string>(0);
--  auto *global_corners = new bvpl_global_corners(corners_file);
--
--  // store output
--  pro.set_output_val<bvpl_global_corners_sptr>(0, global_corners);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
-deleted file mode 100644
-index af283e13ec..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/corners/bvpl_threshold_corners_process.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \brief A process to compute corner measure (Harris)
--// \author Isabel Restrepo
--// \date 20-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--
--//:global variables
--namespace bvpl_threshold_corners_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_threshold_corners_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_threshold_corners_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ;
--  input_types_[i++] = "bvpl_global_corners_sptr" ;
--  input_types_[i++] = "int";  //scene id
--  input_types_[i++] = "float"; //threshold
--  input_types_[i++] = "vcl_string"; //output path for thresholded scenes
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_threshold_corners_process(bprb_func_process& pro)
--{
--  using namespace bvpl_threshold_corners_process_globals;
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  bvpl_global_corners_sptr global_corners = pro.get_input<bvpl_global_corners_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  auto corner_thresh = pro.get_input<float>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  if (!(global_taylor && global_corners))
--    return false;
--
--  global_corners->threshold_laptev_corners(global_taylor, scene_id, corner_thresh, output_path);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
-deleted file mode 100644
-index c4eebb2560..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_add_pca_errors_process.cxx
-+++ /dev/null
-@@ -1,94 +0,0 @@
--//:
--// \file
--// \brief A process to add Taylor error at a percentage of voxels in a block
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_add_pca_errors_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_add_pca_errors_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_add_pca_errors_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
--  input_types_[i++] = "unsigned"; //dimension
--  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_add_pca_errors_process(bprb_func_process& pro)
--{
--  using namespace bvpl_add_pca_errors_process_globals;
--
--  //get inputs
--  unsigned i =0;
--  bvpl_pca_error_scenes_sptr error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
--  auto dim = pro.get_input<unsigned>(i++);
--  auto fraction_nsamples = pro.get_input<double>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!error_scenes) {
--    std::cerr << "Error in bvpl_add_pca_errors_process: Null error scene\n";
--    return false;
--  }
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scenes->get_scene(dim).as_pointer());
--  if (!error_scene) {
--    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--  //sum errors within block
--  double error = 0;
--  if (fraction_nsamples < 0.95)
--  {
--    auto scene_ncells = (double)error_scene->size();
--    error_scene->load_block(block_i,block_j,block_k);
--    auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
--    double nsamples = scene_ncells * fraction_nsamples;
--
--    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
--    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
--             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << '\n';
--    error = bvpl_average_value(error_scene,block_i, block_j, block_k, tree_nsamples);
--    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
--  }
--  else
--  {
--    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
--    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") and dim: " << dim << "is: " << error << '\n';
--  }
--
--  //store output
--  pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
-deleted file mode 100644
-index f6fb2f5d0a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_combine_pairwise_statistics_process.cxx
-+++ /dev/null
-@@ -1,95 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 17-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_matrix_fixed.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_combine_pairwise_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_combine_pairwise_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_combine_pairwise_statistics_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i=0;
--  input_types_[i++] = "vcl_string" ; //stats_file1
--  input_types_[i++] = "vcl_string" ; //stats_file2
--  input_types_[i++] = "vcl_string" ; //stats_file_out
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_combine_pairwise_statistics_process(bprb_func_process& pro)
--{
--  using namespace bvpl_combine_pairwise_statistics_process_globals;
--
--  //get inputs
--  unsigned i= 0;
--  std::string stats_file1 = pro.get_input<std::string>(i++);
--  std::string stats_file2 = pro.get_input<std::string>(i++);
--  std::string stats_file_out = pro.get_input<std::string>(i++);
--
--  //load files
--  vnl_matrix_fixed<double, 125, 125> S1(0.0);
--  vnl_vector_fixed<double, 125> mean1(0.0);
--  unsigned long nfeatures1 =0;
--  {
--    std::ifstream stats_ifs(stats_file1.c_str());
--    if (!stats_ifs.is_open()) {
--      std::cerr << "Error: Failed to open file1\n";
--      return false;
--    }
--    stats_ifs >> nfeatures1 >> mean1 >> S1;
--    stats_ifs.close();
--
--  }
--
--  vnl_matrix_fixed<double, 125, 125> S2(0.0);
--  vnl_vector_fixed<double, 125> mean2(0.0);
--  unsigned long nfeatures2 =0;
--
--  {
--    std::ifstream stats_ifs(stats_file2.c_str());
--    if (!stats_ifs.is_open()) {
--      std::cerr << "Warning: Failed to open file2 - output file will be identical to file1\n";
--      std::ofstream stats_ofs(stats_file_out.c_str());
--      stats_ofs.precision(15);
--      stats_ofs << nfeatures1 << '\n' << mean1 << '\n' << S1;
--      return true;
--    }
--    stats_ifs >> nfeatures2 >> mean2 >> S2;
--    stats_ifs.close();
--  }
--
--  vnl_matrix_fixed<double, 125, 125> S_out(0.0);
--  vnl_vector_fixed<double, 125> mean_out(0.0);
--  double nfeatures_out =0.0;
--  bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
--
--  std::ofstream stats_ofs(stats_file_out.c_str());
--  stats_ofs.precision(15);
--  stats_ofs << nfeatures_out << '\n' << mean_out << '\n' << S_out;
--  stats_ofs.close();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
-deleted file mode 100644
-index e6acd1accd..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_block_process.cxx
-+++ /dev/null
-@@ -1,69 +0,0 @@
--//:
--// \file
--// \brief A process to compute reconstruction error over all samples in a scene (test + train)
--// \author Isabel Restrepo
--// \date 13-Jan-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--//:global variables
--namespace bvpl_compute_pca_error_block_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;        //directory path, where pca_info.xml is
--  constexpr unsigned n_outputs_ = 0;       //error file
--}
--
--
--//:sets input and output types
--bool bvpl_compute_pca_error_block_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_block_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_discover_pca_kernels_sptr" ;  //directory path
--  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
--  input_types_[i++] = "int";   //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "unsigned";  //num_components
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_pca_error_block_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_block_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_discover_pca_kernels_sptr pca_extractor = pro.get_input<bvpl_discover_pca_kernels_sptr>(i++);
--  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  auto num_components = pro.get_input<unsigned>(i++);
--
--  if (!pca_extractor)
--    return false;
--
--  if (!pca_error_scenes)
--    return false;
--
--  //bvpl_discover_pca_kernels pca_extractor(pca_dir);
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
--  pca_extractor->compute_testing_error(error_scene, num_components, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
-deleted file mode 100644
-index 70d9cf1a4b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_error_scene_process.cxx
-+++ /dev/null
-@@ -1,132 +0,0 @@
--//:
--// \file
--// \brief A process to compute reconstruction error over all samples in a scene (test + train)
--// \author Isabel Restrepo
--// \date 13-Jan-2011
--
--#include <iostream>
--#include <cstdlib>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--#include <vul/vul_file.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--// global variables
--namespace bvpl_compute_pca_error_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;        //directory path, where pca_info.xml is
--  constexpr unsigned n_outputs_ = 0;       //error file
--}
--
--
--// sets input and output types
--bool bvpl_compute_pca_error_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string" ;  //directory path
--  input_types_[i++] = "bvpl_pca_error_scenes_sptr";
--  input_types_[i++] = "unsigned";  //num_components
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--#if BVPL_OCTREE_HAS_PTHREADS
--// helper code to launch and manage pthreads
--namespace {
--  struct pthread_data
--  {
--    bvpl_discover_pca_kernels* pca_extractor;
--    boxm_scene<boct_tree<short,float> > * error_scene;
--    vgl_point_3d<int> block_idx;
--    unsigned num_components;
--  };
--
--  void* pthread_launcher(void *arg)
--  {
--    pthread_data *pd = reinterpret_cast<pthread_data*>(arg);
--    vgl_point_3d<int> block_idx = pd->block_idx;
--    pd->pca_extractor->compute_testing_error_thread_safe(pd->error_scene, pd->num_components, block_idx.x(), block_idx.y(), block_idx.z());
--    //delete pd;
--    return arg;
--  }
--}
--#endif
--
--// the process
--bool bvpl_compute_pca_error_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_error_scene_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  std::string pca_dir = pro.get_input<std::string>(i++);
--  bvpl_pca_error_scenes_sptr pca_error_scenes = pro.get_input<bvpl_pca_error_scenes_sptr>(i++);
--  auto num_components = pro.get_input<unsigned>(i++);
--
--  if (!vul_file::is_directory(pca_dir))
--    return false;
--
--  if (!pca_error_scenes)
--    return false;
--
--  auto *pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
--  vgl_vector_3d<unsigned int> num_blocks = pca_extractor->data_scene_dim();
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (pca_error_scenes->get_scene(num_components).as_pointer());
--
--#if BVPL_OCTREE_HAS_PTHREADS
--  pca_extractor->load_all_scene_blocks();
--  error_scene->read_all_blocks();
--  unsigned num_threads = 0;
--  std::vector<vgl_point_3d<int> > block_indices;
--  for (unsigned block_i = 0; block_i < num_blocks.x(); ++block_i) {
--    for (unsigned block_j = 0; block_j < num_blocks.y(); ++block_j) {
--      for (unsigned block_k = 0; block_k < num_blocks.z(); ++block_k) {
--        block_indices.push_back(vgl_point_3d<int>(block_i,block_j,block_k));
--        ++num_threads;
--      }
--    }
--  }
--
--  pthread_t* thread_id = new pthread_t[num_threads]; // beware of memory leaks ...
--
--  for (unsigned i =0; i < num_threads; ++i)
--  {
--    pthread_data* pd = new pthread_data();
--    pd->pca_extractor = pca_extractor;
--    pd->error_scene = error_scene;
--    pd->num_components = num_components;
--    pd->block_idx= block_indices[i];
--    int rc = pthread_create(&thread_id[i], NULL, pthread_launcher, (void*) pd );
--    //pthread_detach(thread_id[i]);
--    if (rc)
--    {
--      std::cerr << "Error creating pthread, return code: "<<rc<<'\n';
--      std::exit(-1);
--    }
--  }
--#if 0
--  for (unsigned i =0; i < num_threads; ++i)
--  {
--    pca_extractor.compute_testing_error_thread_safe(error_scene, num_components, block_indices[i].x(), block_indices[i].y(), block_indices[i].z());
--  }
--  pca_extractor.unload_all_scene_blocks();
--#endif
--
--#endif // PTHREADS
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
-deleted file mode 100644
-index 775dc4cb23..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_compute_pca_test_error_process.cxx
-+++ /dev/null
-@@ -1,59 +0,0 @@
--//:
--// \file
--// \brief A process to compute reconstruction error over all samples in a scene (test + train)
--// \author Isabel Restrepo
--// \date 13-Jan-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--
--//:global variables
--namespace bvpl_compute_pca_test_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;        //directory path, where pca_info.xml is
--  constexpr unsigned n_outputs_ = 1;       //error file
--}
--
--
--//:sets input and output types
--bool bvpl_compute_pca_test_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_test_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string" ;
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "vcl_string";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_pca_test_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_pca_test_error_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--
--  bvpl_discover_pca_kernels pca_extractor(pca_dir);
--
--  vnl_vector<double> t_error;
--  pca_extractor.compute_testing_error(t_error);
--  std::ofstream error_ofs((pca_dir+ "/test_error.txt").c_str());
--
--  if (error_ofs)
--    error_ofs << t_error;
--
--  //store output
--  pro.set_output_val<std::string>(0, pca_dir+ "/test_error.txt");
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
-deleted file mode 100644
-index e76b7b5d98..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_discover_pca_features_process.cxx
-+++ /dev/null
-@@ -1,98 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 17-Nov-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <boxm/boxm_scene.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--//:global variables
--namespace bvpl_discover_pca_features_process_globals
--{
--  constexpr unsigned n_inputs_ = 9;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_discover_pca_features_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_discover_pca_features_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "vcl_string";   //directory to save PCA matrices
--  input_types_[i++] = "double";   //fraction of the total number of leaves
--  input_types_[i++] = "int";    // min and max of kernel
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--
--  return pro.set_input_types(input_types_);
--}
--
--
--//:the process
--bool bvpl_discover_pca_features_process(bprb_func_process& pro)
--{
--  using namespace bvpl_discover_pca_features_process_globals;
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cout << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs
--  unsigned i =0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string pca_dir = pro.get_input<std::string>(i++);
--  auto frac = pro.get_input<double>(i++);
--  int min_x = pro.get_input<int>(i++);
--  int min_y = pro.get_input<int>(i++);
--  int min_z = pro.get_input<int>(i++);
--  int max_x = pro.get_input<int>(i++);
--  int max_y = pro.get_input<int>(i++);
--  int max_z = pro.get_input<int>(i++);
--
--
--  //check input's validity
--  if (!scene_base.ptr()) {
--    std::cout <<  " :-- Base Scene is not valid!\n";
--    return false;
--  }
--
--  //neighborhood box for volume "patches" 5x5x5 for now - this could be an input to the process
--  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
--
--  //cast scene
--  auto *scene= dynamic_cast<boxm_scene<boct_tree<short, float > >* > (scene_base.as_pointer());
--  if (!scene) {
--    std::cout <<  " :-- Input Scene is not of supported type\n";
--    return false;
--  }
--  std::cout << "Scene path: " << scene->filename()<< std::endl;;
--
--
--  //number of samples - 10% of total number of leaf-cells
--  auto nsamples = (unsigned long)((double)scene->size() * frac);
--  std::cout << "Number of samples: " << nsamples << std::endl;
--
--  //bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene);
--  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, pca_dir);
--
--  //write matrices to disk
--  pca_extractor.xml_write();
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
-deleted file mode 100644
-index 365a0eb791..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_global_pca_process.cxx
-+++ /dev/null
-@@ -1,64 +0,0 @@
--//:
--// \file
--// \brief A process that performs PCA analysis given the statistics collected from various scenes using bvpl_pca_global
--// \author Isabel Restrepo
--// \date 23-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_global_pca_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_global_pca_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_global_pca_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";   //path pca_global_info file
--  input_types_[1] = "vcl_string";   //path to statistics file
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_global_pca_process(bprb_func_process& pro)
--{
--  using namespace bvpl_global_pca_process_globals;
--
--  //get inputs
--  std::string pca_file = pro.get_input<std::string>(0);
--  std::string stats_file = pro.get_input<std::string>(1);
--
--  //load file into matrices
--  vnl_matrix_fixed<double, 125, 125> S(0.0);
--  vnl_vector_fixed<double, 125> mean(0.0);
--  unsigned long nfeatures =0;
--  {
--    std::ifstream stats_ifs(stats_file.c_str());
--    if (!stats_ifs.is_open()) {
--      std::cerr << "Error: Failed to open stats file\n";
--      return false;
--    }
--    stats_ifs >> nfeatures >> mean >> S;
--  }
--
--  bvpl_global_pca<125> global_pca(pca_file);
--
--  global_pca.set_up_pca_evd(S,mean,nfeatures);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
-deleted file mode 100644
-index 10e35faddb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_init_global_pca_process.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \brief A process to init auxiliary scenes and other variables
--// \author Isabel Restrepo
--// \date 23-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_init_global_pca_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_init_global_pca_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_pca_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; // path to pca_global_info file
--  input_types_[1] = "unsigned"; //id of the scene to initialize
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_init_global_pca_process(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_pca_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--  auto scene_id = pro.get_input<unsigned>(1);
--
--  bvpl_global_pca<125> global_pca(pca_dir);
--  global_pca.init(scene_id);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
-deleted file mode 100644
-index 8b2070e215..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_global_pca_process.cxx
-+++ /dev/null
-@@ -1,50 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 15-May-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl_octree/bvpl_global_pca.h>
--
--//: global variables
--namespace bvpl_load_global_pca_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_load_global_pca_125_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_pca_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_global_pca_125_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_load_global_pca_125_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_pca_process_globals;
--
--  // get inputs
--  std::string pca_file = pro.get_input<std::string>(0);
--  auto *global_pca = new bvpl_global_pca<125>(pca_file);
--
--  // store output
--  pro.set_output_val<bvpl_global_pca_125_sptr>(0, global_pca);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
-deleted file mode 100644
-index 39161edf02..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_error_scenes_process.cxx
-+++ /dev/null
-@@ -1,58 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 21-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--
--//:global variables
--namespace bvpl_load_pca_error_scenes_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_pca_error_scenes_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_error_scenes_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "boxm_scene_base_sptr";  //data scene
--  input_types_[i++] = "vcl_string";   //pca path
--  input_types_[i++] = "unsigned";   //dimension pca feture
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_pca_error_scenes_sptr" ;
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_pca_error_scenes_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_error_scenes_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string pca_path = pro.get_input<std::string>(i++);
--  auto feature_dim = pro.get_input<unsigned>(i++);
--
--  if (!data_scene_base)
--    return false;
--
--  bvpl_pca_error_scenes *error_scenes = new bvpl_pca_error_scenes(data_scene_base, pca_path, feature_dim);
--  //store output
--  pro.set_output_val<bvpl_pca_error_scenes_sptr>(0, error_scenes);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
-deleted file mode 100644
-index 48082ecb75..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_load_pca_info_process.cxx
-+++ /dev/null
-@@ -1,55 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 3-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vul/vul_file.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--//:global variables
--namespace bvpl_load_pca_info_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_pca_info_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_info_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string" ;  //directory path
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_discover_pca_kernels_sptr";  //pca info
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_pca_info_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_pca_info_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--
--  if (!vul_file::is_directory(pca_dir))
--    return false;
--
--  bvpl_discover_pca_kernels_sptr pca_extractor = new bvpl_discover_pca_kernels(pca_dir);
--
--  //store output
--  pro.set_output_val<bvpl_discover_pca_kernels_sptr>(0, pca_extractor);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
-deleted file mode 100644
-index fb29aeaa8c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_normalize_pca_training_error_process.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 4-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--
--#include <vul/vul_file.h>
--
--//:global variables
--namespace bvpl_normalize_pca_training_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;  //directory path
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_normalize_pca_training_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_normalize_pca_training_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_normalize_pca_training_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_normalize_pca_training_error_process_globals;
--
--  //get inputs
--  std::string pca_dir = pro.get_input<std::string>(0);
--
--  if (!vul_file::is_directory(pca_dir)){
--    std::cerr << " Invalid pca directory\n";
--    return false;
--  }
--
--
--  bvpl_discover_pca_kernels pca_extractor(pca_dir);
--
--  vnl_vector<double> error;
--  pca_extractor.compute_normalized_training_error(error);
--
--  std::ofstream ofs((pca_dir + "/normalized_training_error.txt").c_str());
--  ofs.precision(15);
--  ofs << error;
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
-deleted file mode 100644
-index 40149c3411..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_add_error_process.cxx
-+++ /dev/null
-@@ -1,77 +0,0 @@
--//:
--// \file
--// \brief A process to compute pca projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--//:global variables
--namespace bvpl_pca_global_add_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_global_add_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_add_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_global_add_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_add_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_pca)
--  {
--    std::cerr << "Global PCA is NULL\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr error_scene_base = global_pca->load_error_scene(scene_id);
--  if (!error_scene_base) {
--    std::cerr << "Error in bvpl_add_pca_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--
--  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
--  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
--
--  //store output
--    pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
-deleted file mode 100644
-index 0e127a6a1c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_proj_error_process.cxx
-+++ /dev/null
-@@ -1,63 +0,0 @@
--//:
--// \file
--// \brief A process to compute pca projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_pca_global_proj_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_global_proj_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_proj_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_global_proj_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_proj_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_pca)
--  {
--    std::cerr << "Global PCA is NULL\n";
--    return false;
--  }
--
--  global_pca->projection_error(scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
-deleted file mode 100644
-index fc2e46ff3e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_global_statistics_process.cxx
-+++ /dev/null
-@@ -1,75 +0,0 @@
--//:
--// \file
--// \brief  A process that computes pca statistics (scatter matrix and mean) on a per block basis
--// \author Isabel Restrepo
--// \date 14-Mar-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_pca_global_statistics_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_global_statistics_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_statistics_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i =0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene_id (this can be confirmed in xml file pca_info.xml)
--  input_types_[i++] = "int";   //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "vcl_string"; //path to file to hold statistics of this block
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_global_statistics_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_global_statistics_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  std::string stats_file = pro.get_input<std::string>(i++);
--
--  if(!global_pca)
--  {
--    std::cerr << "Global PCA is NULL \n";
--    return false;
--  }
--  vnl_matrix_fixed<double, 125, 125> S(0.0);
--  vnl_vector_fixed<double, 125> mean(0.0);
--  unsigned long nfeatures = 0;
--
--
--  if(global_pca->sample_statistics(scene_id, block_i, block_j, block_k, S, mean, nfeatures))
--  {
--    std::ofstream stats_ofs(stats_file.c_str());
--    stats_ofs.precision(15);
--    stats_ofs << nfeatures << '\n' << mean << '\n' << S;
--    stats_ofs.close();
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
-deleted file mode 100644
-index 341a8e76ac..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/pca/bvpl_pca_project_process.cxx
-+++ /dev/null
-@@ -1,63 +0,0 @@
--//:
--// \file
--// \brief A process to compute pca projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--
--//:global variables
--namespace bvpl_pca_project_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_pca_project_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_project_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_pca_125_sptr" ; //global pca class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_pca_project_process(bprb_func_process& pro)
--{
--  using namespace bvpl_pca_project_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_pca_125_sptr global_pca = pro.get_input<bvpl_global_pca_125_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_pca)
--  {
--    std::cerr << "Global PCA is NULL\n";
--    return false;
--  }
--
--  global_pca->project(scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
-deleted file mode 100644
-index 3f4d2adf17..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_compute_sf_raw_response_process.cxx
-+++ /dev/null
-@@ -1,70 +0,0 @@
--//:
--// \file
--// \brief A process to run derivatives of gaussian in 3 dimensions - x, y, x
--// \author Isabel Restrepo
--// \date 13-Oct-2010
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
--
--
--#include <boxm/boxm_scene.h>
--
--//: global variables
--namespace bvpl_compute_sf_raw_response_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//: sets input and output types
--bool bvpl_compute_sf_raw_response_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_sf_raw_response_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";  //input/response scene
--  input_types_[i++] = "boxm_scene_base_sptr";  //valid scene
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_compute_sf_raw_response_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_sf_raw_response_process_globals;
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  boxm_scene_base_sptr valid_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--
--  //get scene
--  typedef boct_tree<short, vnl_vector_fixed< float,10 > > response_tree_type;
--  typedef boct_tree<short, bool > valid_tree_type;
--
--
--  if (auto *scene_in = dynamic_cast<boxm_scene< response_tree_type >* >(scene_base.as_pointer()))
--  {
--    double cell_length = scene_in->finest_cell_length();
--
--    if (auto *valid_scene = dynamic_cast<boxm_scene< valid_tree_type >* >(valid_scene_base.as_pointer()))
--    {
--      bvpl_gauss3D_steerable_filters sf;
--      sf.basis_response_at_leaves(scene_in,valid_scene, cell_length);
--    }
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
-deleted file mode 100644
-index 3ceffbbc47..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/steerable_filters/bvpl_init_sf_response_scene_process.cxx
-+++ /dev/null
-@@ -1,87 +0,0 @@
--//:
--// \file
--// \brief A process to initialize the response scene for steerable filter bank
--// \author Isabel Restrepo
--// \date 22-Aug-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/kernels/bvpl_gauss3d_x_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--#include <bvpl/functors/bvpl_algebraic_functor.h>
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--#include <boxm/boxm_scene.h>
--
--//: global variables
--namespace bvpl_init_sf_response_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 2;
--}
--
--
--//: sets input and output types
--bool bvpl_init_sf_response_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_init_sf_response_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";  //input scene
--  input_types_[1] = "vcl_string";            //output path
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";  //response scene
--  output_types_[1] = "boxm_scene_base_sptr";  //valid scene
--
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_init_sf_response_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_init_sf_response_scene_process_globals;
--
--  //get inputs:
--  unsigned i = 0;
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  std::string output_path = pro.get_input<std::string>(i++);
--
--  //get scene
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
--
--  if (auto *scene_in = dynamic_cast<boxm_scene< float_tree_type >* >(scene_base.as_pointer()))
--  {
--    boxm_scene<out_tree_type> *scene_out =
--    new boxm_scene<out_tree_type>(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    scene_out->set_paths(output_path, "steerable_gauss_3d_scene");
--    scene_out->set_appearance_model(VNL_FLOAT_10);
--    scene_out->write_scene("steerable_gauss_3d_scene.xml");
--    scene_in->clone_blocks_to_vector<10>(*scene_out);
--
--    boxm_scene<boct_tree<short, bool> > *valid_scene =
--    new boxm_scene<boct_tree<short, bool> >(scene_in->lvcs(), scene_in->origin(), scene_in->block_dim(), scene_in->world_dim(), scene_in->max_level(), scene_in->init_level());
--    valid_scene->set_paths(output_path, "valid_scene");
--    valid_scene->set_appearance_model(BOXM_BOOL);
--    valid_scene->write_scene("valid_scene.xml");
--
--
--    //store output
--    boxm_scene_base_sptr scene_ptr=new boxm_scene_base();
--    scene_ptr = scene_out;
--    boxm_scene_base_sptr valid_scene_ptr=new boxm_scene_base();
--    valid_scene_ptr = valid_scene;
--    pro.set_output_val<boxm_scene_base_sptr>(0, scene_ptr);
--    pro.set_output_val<boxm_scene_base_sptr>(1, valid_scene_ptr);
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
-deleted file mode 100644
-index c1b1c309c0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_add_taylor_errors_process.cxx
-+++ /dev/null
-@@ -1,90 +0,0 @@
--//:
--// \file
--// \brief A process to add Taylor error at a percentage of voxels in a block
--// \author Isabel Restrepo
--// \date 15-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_add_taylor_errors_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_add_taylor_errors_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_add_taylor_errors_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr";
--  input_types_[i++] = "double";  ////fraction [0,1] of cells used in the computation
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_add_taylor_errors_process(bprb_func_process& pro)
--{
--  using namespace bvpl_add_taylor_errors_process_globals;
--
--  //get inputs
--  unsigned i =0;
--  boxm_scene_base_sptr error_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  auto fraction_nsamples = pro.get_input<double>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!error_scene_base) {
--    std::cerr << "Error in bvpl_add_taylor_errors_process: Null error scene\n";
--    return false;
--  }
--  auto* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (error_scene_base.as_pointer());
--  if (!error_scene) {
--    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--  //sum errors within block
--  auto scene_ncells = (double)error_scene->size();
--  error_scene->load_block(block_i,block_j,block_k);
--  auto tree_ncells = (double)error_scene->get_block(block_i,block_j,block_k)->get_tree()->size();
--  double nsamples = scene_ncells * fraction_nsamples;
--
--  //number of samples - 10% of total number of leaf-cells
--  double error = 0.0;
--  if (fraction_nsamples < 0.95) {
--    auto tree_nsamples = (unsigned long)((tree_ncells/scene_ncells)*nsamples);
--    std::cout << "Number of samples in  the scene " << scene_ncells << '\n'
--             << "Adding errors from " << tree_nsamples << " samples in block: " << block_i << ',' << block_j << ',' << block_k << std::endl;
--    error = bvpl_taylor_basis::sum_errors(error_scene,block_i, block_j, block_k, tree_nsamples);
--  }
--  else {
--    error = bvpl_average_value(error_scene,block_i, block_j, block_k);
--    std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << std::endl;
--  }
--
--  //store output
--  pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
-deleted file mode 100644
-index 50c28a393e..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_coefficients_process.cxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 12-Apr-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--#include <vul/vul_file.h>
--
--//:global variables
--namespace bvpl_compute_taylor_coefficients_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_taylor_coefficients_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_coefficients_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string" ;  //path of taylor_global_info.xml
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_taylor_coefficients_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_coefficients_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  std::string taylor_dir = pro.get_input<std::string>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  int dim = pro.get_input<int>(i++);
--
--  if (!vul_file::is_directory(taylor_dir))
--    return false;
--
--  switch (dim) {
--    case 3:
--    {
--      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
--      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
--      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
--      break;
--    }
--    case 10:
--    {
--      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
--      global_taylor.compute_taylor_coefficients(scene_id, block_i, block_j, block_k);
--      break;
--    }
--    default:
--      break;
--  }
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
-deleted file mode 100644
-index b992c1b5ae..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_compute_taylor_error_process.cxx
-+++ /dev/null
-@@ -1,78 +0,0 @@
--//:
--// \file
--// \brief A process to compute the Taylor reconstruction error of a block (Assumes, basis has been applied)
--// \author Isabel Restrepo
--// \date 9-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <boxm/boxm_scene.h>
--
--//:global variables
--namespace bvpl_compute_taylor_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_compute_taylor_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "boxm_scene_base_sptr"; //the original data scene
--  input_types_[i++] = "bvpl_taylor_scenes_map_sptr" ; //scenes needed for Taylor operations
--  input_types_[i++] = "int" ; //block index in x-dimension
--  input_types_[i++] = "int" ; //block index in y-dimension
--  input_types_[i++] = "int" ; //block index in z-dimension
--
--  std::vector<std::string> output_types_(n_outputs_);
--  i=0;
--  output_types_[i++] = "boxm_scene_base_sptr"; //the error for this block
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_compute_taylor_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_compute_taylor_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  boxm_scene_base_sptr data_scene_base = pro.get_input<boxm_scene_base_sptr>(i++);
--  bvpl_taylor_scenes_map_sptr taylor_scenes = pro.get_input<bvpl_taylor_scenes_map_sptr>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--  if (!data_scene_base) {
--    std::cerr << "Error in bvpl_compute_taylor_error_process: Null data scene\n";
--    return false;
--  }
--  if (!taylor_scenes) {
--    std::cerr << "Error in bvpl_compute_taylor_error_process: Null scenes map\n";
--    return false;
--  }
--
--  //assemble the Taylor basis
--  bvpl_taylor_basis::assemble_basis(taylor_scenes, block_i, block_j, block_k);
--
--  //compute the error block
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
--  auto* data_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (data_scene_base.as_pointer());
--  double cell_length = data_scene->finest_cell_length();
--  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),
--                                                 error_scene,taylor_scenes->loader(),
--                                                 block_i, block_j, block_k, cell_length);
--
--  pro.set_output_val<boxm_scene_base_sptr>(0, error_scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
-deleted file mode 100644
-index 0b57bb488d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_explore_coefficient_scene_process.cxx
-+++ /dev/null
-@@ -1,77 +0,0 @@
--//:
--// \file
--// \brief A process to extract a Taylor coefficient from the 10-d vector
--// \author Isabel Restrepo
--// \date 12-Apr-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--//:global variables
--namespace bvpl_explore_coefficient_scene_process_globals
--{
--  constexpr unsigned n_inputs_ = 3;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_explore_coefficient_scene_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_explore_coefficient_scene_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string"; //path to Taylor info file
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int"; //coefficient
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "boxm_scene_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_explore_coefficient_scene_process(bprb_func_process& pro)
--{
--  using namespace bvpl_explore_coefficient_scene_process_globals;
--
--  //get inputs
--  std::string taylor_dir = pro.get_input<std::string>(0);
--  int scene_id = pro.get_input<int>(1);
--  int coeff_id = pro.get_input<int>(2);
--
--  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--  bvpl_global_taylor<double, 10> taylor(taylor_dir, kernel_names);
--
--  boxm_scene_base_sptr valid_scene_base = taylor.load_valid_scene(scene_id);
--  auto* valid_scene = dynamic_cast<boxm_scene<boct_tree<short, bool> >*> (valid_scene_base.as_pointer());
--  if (!valid_scene) {
--    std::cerr << "Error in bvpl_explore_coefficient_scene_process: Could not cast valid scene\n";
--    return false;
--  }
--
--  std::stringstream scene_ss;
--  scene_ss << "coefficient_" << coeff_id << "_scene_" << scene_id ;
--  std::string scene_path = taylor.aux_dirs(scene_id) + "/" + scene_ss.str() + ".xml";
--
--  std::cout << "Initializing " << scene_path << '\n'
--           << "Scene: " << scene_path << " does not exist, initializing xml" << std::endl;
--  boxm_scene<boct_tree<short, float> > *scene =
--  new boxm_scene<boct_tree<short, float> >(valid_scene->lvcs(), valid_scene->origin(), valid_scene->block_dim(), valid_scene->world_dim(), valid_scene->max_level(), valid_scene->init_level());
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->set_paths(taylor.aux_dirs(scene_id), scene_ss.str());
--  scene->write_scene("/" + scene_ss.str() +  ".xml");
--  taylor.extract_coefficient_scene(scene_id,  coeff_id, scene);
--
--  //store output
--  pro.set_output_val<boxm_scene_base_sptr>(0, scene);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
-deleted file mode 100644
-index c900aeef5d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_init_global_taylor_process.cxx
-+++ /dev/null
-@@ -1,68 +0,0 @@
--//:
--// \file
--// \brief A process to init auxiliary scenes and other variables
--// \author Isabel Restrepo
--// \date 12-Apr-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--//:global variables
--namespace bvpl_init_global_taylor_process_globals
--{
--  constexpr unsigned n_inputs_ = 2;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_init_global_taylor_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_taylor_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; // path to taylor_global_info file
--  input_types_[1] = "int"; // dimension (3 for xyz derivatives, 10 for all 1st and 2nd order derivatives)
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_init_global_taylor_process(bprb_func_process& pro)
--{
--  using namespace bvpl_init_global_taylor_process_globals;
--
--  //get inputs
--  std::string taylor_dir = pro.get_input<std::string>(0);
--  int dim = pro.get_input<int>(1);
--
--  switch (dim) {
--    case 3:
--    {
--      std::string kernel_names[] = {"Ix", "Iy", "Iz"};
--      bvpl_global_taylor<float, 3> global_taylor(taylor_dir, kernel_names);
--      global_taylor.init();
--      break;
--    }
--    case 10:
--    {
--      const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--      bvpl_global_taylor<double, 10> global_taylor(taylor_dir, kernel_names);
--      global_taylor.init();
--      break;
--    }
--    default:
--      break;
--  }
--
--
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
-deleted file mode 100644
-index 0e5713c4dc..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_global_taylor_process.cxx
-+++ /dev/null
-@@ -1,52 +0,0 @@
--//:
--// \file
--// \brief
--// \author Isabel Restrepo
--// \date 21-Jul-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl_octree/bvpl_global_taylor.h>
--
--//: global variables
--namespace bvpl_load_global_taylor_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//: sets input and output types
--bool bvpl_load_global_taylor_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_global_taylor_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_global_taylor_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//: the process
--bool bvpl_load_global_taylor_process(bprb_func_process& pro)
--{
--  typedef vbl_smart_ptr<bvpl_global_taylor<double, 10> > bvpl_global_taylor_sptr;
--  using namespace bvpl_load_global_taylor_process_globals;
--
--  // get inputs
--  std::string taylor_file = pro.get_input<std::string>(0);
--  const std::string kernel_names[10] = {"I0", "Ix", "Iy", "Iz", "Ixx", "Iyy", "Izz", "Ixy", "Ixz", "Iyz" };
--  auto *global_taylor = new bvpl_global_taylor<double, 10>(taylor_file, kernel_names);
--
--  // store output
--  pro.set_output_val<bvpl_global_taylor_sptr>(0, global_taylor);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
-deleted file mode 100644
-index 0b405689b0..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_load_taylor_scenes_process.cxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--//:
--// \file
--// \brief A process to load to memory all smart pointers of scenes needed for Taylor reconstruction
--// \author Isabel Restrepo
--// \date 14-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <vul/vul_file.h>
--
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--//:global variables
--namespace bvpl_load_taylor_scenes_process_globals
--{
--  constexpr unsigned n_inputs_ = 7;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_taylor_scenes_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_scenes_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "vcl_string";  //dir to Taylor scenes
--  input_types_[i++] = "int";         // min and max of Taylor kernel
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--  std::vector<std::string> output_types_(n_outputs_);
--  i = 0;
--  output_types_[i++] = "bvpl_taylor_scenes_map_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_taylor_scenes_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_scenes_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  std::string taylor_dir = pro.get_input<std::string>(i++);
--  int min_x = pro.get_input<int>(i++);
--  int min_y = pro.get_input<int>(i++);
--  int min_z = pro.get_input<int>(i++);
--  int max_x = pro.get_input<int>(i++);
--  int max_y = pro.get_input<int>(i++);
--  int max_z = pro.get_input<int>(i++);
--
--  if (!vul_file::is_directory(taylor_dir)) {
--    std::cerr<<"Error in bvpl_load_taylor_scenes_process_process: Taylor directory doesn't exist\n";
--  }
--
--  bvpl_taylor_basis_loader loader(taylor_dir, vgl_point_3d<int>(min_x,min_y, min_z), vgl_point_3d<int>(max_x, max_y, max_z));
--  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
--
--  //store output
--  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
-deleted file mode 100644
-index 6fe31b4168..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_add_error_process.cxx
-+++ /dev/null
-@@ -1,77 +0,0 @@
--//:
--// \file
--// \brief A process to compute taylor projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--
--
--//:global variables
--namespace bvpl_taylor_global_add_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_taylor_global_add_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_add_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "double";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_taylor_global_add_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_add_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_taylor)
--  {
--    std::cerr << "Global taylor is NULL\n";
--    return false;
--  }
--
--  boxm_scene_base_sptr error_scene_base = global_taylor->load_error_scene(scene_id);
--  if (!error_scene_base) {
--    std::cerr << "Error in bvpl_add_taylor_errors_process: Error scene is of incorrect type\n";
--    return false;
--  }
--
--  double error = bvpl_average_value(error_scene_base,block_i, block_j, block_k);
--  std::cout << "Error at block: (" << block_i << ", " << block_j << ", " << block_k << ") is: " << error << '\n';
--
--  //store output
--    pro.set_output_val<double>(0, error);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
-deleted file mode 100644
-index 3f3ca0a701..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/processes/taylor/bvpl_taylor_global_proj_error_process.cxx
-+++ /dev/null
-@@ -1,63 +0,0 @@
--//:
--// \file
--// \brief A process to compute taylor projection coeffiecients
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--
--//:global variables
--namespace bvpl_taylor_global_proj_error_process_globals
--{
--  constexpr unsigned n_inputs_ = 5;
--  constexpr unsigned n_outputs_ = 0;
--}
--
--
--//:sets input and output types
--bool bvpl_taylor_global_proj_error_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_proj_error_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  unsigned i = 0;
--  input_types_[i++] = "bvpl_global_taylor_sptr" ; //global taylor class
--  input_types_[i++] = "int"; //scene id
--  input_types_[i++] = "int";  //block Indices
--  input_types_[i++] = "int";
--  input_types_[i++] = "int";
--
--  std::vector<std::string> output_types_(n_outputs_);
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_taylor_global_proj_error_process(bprb_func_process& pro)
--{
--  using namespace bvpl_taylor_global_proj_error_process_globals;
--
--  //get inputs
--  unsigned i = 0;
--  bvpl_global_taylor_sptr global_taylor = pro.get_input<bvpl_global_taylor_sptr>(i++);
--  int scene_id = pro.get_input<int>(i++);
--  int block_i = pro.get_input<int>(i++);
--  int block_j = pro.get_input<int>(i++);
--  int block_k = pro.get_input<int>(i++);
--
--  if (!global_taylor)
--  {
--    std::cerr << "Global taylor is NULL\n";
--    return false;
--  }
--
--  global_taylor->compute_approximation_error(scene_id, block_i, block_j, block_k);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
-deleted file mode 100644
-index 320399fb72..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,16 +0,0 @@
--include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree )
--include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree/pro)
--
--add_executable( bvpl_octree_pro_test_all
--  test_driver.cxx
--  test_bvpl_plane_propagation_process.cxx
--)
--
--target_link_libraries( bvpl_octree_pro_test_all ${VXL_LIB_PREFIX}testlib bvpl_octree_pro bvpl_octree boxm boxm_pro boxm_sample boxm_util boct bvpl bprb brdb sdet ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
--
--if(SEGFAULT_FIXED)
--add_test( NAME bvpl_octree_pro_plane_propagation_process COMMAND $<TARGET_FILE:bvpl_octree_pro_test_all> test_bvpl_plane_propagation_process)
--endif()
--
--add_executable( bvpl_octree_pro_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_pro_test_include bvpl_octree_pro sdet )
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
-deleted file mode 100644
-index 1073b2e437..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_bvpl_plane_propagation_process.cxx
-+++ /dev/null
-@@ -1,144 +0,0 @@
--#include <iostream>
--#include <vector>
--#include <testlib/testlib_test.h>
--//:
--// \file
--// \brief  This test creates a tree with 8 leaf cells and inserts only one plane to each
--//         After the boxm_plane_propagation_process is applied, each cell will insert their
--//         neighbors' observation planes and insert into itself. At the end each cell should
--//         have 8 planes in the observation list since each cell has 7 neighbors (all the
--//         other cells in the tree)
--//
--// \author Gamze Tunali
--// \date   March 24, 2010
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <brdb/brdb_value.h>
--#include <brdb/brdb_query.h>
--#include <brdb/brdb_selection.h>
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_batch_process_manager.h>
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_parameters_sptr.h>
--#include <bprb/bprb_parameters.h>
--
--#include <boct/boct_tree_cell.h>
--#include <boct/boct_tree.h>
--
--#include <boxm/boxm_scene.h>
--#include <boxm/sample/boxm_edge_tangent_sample.h>
--#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
--#include <vul/vul_file.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--
--static void test_bvpl_plane_propagation_process()
--{
--  typedef boxm_edge_tangent_sample<float> data_type;
--  typedef boct_tree<short,data_type > tree_type;
--  typedef boxm_scene<boct_tree<short,data_type > > scene_type;
--
--  // create the main scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--  vgl_vector_3d<double> block_dim(10,10,10);
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  scene_type scene(lvcs, origin, block_dim, world_dim);
--  scene.set_octree_levels(3,2);
--  scene.set_paths("./boxm_scene", "block");
--  scene.set_appearance_model(BOXM_EDGE_LINE);
--  x_write(std::cout, scene, "scene");
--  vul_file::make_directory("./boxm_scene");
--  scene.write_scene();
--
--  boxm_block_iterator<boct_tree<short,data_type > > iter(&scene);
--  while (!iter.end())
--  {
--    scene.load_block(iter.index().x(),iter.index().y(),iter.index().z());
--    boxm_block<boct_tree<short,data_type > > * block=scene.get_active_block();
--    boct_tree<short,data_type > * tree= block->get_tree();
--
--    // get the leaf nodes and insert one plane to each
--    std::vector<boct_tree_cell<short,data_type >*> cells=tree->leaf_cells();
--    for (unsigned i=0; i<cells.size(); i++) {
--      boxm_plane_obs<float> p(vgl_homg_plane_3d<float>(float(i+1),0.f,0.f,1.f), 1.0f);
--      data_type data = cells[i]->data();
--      data.insert(p);
--      cells[i]->set_data(data);
--    }
--    block->init_tree(tree);
--    block->get_tree()->print();
--    scene.write_active_block();
--    iter++;
--  }
--
--  DECLARE_FUNC_CONS(bvpl_plane_propagate_process);
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_plane_propagate_process, "bvplPlanePropagateProcess");
--  REGISTER_DATATYPE(boxm_scene_base_sptr);
--
--  //: set the inputs
--  brdb_value_sptr v0 = new brdb_value_t<boxm_scene_base_sptr>(new boxm_scene<boct_tree<short,data_type > >(scene));
--  brdb_value_sptr v1 = new brdb_value_t<std::string>(scene.path());
--  brdb_value_sptr v2 = new brdb_value_t<std::string>("new_scene");
--  brdb_value_sptr v3 = new brdb_value_t<std::string>("new_scene.xml");
--
--  //: inits with the default params
--  bool good = bprb_batch_process_manager::instance()->init_process("bvplPlanePropagateProcess");
--  good = good && bprb_batch_process_manager::instance()->set_input(0, v0);
--  good = good && bprb_batch_process_manager::instance()->set_input(1, v1);
--  good = good && bprb_batch_process_manager::instance()->set_input(2, v2);
--  good = good && bprb_batch_process_manager::instance()->set_input(3, v3);
--  good = good && bprb_batch_process_manager::instance()->run_process();
--
--  unsigned id;
--  good = good && bprb_batch_process_manager::instance()->commit_output(0, id);
--  TEST("process commits output", good, true);
--
--  // check if the results are in DB
--  brdb_query_aptr Q = brdb_query_comp_new("id", brdb_query::EQ, id);
--  brdb_selection_sptr S = DATABASE->select("boxm_scene_base_sptr_data", std::move(Q));
--  if (S->size()!=1){
--    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
--             << " no selections\n";
--  }
--  brdb_value_sptr value;
--  if (!S->get_value(std::string("value"), value)) {
--    std::cout << "in bprb_batch_process_manager::set_input_from_db(.) -"
--             << " didn't get value\n";
--  }
--  bool non_null = (value != nullptr);
--  TEST("the output scene non-null", non_null, true);
--
--  auto* result=static_cast<brdb_value_t<boxm_scene_base_sptr>* >(value.ptr());
--  boxm_scene_base_sptr scene_sptr = result->value();
--
--  // get the new scene with updated cells
--  auto *scene2 = static_cast<scene_type *>(scene_sptr.as_pointer());
--  boxm_block_iterator<boct_tree<short,data_type > > iter2(scene2);
--
--  bool obs_num_ok=true;
--  while (!iter2.end())
--  {
--    scene2->load_block(iter2.index().x(),iter2.index().y(),iter2.index().z());
--    boxm_block<tree_type > * block=scene2->get_active_block();
--    tree_type * tree= block->get_tree();
--
--    // get the leaf nodes and insert one plane to each
--    std::vector<boct_tree_cell<short,data_type >*> nodes=tree->leaf_cells();
--    for (auto & node : nodes) {
--      unsigned num=node->data().num_obs();
--      // each node has 8 neighbors in the 3x3 neighborhood including itself
--      if (num != 8)
--        obs_num_ok = false;
--    }
--    iter2++;
--  }
--  TEST("The number of expected observations at each cell", obs_num_ok, true);
--}
--
--TESTMAIN(test_bvpl_plane_propagation_process);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
-deleted file mode 100644
-index 9fae26da90..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_bvpl_plane_propagation_process );
--
--void register_tests()
--{
--  REGISTER( test_bvpl_plane_propagation_process );
--}
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
-deleted file mode 100644
-index 407d98e94a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/tests/test_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/pro/bvpl_octree_processes.h>
--#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
-deleted file mode 100644
-index 79b3a2bcb4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/readme.txt
-+++ /dev/null
-@@ -1,7 +0,0 @@
--Each of the subfolders contains scripts for different experiments:
--
--reconstruction error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed fraction of training samples and varying number of dimensions.
--
--training error: Finds the reconstruction error using PCA kernels of a scene. The error is computed for a fixed dimension and varying number of training samples
--
--Note: *.sh calls the python scripts with appropriate inputs. You only need to adjust *.sh for your system
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
-deleted file mode 100644
-index 133a5822ed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/add_pca_error.py
-+++ /dev/null
-@@ -1,193 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 21, 2011
--
--@author:Isabel Restrepo
--
--Adds the error of a portion of voxels. Each block is processed in a separate thread.
--This script assumes that the reconstruction error at each voxel has been computed
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class pca_error_job():
--
--    def __init__(self, pca_scenes, dim, fraction, block_i, block_j, block_k):
--        self.pca_scenes = pca_scenes
--        self.dim = dim
--        self.fraction = fraction
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--
--
--def execute_jobs(jobs, num_procs=4):
--    # load up work queue
--    work_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    # create a queue to pass to workers to store the results
--    result_queue = multiprocessing.Queue()
--
--    # spawn workers
--    for i in range(num_procs):
--        worker = pca_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--       # collect the results off the queue
--    # all_results=[];
--#    results = []
--#    while len(results) < len(jobs):
--#        result = result_queue.get()
--#        results.append(result)
--#        all_results[job.dim].append(result);
--#
--#    return all_results;
--
--    # collect the results off the queue
--    results = []
--    while len(results) < len(jobs):
--        result = result_queue.get()
--        results.append(result)
--
--    return results
--
--
--class pca_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Adding Errors")
--            batch.init_process("bvplAddPCAErrorsProcess")
--            batch.set_input_from_db(0, job.pca_scenes)
--            batch.set_input_unsigned(1, job.dim)
--            batch.set_input_double(2, job.fraction)
--            batch.set_input_int(3, job.block_i)
--            batch.set_input_int(4, job.block_j)
--            batch.set_input_int(5, job.block_k)
--            batch.run_process()
--            (id, type) = batch.commit_output(0)
--            error_val = dbvalue(id, type)
--            error = batch.get_output_double(id)
--
--            self.result_queue.put(error)
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#***************** The Main Algorithm ************************#
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA Error Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--fraction', action="store",
--                      dest="fraction", type="float", default=0.0)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--    parser.add_option('--dimension', action="store",
--                      dest="dimension", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    fraction = options.fraction
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--    dimension = options.dimension
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        print "Invalid PCA Dir"
--        sys.exit(-1)
--
--    print("Loading Data Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    data_scene = dbvalue(scene_id, scene_type)
--
--    # Load PCA scenes
--    pca_feature_dim = 125
--    print("Loading PCA Error Scenes")
--    batch.init_process("bvplLoadPCAErrorSceneProcess")
--    batch.set_input_from_db(0, data_scene)
--    batch.set_input_string(1, pca_dir)
--    batch.set_input_unsigned(
--        2, pca_feature_dim)  # dimension pca feature
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    pca_scenes = dbvalue(id, type)
--
--    # Begin multiprocessing
--    # Enqueue jobs
--    job_list = []
--    # for dim in range(0, pca_feature_dim):
--    for block_i in range(0, nblocks_x):
--        for block_j in range(0, nblocks_y):
--            for block_k in range(0, nblocks_z):
--                current_job = pca_error_job(
--                    pca_scenes, dimension, fraction, block_i, block_j, block_k)
--                job_list.append(current_job)
--
--    # run
--    results = execute_jobs(job_list, num_cores)
--
--    # dump results
--    total_error = 0
--    for r in results:
--        total_error = total_error + r
--
--    int_frac = int(fraction * 100)
--    error_file = pca_dir + "/error_" + str(dimension) + "/error.txt"
--    fd = open(error_file, "w")
--    print >>fd, total_error / len(results)
--    print >>fd, results
--    fd.close()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
-deleted file mode 100644
-index c8ede20327..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/compute_pca_error_scene.py
-+++ /dev/null
-@@ -1,164 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--Compuets PCA reconstruction error. Each block is processed in a separate thread.
--This script assumes that the pca basis has been computed as gone by extract_pca_kernels.py
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--import sys
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class pca_error_job():
--
--    def __init__(self, pca_info, pca_error_scenes, block_i, block_j, block_k, dim):
--        self.pca_info = pca_info
--        self.pca_error_scenes = pca_error_scenes
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--        self.dim = dim
--
--
--def execute_jobs(jobs, num_procs=4):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = pca_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class pca_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Computing Error Scene")
--            batch.init_process("bvplComputePCAErrorBlockProcess")
--            batch.set_input_from_db(0, job.pca_info)
--            batch.set_input_from_db(1, job.pca_error_scenes)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.set_input_unsigned(5, job.dim)
--            batch.run_process()
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--#*******************The Main Algorithm ************************#
--if __name__ == "__main__":
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA Error Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--    parser.add_option('--dimension', action="store",
--                      dest="dimension", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--    dimension = options.dimension
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        print "Invalid PCA Dir"
--        sys.exit(-1)
--
--    print("Loading Data Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    data_scene = dbvalue(scene_id, scene_type)
--
--    # Load pca scenes
--    pca_feature_dim = 125
--    print("Loading PCA Error Scenes")
--    batch.init_process("bvplLoadPCAErrorSceneProcess")
--    batch.set_input_from_db(0, data_scene)
--    batch.set_input_string(1, pca_dir)
--    batch.set_input_unsigned(
--        2, pca_feature_dim)  # dimension pca feature
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    pca_scenes = dbvalue(id, type)
--
--    print("Loading PCA Info")
--    batch.init_process("bvplLoadPCAInfoProcess")
--    batch.set_input_string(0, pca_dir)
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    pca_info = dbvalue(id, type)
--
--    # Begin multiprocessing
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--    all_indices = []
--    for block_i in range(0, nblocks_x):
--        for block_j in range(0, nblocks_y):
--            for block_k in range(0, nblocks_z):
--                idx = [block_i, block_j, block_k]
--                all_indices.append(idx)
--
--    random.shuffle(all_indices)
--
--    for i in range(0, len(all_indices)):
--        idx = all_indices[i]
--        current_job = pca_error_job(pca_info, pca_scenes, idx[
--            0], idx[1], idx[2], dimension)
--        job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
-deleted file mode 100644
-index 5d8b2b7910..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/extract_pca_kernels.py
-+++ /dev/null
-@@ -1,61 +0,0 @@
--# Computes the gaussian gradients on a boxm_alpha_scene
--
--import os
--import optparse
--import time
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA basis')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--train_fraction', action="store",
--                      dest="train_fraction", type="float", default=0.0)
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    train_fraction = options.train_fraction
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    print("Extracting Principal Components patches")
--
--    print("Creating a Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    scene = dbvalue(scene_id, scene_type)
--
--    start_time = time.time()
--
--    print("Extract PC")
--    batch.init_process("bvplDiscoverPCAFeaturesProcess")
--    batch.set_input_from_db(0, scene)
--    batch.set_input_string(1,  pca_dir)
--    batch.set_input_double(2,  train_fraction)
--    batch.set_input_int(3, -2)  # min and max points of the kernel
--    batch.set_input_int(4, -2)
--    batch.set_input_int(5, -2)
--    batch.set_input_int(6, 2)
--    batch.set_input_int(7, 2)
--    batch.set_input_int(8, 2)
--    batch.run_process()
--
--    print("Runing time forbvplDiscoverPCAFeaturesProcess:")
--    print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
-deleted file mode 100755
-index 61f3346338..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/pca.sh
-+++ /dev/null
-@@ -1,68 +0,0 @@
--#!/bin/bash
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--A script that encapsulates all steps needed to computer pca reconstruction error as a function of number of components used
--"""
--
--if [ $1 = "-r" ] ; then
--  export PYTHONPATH=/Projects/vxl/bin/release/lib
--else
--  if [ $1 = "-d" ] ; then
--    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
--  else
--    echo "Need a flag, either -d or -r";
--  fi
--fi
--
--echo "PYTHONPATH=" $PYTHONPATH
--
--#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
--#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall/10";
--#nblocks_x=1;
--#nblocks_y=1;
--#nblocks_z=1;
--
--
--#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
--#model_name="capitol_scene";
--#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXM_6_4_4/10";
--#nblocks_x=6;
--#nblocks_y=4;
--#nblocks_z=4;
--
--
--model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
--model_name="downtown_scene";
--pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1/10";
--nblocks_x=3;
--nblocks_y=3;
--nblocks_z=1;
--
--train_fraction=0.1;
--test_fraction=1.0;
--num_cores=5;
--
--
--##************Compute Expected Color Scene
--#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
--
--#Compute PCA basis
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $train_fraction
--
--#Compute reconstruction at each voxel in the scene
--for ((dim = 45; dim <125; dim++))
--do
--  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/compute_pca_error_scene.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --dimension $dim
--
--  #Add error of fraction of voxels
--
--  python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/add_pca_error.py --model_dir $model_dir --pca_dir $pca_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $test_fraction --dimension $dim
--done
--
--# #Save all scenes to drishti raw file
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/PCA/release/reconstruction_error/save_pca_raw.py --pca_dir $pca_dir --num_cores $num_cores
--
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/reconstruction_error/explore_histogram.py --pca_dir $pca_dir --num_cores $num_cores
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
-deleted file mode 100644
-index 15d23e5ebf..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/reconstruction_error/save_pca_raw.py
-+++ /dev/null
-@@ -1,108 +0,0 @@
--import multiprocessing
--import Queue
--import time
--import os
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class save_scene_job():
--
--    def __init__(self, input_scene_path, output_scene_path):
--        self.input_scene_path = input_scene_path
--        self.output_scene_path = output_scene_path
--
--
--def execute_jobs(jobs, num_procs=5):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = save_scene_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class save_scene_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating a Scene")
--            batch.init_process("boxmCreateSceneProcess")
--            batch.set_input_string(0, job.input_scene_path)
--            batch.run_process()
--            (scene_id, scene_type) = batch.commit_output(0)
--            scene = dbvalue(scene_id, scene_type)
--
--            print("Save Scene")
--            batch.init_process("boxmSaveSceneRawProcess")
--            batch.set_input_from_db(0, scene)
--            batch.set_input_string(1, job.output_scene_path)
--            batch.set_input_unsigned(2, 0)
--            batch.set_input_unsigned(3, 1)
--            batch.run_process()
--
--            print ("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#*********************The Main Algorithm ****************************#
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    parser = optparse.OptionParser(
--        description='Save taylor responses to raw file')
--
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--
--    options, args = parser.parse_args()
--
--    pca_dir = options.pca_dir
--    num_cores = options.num_cores
--
--    if not os.path.isdir(pca_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--    pca_feature_dim = 125
--    for dim in range(0, pca_feature_dim):
--
--        scene_in_path = pca_dir + "/error_" + str(dim) + "/error_scene.xml"
--        scene_out_path = pca_dir + "/error_" + str(dim) + "/error_scene"
--
--        current_job = save_scene_job(scene_in_path, scene_out_path)
--
--        job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
-deleted file mode 100644
-index 1616b7850a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/extract_pca_kernels.py
-+++ /dev/null
-@@ -1,66 +0,0 @@
--# Computes the gaussian gradients on a boxm_alpha_scene
--
--import os
--import optparse
--import time
--import sys
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA basis')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--train_fraction', action="store",
--                      dest="train_fraction", type="float", default=0.0)
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    pca_dir = options.pca_dir
--    train_fraction = (options.train_fraction) / 10
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    print("Extracting Principal Components patches")
--
--    print("Creating a Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    scene = dbvalue(scene_id, scene_type)
--
--    start_time = time.time()
--
--    print("Extract PC")
--    batch.init_process("bvplDiscoverPCAFeaturesProcess")
--    batch.set_input_from_db(0, scene)
--    batch.set_input_string(1,  pca_dir)
--    batch.set_input_double(2,  train_fraction)
--    batch.set_input_int(3, -2)  # min and max points of the kernel
--    batch.set_input_int(4, -2)
--    batch.set_input_int(5, -2)
--    batch.set_input_int(6, 2)
--    batch.set_input_int(7, 2)
--    batch.set_input_int(8, 2)
--    batch.run_process()
--
--    print ("Runing time for bvplDiscoverPCAFeaturesProcess:")
--    print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
-deleted file mode 100644
-index e151f95144..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/normalized_training_error.py
-+++ /dev/null
-@@ -1,42 +0,0 @@
--# Computes normalized pca training error
--
--import os
--import optparse
--import time
--import sys
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute PCA basis')
--
--    parser.add_option('--pca_dir', action="store", dest="pca_dir")
--    parser.add_option('--train_fraction', action="store",
--                      dest="train_fraction", type="float", default=0.0)
--    options, args = parser.parse_args()
--
--    pca_dir = options.pca_dir
--    train_fraction = (options.train_fraction) / 10
--
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    pca_dir = pca_dir + "/" + str(int(train_fraction * 100))
--    if not os.path.isdir(pca_dir + "/"):
--        os.makedirs(pca_dir + "/")
--
--    start_time = time.time()
--
--    batch.init_process("bvplNormalizePCATrainingErrorProcess")
--    batch.set_input_string(0,  pca_dir)
--    batch.run_process()
--
--    print ("Runing time for bvplNormalizePCATrainingErrorProcess:")
--    print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
-deleted file mode 100755
-index 82b0a516d8..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/pca/training_error/pca.sh
-+++ /dev/null
-@@ -1,42 +0,0 @@
--#!/bin/bash
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--A script that encapsulates all steps needed to computer pca training error as a the number of training samples varies
--"""
--
--if [ $1 = "-r" ] ; then
--  export PYTHONPATH=/projects/vxl/bin/release/lib
--else
--  if [ $1 = "-d" ] ; then
--     export PYTHONPATH=/projects/vxl/bin/Debug/lib
--  else
--    echo "Need a flag, either -d or -r";
--  fi
--fi
--
--echo "PYTHONPATH=" $PYTHONPATH
--
--#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
--#pca_dir="/Users/isa/Experiments/PCA/CapitolBOXMSmall";
--
--model_dir="/homelocal/isa/Experiments/CapitolBOXM_6_4_4";
--pca_dir="/homelocal/isa/Experiments/PCA/CapitolBOXM_6_4_4";
--
--
--#model_dir="/Users/isa/Experiments/DowntownBOXM_3_3_1";
--#pca_dir="/Users/isa/Experiments/PCA/DowntownBOXM_3_3_1";
--
--
--##Compute Expected Color Scene
--#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
--
--#Compute reconstruction at each voxel in the scene
--for ((dim = 2; dim <11; dim++))
--do
--  #Compute PCA basis
--  python extract_pca_kernels.py --model_dir $model_dir --pca_dir $pca_dir --train_fraction $dim
--done
--
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt b/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
-deleted file mode 100644
-index 5030ca4508..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/readme.txt
-+++ /dev/null
-@@ -1 +0,0 @@
--This folder contains Python scripts that use the main processes of bvpl_octree
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
-deleted file mode 100644
-index a7084e3cbe..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/add_taylor_error.py
-+++ /dev/null
-@@ -1,183 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--Adds the error of a portion of voxels. Each block is processed in a separate thread.
--This script assumes that the reconstruction error at each voxel has been computed
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class taylor_error_job():
--
--    def __init__(self, error_scene, fraction, block_i, block_j, block_k):
--        self.error_scene = error_scene
--        self.fraction = fraction
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--
--
--def execute_jobs(jobs, num_procs=4):
--    # load up work queue
--    work_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    # create a queue to pass to workers to store the results
--    result_queue = multiprocessing.Queue()
--
--    # spawn workers
--    for i in range(num_procs):
--        worker = taylor_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--       # collect the results off the queue
--    results = []
--    while len(results) < len(jobs):
--        result = result_queue.get()
--        results.append(result)
--
--    return results
--
--
--class taylor_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Adding Errors")
--            batch.init_process("bvplAddTaylorErrorsProcess")
--            batch.set_input_from_db(0, job.error_scene)
--            batch.set_input_double(1, job.fraction)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.run_process()
--            (id, type) = batch.commit_output(0)
--            error_val = dbvalue(id, type)
--            error = batch.get_output_double(id)
--
--            self.result_queue.put(error)
--
--            print("error")
--            print(error)
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#***************** The Main Algorithm ************************#
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Add Taylor Errors in a Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--fraction', action="store",
--                      dest="fraction", type="float", default=0.0)
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int", default=1)
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int", default=1)
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int", default=1)
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    taylor_dir = options.taylor_dir
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--    fraction = options.fraction
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    print("Loading Error Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  taylor_dir + "/error_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    error_scene = dbvalue(scene_id, scene_type)
--
--    # Begin multiprocessing
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    blocks_x = [i for i in range(0, nblocks_x)]
--    blocks_y = [i for i in range(0, nblocks_y)]
--    blocks_z = [i for i in range(0, nblocks_z)]
--
--    random.shuffle(blocks_x)
--    random.shuffle(blocks_y)
--    random.shuffle(blocks_y)
--
--    # Enqueue jobs
--    for i in range(0, len(blocks_x)):
--        for j in range(0, len(blocks_y)):
--            for k in range(0, len(blocks_z)):
--                block_i = blocks_x[i]
--                block_j = blocks_y[j]
--                block_k = blocks_z[k]
--                current_job = taylor_error_job(
--                    error_scene, fraction, block_i, block_j, block_k)
--                job_list.append(current_job)
--
--    # run
--    results = execute_jobs(job_list, num_cores)
--
--    # dump results
--    total_error = 0
--    for r in results:
--        print(r)
--        total_error = total_error + r
--
--    # write schedule file
--    int_frac = int(fraction * 100)
--    error_file = taylor_dir + "/error_" + str(int_frac) + ".txt"
--    fd = open(error_file, "w")
--    print >>fd, total_error / len(results)
--    print >>fd, results
--    fd.close()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
-deleted file mode 100644
-index 11386b774c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/compute_taylor_error_scene.py
-+++ /dev/null
-@@ -1,156 +0,0 @@
--# -*- coding: utf-8 -*-
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--Compuets Taylor reconstruction error. Each block is processed in a separate thread.
--This script assumes that the taylor kernels have been run on the data scene as done in run_taylor_kernels.py
--"""
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class taylor_error_job():
--
--    def __init__(self, data_scene, taylor_scenes, block_i, block_j, block_k):
--        self.data_scene = data_scene
--        self.taylor_scenes = taylor_scenes
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--
--
--def execute_jobs(jobs, num_procs=4):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = taylor_error_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class taylor_error_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Computing Error Scene")
--            batch.init_process("bvplComputeTaylorErrorProcess")
--            batch.set_input_from_db(0, job.data_scene)
--            batch.set_input_from_db(1, job.taylor_scenes)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.run_process()
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--#*******************The Main Algorithm ************************#
--if __name__ == "__main__":
--    batch.register_processes()
--    batch.register_datatypes()
--
--    # Parse inputs
--    parser = optparse.OptionParser(description='Compute Taylor Error Scene')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    taylor_dir = options.taylor_dir
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    print("Loading Data Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    data_scene = dbvalue(scene_id, scene_type)
--
--    # Load taylor scenes
--    print("Loading Taylor Scenes")
--    batch.init_process("bvplLoadTaylorScenesProcess")
--    batch.set_input_string(0, taylor_dir)
--    batch.set_input_int(1, -2)  # min and max points of the kernel
--    batch.set_input_int(2, -2)
--    batch.set_input_int(3, -2)
--    batch.set_input_int(4, 2)
--    batch.set_input_int(5, 2)
--    batch.set_input_int(6, 2)
--    batch.run_process()
--    (id, type) = batch.commit_output(0)
--    taylor_scenes = dbvalue(id, type)
--
--    # Begin multiprocessing
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    blocks_x = [i for i in range(0, nblocks_x)]
--    blocks_y = [i for i in range(0, nblocks_y)]
--    blocks_z = [i for i in range(0, nblocks_z)]
--
--    random.shuffle(blocks_x)
--    random.shuffle(blocks_y)
--    random.shuffle(blocks_y)
--
--    # Enqueue jobs
--    for i in range(0, len(blocks_x)):
--        for j in range(0, len(blocks_y)):
--            for k in range(0, len(blocks_z)):
--                block_i = blocks_x[i]
--                block_j = blocks_y[j]
--                block_k = blocks_z[k]
--                current_job = taylor_error_job(
--                    data_scene, taylor_scenes, block_i, block_j, block_k)
--                job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
-deleted file mode 100644
-index 40fcac4910..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/explore_histogram.py
-+++ /dev/null
-@@ -1,113 +0,0 @@
--import os
--import multiprocessing
--import Queue
--import time
--import random
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class histogram_job():
--
--    def __init__(self, scene_path):
--        self.scene_path = scene_path
--
--
--def execute_jobs(jobs, num_procs=4):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = histogram_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class histogram_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating a Scene")
--            batch.init_process("boxmCreateSceneProcess")
--            batch.set_input_string(0,  job.scene_path)
--            batch.run_process()
--            (scene_id, scene_type) = batch.commit_output(0)
--            scene = dbvalue(scene_id, scene_type)
--
--            print("Explore Histogram")
--            batch.init_process("bvplSceneHistorgramProcess")
--            batch.set_input_from_db(0, scene)
--            batch.run_process()
--
--            print("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--#*******************The Main Algorithm ************************#
--
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    parser = optparse.OptionParser(description='Run Taylor Kernels')
--
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--
--    options, args = parser.parse_args()
--
--    taylor_dir = options.taylor_dir
--    num_cores = options.num_cores
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    # Kernel names for 2-degree approximation
--    kernel_list = []
--    kernel_list.append("I0")
--    kernel_list.append("Ix")
--    kernel_list.append("Iy")
--    kernel_list.append("Iz")
--    kernel_list.append("Ixx")
--    kernel_list.append("Iyy")
--    kernel_list.append("Izz")
--    kernel_list.append("Ixy")
--    kernel_list.append("Ixz")
--    kernel_list.append("Iyz")
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--    for curr_kernel in range(0, len(kernel_list)):
--        scene_path = taylor_dir + "/" + \
--            kernel_list[curr_kernel] + "/float_response_scene.xml"
--        current_job = histogram_job(scene_path)
--        job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
-deleted file mode 100644
-index 76a0beacab..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/run_taylor_kernels.py
-+++ /dev/null
-@@ -1,98 +0,0 @@
--import os
--from multiprocessing import Queue
--from taylor_kernel_threads import taylor_kernel_job, execute_jobs
--import time
--import optparse
--import random
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--if __name__ == "__main__":
--    parser = optparse.OptionParser(description='Run Taylor Kernels')
--
--    parser.add_option('--model_dir', action="store", dest="model_dir")
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--kernel_path', action="store", dest="kernel_path")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--    parser.add_option('--nblocks_x', action="store",
--                      dest="nblocks_x", type="int")
--    parser.add_option('--nblocks_y', action="store",
--                      dest="nblocks_y", type="int")
--    parser.add_option('--nblocks_z', action="store",
--                      dest="nblocks_z", type="int")
--
--    options, args = parser.parse_args()
--
--    model_dir = options.model_dir
--    taylor_dir = options.taylor_dir
--    kernel_path = options.kernel_path
--    nblocks_x = options.nblocks_x
--    nblocks_y = options.nblocks_y
--    nblocks_z = options.nblocks_z
--    num_cores = options.num_cores
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Model Dir"
--        sys.exit(-1)
--
--    if not os.path.isdir(model_dir + "/"):
--        print "Invalid Kernel Path"
--        sys.exit(-1)
--
--    if not os.path.isdir(taylor_dir + "/"):
--        os.mkdir(taylor_dir + "/")
--
--    # Kernel names for 2-degree approximation
--    kernel_list = []
--    kernel_list.append("I0")
--    kernel_list.append("Ix")
--    kernel_list.append("Iy")
--    kernel_list.append("Iz")
--    kernel_list.append("Ixx")
--    kernel_list.append("Iyy")
--    kernel_list.append("Izz")
--    kernel_list.append("Ixy")
--    kernel_list.append("Ixz")
--    kernel_list.append("Iyz")
--
--    print("Creating a Scene")
--    batch.init_process("boxmCreateSceneProcess")
--    batch.set_input_string(0,  model_dir + "/mean_color_scene.xml")
--    batch.run_process()
--    (scene_id, scene_type) = batch.commit_output(0)
--    scene = dbvalue(scene_id, scene_type)
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = Queue()
--    job_list = []
--
--    blocks_x = [i for i in range(0, nblocks_x)]
--    blocks_y = [i for i in range(0, nblocks_y)]
--    blocks_z = [i for i in range(0, nblocks_z)]
--
--    random.shuffle(blocks_x)
--    random.shuffle(blocks_y)
--    random.shuffle(blocks_y)
--
--    # Enqueue jobs
--    for curr_kernel in range(0, len(kernel_list)):
--        for i in range(0, len(blocks_x)):
--            for j in range(0, len(blocks_y)):
--                for k in range(0, len(blocks_z)):
--                    block_i = blocks_x[i]
--                    block_j = blocks_y[j]
--                    block_k = blocks_z[k]
--                    curr_kernel_path = kernel_path + "/" + \
--                        kernel_list[curr_kernel] + ".txt"
--                    output_path = taylor_dir + "/" + kernel_list[curr_kernel]
--                    if not os.path.isdir(output_path + "/"):
--                        os.mkdir(output_path + "/")
--                    current_job = taylor_kernel_job(
--                        scene, curr_kernel_path, block_i, block_j, block_k, output_path)
--                    job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
-deleted file mode 100644
-index 1694729229..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/save_taylor_raw.py
-+++ /dev/null
-@@ -1,146 +0,0 @@
--import multiprocessing
--import Queue
--import time
--import os
--import optparse
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class save_scene_job():
--
--    def __init__(self, input_scene_path, output_scene_path):
--        self.input_scene_path = input_scene_path
--        self.output_scene_path = output_scene_path
--
--
--def execute_jobs(jobs, num_procs=5):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = save_scene_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class save_scene_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating a Scene")
--            batch.init_process("boxmCreateSceneProcess")
--            batch.set_input_string(0, job.input_scene_path)
--            batch.run_process()
--            (scene_id, scene_type) = batch.commit_output(0)
--            scene = dbvalue(scene_id, scene_type)
--
--            print("Save Scene")
--            batch.init_process("boxmSaveSceneRawProcess")
--            batch.set_input_from_db(0, scene)
--            batch.set_input_string(
--                1, job.output_scene_path + "_float")
--            batch.set_input_unsigned(2, 0)
--            batch.set_input_unsigned(3, 1)
--            batch.run_process()
--
--#            resolution = 0;
--#            enforce_level = 1;
--
--#            print("Convert to regular grid");
--#            batch.init_process("boxmSceneToBvxmGridProcess");
--#            batch.set_input_from_db(0,scene);
--#            batch.set_input_string(1, job.output_scene_path + ".vox");
--#            batch.set_input_unsigned(2, resolution);
--#            batch.set_input_bool(3, enforce_level);
--#            batch.run_process();
--#            (grid_id, grid_type) = batch.commit_output(0);
--#            grid = dbvalue(grid_id, grid_type);
--#
--#            print("Save Grid");
--#            batch.init_process("bvxmSaveGridRawProcess");
--#            batch.set_input_from_db(0,grid);
--#            batch.set_input_string(1,job.output_scene_path + ".raw");
--#            batch.run_process();
--
--            print ("Runing time for worker:", self.name)
--            print(time.time() - start_time)
--
--
--#*********************The Main Algorithm ****************************#
--if __name__ == "__main__":
--
--    batch.register_processes()
--    batch.register_datatypes()
--
--    parser = optparse.OptionParser(
--        description='Save taylor responses to raw file')
--
--    parser.add_option('--taylor_dir', action="store", dest="taylor_dir")
--    parser.add_option('--num_cores', action="store",
--                      dest="num_cores", type="int", default=4)
--
--    options, args = parser.parse_args()
--
--    taylor_dir = options.taylor_dir
--    num_cores = options.num_cores
--
--    if not os.path.isdir(taylor_dir + "/"):
--        print "Invalid Taylor Dir"
--        sys.exit(-1)
--
--    kernel_list = []
--
--    kernel_list.append("I0")
--    kernel_list.append("Ix")
--    kernel_list.append("Iy")
--    kernel_list.append("Iz")
--    kernel_list.append("Ixx")
--    kernel_list.append("Iyy")
--    kernel_list.append("Izz")
--    kernel_list.append("Ixy")
--    kernel_list.append("Ixz")
--    kernel_list.append("Iyz")
--
--    # Begin multiprocessing
--    t1 = time.time()
--    work_queue = multiprocessing.Queue()
--    job_list = []
--
--    # Enqueue jobs
--#  for i in range(0, len(kernel_list)):
--#
--#      scene_in_path = taylor_dir + "/" + kernel_list[i] + "/float_response_scene.xml";
--#      scene_out_path = taylor_dir + "/" + kernel_list[i]+ "/float_response_scene";
--#
--#      current_job = save_scene_job(scene_in_path, scene_out_path);
--#
--#      job_list.append(current_job);
--
--    # append error scene
--    scene_in_path = taylor_dir + "/error_scene.xml"
--    scene_out_path = taylor_dir + "/error_scene"
--    current_job = save_scene_job(scene_in_path, scene_out_path)
--    job_list.append(current_job)
--
--    execute_jobs(job_list, num_cores)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
-deleted file mode 100755
-index db27ee1939..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor.sh
-+++ /dev/null
-@@ -1,67 +0,0 @@
--#!/bin/bash
--"""
--Created on Mon Feb 14, 2011
--
--@author:Isabel Restrepo
--
--A script that encapsulates all steps needed to computer taylor reconstruction error
--"""
--
--if [ $1 = "-r" ] ; then
--  export PYTHONPATH=/Projects/vxl/bin/Release/lib
--else
--  if [ $1 = "-d" ] ; then
--    export PYTHONPATH=/Projects/vxl/bin/Debug/lib
--  else
--    echo "Need a flag, either -d or -r";
--  fi
--fi
--
--echo "PYTHONPATH=" $PYTHONPATH
--
--#model_dir="/Users/isa/Experiments/CapitolBOXMSmall";
--#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXMSmall_test";
--#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
--#nblocks_x=1;
--#nblocks_y=1;
--#nblocks_z=1;
--
--
--#model_dir="/Users/isa/Experiments/CapitolBOXM_6_4_4";
--#model_name="capitol_scene";
--#taylor_dir="/Users/isa/Experiments/Taylor/CapitolBOXM_6_4_4";
--#kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
--#nblocks_x=6;
--#nblocks_y=4;
--#nblocks_z=4;
--
--
--model_dir="/Users/isa/Experiments/DowntownBOXM_12_12_4";
--model_name="downtown_scene";
--taylor_dir="/Users/isa/Experiments/Taylor/DowntownBOXM_12_12_4";
--kernel_path="/Projects/vxl/src/contrib/brl/bseg/bvpl/doc/taylor2_5_5_5";
--nblocks_x=12;
--nblocks_y=12;
--nblocks_z=4;
--
--fraction=1.0;
--num_cores=10;
--
--cd "/Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor"
--
--# #Compute Expected Color Scene
--#python /Projects/voxels-at-lems/scripts/boxm/compute_expected_color_scene.py --model_dir $model_dir --model_name $model_name
--#
--# #Compute Responses to Taylor Kernels
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/run_taylor_kernels.py --model_dir $model_dir --taylor_dir $taylor_dir --kernel_path $kernel_path --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
--#
--# #Compute reconstruction at each voxel in the scene
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/compute_taylor_error_scene.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z
--#
--# #Add error of fraction of voxels
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/add_taylor_error.py --model_dir $model_dir --taylor_dir $taylor_dir --num_cores $num_cores --nblocks_x $nblocks_x --nblocks_y $nblocks_y --nblocks_z $nblocks_z --fraction $fraction
--#
--# #Save all scenes to drishti raw file
--python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/save_taylor_raw.py --taylor_dir $taylor_dir --num_cores $num_cores
--
--#python /Projects/voxels-at-lems/scripts/bvpl/bvpl_octree/taylor/release/explore_histogram.py --taylor_dir $taylor_dir --num_cores $num_cores
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py b/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
-deleted file mode 100644
-index 029ce9315d..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/python/taylor/reconstruction_error/taylor_kernel_threads.py
-+++ /dev/null
-@@ -1,72 +0,0 @@
--import multiprocessing
--import Queue
--import time
--
--import brl_init
--import bvpl_octree_batch as batch
--dbvalue = brl_init.register_batch(batch)
--
--
--class taylor_kernel_job():
--
--    def __init__(self, scene, kernel_path, block_i, block_j, block_k, output_path):
--        self.scene = scene
--        self.kernel_path = kernel_path
--        self.block_i = block_i
--        self.block_j = block_j
--        self.block_k = block_k
--        self.output_path = output_path
--
--
--def execute_jobs(jobs, num_procs=5):
--    work_queue = multiprocessing.Queue()
--    result_queue = multiprocessing.Queue()
--    for job in jobs:
--        work_queue.put(job)
--
--    for i in range(num_procs):
--        worker = taylor_kernel_worker(work_queue, result_queue)
--        worker.start()
--        print("worker with name ", worker.name, " started!")
--
--
--class taylor_kernel_worker(multiprocessing.Process):
--
--    def __init__(self, work_queue, result_queue):
--        # base class initialization
--        multiprocessing.Process.__init__(self)
--        # job management stuff
--        self.work_queue = work_queue
--        self.result_queue = result_queue
--        self.kill_received = False
--
--    def run(self):
--        while not self.kill_received:
--           # get a task
--            try:
--                job = self.work_queue.get_nowait()
--            except Queue.Empty:
--                break
--
--            start_time = time.time()
--
--            print("Creating taylor kernel")
--            batch.init_process("bvplLoadTaylorKernelProcess")
--            batch.set_input_string(0, job.kernel_path)
--            batch.run_process()
--            (kernel_id, kernel_type) = batch.commit_output(0)
--            kernel = dbvalue(kernel_id, kernel_type)
--
--            print("Running Kernel")
--            batch.init_process("bvplBlockKernelOperatorProcess")
--            batch.set_input_from_db(0, job.scene)
--            batch.set_input_from_db(1, kernel)
--            batch.set_input_int(2, job.block_i)
--            batch.set_input_int(3, job.block_j)
--            batch.set_input_int(4, job.block_k)
--            batch.set_input_string(5, "algebraic")
--            batch.set_input_string(6, job.output_path)
--            batch.run_process()
--
--            print ("Runing time for worker:", self.name)
--            print(time.time() - start_time)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
-deleted file mode 100644
-index 0784ff8eea..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# contrib/brl/bseg/bvpl/bvpl_octree/sample/CMakeLists.txt
--
--set(bvpl_octree_sample_sources
--    bvpl_octree_sample.h           bvpl_octree_sample.hxx
--    bvpl_taylor_basis_sample.h     bvpl_taylor_basis_sample.cxx
--    bvpl_pca_basis_sample.h        bvpl_pca_basis_sample.hxx
--   )
--
--aux_source_directory(Templates bvpl_octree_sample_sources)
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_sample LIBRARY_SOURCES ${bvpl_octree_sample_sources})
--target_link_libraries(bvpl_octree_sample ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vnl)
--
--if( BUILD_TESTING )
--  add_subdirectory(tests)
--endif()
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
-deleted file mode 100644
-index 8cdbd4476b..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bsta_gaussian_sphere+float.1-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bsta/bsta_gaussian_sphere.hxx>
--
--BSTA_GAUSSIAN_SPHERE_INSTANTIATE(float, 1);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
-deleted file mode 100644
-index da403deee4..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+bsta_num_obs+bsta_gauss_sf1--.cxx
-+++ /dev/null
-@@ -1,7 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/io/bsta_io_attributes.h>
--#include <bsta/io/bsta_io_gaussian_sphere.h>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--BVPL_OCTREE_SAMPLE_INSTANTIATE(gauss_type);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
-deleted file mode 100644
-index f88db3342c..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_octree_sample+float-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--
--BVPL_OCTREE_SAMPLE_INSTANTIATE(float);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
-deleted file mode 100644
-index fcaa1db057..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/Templates/bvpl_pca_basis_sample+10-.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
--
--BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(10);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
-deleted file mode 100644
-index 8f1cc33b1f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
-+++ /dev/null
-@@ -1,57 +0,0 @@
--// This is brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.h
--#ifndef bvpl_octree_sample_h
--#define bvpl_octree_sample_h
--//:
--// \file
--// \brief  A data structure to contain bvpl_kernel response, and id corresponding to axis of rotations and rotation around axis
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  December 9, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--template<class T_data>
--class bvpl_octree_sample
--{
-- public:
--  //: Default Constructor. Be careful when using default constructor, the value of response may be nonsense
--  //  This is indicated by the negative id.
--  bvpl_octree_sample():response_(),id_(-1){}
--
--  //: Constructor from response and id
--  bvpl_octree_sample(const T_data& response, const int& id):
--  response_(response),id_(id){}
--
--  short version_no() const{ return 1; }
--
--  void  print(std::ostream& os) const;
--
--  //Member variables
--  T_data response_;
--  int id_;
--};
--
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample);
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample);
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample);
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample);
--
--template<class T_data>
--std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample);
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
-deleted file mode 100644
-index fdc4d34d4a..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx
-+++ /dev/null
-@@ -1,70 +0,0 @@
--#ifndef bvpl_octree_sample_hxx_
--#define bvpl_octree_sample_hxx_
--
--#include "bvpl_octree_sample.h"
--
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.response_);
--}
--
--template<class T_data>
--void vsl_b_write(vsl_b_ostream & os, bvpl_octree_sample<T_data> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.response_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template<class T_data>
--void vsl_b_read(vsl_b_istream & is, bvpl_octree_sample<T_data> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--
--template<class T_data>
--void bvpl_octree_sample<T_data>::print(std::ostream& os) const
--{
--  os << "(response=" << response_ << " id=" << id_ <<')';
--}
--
--template<class T_data>
--std::ostream& operator << (std::ostream& os, const bvpl_octree_sample<T_data>& sample)
--{
--  sample.print(os);
--  return os;
--}
--
--#define BVPL_OCTREE_SAMPLE_INSTANTIATE(T) \
--template class bvpl_octree_sample<T >; \
--template std::ostream& operator << (std::ostream&, const bvpl_octree_sample<T >&); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_octree_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, bvpl_octree_sample<T > *&)
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
-deleted file mode 100644
-index 64e29dd1fd..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h
-+++ /dev/null
-@@ -1,57 +0,0 @@
--// This is bvpl_pca_basis_sample.h
--#ifndef bvpl_pca_basis_sample_h
--#define bvpl_pca_basis_sample_h
--
--//:
--// \file
--// \brief A data structure that contains the vector of projections on pca space
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  28-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vnl/vnl_vector_fixed.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--template <unsigned dim>
--class bvpl_pca_basis_sample{
--
--public:
--  bvpl_pca_basis_sample(){
--    pca_projections_.fill(0);
--  }
--
--  bvpl_pca_basis_sample(vnl_vector_fixed<double,dim> pp){
--    pca_projections_ = pp;
--  }
--  inline short version_no() const{ return 1; }
--
--  //: Vector of projections on pca space
--  vnl_vector_fixed<double,dim> pca_projections_;
--
--};
--
--
--template <unsigned dim>
--std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample);
--
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample);
--
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample);
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample);
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
-deleted file mode 100644
-index 93769db3f7..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#ifndef bvpl_pca_basis_sample_hxx_
--#define bvpl_pca_basis_sample_hxx_
--//:
--// \file
--// \author Isabel Restrepo
--// \date 28-Feb-2011
--
--#include "bvpl_pca_basis_sample.h"
--
--#include <vnl/io/vnl_io_vector_fixed.h>
--#include <vsl/vsl_binary_io.h>
--
--
--template <unsigned dim>
--std::ostream& operator << (std::ostream& os, const bvpl_pca_basis_sample<dim>& sample)
--{
--  os << "PCA projection = " << sample.pca_projections_ << std::endl;
--  return os;
--}
--
--//I/O
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.pca_projections_);
--}
--
--template <unsigned dim>
--void vsl_b_write(vsl_b_ostream & os, bvpl_pca_basis_sample<dim> const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.pca_projections_);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--               << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--}
--
--template <unsigned dim>
--void vsl_b_read(vsl_b_istream & is, bvpl_pca_basis_sample<dim> *&sample)
--{
--  vsl_b_read(is, *sample);
--}
--
--
--#define BVPL_PCA_BASIS_SAMPLE_INSTANTIATE(T) \
--template class bvpl_pca_basis_sample<T >; \
--template std::ostream& operator << (std::ostream&, const bvpl_pca_basis_sample<T >&); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const &); \
--template void vsl_b_write(vsl_b_ostream &, bvpl_pca_basis_sample<T > const *&); \
--template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > &); \
--template void vsl_b_read(vsl_b_istream &, bvpl_pca_basis_sample<T > *&)
--
--#endif // bvpl_pca_basis_sample_hxx_
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
-deleted file mode 100644
-index f2d0372181..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.cxx
-+++ /dev/null
-@@ -1,58 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 10-Feb-2011
--
--#include "bvpl_taylor_basis_sample.h"
--#include <vnl/io/vnl_io_matrix_fixed.h>
--#include <vnl/io/vnl_io_vector_fixed.h>
--
--std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample)
--{
--  os << "I0 = " << sample.I0 << ", G= " <<sample.G<< ", H=" << sample.H << std::endl;
--  return os;
--}
--
--//I/O
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample)
--{
--  vsl_b_write(os, sample.version_no());
--  vsl_b_write(os, sample.I0);
--  vsl_b_write(os, sample.G);
--  vsl_b_write(os, sample.H);
--
--}
--
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample)
--{
--  if (sample) {
--    vsl_b_write(os, *sample);
--  }
--}
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample)
--{
--  if (!is) return;
--
--  short version;
--  vsl_b_read(is,version);
--  switch (version)
--  {
--    case 1:
--      vsl_b_read(is, sample.I0);
--      vsl_b_read(is, sample.G);
--      vsl_b_read(is, sample.H);
--      break;
--    default:
--      std::cerr << "I/O ERROR: vsl_b_read(vsl_b_istream&, boxm_sample<T>&)\n"
--      << "           Unknown version number "<< version << '\n';
--      is.is().clear(std::ios::badbit); // Set an unrecoverable IO error on stream
--      break;
--  }
--
--}
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample)
--{
--  vsl_b_read(is, *sample);
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h b/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
-deleted file mode 100644
-index a10ece861f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h
-+++ /dev/null
-@@ -1,59 +0,0 @@
--// This is bvpl_taylor_basis_sample.h
--#ifndef bvpl_taylor_basis_sample_h
--#define bvpl_taylor_basis_sample_h
--
--//:
--// \file
--// \brief A data structure that contains vectors and matrices needed for taylor approximation
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  10-Feb-2011.
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <vnl/vnl_double_3.h>
--#include <vnl/vnl_double_3x3.h>
--
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vsl/vsl_binary_io.h>
--
--
--//: Data structure needed for 2-degree taylor approximation of 3-dimesional volumes
--class bvpl_taylor_basis2_sample
--{
--public:
--  bvpl_taylor_basis2_sample()
--  {
--    I0 = 0.0f;
--    //empty - to save space
--    G = vnl_double_3(0.0,0.0,0.0);
--    H = vnl_double_3x3(0.0);
--  }
--
--  bvpl_taylor_basis2_sample(double zeroth_dev, vnl_double_3 grad, vnl_double_3x3 hess): I0(zeroth_dev), G(grad), H(hess){}
--
--  short version_no() const{ return 1; }
--  //: Approximation to zeroth derivative
--  double I0;
--  //: Approximation to the Gradient Vector
--  vnl_double_3 G;
--  //: Approximation to the Hessian
--  vnl_double_3x3 H;
--};
--
--std::ostream& operator << (std::ostream& os, const bvpl_taylor_basis2_sample& sample);
--
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const &sample);
--
--void vsl_b_write(vsl_b_ostream & os, bvpl_taylor_basis2_sample const * &sample);
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample &sample);
--
--void vsl_b_read(vsl_b_istream & is, bvpl_taylor_basis2_sample *&sample);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
-deleted file mode 100644
-index a5ca7c7bdf..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,4 +0,0 @@
--add_executable( bvpl_octree_sample_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_sample_test_include bvpl_octree_sample)
--add_executable( bvpl_octree_sample_test_template_include test_template_include.cxx )
--target_link_libraries( bvpl_octree_sample_test_template_include bvpl_octree_sample)
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
-deleted file mode 100644
-index df8d03d364..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_include.cxx
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.h>
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.h>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
-deleted file mode 100644
-index 075d4723fb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/sample/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/sample/bvpl_octree_sample.hxx>
--#include <bvpl/bvpl_octree/sample/bvpl_pca_basis_sample.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
-deleted file mode 100644
-index 5781fd45ca..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,35 +0,0 @@
--include_directories( ${MUL_INCLUDE_DIR} )
--
--add_executable( bvpl_octree_test_all
--  test_driver.cxx
--  test_octree_kernel_operator.cxx
--  test_octree_neighbors.cxx
--#Test EXHIBITS PATH ERRORS --  FIX_ME
--#  test_pca_kernels.cxx
--#Test FAILS --  FIX_ME
--#  test_taylor_basis.cxx
--# Test FAILS FIX_ME
--#  test_gauss3D_steerable_filters.cxx
-- )
--
--set(bvpl_octree_test_all_sources
--    test_utils.h    test_utils.cxx
--   )
--
--vxl_add_library(LIBRARY_NAME bvpl_octree_tests_util LIBRARY_SOURCES  ${bvpl_octree_test_all_sources})
--
--target_link_libraries( bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
--target_link_libraries( bvpl_octree_test_all bvpl_octree_tests_util bvpl_octree_io bvpl_octree bvpl boct boxm ${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul)
--
--add_test( NAME bvpl_octree_test_kernel_operator COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_kernel_operator  )
--add_test( NAME bvpl_octree_test_neighbors COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_octree_neighbors  )
--#add_test( NAME bvpl_octree_test_pca COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_pca_kernels )
--#add_test( NAME bvpl_octree_test_taylor_basis COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_taylor_basis )
--#add_test( NAME test_gauss3D_steerable_filters COMMAND $<TARGET_FILE:bvpl_octree_test_all> test_gauss3D_steerable_filters )
--
--add_executable( bvpl_octree_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_test_include bvpl_octree)
--
--add_executable( bvpl_octree_test_template_include test_template_include.cxx )
--target_link_libraries( bvpl_octree_test_template_include bvpl_octree)
--
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
-deleted file mode 100644
-index b1b39e0bed..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_driver.cxx
-+++ /dev/null
-@@ -1,19 +0,0 @@
--#include <testlib/testlib_register.h>
--
--DECLARE( test_octree_kernel_operator );
--DECLARE( test_octree_neighbors );
--//DECLARE( test_pca_kernels );//TEST EXHIBITS PATH ERRORS
--//DECLARE( test_taylor_basis );//TEST FAILS FIX_ME
--//DECLARE( test_gauss3D_steerable_filters );//TEST FAILS FIX_ME
--
--void register_tests()
--{
--  REGISTER( test_octree_kernel_operator );
--  REGISTER( test_octree_neighbors );
--  //  REGISTER( test_pca_kernels );
--  //  REGISTER( test_taylor_basis );
--  //  REGISTER( test_gauss3D_steerable_filters );
--}
--
--
--DEFINE_MAIN;
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
-deleted file mode 100644
-index 47ec04a8ef..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_gauss3D_steerable_filters.cxx
-+++ /dev/null
-@@ -1,127 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 24-Aug-2011
--
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--#include <bvpl_octree/bvpl_gauss3D_steerable_filters.h>
--
--void test_gauss3D_steerable_filters()
--{
--  typedef boct_tree<short, float> float_tree_type;
--  typedef boct_tree<short, vnl_vector_fixed< float,10 > > out_tree_type;
--
--  clean_up();
--
--  //create scene
--  boxm_scene<boct_tree<short, float > > *mean_scene = create_scene(2,2,2);
--
--  //Explore mean scene
--  std::cout << "Exploring mean scene \n";
--  {
--    boxm_cell_iterator<boct_tree<short,float > > iterator = mean_scene->cell_iterator(&boxm_scene<boct_tree<short, float > >::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short,float > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  //create the output scenes
--  boxm_scene<out_tree_type> *scene_out =
--  new boxm_scene<out_tree_type>(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
--  scene_out->set_paths(".", "steerable_gauss_3d_scene");
--  scene_out->set_appearance_model(VNL_FLOAT_10);
--  scene_out->write_scene("steerable_gauss_3d_scene.xml");
--  mean_scene->clone_blocks_to_vector<10>(*scene_out);
--
--  //Explore Initial Response scene
--  std::cout << "Exploring initial response scene \n";
--  {
--    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  boxm_scene<boct_tree<short, bool> > *valid_scene =
--  new boxm_scene<boct_tree<short, bool> >(mean_scene->lvcs(), mean_scene->origin(), mean_scene->block_dim(), mean_scene->world_dim(), mean_scene->max_level(), mean_scene->init_level());
--  valid_scene->set_paths(".", "valid_scene");
--  valid_scene->set_appearance_model(BOXM_BOOL);
--  valid_scene->write_scene("valid_scene.xml");
--
--  //operate on scene
--  double cell_length = scene_out->finest_cell_length();
--  bvpl_gauss3D_steerable_filters sf;
--
--  sf.basis_response_at_leaves(scene_out, valid_scene, cell_length);
--
--
--  //Explore Response scene
--  std::cout << "Exploring response scene \n";
--  {
--    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  //rotate features according to gradient
--  sf.rotation_invariant_interpolation(scene_out, valid_scene);
--
--  //Explore Invariant Response scene
--  std::cout << "Exploring rotation invariant response scene \n";
--  {
--    boxm_cell_iterator<out_tree_type > iterator = scene_out->cell_iterator(&boxm_scene<out_tree_type>::load_block);
--    iterator.begin();
--
--    while (!iterator.end()) {
--      boct_tree_cell<short, vnl_vector_fixed<float,10> > *cell = *iterator;
--      //if(cell->data().mean() > 0.6)
--      {
--        boct_loc_code<short> code =cell->get_code();
--        std::cout << " Code: " <<code<< std::endl;
--        std::cout << " At cell located at: " << iterator.global_origin() << " Data: " << cell->data() << std::endl;
--
--      }
--      ++iterator;
--    }
--  }
--
--  bool result = true;
--  TEST("Valid Test", result, true);
--}
--
--
--TESTMAIN(test_gauss3D_steerable_filters);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
-deleted file mode 100644
-index a3b8a060e7..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_include.cxx
-+++ /dev/null
-@@ -1,24 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_block_kernel_operator.h>
--#include <bvpl/bvpl_octree/bvpl_block_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_cell_data_traits.h>
--#include <bvpl/bvpl_octree/bvpl_corner_detector.h>
--#include <bvpl/bvpl_octree/bvpl_corner_functors.h>
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_gauss3D_steerable_filters.h>
--#include <bvpl/bvpl_octree/bvpl_global_corners.h>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.h>
--#include <bvpl/bvpl_octree/bvpl_octree_kernel_operator.h>
--#include <bvpl/bvpl_octree/bvpl_octree_neighbors.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vector_operator_impl.h>
--#include <bvpl/bvpl_octree/bvpl_octree_vrml_util.h>
--#include <bvpl/bvpl_octree/bvpl_pca_error_scenes.h>
--#include <bvpl/bvpl_octree/bvpl_scene_kernel_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_neighborhood_operator.h>
--#include <bvpl/bvpl_octree/bvpl_scene_statistics.h>
--#include <bvpl/bvpl_octree/bvpl_scene_vector_operator.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_scenes_map.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
-deleted file mode 100644
-index 73b0ddef0f..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_kernel_operator.cxx
-+++ /dev/null
-@@ -1,352 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov. 16, 2009.
--
--#include <testlib/testlib_test.h>
--
--#include "../bvpl_octree_kernel_operator.h"
--#include "../bvpl_scene_kernel_operator.h"
--#include "../bvpl_octree_vector_operator_impl.h"
--#include "../bvpl_scene_vector_operator.h"
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--
--#include <boct/boct_loc_code.h>
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--static bool debug = false;
--typedef boct_tree<short, float> tree_type;
--typedef boct_tree_cell<short, float> cell_type;
--
--
--void fill_sample_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--    tree->split();
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5);
--    if (debug)
--      for (auto & leave : leaves) {
--        std::cout<< leave->get_code().x_loc_ << ','
--                << leave->get_code().y_loc_ << ','
--                << leave->get_code().z_loc_ << ','
--                << leave->data() << std::endl;
--      }
--
--    leaves[1]->split();
--    //leaves[1]->set_data(0.6);
--  }
--
--#if 0
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (unsigned i=0; i<leaves.size(); i++) {
--      std::cout<< leaves[i]->get_code().x_loc_ << ','
--              << leaves[i]->get_code().y_loc_ << ','
--              << leaves[i]->get_code().z_loc_ << ','
--              << tree->local_origin(leaves[i]) << ','
--              << leaves[i]->get_code().level << ','
--              << tree->cell_size(leaves[i]) << ','
--              << leaves[i]->data() << std::endl;
--    }
--  }
--#endif
--}
--
--void fill_edge3d_tree(boct_tree<short,float>* tree)
--{
--  tree-> split();
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  for (unsigned i= 0; i<4; i++)
--  {
--    leaves[i]->set_data(0.2f);
--    leaves[i]->split();
--    {
--      boct_tree_cell<short,float>* cc =leaves[i]->children();
--      for (unsigned j1=0; j1<8; j1++)
--        cc[j1].split();
--    }
--    leaves[i+4]->set_data(0.9f);
--    leaves[i+4]->split();
--    {
--      boct_tree_cell<short,float>* cc =leaves[i+4]->children();
--      for (unsigned j1=0; j1<8; j1++)
--        cc[j1].split();
--    }
--    //split children
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  }
--}
--
--void octree_kernel()
--{
--  //Create kernel
--  bvpl_edge3d_kernel_factory edge_factory(-1,1,-1,0,-1,0);
--  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
--#ifdef DEBUG
--  kernel->print();
--#endif
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--  //Create the octree
--  auto *tree = new boct_tree<short,float>(3);
--  fill_sample_octree(tree);
--
--  //operate kernel on octree
--  bvpl_octree_kernel_operator<float> oper(tree);
--
--  boct_tree<short,float> *tree_out = tree->clone();
--#ifdef DEBUG
--  tree_out->print();
--#endif
--  oper.operate(functor, kernel, tree_out, 1, 0.5);
--#ifdef DEBUG
--  tree_out->print();
--#endif
--
--  TEST("Octree kernel", true, true);
--  delete tree;
--  delete tree_out;
--}
--
--void scene_kernel_operator()
--{
--  //Create kernel
--  bvpl_edge3d_kernel_factory edge_factory(-1,0,-1,0,-1,0);
--  bvpl_kernel_sptr kernel = new bvpl_kernel(edge_factory.create());
--
--  //kernel->print();
--
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--
--  /***********Part1 operate on tree*******************/
--
--  //Create tree
--  typedef boct_tree<short,float > tree_type;
--  auto *tree = new boct_tree<short,float>(3);
--
--  fill_sample_octree(tree);
--
--  //operate on octree
--  bvpl_octree_kernel_operator<float> oper(tree);
--
--
--  //Create output trees
--  boct_tree<short,float > *tree_out = tree->clone();
--  tree_out->init_cells(0.0f);
--  short level = 0;
--  double cell_length = 1.0/(double)(1<<(tree->root_level() -level));
--
--  // void operate(F functor, bvpl_kernel_sptr kernel, tree_type* out_tree, short level, double cell_length)
--  oper.operate(functor,kernel, tree_out, level, cell_length);
--
--
--  /***********Part2 operate on scene*******************/
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(1,1,1);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  std::string scene_path="./";
--  scene.set_paths(scene_path, "in_block");
--
--  boxm_block_iterator<tree_type>  iter =scene.iterator();
--  iter.begin();
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type> *block = scene.get_active_block();
--    block->init_tree(tree->clone());
--    scene.write_active_block();
--  }
--
--  //Create the output scenes
--  boxm_scene<boct_tree<short,float> > scene_out(lvcs, origin, block_dim, world_dim);
--  scene_out.set_paths(scene_path, "response_scene");
--
--  //operate on scene
--  bvpl_scene_kernel_operator scene_oper;
--  scene_oper.operate(scene,functor, kernel, scene_out);
--
--  //compare blocks of scene with single tree, result should be the same
--  std::vector<boct_tree_cell<short,float>* > leaves_out = tree_out->leaf_cells();
--  boxm_block_iterator<tree_type>  iter2 =scene_out.iterator();
--  bool eq=true;
--  iter2.begin();
--  for (; !iter2.end(); iter2++) {
--    scene_out.load_block(iter2.index());
--    boxm_block<tree_type> *block = scene_out.get_active_block();
--    tree_type *temp_tree = block->get_tree();
--    std::vector<boct_tree_cell<short,float>* > temp_leaves = temp_tree->leaf_cells();
--    // compare tree values
--    for (unsigned i=0; i<temp_leaves.size(); i++) {
--      if (!((temp_leaves[i]->data() == leaves_out[i]->data())))
--      {
--        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
--        eq = false;
--      }
--    }
--  }
--  TEST("tree operator == scene operator", eq, true);
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());//file_it() is deleted here
--   // vul_file::delete_file_glob(file_it());
--  }
--}
--
--void octree_vector_operator()
--{
--  //Create the vector of kernels
--  bvpl_edge3d_kernel_factory kernels_3d(-3,2, -3,2,-3,2);
--  bvpl_create_directions_a dir;
--  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
--
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--  //Create tree. this tree is initialized with 4 leves as a regular grid
--  auto *tree = new boct_tree<short,float>(4);
--
--  fill_edge3d_tree(tree);
--
--  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
--  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
--  short level = 0;
--  double cell_length = 1.0/(double)(1<<(3 -level));
--
--  bvpl_max_vector_operator<float> vector_op;
--
--  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
--
--  //test response at the center is correct
--  boct_loc_code<short> loc_code;
--
--  bool result = true;
--  for (short x=3; x<5; x++)
--    for (short y=3; y<5; y++)
--      for (short z=3; z<5; z++)
--      {
--        loc_code.set_code(x,y,z);
--        loc_code.set_level(0);
--        result = result && tree_out->get_cell(loc_code)->data().id_ == 0;
--      }
--  TEST("Octree vector operator", result, true);
--}
--
--void scene_vector_operator()
--{
--  //Create the vector of kernels
--  bvpl_edge3d_kernel_factory kernels_3d(-3,2,-3,2,-3,2);
--  bvpl_create_directions_a dir;
--  bvpl_kernel_vector_sptr kernel_vec = kernels_3d.create_kernel_vector(dir);
--
--  //Create functor
--  bvpl_edge_geometric_mean_functor<float> functor;
--
--  /***********Part1 operate on tree*******************/
--
--  //Create tree. this tree is initialized with 4 leves as a regular grid
--  auto *tree = new boct_tree<short,float>(4);
--  fill_edge3d_tree(tree);
--
--  //Create output trees
--  boct_tree<short,bvpl_octree_sample<float> > *tree_out = tree->clone_to_type<bvpl_octree_sample<float> >();
--  tree_out->init_cells(bvpl_octree_sample<float>(0.0f, -1));
--  short level = 0;
--  double cell_length = 1.0/(double)(1<<(3 -level));
--
--  //operate vector on tree
--  bvpl_max_vector_operator<float> vector_op;
--
--  vector_op.operate(tree, functor, kernel_vec, tree_out, level, cell_length);
--
--  /***********Part2 operate on scene*******************/
--
--  //Crete the input scene
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(10,10,20);
--
--  vgl_vector_3d<double> block_dim(1,1,1); //world coordinate dimensions of a block
--  vgl_vector_3d<unsigned> world_dim(2,2,2); //number of blocks in a scene
--
--  boxm_scene<tree_type> scene(lvcs, origin, block_dim, world_dim);
--  std::string scene_path("./");
--  scene.set_paths(scene_path, "scene_in");
--
--  boxm_block_iterator<tree_type>  iter =scene.iterator();
--  iter.begin();
--  for (; !iter.end(); iter++) {
--    scene.load_block(iter.index());
--    boxm_block<tree_type> *block = scene.get_active_block();
--    block->init_tree(tree->clone());
--    scene.write_active_block();
--  }
--
--  //Create the output scenes
--  boxm_scene<boct_tree<short,bvpl_octree_sample<float> > > scene_out(lvcs, origin, block_dim, world_dim);
--  scene_out.set_paths(scene_path, "response_scene");
--
--  //operate on scene
--  bvpl_scene_vector_operator scene_oper;
--  scene_oper.operate(scene, functor, kernel_vec, scene_out);
--
--  //compare blocks of scene with single tree, result should be the same
--  std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > leaves_out = tree_out->leaf_cells();
--  boxm_block_iterator<boct_tree<short,bvpl_octree_sample<float> > >  iter2 =scene_out.iterator();
--  bool eq = true;
--  iter2.begin();
--  for (; !iter2.end(); iter2++) {
--    scene_out.load_block(iter2.index());
--    boxm_block<boct_tree<short,bvpl_octree_sample<float> > > *block = scene_out.get_active_block();
--    boct_tree<short,bvpl_octree_sample<float> > *temp_tree = block->get_tree();
--    std::vector<boct_tree_cell<short,bvpl_octree_sample<float> >* > temp_leaves = temp_tree->leaf_cells();
--    // compare tree values
--    for (unsigned i=0; i<temp_leaves.size(); i++)
--      if (!((temp_leaves[i]->data().response_ == leaves_out[i]->data().response_)||
--            (temp_leaves[i]->data().id_ == leaves_out[i]->data().id_)))
--      {
--        std::cout << "scene data: " << temp_leaves[i]->data() << " grid data: " << leaves_out[i]->data()  << std::endl;
--        eq = false;
--      }
--  }
--
--  TEST("tree operator == scene operator", eq, true);
--
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());//Already deletes file_it()
--  //  vul_file::delete_file_glob(file_it());
--  }
--}
--
--
--static void test_octree_kernel_operator()
--{
--  octree_kernel();
-- // octree_vector_operator(); //TEST FAIL FIX_ME
-- // scene_kernel_operator();
-- // scene_vector_operator();
-- }
--
--TESTMAIN(test_octree_kernel_operator);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
-deleted file mode 100644
-index 20a062b9f9..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_octree_neighbors.cxx
-+++ /dev/null
-@@ -1,92 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Nov. 16, 2009.
--
--#include <testlib/testlib_test.h>
--
--#include "../bvpl_octree_neighbors.h"
--#include "../bvpl_scene_kernel_operator.h"
--#include "../bvpl_octree_vector_operator_impl.h"
--#include "../bvpl_scene_vector_operator.h"
--#include <bvpl/functors/bvpl_edge_geometric_mean_functor.h>
--#include <bvpl/kernels/bvpl_edge3d_kernel_factory.h>
--#include <bvpl/kernels/bvpl_create_directions.h>
--
--#include <boct/boct_loc_code.h>
--
--static bool debug = false;
--typedef boct_tree<short, float> tree_type;
--typedef boct_tree_cell<short, float> cell_type;
--
--
--void fill_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--    //tree->split();
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5);
--    if (debug)
--      for (auto & leave : leaves) {
--        std::cout<< leave->get_code().x_loc_ << ','
--                << leave->get_code().y_loc_ << ','
--                << leave->get_code().z_loc_ << ','
--                << leave->data() << std::endl;
--      }
--
--    leaves[0]->split();
--    //leaves[1]->set_data(0.6);
--  }
--
--#if 0
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (unsigned i=0; i<leaves.size(); i++) {
--      std::cout<< leaves[i]->get_code().x_loc_ << ','
--              << leaves[i]->get_code().y_loc_ << ','
--              << leaves[i]->get_code().z_loc_ << ','
--              << tree->local_origin(leaves[i]) << ','
--              << leaves[i]->get_code().level << ','
--              << tree->cell_size(leaves[i]) << ','
--              << leaves[i]->data() << std::endl;
--    }
--  }
--#endif
--}
--
--static void test_octree_neighbors()
--{
--  auto* tree = new boct_tree<short,float>(4,3);
--  fill_octree(tree);
--  bvpl_kernel_iterator iter;
--  vgl_point_3d<int> min_pt(-1,-1,-1);
--  vgl_point_3d<int> max_pt(1,1,1);
--  for (int i=min_pt.x(); i<=max_pt.x(); i++) {
--    for (int j=min_pt.y(); j<=max_pt.y(); j++) {
--      for (int k=min_pt.z(); k<=max_pt.z(); k++) {
--        iter.insert(vgl_point_3d<int>(i,j,k),bvpl_kernel_dispatch(1.0f));
--      }
--    }
--  }
--  bvpl_kernel_sptr kernel= new bvpl_kernel(iter, vnl_float_3(0,0,1), vnl_float_3(0,1,0),0.0f, vgl_vector_3d<int>(3,3,3), min_pt,max_pt);
--
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  bvpl_octree_neighbors<float> neighb(tree);
--  for (auto cell : leaves) {
--    std::cout << cell->code_
--             << "THIS   " << tree->local_origin(cell) << std::endl;
--    std::vector<boct_tree_cell<short,float> *> neighb_cells;
--    neighb.neighbors(kernel, cell, neighb_cells);
--    std::cout << "Number of neighbors: " << neighb_cells.size() << std::endl;
--    for (auto & neighb_cell : neighb_cells) {
--      std::cout << "  " << tree->local_origin(neighb_cell) << std::endl;
--    }
--  }
--}
--
--TESTMAIN(test_octree_neighbors);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
-deleted file mode 100644
-index 602b9b14c6..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_pca_kernels.cxx
-+++ /dev/null
-@@ -1,304 +0,0 @@
--//:
--// \file
--// \brief : Tests bvpl/PCA operations
--// \author Isabel Restrepo
--// \date 17-Nov-2010
--
--#include <testlib/testlib_test.h>
--
--#include <bvpl/bvpl_octree/bvpl_discover_pca_kernels.h>
--#include <bvpl/bvpl_octree/bvpl_global_pca.h>
--#include "test_utils.h"
--
--#include <vnl/vnl_vector.h>
--#include <vnl/vnl_vector_fixed.h>
--#include <vnl/vnl_matrix.h>
--#include <vnl/vnl_matrix_fixed.h>
--
--#include <vul/vul_file.h>
--#include <vpl/vpl.h>
--
--void test_kernel_set_up()
--{
--  bool result=true;;
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene(4,4,4);
--  //neighborhood box for volume "patches" 3x3x3
--   vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-1,-1,-1), vgl_point_3d<int>(1,1,1));
--  //number of samples - 10% of total number of leaf-cells
--  unsigned long nsamples = (unsigned long)((double)scene->size() * 0.1);
--
--  clean_up("./evd", "*.txt");
--  vpl_mkdir("./evd",0777);
--  clean_up("./svd", "*.txt");
--  vpl_mkdir("./svd",0777);
--
--  bvpl_discover_pca_kernels pca_extractor(neighborhood, nsamples, scene, "./evd");
--  bvpl_discover_pca_kernels pca_extractor_svd(neighborhood, nsamples, scene, "./svd", false);
--
--
--  //XML write
--  pca_extractor.xml_write();
--  pca_extractor_svd.xml_write();
--
--  //training errorr
--  vnl_vector<double> verror;
--  vnl_vector<double> t_verror;
--  vnl_vector<double> testing_error;
--  pca_extractor.compute_training_error(verror);
--  pca_extractor.theoretical_training_error(t_verror);
--  pca_extractor.compute_testing_error(testing_error);
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_pca_kernels - 1 " << boct_tree_cell<short, float >::nleaks() << '\n';
--#endif
--
--  result = verror[verror.size()-1] < 1.0e-7;
--  TEST("Test training error:", result, true);
--
--  bvpl_discover_pca_kernels pca_extractor2("./evd");
--  vnl_vector<double> verror2;
--  pca_extractor2.compute_training_error(verror2);
--  vnl_vector<double> test_error2;
--  pca_extractor2.compute_testing_error(test_error2);
--
--  //Load from XML file - and check that clases are the same
--  result = pca_extractor.principal_comps().is_equal(pca_extractor2.principal_comps(), 1.0e-9);
--  TEST("Test xml_write PC:", result, true);
--
--  result = pca_extractor.weights().is_equal(pca_extractor2.weights(), 1.0e-9);
--  TEST("Test xml_write weights:", result, true);
--
--  result = pca_extractor.mean().is_equal(pca_extractor2.mean(), 1.0e-9);
--  TEST("Test xml_write mean:", result, true);
--
--  result = pca_extractor.feature_dim()== pca_extractor2.feature_dim();
--  TEST("Test xml_write feature dim:", result, true);
--
--  result = pca_extractor.nsamples()== pca_extractor2.nsamples();
--  TEST("Test xml_write nsamples :", result, true);
--
--  result = verror.is_equal(t_verror, 1.0e-9);
--  TEST("Test training errors agrees with theoretical value:", result, true);
--
--  result = testing_error.squared_magnitude() > t_verror.squared_magnitude();
--  TEST("Test testing error > training error:", result, true);
--
--  result = testing_error.is_equal(test_error2, 1.0e-9);
--  TEST("Testing errors are equal:", result, true);
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks at test_pca_kernels - 2 " << boct_tree_cell<short, float >::nleaks() << '\n';
--#endif
--
--#if 0
--  std::cout<< "error : " << verror << '\n'
--          << "t_error : " << t_verror << '\n'
--          << "weights : " << pca_extractor.weights() << '\n'
--
--          << "error 1: " << verror << '\n'
--          << "error 2: " << verror2 << '\n'
--
--          << "mean 1: " << pca_extractor.mean() << '\n'
--          << "mean 2: " << pca_extractor2.mean() << '\n'
--
--          << "path 1: " << pca_extractor.scene_path() << '\n'
--          << "path 2: " << pca_extractor2.scene_path() << std::endl;
--#endif
--}
--
--void test_global()
--{
--  //create scene
--  boxm_scene<boct_tree<short, float> > *scene = create_scene(3,3,3);
--  //neighborhood box for volume "patches" 5x5x5
--  vgl_box_3d<int> neighborhood(vgl_point_3d<int>(-2,-2,-2), vgl_point_3d<int>(2,2,2));
--  //number of samples - 10% of total number of leaf-cells
--  double training_fraction = 1.0;
--  unsigned long nsamples = (unsigned long)((double)scene->size() * training_fraction);
--  double finest_cell_length = scene->finest_cell_length();
--
--  clean_up("./pca_info", "*.txt");
--  vpl_mkdir("./pca_info",0777);
--  clean_up("./pca_global_info", "*.txt");
--  vpl_mkdir("./pca_global_info",0777);
--
--  bvpl_discover_pca_kernels pca_info(neighborhood, nsamples, scene, "./pca_info");
--  pca_info.xml_write();
--
--  std::vector<std::string> scenes;
--  std::vector<std::string> aux_paths;
--  std::vector<double> cell_lengths;
--  scenes.push_back("./test_scene.xml");
--  aux_paths.push_back(".");
--  cell_lengths.push_back(finest_cell_length);
--
--  boxm_scene<boct_tree<short, int> > *aux_scene =
--  new boxm_scene<boct_tree<short, int> >(scene->lvcs(), scene->origin(), scene->block_dim(), scene->world_dim(), scene->max_level(), scene->init_level());
--  aux_scene->set_appearance_model(BOXM_INT);
--
--  std::string scene_name = "test_aux_scene";
--  std::string scene_path(vul_file::get_cwd());
--  aux_scene->set_paths(scene_path, scene_name);
--  aux_scene->write_scene("./test_aux_scene.xml");
--
--  bvpl_global_pca<125> pca_global_info(scenes, aux_paths,cell_lengths, neighborhood,training_fraction, "./pca_global_info");
--  pca_global_info.xml_write();
--
--  vnl_matrix<double> s1 = pca_info.compute_scatter_matrix(scene);
--
--  unsigned file =0;
--  for (unsigned i = 0; i < 3; i++)
--    for (unsigned j = 0; j < 3; j++)
--      for (unsigned k = 0; k < 3; k++) {
--        vnl_matrix_fixed<double, 125, 125> S;
--        vnl_vector_fixed<double, 125> mean;
--        unsigned long nfeature =0L;
--        pca_global_info.sample_statistics(0, i, j, k, S, mean, nfeature);
--
--        std::stringstream scatter_ss;
--        scatter_ss << pca_global_info.path_out() << "/S_" << 0 << '_' <<file<< ".txt";
--        std::ofstream scatter_ofs(scatter_ss.str().c_str());
--        scatter_ofs.precision(15);
--        scatter_ofs << S;
--
--        std::stringstream mean_ss;
--        mean_ss <<  pca_global_info.path_out() << "/mean_" << 0 << '_'  <<file << ".txt";
--        std::ofstream mean_ofs ( mean_ss.str().c_str() );
--        mean_ofs.precision(15);
--        mean_ofs << nfeature << '\n' << mean;
--        file++;
--      }
--
--  //read pairwise
--
--  unsigned nrepeat = 0; // will become ceil(log_2(file)) after this iteration
--  unsigned orig_file = file;
--  for (unsigned pow_of_2 = 1; pow_of_2 < orig_file; pow_of_2*=2,++nrepeat) // i.e.: ceil(log_2(file)) iterations
--  {
--    unsigned file_p = 0;
--    unsigned nfiles = 0;
--    for (; file_p < file; file_p+=2, ++nfiles)
--    {
--      vnl_matrix_fixed<double, 125, 125> S1(0.0);
--      vnl_vector_fixed<double, 125> mean1(0.0);
--      unsigned long nfeatures1 =0;
--
--      {
--        std::stringstream scatter_ss;
--        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p << ".txt";
--        std::ifstream scatter_ifs(scatter_ss.str().c_str());
--        scatter_ifs >> S1;
--        std::stringstream mean_ss;
--        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << file_p << ".txt";
--        std::ifstream mean_ifs ( mean_ss.str().c_str() );
--        mean_ifs >> nfeatures1;
--        mean_ifs >> mean1;
--#if 0
--        vul_file::delete(scatter_ss.str());
--        vul_file::delete(mean_ss.str());
--#endif
--      }
--
--      vnl_matrix_fixed<double, 125, 125> S2(0.0);
--      vnl_vector_fixed<double, 125> mean2(0.0);
--      unsigned long nfeatures2 =0;
--
--      {
--        std::stringstream scatter_ss;
--        scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat << '_' << file_p + 1  << ".txt";
--        std::ifstream scatter_ifs(scatter_ss.str().c_str());
--        scatter_ifs >> S2;
--        std::stringstream mean_ss;
--        mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_' << file_p + 1 << ".txt";
--        std::ifstream mean_ifs ( mean_ss.str().c_str() );
--        mean_ifs >> nfeatures2;
--        mean_ifs >> mean2;
--      }
--
--      vnl_matrix_fixed<double, 125, 125> S_out(0.0);
--      vnl_vector_fixed<double, 125> mean_out(0.0);
--      double nfeatures_out =0.0;
--      bvpl_global_pca<125>::combine_pairwise_statistics(mean1, S1, (double)nfeatures1, mean2, S2, (double)nfeatures2, mean_out, S_out, nfeatures_out);
--
--      std::stringstream scatter_ss;
--      scatter_ss <<pca_global_info.path_out()  << "/S_" << (nrepeat+1) << '_' << file_p/2  << ".txt";
--      std::ofstream scatter_ofs(scatter_ss.str().c_str());
--      scatter_ofs.precision(15);
--      scatter_ofs << S_out;
--
--      std::stringstream mean_ss;
--      mean_ss << pca_global_info.path_out() << "/mean_" <<  (nrepeat+1) << '_' << file_p/2<< ".txt";
--      std::ofstream mean_ofs ( mean_ss.str().c_str() );
--      mean_ofs.precision(15);
--      mean_ofs << nfeatures_out << '\n' << mean_out;
--    }
--    file = nfiles;
--  }
--
--  //load final mean and scatter
--  vnl_matrix_fixed<double, 125, 125> S_total(0.0);
--  vnl_vector_fixed<double, 125> mean_total(0.0);
--  unsigned long nfeatures_total =0;
--
--
--  std::stringstream scatter_ss;
--  scatter_ss <<pca_global_info.path_out()  << "/S_" << nrepeat<< '_' << 0 << ".txt";
--  std::ifstream scatter_ifs(scatter_ss.str().c_str());
--  scatter_ifs >> S_total;
--  std::stringstream mean_ss;
--  mean_ss << pca_global_info.path_out() << "/mean_" << nrepeat << '_'  << 0 << ".txt";
--  std::ifstream mean_ifs ( mean_ss.str().c_str() );
--  mean_ifs >> nfeatures_total;
--  mean_ifs >> mean_total;
--
--
--  std::cout << "Scatter diff:\n " << ((s1  - S_total).array_two_norm()) << '\n'
--           << "Mean diff:\n " << (pca_info.mean()  - mean_total).two_norm() << '\n';
--
--  clean_up("./pca_info", "*.txt");
--  clean_up("./pca_global_info", "*.txt");
--#if 0
--  pca_global_info.compute_statistics();
--#endif
--  //compare results
--}
--
--
--void test_pca_kernels()
--{
--  clean_up();
--
--  //make up a matrix
--  vnl_matrix<double> data(2, 10);
--  unsigned i =0;
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.69f, 0.49f));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-1.31f, -1.21f));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.39, 0.99));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.09, 0.29));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(1.29, 1.09));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.49, 0.79));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(0.19, -0.31));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.81, -0.81));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.31, -0.31));
--  data.set_column(i++, vnl_vector_fixed<double, 2>(-0.71, -1.01));
--
--  bvpl_discover_pca_kernels pca_extractor(data);
--
--  vnl_matrix<double> pc = pca_extractor.principal_comps();
--
--  vnl_matrix<double> true_pc(2,2);
--  i =0;
--  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.677873, -0.735179));
--  true_pc.set_row(i++, vnl_vector_fixed<double, 2>(-0.735179, 0.677873));
--
--  bool result = true_pc.is_equal(pc, 0.001);
--  TEST("Test pc equals true_pc", result, true);
--
--  test_kernel_set_up();
--  test_global();
--  clean_up();
--}
--
--
--TESTMAIN(test_pca_kernels);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
-deleted file mode 100644
-index 4e5a30d980..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_taylor_basis.cxx
-+++ /dev/null
-@@ -1,143 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date 11-Feb-2011
--
--#include <iostream>
--#include <map>
--#include <testlib/testlib_test.h>
--
--#include "test_utils.h"
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--#include <bvpl/bvpl_octree/sample/bvpl_taylor_basis_sample.h>
--
--#include <vul/vul_file.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <vnl/vnl_sym_matrix.h>
--
--void create_basis(std::string test_dir, std::map<std::string, float> &values)
--{
--  //generate basis paths
--  if (!vul_file::is_directory(test_dir))
--    vul_file::make_directory(test_dir);
--
--  vul_file::change_directory(test_dir);
--
--  bvpl_taylor_basis_loader loader(test_dir);
--
--  std::vector<std::string> basis_names;
--  loader.files(basis_names);
--
--  //make the basis directories
--  for (unsigned i= 0; i<basis_names.size(); i++)
--  {
--    std::string basis_dir = vul_file::get_cwd()+ "/" + basis_names[i];
--    if (!vul_file::is_directory(basis_dir))
--      vul_file::make_directory(basis_dir);
--
--    vul_file::change_directory(basis_dir);
--
--    create_scene(1,1,1, true, float(i), "float_response_scene");
--
--    vul_file::change_directory("..");
--
--    values.insert(std::pair<std::string, float>(basis_names[i], float(i)));
--  }
--}
--
--void test_assemble_basis(bvpl_taylor_scenes_map_sptr taylor_scenes, std::map<std::string, float> &values)
--{
--  bvpl_taylor_basis::assemble_basis(taylor_scenes, 0, 0, 0);
--
--  //retieve the basis seen and check vectors and matrices
--  double I0 = values["I0"];
--
--  vnl_vector<double> G(3);
--  G[0] = values["Ix"];
--  G[1] = values["Iy"];
--  G[2] = values["Iz"];
--
--  double H_as_vector[6];
--  H_as_vector[0] = values["Ixx"];
--  H_as_vector[1] = values["Ixy"];
--  H_as_vector[2] = values["Iyy"];
--  H_as_vector[3] = values["Ixz"];
--  H_as_vector[4] = values["Iyz"];
--  H_as_vector[5] = values["Izz"];
--  vnl_sym_matrix<double> H(H_as_vector, 3);
--
--  std::cout << "IO: " << I0 << "\nG: " << G <<"\nH: " << H.as_matrix() << std::endl;
--
--  boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* basis_scene = dynamic_cast<boxm_scene<boct_tree<short, bvpl_taylor_basis2_sample > >* > (taylor_scenes->get_scene("basis").as_pointer());
--  basis_scene->load_block(0, 0, 0);
--
--  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* > basis_leaves = basis_scene->get_block(0, 0, 0)->get_tree()->leaf_cells();
--
--  std::vector<boct_tree_cell<short, bvpl_taylor_basis2_sample >* >::iterator it = basis_leaves.begin();
--  bool result = true;
--  for (; it!= basis_leaves.end(); it++)
--  {
--    bvpl_taylor_basis2_sample sample = (*it)->data();
--    if (sample.I0!=I0){
--      result = false;
--      std::cout << sample << std::endl;
--    }
--
--    if (!((sample.G.as_vector()).is_equal(G, 1e-7))){
--      result = false;
--      std::cout << sample << std::endl;
--    }
--
--    if (!((sample.H.as_matrix()).is_equal(H.as_matrix(), 1e-7))){
--      result = false;
--      std::cout << sample << std::endl;
--    }
--  }
--
--  TEST("Test assemble basis", result, true);
--}
--
--
--void test_taylor_basis()
--{
--  //generate basis
--  std::string basis_dir = "./taylor_basis";
--  std::map<std::string, float> values;
--  create_basis(basis_dir, values);
--
--  //load map of scenes into memory
--  bvpl_taylor_basis_loader loader(vul_file::get_cwd());
--  std::cout << vul_file::get_cwd() << std::endl;
--  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
--
--
--  //test assembling
--  test_assemble_basis(taylor_scenes, values);
--
--  //test computing error
--  boxm_scene<boct_tree<short, float> >* data_scene = create_scene(2,2,2, true, 1.0f, "data_scene");
--  boxm_scene<boct_tree<short, float> >* error_scene = dynamic_cast<boxm_scene<boct_tree<short, float> >*> (taylor_scenes->get_scene("error").as_pointer());
--  double cell_length = data_scene->finest_cell_length();
--  bvpl_taylor_basis::compute_approximation_error(data_scene, taylor_scenes->get_scene("basis"),error_scene,loader,0,0,0, cell_length);
--
--  error_scene->load_block(0,0,0);
--  std::cout.precision(15);
--  error_scene->get_block(0,0,0)->get_tree()->print();
--
--  unsigned long tree_ncells = error_scene->get_block(0,0,0)->get_tree()->size();
--  unsigned long scene_ncells = error_scene->size();
--  unsigned long nsamples = scene_ncells*100L;
--
--  //number of samples - 10% of total number of leaf cells
--  unsigned long tree_nsamples = (unsigned long)(float(tree_ncells)/scene_ncells*nsamples);
--  double error = bvpl_taylor_basis::sum_errors(error_scene,0,0,0, tree_nsamples);
--
--  TEST_NEAR("Test average error", error, 131737.5, 1e-7);
--}
--
--
--TESTMAIN(test_taylor_basis);
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
-deleted file mode 100644
-index 2932c2a301..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_template_include.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/bvpl_global_pca.hxx>
--#include <bvpl/bvpl_octree/bvpl_global_taylor.hxx>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
-deleted file mode 100644
-index 39bffed911..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.cxx
-+++ /dev/null
-@@ -1,94 +0,0 @@
--#include "test_utils.h"
--//:
--// \file
--// \author Isabel Restrepo
--// \date 15-Aug-2010
--
--#include <vul/vul_file.h>
--#include <vul/vul_file_iterator.h>
--#include <vpl/vpl.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val)
--{
--  tree-> split(); //now we have 8 cells
--  std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--  leaves[i]->set_data(init_val);
--  leaves[i]->split();
--
--  boct_loc_code<short> code = leaves[i]->get_code() ;
--  std::cerr<< "Create Scene Code: " << code << std::endl;
--}
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx,unsigned world_dimy,unsigned world_dimz,
--                                                   bool uniform, float val, const std::string& scene_prefix)
--{
--  float init_val = 0.5f;
--
--  if (uniform)
--    init_val = val;
--
--  //crete the input scene
--  unsigned int max_tree_level = 3;
--  unsigned int init_level = 1;
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0,0,0);
--
--  vgl_vector_3d<double> block_dim(10, 10, 10); //world coordinate dimensions of a block
--
--  vgl_vector_3d<unsigned> world_dim(world_dimx,world_dimy,world_dimz); //number of blocks in a scene
--
--  auto *scene = new boxm_scene<boct_tree<short, float> >(lvcs, origin, block_dim, world_dim, max_tree_level, init_level );
--  std::string scene_path(vul_file::get_cwd());
--  scene->set_paths(scene_path, scene_prefix);
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->write_scene(scene_prefix + ".xml");
--  unsigned cell_index = 7;
--  boxm_block_iterator<boct_tree<short, float> > iter=scene->iterator();
--  iter.begin();
--  while (!iter.end())
--  {
--    scene->load_block(iter.index());
--    boxm_block<boct_tree<short, float> > *block = scene->get_active_block();
--    // Construct an empty tree with 3 maximum levels 1 levele initialized to 0.0
--    auto *tree = new boct_tree<short,float>(init_val, 3, 1);
--    //tree->print();
--    if (uniform)
--      init_tree(tree, cell_index, init_val);
--    else
--      init_tree(tree, cell_index);
--    //tree->print();
--    block->init_tree(tree);
--    scene->write_active_block();
--    if (cell_index == 0) cell_index = 7;
--    cell_index--;
--    ++iter;
--  }
--
--#ifdef DEBUG_LEAKS
--  std::cerr << "Leaks Created by create_scene() : " << boct_tree_cell<short,float>::nleaks() << std::endl;
--#endif
--  return scene;
--}
--
--
--void clean_up()
--{
--  //clean temporary files
--  vul_file_iterator file_it("./*.bin");
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());// this deletes the file at file_it()
--    //    vul_file::delete_file_glob(file_it());
--  }
--}
--
--void clean_up(const std::string& dir, const std::string& ext)
--{
--  //clean temporary files
--  vul_file_iterator file_it(dir+"/"+ext);
--  for (; file_it; ++file_it)
--  {
--    vpl_unlink(file_it());
--    vul_file::delete_file_glob(file_it());
--  }
--}
-diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h b/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
-deleted file mode 100644
-index f2c915a5cb..0000000000
---- a/contrib/brl/bseg/bvpl/bvpl_octree/tests/test_utils.h
-+++ /dev/null
-@@ -1,20 +0,0 @@
--#ifndef bvpl_octree_test_utils_h_
--#define bvpl_octree_test_utils_h_
--//:
--// \file
--// \brief  A file containing utility functions for other tests
--// \author Isabel Restrepo
--// \date 13-Aug-2010
--
--#include <boxm/boxm_scene.h>
--
--void init_tree(boct_tree<short,float> *tree, unsigned i, float init_val = 0.8);
--
--boxm_scene<boct_tree<short, float> >* create_scene(unsigned world_dimx = 2,unsigned world_dimy = 2,unsigned world_dimz = 2,
--                                                   bool uniform = false, float val = 0.5, const std::string& scene_prefix = "test_scene");
--
--void clean_up();
--
--void clean_up(const std::string& dir, const std::string& ext);
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-index 4279f1e47d..3e7108103d 100644
---- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-@@ -19,7 +19,7 @@ if(EXPAT_FOUND)
- 
-   vxl_add_library(LIBRARY_NAME bvpl_kernels_pro LIBRARY_SOURCES ${bvpl_kernels_pro_sources})
- 
--  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io bvpl_octree bvpl_octree_io bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
-+  target_link_libraries(bvpl_kernels_pro bvpl_kernels bvpl_kernels_io  bsta bprb brdb bvpl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io)
- 
-   if( BUILD_TESTING )
-     add_subdirectory(tests)
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-deleted file mode 100644
-index ee1188aea5..0000000000
---- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/brdb_value_t+bvpl_taylor_scenes_map_sptr-.cxx
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#include <brdb/brdb_value.hxx>
--
--#include <vbl/io/vbl_io_smart_ptr.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--BRDB_VALUE_INSTANTIATE(bvpl_taylor_scenes_map_sptr, "bvpl_taylor_scenes_map_sptr");
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx b/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-deleted file mode 100644
-index 25a60ca12c..0000000000
---- a/contrib/brl/bseg/bvpl/kernels/pro/Templates/vbl_io_smart_ptr+bvpl_taylor_scenes_map-.cxx
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#include <bvpl/bvpl_octree/io/bvpl_io_taylor_scenes_map.h>
--#include <vbl/io/vbl_io_smart_ptr.hxx>
--
--VBL_IO_SMART_PTR_INSTANTIATE(bvpl_taylor_scenes_map);
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
-index 71a463d5d7..cb9febce0d 100644
---- a/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
-+++ b/contrib/brl/bseg/bvpl/kernels/pro/bvpl_kernels_register.cxx
-@@ -25,7 +25,6 @@ void bvpl_kernels_register::register_process()
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_corner2d_kernel_process, "bvplCreateCorner2dKernelProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_gauss3d_xx_kernel_vector_process, "bvplCreateGauss3dXXKernelVectorProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_create_wc_kernel_vector_process, "bvplCreateWCKernelVectorProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvpl_load_taylor_kernel_process, "bvplLoadTaylorKernelProcess");
-   REG_PROCESS_FUNC_CONS2(bvpl_create_gauss3d_kernel_process);
-   REG_PROCESS_FUNC_CONS2(bvpl_create_generic_kernel_vector_process);
-   REG_PROCESS_FUNC_CONS2(bvpl_write_generic_kernel_vector_process);
-diff --git a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx b/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
-deleted file mode 100644
-index c56d9cdb15..0000000000
---- a/contrib/brl/bseg/bvpl/kernels/pro/processes/bvpl_load_taylor_responses_process.cxx
-+++ /dev/null
-@@ -1,53 +0,0 @@
--//:
--// \file
--// \brief A process to load taylor response scenes into memory
--// \author Isabel Restrepo
--// \date 9-Feb-2011
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--
--#include <brdb/brdb_value.h>
--
--#include <bvpl/kernels/bvpl_taylor_basis_factory.h>
--#include <bvpl/bvpl_octree/bvpl_taylor_basis.h>
--
--//:global variables
--namespace bvpl_load_taylor_responses_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--
--//:sets input and output types
--bool bvpl_load_taylor_responses_process_cons(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_responses_process_globals ;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "vcl_string"; //parent dir of responses
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvpl_taylor_scenes_map_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--
--//:the process
--bool bvpl_load_taylor_responses_process(bprb_func_process& pro)
--{
--  using namespace bvpl_load_taylor_responses_process_globals;
--
--  //get inputs
--  std::string parent_dir = pro.get_input<std::string>(0);
--
--  bvpl_taylor_basis_loader loader(parent_dir);
--  bvpl_taylor_scenes_map_sptr  taylor_scenes = new bvpl_taylor_scenes_map(loader);
--
--  //store output
--  pro.set_output_val<bvpl_taylor_scenes_map_sptr>(0, taylor_scenes);
--
--  return true;
--}
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-deleted file mode 100644
-index 3bf956ba6c..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
-+++ /dev/null
-@@ -1,44 +0,0 @@
--# contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
--include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
--if( PYTHON_FOUND )
--  FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(EXPATPP REQUIRED)
--  if( EXPAT_FOUND )
--    include_directories( ${PYTHON_INCLUDE_DIRS} )
--    include_directories( ${BRL_INCLUDE_DIR} )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro )
--    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/bvpl/bvpl_octree)
--    include_directories( ${BRL_INCLUDE_DIR}/bseg/brec )
--
--     set(bvpl_octree_batch_sources
--       reg_bvpl_octree.h   reg_bvpl_octree.cxx
--     )
--    if(NOT VXL_BUILD_POSITION_DEPENDENT_CODE)
--      vxl_add_library(LIBRARY_NAME bvpl_octree_batch LIBRARY_SOURCES SHARED ${bvpl_octree_batch_sources})
--
--      #In windows, library has to have different name depending on debug or release version.
--      if(WIN32)
--        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch DEBUG_POSTFIX _d SUFFIX .pyd)
--      endif()
--      if(APPLE) #This is because python only looks for .so
--        set_target_properties(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch SUFFIX .so)
--      endif()
--      set_target_properties(bvpl_octree_batch PROPERTIES PREFIX "")
--
--      target_link_libraries(bvpl_octree_batch bvpl_octree_pro bvpl_kernels_pro bpro_batch boxm_pro boxm_algo_pro ${VXL_LIB_PREFIX}vpgl_io vpgl_pro ${VXL_LIB_PREFIX}vil_io vil_pro)
--
--      if(PYTHON_DEBUG_LIBRARIES)
--        target_link_libraries( bvpl_octree_batch debug ${PYTHON_DEBUG_LIBRARY})
--      endif()
--
--      if(PYTHON_LIBRARIES)
--        target_link_libraries( bvpl_octree_batch optimized ${PYTHON_LIBRARY})
--      endif()
--
--      if( BUILD_TESTING )
--        add_subdirectory(tests)
--      endif()
--    endif()
--  endif()
--endif()
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
-deleted file mode 100644
-index d2df8b6752..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.cxx
-+++ /dev/null
-@@ -1,61 +0,0 @@
--#include "reg_bvpl_octree.h"
--#include <bprb/bprb_macros.h>
--#include <bprb/bprb_batch_process_manager.h>
--
--// processes
--#include <bvpl/kernels/pro/bvpl_kernels_register.h>
--#include <bvpl/bvpl_octree/pro/bvpl_octree_register.h>
--#include <boxm/pro/boxm_register.h>
--#include <boxm/algo/pro/boxm_algo_register.h>
--#include <vpgl_pro/vpgl_register.h>
--
--PyObject *
--register_processes(PyObject *self, PyObject *args)
--{
--  bvpl_kernels_register::register_process();
--  bvpl_octree_register::register_process();
--  boxm_register::register_process();
--  boxm_algo_register::register_process();
--  vpgl_register::register_process();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--PyObject *
--register_datatypes(PyObject *self, PyObject *args)
--{
--  register_basic_datatypes();
--  bvpl_kernels_register::register_datatype();
--  bvpl_octree_register::register_datatype();
--  boxm_register::register_datatype();
--  boxm_algo_register::register_datatype();
--  vpgl_register::register_datatype();
--  Py_INCREF(Py_None);
--  return Py_None;
--}
--
--PyMODINIT_FUNC
--initbvpl_octree_batch(void)
--{
--  PyMethodDef reg_pro;
--  reg_pro.ml_name = "register_processes";
--  reg_pro.ml_meth = register_processes;
--  reg_pro.ml_doc = "register_processes() create instances of each defined process";
--  reg_pro.ml_flags = METH_VARARGS;
--
--
--  PyMethodDef reg_data;
--  reg_data.ml_name = "register_datatypes";
--  reg_data.ml_meth = register_datatypes;
--  reg_data.ml_doc = "register_datatypes() insert tables in the database for each type";
--  reg_data.ml_flags = METH_VARARGS;
--
--  bvpl_octree_batch_methods[0]=reg_pro;
--  bvpl_octree_batch_methods[1]=reg_data;
--
--  for (int i=0; i<METHOD_NUM; ++i) {
--    bvpl_octree_batch_methods[i+2]=batch_methods[i];
--  }
--
--  Py_InitModule("bvpl_octree_batch", bvpl_octree_batch_methods);
--}
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h b/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
-deleted file mode 100644
-index 4aad2e3dcb..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/reg_bvpl_octree.h
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#ifndef reg_bvpl_octree_h_
--#define reg_bvpl_octree_h_
--
--#include <bpro/bpro_batch/bpro_batch.h>
--
--static PyObject *register_processes(PyObject *self, PyObject *args);
--static PyObject *register_datatypes(PyObject *self, PyObject *args);
--static PyMethodDef bvpl_octree_batch_methods[METHOD_NUM+2];
--
--#endif
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
-deleted file mode 100644
-index 1cc8664ce3..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/tests/CMakeLists.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--add_executable( bvpl_octree_batch_test_include test_include.cxx )
--target_link_libraries( bvpl_octree_batch_test_include bvpl_octree_batch)
-diff --git a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx b/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
-deleted file mode 100644
-index 292774691a..0000000000
---- a/contrib/brl/bseg/bvpl_octree_batch/tests/test_include.cxx
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#include <bvpl_octree_batch/reg_bvpl_octree.h>
--
--int main() { return 0; }
-diff --git a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
-index a387778a0c..0505293103 100644
---- a/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
-@@ -5,14 +5,13 @@ include_directories( ${BRL_INCLUDE_DIR}/bseg/bvxm )
- set(bvxm_algo_sources
-     bvxm_merge_mog.h     bvxm_merge_mog.cxx
-     bvxm_mog_norm.h      bvxm_mog_norm.hxx
--    bvxm_boxm_convert.h
-    )
- 
- aux_source_directory(Templates bvxm_algo_sources)
- 
- vxl_add_library(LIBRARY_NAME bvxm_algo LIBRARY_SOURCES ${bvxm_algo_sources})
- 
--target_link_libraries( bvxm_algo bsta bvxm_grid_io boxm_util ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
-+target_link_libraries( bvxm_algo bsta ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl)
- 
- add_subdirectory(pro)
- 
-diff --git a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h b/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
-deleted file mode 100644
-index d2b4e815e6..0000000000
---- a/contrib/brl/bseg/bvxm/algo/bvxm_boxm_convert.h
-+++ /dev/null
-@@ -1,152 +0,0 @@
--// This is brl/bseg/bvxm/algo/bvxm_boxm_convert.h
--#ifndef bvxm_boxm_convert_h
--#define bvxm_boxm_convert_h
--//:
--// \file
--// \brief Set of functions that convert a boxm_scene to a bvxm grid
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Jan 15, 2009
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <iostream>
--#include <boxm/boxm_scene.h>
--#include <bvxm/grid/bvxm_voxel_grid.h>
--#include <bvxm/grid/bvxm_voxel_grid_basic_ops.h>
--#ifdef _MSC_VER
--#  include <vcl_msvc_warnings.h>
--#endif
--#include <boxm/util/boxm_cell_data_traits.h>
--
--template <class T_loc, class T_data>
--bvxm_voxel_grid<T_data>* boxm_scene_to_bvxm_grid(boxm_scene<boct_tree<T_loc, T_data > > &scene,
--                                                 std::string input_path,
--                                                 unsigned int resolution_level,
--                                                 bool enforce_level = false )
--{
--  //Print a little reminder that no inter/extra-polation happens in this function
--  std::cout << "Convertion boxm_scene to bvxm_grid\n"
--           << "Current resolution level: " << resolution_level << '\n'
--           << "Enforcing only level cells ? " << enforce_level << '\n'
--           << "Is grid saving internal nodes? " <<scene.save_internal_nodes() << std::endl;
--
--  typedef boct_tree<T_loc, T_data > tree_type;
--
--  // create an array for each block, and save in a binary file
--  boxm_block_iterator<tree_type> iter(&scene);
--
--  unsigned int finest_level=100000;
--  // find the finest levels in the blocks
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    tree_type* tree = block->get_tree();
--    if (tree->finest_level() < int(finest_level)) {
--      finest_level = tree->finest_level();
--    }
--    ++iter;
--  }
--
--  // do not make the resolution smaller than finest level
--  if (resolution_level < finest_level)
--    resolution_level=finest_level;
--
--
--  // make sure the resolution level for all trees is the same
--  iter.begin();
--  short root_level = 0;
--  {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    tree_type* tree = block->get_tree();
--    root_level = tree->root_level();
--  }
--
--  // make sure root level is the same for all the trees
--  while (!iter.end()) {
--    vgl_point_3d<int> idx = iter.index();
--    scene.load_block(idx);
--    boxm_block<tree_type>* block = scene.get_block(idx);
--    tree_type* tree = block->get_tree();
--    if (tree->root_level() != root_level)
--    {
--      std::cerr << "Error converting boxm_scene to bvxm_grid: blocks have different root level\n";
--    }
--    iter++;
--  }
--
--  // number of cells for each block should be the same, because they have the
--  // same tree max_level definitions
--  unsigned int ncells = 1 << (root_level - (int)resolution_level);
--
--  std::cout << "Number of cells per grid side: " << ncells << '\n';
--
--  //create the regular grid
--  vgl_vector_3d<unsigned> dim = scene.world_dim(); //number of blocks in the scene
--  unsigned dimx = dim.x()*ncells; // total number of cells in the scene x-dim
--  unsigned dimy = dim.y()*ncells;
--  unsigned dimz = dim.z()*ncells;
--  bvxm_voxel_grid<T_data> *grid = new bvxm_voxel_grid<T_data>(input_path,vgl_vector_3d<unsigned>(dimx,dimy,dimz));
--  T_data data_init(boxm_zero_val<T_loc, T_data>());
--  grid->initialize_data(data_init);
--
--  std::cout << "Grid Size: " << vgl_vector_3d<unsigned>(dimx,dimy,dimz) << '\n'
--           << "In boxm_scene_to_bxm_grid, default voxel value for the grid is: " << data_init << std::endl;
--
--  //iterate through grid, locate corresponding position in the octree
--  typename bvxm_voxel_grid<T_data>::iterator grid_it=grid->begin();
--
--  //locate point in the tree, for now assume ONLY ONE BLOCK
--  iter.begin();
--  vgl_point_3d<int> idx = iter.index();
--  scene.load_block(idx);
--  boxm_block<tree_type>* block = scene.get_block(idx);
--  tree_type* tree = block->get_tree();
--#if 0
--  vgl_box_3d<double> block_bb = block->bounding_box();
--  // assume that bounding box is a cube
--  const double step_len = ((block_bb.max_x() - block_bb.min_x())/double(ncells));
--#endif
--
--  for (unsigned z=0; z<dimz; ++grid_it, ++z)
--  {
--    bvxm_voxel_slab<T_data> slab = (*grid_it);
--    std::cout << '.' <<std::flush ;
--    for (unsigned y=0; y<dimy;++y)
--    {
--      for (unsigned x=0; x<dimx; ++x)
--      {
--        vgl_point_3d<double> p(((double)x/(double)dimx), ((double)y/(double)dimy), (0.99 - (double)z/(double)dimz));
--        //locate the cell containing the point closest to the specified level
--        boct_tree_cell<T_loc,T_data>* this_cell = tree->locate_point_at_level(p, resolution_level,true);
--
--        if (!this_cell) {
--          std::cerr << "In boxm_scene_to_bvxm_grid: cell out of bounds\n";
--          continue;
--        }
--
--        unsigned int level = this_cell->get_code().level;
--        T_data cell_val = this_cell->data();
--
--        if (level < resolution_level)
--          std::cerr << "In boxm_scene_to_bvxm_grid: current level smaller than target level\n";
--
--        //if enfoce level is true, there is no iter/extrapolation
--        if ((enforce_level)&& (level != resolution_level))
--          continue;
--
--        // just copy value to output grid
--        slab(x,y) = cell_val;
--      }
--    }
--  }
--  std::cout << '\n';
--  return grid;
--}
--
--#endif
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-index 4917b6eb59..3a0824d257 100644
---- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-@@ -18,7 +18,8 @@ FIND_PACKAGE(EXPATPP REQUIRED)
-   aux_source_directory(processes bvxm_algo_pro_sources)
- 
-   vxl_add_library(LIBRARY_NAME bvxm_algo_pro LIBRARY_SOURCES ${bvxm_algo_pro_sources} )
--  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
-+  #target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boxm boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
-+  target_link_libraries(bvxm_algo_pro bvxm_algo bvxm_grid_pro boct bprb brdb ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
- 
-   if( BUILD_TESTING )
-     add_subdirectory(tests)
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
-index 69e97478e7..8b9ad6d7f6 100644
---- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
-+++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_processes.h
-@@ -8,6 +8,6 @@
- DECLARE_FUNC_CONS(bvxm_merge_mog_process);
- DECLARE_FUNC_CONS(bvxm_mog_to_mpm_process);
- DECLARE_FUNC_CONS(bvxm_mog_l2_distance);
--DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
-+//DECLARE_FUNC_CONS(boxm_scene_to_bvxm_grid_process);
- 
- #endif
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
-index a7b2141026..a4f1e49d9d 100644
---- a/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
-+++ b/contrib/brl/bseg/bvxm/algo/pro/bvxm_algo_register.cxx
-@@ -19,5 +19,5 @@ void bvxm_algo_register::register_process()
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_merge_mog_process, "bvxmMergeMogProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_to_mpm_process, "bvxmMogToMpmProcess");
-  // REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, bvxm_mog_l2_process, "bvxmMogL2Process");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
-+  //  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm_scene_to_bvxm_grid_process, "boxmSceneToBvxmGridProcess");
- }
-diff --git a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx b/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
-deleted file mode 100644
-index cfc6175b03..0000000000
---- a/contrib/brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--// This is brl/bseg/bvxm/algo/pro/processes/boxm_scene_to_bvxm_grid_process.cxx
--#include <bvxm/algo/bvxm_boxm_convert.h>
--//:
--// \file
--// \brief  Process to convert a boxm_scene to a bvxm_voxel_grid
--// \author Isabel Restrepo mir@lems.brown.edu
--// \date  Jan 19, 2010
--//
--// \verbatim
--//  Modifications
--//   <none yet>
--// \endverbatim
--
--#include <bprb/bprb_func_process.h>
--#include <bprb/bprb_parameters.h>
--#include <brdb/brdb_value.h>
--
--
--#include <bsta/bsta_attributes.h>
--#include <bsta/bsta_mixture_fixed.h>
--#include <bsta/bsta_gauss_sf1.h>
--#include <bsta/bsta_gauss_if3.h>
--
--
--namespace boxm_scene_to_bvxm_grid_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--//: process takes 4 inputs and 1 output.
--// input[0]: The scene
--// input[1]: Path to output grid
--// input[2]: Resolution level
--// input[3]: Bool: Enforce only cells at the resolution leve?
--//           If true, there is no interpolation
--// output[0]: The output grid
--
--bool boxm_scene_to_bvxm_grid_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm_scene_to_bvxm_grid_process_globals;
--
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[0] = "boxm_scene_base_sptr";
--  input_types_[1] = "vcl_string";
--  input_types_[2] = "unsigned";
--  input_types_[3] = "bool";
--
--  std::vector<std::string> output_types_(n_outputs_);
--  output_types_[0] = "bvxm_voxel_grid_base_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm_scene_to_bvxm_grid_process(bprb_func_process& pro)
--{
--  using namespace boxm_scene_to_bvxm_grid_process_globals;
--
--  if (pro.n_inputs() != n_inputs_)
--  {
--    std::cerr << pro.name() << ": the input number should be " << n_inputs_
--             << " but instead it is " << pro.n_inputs() << std::endl;
--    return false;
--  }
--
--  //get inputs:
--  boxm_scene_base_sptr scene_base = pro.get_input<boxm_scene_base_sptr>(0);
--  std::string filepath = pro.get_input<std::string>(1);
--  unsigned resolution_level = pro.get_input<short>(2);
--  bool enforce_level = pro.get_input<bool>(3);
--
--  static const unsigned int n_gaussian_modes_ = 3;
--  typedef bsta_num_obs<bsta_gauss_sf1> gauss_type_sf1;
--  typedef bsta_num_obs<bsta_mixture_fixed<gauss_type_sf1, n_gaussian_modes_> > mix_gauss_sf1_type;
--
--  //check input's validity
--  if (!scene_base.ptr())
--  {
--    std::cerr << pro.name() << ": -- Input scene is not valid!\n";
--    return false;
--  }
--
--  if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, float > > * >(scene_base.as_pointer()))
--  {
--    bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level,enforce_level);
--    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
--    return true;
--  }
--  else if ( auto *scene= dynamic_cast<boxm_scene< boct_tree<short, bsta_num_obs<bsta_gauss_sf1> > > * >(scene_base.as_pointer()))
--  {
--    bvxm_voxel_grid<bsta_num_obs<bsta_gauss_sf1> > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
--    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
--    return true;
--  }
--  else if ( auto *scene =
--            dynamic_cast<boxm_scene< boct_tree<short, mix_gauss_sf1_type > > * >(scene_base.as_pointer()))
--  {
--    bvxm_voxel_grid<mix_gauss_sf1_type > *grid = boxm_scene_to_bvxm_grid(*scene, filepath, resolution_level, enforce_level);
--    pro.set_output_val<bvxm_voxel_grid_base_sptr>(0, grid);
--    return true;
--  }
--  else
--  {
--    std::cerr << "It's not possible to convert input scene to a bvxm grid\n";
--    return false;
--  }
--}
--
--#include <boxm/boxm_scene.hxx>
--#include <boxm/boxm_block.hxx>
--#include <boct/boct_tree.hxx>
--#include <boct/boct_tree_cell.hxx>
--#include <vbl/vbl_array_3d.hxx>
--
--typedef bsta_num_obs<bsta_gauss_sf1> gauss_type;
--typedef bsta_num_obs<bsta_mixture_fixed<gauss_type,3> > mixture_type;
--typedef boct_tree<short,mixture_type> tree_type;
--typedef boxm_block<tree_type> block_type;
--
--BOCT_TREE_INSTANTIATE(short,mixture_type);
--BOCT_TREE_CELL_INSTANTIATE(short,mixture_type);
--BOXM_SCENE_INSTANTIATE(tree_type);
--BOXM_BLOCK_INSTANTIATE(tree_type);
--VBL_ARRAY_3D_INSTANTIATE(block_type);
--
--void vsl_b_write(vsl_b_ostream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
--void vsl_b_read(vsl_b_istream&, bsta_mixture_fixed<bsta_num_obs<bsta_gaussian_sphere<float,1> >,3>&) {}
--void vsl_b_read(vsl_b_istream&, bsta_gaussian_sphere<float,1>&) {}
--//bool operator==(block_type const&, block_type const&) { return false; }
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
-index 1110054d05..d9d1c54305 100644
---- a/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/tests/CMakeLists.txt
-@@ -2,15 +2,12 @@ add_executable( bvxm_algo_test_all
-   test_driver.cxx
-   test_merge_mog.cxx
-   test_mog_norm.cxx
--# causes memory allocation errors (FIX_ME)
--#  test_boxm_scene_to_bvxm_grid.cxx
- )
- 
- target_link_libraries( bvxm_algo_test_all bvxm_algo bvxm_grid ${VXL_LIB_PREFIX}testlib bsta)
- 
- add_test( NAME bvxm_algo_test_merge_mog COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_merge_mog )
- add_test( NAME bvxm_algo_test_mog_norm COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_mog_norm )
--#add_test( NAME bvxm_algo_test_boxm_scene_to_bvxm_grid COMMAND $<TARGET_FILE:bvxm_algo_test_all>   test_boxm_scene_to_bvxm_grid)
- 
- add_executable( bvxm_algo_test_include test_include.cxx )
- target_link_libraries( bvxm_algo_test_include bvxm_algo)
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
-deleted file mode 100644
-index cf5dfe2b40..0000000000
---- a/contrib/brl/bseg/bvxm/algo/tests/test_boxm_scene_to_bvxm_grid.cxx
-+++ /dev/null
-@@ -1,111 +0,0 @@
--//:
--// \file
--// \author Isabel Restrepo
--// \date Jan 19, 2010.
--
--#include <testlib/testlib_test.h>
--#include <bvxm/algo/bvxm_boxm_convert.h>
--#include <boxm/boxm_apm_traits.h>
--
--const bool debug = true;
--
--void fill_octree(boct_tree<short,float>* tree)
--{
--  std::cout << "Creating Octree" << std::endl;
--
--  //Create tree
--  tree->init_cells(0.1f);
--  tree->split();
--  std::cout << "Level 1" << std::endl;
--
--  {
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->leaf_cells();
--    tree->init_cells(0.1f);
--    leaves[1]->set_data(0.5f);
--    if (debug)
--      for (unsigned i=0; i<leaves.size(); i++) {
--        std::cout << leaves[i]->get_code().x_loc_ << ','
--                 << leaves[i]->get_code().y_loc_ << ','
--                 << leaves[i]->get_code().z_loc_ << ','
--                 << leaves[i]->data() << std::endl;
--      }
--
--    leaves[1]->split();
--  }
--
--  if (debug)
--  {
--    std::cout << "Level 0" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->cells_at_level((short)0);
--    for (unsigned i=0; i<leaves.size(); i++) {
--      leaves[i]->set_data(0.9f);
--      std::cout << leaves[i]->get_code().x_loc_ << ','
--               << leaves[i]->get_code().y_loc_ << ','
--               << leaves[i]->get_code().z_loc_ << ','
--               << leaves[i]->get_code().level << ','
--               << leaves[i]->data() << std::endl;
--    }
--  }
--
--  if (debug)
--  {
--    std::cout << "All Levels" << std::endl;
--    std::vector<boct_tree_cell<short,float>*> leaves = tree->all_cells();
--    for (unsigned i=0; i<leaves.size(); i++) {
--      std::cout << leaves[i]->get_code().x_loc_ << ','
--               << leaves[i]->get_code().y_loc_ << ','
--               << leaves[i]->get_code().z_loc_ << ','
--               << leaves[i]->get_code().level << ','
--               << leaves[i]->data() << std::endl;
--    }
--  }
--}
--
--static void test_boxm_scene_to_bvxm_grid()
--{
--  //Create a dummy scene
--  typedef boct_tree<short,float > tree_type;
--  boct_tree<short,float> *tree = new boct_tree<short,float>(3);
--  fill_octree(tree);
--
--  vpgl_lvcs lvcs(33.33,44.44,10.0, vpgl_lvcs::wgs84, vpgl_lvcs::DEG, vpgl_lvcs::METERS);
--  vgl_point_3d<double> origin(0.0,0.0,0.0);
--
--  //world coordinate dimensions of a block
--  vgl_vector_3d<double> block_dim(10.0,10.0,10.0);
--
--  //number of blocks in a scene
--  vgl_vector_3d<unsigned> world_dim(1,1,1);
--
--  boxm_scene<tree_type> *scene= new boxm_scene<tree_type>(lvcs, origin, block_dim, world_dim,true);
--  std::string scene_path=".";
--  scene->set_paths(scene_path, "in_block");
--  scene->set_appearance_model(BOXM_FLOAT);
--  scene->clean_scene();
--
--  boxm_block_iterator<tree_type >  iter =scene->iterator();
--  iter.begin();
--  scene->load_block(iter.index());
--  boxm_block<tree_type> *block = scene->get_active_block();
--  block->init_tree(tree);
--  scene->write_active_block();
--  std::string input_path("scene_to_grid.vox");
--
--  bvxm_voxel_grid<float> *grid = boxm_scene_to_bvxm_grid(*scene,input_path, 0);
--
--  //Check the grid
--  bvxm_voxel_grid<float>::iterator grid_it = grid->slab_iterator(0, grid->grid_size().z());
--
--  for (unsigned z = 0; z<grid->grid_size().z(); ++z)
--    for (unsigned y = 0; y<grid->grid_size().y(); ++y)
--      for (unsigned x= 0; x<grid->grid_size().x(); ++x)
--      {
--        std::cout << "Value at " << '(' << x << ',' << y <<',' <<z << ")= " << (*grid_it)(x,y,z) << std::endl;
--      }
--
--  // TEST("Valid cropped tree", result, true);
--
--  scene->clean_scene();
--}
--
--TESTMAIN(test_boxm_scene_to_bvxm_grid);
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
-index 73e5836b26..cdb72c7ec2 100644
---- a/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
-+++ b/contrib/brl/bseg/bvxm/algo/tests/test_driver.cxx
-@@ -2,15 +2,13 @@
- 
- DECLARE( test_merge_mog );
- DECLARE( test_mog_norm );
--//DECLARE( test_boxm_scene_to_bvxm_grid);
-+
- 
- 
- void register_tests()
- {
-   REGISTER( test_merge_mog );
-   REGISTER( test_mog_norm );
--  // test causing memory allocation errors on dashboard build
--  //REGISTER( test_boxm_scene_to_bvxm_grid );
- 
- }
- 
-diff --git a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
-index b109456239..2c0b205311 100644
---- a/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
-+++ b/contrib/brl/bseg/bvxm/algo/tests/test_include.cxx
-@@ -1,4 +1,3 @@
--#include <bvxm/algo/bvxm_boxm_convert.h>
- #include <bvxm/algo/bvxm_merge_mog.h>
- #include <bvxm/algo/bvxm_mog_norm.h>
- 
--- 
-2.21.0
-
diff --git a/0009-v3.5.0-indent-to-keep-gcc-happy.patch b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
new file mode 100644
index 0000000..02d9fcd
--- /dev/null
+++ b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
@@ -0,0 +1,26 @@
+From 64ddad342a4e3e08801863ece32ce1fcb3388dbe Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 13:27:34 +0100
+Subject: [PATCH 09/11] v3.5.0: indent to keep gcc happy
+
+---
+ core/vpgl/vpgl_tri_focal_tensor.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/vpgl/vpgl_tri_focal_tensor.h b/core/vpgl/vpgl_tri_focal_tensor.h
+index 21a96688fb..e3f8929767 100644
+--- a/core/vpgl/vpgl_tri_focal_tensor.h
++++ b/core/vpgl/vpgl_tri_focal_tensor.h
+@@ -186,7 +186,8 @@ protected:
+ 
+ 
+   virtual bool get_epipoles(vgl_homg_point_2d<Type>& e12, vgl_homg_point_2d<Type>& e13)  {
+-    if (!epipoles_valid_) compute_epipoles(); e12 = e12_; e13 = e13_; return epipoles_valid_;
++    if (!epipoles_valid_) compute_epipoles();
++    e12 = e12_; e13 = e13_; return epipoles_valid_;
+   }
+ 
+   bool compute_epipoles();
+-- 
+2.41.0
+
diff --git a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch b/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
new file mode 100644
index 0000000..5e881e2
--- /dev/null
+++ b/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
@@ -0,0 +1,32 @@
+From 13b3970f10dd132bda85f3ae87c610934a7d62eb Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 15:55:38 +0100
+Subject: [PATCH 10/11] Revert "remove dependency on brdb by imesh lib"
+
+This reverts commit fb7582a4a0509a82bd99fd1636ba00ca16279847.
+---
+ contrib/brl/bbas/imesh/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/brl/bbas/imesh/CMakeLists.txt b/contrib/brl/bbas/imesh/CMakeLists.txt
+index b122b33faf..a8a107e574 100644
+--- a/contrib/brl/bbas/imesh/CMakeLists.txt
++++ b/contrib/brl/bbas/imesh/CMakeLists.txt
+@@ -22,11 +22,11 @@ aux_source_directory(Templates imesh_sources)
+ 
+ vxl_add_library(LIBRARY_NAME imesh LIBRARY_SOURCES  ${imesh_sources})
+ 
+-target_link_libraries(imesh ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl)
++target_link_libraries(imesh ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul brdb ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl)
+ 
+ # Algorithms
+ add_subdirectory(algo)
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+-endif()
++endif()
+\ No newline at end of file
+-- 
+2.41.0
+
diff --git a/0010-gcc11.patch b/0010-gcc11.patch
deleted file mode 100644
index f54851e..0000000
--- a/0010-gcc11.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 66f985519061bc789153ad4654debebd88c922c4 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Sat, 17 Oct 2020 19:59:22 -0600
-Subject: [PATCH] gcc-11
-
----
- core/testlib/testlib_test.h | 1 +
- core/vnl/vnl_bignum.cxx     | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/core/testlib/testlib_test.h b/core/testlib/testlib_test.h
-index e070f2a..87d5c5c 100644
---- a/core/testlib/testlib_test.h
-+++ b/core/testlib/testlib_test.h
-@@ -14,6 +14,7 @@
- 
- #include <string>
- #include <complex>
-+#include <limits>
- 
- //: initialise test counters, check test name 'name' exists
- void testlib_test_start(const char* name = nullptr);
-diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx
-index b615a9b..741bd43 100644
---- a/core/vnl/vnl_bignum.cxx
-+++ b/core/vnl/vnl_bignum.cxx
-@@ -6,6 +6,7 @@
- #include <algorithm>
- #include <vector>
- #include <iostream>
-+#include <limits>
- #include "vnl_bignum.h"
- //:
- // \file
--- 
-2.28.0
-
diff --git a/0011-v3.5.0-fix-for-gcc11.patch b/0011-v3.5.0-fix-for-gcc11.patch
new file mode 100644
index 0000000..6eb4d0b
--- /dev/null
+++ b/0011-v3.5.0-fix-for-gcc11.patch
@@ -0,0 +1,89 @@
+From b430d3ffb98c2c50088b0ee3afe2f6fcd521fe49 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 17:05:04 +0100
+Subject: [PATCH 11/11] v3.5.0: fix for gcc11
+
+---
+ .../brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx    | 1 +
+ contrib/brl/bseg/bsgm/bsgm_error_checking.h                      | 1 +
+ contrib/brl/bseg/bsgm/bsgm_remove_spikes.h                       | 1 +
+ contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h               | 1 +
+ core/testlib/testlib_test.h                                      | 1 +
+ core/vnl/vnl_bignum.cxx                                          | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
+index 67f6f1582c..185042f4df 100644
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
++++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
+@@ -2,6 +2,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <algorithm>
++#include <limits>
+ #include <bprb/bprb_func_process.h>
+ //:
+ // \file
+diff --git a/contrib/brl/bseg/bsgm/bsgm_error_checking.h b/contrib/brl/bseg/bsgm/bsgm_error_checking.h
+index 3eb3731a48..69ddb9a659 100644
+--- a/contrib/brl/bseg/bsgm/bsgm_error_checking.h
++++ b/contrib/brl/bseg/bsgm/bsgm_error_checking.h
+@@ -11,6 +11,7 @@
+ #include <vgl/vgl_box_2d.h>
+ #include <vil/vil_image_view.h>
+ #include <vector>
++#include <limits>
+ 
+ //:
+ // \file
+diff --git a/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h b/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
+index fd1ca2a941..c20cfe8b80 100644
+--- a/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
++++ b/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
+@@ -2,6 +2,7 @@
+ #include <iomanip>
+ #include <cmath>
+ #include <vector>
++#include <limits>
+ #include <vgl/vgl_point_3d.h>
+ #include <vil/vil_image_view.h>
+ 
+diff --git a/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h b/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
+index 96654ddac0..762d4598bf 100644
+--- a/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
++++ b/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
+@@ -10,6 +10,7 @@
+ #include <vil3d/vil3d_math.h>
+ #include <vil3d/algo/vil3d_exp_filter.h>
+ #include <cassert>
++#include <limits>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/core/testlib/testlib_test.h b/core/testlib/testlib_test.h
+index e070f2aacc..87d5c5ceb1 100644
+--- a/core/testlib/testlib_test.h
++++ b/core/testlib/testlib_test.h
+@@ -14,6 +14,7 @@
+ 
+ #include <string>
+ #include <complex>
++#include <limits>
+ 
+ //: initialise test counters, check test name 'name' exists
+ void testlib_test_start(const char* name = nullptr);
+diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx
+index 26760c2054..0556918395 100644
+--- a/core/vnl/vnl_bignum.cxx
++++ b/core/vnl/vnl_bignum.cxx
+@@ -6,6 +6,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <iostream>
++#include <limits>
+ #include "vnl_bignum.h"
+ //:
+ // \file
+-- 
+2.41.0
+
diff --git a/sources b/sources
index 09701af..c1c5d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vxl-2.0.2-clean.tar.gz) = d8cad8ca6851641bb4c3398b8bf5e3df45a7414fd736acf8e75b79bdd5d18ec3aae4edac5b4c66d98fc499f411a25a443f046859a3544e45228f468052ec79ee
+SHA512 (vxl-3.5.0-clean.tar.gz) = cb5eaf88e689216b9de56f9a9e07e2a6a8ce4469d0b990f847e8f1060b0a0d6e621ef128c9878a26cef8816b0efd7e99bcca8bc65a43e091f3650158425ebde9
diff --git a/vxl.spec b/vxl.spec
index 9e15e85..528060a 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,7 @@
 %undefine __cmake_in_source_build
 
 Name:       vxl
-Version:    2.0.2
+Version:    3.5.0
 Release:    %autorelease
 Summary:    C++ Libraries for Computer Vision Research and Implementation
 License:    BSD
@@ -10,32 +10,31 @@ URL:        https://vxl.github.io/
 # tar xf vxl-%%{version}.tar.gz
 # rm -rf vxl-%%{version}/contrib/prip/vdtop/tests/lena.org.pgm
 # tar cfz vxl-%%{version}-clean.tar.gz vxl-%%{version}/
-# Source0:  https://github.com/vxl/vxl/archive/v%%{version}/%%{name}-%%{version}.tar.gz
+#Source0:  https://github.com/vxl/vxl/archive/v%%{version}/%%{name}-%%{version}.tar.gz
 Source0:    %{name}-%{version}-clean.tar.gz
 
 # Patches generated from tree here:
-# https://github.com/sanjayankur31/vxl/tree/fedora-v2.0.2-f32
+# https://github.com/sanjayankur31/vxl/tree/fedora-v3.5.0-f32
 # use system rply and don't use mpeg2
-Patch1:     0001-v2.0.2-unbundle-rply.patch
-Patch2:     0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch
-Patch3:     0003-v2.0.2-Use-Fedora-minizip.patch
-# Submitted upstream https://github.com/vxl/vxl/pull/626
-Patch4:     0004-v2.0.2-Version-shared-objects.patch
-Patch5:     0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch
-Patch6:     0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch
-Patch7:     0007-v2.0.2-fix-bkml-test.patch
-Patch8:     0008-v2.0.2-Correct-rply-includedir.patch
-
-# Fixes https://github.com/vxl/vxl/issues/638
-# Thanks jjames@fedoraproject.org for pointing it out
-Patch9:     0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch
-
-# Remove obsolete boxm library that fails to build on ARM
-# https://github.com/vxl/vxl/commit/cdf414000606af4bad322f7ff4c1fcdeaaa286ad
-Patch10:    0009-removed-the-obsolete-octree-library-boxm.patch
+Patch:     0001-v3.5.0-unbundle-rply.patch
+Patch:     0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
+Patch:     0003-v3.5.0-Use-Fedora-minizip.patch
+Patch:     0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
+Patch:     0005-v3.5.0-fix-bkml-test.patch
+Patch:     0006-v3.5.0-Correct-rply-includedir.patch
+Patch:     0007-v3.5.0-remove-triangle.patch
+Patch:     0008-v3.5.0-remove-bits-using-triangle.patch
+Patch:     0009-v3.5.0-indent-to-keep-gcc-happy.patch
+# otherwise we get:
+# /usr/bin/ld: ../../../../../lib/libimesh.so.3.5.0.0: undefined reference to `brdb_value::registrar::registrar(brdb_value const*)'
+# collect2: error: ld returned 1 exit status
+# gmake[2]: *** [contrib/brl/bseg/baml/tests/CMakeFiles/baml_test_all.dir/build.make:172: bin/baml_test_all] Error 1
+# gmake[2]: Leaving directory '/builddir/build/BUILD/vxl-3.5.0/redhat-linux-build'
+# gmake[1]: *** [CMakeFiles/Makefile2:46025: contrib/brl/bseg/baml/tests/CMakeFiles/baml_test_all.dir/all] Error 2
+Patch:     0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
 
 # Fix missing #include caught by gcc-11
-Patch11:     0010-gcc11.patch
+Patch:     0011-v3.5.0-fix-for-gcc11.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -224,405 +223,405 @@ ctest %{_vpath_builddir} || exit 0
 %files
 %doc core/vxl_copyright.h
 %{_bindir}/octree
-%{_libdir}/libclipper.so.2.0
-%{_libdir}/libtestlib.so.2.0
-%{_libdir}/libvcl.so.2.0
-%{_libdir}/libvgl.so.2.0
-%{_libdir}/libvidl.so.2.0
-%{_libdir}/libvil_io.so.2.0
-%{_libdir}/libvnl.so.2.0
-%{_libdir}/libvpgl_file_formats.so.2.0
-%{_libdir}/libvpl.so.2.0
-%{_libdir}/libclipper.so.2.0.2
-%{_libdir}/libtestlib.so.2.0.2
-%{_libdir}/libvcl.so.2.0.2
-%{_libdir}/libvgl.so.2.0.2
-%{_libdir}/libvidl.so.2.0.2
-%{_libdir}/libvil_io.so.2.0.2
-%{_libdir}/libvnl.so.2.0.2
-%{_libdir}/libvpgl_file_formats.so.2.0.2
-%{_libdir}/libvpl.so.2.0.2
-%{_libdir}/libnetlib.so.2.0
-%{_libdir}/libv3p_netlib.so.2.0
-%{_libdir}/libvcsl.so.2.0
-%{_libdir}/libvgl_xio.so.2.0
-%{_libdir}/libvil.so.2.0
-%{_libdir}/libvnl_xio.so.2.0
-%{_libdir}/libvpgl_io.so.2.0
-%{_libdir}/libvsl.so.2.0
-%{_libdir}/libnetlib.so.2.0.2
-%{_libdir}/libv3p_netlib.so.2.0.2
-%{_libdir}/libvcsl.so.2.0.2
-%{_libdir}/libvgl_xio.so.2.0.2
-%{_libdir}/libvil.so.2.0.2
-%{_libdir}/libvnl_xio.so.2.0.2
-%{_libdir}/libvpgl_io.so.2.0.2
-%{_libdir}/libvsl.so.2.0.2
-%{_libdir}/libvbl_io.so.2.0
-%{_libdir}/libvgl_algo.so.2.0
-%{_libdir}/libvil1.so.2.0
-%{_libdir}/libvnl_algo.so.2.0
-%{_libdir}/libvpdl.so.2.0
-%{_libdir}/libvpgl.so.2.0
-%{_libdir}/libvul_io.so.2.0
-%{_libdir}/libvbl_io.so.2.0.2
-%{_libdir}/libvgl_algo.so.2.0.2
-%{_libdir}/libvil1.so.2.0.2
-%{_libdir}/libvnl_algo.so.2.0.2
-%{_libdir}/libvpdl.so.2.0.2
-%{_libdir}/libvpgl.so.2.0.2
-%{_libdir}/libvul_io.so.2.0.2
-%{_libdir}/libvbl.so.2.0
-%{_libdir}/libvgl_io.so.2.0
-%{_libdir}/libvil_algo.so.2.0
-%{_libdir}/libvnl_io.so.2.0
-%{_libdir}/libvpgl_algo.so.2.0
-%{_libdir}/libvpgl_xio.so.2.0
-%{_libdir}/libvul.so.2.0
-%{_libdir}/libvbl.so.2.0.2
-%{_libdir}/libvgl_io.so.2.0.2
-%{_libdir}/libvil_algo.so.2.0.2
-%{_libdir}/libvnl_io.so.2.0.2
-%{_libdir}/libvpgl_algo.so.2.0.2
-%{_libdir}/libvpgl_xio.so.2.0.2
-%{_libdir}/libvul.so.2.0.2
-%{_libdir}/libbaio.so.2.0
-%{_libdir}/libbaio.so.2.0.2
-%{_libdir}/libbaml.so.2.0
-%{_libdir}/libbaml.so.2.0.2
-%{_libdir}/libbapl.so.2.0
-%{_libdir}/libbapl.so.2.0.2
-%{_libdir}/libbapl_io.so.2.0
-%{_libdir}/libbapl_io.so.2.0.2
-%{_libdir}/libbapl_pro.so.2.0
-%{_libdir}/libbapl_pro.so.2.0.2
-%{_libdir}/libbbas_pro.so.2.0
-%{_libdir}/libbbas_pro.so.2.0.2
-%{_libdir}/libbbgm.so.2.0
-%{_libdir}/libbbgm.so.2.0.2
-%{_libdir}/libbbgm_pro.so.2.0
-%{_libdir}/libbbgm_pro.so.2.0.2
-%{_libdir}/libbcvr.so.2.0
-%{_libdir}/libbcvr.so.2.0.2
-%{_libdir}/libbdgl.so.2.0
-%{_libdir}/libbdgl.so.2.0.2
-%{_libdir}/libbdpg.so.2.0
-%{_libdir}/libbdpg.so.2.0.2
-%{_libdir}/libbetr.so.2.0
-%{_libdir}/libbetr.so.2.0.2
-%{_libdir}/libbetr_pro.so.2.0
-%{_libdir}/libbetr_pro.so.2.0.2
-%{_libdir}/libbgrl.so.2.0
-%{_libdir}/libbgrl.so.2.0.2
-%{_libdir}/libbgrl2.so.2.0
-%{_libdir}/libbgrl2.so.2.0.2
-%{_libdir}/libbgrl2_algo.so.2.0
-%{_libdir}/libbgrl2_algo.so.2.0.2
-%{_libdir}/libbil.so.2.0
-%{_libdir}/libbil.so.2.0.2
-%{_libdir}/libbil_algo.so.2.0
-%{_libdir}/libbil_algo.so.2.0.2
-%{_libdir}/libbjson.so.2.0
-%{_libdir}/libbjson.so.2.0.2
-%{_libdir}/libbkml.so.2.0
-%{_libdir}/libbkml.so.2.0.2
-%{_libdir}/libbmdl.so.2.0
-%{_libdir}/libbmdl.so.2.0.2
-%{_libdir}/libbmdl_pro.so.2.0
-%{_libdir}/libbmdl_pro.so.2.0.2
-%{_libdir}/libbmsh3d.so.2.0
-%{_libdir}/libbmsh3d.so.2.0.2
-%{_libdir}/libbmsh3d_algo.so.2.0
-%{_libdir}/libbmsh3d_algo.so.2.0.2
-%{_libdir}/libbmsh3d_pro.so.2.0
-%{_libdir}/libbmsh3d_pro.so.2.0.2
-%{_libdir}/libbnabo.so.2.0
-%{_libdir}/libbnabo.so.2.0.2
-%{_libdir}/libbnl.so.2.0
-%{_libdir}/libbnl.so.2.0.2
-%{_libdir}/libbnl_algo.so.2.0
-%{_libdir}/libbnl_algo.so.2.0.2
-%{_libdir}/libboct.so.2.0
-%{_libdir}/libboct.so.2.0.2
-%{_libdir}/libboxm2.so.2.0
-%{_libdir}/libboxm2.so.2.0.2
-%{_libdir}/libboxm2_basic.so.2.0
-%{_libdir}/libboxm2_basic.so.2.0.2
-%{_libdir}/libboxm2_class.so.2.0
-%{_libdir}/libboxm2_class.so.2.0.2
-%{_libdir}/libboxm2_cpp.so.2.0
-%{_libdir}/libboxm2_cpp.so.2.0.2
-%{_libdir}/libboxm2_cpp_algo.so.2.0
-%{_libdir}/libboxm2_cpp_algo.so.2.0.2
-%{_libdir}/libboxm2_cpp_pro.so.2.0
-%{_libdir}/libboxm2_cpp_pro.so.2.0.2
-%{_libdir}/libboxm2_io.so.2.0
-%{_libdir}/libboxm2_io.so.2.0.2
-%{_libdir}/libboxm2_pro.so.2.0
-%{_libdir}/libboxm2_pro.so.2.0.2
-%{_libdir}/libboxm2_util.so.2.0
-%{_libdir}/libboxm2_util.so.2.0.2
-%{_libdir}/libboxm2_vecf.so.2.0
-%{_libdir}/libboxm2_vecf.so.2.0.2
-%{_libdir}/libboxm2_volm.so.2.0
-%{_libdir}/libboxm2_volm.so.2.0.2
-%{_libdir}/libboxm2_volm_conf.so.2.0
-%{_libdir}/libboxm2_volm_conf.so.2.0.2
-%{_libdir}/libboxm2_volm_desc.so.2.0
-%{_libdir}/libboxm2_volm_desc.so.2.0.2
-%{_libdir}/libboxm2_volm_io.so.2.0
-%{_libdir}/libboxm2_volm_io.so.2.0.2
-%{_libdir}/libboxm2_volm_pro.so.2.0
-%{_libdir}/libboxm2_volm_pro.so.2.0.2
-%{_libdir}/libbpgl.so.2.0
-%{_libdir}/libbpgl.so.2.0.2
-%{_libdir}/libbpgl_algo.so.2.0
-%{_libdir}/libbpgl_algo.so.2.0.2
-%{_libdir}/libbprb.so.2.0
-%{_libdir}/libbprb.so.2.0.2
-%{_libdir}/libbrad.so.2.0
-%{_libdir}/libbrad.so.2.0.2
-%{_libdir}/libbrad_io.so.2.0
-%{_libdir}/libbrad_io.so.2.0.2
-%{_libdir}/libbrad_pro.so.2.0
-%{_libdir}/libbrad_pro.so.2.0.2
-%{_libdir}/libbrdb.so.2.0
-%{_libdir}/libbrdb.so.2.0.2
-%{_libdir}/libbrec.so.2.0
-%{_libdir}/libbrec.so.2.0.2
-%{_libdir}/libbrec_pro.so.2.0
-%{_libdir}/libbrec_pro.so.2.0.2
-%{_libdir}/libbreg3d.so.2.0
-%{_libdir}/libbreg3d.so.2.0.2
-%{_libdir}/libbreg3d_pro.so.2.0
-%{_libdir}/libbreg3d_pro.so.2.0.2
-%{_libdir}/libbrip.so.2.0
-%{_libdir}/libbrip.so.2.0.2
-%{_libdir}/libbrip_pro.so.2.0
-%{_libdir}/libbrip_pro.so.2.0.2
-%{_libdir}/libbsgm.so.2.0
-%{_libdir}/libbsgm.so.2.0.2
-%{_libdir}/libbsgm_pro.so.2.0
-%{_libdir}/libbsgm_pro.so.2.0.2
-%{_libdir}/libbsl.so.2.0
-%{_libdir}/libbsl.so.2.0.2
-%{_libdir}/libbsol.so.2.0
-%{_libdir}/libbsol.so.2.0.2
-%{_libdir}/libbsta.so.2.0
-%{_libdir}/libbsta.so.2.0.2
-%{_libdir}/libbsta_algo.so.2.0
-%{_libdir}/libbsta_algo.so.2.0.2
-%{_libdir}/libbsta_io.so.2.0
-%{_libdir}/libbsta_io.so.2.0.2
-%{_libdir}/libbsta_pro.so.2.0
-%{_libdir}/libbsta_pro.so.2.0.2
-%{_libdir}/libbsta_vis.so.2.0
-%{_libdir}/libbsta_vis.so.2.0.2
-%{_libdir}/libbstm.so.2.0
-%{_libdir}/libbstm.so.2.0.2
-%{_libdir}/libbstm_basic.so.2.0
-%{_libdir}/libbstm_basic.so.2.0.2
-%{_libdir}/libbstm_cpp_algo.so.2.0
-%{_libdir}/libbstm_cpp_algo.so.2.0.2
-%{_libdir}/libbstm_cpp_pro.so.2.0
-%{_libdir}/libbstm_cpp_pro.so.2.0.2
-%{_libdir}/libbstm_io.so.2.0
-%{_libdir}/libbstm_io.so.2.0.2
-%{_libdir}/libbstm_multi.so.2.0
-%{_libdir}/libbstm_multi.so.2.0.2
-%{_libdir}/libbstm_multi_basic.so.2.0
-%{_libdir}/libbstm_multi_basic.so.2.0.2
-%{_libdir}/libbstm_multi_io.so.2.0
-%{_libdir}/libbstm_multi_io.so.2.0.2
-%{_libdir}/libbstm_pro.so.2.0
-%{_libdir}/libbstm_pro.so.2.0.2
-%{_libdir}/libbstm_util.so.2.0
-%{_libdir}/libbstm_util.so.2.0.2
-%{_libdir}/libbsvg.so.2.0
-%{_libdir}/libbsvg.so.2.0.2
-%{_libdir}/libbsvg_pro.so.2.0
-%{_libdir}/libbsvg_pro.so.2.0.2
-%{_libdir}/libbtol.so.2.0
-%{_libdir}/libbtol.so.2.0.2
-%{_libdir}/libbugl.so.2.0
-%{_libdir}/libbugl.so.2.0.2
-%{_libdir}/libbundler.so.2.0
-%{_libdir}/libbundler.so.2.0.2
-%{_libdir}/libbvgl.so.2.0
-%{_libdir}/libbvgl.so.2.0.2
-%{_libdir}/libbvgl_algo.so.2.0
-%{_libdir}/libbvgl_algo.so.2.0.2
-%{_libdir}/libbvgl_pro.so.2.0
-%{_libdir}/libbvgl_pro.so.2.0.2
-%{_libdir}/libbvpl.so.2.0
-%{_libdir}/libbvpl.so.2.0.2
-%{_libdir}/libbvpl_functors.so.2.0
-%{_libdir}/libbvpl_functors.so.2.0.2
-%{_libdir}/libbvpl_kernels.so.2.0
-%{_libdir}/libbvpl_kernels.so.2.0.2
-%{_libdir}/libbvpl_kernels_io.so.2.0
-%{_libdir}/libbvpl_kernels_io.so.2.0.2
-%{_libdir}/libbvpl_kernels_pro.so.2.0
-%{_libdir}/libbvpl_kernels_pro.so.2.0.2
-%{_libdir}/libbvpl_pro.so.2.0
-%{_libdir}/libbvpl_pro.so.2.0.2
-%{_libdir}/libbvpl_util.so.2.0
-%{_libdir}/libbvpl_util.so.2.0.2
-%{_libdir}/libbvpl_util_io.so.2.0
-%{_libdir}/libbvpl_util_io.so.2.0.2
-%{_libdir}/libbvrml.so.2.0
-%{_libdir}/libbvrml.so.2.0.2
-%{_libdir}/libbvrml_pro.so.2.0
-%{_libdir}/libbvrml_pro.so.2.0.2
-%{_libdir}/libbvxm.so.2.0
-%{_libdir}/libbvxm.so.2.0.2
-%{_libdir}/libbvxm_algo.so.2.0
-%{_libdir}/libbvxm_algo.so.2.0.2
-%{_libdir}/libbvxm_algo_pro.so.2.0
-%{_libdir}/libbvxm_algo_pro.so.2.0.2
-%{_libdir}/libbvxm_grid.so.2.0
-%{_libdir}/libbvxm_grid.so.2.0.2
-%{_libdir}/libbvxm_grid_io.so.2.0
-%{_libdir}/libbvxm_grid_io.so.2.0.2
-%{_libdir}/libbvxm_grid_pro.so.2.0
-%{_libdir}/libbvxm_grid_pro.so.2.0.2
-%{_libdir}/libbvxm_io.so.2.0
-%{_libdir}/libbvxm_io.so.2.0.2
-%{_libdir}/libbvxm_pro.so.2.0
-%{_libdir}/libbvxm_pro.so.2.0.2
-%{_libdir}/libbwm_video.so.2.0
-%{_libdir}/libbwm_video.so.2.0.2
-%{_libdir}/libbxml.so.2.0
-%{_libdir}/libbxml.so.2.0.2
-%{_libdir}/libclsfy.so.2.0
-%{_libdir}/libclsfy.so.2.0.2
-%{_libdir}/libdepth_map.so.2.0
-%{_libdir}/libdepth_map.so.2.0.2
-%{_libdir}/libfhs.so.2.0
-%{_libdir}/libfhs.so.2.0.2
-%{_libdir}/libgeml.so.2.0
-%{_libdir}/libgeml.so.2.0.2
-%{_libdir}/libgevd.so.2.0
-%{_libdir}/libgevd.so.2.0.2
-%{_libdir}/libgmvl.so.2.0
-%{_libdir}/libgmvl.so.2.0.2
-%{_libdir}/libgst.so.2.0
-%{_libdir}/libgst.so.2.0.2
-%{_libdir}/libgtrl.so.2.0
-%{_libdir}/libgtrl.so.2.0.2
-%{_libdir}/libicam.so.2.0
-%{_libdir}/libicam.so.2.0.2
-%{_libdir}/libicam_pro.so.2.0
-%{_libdir}/libicam_pro.so.2.0.2
-%{_libdir}/libihog.so.2.0
-%{_libdir}/libihog.so.2.0.2
-%{_libdir}/libihog_pro.so.2.0
-%{_libdir}/libihog_pro.so.2.0.2
-%{_libdir}/libimesh.so.2.0
-%{_libdir}/libimesh.so.2.0.2
-%{_libdir}/libimesh_algo.so.2.0
-%{_libdir}/libimesh_algo.so.2.0.2
-%{_libdir}/libipts.so.2.0
-%{_libdir}/libipts.so.2.0.2
-%{_libdir}/libm23d.so.2.0
-%{_libdir}/libm23d.so.2.0.2
-%{_libdir}/libmbl.so.2.0
-%{_libdir}/libmbl.so.2.0.2
-%{_libdir}/libmcal.so.2.0
-%{_libdir}/libmcal.so.2.0.2
-%{_libdir}/libmfpf.so.2.0
-%{_libdir}/libmfpf.so.2.0.2
-%{_libdir}/libmipa.so.2.0
-%{_libdir}/libmipa.so.2.0.2
-%{_libdir}/libmmn.so.2.0
-%{_libdir}/libmmn.so.2.0.2
-%{_libdir}/libmsdi.so.2.0
-%{_libdir}/libmsdi.so.2.0.2
-%{_libdir}/libmsm.so.2.0
-%{_libdir}/libmsm.so.2.0.2
-%{_libdir}/libmsm_utils.so.2.0
-%{_libdir}/libmsm_utils.so.2.0.2
-%{_libdir}/libmvl.so.2.0
-%{_libdir}/libmvl.so.2.0.2
-%{_libdir}/libmvl2.so.2.0
-%{_libdir}/libmvl2.so.2.0.2
-%{_libdir}/libosl.so.2.0
-%{_libdir}/libosl.so.2.0.2
-%{_libdir}/libouel.so.2.0
-%{_libdir}/libouel.so.2.0.2
-%{_libdir}/libouml.so.2.0
-%{_libdir}/libouml.so.2.0.2
-%{_libdir}/liboxl_vrml.so.2.0
-%{_libdir}/liboxl_vrml.so.2.0.2
-%{_libdir}/libpdf1d.so.2.0
-%{_libdir}/libpdf1d.so.2.0.2
-%{_libdir}/librgrl.so.2.0
-%{_libdir}/librgrl.so.2.0.2
-%{_libdir}/librrel.so.2.0
-%{_libdir}/librrel.so.2.0.2
-%{_libdir}/librsdl.so.2.0
-%{_libdir}/librsdl.so.2.0.2
-%{_libdir}/libsdet.so.2.0
-%{_libdir}/libsdet.so.2.0.2
-%{_libdir}/libsdet_pro.so.2.0
-%{_libdir}/libsdet_pro.so.2.0.2
-%{_libdir}/libvcon_pro.so.2.0
-%{_libdir}/libvcon_pro.so.2.0.2
-%{_libdir}/libvdgl.so.2.0
-%{_libdir}/libvdgl.so.2.0.2
-%{_libdir}/libvdtop.so.2.0
-%{_libdir}/libvdtop.so.2.0.2
-%{_libdir}/libvepl.so.2.0
-%{_libdir}/libvepl.so.2.0.2
-%{_libdir}/libvidl_pro.so.2.0
-%{_libdir}/libvidl_pro.so.2.0.2
-%{_libdir}/libvifa.so.2.0
-%{_libdir}/libvifa.so.2.0.2
-%{_libdir}/libvil3d.so.2.0
-%{_libdir}/libvil3d.so.2.0.2
-%{_libdir}/libvil3d_algo.so.2.0
-%{_libdir}/libvil3d_algo.so.2.0.2
-%{_libdir}/libvil3d_io.so.2.0
-%{_libdir}/libvil3d_io.so.2.0.2
-%{_libdir}/libvil_pro.so.2.0
-%{_libdir}/libvil_pro.so.2.0.2
-%{_libdir}/libvimt.so.2.0
-%{_libdir}/libvimt.so.2.0.2
-%{_libdir}/libvimt3d.so.2.0
-%{_libdir}/libvimt3d.so.2.0.2
-%{_libdir}/libvimt_algo.so.2.0
-%{_libdir}/libvimt_algo.so.2.0.2
-%{_libdir}/libvipl.so.2.0
-%{_libdir}/libvipl.so.2.0.2
-%{_libdir}/libvmal.so.2.0
-%{_libdir}/libvmal.so.2.0.2
-%{_libdir}/libvmap.so.2.0
-%{_libdir}/libvmap.so.2.0.2
-%{_libdir}/libvolm.so.2.0
-%{_libdir}/libvolm.so.2.0.2
-%{_libdir}/libvolm_conf.so.2.0
-%{_libdir}/libvolm_conf.so.2.0.2
-%{_libdir}/libvolm_desc.so.2.0
-%{_libdir}/libvolm_desc.so.2.0.2
-%{_libdir}/libvolm_pro.so.2.0
-%{_libdir}/libvolm_pro.so.2.0.2
-%{_libdir}/libvpdfl.so.2.0
-%{_libdir}/libvpdfl.so.2.0.2
-%{_libdir}/libvpgl_pro.so.2.0
-%{_libdir}/libvpgl_pro.so.2.0.2
-%{_libdir}/libvpyr.so.2.0
-%{_libdir}/libvpyr.so.2.0.2
-%{_libdir}/libvsol.so.2.0
-%{_libdir}/libvsol.so.2.0.2
-%{_libdir}/libvsph.so.2.0
-%{_libdir}/libvsph.so.2.0.2
-%{_libdir}/libvtol.so.2.0
-%{_libdir}/libvtol.so.2.0.2
-%{_libdir}/libvtol_algo.so.2.0
-%{_libdir}/libvtol_algo.so.2.0.2
+%{_libdir}/libclipper.so.3.5
+%{_libdir}/libtestlib.so.3.5
+%{_libdir}/libvcl.so.3.5
+%{_libdir}/libvgl.so.3.5
+%{_libdir}/libvidl.so.3.5
+%{_libdir}/libvil_io.so.3.5
+%{_libdir}/libvnl.so.3.5
+%{_libdir}/libvpgl_file_formats.so.3.5
+%{_libdir}/libvpl.so.3.5
+%{_libdir}/libclipper.so.3.5.0
+%{_libdir}/libtestlib.so.3.5.0
+%{_libdir}/libvcl.so.3.5.0
+%{_libdir}/libvgl.so.3.5.0
+%{_libdir}/libvidl.so.3.5.0
+%{_libdir}/libvil_io.so.3.5.0
+%{_libdir}/libvnl.so.3.5.0
+%{_libdir}/libvpgl_file_formats.so.3.5.0
+%{_libdir}/libvpl.so.3.5.0
+%{_libdir}/libnetlib.so.3.5
+%{_libdir}/libv3p_netlib.so.3.5
+%{_libdir}/libvcsl.so.3.5
+%{_libdir}/libvgl_xio.so.3.5
+%{_libdir}/libvil.so.3.5
+%{_libdir}/libvnl_xio.so.3.5
+%{_libdir}/libvpgl_io.so.3.5
+%{_libdir}/libvsl.so.3.5
+%{_libdir}/libnetlib.so.3.5.0
+%{_libdir}/libv3p_netlib.so.3.5.0
+%{_libdir}/libvcsl.so.3.5.0
+%{_libdir}/libvgl_xio.so.3.5.0
+%{_libdir}/libvil.so.3.5.0
+%{_libdir}/libvnl_xio.so.3.5.0
+%{_libdir}/libvpgl_io.so.3.5.0
+%{_libdir}/libvsl.so.3.5.0
+%{_libdir}/libvbl_io.so.3.5
+%{_libdir}/libvgl_algo.so.3.5
+%{_libdir}/libvil1.so.3.5
+%{_libdir}/libvnl_algo.so.3.5
+%{_libdir}/libvpdl.so.3.5
+%{_libdir}/libvpgl.so.3.5
+%{_libdir}/libvul_io.so.3.5
+%{_libdir}/libvbl_io.so.3.5.0
+%{_libdir}/libvgl_algo.so.3.5.0
+%{_libdir}/libvil1.so.3.5.0
+%{_libdir}/libvnl_algo.so.3.5.0
+%{_libdir}/libvpdl.so.3.5.0
+%{_libdir}/libvpgl.so.3.5.0
+%{_libdir}/libvul_io.so.3.5.0
+%{_libdir}/libvbl.so.3.5
+%{_libdir}/libvgl_io.so.3.5
+%{_libdir}/libvil_algo.so.3.5
+%{_libdir}/libvnl_io.so.3.5
+%{_libdir}/libvpgl_algo.so.3.5
+%{_libdir}/libvpgl_xio.so.3.5
+%{_libdir}/libvul.so.3.5
+%{_libdir}/libvbl.so.3.5.0
+%{_libdir}/libvgl_io.so.3.5.0
+%{_libdir}/libvil_algo.so.3.5.0
+%{_libdir}/libvnl_io.so.3.5.0
+%{_libdir}/libvpgl_algo.so.3.5.0
+%{_libdir}/libvpgl_xio.so.3.5.0
+%{_libdir}/libvul.so.3.5.0
+%{_libdir}/libbaio.so.3.5
+%{_libdir}/libbaio.so.3.5.0
+%{_libdir}/libbaml.so.3.5
+%{_libdir}/libbaml.so.3.5.0
+%{_libdir}/libbapl.so.3.5
+%{_libdir}/libbapl.so.3.5.0
+%{_libdir}/libbapl_io.so.3.5
+%{_libdir}/libbapl_io.so.3.5.0
+%{_libdir}/libbapl_pro.so.3.5
+%{_libdir}/libbapl_pro.so.3.5.0
+%{_libdir}/libbbas_pro.so.3.5
+%{_libdir}/libbbas_pro.so.3.5.0
+%{_libdir}/libbbgm.so.3.5
+%{_libdir}/libbbgm.so.3.5.0
+%{_libdir}/libbbgm_pro.so.3.5
+%{_libdir}/libbbgm_pro.so.3.5.0
+%{_libdir}/libbcvr.so.3.5
+%{_libdir}/libbcvr.so.3.5.0
+%{_libdir}/libbdgl.so.3.5
+%{_libdir}/libbdgl.so.3.5.0
+%{_libdir}/libbdpg.so.3.5
+%{_libdir}/libbdpg.so.3.5.0
+%{_libdir}/libbetr.so.3.5
+%{_libdir}/libbetr.so.3.5.0
+%{_libdir}/libbetr_pro.so.3.5
+%{_libdir}/libbetr_pro.so.3.5.0
+%{_libdir}/libbgrl.so.3.5
+%{_libdir}/libbgrl.so.3.5.0
+%{_libdir}/libbgrl2.so.3.5
+%{_libdir}/libbgrl2.so.3.5.0
+%{_libdir}/libbgrl2_algo.so.3.5
+%{_libdir}/libbgrl2_algo.so.3.5.0
+%{_libdir}/libbil.so.3.5
+%{_libdir}/libbil.so.3.5.0
+%{_libdir}/libbil_algo.so.3.5
+%{_libdir}/libbil_algo.so.3.5.0
+%{_libdir}/libbjson.so.3.5
+%{_libdir}/libbjson.so.3.5.0
+%{_libdir}/libbkml.so.3.5
+%{_libdir}/libbkml.so.3.5.0
+%{_libdir}/libbmdl.so.3.5
+%{_libdir}/libbmdl.so.3.5.0
+%{_libdir}/libbmdl_pro.so.3.5
+%{_libdir}/libbmdl_pro.so.3.5.0
+%{_libdir}/libbmsh3d.so.3.5
+%{_libdir}/libbmsh3d.so.3.5.0
+%{_libdir}/libbmsh3d_algo.so.3.5
+%{_libdir}/libbmsh3d_algo.so.3.5.0
+%{_libdir}/libbmsh3d_pro.so.3.5
+%{_libdir}/libbmsh3d_pro.so.3.5.0
+%{_libdir}/libbnabo.so.3.5
+%{_libdir}/libbnabo.so.3.5.0
+%{_libdir}/libbnl.so.3.5
+%{_libdir}/libbnl.so.3.5.0
+%{_libdir}/libbnl_algo.so.3.5
+%{_libdir}/libbnl_algo.so.3.5.0
+%{_libdir}/libboct.so.3.5
+%{_libdir}/libboct.so.3.5.0
+%{_libdir}/libboxm2.so.3.5
+%{_libdir}/libboxm2.so.3.5.0
+%{_libdir}/libboxm2_basic.so.3.5
+%{_libdir}/libboxm2_basic.so.3.5.0
+%{_libdir}/libboxm2_class.so.3.5
+%{_libdir}/libboxm2_class.so.3.5.0
+%{_libdir}/libboxm2_cpp.so.3.5
+%{_libdir}/libboxm2_cpp.so.3.5.0
+%{_libdir}/libboxm2_cpp_algo.so.3.5
+%{_libdir}/libboxm2_cpp_algo.so.3.5.0
+%{_libdir}/libboxm2_cpp_pro.so.3.5
+%{_libdir}/libboxm2_cpp_pro.so.3.5.0
+%{_libdir}/libboxm2_io.so.3.5
+%{_libdir}/libboxm2_io.so.3.5.0
+%{_libdir}/libboxm2_pro.so.3.5
+%{_libdir}/libboxm2_pro.so.3.5.0
+%{_libdir}/libboxm2_util.so.3.5
+%{_libdir}/libboxm2_util.so.3.5.0
+%{_libdir}/libboxm2_vecf.so.3.5
+%{_libdir}/libboxm2_vecf.so.3.5.0
+%{_libdir}/libboxm2_volm.so.3.5
+%{_libdir}/libboxm2_volm.so.3.5.0
+%{_libdir}/libboxm2_volm_conf.so.3.5
+%{_libdir}/libboxm2_volm_conf.so.3.5.0
+%{_libdir}/libboxm2_volm_desc.so.3.5
+%{_libdir}/libboxm2_volm_desc.so.3.5.0
+%{_libdir}/libboxm2_volm_io.so.3.5
+%{_libdir}/libboxm2_volm_io.so.3.5.0
+%{_libdir}/libboxm2_volm_pro.so.3.5
+%{_libdir}/libboxm2_volm_pro.so.3.5.0
+%{_libdir}/libbpgl.so.3.5
+%{_libdir}/libbpgl.so.3.5.0
+%{_libdir}/libbpgl_algo.so.3.5
+%{_libdir}/libbpgl_algo.so.3.5.0
+%{_libdir}/libbprb.so.3.5
+%{_libdir}/libbprb.so.3.5.0
+%{_libdir}/libbrad.so.3.5
+%{_libdir}/libbrad.so.3.5.0
+%{_libdir}/libbrad_io.so.3.5
+%{_libdir}/libbrad_io.so.3.5.0
+%{_libdir}/libbrad_pro.so.3.5
+%{_libdir}/libbrad_pro.so.3.5.0
+%{_libdir}/libbrdb.so.3.5
+%{_libdir}/libbrdb.so.3.5.0
+%{_libdir}/libbrec.so.3.5
+%{_libdir}/libbrec.so.3.5.0
+%{_libdir}/libbrec_pro.so.3.5
+%{_libdir}/libbrec_pro.so.3.5.0
+%{_libdir}/libbreg3d.so.3.5
+%{_libdir}/libbreg3d.so.3.5.0
+%{_libdir}/libbreg3d_pro.so.3.5
+%{_libdir}/libbreg3d_pro.so.3.5.0
+%{_libdir}/libbrip.so.3.5
+%{_libdir}/libbrip.so.3.5.0
+%{_libdir}/libbrip_pro.so.3.5
+%{_libdir}/libbrip_pro.so.3.5.0
+%{_libdir}/libbsgm.so.3.5
+%{_libdir}/libbsgm.so.3.5.0
+%{_libdir}/libbsgm_pro.so.3.5
+%{_libdir}/libbsgm_pro.so.3.5.0
+%{_libdir}/libbsl.so.3.5
+%{_libdir}/libbsl.so.3.5.0
+%{_libdir}/libbsol.so.3.5
+%{_libdir}/libbsol.so.3.5.0
+%{_libdir}/libbsta.so.3.5
+%{_libdir}/libbsta.so.3.5.0
+%{_libdir}/libbsta_algo.so.3.5
+%{_libdir}/libbsta_algo.so.3.5.0
+%{_libdir}/libbsta_io.so.3.5
+%{_libdir}/libbsta_io.so.3.5.0
+%{_libdir}/libbsta_pro.so.3.5
+%{_libdir}/libbsta_pro.so.3.5.0
+%{_libdir}/libbsta_vis.so.3.5
+%{_libdir}/libbsta_vis.so.3.5.0
+%{_libdir}/libbstm.so.3.5
+%{_libdir}/libbstm.so.3.5.0
+%{_libdir}/libbstm_basic.so.3.5
+%{_libdir}/libbstm_basic.so.3.5.0
+%{_libdir}/libbstm_cpp_algo.so.3.5
+%{_libdir}/libbstm_cpp_algo.so.3.5.0
+%{_libdir}/libbstm_cpp_pro.so.3.5
+%{_libdir}/libbstm_cpp_pro.so.3.5.0
+%{_libdir}/libbstm_io.so.3.5
+%{_libdir}/libbstm_io.so.3.5.0
+%{_libdir}/libbstm_multi.so.3.5
+%{_libdir}/libbstm_multi.so.3.5.0
+%{_libdir}/libbstm_multi_basic.so.3.5
+%{_libdir}/libbstm_multi_basic.so.3.5.0
+%{_libdir}/libbstm_multi_io.so.3.5
+%{_libdir}/libbstm_multi_io.so.3.5.0
+%{_libdir}/libbstm_pro.so.3.5
+%{_libdir}/libbstm_pro.so.3.5.0
+%{_libdir}/libbstm_util.so.3.5
+%{_libdir}/libbstm_util.so.3.5.0
+%{_libdir}/libbsvg.so.3.5
+%{_libdir}/libbsvg.so.3.5.0
+%{_libdir}/libbsvg_pro.so.3.5
+%{_libdir}/libbsvg_pro.so.3.5.0
+%{_libdir}/libbtol.so.3.5
+%{_libdir}/libbtol.so.3.5.0
+%{_libdir}/libbugl.so.3.5
+%{_libdir}/libbugl.so.3.5.0
+%{_libdir}/libbundler.so.3.5
+%{_libdir}/libbundler.so.3.5.0
+%{_libdir}/libbvgl.so.3.5
+%{_libdir}/libbvgl.so.3.5.0
+%{_libdir}/libbvgl_algo.so.3.5
+%{_libdir}/libbvgl_algo.so.3.5.0
+%{_libdir}/libbvgl_pro.so.3.5
+%{_libdir}/libbvgl_pro.so.3.5.0
+%{_libdir}/libbvpl.so.3.5
+%{_libdir}/libbvpl.so.3.5.0
+%{_libdir}/libbvpl_functors.so.3.5
+%{_libdir}/libbvpl_functors.so.3.5.0
+%{_libdir}/libbvpl_kernels.so.3.5
+%{_libdir}/libbvpl_kernels.so.3.5.0
+%{_libdir}/libbvpl_kernels_io.so.3.5
+%{_libdir}/libbvpl_kernels_io.so.3.5.0
+%{_libdir}/libbvpl_kernels_pro.so.3.5
+%{_libdir}/libbvpl_kernels_pro.so.3.5.0
+%{_libdir}/libbvpl_pro.so.3.5
+%{_libdir}/libbvpl_pro.so.3.5.0
+%{_libdir}/libbvpl_util.so.3.5
+%{_libdir}/libbvpl_util.so.3.5.0
+%{_libdir}/libbvpl_util_io.so.3.5
+%{_libdir}/libbvpl_util_io.so.3.5.0
+%{_libdir}/libbvrml.so.3.5
+%{_libdir}/libbvrml.so.3.5.0
+%{_libdir}/libbvrml_pro.so.3.5
+%{_libdir}/libbvrml_pro.so.3.5.0
+%{_libdir}/libbvxm.so.3.5
+%{_libdir}/libbvxm.so.3.5.0
+%{_libdir}/libbvxm_algo.so.3.5
+%{_libdir}/libbvxm_algo.so.3.5.0
+%{_libdir}/libbvxm_algo_pro.so.3.5
+%{_libdir}/libbvxm_algo_pro.so.3.5.0
+%{_libdir}/libbvxm_grid.so.3.5
+%{_libdir}/libbvxm_grid.so.3.5.0
+%{_libdir}/libbvxm_grid_io.so.3.5
+%{_libdir}/libbvxm_grid_io.so.3.5.0
+%{_libdir}/libbvxm_grid_pro.so.3.5
+%{_libdir}/libbvxm_grid_pro.so.3.5.0
+%{_libdir}/libbvxm_io.so.3.5
+%{_libdir}/libbvxm_io.so.3.5.0
+%{_libdir}/libbvxm_pro.so.3.5
+%{_libdir}/libbvxm_pro.so.3.5.0
+%{_libdir}/libbwm_video.so.3.5
+%{_libdir}/libbwm_video.so.3.5.0
+%{_libdir}/libbxml.so.3.5
+%{_libdir}/libbxml.so.3.5.0
+%{_libdir}/libclsfy.so.3.5
+%{_libdir}/libclsfy.so.3.5.0
+%{_libdir}/libdepth_map.so.3.5
+%{_libdir}/libdepth_map.so.3.5.0
+%{_libdir}/libfhs.so.3.5
+%{_libdir}/libfhs.so.3.5.0
+%{_libdir}/libgeml.so.3.5
+%{_libdir}/libgeml.so.3.5.0
+%{_libdir}/libgevd.so.3.5
+%{_libdir}/libgevd.so.3.5.0
+%{_libdir}/libgmvl.so.3.5
+%{_libdir}/libgmvl.so.3.5.0
+%{_libdir}/libgst.so.3.5
+%{_libdir}/libgst.so.3.5.0
+%{_libdir}/libgtrl.so.3.5
+%{_libdir}/libgtrl.so.3.5.0
+%{_libdir}/libicam.so.3.5
+%{_libdir}/libicam.so.3.5.0
+%{_libdir}/libicam_pro.so.3.5
+%{_libdir}/libicam_pro.so.3.5.0
+%{_libdir}/libihog.so.3.5
+%{_libdir}/libihog.so.3.5.0
+%{_libdir}/libihog_pro.so.3.5
+%{_libdir}/libihog_pro.so.3.5.0
+%{_libdir}/libimesh.so.3.5
+%{_libdir}/libimesh.so.3.5.0
+%{_libdir}/libimesh_algo.so.3.5
+%{_libdir}/libimesh_algo.so.3.5.0
+%{_libdir}/libipts.so.3.5
+%{_libdir}/libipts.so.3.5.0
+%{_libdir}/libm23d.so.3.5
+%{_libdir}/libm23d.so.3.5.0
+%{_libdir}/libmbl.so.3.5
+%{_libdir}/libmbl.so.3.5.0
+%{_libdir}/libmcal.so.3.5
+%{_libdir}/libmcal.so.3.5.0
+%{_libdir}/libmfpf.so.3.5
+%{_libdir}/libmfpf.so.3.5.0
+%{_libdir}/libmipa.so.3.5
+%{_libdir}/libmipa.so.3.5.0
+%{_libdir}/libmmn.so.3.5
+%{_libdir}/libmmn.so.3.5.0
+%{_libdir}/libmsdi.so.3.5
+%{_libdir}/libmsdi.so.3.5.0
+%{_libdir}/libmsm.so.3.5
+%{_libdir}/libmsm.so.3.5.0
+%{_libdir}/libmsm_utils.so.3.5
+%{_libdir}/libmsm_utils.so.3.5.0
+%{_libdir}/libmvl.so.3.5
+%{_libdir}/libmvl.so.3.5.0
+%{_libdir}/libmvl2.so.3.5
+%{_libdir}/libmvl2.so.3.5.0
+%{_libdir}/libosl.so.3.5
+%{_libdir}/libosl.so.3.5.0
+%{_libdir}/libouel.so.3.5
+%{_libdir}/libouel.so.3.5.0
+%{_libdir}/libouml.so.3.5
+%{_libdir}/libouml.so.3.5.0
+%{_libdir}/liboxl_vrml.so.3.5
+%{_libdir}/liboxl_vrml.so.3.5.0
+%{_libdir}/libpdf1d.so.3.5
+%{_libdir}/libpdf1d.so.3.5.0
+%{_libdir}/librgrl.so.3.5
+%{_libdir}/librgrl.so.3.5.0
+%{_libdir}/librrel.so.3.5
+%{_libdir}/librrel.so.3.5.0
+%{_libdir}/librsdl.so.3.5
+%{_libdir}/librsdl.so.3.5.0
+%{_libdir}/libsdet.so.3.5
+%{_libdir}/libsdet.so.3.5.0
+%{_libdir}/libsdet_pro.so.3.5
+%{_libdir}/libsdet_pro.so.3.5.0
+%{_libdir}/libvcon_pro.so.3.5
+%{_libdir}/libvcon_pro.so.3.5.0
+%{_libdir}/libvdgl.so.3.5
+%{_libdir}/libvdgl.so.3.5.0
+%{_libdir}/libvdtop.so.3.5
+%{_libdir}/libvdtop.so.3.5.0
+%{_libdir}/libvepl.so.3.5
+%{_libdir}/libvepl.so.3.5.0
+%{_libdir}/libvidl_pro.so.3.5
+%{_libdir}/libvidl_pro.so.3.5.0
+%{_libdir}/libvifa.so.3.5
+%{_libdir}/libvifa.so.3.5.0
+%{_libdir}/libvil3d.so.3.5
+%{_libdir}/libvil3d.so.3.5.0
+%{_libdir}/libvil3d_algo.so.3.5
+%{_libdir}/libvil3d_algo.so.3.5.0
+%{_libdir}/libvil3d_io.so.3.5
+%{_libdir}/libvil3d_io.so.3.5.0
+%{_libdir}/libvil_pro.so.3.5
+%{_libdir}/libvil_pro.so.3.5.0
+%{_libdir}/libvimt.so.3.5
+%{_libdir}/libvimt.so.3.5.0
+%{_libdir}/libvimt3d.so.3.5
+%{_libdir}/libvimt3d.so.3.5.0
+%{_libdir}/libvimt_algo.so.3.5
+%{_libdir}/libvimt_algo.so.3.5.0
+%{_libdir}/libvipl.so.3.5
+%{_libdir}/libvipl.so.3.5.0
+%{_libdir}/libvmal.so.3.5
+%{_libdir}/libvmal.so.3.5.0
+%{_libdir}/libvmap.so.3.5
+%{_libdir}/libvmap.so.3.5.0
+%{_libdir}/libvolm.so.3.5
+%{_libdir}/libvolm.so.3.5.0
+%{_libdir}/libvolm_conf.so.3.5
+%{_libdir}/libvolm_conf.so.3.5.0
+%{_libdir}/libvolm_desc.so.3.5
+%{_libdir}/libvolm_desc.so.3.5.0
+%{_libdir}/libvolm_pro.so.3.5
+%{_libdir}/libvolm_pro.so.3.5.0
+%{_libdir}/libvpdfl.so.3.5
+%{_libdir}/libvpdfl.so.3.5.0
+%{_libdir}/libvpgl_pro.so.3.5
+%{_libdir}/libvpgl_pro.so.3.5.0
+%{_libdir}/libvpyr.so.3.5
+%{_libdir}/libvpyr.so.3.5.0
+%{_libdir}/libvsol.so.3.5
+%{_libdir}/libvsol.so.3.5.0
+%{_libdir}/libvsph.so.3.5
+%{_libdir}/libvsph.so.3.5.0
+%{_libdir}/libvtol.so.3.5
+%{_libdir}/libvtol.so.3.5.0
+%{_libdir}/libvtol_algo.so.3.5
+%{_libdir}/libvtol_algo.so.3.5.0
 # Bundles
-%{_libdir}/libopenjpeg2.so.2.0
-%{_libdir}/libopenjpeg2.so.2.0.0
+%{_libdir}/libopenjpeg2.so.3.5
+%{_libdir}/libopenjpeg2.so.3.5.0
 
 %files devel
 %{_datadir}/%{name}

From 1f24f8bc47645555fc19adc79bd45d32f580ea7d Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Mon, 4 Dec 2023 16:47:06 +0000
Subject: [PATCH 54/74] Rebuilt for minizip-ng transition Fedora change

Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
---
 vxl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 9e15e85..209dc13 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -59,7 +59,7 @@ BuildRequires:  libdc1394-devel
 %endif
 BuildRequires:  libgeotiff-devel
 BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  minizip-devel
+BuildRequires:  minizip-ng-compat-devel
 # Does not build with latest version
 # https://github.com/vxl/vxl/issues/627
 # BuildRequires:  openjpeg2-devel

From a28af8b1ff1bcbdc35fa6b0cf62e2e5e6d563edf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 08:18:22 +0000
Subject: [PATCH 55/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From fcf86c67fd7de16f843b1b14a8b521b3062fbf25 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 10 Apr 2024 21:27:05 -0600
Subject: [PATCH 56/74] Link bsgm to acal; Re-add #include <minizip/zip.h>

---
 0003-v3.5.0-Use-Fedora-minizip.patch |  6 ++----
 0012-v3.5.0-Link-bsgm-to-acal.patch  | 25 +++++++++++++++++++++++++
 vxl.spec                             |  2 ++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 0012-v3.5.0-Link-bsgm-to-acal.patch

diff --git a/0003-v3.5.0-Use-Fedora-minizip.patch b/0003-v3.5.0-Use-Fedora-minizip.patch
index 9d024a9..bc755b1 100644
--- a/0003-v3.5.0-Use-Fedora-minizip.patch
+++ b/0003-v3.5.0-Use-Fedora-minizip.patch
@@ -24,12 +24,10 @@ diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
 index daf78da93f..82e4a0b6d6 100644
 --- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
 +++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-@@ -37,7 +37,8 @@
- #include "vul/vul_file.h"
+@@ -38,6 +38,7 @@
  
  #if HAS_ZLIB
--#include <minizip/zip.h>
-+#include <zip.h>
+ #include <minizip/zip.h>
 +#include <zlib.h>
  #endif
  
diff --git a/0012-v3.5.0-Link-bsgm-to-acal.patch b/0012-v3.5.0-Link-bsgm-to-acal.patch
new file mode 100644
index 0000000..d3f6f66
--- /dev/null
+++ b/0012-v3.5.0-Link-bsgm-to-acal.patch
@@ -0,0 +1,25 @@
+From d975bf29cfeb1e7b7dfec3aa4f6c8ccd4923eb11 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 10 Apr 2024 20:24:51 -0600
+Subject: [PATCH 12/12] v3.5.0 Link bsgm to acal
+
+---
+ contrib/brl/bseg/bsgm/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bseg/bsgm/CMakeLists.txt b/contrib/brl/bseg/bsgm/CMakeLists.txt
+index 44c4637..975ed53 100644
+--- a/contrib/brl/bseg/bsgm/CMakeLists.txt
++++ b/contrib/brl/bseg/bsgm/CMakeLists.txt
+@@ -16,7 +16,7 @@ aux_source_directory(Templates bsgm_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bsgm LIBRARY_SOURCES ${bsgm_sources})
+ 
+-target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
++target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}acal ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+ 
+ add_subdirectory( app )
+ 
+-- 
+2.44.0
+
diff --git a/vxl.spec b/vxl.spec
index 528060a..a2918f2 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -35,6 +35,8 @@ Patch:     0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
 
 # Fix missing #include caught by gcc-11
 Patch:     0011-v3.5.0-fix-for-gcc11.patch
+# https://github.com/vxl/vxl/pull/947
+Patch:     0012-v3.5.0-Link-bsgm-to-acal.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel

From 0704b47804085998d44cf54f109bb66d1bc4577b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 09:04:33 +0000
Subject: [PATCH 57/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From eaf9738611c779450a9480fbd60b678550b0f225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 4 Sep 2024 22:43:30 +0200
Subject: [PATCH 58/74] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 vxl.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 209dc13..a3ac0aa 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -4,7 +4,8 @@ Name:       vxl
 Version:    2.0.2
 Release:    %autorelease
 Summary:    C++ Libraries for Computer Vision Research and Implementation
-License:    BSD
+# Automatically converted from old format: BSD - review is highly recommended.
+License:    LicenseRef-Callaway-BSD
 URL:        https://vxl.github.io/
 # Need to remove the non-free lena image from the sources
 # tar xf vxl-%%{version}.tar.gz

From addda23d1030da8c228e663bfb5b6fd0cd15220f Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 1 Oct 2024 15:40:33 +0100
Subject: [PATCH 59/74] wip

---
 0001-v3.5.0-unbundle-rply.patch               |  4 +-
 ...-v3.5.0-Use-Fedora-expat-and-expatpp.patch |  4 +-
 0003-v3.5.0-Use-Fedora-minizip.patch          | 18 ++--
 ...v3.5.0-Add-cmake-module-to-find-RPLY.patch |  6 +-
 0005-v3.5.0-fix-bkml-test.patch               |  6 +-
 0006-v3.5.0-Correct-rply-includedir.patch     |  6 +-
 0007-v3.5.0-remove-triangle.patch             |  6 +-
 0008-v3.5.0-remove-bits-using-triangle.patch  |  6 +-
 0009-v3.5.0-indent-to-keep-gcc-happy.patch    |  6 +-
 ...move-dependency-on-brdb-by-imesh-lib.patch |  6 +-
 0011-v3.5.0-fix-for-gcc11.patch               |  6 +-
 0012-v3.5.0-link-against-acal.patch           | 45 +++++++++
 0013-meh.patch                                | 25 +++++
 ...-use-system-zlib-tiff-minizip-compat.patch | 52 ++++++++++
 0015-v3.5.0-fix-linking.patch                 | 25 +++++
 vxl.spec                                      | 98 ++++++++++---------
 16 files changed, 235 insertions(+), 84 deletions(-)
 create mode 100644 0012-v3.5.0-link-against-acal.patch
 create mode 100644 0013-meh.patch
 create mode 100644 0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
 create mode 100644 0015-v3.5.0-fix-linking.patch

diff --git a/0001-v3.5.0-unbundle-rply.patch b/0001-v3.5.0-unbundle-rply.patch
index 2e10623..7c775c6 100644
--- a/0001-v3.5.0-unbundle-rply.patch
+++ b/0001-v3.5.0-unbundle-rply.patch
@@ -1,7 +1,7 @@
 From b7944a8898b3a1aef606cf6f4047dcf11aca11a6 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 01/11] v3.5.0: unbundle rply
+Subject: [PATCH 01/15] v3.5.0: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
@@ -3608,5 +3608,5 @@ index 3c604fd88e..0000000000
 - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 - * ---------------------------------------------------------------------- */
 -- 
-2.41.0
+2.43.0
 
diff --git a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
index 852f5ed..6c4fdcc 100644
--- a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
+++ b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
@@ -1,7 +1,7 @@
 From 26d548e302e9fa1bcc2986ba91f12313ccb00829 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 02/11] v3.5.0 Use Fedora expat and expatpp
+Subject: [PATCH 02/15] v3.5.0 Use Fedora expat and expatpp
 
 ---
  CMakeLists.txt                                |  2 +
@@ -919,5 +919,5 @@ index 26504576be..ed189bccd7 100644
    if(EXPATPP_FOUND)
      include_directories( ${BRL_INCLUDE_DIR} )
 -- 
-2.41.0
+2.43.0
 
diff --git a/0003-v3.5.0-Use-Fedora-minizip.patch b/0003-v3.5.0-Use-Fedora-minizip.patch
index 9d024a9..11f5f7c 100644
--- a/0003-v3.5.0-Use-Fedora-minizip.patch
+++ b/0003-v3.5.0-Use-Fedora-minizip.patch
@@ -1,12 +1,12 @@
-From 9ea313cbb20b9d4ac4d21e03323e57eb0eb79502 Mon Sep 17 00:00:00 2001
+From c0cc5459f8ee3dfc40cefb26487a1449d5100d8e Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 03/11] v3.5.0 Use Fedora minizip
+Subject: [PATCH 03/15] v3.5.0 Use Fedora minizip
 
 ---
  contrib/brl/b3p/CMakeLists.txt                                | 4 ----
- .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 3 ++-
- 2 files changed, 2 insertions(+), 5 deletions(-)
+ .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 1 +
+ 2 files changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
 index 7fefd89f41..b2f4b5f6bd 100644
@@ -21,19 +21,17 @@ index 7fefd89f41..b2f4b5f6bd 100644
 -
 -
 diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-index daf78da93f..82e4a0b6d6 100644
+index daf78da93f..1a2241adbf 100644
 --- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
 +++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-@@ -37,7 +37,8 @@
- #include "vul/vul_file.h"
+@@ -38,6 +38,7 @@
  
  #if HAS_ZLIB
--#include <minizip/zip.h>
-+#include <zip.h>
+ #include <minizip/zip.h>
 +#include <zlib.h>
  #endif
  
  #define WRITEBUFFERSIZE (16384)
 -- 
-2.41.0
+2.43.0
 
diff --git a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
index 8af0445..ac3ed6d 100644
--- a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
+++ b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
@@ -1,7 +1,7 @@
-From 88a4bf8941e7d98768697ef71070fce5302808d2 Mon Sep 17 00:00:00 2001
+From 04c541d97aeb5ccc75615dd537e8a64c1e1f3814 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 14:11:31 +0100
-Subject: [PATCH 04/11] v3.5.0 Add cmake module to find RPLY
+Subject: [PATCH 04/15] v3.5.0 Add cmake module to find RPLY
 
 ---
  CMakeLists.txt                                |  3 +-
@@ -104,5 +104,5 @@ index c3ed4ed27d..19763fbd71 100644
  include_directories( ${BRL_INCLUDE_DIR}/bseg )
  include_directories( ${MUL_INCLUDE_DIR} )
 -- 
-2.41.0
+2.43.0
 
diff --git a/0005-v3.5.0-fix-bkml-test.patch b/0005-v3.5.0-fix-bkml-test.patch
index f2250b4..f4cc6d4 100644
--- a/0005-v3.5.0-fix-bkml-test.patch
+++ b/0005-v3.5.0-fix-bkml-test.patch
@@ -1,7 +1,7 @@
-From 61d87d4f700e66f09f5cad1ae5c9e3fbbb4c61b9 Mon Sep 17 00:00:00 2001
+From 8697b5c51bf883e04634d49c45421f2776f59fd3 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 17:05:39 +0100
-Subject: [PATCH 05/11] v3.5.0 fix bkml test
+Subject: [PATCH 05/15] v3.5.0 fix bkml test
 
 ---
  contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
@@ -54,5 +54,5 @@ index 84c36469a4..9eddec1f66 100644
 +  target_link_libraries( bkml_test_include bkml )
 +endif()
 -- 
-2.41.0
+2.43.0
 
diff --git a/0006-v3.5.0-Correct-rply-includedir.patch b/0006-v3.5.0-Correct-rply-includedir.patch
index 77ffa27..7b6a03a 100644
--- a/0006-v3.5.0-Correct-rply-includedir.patch
+++ b/0006-v3.5.0-Correct-rply-includedir.patch
@@ -1,7 +1,7 @@
-From eb908f4841ef0f25fc6a34740343a04303caf60b Mon Sep 17 00:00:00 2001
+From 2252a472803e52dd504e243593f32f4312342591 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 23:32:15 +0100
-Subject: [PATCH 06/11] v3.5.0 Correct rply includedir
+Subject: [PATCH 06/15] v3.5.0 Correct rply includedir
 
 ---
  contrib/brl/bbas/bvrml/pro/CMakeLists.txt      |  8 +++++++-
@@ -110,5 +110,5 @@ index 265cd5d066..2ec707047f 100644
  endif()
  
 -- 
-2.41.0
+2.43.0
 
diff --git a/0007-v3.5.0-remove-triangle.patch b/0007-v3.5.0-remove-triangle.patch
index 0a01794..5483f24 100644
--- a/0007-v3.5.0-remove-triangle.patch
+++ b/0007-v3.5.0-remove-triangle.patch
@@ -1,7 +1,7 @@
-From 0bab0cea132ba88f0d3646797e3d4087016bc2a8 Mon Sep 17 00:00:00 2001
+From 80bdd447db20e28e08adeaa35a6528957e286902 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 10:48:40 +0100
-Subject: [PATCH 07/11] v3.5.0: remove triangle
+Subject: [PATCH 07/15] v3.5.0: remove triangle
 
 Reference:
 https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files
@@ -20103,5 +20103,5 @@ index de14cb5395..0000000000
 -#endif /* not ANSI_DECLARATORS */
 -#endif /* netlib_triangle_h_ */
 -- 
-2.41.0
+2.43.0
 
diff --git a/0008-v3.5.0-remove-bits-using-triangle.patch b/0008-v3.5.0-remove-bits-using-triangle.patch
index cd64871..d0e47fc 100644
--- a/0008-v3.5.0-remove-bits-using-triangle.patch
+++ b/0008-v3.5.0-remove-bits-using-triangle.patch
@@ -1,7 +1,7 @@
-From e06da0ba5eac36a06f00f45055ab7e9ba690d0da Mon Sep 17 00:00:00 2001
+From da8df48049aa20240103f6da054d5245faa88c04 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 11:31:49 +0100
-Subject: [PATCH 08/11] v3.5.0: remove bits using triangle
+Subject: [PATCH 08/15] v3.5.0: remove bits using triangle
 
 ---
  contrib/brl/bbas/imesh/algo/CMakeLists.txt    |  11 -
@@ -2047,5 +2047,5 @@ index df3ed4bd29..f3e98fca4c 100644
  #include <gtrl/gtrl_polygon.h>
  
 -- 
-2.41.0
+2.43.0
 
diff --git a/0009-v3.5.0-indent-to-keep-gcc-happy.patch b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
index 02d9fcd..7750f89 100644
--- a/0009-v3.5.0-indent-to-keep-gcc-happy.patch
+++ b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
@@ -1,7 +1,7 @@
-From 64ddad342a4e3e08801863ece32ce1fcb3388dbe Mon Sep 17 00:00:00 2001
+From 303abcb68bcc14b04d73460d25d8e4978e5b3617 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 13:27:34 +0100
-Subject: [PATCH 09/11] v3.5.0: indent to keep gcc happy
+Subject: [PATCH 09/15] v3.5.0: indent to keep gcc happy
 
 ---
  core/vpgl/vpgl_tri_focal_tensor.h | 3 ++-
@@ -22,5 +22,5 @@ index 21a96688fb..e3f8929767 100644
  
    bool compute_epipoles();
 -- 
-2.41.0
+2.43.0
 
diff --git a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch b/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
index 5e881e2..e7cf62c 100644
--- a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
+++ b/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
@@ -1,7 +1,7 @@
-From 13b3970f10dd132bda85f3ae87c610934a7d62eb Mon Sep 17 00:00:00 2001
+From 01cc01d9f11380ee872b8d3b9868dfd8a2f5d9ab Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 15:55:38 +0100
-Subject: [PATCH 10/11] Revert "remove dependency on brdb by imesh lib"
+Subject: [PATCH 10/15] Revert "remove dependency on brdb by imesh lib"
 
 This reverts commit fb7582a4a0509a82bd99fd1636ba00ca16279847.
 ---
@@ -28,5 +28,5 @@ index b122b33faf..a8a107e574 100644
 +endif()
 \ No newline at end of file
 -- 
-2.41.0
+2.43.0
 
diff --git a/0011-v3.5.0-fix-for-gcc11.patch b/0011-v3.5.0-fix-for-gcc11.patch
index 6eb4d0b..32a3c81 100644
--- a/0011-v3.5.0-fix-for-gcc11.patch
+++ b/0011-v3.5.0-fix-for-gcc11.patch
@@ -1,7 +1,7 @@
-From b430d3ffb98c2c50088b0ee3afe2f6fcd521fe49 Mon Sep 17 00:00:00 2001
+From 9b6cd29a9ef87c7e221ba00987e6aa29b68a902f Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 17:05:04 +0100
-Subject: [PATCH 11/11] v3.5.0: fix for gcc11
+Subject: [PATCH 11/15] v3.5.0: fix for gcc11
 
 ---
  .../brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx    | 1 +
@@ -85,5 +85,5 @@ index 26760c2054..0556918395 100644
  //:
  // \file
 -- 
-2.41.0
+2.43.0
 
diff --git a/0012-v3.5.0-link-against-acal.patch b/0012-v3.5.0-link-against-acal.patch
new file mode 100644
index 0000000..c7a12b8
--- /dev/null
+++ b/0012-v3.5.0-link-against-acal.patch
@@ -0,0 +1,45 @@
+From bb9879544a1e180c1a2f2f3b4aa3241d4fed1f27 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 24 Oct 2023 12:16:41 +0100
+Subject: [PATCH 12/15] v3.5.0: link against acal
+
+To fix:
+```
+/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `acal_f_utils::read_affine_cameras(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::map<unsigned long, vpgl_affine_camera<double>, std::less<unsigned long>, std::allocator<std::pair<unsigned long const, vpgl_affine_camera<double> > > >&)'
+/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `acal_f_utils::datetime_from_iname(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, dtime&)'
+/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `dtime::time_diff(dtime const&, dtime const&)'
+collect2: error: ld returned 1 exit status
+```
+---
+ contrib/brl/bseg/bsgm/CMakeLists.txt         | 2 +-
+ contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bseg/bsgm/CMakeLists.txt b/contrib/brl/bseg/bsgm/CMakeLists.txt
+index 44c4637af2..975ed5364c 100644
+--- a/contrib/brl/bseg/bsgm/CMakeLists.txt
++++ b/contrib/brl/bseg/bsgm/CMakeLists.txt
+@@ -16,7 +16,7 @@ aux_source_directory(Templates bsgm_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bsgm LIBRARY_SOURCES ${bsgm_sources})
+ 
+-target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
++target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}acal ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+ 
+ add_subdirectory( app )
+ 
+diff --git a/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx b/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
+index 6320d290ff..e97e318428 100644
+--- a/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
++++ b/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
+@@ -4,6 +4,7 @@
+ #include <algorithm>
+ #include <fstream>
+ #include <bpgl/acal/acal_metadata.h>
++#include <bpgl/acal/acal_f_utils.h>
+ 
+ std::string bsgm_pair_selector::remove_crop_postfix(std::string const& iname)
+ {
+-- 
+2.43.0
+
diff --git a/0013-meh.patch b/0013-meh.patch
new file mode 100644
index 0000000..d4f4c69
--- /dev/null
+++ b/0013-meh.patch
@@ -0,0 +1,25 @@
+From 67a426448277f57dd1f8ad97ebf72ca01f74ff10 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 24 Oct 2023 13:50:37 +0100
+Subject: [PATCH 13/15] meh
+
+---
+ contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt b/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
+index 66d543b5c9..0ffff761fd 100644
+--- a/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
++++ b/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
+@@ -8,7 +8,7 @@ if(EXPAT_FOUND)
+   test_vil_crop_image_process.cxx
+  )
+ 
+-target_link_libraries(vil_pro_test_all ${VXL_LIB_PREFIX}testlib vil_pro bprb sdet ${VXL_LIB_PREFIX}vil expat expatpp)
++target_link_libraries(vil_pro_test_all ${VXL_LIB_PREFIX}testlib vil_pro bprb brdb sdet ${VXL_LIB_PREFIX}vil expat expatpp)
+ 
+ add_test( NAME bpro_vil_test_convert_to_n_planes_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_convert_to_n_planes_process )
+ add_test( NAME bpro_vil_test_crop_image_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_crop_image_process )
+-- 
+2.43.0
+
diff --git a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
new file mode 100644
index 0000000..9ab6ee7
--- /dev/null
+++ b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
@@ -0,0 +1,52 @@
+From 7c3a087b1484dad20f5ff098f4e3daceffc82e0b Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 22 Jan 2024 11:40:35 +0000
+Subject: [PATCH 14/15] v3.5.0: use system zlib, tiff, minizip-compat
+
+---
+ contrib/brl/bseg/bmdl/CMakeLists.txt     | 7 +++++++
+ contrib/brl/bseg/bmdl/pro/CMakeLists.txt | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/brl/bseg/bmdl/CMakeLists.txt b/contrib/brl/bseg/bmdl/CMakeLists.txt
+index 4890d2ab29..8db0d2ca1c 100644
+--- a/contrib/brl/bseg/bmdl/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl/CMakeLists.txt
+@@ -1,5 +1,12 @@
+ # This is brl/seg/bmdl/CMakeLists.txt
+ 
++FIND_PACKAGE( ZLIB QUIET )
++if(ZLIB_FOUND)
++  include_directories( ${ZLIB_INCLUDE_DIR} )
++  include_directories( ${BRL_INCLUDE_DIR}/b3p )
++  add_definitions(-DHAS_ZLIB=1)
++endif()
++
+ if(HAS_GEOTIFF)
+   include_directories( ${GEOTIFF_INCLUDE_DIR} )
+ 
+diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+index 7c73fe1bb0..cc30626c09 100644
+--- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This is contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+ # bmdl's Process Library
+ 
+-include( ${VXL_CMAKE_DIR}/FindZLIB.cmake )
++FIND_PACKAGE( ZLIB QUIET )
+ if(ZLIB_FOUND)
+   include_directories( ${ZLIB_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p )
+@@ -12,7 +12,7 @@ endif()
+ FIND_PACKAGE(EXPAT REQUIRED)
+ FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+-  include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
++  FIND_PACKAGE(TIFF)
+   if(TIFF_FOUND)
+     include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+     if(GEOTIFF_FOUND)
+-- 
+2.43.0
+
diff --git a/0015-v3.5.0-fix-linking.patch b/0015-v3.5.0-fix-linking.patch
new file mode 100644
index 0000000..e71e087
--- /dev/null
+++ b/0015-v3.5.0-fix-linking.patch
@@ -0,0 +1,25 @@
+From c6b2dec1bb09ef0d7fac89a6a2f74d85fa9b36bc Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 23 Jan 2024 16:54:51 +0000
+Subject: [PATCH 15/15] v3.5.0: fix linking
+
+---
+ contrib/brl/bpro/core/brip_pro/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bpro/core/brip_pro/CMakeLists.txt b/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+index cfa7d46af8..b8d557cdb9 100644
+--- a/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
++++ b/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+@@ -14,7 +14,7 @@ aux_source_directory(Templates brip_pro_sources)
+ aux_source_directory(processes brip_pro_sources)
+ 
+ vxl_add_library(LIBRARY_NAME brip_pro LIBRARY_SOURCES ${brip_pro_sources})
+-target_link_libraries(brip_pro bprb brdb brip vil_pro ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vsl bil_algo)
++target_link_libraries(brip_pro bprb brdb brip vpgl_pro vil_pro ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vsl bil_algo)
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+-- 
+2.43.0
+
diff --git a/vxl.spec b/vxl.spec
index 528060a..a9118e2 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -35,6 +35,11 @@ Patch:     0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
 
 # Fix missing #include caught by gcc-11
 Patch:     0011-v3.5.0-fix-for-gcc11.patch
+# For linker error
+Patch:     0012-v3.5.0-link-against-acal.patch
+Patch:     0013-meh.patch
+Patch:     0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
+Patch:     0015-v3.5.0-fix-linking.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -58,7 +63,8 @@ BuildRequires:  libdc1394-devel
 %endif
 BuildRequires:  libgeotiff-devel
 BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  minizip-devel
+# Does not build with new minizip
+BuildRequires:  minizip-compat-devel
 # Does not build with latest version
 # https://github.com/vxl/vxl/issues/627
 # BuildRequires:  openjpeg2-devel
@@ -70,7 +76,7 @@ BuildRequires:  rply-devel
 BuildRequires:  SIMVoleon-devel
 BuildRequires:  shapelib-devel
 BuildRequires:  texi2html
-BuildRequires:  zlib-devel
+BuildRequires:  zlib-ng-compat-devel
 
 # Bundled
 Provides:  bundled(libopenjpeg2) = 2.0.0
@@ -111,10 +117,10 @@ develop code based on VXL.
 # QV is a Silicon Graphics' VRML parser from the 90s. Now unmantained.
 
 # Bundled: dcmtk
-# Requires VXL_FORCE_V3P_DCMTK:BOOL=ON
+# Requires VXL_FORCE_V3P_DCMTK:BOOL=TRUE
 
 # Also bundled: openjpeg2
-# Requires VXL_FORCE_V3P_OPENJPEG2:BOOL=ON \
+# Requires VXL_FORCE_V3P_OPENJPEG2:BOOL=TRUE \
 # Also may be needed
 # -DOPENJPEG2_INCLUDE_DIR:PATH=%%{_includedir}/openjpeg-2.3 \
 # -DOPENJPEG2_LIBRARIES:PATH=%%{_libdir}/libopenjp2.so \
@@ -146,50 +152,50 @@ sed -i '/add_subdirectory(minizip)/ d' contrib/brl/b3p/CMakeLists.txt
 
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DVXL_USE_GEOTIFF:BOOL=ON \
-    -DVXL_FORCE_B3P_EXPAT:BOOL=OFF \
-    -DVXL_FORCE_V3P_DCMTK:BOOL=ON \
-    -DVXL_FORCE_V3P_GEOTIFF:BOOL=OFF \
-    -DVXL_FORCE_V3P_JPEG:BOOL=OFF \
-    -DVXL_FORCE_V3P_PNG:BOOL=OFF \
-    -DVXL_FORCE_V3P_TIFF:BOOL=OFF \
-    -DVXL_FORCE_V3P_ZLIB:BOOL=OFF \
-    -DVXL_FORCE_V3P_RPLY:BOOL=OFF \
-    -DVXL_FORCE_V3P_OPENJPEG2:BOOL=ON \
-    -DVXL_USING_NATIVE_ZLIB:BOOL=ON \
-    -DVXL_USING_NATIVE_JPEG:BOOL=ON \
-    -DVXL_USING_NATIVE_PNG:BOOL=ON \
-    -DVXL_USING_NATIVE_TIFF:BOOL=ON \
-    -DVXL_USING_NATIVE_GEOTIFF:BOOL=ON \
-    -DVXL_USING_NATIVE_EXPAT:BOOL=ON \
-    -DVXL_USING_NATIVE_EXPATPP:BOOL=ON \
-    -DVXL_USING_NATIVE_SHAPELIB:BOOL=ON \
-    -DVXL_USING_NATIVE_BZLIB2:BOOL=ON \
-    -DVXL_BUILD_VGUI:BOOL=OFF \
-    -DVXL_BUILD_BGUI3D:BOOL=OFF \
-    -DVXL_BUILD_OXL:BOOL=ON \
-    -DVXL_BUILD_BRL:BOOL=ON \
-    -DVXL_BUILD_BRL_PYTHON:BOOL=OFF \
-    -DVXL_BUILD_GEL:BOOL=ON \
-    -DVXL_BUILD_PRIP:BOOL=ON \
-    -DVXL_BUILD_CONVERSIONS:BOOL=ON \
-    -DVXL_BUILD_CUL:BOOL=ON \
-    -DVXL_BUILD_RPL:BOOL=ON \
-    -DVXL_BUILD_CONTRIB:BOOL=ON \
-    -DVXL_BUILD_CORE_SERIALISATION:BOOL=ON \
-    -DVXL_BUILD_CORE_GEOMETRY:BOOL=ON \
-    -DVXL_BUILD_CORE_IMAGING:BOOL=ON \
-    -DVXL_BUILD_CORE_NUMERICS:BOOL=ON \
-    -DVXL_BUILD_CORE_PROBABILITY:BOOL=ON \
-    -DVXL_BUILD_CORE_UTILITIES:BOOL=ON \
-    -DVXL_BUILD_CORE_VIDEO:BOOL=ON \
-    -DVXL_BUILD_EXAMPLES:BOOL=OFF \
-    -DBUILD_TESTING:BOOL=ON \
-    -DVXL_BUILD_DOCUMENTATION:BOOL=ON \
+    -DBUILD_SHARED_LIBS:BOOL=TRUE \
+    -DVXL_USE_GEOTIFF:BOOL=TRUE \
+    -DVXL_FORCE_B3P_EXPAT:BOOL=FALSE \
+    -DVXL_FORCE_V3P_DCMTK:BOOL=TRUE \
+    -DVXL_FORCE_V3P_GEOTIFF:BOOL=FALSE \
+    -DVXL_FORCE_V3P_JPEG:BOOL=FALSE \
+    -DVXL_FORCE_V3P_PNG:BOOL=FALSE \
+    -DVXL_FORCE_V3P_TIFF:BOOL=FALSE \
+    -DVXL_FORCE_V3P_ZLIB:BOOL=FALSE \
+    -DVXL_FORCE_V3P_RPLY:BOOL=FALSE \
+    -DVXL_FORCE_V3P_OPENJPEG2:BOOL=TRUE \
+    -DVXL_USING_NATIVE_ZLIB:BOOL=TRUE \
+    -DVXL_USING_NATIVE_JPEG:BOOL=TRUE \
+    -DVXL_USING_NATIVE_PNG:BOOL=TRUE \
+    -DVXL_USING_NATIVE_TIFF:BOOL=TRUE \
+    -DVXL_USING_NATIVE_GEOTIFF:BOOL=TRUE \
+    -DVXL_USING_NATIVE_EXPAT:BOOL=TRUE \
+    -DVXL_USING_NATIVE_EXPATPP:BOOL=TRUE \
+    -DVXL_USING_NATIVE_SHAPELIB:BOOL=TRUE \
+    -DVXL_USING_NATIVE_BZLIB2:BOOL=TRUE \
+    -DVXL_BUILD_VGUI:BOOL=FALSE \
+    -DVXL_BUILD_BGUI3D:BOOL=FALSE \
+    -DVXL_BUILD_OXL:BOOL=TRUE \
+    -DVXL_BUILD_BRL:BOOL=TRUE \
+    -DVXL_BUILD_BRL_PYTHON:BOOL=FALSE \
+    -DVXL_BUILD_GEL:BOOL=TRUE \
+    -DVXL_BUILD_PRIP:BOOL=TRUE \
+    -DVXL_BUILD_CONVERSIONS:BOOL=TRUE \
+    -DVXL_BUILD_CUL:BOOL=TRUE \
+    -DVXL_BUILD_RPL:BOOL=TRUE \
+    -DVXL_BUILD_CONTRIB:BOOL=TRUE \
+    -DVXL_BUILD_CORE_SERIALISATION:BOOL=TRUE \
+    -DVXL_BUILD_CORE_GEOMETRY:BOOL=TRUE \
+    -DVXL_BUILD_CORE_IMAGING:BOOL=TRUE \
+    -DVXL_BUILD_CORE_NUMERICS:BOOL=TRUE \
+    -DVXL_BUILD_CORE_PROBABILITY:BOOL=TRUE \
+    -DVXL_BUILD_CORE_UTILITIES:BOOL=TRUE \
+    -DVXL_BUILD_CORE_VIDEO:BOOL=TRUE \
+    -DVXL_BUILD_EXAMPLES:BOOL=FALSE \
+    -DBUILD_TESTING:BOOL=TRUE \
+    -DVXL_BUILD_DOCUMENTATION:BOOL=TRUE \
     -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
     -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
-    -DVNL_CONFIG_LEGACY_METHODS:BOOL=ON
+    -DVNL_CONFIG_LEGACY_METHODS:BOOL=TRUE
 
 # Other stuff
 # -DEXPATPP_INCLUDE_DIR:PATH=%%{_includedir} \

From 937cea5565318ac6f2a644ca6f026853901f35bd Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 2 Oct 2024 13:01:57 +0100
Subject: [PATCH 60/74] fix: fix build

---
 0001-v3.5.0-unbundle-rply.patch               |    4 +-
 ...-v3.5.0-Use-Fedora-expat-and-expatpp.patch |    4 +-
 0003-v3.5.0-Use-Fedora-minizip.patch          |    4 +-
 ...v3.5.0-Add-cmake-module-to-find-RPLY.patch |    4 +-
 0005-v3.5.0-fix-bkml-test.patch               |    4 +-
 0006-v3.5.0-Correct-rply-includedir.patch     |    4 +-
 0007-v3.5.0-remove-triangle.patch             |    4 +-
 0008-v3.5.0-remove-bits-using-triangle.patch  |    4 +-
 0009-v3.5.0-indent-to-keep-gcc-happy.patch    |    4 +-
 ...move-dependency-on-brdb-by-imesh-lib.patch |    4 +-
 0011-v3.5.0-fix-for-gcc11.patch               |    4 +-
 0012-v3.5.0-link-against-acal.patch           |    4 +-
 0013-meh.patch                                |    4 +-
 ...-use-system-zlib-tiff-minizip-compat.patch |    4 +-
 0015-v3.5.0-fix-linking.patch                 |    4 +-
 0016-v3.5.0-fix-linking.patch                 |   26 +
 ...xm2-processes-that-use-sdnet-that-re.patch |  894 +++++++++++++
 vxl.spec                                      | 1119 +++++++++--------
 18 files changed, 1518 insertions(+), 581 deletions(-)
 create mode 100644 0016-v3.5.0-fix-linking.patch
 create mode 100644 0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch

diff --git a/0001-v3.5.0-unbundle-rply.patch b/0001-v3.5.0-unbundle-rply.patch
index 7c775c6..264671a 100644
--- a/0001-v3.5.0-unbundle-rply.patch
+++ b/0001-v3.5.0-unbundle-rply.patch
@@ -1,7 +1,7 @@
 From b7944a8898b3a1aef606cf6f4047dcf11aca11a6 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 01/15] v3.5.0: unbundle rply
+Subject: [PATCH 01/17] v3.5.0: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
@@ -3608,5 +3608,5 @@ index 3c604fd88e..0000000000
 - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 - * ---------------------------------------------------------------------- */
 -- 
-2.43.0
+2.46.1
 
diff --git a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
index 6c4fdcc..c709024 100644
--- a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
+++ b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
@@ -1,7 +1,7 @@
 From 26d548e302e9fa1bcc2986ba91f12313ccb00829 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 02/15] v3.5.0 Use Fedora expat and expatpp
+Subject: [PATCH 02/17] v3.5.0 Use Fedora expat and expatpp
 
 ---
  CMakeLists.txt                                |  2 +
@@ -919,5 +919,5 @@ index 26504576be..ed189bccd7 100644
    if(EXPATPP_FOUND)
      include_directories( ${BRL_INCLUDE_DIR} )
 -- 
-2.43.0
+2.46.1
 
diff --git a/0003-v3.5.0-Use-Fedora-minizip.patch b/0003-v3.5.0-Use-Fedora-minizip.patch
index 11f5f7c..c6b5784 100644
--- a/0003-v3.5.0-Use-Fedora-minizip.patch
+++ b/0003-v3.5.0-Use-Fedora-minizip.patch
@@ -1,7 +1,7 @@
 From c0cc5459f8ee3dfc40cefb26487a1449d5100d8e Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 03/15] v3.5.0 Use Fedora minizip
+Subject: [PATCH 03/17] v3.5.0 Use Fedora minizip
 
 ---
  contrib/brl/b3p/CMakeLists.txt                                | 4 ----
@@ -33,5 +33,5 @@ index daf78da93f..1a2241adbf 100644
  
  #define WRITEBUFFERSIZE (16384)
 -- 
-2.43.0
+2.46.1
 
diff --git a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
index ac3ed6d..58325e3 100644
--- a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
+++ b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
@@ -1,7 +1,7 @@
 From 04c541d97aeb5ccc75615dd537e8a64c1e1f3814 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 14:11:31 +0100
-Subject: [PATCH 04/15] v3.5.0 Add cmake module to find RPLY
+Subject: [PATCH 04/17] v3.5.0 Add cmake module to find RPLY
 
 ---
  CMakeLists.txt                                |  3 +-
@@ -104,5 +104,5 @@ index c3ed4ed27d..19763fbd71 100644
  include_directories( ${BRL_INCLUDE_DIR}/bseg )
  include_directories( ${MUL_INCLUDE_DIR} )
 -- 
-2.43.0
+2.46.1
 
diff --git a/0005-v3.5.0-fix-bkml-test.patch b/0005-v3.5.0-fix-bkml-test.patch
index f4cc6d4..1e0da3d 100644
--- a/0005-v3.5.0-fix-bkml-test.patch
+++ b/0005-v3.5.0-fix-bkml-test.patch
@@ -1,7 +1,7 @@
 From 8697b5c51bf883e04634d49c45421f2776f59fd3 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 17:05:39 +0100
-Subject: [PATCH 05/15] v3.5.0 fix bkml test
+Subject: [PATCH 05/17] v3.5.0 fix bkml test
 
 ---
  contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
@@ -54,5 +54,5 @@ index 84c36469a4..9eddec1f66 100644
 +  target_link_libraries( bkml_test_include bkml )
 +endif()
 -- 
-2.43.0
+2.46.1
 
diff --git a/0006-v3.5.0-Correct-rply-includedir.patch b/0006-v3.5.0-Correct-rply-includedir.patch
index 7b6a03a..3e73b66 100644
--- a/0006-v3.5.0-Correct-rply-includedir.patch
+++ b/0006-v3.5.0-Correct-rply-includedir.patch
@@ -1,7 +1,7 @@
 From 2252a472803e52dd504e243593f32f4312342591 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 23:32:15 +0100
-Subject: [PATCH 06/15] v3.5.0 Correct rply includedir
+Subject: [PATCH 06/17] v3.5.0 Correct rply includedir
 
 ---
  contrib/brl/bbas/bvrml/pro/CMakeLists.txt      |  8 +++++++-
@@ -110,5 +110,5 @@ index 265cd5d066..2ec707047f 100644
  endif()
  
 -- 
-2.43.0
+2.46.1
 
diff --git a/0007-v3.5.0-remove-triangle.patch b/0007-v3.5.0-remove-triangle.patch
index 5483f24..1a64170 100644
--- a/0007-v3.5.0-remove-triangle.patch
+++ b/0007-v3.5.0-remove-triangle.patch
@@ -1,7 +1,7 @@
 From 80bdd447db20e28e08adeaa35a6528957e286902 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 10:48:40 +0100
-Subject: [PATCH 07/15] v3.5.0: remove triangle
+Subject: [PATCH 07/17] v3.5.0: remove triangle
 
 Reference:
 https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files
@@ -20103,5 +20103,5 @@ index de14cb5395..0000000000
 -#endif /* not ANSI_DECLARATORS */
 -#endif /* netlib_triangle_h_ */
 -- 
-2.43.0
+2.46.1
 
diff --git a/0008-v3.5.0-remove-bits-using-triangle.patch b/0008-v3.5.0-remove-bits-using-triangle.patch
index d0e47fc..69bb312 100644
--- a/0008-v3.5.0-remove-bits-using-triangle.patch
+++ b/0008-v3.5.0-remove-bits-using-triangle.patch
@@ -1,7 +1,7 @@
 From da8df48049aa20240103f6da054d5245faa88c04 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 11:31:49 +0100
-Subject: [PATCH 08/15] v3.5.0: remove bits using triangle
+Subject: [PATCH 08/17] v3.5.0: remove bits using triangle
 
 ---
  contrib/brl/bbas/imesh/algo/CMakeLists.txt    |  11 -
@@ -2047,5 +2047,5 @@ index df3ed4bd29..f3e98fca4c 100644
  #include <gtrl/gtrl_polygon.h>
  
 -- 
-2.43.0
+2.46.1
 
diff --git a/0009-v3.5.0-indent-to-keep-gcc-happy.patch b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
index 7750f89..39742da 100644
--- a/0009-v3.5.0-indent-to-keep-gcc-happy.patch
+++ b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
@@ -1,7 +1,7 @@
 From 303abcb68bcc14b04d73460d25d8e4978e5b3617 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 13:27:34 +0100
-Subject: [PATCH 09/15] v3.5.0: indent to keep gcc happy
+Subject: [PATCH 09/17] v3.5.0: indent to keep gcc happy
 
 ---
  core/vpgl/vpgl_tri_focal_tensor.h | 3 ++-
@@ -22,5 +22,5 @@ index 21a96688fb..e3f8929767 100644
  
    bool compute_epipoles();
 -- 
-2.43.0
+2.46.1
 
diff --git a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch b/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
index e7cf62c..13f1bc5 100644
--- a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
+++ b/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
@@ -1,7 +1,7 @@
 From 01cc01d9f11380ee872b8d3b9868dfd8a2f5d9ab Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 15:55:38 +0100
-Subject: [PATCH 10/15] Revert "remove dependency on brdb by imesh lib"
+Subject: [PATCH 10/17] Revert "remove dependency on brdb by imesh lib"
 
 This reverts commit fb7582a4a0509a82bd99fd1636ba00ca16279847.
 ---
@@ -28,5 +28,5 @@ index b122b33faf..a8a107e574 100644
 +endif()
 \ No newline at end of file
 -- 
-2.43.0
+2.46.1
 
diff --git a/0011-v3.5.0-fix-for-gcc11.patch b/0011-v3.5.0-fix-for-gcc11.patch
index 32a3c81..4b5bf3c 100644
--- a/0011-v3.5.0-fix-for-gcc11.patch
+++ b/0011-v3.5.0-fix-for-gcc11.patch
@@ -1,7 +1,7 @@
 From 9b6cd29a9ef87c7e221ba00987e6aa29b68a902f Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 17:05:04 +0100
-Subject: [PATCH 11/15] v3.5.0: fix for gcc11
+Subject: [PATCH 11/17] v3.5.0: fix for gcc11
 
 ---
  .../brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx    | 1 +
@@ -85,5 +85,5 @@ index 26760c2054..0556918395 100644
  //:
  // \file
 -- 
-2.43.0
+2.46.1
 
diff --git a/0012-v3.5.0-link-against-acal.patch b/0012-v3.5.0-link-against-acal.patch
index c7a12b8..b59977a 100644
--- a/0012-v3.5.0-link-against-acal.patch
+++ b/0012-v3.5.0-link-against-acal.patch
@@ -1,7 +1,7 @@
 From bb9879544a1e180c1a2f2f3b4aa3241d4fed1f27 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 24 Oct 2023 12:16:41 +0100
-Subject: [PATCH 12/15] v3.5.0: link against acal
+Subject: [PATCH 12/17] v3.5.0: link against acal
 
 To fix:
 ```
@@ -41,5 +41,5 @@ index 6320d290ff..e97e318428 100644
  std::string bsgm_pair_selector::remove_crop_postfix(std::string const& iname)
  {
 -- 
-2.43.0
+2.46.1
 
diff --git a/0013-meh.patch b/0013-meh.patch
index d4f4c69..3ef0616 100644
--- a/0013-meh.patch
+++ b/0013-meh.patch
@@ -1,7 +1,7 @@
 From 67a426448277f57dd1f8ad97ebf72ca01f74ff10 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 24 Oct 2023 13:50:37 +0100
-Subject: [PATCH 13/15] meh
+Subject: [PATCH 13/17] meh
 
 ---
  contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt | 2 +-
@@ -21,5 +21,5 @@ index 66d543b5c9..0ffff761fd 100644
  add_test( NAME bpro_vil_test_convert_to_n_planes_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_convert_to_n_planes_process )
  add_test( NAME bpro_vil_test_crop_image_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_crop_image_process )
 -- 
-2.43.0
+2.46.1
 
diff --git a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
index 9ab6ee7..d55dfb6 100644
--- a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
+++ b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
@@ -1,7 +1,7 @@
 From 7c3a087b1484dad20f5ff098f4e3daceffc82e0b Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 22 Jan 2024 11:40:35 +0000
-Subject: [PATCH 14/15] v3.5.0: use system zlib, tiff, minizip-compat
+Subject: [PATCH 14/17] v3.5.0: use system zlib, tiff, minizip-compat
 
 ---
  contrib/brl/bseg/bmdl/CMakeLists.txt     | 7 +++++++
@@ -48,5 +48,5 @@ index 7c73fe1bb0..cc30626c09 100644
      include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
      if(GEOTIFF_FOUND)
 -- 
-2.43.0
+2.46.1
 
diff --git a/0015-v3.5.0-fix-linking.patch b/0015-v3.5.0-fix-linking.patch
index e71e087..06f6c57 100644
--- a/0015-v3.5.0-fix-linking.patch
+++ b/0015-v3.5.0-fix-linking.patch
@@ -1,7 +1,7 @@
 From c6b2dec1bb09ef0d7fac89a6a2f74d85fa9b36bc Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 23 Jan 2024 16:54:51 +0000
-Subject: [PATCH 15/15] v3.5.0: fix linking
+Subject: [PATCH 15/17] v3.5.0: fix linking
 
 ---
  contrib/brl/bpro/core/brip_pro/CMakeLists.txt | 2 +-
@@ -21,5 +21,5 @@ index cfa7d46af8..b8d557cdb9 100644
  if( BUILD_TESTING )
    add_subdirectory(tests)
 -- 
-2.43.0
+2.46.1
 
diff --git a/0016-v3.5.0-fix-linking.patch b/0016-v3.5.0-fix-linking.patch
new file mode 100644
index 0000000..647f368
--- /dev/null
+++ b/0016-v3.5.0-fix-linking.patch
@@ -0,0 +1,26 @@
+From 87e0e8fa35cfb7c5e4048827771f18cf83d5f6e1 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 1 Oct 2024 16:00:35 +0100
+Subject: [PATCH 16/17] v3.5.0: fix linking
+
+---
+ contrib/brl/bpro/core/vil_pro/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bpro/core/vil_pro/CMakeLists.txt b/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+index 5298c63727..ba36c765bb 100644
+--- a/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
++++ b/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+@@ -17,7 +17,8 @@ aux_source_directory(processes vil_pro_sources)
+ 
+ vxl_add_library(LIBRARY_NAME vil_pro LIBRARY_SOURCES ${vil_pro_sources})
+ 
+-target_link_libraries(vil_pro bbas_pro bprb bil bil_algo brip sdet ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl bsta_vis)
++target_link_libraries(vil_pro bbas_pro bprb bil bil_algo brip sdet ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl bsta_vis vpgl_pro)
++# Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+-- 
+2.46.1
+
diff --git a/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch b/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
new file mode 100644
index 0000000..dad0d61
--- /dev/null
+++ b/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
@@ -0,0 +1,894 @@
+From b06c0578f573eae423663151cd9dee7f8316169f Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 1 Oct 2024 16:26:23 +0100
+Subject: [PATCH 17/17] v3.5.0: remove boxm2 processes that use sdnet that
+ require triangle
+
+---
+ contrib/brl/bseg/boxm2/pro/boxm2_processes.h  |   3 -
+ contrib/brl/bseg/boxm2/pro/boxm2_register.cxx |   3 -
+ .../processes/boxm2_export_mesh_process.cxx   | 213 -------
+ .../boxm2_export_textured_mesh_process.cxx    | 523 ------------------
+ .../pro/processes/boxm2_load_mesh_process.cxx |  78 ---
+ 5 files changed, 820 deletions(-)
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
+
+diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
+index 4d68be95b0..7094c03fb5 100644
+--- a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
++++ b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
+@@ -13,8 +13,6 @@ DECLARE_FUNC_CONS(boxm2_create_cache_process);
+ DECLARE_FUNC_CONS(boxm2_create_scene_process);
+ DECLARE_FUNC_CONS(boxm2_write_scene_xml_process);
+ DECLARE_FUNC_CONS(boxm2_add_block_process);
+-DECLARE_FUNC_CONS(boxm2_export_textured_mesh_process);
+-DECLARE_FUNC_CONS(boxm2_export_mesh_process);
+ DECLARE_FUNC_CONS(boxm2_describe_scene_process);
+ DECLARE_FUNC_CONS(boxm2_create_stream_cache_process);
+ DECLARE_FUNC_CONS(boxm2_roi_init_process);
+@@ -57,7 +55,6 @@ DECLARE_FUNC_CONS(boxm2_label_to_xyz_process);
+ DECLARE_FUNC_CONS(boxm2_label_to_xyz_process2);
+ DECLARE_FUNC_CONS(boxm2_prune_scene_blocks_process);
+ DECLARE_FUNC_CONS(boxm2_prune_scene_blocks_by_dem_process);
+-DECLARE_FUNC_CONS(boxm2_load_mesh_process);
+ DECLARE_FUNC_CONS(boxm2_create_camera_from_kml_path_process);  // August 23, 2013 Yi Dong
+ 
+ DECLARE_FUNC_CONS(boxm2_ortho_geo_cam_from_scene_process);
+diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
+index a05b9e5c58..e1cefa5765 100644
+--- a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
++++ b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
+@@ -33,8 +33,6 @@ void boxm2_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_scene_process,    "boxm2CreateSceneProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_write_scene_xml_process, "boxm2WriteSceneXMLProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_add_block_process,       "boxm2AddBlockProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_textured_mesh_process,"boxm2ExportTexturedMeshProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_mesh_process,"boxm2ExportMeshProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_describe_scene_process,"boxm2DescribeSceneProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_stream_cache_process, "boxm2CreateStreamCacheProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_roi_init_process, "boxm2RoiInitProcess");
+@@ -58,7 +56,6 @@ void boxm2_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_from_box_cams_process, "boxm2SceneFromBoxCamsProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_from_nvm_txt_process, "boxm2SceneFromNVMtxtProcess");
+ 
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_load_mesh_process, "boxm2LoadMeshProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_compactify_mog6_view_process, "boxm2CompactifyMog6ViewProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_statistics_process, "boxm2SceneStatisticsProcess");
+ 
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
+deleted file mode 100644
+index bdc59a32e7..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
++++ /dev/null
+@@ -1,213 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for exporting a texture mapped mesh of a scene
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2011
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_new.h"
+-#include "vil/vil_math.h"
+-
+-//vgl
+-#include "vgl/vgl_point_3d.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/imesh_operations.h>
+-
+-namespace boxm2_export_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm2_export_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "vil_image_view_base_sptr";  //depth image
+-  input_types_[i++] = "vil_image_view_base_sptr";  //x image
+-  input_types_[i++] = "vil_image_view_base_sptr";  //y image
+-  input_types_[i++] = "vcl_string";                //output dir of saved mesh
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "imesh_mesh_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_export_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned argIdx = 0;
+-  vil_image_view_base_sptr img = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  vil_image_view_base_sptr ximg = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  vil_image_view_base_sptr yimg = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  std::string out_dir = pro.get_input<std::string>(argIdx++);
+-
+-  //create the mesh directory
+-  if (out_dir != "") {
+-    if (!vul_file::make_directory_path(out_dir.c_str())) {
+-      std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
+-      return false;
+-    }
+-  }
+-
+-  //cast camera and image so they are useful
+-  auto* z_img = (vil_image_view<float>*) img.ptr();
+-  auto* x_img = (vil_image_view<float>*) ximg.ptr();
+-  auto* y_img = (vil_image_view<float>*) yimg.ptr();
+-
+-  //determine size of depth image
+-  unsigned ni = z_img->ni();
+-  unsigned nj = z_img->nj();
+-
+-  //create new resource sptr
+-  vil_image_resource_sptr z_img_res = vil_new_image_resource_of_view(*z_img);
+-
+-  //initialize some sdet_image_mesh parameters
+-  sdet_image_mesh_params imp;
+-  // sigma of the Gaussian for smoothing the image prior to edge detection
+-  imp.smooth_ = 1.0f;
+-  // the edge detection threshold
+-  imp.thresh_ = 1.68f;
+-  // the shortest edgel chain that is considered for line fitting
+-  imp.min_fit_length_ = 5;
+-
+-  // the threshold on rms pixel distance of edgels to the line
+-  imp.rms_distance_ = 0.11;
+-  // the width in pixels of the transition of a step edge
+-  imp.step_half_width_ = 0.0;
+-
+-  // the mesh processor
+-  sdet_image_mesh im(imp);
+-  im.set_image(z_img_res);
+-  if (!im.compute_mesh()) {
+-    std::cout<<"mesh could not be computed"<<std::endl;
+-    return false;
+-  }
+-  imesh_mesh& mesh = im.get_mesh();
+-  std::cout << "Number of vertices " << mesh.num_verts()
+-           << "  number of faces "<< mesh.num_faces()<< '\n';
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Take mesh and add points to triangles of high depth variance
+-  // I.E. if a triangle in mesh has corners both very close and very far from top
+-  // camera, take it's centroid point and add x,y,z point, creating 3 new faces
+-  ////////////////////////////////////////////////////////////////////////////////
+-  mesh.compute_vertex_normals_from_faces();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// normalize mesh world points to fit in the image_bb from above
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // get min and max z values
+-  float minz=0, maxz=0;
+-  vil_math_value_range(*z_img, minz, maxz);
+-  std::cout<<"Min z: "<<minz<<" Max z: "<<maxz<<std::endl;
+-
+-  //grab vertices in the mesh - convert them to scene coordinates (not image)
+-  imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-  unsigned nverts = mesh.num_verts();
+-  for (unsigned iv = 0; iv<nverts; ++iv)
+-  {
+-    //get coordinates so you can index into the height map
+-    auto i = static_cast<unsigned>(verts[iv][0]);
+-    auto j = static_cast<unsigned>(verts[iv][1]);
+-    if (i<ni && j<nj)
+-    {
+-      verts[iv][0] = (*x_img)(i,j);
+-      verts[iv][1] = (*y_img)(i,j);
+-      verts[iv][2] = (*z_img)(i,j);
+-    }
+-  }
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// cut tall triangles into quarters (find midpoints of each
+-  ////////////////////////////////////////////////////////////////////////////////
+-//bool did_divide = true;
+-  //while (did_divide)
+-  {
+-    std::set<unsigned int> sel_faces;
+-    double maxLen = (maxz-minz) / 3.0;
+-    auto& faces = (imesh_regular_face_array<3>&) mesh.faces();
+-    imesh_vertex_array<3>&       verts = mesh.vertices<3>();
+-
+-    unsigned nfaces = mesh.num_faces();
+-    for (unsigned iface = 0; iface<nfaces; ++iface)
+-    {
+-      //store three 3d points
+-      std::vector<vgl_point_3d<double> > points;
+-      for (int i=0; i<3; ++i) {
+-        unsigned vertexId = faces[iface][i];
+-        double x = verts[vertexId][0];
+-        double y = verts[vertexId][1];
+-        double z = verts[vertexId][2];
+-        points.emplace_back(x,y,z );
+-      }
+-
+-      // if any one side of the triangle is too long, cut it
+-      double lenA = (points[0]-points[1]).sqr_length(); // vgl_vector length == distance
+-      double lenB = (points[1]-points[2]).sqr_length();
+-      double lenC = (points[0]-points[2]).sqr_length();
+-      maxLen *= maxLen; // sqr
+-      if (lenA > maxLen || lenB > maxLen || lenC > maxLen) {
+-        sel_faces.insert(iface);
+-      }
+-    }
+-
+-    //if the divide face set is not empty, divide the faces
+-    if ( !sel_faces.empty() ) {
+-//    did_divide = true;
+-
+-      std::cout<<"Subdividing mesh"<<std::endl;
+-      imesh_quad_subdivide(mesh, sel_faces);
+-
+-      std::cout<<"Re triangulating mesh"<<std::endl;
+-      imesh_triangulate(mesh);
+-    }
+-//  else {
+-//    did_divide = false;
+-//  }
+-  }
+-
+-  imesh_mesh_sptr mesh_sptr = new imesh_mesh(mesh);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// Write out in VRML format
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::string vrfile = out_dir + "/untextured.wrl";
+-  std::ofstream os(vrfile.c_str());
+-  imesh_write_vrml(os, mesh);
+-  os.close();
+-
+-  // store scene smart pointer
+-  argIdx = 0;
+-  pro.set_output_val<imesh_mesh_sptr>(argIdx++, mesh_sptr);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
+deleted file mode 100644
+index 73e67b8bb6..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
++++ /dev/null
+@@ -1,523 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
+-#include <bprb/bprb_func_process.h>
+-#include <fstream>
+-#include <iostream>
+-#include <utility>
+-//:
+-// \file
+-// \brief  A process for exporting a texture mapped mesh of a scene
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2011
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include "vul/vul_timer.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_save.h"
+-#include "vil/vil_new.h"
+-
+-//vgl
+-#include "vgl/vgl_distance.h"
+-#include "vgl/vgl_ray_3d.h"
+-#include "vgl/vgl_point_3d.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//vpgl camera stuff
+-#include "vpgl/vpgl_perspective_camera.h"
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/algo/imesh_render.h>
+-
+-namespace boxm2_export_textured_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-
+-  //helper texture map methods
+-  void boxm2_texture_mesh_from_imgs(std::string im_dir,
+-                                    std::string cam_dir,
+-                                    imesh_mesh& in_mesh,
+-                                    std::map<std::string, imesh_mesh>& meshes);
+-
+-  //populates a vector of visibility images (by face id int)
+-  void boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                            std::vector<vil_image_view<int>* >& vis_images,
+-                            imesh_mesh& in_mesh);
+-
+-
+-  //checks if a triangle in UV space is visible.  us and vs are double buffers of length 3
+-  bool face_is_visible( vpgl_perspective_camera<double>* cam,
+-                        vil_image_view<int>* vis_img,
+-                        const double* us,
+-                        const double* vs,
+-                        int face_id);
+-}
+-
+-bool boxm2_export_textured_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_textured_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "vil_image_view_base_sptr";  //depth image
+-  input_types_[i++] = "vpgl_camera_double_sptr";   //depth image cam
+-  input_types_[i++] = "boxm2_scene_sptr";          //scene object
+-  input_types_[i++] = "vcl_string";                //directory of scene images
+-  input_types_[i++] = "vcl_string";                //directory of corresponding cams
+-  input_types_[i++] = "vcl_string";                //output dir of saved mesh
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  //output_types_[0] = "boxm2_scene_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_export_textured_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_textured_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned argIdx = 0;
+-  vil_image_view_base_sptr img = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  vpgl_camera_double_sptr  cam = pro.get_input<vpgl_camera_double_sptr>(argIdx++);
+-  boxm2_scene_sptr       scene = pro.get_input<boxm2_scene_sptr>(argIdx++);
+-  std::string img_dir = pro.get_input<std::string>(argIdx++);
+-  std::string cam_dir = pro.get_input<std::string>(argIdx++);
+-  std::string out_dir = pro.get_input<std::string>(argIdx++);
+-
+-  if (img->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
+-  {
+-    auto* inim = (vil_image_view<vxl_byte>*) img.ptr();
+-    auto* fimg = new vil_image_view<float>(img->ni(), img->nj());
+-    for (unsigned int i=0; i<img->ni(); ++i)
+-      for (unsigned int j=0; j<img->nj(); ++j)
+-        (*fimg)(i,j) = (float) (*inim)(i,j) / 255.0f;
+-    img = vil_image_view_base_sptr(fimg);
+-  }
+-
+-  //create the mesh directory
+-  if (!vul_file::make_directory_path(out_dir.c_str())) {
+-    std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
+-    return false;
+-  }
+-
+-  //cast camera and image so they are useful
+-  auto* pcam = (vpgl_perspective_camera<double>*) cam.ptr();
+-  auto* depth = (vil_image_view<float>*) img.ptr();
+-
+-  //determine size of depth image
+-  unsigned ni = img->ni();
+-  unsigned nj = img->nj();
+-
+-  //calculate XYZ image image that corresponds to depth image
+-  auto* xyz_img = new vil_image_view<vil_rgba<float> >(ni, nj);
+-  auto* z_img = new vil_image_view<float>(ni,nj);
+-  for (unsigned int i=0; i<ni; ++i) {
+-    for (unsigned int j=0; j<nj; ++j) {
+-      //grab the ray from the camera
+-      vgl_ray_3d<double> ray = pcam->backproject_ray( (double) i+.5, (double) j+.5);
+-
+-      //ray o
+-      float ray_ox = float(ray.origin().x()),
+-            ray_oy = float(ray.origin().y()),
+-            ray_oz = float(ray.origin().z());
+-
+-      //ray dir
+-      float dray_x = float(ray.direction().x()),
+-            dray_y = float(ray.direction().y()),
+-            dray_z = float(ray.direction().z());
+-
+-      //expected ray depth
+-      float ray_t = (*depth)(i,j);
+-
+-      //calculate x,y,z position at expected depth
+-      (*xyz_img)(i,j) = vil_rgba<float>(ray_ox - ray_t*dray_x,
+-                                        ray_oy - ray_t*dray_y,
+-                                        ray_oz - ray_t*dray_z,
+-                                        0.0f);
+-      (*z_img)(i,j) = ray_oz - ray_t*dray_z;
+-    }
+-  }
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  // Generate 3d mesh from depth image
+-  //////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"Generating image mesh"<<std::endl;
+-
+-  //create new resource sptr
+-  vil_image_resource_sptr z_img_res = vil_new_image_resource_of_view(*z_img);
+-
+-  //initialize some sdet_image_mesh parameters
+-  sdet_image_mesh_params imp;
+-  // sigma of the Gaussian for smoothing the image prior to edge detection
+-  imp.smooth_ = 2.0f;
+-  // the edge detection threshold
+-  imp.thresh_ = 2.0f;
+-  // the shortest edgel chain that is considered for line fitting
+-  imp.min_fit_length_ = 7;
+-  // the threshold on rms pixel distance of edgels to the line
+-  imp.rms_distance_ = 0.1;
+-  // the width in pixels of the transition of a step edge
+-  imp.step_half_width_ = 5.0;
+-
+-  // the mesh processor
+-  sdet_image_mesh im(imp);
+-  im.set_image(z_img_res);
+-  if (!im.compute_mesh()) {
+-    std::cout<<"mesh could not be computed"<<std::endl;
+-    return false;
+-  }
+-  imesh_mesh& mesh = im.get_mesh();
+-  std::cout << "Number of vertices " << mesh.num_verts()
+-           << "  number of faces "<< mesh.num_faces()<< '\n';
+-
+-  std::string meshFile = out_dir + "/wire.wrl";
+-  std::ofstream wos(meshFile.c_str());
+-  imesh_write_vrml(wos, mesh);
+-  wos.close();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// normalize mesh world points to fit in the image_bb from above
+-  ////////////////////////////////////////////////////////////////////////////////
+-  vul_timer t;
+-  //grab vertices in the mesh - convert them to scene coordinates (not image)
+-  imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-  unsigned nverts = mesh.num_verts();
+-  for (unsigned iv = 0; iv<nverts; ++iv)
+-  {
+-    //get coordinates so you can index into the height map
+-    auto i = static_cast<unsigned>(verts[iv][0]);
+-    auto j = static_cast<unsigned>(verts[iv][1]);
+-    double scene_x=0, scene_y=0,scene_z = 0.0;
+-    if (i<ni && j<nj) {
+-      scene_x = (*xyz_img)(i,j).R();
+-      scene_y = (*xyz_img)(i,j).G();
+-      scene_z = (*xyz_img)(i,j).B();
+-    }
+-    verts[iv][0] = scene_x;
+-    verts[iv][1] = scene_y;
+-    verts[iv][2] = scene_z;
+-  }
+-  std::cout<<mesh.has_tex_coords()<<std::endl;
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  //Texture map the mesh
+-  //////////////////////////////////////////////////////////////////////////////
+-  //boxm2_texture_mesh_topdown(img_dir, cam_dir, mesh);
+-  std::map<std::string, imesh_mesh> meshes;
+-  boxm2_texture_mesh_from_imgs(img_dir, cam_dir, mesh, meshes);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// Write out in VRML format
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //output file and stream
+-  std::string vrfile = out_dir + "/vrmesh.wrl";
+-  std::ofstream os(vrfile.c_str());
+-
+-  //write each submesh into one file
+-  std::map<std::string, imesh_mesh>::iterator subMesh;
+-  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh)
+-  {
+-    imesh_mesh& sMesh = subMesh->second;
+-    std::cout<<"Writing sub mesh: "<<sMesh.tex_source()<<" has "<<sMesh.num_faces()<<" faces"<<std::endl;
+-    imesh_write_vrml(os, sMesh);
+-  }
+-  os.close();
+-  std::cout<<"Texture Mapping Mesh Time: "<<t.all()<<"ms"<<std::endl;
+-
+-  return true;
+-}
+-
+-
+-//Given a directory of images, dir cams, an input mesh, this function creates
+-//map of textured meshes (imesh doesn't ostensibly handle meshes from multiple textures)
+-void boxm2_export_textured_mesh_process_globals::boxm2_texture_mesh_from_imgs(std::string im_dir,
+-                                                                              std::string cam_dir,
+-                                                                              imesh_mesh& in_mesh,
+-                                                                              std::map<std::string, imesh_mesh>& meshes)
+-{
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // BEGIN TEXTURE MAPPING
+-  // Gather cameras and iamges that will contribute to the texture
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::vector<std::string> camfiles = boxm2_util::camfiles_from_directory(std::move(cam_dir));
+-  std::vector<std::string> imfiles = boxm2_util::images_from_directory(std::move(im_dir));
+-
+-  std::vector<vpgl_perspective_camera<double>* > cameras;
+-  for (auto & camfile : camfiles) {
+-    //build the camera from file
+-    std::ifstream ifs(camfile.c_str());
+-    auto* icam = new vpgl_perspective_camera<double>;
+-    if (!ifs.is_open()) {
+-      std::cerr << "Failed to open file " << camfile << '\n';
+-      return;
+-    }
+-    ifs >> *icam;
+-    cameras.push_back(icam);
+-    std::cout<<icam->principal_axis()<<std::endl;
+-  }
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Grab input mesh vertices and input mesh faces
+-  ////////////////////////////////////////////////////////////////////////////////
+-  in_mesh.compute_vertex_normals_from_faces();
+-  auto& in_faces = (imesh_regular_face_array<3>&) in_mesh.faces();
+-  unsigned nfaces = in_mesh.num_faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Render Visibility Images
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::vector<vil_image_view<int>* > vis_images;
+-  boxm2_visible_faces(cameras, vis_images, in_mesh);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // For each Face:
+-  //   determine which image is closest in normal and visible, store face index in a map[image_str, vector<int>face]
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //texture index
+-  std::cout<<"Populating faces for each texture"<<std::endl;
+-  std::map<std::string, std::vector<unsigned> > app_faces; //image_name to face_list
+-  std::map<std::string, vpgl_perspective_camera<double>* > texture_cams;
+-  for (unsigned iface = 0; iface<nfaces; ++iface)
+-  {
+-    //create list of cameras from which you can see this face
+-    std::vector<vpgl_perspective_camera<double>* > visible_views;
+-    for (unsigned int i=0; i<vis_images.size(); ++i) {
+-      //project triangle
+-      double us[3], vs[3];
+-      for (int vIdx=0; vIdx<3; ++vIdx) {
+-        unsigned vertIdx = in_faces[iface][vIdx];
+-
+-        //project these verts into UV
+-        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
+-        double u,v;
+-        cameras[i]->project(x, y, z, u, v);
+-        us[vIdx] = u;
+-        vs[vIdx] = v;
+-      }
+-      if ( face_is_visible( cameras[i], vis_images[i], us, vs, iface) )
+-        visible_views.push_back(cameras[i]);
+-    }
+-
+-    //now compare the normal to each of the visible view cameras
+-    vgl_vector_3d<double>& normal = in_faces.normal(iface);
+-
+-    //find camera with the closest look vector to this normal
+-    int closeIdx = boxm2_util::find_nearest_cam(normal, visible_views);
+-    vpgl_perspective_camera<double>* closest = nullptr;
+-    std::string im_name = "empty";
+-    if (closeIdx >= 0) {
+-      closest = cameras[closeIdx];
+-      im_name = imfiles[closeIdx];
+-    }
+-
+-    //grab appropriate face list (create it if it's not there)
+-    auto iter = app_faces.find(im_name);
+-    if ( iter == app_faces.end() ) {
+-      std::cout<<"Adding image: "<<im_name<<" to texture list"<<std::endl;
+-      std::vector<unsigned> faceList;
+-      faceList.push_back(iface);
+-      app_faces[im_name] = faceList;
+-
+-      //keep track of the camera
+-      texture_cams[im_name] = closest;
+-    }
+-    else {
+-      app_faces[im_name].push_back(iface);
+-    }
+-  }
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // For each image/appearance:
+-  //   - create a vert list
+-  //   - create a face list
+-  //   - create a sub mesh that is textured
+-  ////////////////////////////////////////////////////////////////////////////////
+-
+-  //for each appearance (texture image), create an imesh_mesh (subMesh);
+-  std::cout<<"Creating Sub Meshes for each texture"<<std::endl;
+-  std::map<std::string, std::vector<unsigned> >::iterator apps;
+-  for (apps = app_faces.begin(); apps != app_faces.end(); ++apps)
+-  {
+-    //for each appearance, we're creating a whole new mesh
+-    // first create the face list
+-    auto* flist = new imesh_regular_face_array<3>();
+-
+-    //now create the vertex list
+-    auto* verts3 = new imesh_vertex_array<3>();
+-
+-    //get faces list corresponding to this texture
+-    std::vector<unsigned>& face_list = apps->second;
+-    for (unsigned int i=0; i<face_list.size(); ++i) {
+-      //get old face
+-      unsigned old_fIdx = face_list[i];
+-
+-      //old face vertices
+-      unsigned v1 = in_faces[old_fIdx][0];
+-      unsigned v2 = in_faces[old_fIdx][1];
+-      unsigned v3 = in_faces[old_fIdx][2];
+-
+-      //push these vertices onto the new vert list
+-      verts3->push_back( imesh_vertex<3>(in_verts[v1][0], in_verts[v1][1], in_verts[v1][2]) );
+-      verts3->push_back( imesh_vertex<3>(in_verts[v2][0], in_verts[v2][1], in_verts[v2][2]) );
+-      verts3->push_back( imesh_vertex<3>(in_verts[v3][0], in_verts[v3][1], in_verts[v3][2]) );
+-
+-      imesh_tri tri(3*i, 3*i+1, 3*i+2);
+-      flist->push_back(tri);
+-    }
+-
+-    //create the submesh using the auto ptrs
+-    std::unique_ptr<imesh_vertex_array_base> v3(verts3);
+-    std::unique_ptr<imesh_face_array_base> f3(flist);
+-    imesh_mesh subMesh(std::move(v3), std::move(f3));
+-
+-    std::cout<<"Setting tex source: "<<apps->first<<std::endl;
+-    meshes[apps->first] = subMesh;
+-    meshes[apps->first].set_tex_source(apps->first);
+-  }
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  //For each mesh, map each vertex
+-  //////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"Mapping sub meshes for each texture"<<std::endl;
+-  std::map<std::string, imesh_mesh>::iterator subMesh;
+-  auto txCam = texture_cams.begin();
+-  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh, ++txCam)
+-  {
+-    imesh_mesh& mesh = subMesh->second;
+-    imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-    unsigned nverts = mesh.num_verts();
+-
+-    //texture map the non empty appearances
+-    if (txCam->first != "empty")
+-    {
+-      std::vector<vgl_point_2d<double> > tex_coords(nverts, vgl_point_2d<double>(0.0,0.0));
+-      for (unsigned iv = 0; iv<nverts; ++iv)
+-      {
+-        //find camera corresponding to this texture
+-        vpgl_perspective_camera<double>* closest = txCam->second;
+-        vgl_point_2d<double> principal_point = closest->get_calibration().principal_point();
+-        double ni = principal_point.x()*2.0;
+-        double nj = principal_point.y()*2.0;
+-
+-        //project the vertex onto the camera, store the texture coordinate
+-        double x = verts[iv][0];
+-        double y = verts[iv][1];
+-        double z = verts[iv][2];
+-        double u,v;
+-        closest->project(x, y, z, u, v);
+-
+-        //flip v about the y axis
+-        v=nj-v;
+-
+-        //store the tex_coordinate
+-        vgl_point_2d<double> uv(u/ni,v/nj);
+-        tex_coords[iv] = uv;
+-      }
+-      mesh.set_tex_coords(tex_coords);
+-    }
+-  }
+-}
+-
+-bool boxm2_export_textured_mesh_process_globals::face_is_visible( vpgl_perspective_camera<double>*  /*cam*/,
+-                                                                  vil_image_view<int>* vis_img,
+-                                                                  const double* us,
+-                                                                  const double* vs,
+-                                                                  int face_id)
+-{
+-  //now create a polygon, and find the integer image coordinates (U,V) that this polygon covers
+-  int ni = vis_img->ni();
+-  int nj = vis_img->nj();
+-
+-  vgl_triangle_scan_iterator<double> tsi;
+-  tsi.a.x = us[0];  tsi.a.y = vs[0];
+-  tsi.b.x = us[1];  tsi.b.y = vs[1];
+-  tsi.c.x = us[2];  tsi.c.y = vs[2];
+-  for (tsi.reset(); tsi.next(); ) {
+-    int y = tsi.scany();
+-    if (y<0 || y>=nj) continue;
+-    int min_x = tsi.startx();
+-    int max_x = tsi.endx();
+-    if (min_x >= ni || max_x < 0)
+-      continue;
+-    if (min_x < 0) min_x = 0;
+-    if (max_x >= ni) max_x = ni-1;
+-    for (int x = min_x; x <= max_x; ++x) {
+-      if ( (*vis_img)(x,y) != face_id )
+-        return false;
+-    }
+-  }
+-
+-  //if it made it this far, it's completely visible
+-  return true;
+-}
+-
+-
+-void boxm2_export_textured_mesh_process_globals::boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                                                                      std::vector<vil_image_view<int >* >& vis_images,
+-                                                                      imesh_mesh& in_mesh)
+-{
+-  auto& in_faces = (imesh_regular_face_array<3>&) in_mesh.faces();
+-  unsigned nfaces = in_mesh.num_faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-
+-  //iterate over each camera, creating a visibility image for each
+-  for (auto pcam : cameras)
+-  {
+-    //get the principal point of the cam for image size
+-    vgl_point_2d<double> principal_point = pcam->get_calibration().principal_point();
+-    auto ni = (unsigned) (principal_point.x()*2.0);
+-    auto nj = (unsigned) (principal_point.y()*2.0);
+-
+-    // render the face_id/distance image
+-    vil_image_view<double> depth_im(ni, nj);
+-    auto*   face_im = new vil_image_view<int>(ni, nj);
+-    depth_im.fill(10e100);  //Initial depth is huge,
+-    face_im->fill(-1); //initial face id is -1
+-    for (unsigned iface = 0; iface<nfaces; ++iface)
+-    {
+-      //get the vertices from the face, project into UVs
+-      double us[3], vs[3], dists[3];
+-      for (int vIdx=0; vIdx<3; ++vIdx) {
+-        unsigned vertIdx = in_faces[iface][vIdx];
+-
+-        //project these verts into UV
+-        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
+-        double u,v;
+-        pcam->project(x, y, z, u, v);
+-        us[vIdx] = u;
+-        vs[vIdx] = v;
+-
+-        //keep track of distance to each vertex
+-        dists[vIdx] = vgl_distance(vgl_point_3d<double>(x,y,z), pcam->get_camera_center());
+-      }
+-
+-      //render the triangle label onto the label image, using the depth image
+-      vgl_point_3d<double> v1(us[0], vs[0], dists[0]);
+-      vgl_point_3d<double> v2(us[1], vs[1], dists[1]);
+-      vgl_point_3d<double> v3(us[2], vs[2], dists[2]);
+-      imesh_render_triangle_label<int>(v1, v2, v3, (int) iface, (*face_im), depth_im);
+-    } //end for iface
+-
+-    //keep the vis_image just calculated
+-    vis_images.push_back(face_im);
+-    vil_save(depth_im, "/media/VXL/mesh/downtown/dist_im.tif");
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
+deleted file mode 100644
+index 78c545a3fd..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
++++ /dev/null
+@@ -1,78 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for loading a  mesh
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2013
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include "vul/vul_timer.h"
+-#include "vnl/vnl_random.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_save.h"
+-#include <vil/algo/vil_gauss_filter.h>
+-
+-//vgl
+-#include "vgl/vgl_distance.h"
+-#include "vgl/vgl_triangle_scan_iterator.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//vpgl camera stuff
+-#include "vpgl/vpgl_perspective_camera.h"
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/algo/imesh_render.h>
+-
+-namespace boxm2_load_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm2_load_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_load_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "vcl_string";       //mesh filename
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "imesh_mesh_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_load_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_load_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-  unsigned argIdx = 0;
+-  std::string mesh_filename = pro.get_input<std::string>(argIdx++);
+-  imesh_mesh_sptr mesh = new imesh_mesh();
+-  imesh_read(mesh_filename, *(mesh.ptr()));
+-  std::cout<<"# of faces "<<mesh->num_faces()<<std::endl;
+-  pro.set_output_val<imesh_mesh_sptr>(0,mesh);
+-
+-
+-  return true;
+-}
+-- 
+2.46.1
+
diff --git a/vxl.spec b/vxl.spec
index f73e15d..3b89c8b 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,5 +1,10 @@
 %undefine __cmake_in_source_build
 
+# shared objects version: API
+%global major 3
+%global minor 5
+%global patch 0
+
 Name:       vxl
 Version:    3.5.0
 Release:    %autorelease
@@ -41,6 +46,8 @@ Patch:     0012-v3.5.0-link-against-acal.patch
 Patch:     0013-meh.patch
 Patch:     0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
 Patch:     0015-v3.5.0-fix-linking.patch
+Patch:     0016-v3.5.0-fix-linking.patch
+Patch:     0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -152,6 +159,7 @@ sed -i '/add_subdirectory(minizip)/ d' contrib/brl/b3p/CMakeLists.txt
 
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
+    -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{_datadir}/%{name} \
     -DBUILD_SHARED_LIBS:BOOL=TRUE \
     -DVXL_USE_GEOTIFF:BOOL=TRUE \
     -DVXL_FORCE_B3P_EXPAT:BOOL=FALSE \
@@ -229,571 +237,549 @@ ctest %{_vpath_builddir} || exit 0
 %files
 %doc core/vxl_copyright.h
 %{_bindir}/octree
-%{_libdir}/libclipper.so.3.5
-%{_libdir}/libtestlib.so.3.5
-%{_libdir}/libvcl.so.3.5
-%{_libdir}/libvgl.so.3.5
-%{_libdir}/libvidl.so.3.5
-%{_libdir}/libvil_io.so.3.5
-%{_libdir}/libvnl.so.3.5
-%{_libdir}/libvpgl_file_formats.so.3.5
-%{_libdir}/libvpl.so.3.5
-%{_libdir}/libclipper.so.3.5.0
-%{_libdir}/libtestlib.so.3.5.0
-%{_libdir}/libvcl.so.3.5.0
-%{_libdir}/libvgl.so.3.5.0
-%{_libdir}/libvidl.so.3.5.0
-%{_libdir}/libvil_io.so.3.5.0
-%{_libdir}/libvnl.so.3.5.0
-%{_libdir}/libvpgl_file_formats.so.3.5.0
-%{_libdir}/libvpl.so.3.5.0
-%{_libdir}/libnetlib.so.3.5
-%{_libdir}/libv3p_netlib.so.3.5
-%{_libdir}/libvcsl.so.3.5
-%{_libdir}/libvgl_xio.so.3.5
-%{_libdir}/libvil.so.3.5
-%{_libdir}/libvnl_xio.so.3.5
-%{_libdir}/libvpgl_io.so.3.5
-%{_libdir}/libvsl.so.3.5
-%{_libdir}/libnetlib.so.3.5.0
-%{_libdir}/libv3p_netlib.so.3.5.0
-%{_libdir}/libvcsl.so.3.5.0
-%{_libdir}/libvgl_xio.so.3.5.0
-%{_libdir}/libvil.so.3.5.0
-%{_libdir}/libvnl_xio.so.3.5.0
-%{_libdir}/libvpgl_io.so.3.5.0
-%{_libdir}/libvsl.so.3.5.0
-%{_libdir}/libvbl_io.so.3.5
-%{_libdir}/libvgl_algo.so.3.5
-%{_libdir}/libvil1.so.3.5
-%{_libdir}/libvnl_algo.so.3.5
-%{_libdir}/libvpdl.so.3.5
-%{_libdir}/libvpgl.so.3.5
-%{_libdir}/libvul_io.so.3.5
-%{_libdir}/libvbl_io.so.3.5.0
-%{_libdir}/libvgl_algo.so.3.5.0
-%{_libdir}/libvil1.so.3.5.0
-%{_libdir}/libvnl_algo.so.3.5.0
-%{_libdir}/libvpdl.so.3.5.0
-%{_libdir}/libvpgl.so.3.5.0
-%{_libdir}/libvul_io.so.3.5.0
-%{_libdir}/libvbl.so.3.5
-%{_libdir}/libvgl_io.so.3.5
-%{_libdir}/libvil_algo.so.3.5
-%{_libdir}/libvnl_io.so.3.5
-%{_libdir}/libvpgl_algo.so.3.5
-%{_libdir}/libvpgl_xio.so.3.5
-%{_libdir}/libvul.so.3.5
-%{_libdir}/libvbl.so.3.5.0
-%{_libdir}/libvgl_io.so.3.5.0
-%{_libdir}/libvil_algo.so.3.5.0
-%{_libdir}/libvnl_io.so.3.5.0
-%{_libdir}/libvpgl_algo.so.3.5.0
-%{_libdir}/libvpgl_xio.so.3.5.0
-%{_libdir}/libvul.so.3.5.0
-%{_libdir}/libbaio.so.3.5
-%{_libdir}/libbaio.so.3.5.0
-%{_libdir}/libbaml.so.3.5
-%{_libdir}/libbaml.so.3.5.0
-%{_libdir}/libbapl.so.3.5
-%{_libdir}/libbapl.so.3.5.0
-%{_libdir}/libbapl_io.so.3.5
-%{_libdir}/libbapl_io.so.3.5.0
-%{_libdir}/libbapl_pro.so.3.5
-%{_libdir}/libbapl_pro.so.3.5.0
-%{_libdir}/libbbas_pro.so.3.5
-%{_libdir}/libbbas_pro.so.3.5.0
-%{_libdir}/libbbgm.so.3.5
-%{_libdir}/libbbgm.so.3.5.0
-%{_libdir}/libbbgm_pro.so.3.5
-%{_libdir}/libbbgm_pro.so.3.5.0
-%{_libdir}/libbcvr.so.3.5
-%{_libdir}/libbcvr.so.3.5.0
-%{_libdir}/libbdgl.so.3.5
-%{_libdir}/libbdgl.so.3.5.0
-%{_libdir}/libbdpg.so.3.5
-%{_libdir}/libbdpg.so.3.5.0
-%{_libdir}/libbetr.so.3.5
-%{_libdir}/libbetr.so.3.5.0
-%{_libdir}/libbetr_pro.so.3.5
-%{_libdir}/libbetr_pro.so.3.5.0
-%{_libdir}/libbgrl.so.3.5
-%{_libdir}/libbgrl.so.3.5.0
-%{_libdir}/libbgrl2.so.3.5
-%{_libdir}/libbgrl2.so.3.5.0
-%{_libdir}/libbgrl2_algo.so.3.5
-%{_libdir}/libbgrl2_algo.so.3.5.0
-%{_libdir}/libbil.so.3.5
-%{_libdir}/libbil.so.3.5.0
-%{_libdir}/libbil_algo.so.3.5
-%{_libdir}/libbil_algo.so.3.5.0
-%{_libdir}/libbjson.so.3.5
-%{_libdir}/libbjson.so.3.5.0
-%{_libdir}/libbkml.so.3.5
-%{_libdir}/libbkml.so.3.5.0
-%{_libdir}/libbmdl.so.3.5
-%{_libdir}/libbmdl.so.3.5.0
-%{_libdir}/libbmdl_pro.so.3.5
-%{_libdir}/libbmdl_pro.so.3.5.0
-%{_libdir}/libbmsh3d.so.3.5
-%{_libdir}/libbmsh3d.so.3.5.0
-%{_libdir}/libbmsh3d_algo.so.3.5
-%{_libdir}/libbmsh3d_algo.so.3.5.0
-%{_libdir}/libbmsh3d_pro.so.3.5
-%{_libdir}/libbmsh3d_pro.so.3.5.0
-%{_libdir}/libbnabo.so.3.5
-%{_libdir}/libbnabo.so.3.5.0
-%{_libdir}/libbnl.so.3.5
-%{_libdir}/libbnl.so.3.5.0
-%{_libdir}/libbnl_algo.so.3.5
-%{_libdir}/libbnl_algo.so.3.5.0
-%{_libdir}/libboct.so.3.5
-%{_libdir}/libboct.so.3.5.0
-%{_libdir}/libboxm2.so.3.5
-%{_libdir}/libboxm2.so.3.5.0
-%{_libdir}/libboxm2_basic.so.3.5
-%{_libdir}/libboxm2_basic.so.3.5.0
-%{_libdir}/libboxm2_class.so.3.5
-%{_libdir}/libboxm2_class.so.3.5.0
-%{_libdir}/libboxm2_cpp.so.3.5
-%{_libdir}/libboxm2_cpp.so.3.5.0
-%{_libdir}/libboxm2_cpp_algo.so.3.5
-%{_libdir}/libboxm2_cpp_algo.so.3.5.0
-%{_libdir}/libboxm2_cpp_pro.so.3.5
-%{_libdir}/libboxm2_cpp_pro.so.3.5.0
-%{_libdir}/libboxm2_io.so.3.5
-%{_libdir}/libboxm2_io.so.3.5.0
-%{_libdir}/libboxm2_pro.so.3.5
-%{_libdir}/libboxm2_pro.so.3.5.0
-%{_libdir}/libboxm2_util.so.3.5
-%{_libdir}/libboxm2_util.so.3.5.0
-%{_libdir}/libboxm2_vecf.so.3.5
-%{_libdir}/libboxm2_vecf.so.3.5.0
-%{_libdir}/libboxm2_volm.so.3.5
-%{_libdir}/libboxm2_volm.so.3.5.0
-%{_libdir}/libboxm2_volm_conf.so.3.5
-%{_libdir}/libboxm2_volm_conf.so.3.5.0
-%{_libdir}/libboxm2_volm_desc.so.3.5
-%{_libdir}/libboxm2_volm_desc.so.3.5.0
-%{_libdir}/libboxm2_volm_io.so.3.5
-%{_libdir}/libboxm2_volm_io.so.3.5.0
-%{_libdir}/libboxm2_volm_pro.so.3.5
-%{_libdir}/libboxm2_volm_pro.so.3.5.0
-%{_libdir}/libbpgl.so.3.5
-%{_libdir}/libbpgl.so.3.5.0
-%{_libdir}/libbpgl_algo.so.3.5
-%{_libdir}/libbpgl_algo.so.3.5.0
-%{_libdir}/libbprb.so.3.5
-%{_libdir}/libbprb.so.3.5.0
-%{_libdir}/libbrad.so.3.5
-%{_libdir}/libbrad.so.3.5.0
-%{_libdir}/libbrad_io.so.3.5
-%{_libdir}/libbrad_io.so.3.5.0
-%{_libdir}/libbrad_pro.so.3.5
-%{_libdir}/libbrad_pro.so.3.5.0
-%{_libdir}/libbrdb.so.3.5
-%{_libdir}/libbrdb.so.3.5.0
-%{_libdir}/libbrec.so.3.5
-%{_libdir}/libbrec.so.3.5.0
-%{_libdir}/libbrec_pro.so.3.5
-%{_libdir}/libbrec_pro.so.3.5.0
-%{_libdir}/libbreg3d.so.3.5
-%{_libdir}/libbreg3d.so.3.5.0
-%{_libdir}/libbreg3d_pro.so.3.5
-%{_libdir}/libbreg3d_pro.so.3.5.0
-%{_libdir}/libbrip.so.3.5
-%{_libdir}/libbrip.so.3.5.0
-%{_libdir}/libbrip_pro.so.3.5
-%{_libdir}/libbrip_pro.so.3.5.0
-%{_libdir}/libbsgm.so.3.5
-%{_libdir}/libbsgm.so.3.5.0
-%{_libdir}/libbsgm_pro.so.3.5
-%{_libdir}/libbsgm_pro.so.3.5.0
-%{_libdir}/libbsl.so.3.5
-%{_libdir}/libbsl.so.3.5.0
-%{_libdir}/libbsol.so.3.5
-%{_libdir}/libbsol.so.3.5.0
-%{_libdir}/libbsta.so.3.5
-%{_libdir}/libbsta.so.3.5.0
-%{_libdir}/libbsta_algo.so.3.5
-%{_libdir}/libbsta_algo.so.3.5.0
-%{_libdir}/libbsta_io.so.3.5
-%{_libdir}/libbsta_io.so.3.5.0
-%{_libdir}/libbsta_pro.so.3.5
-%{_libdir}/libbsta_pro.so.3.5.0
-%{_libdir}/libbsta_vis.so.3.5
-%{_libdir}/libbsta_vis.so.3.5.0
-%{_libdir}/libbstm.so.3.5
-%{_libdir}/libbstm.so.3.5.0
-%{_libdir}/libbstm_basic.so.3.5
-%{_libdir}/libbstm_basic.so.3.5.0
-%{_libdir}/libbstm_cpp_algo.so.3.5
-%{_libdir}/libbstm_cpp_algo.so.3.5.0
-%{_libdir}/libbstm_cpp_pro.so.3.5
-%{_libdir}/libbstm_cpp_pro.so.3.5.0
-%{_libdir}/libbstm_io.so.3.5
-%{_libdir}/libbstm_io.so.3.5.0
-%{_libdir}/libbstm_multi.so.3.5
-%{_libdir}/libbstm_multi.so.3.5.0
-%{_libdir}/libbstm_multi_basic.so.3.5
-%{_libdir}/libbstm_multi_basic.so.3.5.0
-%{_libdir}/libbstm_multi_io.so.3.5
-%{_libdir}/libbstm_multi_io.so.3.5.0
-%{_libdir}/libbstm_pro.so.3.5
-%{_libdir}/libbstm_pro.so.3.5.0
-%{_libdir}/libbstm_util.so.3.5
-%{_libdir}/libbstm_util.so.3.5.0
-%{_libdir}/libbsvg.so.3.5
-%{_libdir}/libbsvg.so.3.5.0
-%{_libdir}/libbsvg_pro.so.3.5
-%{_libdir}/libbsvg_pro.so.3.5.0
-%{_libdir}/libbtol.so.3.5
-%{_libdir}/libbtol.so.3.5.0
-%{_libdir}/libbugl.so.3.5
-%{_libdir}/libbugl.so.3.5.0
-%{_libdir}/libbundler.so.3.5
-%{_libdir}/libbundler.so.3.5.0
-%{_libdir}/libbvgl.so.3.5
-%{_libdir}/libbvgl.so.3.5.0
-%{_libdir}/libbvgl_algo.so.3.5
-%{_libdir}/libbvgl_algo.so.3.5.0
-%{_libdir}/libbvgl_pro.so.3.5
-%{_libdir}/libbvgl_pro.so.3.5.0
-%{_libdir}/libbvpl.so.3.5
-%{_libdir}/libbvpl.so.3.5.0
-%{_libdir}/libbvpl_functors.so.3.5
-%{_libdir}/libbvpl_functors.so.3.5.0
-%{_libdir}/libbvpl_kernels.so.3.5
-%{_libdir}/libbvpl_kernels.so.3.5.0
-%{_libdir}/libbvpl_kernels_io.so.3.5
-%{_libdir}/libbvpl_kernels_io.so.3.5.0
-%{_libdir}/libbvpl_kernels_pro.so.3.5
-%{_libdir}/libbvpl_kernels_pro.so.3.5.0
-%{_libdir}/libbvpl_pro.so.3.5
-%{_libdir}/libbvpl_pro.so.3.5.0
-%{_libdir}/libbvpl_util.so.3.5
-%{_libdir}/libbvpl_util.so.3.5.0
-%{_libdir}/libbvpl_util_io.so.3.5
-%{_libdir}/libbvpl_util_io.so.3.5.0
-%{_libdir}/libbvrml.so.3.5
-%{_libdir}/libbvrml.so.3.5.0
-%{_libdir}/libbvrml_pro.so.3.5
-%{_libdir}/libbvrml_pro.so.3.5.0
-%{_libdir}/libbvxm.so.3.5
-%{_libdir}/libbvxm.so.3.5.0
-%{_libdir}/libbvxm_algo.so.3.5
-%{_libdir}/libbvxm_algo.so.3.5.0
-%{_libdir}/libbvxm_algo_pro.so.3.5
-%{_libdir}/libbvxm_algo_pro.so.3.5.0
-%{_libdir}/libbvxm_grid.so.3.5
-%{_libdir}/libbvxm_grid.so.3.5.0
-%{_libdir}/libbvxm_grid_io.so.3.5
-%{_libdir}/libbvxm_grid_io.so.3.5.0
-%{_libdir}/libbvxm_grid_pro.so.3.5
-%{_libdir}/libbvxm_grid_pro.so.3.5.0
-%{_libdir}/libbvxm_io.so.3.5
-%{_libdir}/libbvxm_io.so.3.5.0
-%{_libdir}/libbvxm_pro.so.3.5
-%{_libdir}/libbvxm_pro.so.3.5.0
-%{_libdir}/libbwm_video.so.3.5
-%{_libdir}/libbwm_video.so.3.5.0
-%{_libdir}/libbxml.so.3.5
-%{_libdir}/libbxml.so.3.5.0
-%{_libdir}/libclsfy.so.3.5
-%{_libdir}/libclsfy.so.3.5.0
-%{_libdir}/libdepth_map.so.3.5
-%{_libdir}/libdepth_map.so.3.5.0
-%{_libdir}/libfhs.so.3.5
-%{_libdir}/libfhs.so.3.5.0
-%{_libdir}/libgeml.so.3.5
-%{_libdir}/libgeml.so.3.5.0
-%{_libdir}/libgevd.so.3.5
-%{_libdir}/libgevd.so.3.5.0
-%{_libdir}/libgmvl.so.3.5
-%{_libdir}/libgmvl.so.3.5.0
-%{_libdir}/libgst.so.3.5
-%{_libdir}/libgst.so.3.5.0
-%{_libdir}/libgtrl.so.3.5
-%{_libdir}/libgtrl.so.3.5.0
-%{_libdir}/libicam.so.3.5
-%{_libdir}/libicam.so.3.5.0
-%{_libdir}/libicam_pro.so.3.5
-%{_libdir}/libicam_pro.so.3.5.0
-%{_libdir}/libihog.so.3.5
-%{_libdir}/libihog.so.3.5.0
-%{_libdir}/libihog_pro.so.3.5
-%{_libdir}/libihog_pro.so.3.5.0
-%{_libdir}/libimesh.so.3.5
-%{_libdir}/libimesh.so.3.5.0
-%{_libdir}/libimesh_algo.so.3.5
-%{_libdir}/libimesh_algo.so.3.5.0
-%{_libdir}/libipts.so.3.5
-%{_libdir}/libipts.so.3.5.0
-%{_libdir}/libm23d.so.3.5
-%{_libdir}/libm23d.so.3.5.0
-%{_libdir}/libmbl.so.3.5
-%{_libdir}/libmbl.so.3.5.0
-%{_libdir}/libmcal.so.3.5
-%{_libdir}/libmcal.so.3.5.0
-%{_libdir}/libmfpf.so.3.5
-%{_libdir}/libmfpf.so.3.5.0
-%{_libdir}/libmipa.so.3.5
-%{_libdir}/libmipa.so.3.5.0
-%{_libdir}/libmmn.so.3.5
-%{_libdir}/libmmn.so.3.5.0
-%{_libdir}/libmsdi.so.3.5
-%{_libdir}/libmsdi.so.3.5.0
-%{_libdir}/libmsm.so.3.5
-%{_libdir}/libmsm.so.3.5.0
-%{_libdir}/libmsm_utils.so.3.5
-%{_libdir}/libmsm_utils.so.3.5.0
-%{_libdir}/libmvl.so.3.5
-%{_libdir}/libmvl.so.3.5.0
-%{_libdir}/libmvl2.so.3.5
-%{_libdir}/libmvl2.so.3.5.0
-%{_libdir}/libosl.so.3.5
-%{_libdir}/libosl.so.3.5.0
-%{_libdir}/libouel.so.3.5
-%{_libdir}/libouel.so.3.5.0
-%{_libdir}/libouml.so.3.5
-%{_libdir}/libouml.so.3.5.0
-%{_libdir}/liboxl_vrml.so.3.5
-%{_libdir}/liboxl_vrml.so.3.5.0
-%{_libdir}/libpdf1d.so.3.5
-%{_libdir}/libpdf1d.so.3.5.0
-%{_libdir}/librgrl.so.3.5
-%{_libdir}/librgrl.so.3.5.0
-%{_libdir}/librrel.so.3.5
-%{_libdir}/librrel.so.3.5.0
-%{_libdir}/librsdl.so.3.5
-%{_libdir}/librsdl.so.3.5.0
-%{_libdir}/libsdet.so.3.5
-%{_libdir}/libsdet.so.3.5.0
-%{_libdir}/libsdet_pro.so.3.5
-%{_libdir}/libsdet_pro.so.3.5.0
-%{_libdir}/libvcon_pro.so.3.5
-%{_libdir}/libvcon_pro.so.3.5.0
-%{_libdir}/libvdgl.so.3.5
-%{_libdir}/libvdgl.so.3.5.0
-%{_libdir}/libvdtop.so.3.5
-%{_libdir}/libvdtop.so.3.5.0
-%{_libdir}/libvepl.so.3.5
-%{_libdir}/libvepl.so.3.5.0
-%{_libdir}/libvidl_pro.so.3.5
-%{_libdir}/libvidl_pro.so.3.5.0
-%{_libdir}/libvifa.so.3.5
-%{_libdir}/libvifa.so.3.5.0
-%{_libdir}/libvil3d.so.3.5
-%{_libdir}/libvil3d.so.3.5.0
-%{_libdir}/libvil3d_algo.so.3.5
-%{_libdir}/libvil3d_algo.so.3.5.0
-%{_libdir}/libvil3d_io.so.3.5
-%{_libdir}/libvil3d_io.so.3.5.0
-%{_libdir}/libvil_pro.so.3.5
-%{_libdir}/libvil_pro.so.3.5.0
-%{_libdir}/libvimt.so.3.5
-%{_libdir}/libvimt.so.3.5.0
-%{_libdir}/libvimt3d.so.3.5
-%{_libdir}/libvimt3d.so.3.5.0
-%{_libdir}/libvimt_algo.so.3.5
-%{_libdir}/libvimt_algo.so.3.5.0
-%{_libdir}/libvipl.so.3.5
-%{_libdir}/libvipl.so.3.5.0
-%{_libdir}/libvmal.so.3.5
-%{_libdir}/libvmal.so.3.5.0
-%{_libdir}/libvmap.so.3.5
-%{_libdir}/libvmap.so.3.5.0
-%{_libdir}/libvolm.so.3.5
-%{_libdir}/libvolm.so.3.5.0
-%{_libdir}/libvolm_conf.so.3.5
-%{_libdir}/libvolm_conf.so.3.5.0
-%{_libdir}/libvolm_desc.so.3.5
-%{_libdir}/libvolm_desc.so.3.5.0
-%{_libdir}/libvolm_pro.so.3.5
-%{_libdir}/libvolm_pro.so.3.5.0
-%{_libdir}/libvpdfl.so.3.5
-%{_libdir}/libvpdfl.so.3.5.0
-%{_libdir}/libvpgl_pro.so.3.5
-%{_libdir}/libvpgl_pro.so.3.5.0
-%{_libdir}/libvpyr.so.3.5
-%{_libdir}/libvpyr.so.3.5.0
-%{_libdir}/libvsol.so.3.5
-%{_libdir}/libvsol.so.3.5.0
-%{_libdir}/libvsph.so.3.5
-%{_libdir}/libvsph.so.3.5.0
-%{_libdir}/libvtol.so.3.5
-%{_libdir}/libvtol.so.3.5.0
-%{_libdir}/libvtol_algo.so.3.5
-%{_libdir}/libvtol_algo.so.3.5.0
-# Bundles
-%{_libdir}/libopenjpeg2.so.3.5
-%{_libdir}/libopenjpeg2.so.3.5.0
+%{_libdir}/libacal.so.%{major}.%{minor}
+%{_libdir}/libacal.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libacal_io.so.%{major}.%{minor}
+%{_libdir}/libacal_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbaio.so.%{major}.%{minor}
+%{_libdir}/libbaio.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbaml.so.%{major}.%{minor}
+%{_libdir}/libbaml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbapl.so.%{major}.%{minor}
+%{_libdir}/libbapl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbapl_io.so.%{major}.%{minor}
+%{_libdir}/libbapl_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbapl_pro.so.%{major}.%{minor}
+%{_libdir}/libbapl_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbbas_pro.so.%{major}.%{minor}
+%{_libdir}/libbbas_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbbgm.so.%{major}.%{minor}
+%{_libdir}/libbbgm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbbgm_pro.so.%{major}.%{minor}
+%{_libdir}/libbbgm_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbcvr.so.%{major}.%{minor}
+%{_libdir}/libbcvr.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbdgl.so.%{major}.%{minor}
+%{_libdir}/libbdgl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbdpg.so.%{major}.%{minor}
+%{_libdir}/libbdpg.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbetr.so.%{major}.%{minor}
+%{_libdir}/libbetr.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbetr_pro.so.%{major}.%{minor}
+%{_libdir}/libbetr_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbgrl.so.%{major}.%{minor}
+%{_libdir}/libbgrl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbgrl2.so.%{major}.%{minor}
+%{_libdir}/libbgrl2.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbgrl2_algo.so.%{major}.%{minor}
+%{_libdir}/libbgrl2_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbil.so.%{major}.%{minor}
+%{_libdir}/libbil.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbil_algo.so.%{major}.%{minor}
+%{_libdir}/libbil_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbjson.so.%{major}.%{minor}
+%{_libdir}/libbjson.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbkml.so.%{major}.%{minor}
+%{_libdir}/libbkml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbmdl.so.%{major}.%{minor}
+%{_libdir}/libbmdl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbmdl_pro.so.%{major}.%{minor}
+%{_libdir}/libbmdl_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbmsh3d.so.%{major}.%{minor}
+%{_libdir}/libbmsh3d.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbmsh3d_algo.so.%{major}.%{minor}
+%{_libdir}/libbmsh3d_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbmsh3d_pro.so.%{major}.%{minor}
+%{_libdir}/libbmsh3d_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbnabo.so.%{major}.%{minor}
+%{_libdir}/libbnabo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbnl.so.%{major}.%{minor}
+%{_libdir}/libbnl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbnl_algo.so.%{major}.%{minor}
+%{_libdir}/libbnl_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboct.so.%{major}.%{minor}
+%{_libdir}/libboct.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2.so.%{major}.%{minor}
+%{_libdir}/libboxm2.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_basic.so.%{major}.%{minor}
+%{_libdir}/libboxm2_basic.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_class.so.%{major}.%{minor}
+%{_libdir}/libboxm2_class.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_cpp.so.%{major}.%{minor}
+%{_libdir}/libboxm2_cpp.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_cpp_algo.so.%{major}.%{minor}
+%{_libdir}/libboxm2_cpp_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_cpp_pro.so.%{major}.%{minor}
+%{_libdir}/libboxm2_cpp_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_io.so.%{major}.%{minor}
+%{_libdir}/libboxm2_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_pro.so.%{major}.%{minor}
+%{_libdir}/libboxm2_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_util.so.%{major}.%{minor}
+%{_libdir}/libboxm2_util.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_vecf.so.%{major}.%{minor}
+%{_libdir}/libboxm2_vecf.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_volm.so.%{major}.%{minor}
+%{_libdir}/libboxm2_volm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_volm_conf.so.%{major}.%{minor}
+%{_libdir}/libboxm2_volm_conf.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_volm_desc.so.%{major}.%{minor}
+%{_libdir}/libboxm2_volm_desc.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_volm_io.so.%{major}.%{minor}
+%{_libdir}/libboxm2_volm_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libboxm2_volm_pro.so.%{major}.%{minor}
+%{_libdir}/libboxm2_volm_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbpgl.so.%{major}.%{minor}
+%{_libdir}/libbpgl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbpgl_algo.so.%{major}.%{minor}
+%{_libdir}/libbpgl_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbprb.so.%{major}.%{minor}
+%{_libdir}/libbprb.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrad.so.%{major}.%{minor}
+%{_libdir}/libbrad.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrad_io.so.%{major}.%{minor}
+%{_libdir}/libbrad_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrad_pro.so.%{major}.%{minor}
+%{_libdir}/libbrad_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrdb.so.%{major}.%{minor}
+%{_libdir}/libbrdb.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrec.so.%{major}.%{minor}
+%{_libdir}/libbrec.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrec_pro.so.%{major}.%{minor}
+%{_libdir}/libbrec_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbreg3d.so.%{major}.%{minor}
+%{_libdir}/libbreg3d.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbreg3d_pro.so.%{major}.%{minor}
+%{_libdir}/libbreg3d_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbres.so.%{major}.%{minor}
+%{_libdir}/libbres.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrip.so.%{major}.%{minor}
+%{_libdir}/libbrip.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbrip_pro.so.%{major}.%{minor}
+%{_libdir}/libbrip_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsgm.so.%{major}.%{minor}
+%{_libdir}/libbsgm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsgm_pro.so.%{major}.%{minor}
+%{_libdir}/libbsgm_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsl.so.%{major}.%{minor}
+%{_libdir}/libbsl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsol.so.%{major}.%{minor}
+%{_libdir}/libbsol.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsta.so.%{major}.%{minor}
+%{_libdir}/libbsta.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsta_algo.so.%{major}.%{minor}
+%{_libdir}/libbsta_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsta_io.so.%{major}.%{minor}
+%{_libdir}/libbsta_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsta_pro.so.%{major}.%{minor}
+%{_libdir}/libbsta_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsta_vis.so.%{major}.%{minor}
+%{_libdir}/libbsta_vis.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm.so.%{major}.%{minor}
+%{_libdir}/libbstm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_basic.so.%{major}.%{minor}
+%{_libdir}/libbstm_basic.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_cpp_algo.so.%{major}.%{minor}
+%{_libdir}/libbstm_cpp_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_cpp_pro.so.%{major}.%{minor}
+%{_libdir}/libbstm_cpp_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_io.so.%{major}.%{minor}
+%{_libdir}/libbstm_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_multi.so.%{major}.%{minor}
+%{_libdir}/libbstm_multi.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_multi_basic.so.%{major}.%{minor}
+%{_libdir}/libbstm_multi_basic.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_multi_io.so.%{major}.%{minor}
+%{_libdir}/libbstm_multi_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_pro.so.%{major}.%{minor}
+%{_libdir}/libbstm_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbstm_util.so.%{major}.%{minor}
+%{_libdir}/libbstm_util.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsvg.so.%{major}.%{minor}
+%{_libdir}/libbsvg.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbsvg_pro.so.%{major}.%{minor}
+%{_libdir}/libbsvg_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbtol.so.%{major}.%{minor}
+%{_libdir}/libbtol.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbugl.so.%{major}.%{minor}
+%{_libdir}/libbugl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbundler.so.%{major}.%{minor}
+%{_libdir}/libbundler.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvgl.so.%{major}.%{minor}
+%{_libdir}/libbvgl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvgl_algo.so.%{major}.%{minor}
+%{_libdir}/libbvgl_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvgl_pro.so.%{major}.%{minor}
+%{_libdir}/libbvgl_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl.so.%{major}.%{minor}
+%{_libdir}/libbvpl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_functors.so.%{major}.%{minor}
+%{_libdir}/libbvpl_functors.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_kernels.so.%{major}.%{minor}
+%{_libdir}/libbvpl_kernels.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_kernels_io.so.%{major}.%{minor}
+%{_libdir}/libbvpl_kernels_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_kernels_pro.so.%{major}.%{minor}
+%{_libdir}/libbvpl_kernels_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_pro.so.%{major}.%{minor}
+%{_libdir}/libbvpl_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_util.so.%{major}.%{minor}
+%{_libdir}/libbvpl_util.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvpl_util_io.so.%{major}.%{minor}
+%{_libdir}/libbvpl_util_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvrml.so.%{major}.%{minor}
+%{_libdir}/libbvrml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvrml_pro.so.%{major}.%{minor}
+%{_libdir}/libbvrml_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm.so.%{major}.%{minor}
+%{_libdir}/libbvxm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_algo.so.%{major}.%{minor}
+%{_libdir}/libbvxm_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_algo_pro.so.%{major}.%{minor}
+%{_libdir}/libbvxm_algo_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_grid.so.%{major}.%{minor}
+%{_libdir}/libbvxm_grid.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_grid_io.so.%{major}.%{minor}
+%{_libdir}/libbvxm_grid_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_grid_pro.so.%{major}.%{minor}
+%{_libdir}/libbvxm_grid_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_io.so.%{major}.%{minor}
+%{_libdir}/libbvxm_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbvxm_pro.so.%{major}.%{minor}
+%{_libdir}/libbvxm_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbwm_video.so.%{major}.%{minor}
+%{_libdir}/libbwm_video.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libbxml.so.%{major}.%{minor}
+%{_libdir}/libbxml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libclipper.so.%{major}.%{minor}
+%{_libdir}/libclipper.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libclsfy.so.%{major}.%{minor}
+%{_libdir}/libclsfy.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libdepth_map.so.%{major}.%{minor}
+%{_libdir}/libdepth_map.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libfhs.so.%{major}.%{minor}
+%{_libdir}/libfhs.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libgeml.so.%{major}.%{minor}
+%{_libdir}/libgeml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libgevd.so.%{major}.%{minor}
+%{_libdir}/libgevd.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libgmvl.so.%{major}.%{minor}
+%{_libdir}/libgmvl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libgst.so.%{major}.%{minor}
+%{_libdir}/libgst.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libgtrl.so.%{major}.%{minor}
+%{_libdir}/libgtrl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libicam.so.%{major}.%{minor}
+%{_libdir}/libicam.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libicam_pro.so.%{major}.%{minor}
+%{_libdir}/libicam_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libihog.so.%{major}.%{minor}
+%{_libdir}/libihog.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libihog_pro.so.%{major}.%{minor}
+%{_libdir}/libihog_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libimesh.so.%{major}.%{minor}
+%{_libdir}/libimesh.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libimesh_algo.so.%{major}.%{minor}
+%{_libdir}/libimesh_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libipts.so.%{major}.%{minor}
+%{_libdir}/libipts.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libm23d.so.%{major}.%{minor}
+%{_libdir}/libm23d.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmbl.so.%{major}.%{minor}
+%{_libdir}/libmbl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmcal.so.%{major}.%{minor}
+%{_libdir}/libmcal.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmfpf.so.%{major}.%{minor}
+%{_libdir}/libmfpf.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmipa.so.%{major}.%{minor}
+%{_libdir}/libmipa.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmmn.so.%{major}.%{minor}
+%{_libdir}/libmmn.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmsdi.so.%{major}.%{minor}
+%{_libdir}/libmsdi.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmsm.so.%{major}.%{minor}
+%{_libdir}/libmsm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmsm_utils.so.%{major}.%{minor}
+%{_libdir}/libmsm_utils.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmvl.so.%{major}.%{minor}
+%{_libdir}/libmvl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libmvl2.so.%{major}.%{minor}
+%{_libdir}/libmvl2.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libopenjpeg2.so.2.%{patch}.0
+%{_libdir}/libopenjpeg2.so.%{major}.%{minor}
+%{_libdir}/libosl.so.%{major}.%{minor}
+%{_libdir}/libosl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libouel.so.%{major}.%{minor}
+%{_libdir}/libouel.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libouml.so.%{major}.%{minor}
+%{_libdir}/libouml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/liboxl_vrml.so.%{major}.%{minor}
+%{_libdir}/liboxl_vrml.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libpdf1d.so.%{major}.%{minor}
+%{_libdir}/libpdf1d.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/librgrl.so.%{major}.%{minor}
+%{_libdir}/librgrl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/librrel.so.%{major}.%{minor}
+%{_libdir}/librrel.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/librsdl.so.%{major}.%{minor}
+%{_libdir}/librsdl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libsdet.so.%{major}.%{minor}
+%{_libdir}/libsdet.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libsdet_algo.so.%{major}.%{minor}
+%{_libdir}/libsdet_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libsdet_pro.so.%{major}.%{minor}
+%{_libdir}/libsdet_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libtestlib.so.%{major}.%{minor}
+%{_libdir}/libtestlib.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libv3p_netlib.so.%{major}.%{minor}
+%{_libdir}/libv3p_netlib.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvbl.so.%{major}.%{minor}
+%{_libdir}/libvbl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvbl_io.so.%{major}.%{minor}
+%{_libdir}/libvbl_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvcl.so.%{major}.%{minor}
+%{_libdir}/libvcl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvcon_pro.so.%{major}.%{minor}
+%{_libdir}/libvcon_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvcsl.so.%{major}.%{minor}
+%{_libdir}/libvcsl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvdgl.so.%{major}.%{minor}
+%{_libdir}/libvdgl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvdtop.so.%{major}.%{minor}
+%{_libdir}/libvdtop.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvepl.so.%{major}.%{minor}
+%{_libdir}/libvepl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvgl.so.%{major}.%{minor}
+%{_libdir}/libvgl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvgl_algo.so.%{major}.%{minor}
+%{_libdir}/libvgl_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvgl_io.so.%{major}.%{minor}
+%{_libdir}/libvgl_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvgl_xio.so.%{major}.%{minor}
+%{_libdir}/libvgl_xio.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvidl.so.%{major}.%{minor}
+%{_libdir}/libvidl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvidl_pro.so.%{major}.%{minor}
+%{_libdir}/libvidl_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvifa.so.%{major}.%{minor}
+%{_libdir}/libvifa.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil.so.%{major}.%{minor}
+%{_libdir}/libvil.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil1.so.%{major}.%{minor}
+%{_libdir}/libvil1.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil3d.so.%{major}.%{minor}
+%{_libdir}/libvil3d.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil3d_algo.so.%{major}.%{minor}
+%{_libdir}/libvil3d_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil3d_io.so.%{major}.%{minor}
+%{_libdir}/libvil3d_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil_algo.so.%{major}.%{minor}
+%{_libdir}/libvil_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil_io.so.%{major}.%{minor}
+%{_libdir}/libvil_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvil_pro.so.%{major}.%{minor}
+%{_libdir}/libvil_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvimt.so.%{major}.%{minor}
+%{_libdir}/libvimt.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvimt3d.so.%{major}.%{minor}
+%{_libdir}/libvimt3d.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvimt_algo.so.%{major}.%{minor}
+%{_libdir}/libvimt_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvipl.so.%{major}.%{minor}
+%{_libdir}/libvipl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvmal.so.%{major}.%{minor}
+%{_libdir}/libvmal.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvmap.so.%{major}.%{minor}
+%{_libdir}/libvmap.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvnl.so.%{major}.%{minor}
+%{_libdir}/libvnl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvnl_algo.so.%{major}.%{minor}
+%{_libdir}/libvnl_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvnl_io.so.%{major}.%{minor}
+%{_libdir}/libvnl_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvnl_xio.so.%{major}.%{minor}
+%{_libdir}/libvnl_xio.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvolm.so.%{major}.%{minor}
+%{_libdir}/libvolm.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvolm_conf.so.%{major}.%{minor}
+%{_libdir}/libvolm_conf.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvolm_desc.so.%{major}.%{minor}
+%{_libdir}/libvolm_desc.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvolm_pro.so.%{major}.%{minor}
+%{_libdir}/libvolm_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpdfl.so.%{major}.%{minor}
+%{_libdir}/libvpdfl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpdl.so.%{major}.%{minor}
+%{_libdir}/libvpdl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpgl.so.%{major}.%{minor}
+%{_libdir}/libvpgl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpgl_algo.so.%{major}.%{minor}
+%{_libdir}/libvpgl_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpgl_file_formats.so.%{major}.%{minor}
+%{_libdir}/libvpgl_file_formats.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpgl_io.so.%{major}.%{minor}
+%{_libdir}/libvpgl_io.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpgl_pro.so.%{major}.%{minor}
+%{_libdir}/libvpgl_pro.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpgl_xio.so.%{major}.%{minor}
+%{_libdir}/libvpgl_xio.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpl.so.%{major}.%{minor}
+%{_libdir}/libvpl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvpyr.so.%{major}.%{minor}
+%{_libdir}/libvpyr.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvsl.so.%{major}.%{minor}
+%{_libdir}/libvsl.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvsol.so.%{major}.%{minor}
+%{_libdir}/libvsol.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvsph.so.%{major}.%{minor}
+%{_libdir}/libvsph.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvtol.so.%{major}.%{minor}
+%{_libdir}/libvtol.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvtol_algo.so.%{major}.%{minor}
+%{_libdir}/libvtol_algo.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvul.so.%{major}.%{minor}
+%{_libdir}/libvul.so.%{major}.%{minor}.%{patch}.0
+%{_libdir}/libvul_io.so.%{major}.%{minor}
+%{_libdir}/libvul_io.so.%{major}.%{minor}.%{patch}.0
 
 %files devel
 %{_datadir}/%{name}
 %{_includedir}/%{name}
-%{_libdir}/libclipper.so
-%{_libdir}/libvbl_io.so
-%{_libdir}/libvcsl.so
-%{_libdir}/libvgl.so
-%{_libdir}/libvil_algo.so
-%{_libdir}/libvnl_algo.so
-%{_libdir}/libvnl_xio.so
-%{_libdir}/libvpgl_file_formats.so
-%{_libdir}/libvpgl_xio.so
-%{_libdir}/libvul_io.so
-%{_libdir}/libnetlib.so
-%{_libdir}/libtestlib.so
-%{_libdir}/libvbl.so
-%{_libdir}/libvgl_algo.so
-%{_libdir}/libvgl_xio.so
-%{_libdir}/libvil_io.so
-%{_libdir}/libvnl_io.so
-%{_libdir}/libvpdl.so
-%{_libdir}/libvpgl_io.so
-%{_libdir}/libvpl.so
-%{_libdir}/libvul.so
-%{_libdir}/libopenjpeg2.so
-%{_libdir}/libv3p_netlib.so
-%{_libdir}/libvcl.so
-%{_libdir}/libvgl_io.so
-%{_libdir}/libvidl.so
-%{_libdir}/libvil1.so
-%{_libdir}/libvil.so
-%{_libdir}/libvnl.so
-%{_libdir}/libvpgl_algo.so
-%{_libdir}/libvpgl.so
-%{_libdir}/libmipa.so
-%{_libdir}/libmfpf.so
-%{_libdir}/libmcal.so
-%{_libdir}/libmbl.so
-%{_libdir}/libm23d.so
-%{_libdir}/libipts.so
-%{_libdir}/libimesh_algo.so
-%{_libdir}/libimesh.so
-%{_libdir}/libihog_pro.so
-%{_libdir}/libihog.so
-%{_libdir}/libicam_pro.so
-%{_libdir}/libicam.so
-%{_libdir}/libgst.so
-%{_libdir}/libgmvl.so
-%{_libdir}/libgevd.so
-%{_libdir}/libgtrl.so
-%{_libdir}/libgeml.so
-%{_libdir}/libfhs.so
-%{_libdir}/libdepth_map.so
-%{_libdir}/libclsfy.so
-%{_libdir}/libbxml.so
-%{_libdir}/libbwm_video.so
-%{_libdir}/libbvxm_pro.so
-%{_libdir}/libbvxm_io.so
-%{_libdir}/libbvxm_grid_pro.so
-%{_libdir}/libbvxm_grid_io.so
-%{_libdir}/libbvxm_grid.so
-%{_libdir}/libbvxm_algo_pro.so
-%{_libdir}/libbvxm_algo.so
-%{_libdir}/libbvxm.so
-%{_libdir}/libbvrml_pro.so
-%{_libdir}/libbvrml.so
-%{_libdir}/libbvpl_util_io.so
-%{_libdir}/libbvpl_util.so
-%{_libdir}/libbvpl_pro.so
-%{_libdir}/libbvpl_kernels_pro.so
-%{_libdir}/libbvpl_kernels_io.so
-%{_libdir}/libbvpl_kernels.so
-%{_libdir}/libbvpl_functors.so
-%{_libdir}/libbvpl.so
-%{_libdir}/libvsl.so
-%{_libdir}/libbvgl_pro.so
-%{_libdir}/libbvgl_algo.so
-%{_libdir}/libbvgl.so
-%{_libdir}/libbundler.so
-%{_libdir}/libbugl.so
-%{_libdir}/libbtol.so
-%{_libdir}/libbsvg_pro.so
-%{_libdir}/libbsvg.so
-%{_libdir}/libbstm_util.so
-%{_libdir}/libbstm_pro.so
-%{_libdir}/libbstm_multi_io.so
-%{_libdir}/libbstm_multi_basic.so
-%{_libdir}/libbstm_multi.so
-%{_libdir}/libbstm_io.so
-%{_libdir}/libbstm_cpp_pro.so
-%{_libdir}/libbstm_cpp_algo.so
-%{_libdir}/libbstm_basic.so
-%{_libdir}/libbstm.so
-%{_libdir}/libbsta_vis.so
-%{_libdir}/libbsta_pro.so
-%{_libdir}/libbsta_io.so
-%{_libdir}/libbsta_algo.so
-%{_libdir}/libbsta.so
-%{_libdir}/libbsol.so
-%{_libdir}/libbsl.so
-%{_libdir}/libbsgm_pro.so
-%{_libdir}/libbsgm.so
-%{_libdir}/libbrip_pro.so
-%{_libdir}/libbrip.so
-%{_libdir}/libbreg3d_pro.so
-%{_libdir}/libbreg3d.so
-%{_libdir}/libbrec_pro.so
-%{_libdir}/libbrec.so
-%{_libdir}/libbrdb.so
-%{_libdir}/libbrad_pro.so
-%{_libdir}/libbrad_io.so
-%{_libdir}/libbrad.so
-%{_libdir}/libbprb.so
-%{_libdir}/libbpgl_algo.so
-%{_libdir}/libbpgl.so
-%{_libdir}/libboxm2_volm_pro.so
-%{_libdir}/libboxm2_volm_io.so
-%{_libdir}/libboxm2_volm_conf.so
-%{_libdir}/libboxm2_volm.so
-%{_libdir}/libboxm2_vecf.so
-%{_libdir}/libboxm2_util.so
-%{_libdir}/libboxm2_pro.so
-%{_libdir}/libboxm2_io.so
-%{_libdir}/libboxm2_cpp_pro.so
-%{_libdir}/libboxm2_cpp_algo.so
-%{_libdir}/libboxm2_cpp.so
-%{_libdir}/libboxm2_class.so
-%{_libdir}/libboxm2_basic.so
-%{_libdir}/libboxm2.so
-%{_libdir}/libboct.so
-%{_libdir}/libbnl_algo.so
-%{_libdir}/libbnl.so
-%{_libdir}/libbnabo.so
-%{_libdir}/libbmsh3d_pro.so
-%{_libdir}/libbmsh3d_algo.so
-%{_libdir}/libboxm2_volm_desc.so
-%{_libdir}/libbmsh3d.so
-%{_libdir}/libbmdl_pro.so
-%{_libdir}/libbmdl.so
-%{_libdir}/libbkml.so
-%{_libdir}/libbjson.so
-%{_libdir}/libbil_algo.so
-%{_libdir}/libbil.so
-%{_libdir}/libbgrl2_algo.so
-%{_libdir}/libbgrl2.so
-%{_libdir}/libbgrl.so
-%{_libdir}/libbetr_pro.so
-%{_libdir}/libbetr.so
-%{_libdir}/libbdpg.so
-%{_libdir}/libbdgl.so
-%{_libdir}/libbcvr.so
-%{_libdir}/libbbgm_pro.so
-%{_libdir}/libbbgm.so
 %{_libdir}/libbbas_pro.so
 %{_libdir}/libbapl_pro.so
 %{_libdir}/libbapl_io.so
-%{_libdir}/libbapl.so
-%{_libdir}/libbaml.so
+%{_libdir}/libacal.so
+%{_libdir}/libacal_io.so
 %{_libdir}/libbaio.so
+%{_libdir}/libbaml.so
+%{_libdir}/libbapl.so
+%{_libdir}/libbbgm.so
+%{_libdir}/libbbgm_pro.so
+%{_libdir}/libbcvr.so
+%{_libdir}/libbdgl.so
+%{_libdir}/libbdpg.so
+%{_libdir}/libbetr.so
+%{_libdir}/libbetr_pro.so
+%{_libdir}/libbgrl.so
+%{_libdir}/libbgrl2.so
+%{_libdir}/libbgrl2_algo.so
+%{_libdir}/libbil.so
+%{_libdir}/libbil_algo.so
+%{_libdir}/libbjson.so
+%{_libdir}/libbkml.so
+%{_libdir}/libbmdl.so
+%{_libdir}/libbmdl_pro.so
+%{_libdir}/libbmsh3d.so
+%{_libdir}/libbmsh3d_algo.so
+%{_libdir}/libbmsh3d_pro.so
+%{_libdir}/libbnabo.so
+%{_libdir}/libbnl.so
+%{_libdir}/libbnl_algo.so
+%{_libdir}/libboct.so
+%{_libdir}/libboxm2.so
+%{_libdir}/libboxm2_basic.so
+%{_libdir}/libboxm2_class.so
+%{_libdir}/libboxm2_cpp.so
+%{_libdir}/libboxm2_cpp_algo.so
+%{_libdir}/libboxm2_cpp_pro.so
+%{_libdir}/libboxm2_io.so
+%{_libdir}/libboxm2_pro.so
+%{_libdir}/libboxm2_util.so
+%{_libdir}/libboxm2_vecf.so
+%{_libdir}/libboxm2_volm.so
+%{_libdir}/libboxm2_volm_conf.so
+%{_libdir}/libboxm2_volm_desc.so
+%{_libdir}/libboxm2_volm_io.so
+%{_libdir}/libboxm2_volm_pro.so
+%{_libdir}/libbpgl.so
+%{_libdir}/libbpgl_algo.so
+%{_libdir}/libbprb.so
+%{_libdir}/libbrad.so
+%{_libdir}/libbrad_io.so
+%{_libdir}/libbrad_pro.so
+%{_libdir}/libbrdb.so
+%{_libdir}/libbrec.so
+%{_libdir}/libbrec_pro.so
+%{_libdir}/libbreg3d.so
+%{_libdir}/libbreg3d_pro.so
+%{_libdir}/libbres.so
+%{_libdir}/libbrip.so
+%{_libdir}/libbrip_pro.so
+%{_libdir}/libbsgm.so
+%{_libdir}/libbsgm_pro.so
+%{_libdir}/libbsl.so
+%{_libdir}/libbsol.so
+%{_libdir}/libbsta.so
+%{_libdir}/libbsta_algo.so
+%{_libdir}/libbsta_io.so
+%{_libdir}/libbsta_pro.so
+%{_libdir}/libbsta_vis.so
+%{_libdir}/libbstm.so
+%{_libdir}/libbstm_basic.so
+%{_libdir}/libbstm_cpp_algo.so
+%{_libdir}/libbstm_cpp_pro.so
+%{_libdir}/libbstm_io.so
+%{_libdir}/libbstm_multi.so
+%{_libdir}/libbstm_multi_basic.so
+%{_libdir}/libbstm_multi_io.so
+%{_libdir}/libbstm_pro.so
+%{_libdir}/libbstm_util.so
+%{_libdir}/libbsvg.so
+%{_libdir}/libbsvg_pro.so
+%{_libdir}/libbtol.so
+%{_libdir}/libbugl.so
+%{_libdir}/libbundler.so
+%{_libdir}/libbvgl.so
+%{_libdir}/libbvgl_algo.so
+%{_libdir}/libbvgl_pro.so
+%{_libdir}/libbvpl.so
+%{_libdir}/libbvpl_functors.so
+%{_libdir}/libbvpl_kernels.so
+%{_libdir}/libbvpl_kernels_io.so
+%{_libdir}/libbvpl_kernels_pro.so
+%{_libdir}/libbvpl_pro.so
+%{_libdir}/libbvpl_util.so
+%{_libdir}/libbvpl_util_io.so
+%{_libdir}/libbvrml.so
+%{_libdir}/libbvrml_pro.so
+%{_libdir}/libbvxm.so
+%{_libdir}/libbvxm_algo.so
+%{_libdir}/libbvxm_algo_pro.so
+%{_libdir}/libbvxm_grid.so
+%{_libdir}/libbvxm_grid_io.so
+%{_libdir}/libbvxm_grid_pro.so
+%{_libdir}/libbvxm_io.so
+%{_libdir}/libbvxm_pro.so
+%{_libdir}/libbwm_video.so
+%{_libdir}/libbxml.so
+%{_libdir}/libclipper.so
+%{_libdir}/libclsfy.so
+%{_libdir}/libdepth_map.so
+%{_libdir}/libfhs.so
+%{_libdir}/libgeml.so
+%{_libdir}/libgevd.so
+%{_libdir}/libgmvl.so
+%{_libdir}/libgst.so
+%{_libdir}/libgtrl.so
+%{_libdir}/libicam.so
+%{_libdir}/libicam_pro.so
+%{_libdir}/libihog.so
+%{_libdir}/libihog_pro.so
+%{_libdir}/libimesh.so
+%{_libdir}/libimesh_algo.so
+%{_libdir}/libipts.so
+%{_libdir}/libm23d.so
+%{_libdir}/libmbl.so
+%{_libdir}/libmcal.so
+%{_libdir}/libmfpf.so
+%{_libdir}/libmipa.so
 %{_libdir}/libmmn.so
 %{_libdir}/libmsdi.so
 %{_libdir}/libmsm.so
 %{_libdir}/libmsm_utils.so
 %{_libdir}/libmvl.so
 %{_libdir}/libmvl2.so
+%{_libdir}/libopenjpeg2.so
 %{_libdir}/libosl.so
 %{_libdir}/libouel.so
 %{_libdir}/libouml.so
@@ -803,16 +789,32 @@ ctest %{_vpath_builddir} || exit 0
 %{_libdir}/librrel.so
 %{_libdir}/librsdl.so
 %{_libdir}/libsdet.so
+%{_libdir}/libsdet_algo.so
 %{_libdir}/libsdet_pro.so
+%{_libdir}/libtestlib.so
+%{_libdir}/libv3p_netlib.so
+%{_libdir}/libvbl.so
+%{_libdir}/libvbl_io.so
+%{_libdir}/libvcl.so
 %{_libdir}/libvcon_pro.so
+%{_libdir}/libvcsl.so
 %{_libdir}/libvdgl.so
 %{_libdir}/libvdtop.so
 %{_libdir}/libvepl.so
+%{_libdir}/libvgl.so
+%{_libdir}/libvgl_algo.so
+%{_libdir}/libvgl_io.so
+%{_libdir}/libvgl_xio.so
+%{_libdir}/libvidl.so
 %{_libdir}/libvidl_pro.so
 %{_libdir}/libvifa.so
+%{_libdir}/libvil.so
+%{_libdir}/libvil1.so
 %{_libdir}/libvil3d.so
 %{_libdir}/libvil3d_algo.so
 %{_libdir}/libvil3d_io.so
+%{_libdir}/libvil_algo.so
+%{_libdir}/libvil_io.so
 %{_libdir}/libvil_pro.so
 %{_libdir}/libvimt.so
 %{_libdir}/libvimt3d.so
@@ -820,17 +822,32 @@ ctest %{_vpath_builddir} || exit 0
 %{_libdir}/libvipl.so
 %{_libdir}/libvmal.so
 %{_libdir}/libvmap.so
+%{_libdir}/libvnl.so
+%{_libdir}/libvnl_algo.so
+%{_libdir}/libvnl_io.so
+%{_libdir}/libvnl_xio.so
 %{_libdir}/libvolm.so
 %{_libdir}/libvolm_conf.so
 %{_libdir}/libvolm_desc.so
 %{_libdir}/libvolm_pro.so
 %{_libdir}/libvpdfl.so
+%{_libdir}/libvpdl.so
+%{_libdir}/libvpgl.so
+%{_libdir}/libvpgl_algo.so
+%{_libdir}/libvpgl_file_formats.so
+%{_libdir}/libvpgl_io.so
 %{_libdir}/libvpgl_pro.so
+%{_libdir}/libvpgl_xio.so
+%{_libdir}/libvpl.so
 %{_libdir}/libvpyr.so
+%{_libdir}/libvsl.so
 %{_libdir}/libvsol.so
 %{_libdir}/libvsph.so
 %{_libdir}/libvtol.so
 %{_libdir}/libvtol_algo.so
+%{_libdir}/libvul.so
+%{_libdir}/libvul_io.so
+
 
 %files doc
 %doc core/vxl_copyright.h

From 7a00e69f68e26f5e815223c98c9217f4ae6bd417 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 2 Oct 2024 13:58:31 +0100
Subject: [PATCH 61/74] feat: update licenses, and remove obsolete spec
 commands

---
 ...tch => 0010-v3.5.0-more-linker-fixes.patch |   5 +-
 0011-v3.5.0-fix-for-gcc11.patch               |   2 +-
 0012-v3.5.0-link-against-acal.patch           |   2 +-
 ...ch => 0013-v3.5.0-more-linkage-fixes.patch |   4 +-
 ...-use-system-zlib-tiff-minizip-compat.patch |   2 +-
 0015-v3.5.0-fix-linking.patch                 |   2 +-
 0016-v3.5.0-fix-linking.patch                 |   2 +-
 ...xm2-processes-that-use-sdnet-that-re.patch |   2 +-
 licenses.txt                                  | 245 ++++++++++++++++++
 vxl.spec                                      |  54 ++--
 10 files changed, 277 insertions(+), 43 deletions(-)
 rename 0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch => 0010-v3.5.0-more-linker-fixes.patch (82%)
 rename 0013-meh.patch => 0013-v3.5.0-more-linkage-fixes.patch (90%)
 create mode 100644 licenses.txt

diff --git a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch b/0010-v3.5.0-more-linker-fixes.patch
similarity index 82%
rename from 0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
rename to 0010-v3.5.0-more-linker-fixes.patch
index 13f1bc5..74f79a0 100644
--- a/0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
+++ b/0010-v3.5.0-more-linker-fixes.patch
@@ -1,9 +1,8 @@
-From 01cc01d9f11380ee872b8d3b9868dfd8a2f5d9ab Mon Sep 17 00:00:00 2001
+From c45defc6a27e344f7d3f69dde806d4b187e2aa27 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 15:55:38 +0100
-Subject: [PATCH 10/17] Revert "remove dependency on brdb by imesh lib"
+Subject: [PATCH 10/17] v3.5.0: more linker fixes
 
-This reverts commit fb7582a4a0509a82bd99fd1636ba00ca16279847.
 ---
  contrib/brl/bbas/imesh/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/0011-v3.5.0-fix-for-gcc11.patch b/0011-v3.5.0-fix-for-gcc11.patch
index 4b5bf3c..f6714f3 100644
--- a/0011-v3.5.0-fix-for-gcc11.patch
+++ b/0011-v3.5.0-fix-for-gcc11.patch
@@ -1,4 +1,4 @@
-From 9b6cd29a9ef87c7e221ba00987e6aa29b68a902f Mon Sep 17 00:00:00 2001
+From 690e4102939836f82afb83bba6120698403fcd43 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 17:05:04 +0100
 Subject: [PATCH 11/17] v3.5.0: fix for gcc11
diff --git a/0012-v3.5.0-link-against-acal.patch b/0012-v3.5.0-link-against-acal.patch
index b59977a..af1c44c 100644
--- a/0012-v3.5.0-link-against-acal.patch
+++ b/0012-v3.5.0-link-against-acal.patch
@@ -1,4 +1,4 @@
-From bb9879544a1e180c1a2f2f3b4aa3241d4fed1f27 Mon Sep 17 00:00:00 2001
+From 0cee9d18cd8a652145684ac0c74d905b810e5e0c Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 24 Oct 2023 12:16:41 +0100
 Subject: [PATCH 12/17] v3.5.0: link against acal
diff --git a/0013-meh.patch b/0013-v3.5.0-more-linkage-fixes.patch
similarity index 90%
rename from 0013-meh.patch
rename to 0013-v3.5.0-more-linkage-fixes.patch
index 3ef0616..f81eba1 100644
--- a/0013-meh.patch
+++ b/0013-v3.5.0-more-linkage-fixes.patch
@@ -1,7 +1,7 @@
-From 67a426448277f57dd1f8ad97ebf72ca01f74ff10 Mon Sep 17 00:00:00 2001
+From 2757969a8b0e55c2310d50ef4764d3f81ce1d748 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 24 Oct 2023 13:50:37 +0100
-Subject: [PATCH 13/17] meh
+Subject: [PATCH 13/17] v3.5.0: more linkage fixes
 
 ---
  contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt | 2 +-
diff --git a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
index d55dfb6..f65f455 100644
--- a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
+++ b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
@@ -1,4 +1,4 @@
-From 7c3a087b1484dad20f5ff098f4e3daceffc82e0b Mon Sep 17 00:00:00 2001
+From ea6a4cc7095db5e98728849f6db505952704ca37 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 22 Jan 2024 11:40:35 +0000
 Subject: [PATCH 14/17] v3.5.0: use system zlib, tiff, minizip-compat
diff --git a/0015-v3.5.0-fix-linking.patch b/0015-v3.5.0-fix-linking.patch
index 06f6c57..ed88319 100644
--- a/0015-v3.5.0-fix-linking.patch
+++ b/0015-v3.5.0-fix-linking.patch
@@ -1,4 +1,4 @@
-From c6b2dec1bb09ef0d7fac89a6a2f74d85fa9b36bc Mon Sep 17 00:00:00 2001
+From 4f74f5343ff3595872d045c4bf5025e347d18438 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 23 Jan 2024 16:54:51 +0000
 Subject: [PATCH 15/17] v3.5.0: fix linking
diff --git a/0016-v3.5.0-fix-linking.patch b/0016-v3.5.0-fix-linking.patch
index 647f368..ed3d3e6 100644
--- a/0016-v3.5.0-fix-linking.patch
+++ b/0016-v3.5.0-fix-linking.patch
@@ -1,4 +1,4 @@
-From 87e0e8fa35cfb7c5e4048827771f18cf83d5f6e1 Mon Sep 17 00:00:00 2001
+From 4de179f888a8c0ce9bbec7a63c4e86015598a809 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 1 Oct 2024 16:00:35 +0100
 Subject: [PATCH 16/17] v3.5.0: fix linking
diff --git a/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch b/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
index dad0d61..df64d59 100644
--- a/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
+++ b/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
@@ -1,4 +1,4 @@
-From b06c0578f573eae423663151cd9dee7f8316169f Mon Sep 17 00:00:00 2001
+From a002d34fee7a0c86de360de5792dbffbbb5255d9 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 1 Oct 2024 16:26:23 +0100
 Subject: [PATCH 17/17] v3.5.0: remove boxm2 processes that use sdnet that
diff --git a/licenses.txt b/licenses.txt
new file mode 100644
index 0000000..eeb2b84
--- /dev/null
+++ b/licenses.txt
@@ -0,0 +1,245 @@
+# remove bits unbundled and removed in patches and run
+# licensecheck -r . | sed '/UNKNOWN/ d'
+
+# To get a list, run:
+# cat licenses.txt | grep -Ev "^#" | cut -d: -f2 | sort -u
+
+# additional notes on licenses below (also commented by starting line with #):
+
+./core/vxl_copyright.h: BSD 3-Clause License
+./vcl/vcl_atomic_count.h: Boost Software License 1.0
+./config/cmake/CodeCoverage.cmake: BSD 3-Clause License
+./core/vbl/vbl_checked_delete.h: NTP License
+./core/vbl/vbl_disjoint_sets.h: *No copyright* MIT License
+./core/vbl/vbl_scoped_ptr.h: NTP License
+./core/vul/vul_ios_state.h: Boost Software License 1.0
+./scripts/gitsetup/LICENSE: *No copyright* Apache License 2.0
+./scripts/gitsetup/README: *No copyright* Apache License 2.0
+./scripts/gitsetup/git-gerrit-push: Apache License 2.0
+./scripts/gitsetup/setup-gerrit: Apache License 2.0
+./scripts/gitsetup/setup-hooks: Apache License 2.0
+./scripts/gitsetup/setup-sourceforge: Apache License 2.0
+./scripts/gitsetup/setup-ssh: Apache License 2.0
+./scripts/gitsetup/setup-stage: Apache License 2.0
+./scripts/gitsetup/setup-user: Apache License 2.0
+./scripts/gitsetup/tips: Apache License 2.0
+./v3p/clipper/License.txt: *No copyright* Boost Software License 1.0
+./v3p/clipper/clipper.cpp: Boost Software License
+./v3p/clipper/clipper.hxx: Boost Software License
+./v3p/openjpeg2/bio.c: BSD 2-Clause License
+./v3p/openjpeg2/bio.h: BSD 2-Clause License
+./v3p/openjpeg2/cio.c: BSD 2-Clause License
+./v3p/openjpeg2/cio.h: BSD 2-Clause License
+./v3p/openjpeg2/dwt.c: BSD 2-Clause License
+./v3p/openjpeg2/dwt.h: BSD 2-Clause License
+./v3p/openjpeg2/event.c: BSD 2-Clause License
+./v3p/openjpeg2/event.h: BSD 2-Clause License
+./v3p/openjpeg2/fix.h: BSD 2-Clause License
+./v3p/openjpeg2/function_list.c: BSD 2-Clause License
+./v3p/openjpeg2/function_list.h: BSD 2-Clause License
+./v3p/openjpeg2/image.c: BSD 2-Clause License
+./v3p/openjpeg2/image.h: BSD 2-Clause License
+./v3p/openjpeg2/int.h: BSD 2-Clause License
+./v3p/openjpeg2/invert.c: BSD 2-Clause License
+./v3p/openjpeg2/invert.h: BSD 2-Clause License
+./v3p/openjpeg2/j2k.c: BSD 2-Clause License
+./v3p/openjpeg2/j2k.h: BSD 2-Clause License
+./v3p/openjpeg2/j2k_lib.c: BSD 2-Clause License
+./v3p/openjpeg2/j2k_lib.h: BSD 2-Clause License
+./v3p/openjpeg2/jp2.c: BSD 2-Clause License
+./v3p/openjpeg2/jp2.h: BSD 2-Clause License
+./v3p/openjpeg2/jpt.c: BSD 2-Clause License
+./v3p/openjpeg2/jpt.h: BSD 2-Clause License
+./v3p/openjpeg2/license.txt: BSD 2-Clause License
+./v3p/openjpeg2/mct.c: BSD 2-Clause License
+./v3p/openjpeg2/mct.h: BSD 2-Clause License
+./v3p/openjpeg2/mqc.c: BSD 2-Clause License
+./v3p/openjpeg2/mqc.h: BSD 2-Clause License
+./v3p/openjpeg2/openjpeg.c: BSD 2-Clause License
+./v3p/openjpeg2/openjpeg.h: BSD 2-Clause License
+./v3p/openjpeg2/opj_includes.h: BSD 2-Clause License
+./v3p/openjpeg2/opj_malloc.h: BSD 2-Clause License
+./v3p/openjpeg2/pi.c: BSD 2-Clause License
+./v3p/openjpeg2/pi.h: BSD 2-Clause License
+./v3p/openjpeg2/profile.c: BSD 2-Clause License
+./v3p/openjpeg2/profile.h: BSD 2-Clause License
+./v3p/openjpeg2/raw.c: BSD 2-Clause License
+./v3p/openjpeg2/raw.h: BSD 2-Clause License
+./v3p/openjpeg2/t1.c: BSD 2-Clause License
+./v3p/openjpeg2/t1.h: BSD 2-Clause License
+./v3p/openjpeg2/t2.c: BSD 2-Clause License
+./v3p/openjpeg2/t2.h: BSD 2-Clause License
+./v3p/openjpeg2/tcd.c: BSD 2-Clause License
+./v3p/openjpeg2/tcd.h: BSD 2-Clause License
+./v3p/openjpeg2/tgt.c: BSD 2-Clause License
+./v3p/openjpeg2/tgt.h: BSD 2-Clause License
+./vcl/internal/vcl_atomic_count_gcc.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_gcc_x86.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_pthreads.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_solaris.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_sync.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_win32.h: Boost Software License 1.0
+./vcl/internal/vcl_interlocked.h: Boost Software License 1.0
+./contrib/rpl/rgtl/CMakeLists.txt: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_data_fixed.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_index.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_link.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_node_data.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_policy.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_config.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_license_1_0.txt: *No copyright* Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_meta.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_points.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_points.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_triangles_3d.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_triangles_3d.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_closest_polygon_3d.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_once.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_once.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_bounds.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_bounds.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_geometry.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_geometry.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_location.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_data_fixed.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_data_fixed.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_element.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_index.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_visit.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_objects.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_objects.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_point_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_point_location.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_separating_axis.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_separating_axis_projection.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize.txt: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_access.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_base.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_direction.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_istream.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_istream.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_ostream.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_ostream.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_split.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_stl_vector.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_vnl_double_3.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_vnl_vector_fixed.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_base.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_base.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_bounds.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_bounds.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_geometry.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_geometry.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_location.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_object_array.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_object_array_triangles_3d.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_object_array_triangles_3d.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_objects.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_objects.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_space.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_space.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_static_assert.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_tagged_index.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_tagged_vector.h: Boost Software License 1.0
+./contrib/rpl/rtvl/CMakeLists.txt: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_intpow.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_license_1_0.txt: *No copyright* Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_refine.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_refine.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor_d.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor_d.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_terms.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tokens.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_vote.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_vote.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee_d.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee_d.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_voter.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_voter.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_original.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_original.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_smooth.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_smooth.hxx: Boost Software License 1.0
+./core/doc/book/chapter_vnl.texi: *No copyright* Public domain
+./core/vil/file_formats/viffheader.h.original: NTP License (legal disclaimer)
+./core/vil/file_formats/vil_viffheader.h: NTP License (legal disclaimer)
+./core/vil1/file_formats/vil1_viff_support.c: NTP License (legal disclaimer)
+./core/vil1/file_formats/vil1_viffheader.h: NTP License (legal disclaimer)
+./v3p/netlib/libf2c/Notice: Standard ML of New Jersey License
+./v3p/netlib/libf2c/arithchk.c: Standard ML of New Jersey License
+./v3p/netlib/linalg/lsmrBase.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsmrBase.h: Apache License 2.0
+./v3p/netlib/linalg/lsmrDense.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsmrDense.h: Apache License 2.0
+./v3p/netlib/linalg/lsqrBase.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsqrBase.h: Apache License 2.0
+./v3p/netlib/linalg/lsqrDense.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsqrDense.h: Apache License 2.0
+./v3p/netlib/tests/lsmrTest2.cxx: Apache License 2.0
+./v3p/netlib/tests/lsqrTest1.cxx: Apache License 2.0
+./v3p/netlib/tests/lsqrTest2.cxx: Apache License 2.0
+./v3p/netlib/tests/tricall.c: *No copyright* Public domain
+./contrib/brl/bbas/bjson/bjsoncpp.cxx: MIT License
+./contrib/brl/bbas/bjson/jsoncpp.cxx: MIT License
+./contrib/brl/bbas/bnabo/bnabo.cxx: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo.h: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_brute_force.cxx: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_index_heap.h: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_kdd_tree.cxx: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_private.h: BSD 3-Clause License
+./contrib/mul/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
+./contrib/rpl/rgtl/tests/CMakeLists.txt: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_compact_tree_data_fixed.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_driver.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_octree_data_fixed.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_octree_dual_visit.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_octree_objects.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_sqt_base.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_refine+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_refine+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor_d+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor_d+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_vote+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_vote+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee_d+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee_d+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_voter+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_voter+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_original+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_original+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_smooth+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_smooth+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/examples/rtvl_hello.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/examples/rtvl_saliency_image.cxx: Boost Software License 1.0
+./contrib/tbl/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
+./v3p/dcmtk/ofstd/libsrc/ofstd.cxx: BSD 3-Clause License and/or NTP License
+
+./contrib/brl/bbas/bil/algo/bil_edt.h: *No copyright* GNU Lesser General Public License [generated file]
+# ^
+# Not under this license. The text says:
+# //  Implementation influenced by the LTI lib, which is licensed under LGPL:
+# //    http://ltilib.sourceforge.net
+
+./contrib/brl/bseg/boxm2/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.cookie-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.disabletextselect-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.mousewheel-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.reel-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/miniZoomPan.js: *No copyright* MIT License
diff --git a/vxl.spec b/vxl.spec
index 3b89c8b..3c61d52 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -9,8 +9,11 @@ Name:       vxl
 Version:    3.5.0
 Release:    %autorelease
 Summary:    C++ Libraries for Computer Vision Research and Implementation
-# Automatically converted from old format: BSD - review is highly recommended.
-License:    LicenseRef-Callaway-BSD
+
+# see licenses.txt for a complete break down of licenses (using licensecheck)
+# other licenses are not included because the files they refer to are not used/included in our build
+License:    BSD-3-Clause and NTP and BSL-1.0 and BSD-2-Clause and MIT and Apache-2.0 and LicenseRef-Fedora-Public-Domain and SMLNJ
+
 URL:        https://vxl.github.io/
 # Need to remove the non-free lena image from the sources
 # tar xf vxl-%%{version}.tar.gz
@@ -37,16 +40,17 @@ Patch:     0009-v3.5.0-indent-to-keep-gcc-happy.patch
 # gmake[2]: *** [contrib/brl/bseg/baml/tests/CMakeFiles/baml_test_all.dir/build.make:172: bin/baml_test_all] Error 1
 # gmake[2]: Leaving directory '/builddir/build/BUILD/vxl-3.5.0/redhat-linux-build'
 # gmake[1]: *** [CMakeFiles/Makefile2:46025: contrib/brl/bseg/baml/tests/CMakeFiles/baml_test_all.dir/all] Error 2
-Patch:     0010-Revert-remove-dependency-on-brdb-by-imesh-lib.patch
+Patch:     0010-v3.5.0-more-linker-fixes.patch
 
 # Fix missing #include caught by gcc-11
 Patch:     0011-v3.5.0-fix-for-gcc11.patch
 # For linker error
 Patch:     0012-v3.5.0-link-against-acal.patch
-Patch:     0013-meh.patch
+Patch:     0013-v3.5.0-more-linkage-fixes.patch
 Patch:     0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
 Patch:     0015-v3.5.0-fix-linking.patch
 Patch:     0016-v3.5.0-fix-linking.patch
+# remove more bits that used triangle
 Patch:     0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
 
 BuildRequires:  cmake
@@ -58,9 +62,11 @@ BuildRequires:  freeglut-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  git
+
 # Use bundled dcmtk until upstream updates their code to use newer dcmtk
 # https://github.com/vxl/vxl/issues/550
 # BuildRequires:  dcmtk-devel
+
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXmu-devel
@@ -72,9 +78,13 @@ BuildRequires:  libdc1394-devel
 BuildRequires:  libgeotiff-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  minizip-ng-compat-devel
+
 # Does not build with latest version
 # https://github.com/vxl/vxl/issues/627
 # BuildRequires:  openjpeg2-devel
+# Bundled
+Provides:  bundled(libopenjpeg2) = 2.0.0
+
 
 # Py2 only from the looks of it
 # BuildRequires:  python3-devel
@@ -85,9 +95,6 @@ BuildRequires:  shapelib-devel
 BuildRequires:  texi2html
 BuildRequires:  zlib-ng-compat-devel
 
-# Bundled
-Provides:  bundled(libopenjpeg2) = 2.0.0
-
 #GUI needs wx, a desktop file and an icon
 
 %description
@@ -119,32 +126,18 @@ develop code based on VXL.
 %prep
 %autosetup -S git
 
-# Remove bundled library (let's use FEDORA's ones)
-# v3p/netlib (made by f2c) dependency not removed because of heavily modifications
-# QV is a Silicon Graphics' VRML parser from the 90s. Now unmantained.
+# remove bundled bits
+# triangle removed in patch (bad license: https://github.com/vxl/vxl/issues/752#issuecomment-655526696)
 
-# Bundled: dcmtk
-# Requires VXL_FORCE_V3P_DCMTK:BOOL=TRUE
-
-# Also bundled: openjpeg2
-# Requires VXL_FORCE_V3P_OPENJPEG2:BOOL=TRUE \
-# Also may be needed
-# -DOPENJPEG2_INCLUDE_DIR:PATH=%%{_includedir}/openjpeg-2.3 \
-# -DOPENJPEG2_LIBRARIES:PATH=%%{_libdir}/libopenjp2.so \
-
-
-# for l in jpeg png zlib tiff geotiff rply dcmtk bzlib openjpeg2
+# remove other bits, only leave CMakeLists.txt
 for l in jpeg png zlib tiff geotiff bzlib
 do
-    find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm {} +
+    find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
 done
-
-find contrib/brl/b3p/shapelib -type f ! -name 'CMakeLists.txt' -execdir rm {} +
-find contrib/brl/b3p/minizip -type f ! -name 'CMakeLists.txt' -execdir rm {} +
-find contrib/brl/b3p/expat -type f ! -name 'CMakeLists.txt' -execdir rm {} +
-find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
-
-# v3p/mpeg2 lib in fedora is not enough to build the target. Moreover it is in rpmfusion repo
+find contrib/brl/b3p/shapelib -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
+find contrib/brl/b3p/minizip -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
+find contrib/brl/b3p/expat -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
+find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
 
 # Fix executable permissions on source file
 # not using "." for find since it sometimes crashes within the .git folder
@@ -154,9 +147,6 @@ for f in config contrib core scripts v3p vcl; do
     find $f -name "*.txx" -execdir chmod -x '{}' \;
 done
 
-# Do not use bundled minizip
-sed -i '/add_subdirectory(minizip)/ d' contrib/brl/b3p/CMakeLists.txt
-
 %build
 %cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
     -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{_datadir}/%{name} \

From 0b24cce484f1c61b1d2ba21737ccd1a14fae90cd Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 2 Oct 2024 13:59:54 +0100
Subject: [PATCH 62/74] chore: remove ldconfig call

---
 vxl.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index 3c61d52..f5d76fc 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -222,8 +222,6 @@ rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 # 968 - vifa_test_int_faces_adj_attr (Child aborted)
 ctest %{_vpath_builddir} || exit 0
 
-%ldconfig_scriptlets
-
 %files
 %doc core/vxl_copyright.h
 %{_bindir}/octree

From eddbf360f8ad7c4a60781269da2fb3bd5b3e5c2e Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 2 Oct 2024 15:47:11 +0100
Subject: [PATCH 63/74] fix: enable tests, update list of skipped ones

---
 0001-v3.5.0-unbundle-rply.patch               |  2 +-
 ...-v3.5.0-Use-Fedora-expat-and-expatpp.patch |  2 +-
 0003-v3.5.0-Use-Fedora-minizip.patch          |  2 +-
 ...v3.5.0-Add-cmake-module-to-find-RPLY.patch |  2 +-
 0005-v3.5.0-fix-bkml-test.patch               |  2 +-
 0006-v3.5.0-Correct-rply-includedir.patch     |  2 +-
 0007-v3.5.0-remove-triangle.patch             |  2 +-
 0008-v3.5.0-remove-bits-using-triangle.patch  |  2 +-
 0009-v3.5.0-indent-to-keep-gcc-happy.patch    |  2 +-
 0010-v3.5.0-more-linker-fixes.patch           |  2 +-
 0011-v3.5.0-fix-for-gcc11.patch               |  2 +-
 0012-v3.5.0-link-against-acal.patch           |  2 +-
 0013-v3.5.0-more-linkage-fixes.patch          |  2 +-
 ...-use-system-zlib-tiff-minizip-compat.patch |  2 +-
 0015-v3.5.0-fix-linking.patch                 |  2 +-
 0016-v3.5.0-fix-linking.patch                 |  2 +-
 ...xm2-processes-that-use-sdnet-that-re.patch |  2 +-
 ...-chore-remove-ctest-dashboard-config.patch | 43 +++++++++++++++++++
 vxl.spec                                      | 18 +++++---
 19 files changed, 71 insertions(+), 24 deletions(-)
 create mode 100644 0018-chore-remove-ctest-dashboard-config.patch

diff --git a/0001-v3.5.0-unbundle-rply.patch b/0001-v3.5.0-unbundle-rply.patch
index 264671a..de56a11 100644
--- a/0001-v3.5.0-unbundle-rply.patch
+++ b/0001-v3.5.0-unbundle-rply.patch
@@ -1,7 +1,7 @@
 From b7944a8898b3a1aef606cf6f4047dcf11aca11a6 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 01/17] v3.5.0: unbundle rply
+Subject: [PATCH 01/18] v3.5.0: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
diff --git a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
index c709024..37c28aa 100644
--- a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
+++ b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
@@ -1,7 +1,7 @@
 From 26d548e302e9fa1bcc2986ba91f12313ccb00829 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 02/17] v3.5.0 Use Fedora expat and expatpp
+Subject: [PATCH 02/18] v3.5.0 Use Fedora expat and expatpp
 
 ---
  CMakeLists.txt                                |  2 +
diff --git a/0003-v3.5.0-Use-Fedora-minizip.patch b/0003-v3.5.0-Use-Fedora-minizip.patch
index c6b5784..6b155e9 100644
--- a/0003-v3.5.0-Use-Fedora-minizip.patch
+++ b/0003-v3.5.0-Use-Fedora-minizip.patch
@@ -1,7 +1,7 @@
 From c0cc5459f8ee3dfc40cefb26487a1449d5100d8e Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 03/17] v3.5.0 Use Fedora minizip
+Subject: [PATCH 03/18] v3.5.0 Use Fedora minizip
 
 ---
  contrib/brl/b3p/CMakeLists.txt                                | 4 ----
diff --git a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
index 58325e3..b28b11e 100644
--- a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
+++ b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
@@ -1,7 +1,7 @@
 From 04c541d97aeb5ccc75615dd537e8a64c1e1f3814 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 14:11:31 +0100
-Subject: [PATCH 04/17] v3.5.0 Add cmake module to find RPLY
+Subject: [PATCH 04/18] v3.5.0 Add cmake module to find RPLY
 
 ---
  CMakeLists.txt                                |  3 +-
diff --git a/0005-v3.5.0-fix-bkml-test.patch b/0005-v3.5.0-fix-bkml-test.patch
index 1e0da3d..90dd9a0 100644
--- a/0005-v3.5.0-fix-bkml-test.patch
+++ b/0005-v3.5.0-fix-bkml-test.patch
@@ -1,7 +1,7 @@
 From 8697b5c51bf883e04634d49c45421f2776f59fd3 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 17:05:39 +0100
-Subject: [PATCH 05/17] v3.5.0 fix bkml test
+Subject: [PATCH 05/18] v3.5.0 fix bkml test
 
 ---
  contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
diff --git a/0006-v3.5.0-Correct-rply-includedir.patch b/0006-v3.5.0-Correct-rply-includedir.patch
index 3e73b66..c579c1d 100644
--- a/0006-v3.5.0-Correct-rply-includedir.patch
+++ b/0006-v3.5.0-Correct-rply-includedir.patch
@@ -1,7 +1,7 @@
 From 2252a472803e52dd504e243593f32f4312342591 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 23:32:15 +0100
-Subject: [PATCH 06/17] v3.5.0 Correct rply includedir
+Subject: [PATCH 06/18] v3.5.0 Correct rply includedir
 
 ---
  contrib/brl/bbas/bvrml/pro/CMakeLists.txt      |  8 +++++++-
diff --git a/0007-v3.5.0-remove-triangle.patch b/0007-v3.5.0-remove-triangle.patch
index 1a64170..7c34082 100644
--- a/0007-v3.5.0-remove-triangle.patch
+++ b/0007-v3.5.0-remove-triangle.patch
@@ -1,7 +1,7 @@
 From 80bdd447db20e28e08adeaa35a6528957e286902 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 10:48:40 +0100
-Subject: [PATCH 07/17] v3.5.0: remove triangle
+Subject: [PATCH 07/18] v3.5.0: remove triangle
 
 Reference:
 https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files
diff --git a/0008-v3.5.0-remove-bits-using-triangle.patch b/0008-v3.5.0-remove-bits-using-triangle.patch
index 69bb312..e4e8a22 100644
--- a/0008-v3.5.0-remove-bits-using-triangle.patch
+++ b/0008-v3.5.0-remove-bits-using-triangle.patch
@@ -1,7 +1,7 @@
 From da8df48049aa20240103f6da054d5245faa88c04 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 11:31:49 +0100
-Subject: [PATCH 08/17] v3.5.0: remove bits using triangle
+Subject: [PATCH 08/18] v3.5.0: remove bits using triangle
 
 ---
  contrib/brl/bbas/imesh/algo/CMakeLists.txt    |  11 -
diff --git a/0009-v3.5.0-indent-to-keep-gcc-happy.patch b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
index 39742da..a743690 100644
--- a/0009-v3.5.0-indent-to-keep-gcc-happy.patch
+++ b/0009-v3.5.0-indent-to-keep-gcc-happy.patch
@@ -1,7 +1,7 @@
 From 303abcb68bcc14b04d73460d25d8e4978e5b3617 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 13:27:34 +0100
-Subject: [PATCH 09/17] v3.5.0: indent to keep gcc happy
+Subject: [PATCH 09/18] v3.5.0: indent to keep gcc happy
 
 ---
  core/vpgl/vpgl_tri_focal_tensor.h | 3 ++-
diff --git a/0010-v3.5.0-more-linker-fixes.patch b/0010-v3.5.0-more-linker-fixes.patch
index 74f79a0..53c9fcc 100644
--- a/0010-v3.5.0-more-linker-fixes.patch
+++ b/0010-v3.5.0-more-linker-fixes.patch
@@ -1,7 +1,7 @@
 From c45defc6a27e344f7d3f69dde806d4b187e2aa27 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 15:55:38 +0100
-Subject: [PATCH 10/17] v3.5.0: more linker fixes
+Subject: [PATCH 10/18] v3.5.0: more linker fixes
 
 ---
  contrib/brl/bbas/imesh/CMakeLists.txt | 4 ++--
diff --git a/0011-v3.5.0-fix-for-gcc11.patch b/0011-v3.5.0-fix-for-gcc11.patch
index f6714f3..7d62d4e 100644
--- a/0011-v3.5.0-fix-for-gcc11.patch
+++ b/0011-v3.5.0-fix-for-gcc11.patch
@@ -1,7 +1,7 @@
 From 690e4102939836f82afb83bba6120698403fcd43 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 23 Oct 2023 17:05:04 +0100
-Subject: [PATCH 11/17] v3.5.0: fix for gcc11
+Subject: [PATCH 11/18] v3.5.0: fix for gcc11
 
 ---
  .../brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx    | 1 +
diff --git a/0012-v3.5.0-link-against-acal.patch b/0012-v3.5.0-link-against-acal.patch
index af1c44c..6a791c8 100644
--- a/0012-v3.5.0-link-against-acal.patch
+++ b/0012-v3.5.0-link-against-acal.patch
@@ -1,7 +1,7 @@
 From 0cee9d18cd8a652145684ac0c74d905b810e5e0c Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 24 Oct 2023 12:16:41 +0100
-Subject: [PATCH 12/17] v3.5.0: link against acal
+Subject: [PATCH 12/18] v3.5.0: link against acal
 
 To fix:
 ```
diff --git a/0013-v3.5.0-more-linkage-fixes.patch b/0013-v3.5.0-more-linkage-fixes.patch
index f81eba1..ad6cc56 100644
--- a/0013-v3.5.0-more-linkage-fixes.patch
+++ b/0013-v3.5.0-more-linkage-fixes.patch
@@ -1,7 +1,7 @@
 From 2757969a8b0e55c2310d50ef4764d3f81ce1d748 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 24 Oct 2023 13:50:37 +0100
-Subject: [PATCH 13/17] v3.5.0: more linkage fixes
+Subject: [PATCH 13/18] v3.5.0: more linkage fixes
 
 ---
  contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt | 2 +-
diff --git a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
index f65f455..ee8fbbc 100644
--- a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
+++ b/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
@@ -1,7 +1,7 @@
 From ea6a4cc7095db5e98728849f6db505952704ca37 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Mon, 22 Jan 2024 11:40:35 +0000
-Subject: [PATCH 14/17] v3.5.0: use system zlib, tiff, minizip-compat
+Subject: [PATCH 14/18] v3.5.0: use system zlib, tiff, minizip-compat
 
 ---
  contrib/brl/bseg/bmdl/CMakeLists.txt     | 7 +++++++
diff --git a/0015-v3.5.0-fix-linking.patch b/0015-v3.5.0-fix-linking.patch
index ed88319..91cdb04 100644
--- a/0015-v3.5.0-fix-linking.patch
+++ b/0015-v3.5.0-fix-linking.patch
@@ -1,7 +1,7 @@
 From 4f74f5343ff3595872d045c4bf5025e347d18438 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 23 Jan 2024 16:54:51 +0000
-Subject: [PATCH 15/17] v3.5.0: fix linking
+Subject: [PATCH 15/18] v3.5.0: fix linking
 
 ---
  contrib/brl/bpro/core/brip_pro/CMakeLists.txt | 2 +-
diff --git a/0016-v3.5.0-fix-linking.patch b/0016-v3.5.0-fix-linking.patch
index ed3d3e6..02410cf 100644
--- a/0016-v3.5.0-fix-linking.patch
+++ b/0016-v3.5.0-fix-linking.patch
@@ -1,7 +1,7 @@
 From 4de179f888a8c0ce9bbec7a63c4e86015598a809 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 1 Oct 2024 16:00:35 +0100
-Subject: [PATCH 16/17] v3.5.0: fix linking
+Subject: [PATCH 16/18] v3.5.0: fix linking
 
 ---
  contrib/brl/bpro/core/vil_pro/CMakeLists.txt | 3 ++-
diff --git a/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch b/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
index df64d59..1c58efb 100644
--- a/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
+++ b/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
@@ -1,7 +1,7 @@
 From a002d34fee7a0c86de360de5792dbffbbb5255d9 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Tue, 1 Oct 2024 16:26:23 +0100
-Subject: [PATCH 17/17] v3.5.0: remove boxm2 processes that use sdnet that
+Subject: [PATCH 17/18] v3.5.0: remove boxm2 processes that use sdnet that
  require triangle
 
 ---
diff --git a/0018-chore-remove-ctest-dashboard-config.patch b/0018-chore-remove-ctest-dashboard-config.patch
new file mode 100644
index 0000000..e43d5b3
--- /dev/null
+++ b/0018-chore-remove-ctest-dashboard-config.patch
@@ -0,0 +1,43 @@
+From 99f96d0e6d18996ad58d34998d08f022585ae77b Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Wed, 2 Oct 2024 14:39:51 +0100
+Subject: [PATCH 18/18] chore: remove ctest dashboard config
+
+---
+ CMakeLists.txt    | 4 ----
+ CTestConfig.cmake | 8 --------
+ 2 files changed, 12 deletions(-)
+ delete mode 100644 CTestConfig.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e1aa0390d4..810a1f4b21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -322,10 +322,6 @@ configure_file( ${VXL_CMAKE_DIR}/UseVXL.cmake
+ # For use in client projects that call UseVXL.cmake
+ set(VXL_LIBRARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE STATIC "Where all the vxl libraries are, for clients to use." )
+ 
+-# Copy CTestCustom.cmake to top of build tree
+-configure_file( ${VXL_CMAKE_DIR}/CTestCustom.cmake
+-  ${VXL_BINARY_DIR}/CTestCustom.cmake COPYONLY )
+-
+ # This command must be the last command in this file
+ if(NOT VXL_NO_EXPORT)
+   include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/export/VXLCreateProject.cmake)
+diff --git a/CTestConfig.cmake b/CTestConfig.cmake
+deleted file mode 100644
+index f2620f7bf6..0000000000
+--- a/CTestConfig.cmake
++++ /dev/null
+@@ -1,8 +0,0 @@
+-# CTest Configuration for VXL
+-set(CTEST_PROJECT_NAME "VXL")
+-set(CTEST_NIGHTLY_START_TIME "22:00:00 EST")
+-
+-set(CTEST_DROP_METHOD "http")
+-set(CTEST_DROP_SITE "open.cdash.org")
+-set(CTEST_DROP_LOCATION "/submit.php?project=vxl")
+-set(CTEST_DROP_SITE_CDASH TRUE)
+-- 
+2.46.1
+
diff --git a/vxl.spec b/vxl.spec
index f5d76fc..dabecf0 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -52,6 +52,8 @@ Patch:     0015-v3.5.0-fix-linking.patch
 Patch:     0016-v3.5.0-fix-linking.patch
 # remove more bits that used triangle
 Patch:     0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
+# remove ctest dashboard config
+Patch:     0018-chore-remove-ctest-dashboard-config.patch
 
 BuildRequires:  cmake
 BuildRequires:  Coin2-devel
@@ -214,13 +216,15 @@ done
 rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 
 %check
-# 5/985 fail:
-# 713 - bil_algo_test_detect_ridges (SEGFAULT)
-# 781 - bkml_test_bkml (Child aborted)
-# 801 - volm_test_candidate_region_parser (Child aborted)
-# 967 - vifa_test_int_faces_attr (Child aborted)
-# 968 - vifa_test_int_faces_adj_attr (Child aborted)
-ctest %{_vpath_builddir} || exit 0
+# 99% tests passed, 5 tests failed out of 997
+# Total Test time (real) =  23.64 sec
+# The following tests FAILED:
+#        781 - acal_test_metadata (Failed)
+#        816 - bkml_test_bkml (Subprocess aborted)
+#        836 - volm_test_candidate_region_parser (Subprocess aborted)
+#        979 - vifa_test_int_faces_attr (Subprocess aborted)
+#        980 - vifa_test_int_faces_adj_attr (Subprocess aborted)
+%ctest -E "(acal_test_metadata|bkml_test_bkml|volm_test_candidate_region_parser|vifa_test_int_faces_attr|vifa_test_int_faces_adj_attr)"
 
 %files
 %doc core/vxl_copyright.h

From 83d5ede55298e33e0bacc0b7b39bb08db46f1ef8 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 2 Oct 2024 16:52:36 +0100
Subject: [PATCH 64/74] fix: ignore non-deterministic test failures on aarch64

---
 vxl.spec | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/vxl.spec b/vxl.spec
index dabecf0..348c65c 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -216,6 +216,23 @@ done
 rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 
 %check
+# different tests fail on different arches
+
+%ifarch aarch64
+# A number of test fail, but not deterministically, e.g:
+
+#    183 - vgl_test_frustum_3d (Failed)
+#    557 - m23d_test_ortho_flexible_builder (Failed)
+#    638 - vepl_test_gradient_dir (Failed)
+#    732 - bil_test_warp (Failed)
+#    748 - vsph_test_camera_bounds (Failed)
+#    768 - icam_test_transform (Failed)
+#    812 - imesh_test_imls_surface (Failed)
+#    886 - breg3d_test_ekf_camera_optimizer (Failed)
+
+# Do not make build fail for this arch
+%ctest || true
+%else
 # 99% tests passed, 5 tests failed out of 997
 # Total Test time (real) =  23.64 sec
 # The following tests FAILED:
@@ -225,6 +242,7 @@ rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 #        979 - vifa_test_int_faces_attr (Subprocess aborted)
 #        980 - vifa_test_int_faces_adj_attr (Subprocess aborted)
 %ctest -E "(acal_test_metadata|bkml_test_bkml|volm_test_candidate_region_parser|vifa_test_int_faces_attr|vifa_test_int_faces_adj_attr)"
+%endif
 
 %files
 %doc core/vxl_copyright.h

From 510e9fe985c3208d056df3ba9e83ed28ae7e257d Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 3 Oct 2024 14:26:37 +0100
Subject: [PATCH 65/74] chore: use "AND" for licenses

[ci skip]
---
 vxl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 348c65c..42492ff 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -12,7 +12,7 @@ Summary:    C++ Libraries for Computer Vision Research and Implementation
 
 # see licenses.txt for a complete break down of licenses (using licensecheck)
 # other licenses are not included because the files they refer to are not used/included in our build
-License:    BSD-3-Clause and NTP and BSL-1.0 and BSD-2-Clause and MIT and Apache-2.0 and LicenseRef-Fedora-Public-Domain and SMLNJ
+License:    BSD-3-Clause AND NTP AND BSL-1.0 AND BSD-2-Clause AND MIT AND Apache-2.0 AND LicenseRef-Fedora-Public-Domain AND SMLNJ
 
 URL:        https://vxl.github.io/
 # Need to remove the non-free lena image from the sources

From 4840ed3b0ba919d658b310dd245e8019d25fbedb Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 3 Oct 2024 14:27:51 +0100
Subject: [PATCH 66/74] feat: exclude ix86

[ci skip]
---
 vxl.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vxl.spec b/vxl.spec
index 42492ff..b82be47 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -14,6 +14,9 @@ Summary:    C++ Libraries for Computer Vision Research and Implementation
 # other licenses are not included because the files they refer to are not used/included in our build
 License:    BSD-3-Clause AND NTP AND BSL-1.0 AND BSD-2-Clause AND MIT AND Apache-2.0 AND LicenseRef-Fedora-Public-Domain AND SMLNJ
 
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
+
 URL:        https://vxl.github.io/
 # Need to remove the non-free lena image from the sources
 # tar xf vxl-%%{version}.tar.gz

From f7d7434077848c4bbb8863561c0d8bab7854599f Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 7 Oct 2024 11:00:24 +0100
Subject: [PATCH 67/74] tests: make non x86_64 tests informative

These seem to fail non-deterministically.
---
 vxl.spec | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index b82be47..98a4101 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -221,21 +221,7 @@ rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 %check
 # different tests fail on different arches
 
-%ifarch aarch64
-# A number of test fail, but not deterministically, e.g:
-
-#    183 - vgl_test_frustum_3d (Failed)
-#    557 - m23d_test_ortho_flexible_builder (Failed)
-#    638 - vepl_test_gradient_dir (Failed)
-#    732 - bil_test_warp (Failed)
-#    748 - vsph_test_camera_bounds (Failed)
-#    768 - icam_test_transform (Failed)
-#    812 - imesh_test_imls_surface (Failed)
-#    886 - breg3d_test_ekf_camera_optimizer (Failed)
-
-# Do not make build fail for this arch
-%ctest || true
-%else
+%ifarch x86_64
 # 99% tests passed, 5 tests failed out of 997
 # Total Test time (real) =  23.64 sec
 # The following tests FAILED:
@@ -245,6 +231,19 @@ rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 #        979 - vifa_test_int_faces_attr (Subprocess aborted)
 #        980 - vifa_test_int_faces_adj_attr (Subprocess aborted)
 %ctest -E "(acal_test_metadata|bkml_test_bkml|volm_test_candidate_region_parser|vifa_test_int_faces_attr|vifa_test_int_faces_adj_attr)"
+%else
+# A number of test fail, but not deterministically on aarch and ppc64le etc, e.g:
+
+#    183 - vgl_test_frustum_3d (Failed)
+#    557 - m23d_test_ortho_flexible_builder (Failed)
+#    638 - vepl_test_gradient_dir (Failed)
+#    732 - bil_test_warp (Failed)
+#    748 - vsph_test_camera_bounds (Failed)
+#    768 - icam_test_transform (Failed)
+#    812 - imesh_test_imls_surface (Failed)
+#    886 - breg3d_test_ekf_camera_optimizer (Failed)
+# Do not make build fail for this arch
+%ctest || true
 %endif
 
 %files

From fd195578da19d1a91c0cf1cd91db450364084be4 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sat, 12 Oct 2024 00:24:42 +0100
Subject: [PATCH 68/74] chore: add github repo/branch note in spec

---
 vxl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 98a4101..12183ef 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -26,7 +26,7 @@ URL:        https://vxl.github.io/
 Source0:    %{name}-%{version}-clean.tar.gz
 
 # Patches generated from tree here:
-# https://github.com/sanjayankur31/vxl/tree/fedora-v3.5.0-f32
+# https://github.com/sanjayankur31/vxl/tree/fedora-3.5.0
 # use system rply and don't use mpeg2
 Patch:     0001-v3.5.0-unbundle-rply.patch
 Patch:     0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch

From 5a8896d91b25278ac49e03ce26b4f0448a94f327 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 14:41:43 +0000
Subject: [PATCH 69/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From c2e4fc1a9796c49b9150e7b60ff26beb4dede197 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sat, 24 May 2025 17:21:02 +0100
Subject: [PATCH 70/74] fix: disable failing test

The test does not provide much information, so we disable it for the
time being to fix the build.
---
 vxl.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vxl.spec b/vxl.spec
index 12183ef..97a9f2a 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -225,12 +225,13 @@ rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
 # 99% tests passed, 5 tests failed out of 997
 # Total Test time (real) =  23.64 sec
 # The following tests FAILED:
+#        30 -  vul_vul_test_driver (invalid test name)
 #        781 - acal_test_metadata (Failed)
 #        816 - bkml_test_bkml (Subprocess aborted)
 #        836 - volm_test_candidate_region_parser (Subprocess aborted)
 #        979 - vifa_test_int_faces_attr (Subprocess aborted)
 #        980 - vifa_test_int_faces_adj_attr (Subprocess aborted)
-%ctest -E "(acal_test_metadata|bkml_test_bkml|volm_test_candidate_region_parser|vifa_test_int_faces_attr|vifa_test_int_faces_adj_attr)"
+%ctest -E "(acal_test_metadata|bkml_test_bkml|volm_test_candidate_region_parser|vifa_test_int_faces_attr|vifa_test_int_faces_adj_attr|vul_vul_test_driver)"
 %else
 # A number of test fail, but not deterministically on aarch and ppc64le etc, e.g:
 

From 12e7328bc5c75484fdbd2da72d1c44e6cf15d617 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:15:43 +0000
Subject: [PATCH 71/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From e862a90a0c863b5f2a7d95eb5bf4f0213353dbec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 20:05:32 +0000
Subject: [PATCH 72/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild


From 51dd62e2255ab382d46fbe25f5af12d473555164 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:39:48 +0000
Subject: [PATCH 73/74] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild


From 779d95016803f26aa43218ed86a3261ab26ee68a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Mon, 24 Aug 2026 15:48:53 +0200
Subject: [PATCH 74/74] Fix FTBFS in F45+

- switch from Coin2 to Coin4
- drop SIMVoleon dependency
---
 vxl.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vxl.spec b/vxl.spec
index 97a9f2a..2b71ec8 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -59,7 +59,7 @@ Patch:     0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
 Patch:     0018-chore-remove-ctest-dashboard-config.patch
 
 BuildRequires:  cmake
-BuildRequires:  Coin2-devel
+BuildRequires:  Coin4-devel
 BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  expatpp-devel
@@ -95,7 +95,6 @@ Provides:  bundled(libopenjpeg2) = 2.0.0
 # BuildRequires:  python3-devel
 
 BuildRequires:  rply-devel
-BuildRequires:  SIMVoleon-devel
 BuildRequires:  shapelib-devel
 BuildRequires:  texi2html
 BuildRequires:  zlib-ng-compat-devel